More debug calls to set the premiumUUID

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+[//]: # (Lines in this format are considered as comments and will not be displayed.)
+[//]: #
+[//]: # (Before reporting make sure you're running the **latest build** of the plugin and checked for duplicate issues!)
+
+### What behaviour is observed:
+[//]: # (What happened?)
+
+### What behaviour is expected:
+[//]: # (What did you expect?)
+
+### Steps/models to reproduce:
+[//]: # (The actions that cause the issue. Please explain it in detail)
+
+### Plugin list:
+[//]: # (This can be found by running `/pl`)
+
+### Environment description
+[//]: # (Server software with exact version number, Minecraft version, SQLite/MySQL, ...)
+
+### Plugin version or build number (don't write latest):
+[//]: # (This can be found by running `/version plugin-name`.)
+
+### Error Log:
+[Hastebin](https://hastebin.com/) / [Gist](https://gist.github.com/) link of the error or stacktrace (if any)
+
+### Configuration:
+[//]: # (remember to delete any sensitive data)
+[Hastebin](https://hastebin.com/) / [Gist](https://gist.github.com/) link of your config.yml file 

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,68 +0,0 @@
-name: 🐞 Bug Report
-description: Something isn't working, broken, not expected behavior
-labels: [bug]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This ticket is about bugs, so broken, not expected behavior. Feedback about this form is appreciated.
-  - type: textarea
-    attributes:
-      label: What happened?
-      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
-      description: The actions that cause the issues. Please explain it in detail.
-  - type: input
-    attributes:
-      label: Plugin list
-      description: This can be found by running `/pl`
-      placeholder: AuthMe, ProtocolLib, ...
-  - type: input
-    attributes:
-      label: Configuration file
-      description: |
-        Link to the contents of your config.yml file.
-        You can use [GitHub](https://gist.github.com/), [Hastebin](https://hastebin.com) or similar for that.
-      placeholder: https://gist.github.com/games647/88c4439e1cd7810f21318b1b24a04ee0
-  - type: textarea
-    attributes:
-      label: Server log
-      description: The error, stacktrace or link the complete log. You can use the links above for long versions.
-      render: shell
-      placeholder: https://hastebin.com/ / https://gist.github.com/
-  - type: input
-    attributes:
-      label: Plugin version
-      description: Plugin version or build number. This can be found by running `/version plugin-name`
-      placeholder: v3.1-SNAPSHOT-570b321
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Platform
-      description: Server software - choose your proxy software if you have multiple servers
-      options:
-        - Spigot
-        - BungeeCord
-        - Velocity
-    validations:
-      required: true
-  - type: checkboxes
-    attributes:
-      label: Relevance
-      description: Check list for previous tickets
-      options:
-        - label: I tried the latest build
-          required: true
-        - label: |
-            I checked for existing tickets -
-            If there are, please vote them with a thumps reaction and not create new ones
-          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-# General configuration for issue templates
-
-# Allow issues without a template
-#blank_issues_enabled: false
-
-# Extra section on creating issues to redirect to another site
-contact_links:
-  - name: 📌 Questions
-    url: https://github.com/games647/FastLogin/discussions
-    about: You want to ask something
-

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -1,25 +0,0 @@
----
-name: 💡 Enhancement request
-about: New feature or change request
-title: ''
-labels: 'enhancement'
-assignees: ''
-
----
-
-[//]: # (Lines in this format are considered as comments and will not be displayed.)
-[//]: # (Before reporting make sure you're running the **latest build** of the plugin and checked for existing issues!)
-
-[//]: # (This ticket is about suggestions for a feature or particular enhancement)
-
-### Is your feature request related to a problem? Please describe.
-[//]: # (A clear and concise description of what the problem is. Ex. I'm always frustrated when [...])
-
-### Describe the solution you'd like
-[//]: # (A clear and concise description of what you want to happen.)
-
-### Describe alternatives you've considered
-[//]: # (A clear and concise description of any alternative solutions or features you've considered.)
-
-### Additional context
-[//]: # (Add any other context or screenshots about the feature request here.)

.github/dependabot.yml

@@ -1,35 +0,0 @@
-version: 2
-
-updates:
-  # Updates for workflow files
-  - package-ecosystem: "github-actions"
-    # Workflow files stored in the
-    # default location of `.github/workflows`
-    directory: "/"
-    schedule:
-      interval: "monthly"
-
-  # Maven project
-  - package-ecosystem: maven
-    directory: "/"
-    schedule:
-      interval: weekly
-    ignore:
-      - dependency-name: com.google.code.gson:gson
-        versions:
-          - "> 2.2.4"
-      - dependency-name: com.google.guava
-      - dependency-name: me.clip:placeholderapi
-        versions:
-          - "> 2.10.8, < 2.11"
-      - dependency-name: net.md-5:bungeecord-config
-        versions:
-          - "> 1.12-SNAPSHOT"
-      - dependency-name: de.xxschrandxx.bca:BungeeCordAuthenticator
-        versions:
-          - 0.0.3
-      - dependency-name: com.zaxxer:HikariCP
-        versions:
-          - 4.0.0
-          - 4.0.2
-          - 4.0.3

.github/pull_request_template.md

@@ -1,8 +0,0 @@
-[//]: # (Lines in this format are considered as comments and will not be displayed.)
-[//]: # (If your work is in progress, please consider making a draft pull request.)
-
-### Summary of your change
-[//]: # (Example: motiviation, enhancement)
-
-### Related issue
-[//]: # (Reference it using '#NUMBER'. Ex: Fixes/Related #...)

.github/workflows/codeql-analysis.yml

@@ -1,67 +0,0 @@
-# GitHub automatic code security scanning using CodeQL
-
-# Human-readable name in the actions tab
-name: "CodeQL"
-
-on:
-  # Scan only for push on the primary branch for now
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  # job i
-  analyze:
-
-    # Display name
-    name: Analyze
-
-    # Environment
-    runs-on: ubuntu-latest
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Languages to scan
-        language: [ 'java' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Setup Java
-    - name: Set up JDK
-      uses: actions/setup-java@v2.3.0
-      with:
-        distribution: 'adopt'
-        # Use Java 16, because it's minimum required version by Geyser
-        java-version: 16
-        cache: 'maven'
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-
-    # Cache build process too like in the maven config
-    - uses: actions/cache@v2.1.4
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
-
-    # Auto build attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.github/workflows/maven.yml

@@ -1,43 +0,0 @@
-# Automatically build, run unit and integration tests to detect errors early (CI provided by GitHub)
-# including making pull requests review easier
-
-# Human-readable name in the actions tab
-name: Java CI
-
-# Build on every pull request regardless of the branch
-# Wiki: https://help.github.com/en/actions/reference/events-that-trigger-workflows
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  # job id
-  build_and_test:
-
-    # Environment image - always use the newest OS
-    runs-on: ubuntu-latest
-
-    # Run steps
-    steps:
-      # Pull changes
-      - uses: actions/checkout@v2.3.4
-
-      # Setup Java
-      - name: Set up JDK
-        uses: actions/setup-java@v2.3.0
-        with:
-          distribution: 'temurin'
-          # Use Java 16, because it's minimum required version by Geyser
-          java-version: 16
-          cache: 'maven'
-
-      # Build and test (included in package)
-      - name: Build with Maven and test
-        # Run non-interactive, package (with compile+test),
-        # ignore snapshot updates, because they are likely to have breaking changes, enforce checksums to validate
-        # possible errors in dependencies
-        run: mvn test --batch-mode --no-snapshot-updates --strict-checksums --file pom.xml

.gitignore

@@ -13,9 +13,6 @@ nb-configuration.xml
 *.iws
 .idea/
 
-# VSCode
-.vscode/
-
 # Maven
 target/
 pom.xml.versionsBackup
@@ -45,5 +42,3 @@ hs_err_pid*
 # Mac filesystem dust
 .DS_Store
 
-# Factorypath from Visual Studio Code
-.factorypath

.travis.yml

@@ -0,0 +1,13 @@
+# Use https://travis-ci.org/ for automatic testing
+
+# speed up testing https://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
+sudo: false
+
+# This is a java project
+language: java
+
+script: mvn test -B
+
+jdk:
+  - oraclejdk8
+  - oraclejdk9

CHANGELOG.md

@@ -1,7 +1,5 @@
 ### 1.11
 
-* TODO: Replace reflection with methodhandles
-
 * Use direct proxies instead of ssl factories for multiple IP-addresses
 * Remove local address check for multiple IP-addresses
 * Fix parsing of local IP-addresses

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 games647 and contributors
+Copyright (c) 2015-2018
 
 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

@@ -11,29 +11,26 @@ So they don't need to enter passwords. This is also called auto login (auto-logi
 * Cauldron support
 * Forge/Sponge message support
 * Premium UUID support
-* Forward skins
-* Detect username changed and will update the existing database record
+* Forwards Skins
+* Detect user name changed and will update the existing database record
 * BungeeCord 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
+* Good performance by using async non blocking operations
 * Locale messages
-* Support for Bedrock players proxied through FloodGate
-
-## Issues
-
-Please use issues for bug reports, suggestions, questions and more. Please check for existing issues. Existing issues
-can be voted up by adding up vote to the original post. Closing issues means that they are marked as resolved. Comments
-are still allowed and it could be re-opened.
+* Import the database from similar plugins
 
 ## Development builds
 
-Development builds contain the latest changes from the Source-Code. They are bleeding edge and could introduce new bugs,
-but also include features, enhancements and bug fixes that are not yet in a released version. If you click on the left
-side on `Changes`, you can see iterative change sets leading to a specific build.
+Development builds of this project can be acquired at the provided CI (continuous integration) server. It contains the
+latest changes from the Source-Code in preparation for the following release. This means they could contain new
+features, bug fixes and other changes since the last release.
 
-You can download them from here: https://ci.codemc.org/job/Games647/job/FastLogin/
+Nevertheless builds are only tested using a small set of automated and a few manual tests. Therefore they **could**
+contain new bugs and are likely to be less stable than released versions.
+
+https://ci.codemc.org/job/Games647/job/FastLogin/changes
 
 ***
 
@@ -49,57 +46,35 @@ You can download them from here: https://ci.codemc.org/job/Games647/job/FastLogi
     fastlogin.command.premium.other
     fastlogin.command.cracked.other
 
-## Placeholder
-
-This plugin supports `PlaceholderAPI` on `Spigot`. It exports the following variable
-`%fastlogin_status%`. In BungeeCord environments, the status of a player will be delivered with a delay after the player
-already successful joined the server. This takes about a couple of milliseconds. In this case the value
-will be `Unknown`.
-
-Possible values: `Premium`, `Cracked`, `Unknown`
-
 ## Requirements
 
-* Plugin:
-    * [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/) or
+* Plugin: 
+    * [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/) or 
     * [ProtocolSupport](https://www.spigotmc.org/resources/protocolsupport.7201/)
-* [Spigot](https://www.spigotmc.org) 1.8.8+
+* [Spigot](https://www.spigotmc.org) 1.7.10+
 * Java 8+
-* Run Spigot (or a fork e.g. Paper) and/or BungeeCord (or a fork e.g. Waterfall) in offline mode
-* An auth plugin.
+* Run Spigot and/or BungeeCord/Waterfall in offline mode (see server.properties or config.yml)
+* An auth plugin. Supported plugins
 
-### Supported auth plugins
+### Bukkit/Spigot/Paper
 
-#### Spigot/Paper
-
-* [AdvancedLogin (Paid)](https://www.spigotmc.org/resources/advancedlogin.10510/)
 * [AuthMe (5.X)](https://dev.bukkit.org/bukkit-plugins/authme-reloaded/)
+* [xAuth](https://dev.bukkit.org/bukkit-plugins/xauth/)
+* [LogIt](https://github.com/games647/LogIt)
+* [AdvancedLogin (Paid)](https://www.spigotmc.org/resources/advancedlogin.10510/)
 * [CrazyLogin](https://dev.bukkit.org/bukkit-plugins/crazylogin/)
 * [LoginSecurity](https://dev.bukkit.org/bukkit-plugins/loginsecurity/)
-* [LogIt](https://github.com/games647/LogIt)
-* [SodionAuth (2.0+)](https://github.com/MohistMC/SodionAuth)
 * [UltraAuth](https://dev.bukkit.org/bukkit-plugins/ultraauth-aa/)
-* [UserLogin](https://www.spigotmc.org/resources/userlogin.80669/)
-* [xAuth](https://dev.bukkit.org/bukkit-plugins/xauth/)
 
-#### BungeeCord/Waterfall
+### BungeeCord/Waterfall
 
 * [BungeeAuth](https://www.spigotmc.org/resources/bungeeauth.493/)
-* [BungeeAuthenticator](https://www.spigotmc.org/resources/bungeecordauthenticator.87669/)
-* [SodionAuth (2.0+)](https://github.com/MohistMC/SodionAuth)
-
-## Network requests
-
-This plugin performs network requests to:
-
-* https://api.mojang.com - retrieving uuid data to decide if we should activate premium login
-* https://sessionserver.mojang.com - verify if the player is the owner of that account
 
 ***
 
 ## How to install
 
-### Spigot/Paper
+### Bukkit/Spigot/Paper
 
 1. Download and install ProtocolLib/ProtocolSupport
 2. Download and install FastLogin (or FastLoginBukkit for newer versions)
@@ -109,13 +84,13 @@ This plugin performs network requests to:
 
 1. Activate BungeeCord in the Spigot configuration
 2. Restart your server
-3. Now there is `allowed-proxies.txt` file in the FastLogin folder
+3. Now there is proxy-whitelist file in the FastLogin folder
 Put your stats id from the BungeeCord config into this file
 4. Activate ipForward in your BungeeCord config
-5. Download and Install FastLogin (or FastLoginBungee/FastLoginBukkit in newer versions) on BungeeCord AND Spigot
+5. Download and Install FastLogin (or FastLoginBungee in newer versions) on BungeeCord AND Spigot
 (on the servers where your login plugin is or where player should be able to execute the commands of FastLogin)
 6. Check your database settings in the config of FastLogin on BungeeCord
-7. Set proxy and Spigot in offline mode by setting the value onlinemode in your config.yml to false
-8. You should *always* firewall your Spigot server that it's only accessible through BungeeCord
+7. Set your proxy (BungeeCord) in offline mode by setting the value onlinemode in your config.yml to false
+8. You should *always* firewall your Spigot server that it's only accessible through BungeeCord 
     * https://www.spigotmc.org/wiki/bungeecord-installation/#post-installation
-    * BungeeCord doesn't support SQLite per default, so you should change the configuration to MySQL or MariaDB. For that you have to install MariaDB/MySQL on your root server first and put the credentials you made in the FastLogin config files.
+    * BungeeCord doesn't support SQLite per default, so you should change the configuration to MySQL or MariaDB

bukkit/pom.xml

@@ -1,32 +1,5 @@
-<!--
-
-    SPDX-License-Identifier: MIT
-
-    The MIT License (MIT)
-
-    Copyright (c) 2015-2021 <Your name 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.
-
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -36,7 +9,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <!--This has to be in lowercase because it's used by plugin.yml-->
+    <!--This have to be in lowercase because it's used by plugin.yml-->
     <artifactId>fastlogin.bukkit</artifactId>
     <packaging>jar</packaging>
 
@@ -47,7 +20,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.1.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
@@ -68,24 +41,7 @@
                             <pattern>com.google.gson</pattern>
                             <shadedPattern>fastlogin.gson</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>com.google.common</pattern>
-                            <shadedPattern>fastlogin.guava</shadedPattern>
-                            <excludes>
-                                <exclude>com.google.common.collect.Multimap</exclude>
-                            </excludes>
-                        </relocation>
-                        <relocation>
-                            <pattern>io.papermc.lib</pattern>
-                            <shadedPattern>fastlogin.paperlib</shadedPattern>
-                        </relocation>
                     </relocations>
-                    <!-- Rename the service file too to let SLF4J api find our own relocated jdk logger -->
-                    <!-- Located in META-INF/services -->
-                    <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                    </transformers>
-                    <minimizeJar>true</minimizeJar>
                 </configuration>
                 <executions>
                     <execution>
@@ -100,43 +56,40 @@
     </build>
 
     <repositories>
-        <!-- PaperSpigot API and PaperLib -->
+        <!--Bukkit-Server-API -->
         <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
 
-        <!-- ProtocolLib -->
+        <!--LoginSecurity-->
+        <repository>
+            <id>lenis0012-repo</id>
+            <url>http://ci.lenis0012.com/plugin/repository/everything/</url>
+        </repository>
+
+        <!--ProtocolLib-->
         <repository>
             <id>dmulloy2-repo</id>
-            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
+            <url>http://repo.dmulloy2.net/content/groups/public/</url>
         </repository>
 
-        <!-- AuthMe Reloaded, xAuth and LoginSecurity -->
+        <!--AuthMe Reloaded and xAuth -->
         <repository>
-            <id>codemc-releases</id>
-            <url>https://repo.codemc.io/repository/maven-public/</url>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
 
-        <!-- GitHub automatic maven builds -->
+        <!--GitHub automatic maven builds-->
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
         </repository>
 
-        <!-- PlaceholderAPI -->
+        <!--PlaceholderAPI -->
         <repository>
             <id>placeholderapi</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
+            <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
     </repositories>
 
@@ -148,94 +101,28 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- PaperSpigot API for correcting user cache usage -->
+        <!--Server API-->
         <dependency>
-            <groupId>io.papermc.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.18-R0.1-SNAPSHOT</version>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
-            <!-- Use our own newer api version -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- PaperLib for checking if server uses PaperSpigot -->
-        <dependency>
-            <groupId>io.papermc</groupId>
-            <artifactId>paperlib</artifactId>
-            <version>1.0.7</version>
         </dependency>
 
         <!--Library for listening and sending Minecraft packets-->
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.7.0</version>
+            <version>4.3.0</version>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!--Changing onlinemode on login process-->
         <dependency>
             <groupId>com.github.ProtocolSupport</groupId>
             <artifactId>ProtocolSupport</artifactId>
-            <!--4.29.dev after commit about API improvements-->
-            <version>3a80c661fe</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!--Floodgate for Xbox Live Authentication-->
-        <dependency>
-            <groupId>org.geysermc.floodgate</groupId>
-            <artifactId>api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.geysermc.cumulus</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Bedrock player bridge -->
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>core</artifactId>
-            <version>${geyser.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- We need the API, but it was excluded above -->
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>geyser-api</artifactId>
-            <version>${geyser.version}</version>
+            <!--4.25.dev-->
+            <version>a4f060dc46</version>
             <scope>provided</scope>
         </dependency>
 
@@ -243,7 +130,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.0</version>
+            <version>2.8.5</version>
             <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
@@ -272,7 +159,7 @@
         <dependency>
             <groupId>com.lenis0012.bukkit</groupId>
             <artifactId>loginsecurity</artifactId>
-            <version>3.0.2</version>
+            <version>2.1.7</version>
             <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
@@ -339,19 +226,5 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/lib/UltraAuth v2.1.2.jar</systemPath>
         </dependency>
-
-        <dependency>
-            <groupId>com.github.Mohist-Community.SodionAuth</groupId>
-            <artifactId>SodionAuth-Bukkit</artifactId>
-            <version>2bdfdc854b</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.Mohist-Community.SodionAuth</groupId>
-                    <artifactId>SodionAuth-Libs</artifactId>
-                </exclusion>
-            </exclusions>
-            <optional>true</optional>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>

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

@@ -1,36 +1,13 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit;
 
-import com.github.games647.craftapi.model.skin.SkinProperty;
+import com.github.games647.craftapi.model.skin.Property;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.LoginSession;
 
 import java.util.Optional;
 
+import org.apache.commons.lang.ArrayUtils;
+
 /**
  * Represents a client connecting to the server.
  *
@@ -38,51 +15,46 @@ import java.util.Optional;
  */
 public class BukkitLoginSession extends LoginSession {
 
-    private static final byte[] EMPTY_ARRAY = {};
-
+    private final String serverId;
     private final byte[] verifyToken;
 
     private boolean verified;
 
-    private SkinProperty skinProperty;
+    private Property skinProperty;
 
-    public BukkitLoginSession(String username, byte[] verifyToken, boolean registered
+    public BukkitLoginSession(String username, String serverId, byte[] verifyToken, boolean registered
             , StoredProfile profile) {
         super(username, registered, profile);
 
-        this.verifyToken = verifyToken.clone();
+        this.serverId = serverId;
+        this.verifyToken = ArrayUtils.clone(verifyToken);
     }
 
     //available for BungeeCord
     public BukkitLoginSession(String username, boolean registered) {
-        this(username, EMPTY_ARRAY, registered, null);
+        this(username, "", ArrayUtils.EMPTY_BYTE_ARRAY, registered, null);
     }
 
     //cracked player
     public BukkitLoginSession(String username, StoredProfile profile) {
-        this(username, EMPTY_ARRAY, false, profile);
-    }
-
-    //ProtocolSupport
-    public BukkitLoginSession(String username, boolean registered, StoredProfile profile) {
-        this(username, EMPTY_ARRAY, registered, profile);
+        this(username, "", ArrayUtils.EMPTY_BYTE_ARRAY, false, profile);
     }
 
     /**
-     * Gets the verify-token the server sent to the client.
+     * Gets the verify token the server sent to the client.
      *
      * Empty if it's a BungeeCord connection
      *
-     * @return verify token from the server
+     * @return the verify token from the server
      */
-    public synchronized byte[] getVerifyToken() {
-        return verifyToken.clone();
+    public byte[] getVerifyToken() {
+        return ArrayUtils.clone(verifyToken);
     }
 
     /**
      * @return premium skin if available
      */
-    public synchronized Optional<SkinProperty> getSkin() {
+    public synchronized Optional<Property> getSkin() {
         return Optional.ofNullable(skinProperty);
     }
 
@@ -90,7 +62,7 @@ public class BukkitLoginSession extends LoginSession {
      * Sets the premium skin property which was retrieved by the session server
      * @param skinProperty premium skin
      */
-    public synchronized void setSkinProperty(SkinProperty skinProperty) {
+    public synchronized void setSkinProperty(Property skinProperty) {
         this.skinProperty = skinProperty;
     }
 

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

@@ -1,50 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit;
-
-import com.github.games647.fastlogin.core.AsyncScheduler;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.ThreadFactory;
-
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
-import org.slf4j.Logger;
-
-public class BukkitScheduler extends AsyncScheduler {
-
-    private final Executor syncExecutor;
-
-    public BukkitScheduler(Plugin plugin, Logger logger, ThreadFactory threadFactory) {
-        super(logger, threadFactory);
-
-        syncExecutor = r -> Bukkit.getScheduler().runTask(plugin, r);
-    }
-
-    public Executor getSyncExecutor() {
-        return syncExecutor;
-    }
-}

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

@@ -1,199 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit;
-
-import com.github.games647.fastlogin.bukkit.listener.BungeeListener;
-import com.github.games647.fastlogin.core.message.ChannelMessage;
-import com.github.games647.fastlogin.core.message.LoginActionMessage;
-import com.github.games647.fastlogin.core.message.NamespaceKey;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Stream;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.messaging.PluginMessageRecipient;
-
-import static com.github.games647.fastlogin.core.message.ChangePremiumMessage.CHANGE_CHANNEL;
-import static com.github.games647.fastlogin.core.message.SuccessMessage.SUCCESS_CHANNEL;
-import static java.util.stream.Collectors.toSet;
-
-public class BungeeManager {
-
-    private static final String LEGACY_FILE_NAME = "proxy-whitelist.txt";
-    private static final String FILE_NAME = "allowed-proxies.txt";
-
-    //null if proxies allowed list is empty so bungeecord support is disabled
-    private Set<UUID> proxyIds;
-
-    private final FastLoginBukkit plugin;
-    private boolean enabled;
-
-    private final Set<UUID> firedJoinEvents = new HashSet<>();
-
-    public BungeeManager(FastLoginBukkit plugin) {
-        this.plugin = plugin;
-    }
-
-    public void cleanup() {
-        //remove old blocked status
-        Bukkit.getOnlinePlayers().forEach(player -> player.removeMetadata(plugin.getName(), plugin));
-    }
-
-    public void sendPluginMessage(PluginMessageRecipient player, ChannelMessage message) {
-        if (player != null) {
-            ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
-            message.writeTo(dataOutput);
-
-            NamespaceKey channel = new NamespaceKey(plugin.getName(), message.getChannelName());
-            player.sendPluginMessage(plugin, channel.getCombinedName(), dataOutput.toByteArray());
-        }
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void initialize() {
-        try {
-            enabled = detectProxy();
-        } catch (Exception ex) {
-            plugin.getLog().warn("Cannot check proxy support. Fallback to non-proxy mode", ex);
-        }
-
-        if (enabled) {
-            proxyIds = loadBungeeCordIds();
-            registerPluginChannels();
-        }
-    }
-
-    private boolean isProxySupported(String className, String fieldName) {
-        try {
-            return Class.forName(className).getDeclaredField(fieldName).getBoolean(null);
-        } catch (ClassNotFoundException notFoundEx) {
-            //ignore server has no proxy support
-        } catch (NoSuchFieldException | IllegalAccessException noSuchFieldException) {
-            plugin.getLog().warn("Cannot access proxy field", noSuchFieldException);
-        }
-
-        return false;
-    }
-
-    private boolean detectProxy() {
-        return isProxySupported("org.spigotmc.SpigotConfig", "bungee")
-                || isProxySupported("com.destroystokyo.paper.PaperConfig", "velocitySupport");
-    }
-
-    private void registerPluginChannels() {
-        Server server = Bukkit.getServer();
-
-        // check for incoming messages from the bungeecord version of this plugin
-        String groupId = plugin.getName();
-        String forceChannel = NamespaceKey.getCombined(groupId, LoginActionMessage.FORCE_CHANNEL);
-        server.getMessenger().registerIncomingPluginChannel(plugin, forceChannel, new BungeeListener(plugin));
-
-        // outgoing
-        String successChannel = new NamespaceKey(groupId, SUCCESS_CHANNEL).getCombinedName();
-        String changeChannel = new NamespaceKey(groupId, CHANGE_CHANNEL).getCombinedName();
-        server.getMessenger().registerOutgoingPluginChannel(plugin, successChannel);
-        server.getMessenger().registerOutgoingPluginChannel(plugin, changeChannel);
-    }
-
-    private Set<UUID> loadBungeeCordIds() {
-        Path proxiesFile = plugin.getPluginFolder().resolve(FILE_NAME);
-        Path legacyFile = plugin.getPluginFolder().resolve(LEGACY_FILE_NAME);
-        try {
-            if (Files.notExists(proxiesFile)) {
-                if (Files.exists(legacyFile)) {
-                    Files.move(legacyFile, proxiesFile);
-                }
-
-                if (Files.notExists(legacyFile)) {
-                    Files.createFile(proxiesFile);
-                }
-            }
-
-            Files.deleteIfExists(legacyFile);
-            try (Stream<String> lines = Files.lines(proxiesFile)) {
-                return lines.map(String::trim)
-                        .map(UUID::fromString)
-                        .collect(toSet());
-            }
-        } catch (IOException ex) {
-            plugin.getLog().error("Failed to read proxies", ex);
-        } catch (Exception ex) {
-            plugin.getLog().error("Failed to retrieve proxy Id. Disabling BungeeCord support", ex);
-        }
-
-        return Collections.emptySet();
-    }
-
-    public boolean isProxyAllowed(UUID proxyId) {
-        return proxyIds != null && proxyIds.contains(proxyId);
-    }
-
-    /**
-     * Mark the event to be fired including the task delay.
-     *
-     * @param player joining player
-     */
-    public synchronized void markJoinEventFired(Player player) {
-        firedJoinEvents.add(player.getUniqueId());
-    }
-
-    /**
-     * Check if the event fired including with the task delay. This necessary to restore the order of processing the
-     * BungeeCord messages after the PlayerJoinEvent fires including the delay.
-     *
-     * If the join event fired, the delay exceeded, but it ran earlier and couldn't find the recently started login
-     * session. If not fired, we can start a new force login task. This will still match the requirement that we wait
-     * a certain time after the player join event fired.
-     *
-     * @param player joining player
-     * @return event fired including delay
-     */
-    public synchronized boolean didJoinEventFired(Player player) {
-        return firedJoinEvents.contains(player.getUniqueId());
-    }
-
-    /**
-     * Player quit clean up
-     *
-     * @param player joining player
-     */
-    public synchronized void cleanup(Player player) {
-        firedJoinEvents.remove(player.getUniqueId());
-    }
-}

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

@@ -0,0 +1,121 @@
+package com.github.games647.fastlogin.bukkit;
+
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.security.Key;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.Random;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * Encryption and decryption minecraft util for connection between servers
+ * and paid Minecraft account clients.
+ *
+ * @see net.minecraft.server.MinecraftEncryption
+ */
+public class EncryptionUtil {
+
+    public static final int VERIFY_TOKEN_LENGTH = 4;
+    public static final String KEY_PAIR_ALGORITHM = "RSA";
+
+    private EncryptionUtil() {
+        //utility
+    }
+
+    /**
+     * Generate a RSA key pair
+     *
+     * @return The RSA key pair.
+     */
+    public static KeyPair generateKeyPair() {
+        try {
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KEY_PAIR_ALGORITHM);
+
+            keyPairGenerator.initialize(1_024);
+            return keyPairGenerator.generateKeyPair();
+        } catch (NoSuchAlgorithmException nosuchalgorithmexception) {
+            //Should be existing in every vm
+            throw new ExceptionInInitializerError(nosuchalgorithmexception);
+        }
+    }
+
+    /**
+     * Generate a random token. This is used to verify that we are communicating with the same player
+     * in a login session.
+     *
+     * @param random random generator
+     * @return an error with 4 bytes long
+     */
+    public static byte[] generateVerifyToken(Random random) {
+        byte[] token = new byte[VERIFY_TOKEN_LENGTH];
+        random.nextBytes(token);
+        return token;
+    }
+
+    /**
+     * Generate the server id based on client and server data.
+     *
+     * @param sessionId    session for the current login attempt
+     * @param sharedSecret shared secret between the client and the server
+     * @param publicKey    public key of the server
+     * @return the server id formatted as a hexadecimal string.
+     */
+    public static String getServerIdHashString(String sessionId, Key sharedSecret, PublicKey publicKey) {
+        try {
+            byte[] serverHash = getServerIdHash(sessionId, sharedSecret, publicKey);
+            return (new BigInteger(serverHash)).toString(16);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+
+        return "";
+    }
+
+    /**
+     * Decrypts the content and extracts the key spec.
+     *
+     * @param cipher     decryption cipher
+     * @param privateKey private key of the server
+     * @param sharedKey  the encrypted shared key
+     * @return shared secret key
+     * @throws GeneralSecurityException
+     */
+    public static SecretKey decryptSharedKey(Cipher cipher, PrivateKey privateKey, byte[] sharedKey)
+            throws GeneralSecurityException {
+        return new SecretKeySpec(decrypt(cipher, privateKey, sharedKey), "AES");
+    }
+
+    /**
+     * Decrypted the given data using the cipher.
+     *
+     * @param cipher decryption cypher
+     * @param key    server private key
+     * @param data   the encrypted data
+     * @return clear text data
+     * @throws GeneralSecurityException if it fails to initialize and decrypt the data
+     */
+    public static byte[] decrypt(Cipher cipher, PrivateKey key, byte[] data) throws GeneralSecurityException {
+        cipher.init(Cipher.DECRYPT_MODE, key);
+        return cipher.doFinal(data);
+    }
+
+    private static byte[] getServerIdHash(String sessionId, Key sharedSecret, PublicKey publicKey)
+            throws NoSuchAlgorithmException {
+        MessageDigest digest = MessageDigest.getInstance("SHA-1");
+
+        digest.update(sessionId.getBytes(StandardCharsets.ISO_8859_1));
+        digest.update(sharedSecret.getEncoded());
+        digest.update(publicKey.getEncoded());
+
+        return digest.digest();
+    }
+}

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

@@ -1,67 +1,32 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit;
 
-import com.destroystokyo.paper.event.player.PlayerHandshakeEvent;
 import com.github.games647.fastlogin.bukkit.command.CrackedCommand;
 import com.github.games647.fastlogin.bukkit.command.PremiumCommand;
+import com.github.games647.fastlogin.bukkit.listener.BungeeListener;
 import com.github.games647.fastlogin.bukkit.listener.ConnectionListener;
-import com.github.games647.fastlogin.bukkit.listener.PaperCacheListener;
-import com.github.games647.fastlogin.bukkit.listener.protocollib.ManualNameChange;
 import com.github.games647.fastlogin.bukkit.listener.protocollib.ProtocolLibListener;
 import com.github.games647.fastlogin.bukkit.listener.protocollib.SkinApplyListener;
 import com.github.games647.fastlogin.bukkit.listener.protocolsupport.ProtocolSupportListener;
 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.hooks.bedrock.BedrockService;
-import com.github.games647.fastlogin.core.hooks.bedrock.FloodgateService;
-import com.github.games647.fastlogin.core.hooks.bedrock.GeyserService;
+import com.github.games647.fastlogin.core.message.ChannelMessage;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.PlatformPlugin;
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
 
-import io.papermc.lib.PaperLib;
-
-import java.net.InetSocketAddress;
 import java.nio.file.Path;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.geysermc.floodgate.api.FloodgateApi;
-import org.geysermc.geyser.GeyserImpl;
+import org.bukkit.plugin.messaging.PluginMessageRecipient;
 import org.slf4j.Logger;
 
 /**
@@ -71,54 +36,39 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
 
     //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 Logger logger = CommonUtil.createLoggerFromJDK(getLogger());
     private final Map<UUID, PremiumStatus> premiumPlayers = new ConcurrentHashMap<>();
-    private final Logger logger;
 
     private boolean serverStarted;
-    private BungeeManager bungeeManager;
-    private final BukkitScheduler scheduler;
+    private boolean bungeeCord;
     private FastLoginCore<Player, CommandSender, FastLoginBukkit> core;
-    private FloodgateService floodgateService;
-    private GeyserService geyserService;
-
-    private PremiumPlaceholder premiumPlaceholder;
-
-    public FastLoginBukkit() {
-        this.logger = CommonUtil.initializeLoggerService(getLogger());
-        this.scheduler = new BukkitScheduler(this, logger, getThreadFactory());
-    }
 
     @Override
     public void onEnable() {
         core = new FastLoginCore<>(this);
         core.load();
+        try {
+            bungeeCord = Class.forName("org.spigotmc.SpigotConfig").getDeclaredField("bungee").getBoolean(null);
+        } catch (ClassNotFoundException notFoundEx) {
+            //ignore server has no bungee support
+        } catch (Exception ex) {
+            logger.warn("Cannot check bungeecord support. You use a non-Spigot build", ex);
+        }
 
         if (getServer().getOnlineMode()) {
-            //we need to require offline to prevent a loginSession request for an offline player
-            logger.error("Server has to be in offline mode");
+            //we need to require offline to prevent a loginSession request for a offline player
+            logger.error("Server have to be in offline mode");
             setEnabled(false);
             return;
         }
 
-        if (!initializeFloodgate()) {
-            setEnabled(false);
-        }
-
-        bungeeManager = new BungeeManager(this);
-        bungeeManager.initialize();
-
-        // getServer().getPluginManager().registerEvents(new Listener() {
-        //
-        //     @EventHandler
-        //     void onHandshake(PlayerHandshakeEvent handshakeEvent) {
-        //         handshakeEvent.setCancelled(false);
-        //         handshakeEvent.setSocketAddressHostname("192.168.0.1");
-        //     }
-        // }, this);
-
         PluginManager pluginManager = getServer().getPluginManager();
-        if (bungeeManager.isEnabled()) {
-            markInitialized();
+        if (bungeeCord) {
+            setServerStarted();
+
+            //check for incoming messages from the bungeecord version of this plugin
+            getServer().getMessenger().registerIncomingPluginChannel(this, getName(), new BungeeListener(this));
+            getServer().getMessenger().registerOutgoingPluginChannel(this, getName());
         } else {
             if (!core.setupDatabase()) {
                 setEnabled(false);
@@ -126,33 +76,12 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
             }
 
             if (pluginManager.isPluginEnabled("ProtocolSupport")) {
-                pluginManager.registerEvents(new ProtocolSupportListener(this, core.getRateLimiter()), this);
+                pluginManager.registerEvents(new ProtocolSupportListener(this), this);
             } else if (pluginManager.isPluginEnabled("ProtocolLib")) {
-                ProtocolLibListener.register(this, core.getRateLimiter());
-
-                if (isPluginInstalled("floodgate")) {
-                    if (getConfig().getBoolean("floodgatePrefixWorkaround")){
-                        ManualNameChange.register(this, floodgateService);
-                        logger.info("Floodgate prefix injection workaround has been enabled.");
-                        logger.info("If you have problems joining the server, try disabling it in the configuration.");
-                    } else {
-                        logger.warn("We have detected that you are runnging FastLogin alongside Floodgate and ProtocolLib.");
-                        logger.warn("Currently there is an issue with FastLogin that prevents Floodgate name prefixes from showing up "
-                                + "when it is together used with ProtocolLib.");
-                        logger.warn("If you would like to use Floodgate name prefixes, you can enable an experimental workaround by changing "
-                                + "the value 'floodgatePrefixWorkaround' to true in config.yml.");
-                        logger.warn("For more information visit https://github.com/games647/FastLogin/issues/493");
-                    }
-                }
-
-                //if server is using paper - we need to set the skin at pre login anyway, so no need for this listener
-                if (!PaperLib.isPaper() && getConfig().getBoolean("forwardSkin")) {
-                    pluginManager.registerEvents(new SkinApplyListener(this), this);
-                }
+                ProtocolLibListener.register(this);
+                pluginManager.registerEvents(new SkinApplyListener(this), this);
             } else {
                 logger.warn("Either ProtocolLib or ProtocolSupport have to be installed if you don't use BungeeCord");
-                setEnabled(false);
-                return;
             }
         }
 
@@ -161,37 +90,14 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
 
         pluginManager.registerEvents(new ConnectionListener(this), this);
 
-        //if server is using paper - we need to add one more listener to correct the user cache usage
-        if (PaperLib.isPaper()) {
-            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)));
+        getCommand("premium").setExecutor(new PremiumCommand(this));
+        getCommand("cracked").setExecutor(new CrackedCommand(this));
 
         if (pluginManager.isPluginEnabled("PlaceholderAPI")) {
-            premiumPlaceholder = new PremiumPlaceholder(this);
-            premiumPlaceholder.register();
+            //prevents NoClassDef errors if it's not available
+            PremiumPlaceholder.register(this);
         }
-
-        dependencyWarnings();
-    }
-
-    private boolean initializeFloodgate() {
-        if (getServer().getPluginManager().getPlugin("Geyser-Spigot") != null) {
-            geyserService = new GeyserService(GeyserImpl.getInstance(), core);
-        }
-
-        if (getServer().getPluginManager().getPlugin("floodgate") != null) {
-            floodgateService = new FloodgateService(FloodgateApi.getInstance(), core);
-
-            // Check Floodgate config values and return
-            return floodgateService.isValidFloodgateConfigString("autoLoginFloodgate")
-                    && floodgateService.isValidFloodgateConfigString("allowFloodgateNameConflict");
-        }
-
-        return true;
     }
 
     @Override
@@ -203,17 +109,8 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
             core.close();
         }
 
-        if (bungeeManager != null) {
-            bungeeManager.cleanup();
-        }
-
-        if (premiumPlaceholder != null && getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
-            try {
-                premiumPlaceholder.unregister();
-            } catch (Exception | NoSuchMethodError exception) {
-                logger.error("Failed to unregister placeholder", exception);
-            }
-        }
+        //remove old blacklists
+        getServer().getOnlinePlayers().forEach(player -> player.removeMetadata(getName(), this));
     }
 
     public FastLoginCore<Player, CommandSender, FastLoginBukkit> getCore() {
@@ -230,36 +127,23 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
         return loginSession;
     }
 
-    public BukkitLoginSession getSession(InetSocketAddress address) {
-        String id = getSessionId(address);
-        return loginSession.get(id);
-    }
-
-    public String getSessionId(InetSocketAddress address) {
-        return address.getAddress().getHostAddress() + ':' + address.getPort();
-    }
-
-    public void putSession(InetSocketAddress address, BukkitLoginSession session) {
-        String id = getSessionId(address);
-        loginSession.put(id, session);
-    }
-
-    public void removeSession(InetSocketAddress address) {
-        String id = getSessionId(address);
-        loginSession.remove(id);
-    }
-
     public Map<UUID, PremiumStatus> getPremiumPlayers() {
         return premiumPlayers;
     }
 
+    public boolean isBungeeEnabled() {
+        return bungeeCord;
+    }
+
     /**
      * Fetches the premium status of an online player.
      *
-     * @param onlinePlayer player that is currently online player (play state)
+     * @param onlinePlayer
      * @return the online status or unknown if an error happened, the player isn't online or BungeeCord doesn't send
      * us the status message yet (This means you cannot check the login status on the PlayerJoinEvent).
+     * @deprecated this method could be removed in future versions and exists only as a temporarily solution
      */
+    @Deprecated
     public PremiumStatus getStatus(UUID onlinePlayer) {
         return premiumPlayers.getOrDefault(onlinePlayer, PremiumStatus.UNKNOWN);
     }
@@ -274,12 +158,20 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
         return serverStarted;
     }
 
-    public void markInitialized() {
-        this.serverStarted = true;
+    public void setServerStarted() {
+        if (!this.serverStarted) {
+            this.serverStarted = true;
+        }
     }
 
-    public BungeeManager getBungeeManager() {
-        return bungeeManager;
+    public void sendPluginMessage(PluginMessageRecipient player, ChannelMessage message) {
+        if (player != null) {
+            ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
+            dataOutput.writeUTF(message.getChannelName());
+
+            message.writeTo(dataOutput);
+            player.sendPluginMessage(this, this.getName(), dataOutput.toByteArray());
+        }
     }
 
     @Override
@@ -292,55 +184,8 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
         return logger;
     }
 
-    @Override
-    public BukkitScheduler getScheduler() {
-        return scheduler;
-    }
-
     @Override
     public void sendMessage(CommandSender receiver, String message) {
         receiver.sendMessage(message);
     }
-
-    /**
-     * Checks if a plugin is installed on the server
-     *
-     * @param name the name of the plugin
-     * @return true if the plugin is installed
-     */
-    @Override
-    public boolean isPluginInstalled(String name) {
-        // the plugin may be enabled after FastLogin, so isPluginEnabled() won't work here
-        return Bukkit.getServer().getPluginManager().getPlugin(name) != null;
-    }
-
-    public FloodgateService getFloodgateService() {
-        return floodgateService;
-    }
-
-    public GeyserService getGeyserService() {
-        return geyserService;
-    }
-
-    @Override
-    public BedrockService<?> getBedrockService() {
-        if (floodgateService != null) {
-            return floodgateService;
-        }
-        return geyserService;
-    }
-
-    /**
-     * Send warning messages to log if incompatible plugins are used
-     */
-    private void dependencyWarnings() {
-        if (isPluginInstalled("floodgate-bukkit")) {
-            logger.warn("We have detected that you are running Floodgate 1.0 which is not supported by the Bukkit "
-                    + "version of FastLogin.");
-            logger.warn("If you would like to use FastLogin with Floodgate, you can download development builds of "
-                    + "Floodgate 2.0 from https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/dev%252F2.0/");
-            logger.warn("Don't forget to update Geyser to a supported version as well from "
-                    + "https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/floodgate-2.0/");
-    	}
-    }
 }

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

@@ -1,38 +1,15 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit;
 
+import java.util.stream.Collectors;
+
+import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 
-import org.bukkit.OfflinePlayer;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.entity.Player;
 
 public class PremiumPlaceholder extends PlaceholderExpansion {
 
-    private static final String PLACEHOLDER_VARIABLE = "status";
+    private static final String PLACEHOLDER_VARIABLE = "fastlogin_status";
 
     private final FastLoginBukkit plugin;
 
@@ -40,33 +17,37 @@ public class PremiumPlaceholder extends PlaceholderExpansion {
         this.plugin = plugin;
     }
 
+    public static void register(FastLoginBukkit plugin) {
+        PremiumPlaceholder placeholderHook = new PremiumPlaceholder(plugin);
+        PlaceholderAPI.registerPlaceholderHook(PLACEHOLDER_VARIABLE, placeholderHook);
+    }
+
     @Override
-    public String onRequest(OfflinePlayer player, @NotNull String identifier) {
-        // player is null if offline
-        if (player != null && PLACEHOLDER_VARIABLE.equals(identifier)) {
-            return plugin.getStatus(player.getUniqueId()).getReadableName();
+    public String onPlaceholderRequest(Player player, String variable) {
+        if (player != null && PLACEHOLDER_VARIABLE.equals(variable)) {
+            return plugin.getStatus(player.getUniqueId()).name();
         }
 
-        return null;
+        return "";
     }
 
     @Override
-    public @NotNull String getIdentifier() {
+    public String getIdentifier() {
+        return PLACEHOLDER_VARIABLE;
+    }
+
+    @Override
+    public String getPlugin() {
         return plugin.getName();
     }
 
     @Override
-    public String getRequiredPlugin() {
+    public String getAuthor() {
+        return plugin.getDescription().getAuthors().stream().collect(Collectors.joining(", "));
+    }
+
+    @Override
+    public String getVersion() {
         return plugin.getName();
     }
-
-    @Override
-    public @NotNull String getAuthor() {
-        return String.join(", ", plugin.getDescription().getAuthors());
-    }
-
-    @Override
-    public @NotNull String getVersion() {
-        return plugin.getDescription().getVersion();
-    }
 }

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

@@ -1,39 +1,11 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.command;
 
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.event.BukkitFastLoginPremiumToggleEvent;
 import com.github.games647.fastlogin.core.StoredProfile;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import static com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent.PremiumToggleReason;
 
 public class CrackedCommand extends ToggleCommand {
 
@@ -42,7 +14,7 @@ public class CrackedCommand extends ToggleCommand {
     }
 
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (args.length == 0) {
             onCrackedSelf(sender, command, args);
         } else {
@@ -61,7 +33,7 @@ public class CrackedCommand extends ToggleCommand {
             return;
         }
 
-        if (plugin.getBungeeManager().isEnabled()) {
+        if (plugin.isBungeeEnabled()) {
             sendBungeeActivateMessage(sender, sender.getName(), false);
             plugin.getCore().sendLocaleMessage("wait-on-proxy", sender);
         } else {
@@ -72,10 +44,8 @@ public class CrackedCommand extends ToggleCommand {
 
                 profile.setPremium(false);
                 profile.setId(null);
-                plugin.getScheduler().runAsync(() -> {
+                Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
                     plugin.getCore().getStorage().save(profile);
-                    plugin.getServer().getPluginManager().callEvent(
-                            new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_OTHER));
                 });
             } else {
                 plugin.getCore().sendLocaleMessage("not-premium", sender);
@@ -106,10 +76,8 @@ public class CrackedCommand extends ToggleCommand {
             plugin.getCore().sendLocaleMessage("remove-premium", sender);
 
             profile.setPremium(false);
-            plugin.getScheduler().runAsync(() -> {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
                 plugin.getCore().getStorage().save(profile);
-                plugin.getServer().getPluginManager().callEvent(
-                        new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_OTHER));
             });
         }
     }

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

@@ -1,46 +1,19 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.command;
 
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.event.BukkitFastLoginPremiumToggleEvent;
 import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent.PremiumToggleReason;
 
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Let users activate fast login by command. This only be accessible if
- * the user has access to its account. So we can make sure that not another
- * person with a paid account and the same username can steal their account.
+ * the user has access to it's account. So we can make sure that not another
+ * person with a paid account and the same username can steal his account.
  */
 public class PremiumCommand extends ToggleCommand {
 
@@ -49,7 +22,7 @@ public class PremiumCommand extends ToggleCommand {
     }
 
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (args.length == 0) {
             onPremiumSelf(sender, command, args);
         } else {
@@ -68,29 +41,27 @@ public class PremiumCommand extends ToggleCommand {
             return;
         }
 
-        UUID id = ((Player) sender).getUniqueId();
-        if (plugin.getConfig().getBoolean("premium-warning") && !plugin.getCore().getPendingConfirms().contains(id)) {
-            sender.sendMessage(plugin.getCore().getMessage("premium-warning"));
-            plugin.getCore().getPendingConfirms().add(id);
-            return;
-        }
+            UUID id = ((Player) sender).getUniqueId();
+            if (plugin.getConfig().getBoolean("premium-warning") && !plugin.getCore().getPendingConfirms().contains(id)) {
+                sender.sendMessage(plugin.getCore().getMessage("premium-warning"));
+                plugin.getCore().getPendingConfirms().add(id);
+                return;
+            }
 
-        plugin.getCore().getPendingConfirms().remove(id);
-        //todo: load async
-        StoredProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
-        if (profile.isPremium()) {
-            plugin.getCore().sendLocaleMessage("already-exists", sender);
-        } else {
-            //todo: resolve uuid
-            profile.setPremium(true);
-            plugin.getScheduler().runAsync(() -> {
-                plugin.getCore().getStorage().save(profile);
-                plugin.getServer().getPluginManager().callEvent(
-                        new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_SELF));
-            });
+            plugin.getCore().getPendingConfirms().remove(id);
+            //todo: load async
+            StoredProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
+            if (profile.isPremium()) {
+                plugin.getCore().sendLocaleMessage("already-exists", sender);
+            } else {
+                //todo: resolve uuid
+                profile.setPremium(true);
+                Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                    plugin.getCore().getStorage().save(profile);
+                });
 
-            plugin.getCore().sendLocaleMessage("add-premium", sender);
-        }
+                plugin.getCore().sendLocaleMessage("add-premium", sender);
+            }
     }
 
     private void onPremiumOther(CommandSender sender, Command command, String[] args) {
@@ -114,10 +85,8 @@ public class PremiumCommand extends ToggleCommand {
         } else {
             //todo: resolve uuid
             profile.setPremium(true);
-            plugin.getScheduler().runAsync(() -> {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
                 plugin.getCore().getStorage().save(profile);
-                plugin.getServer().getPluginManager().callEvent(
-                        new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_OTHER));
             });
 
             plugin.getCore().sendLocaleMessage("add-premium-other", sender);

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.command;
 
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
@@ -47,16 +22,16 @@ public abstract class ToggleCommand implements CommandExecutor {
     }
 
     protected boolean hasOtherPermission(CommandSender sender, Command cmd) {
-        if (sender.hasPermission(cmd.getPermission() + ".other")) {
-            return true;
+        if (!sender.hasPermission(cmd.getPermission() + ".other")) {
+            plugin.getCore().sendLocaleMessage("no-permission", sender);
+            return false;
         }
 
-        plugin.getCore().sendLocaleMessage("no-permission", sender);
-        return false;
+        return true;
     }
 
     protected boolean forwardBungeeCommand(CommandSender sender, String target, boolean activate) {
-        if (plugin.getBungeeManager().isEnabled()) {
+        if (plugin.isBungeeEnabled()) {
             sendBungeeActivateMessage(sender, target, activate);
             plugin.getCore().sendLocaleMessage("wait-on-proxy", sender);
             return true;
@@ -78,7 +53,7 @@ public abstract class ToggleCommand implements CommandExecutor {
     protected void sendBungeeActivateMessage(CommandSender invoker, String target, boolean activate) {
         if (invoker instanceof PluginMessageRecipient) {
             ChannelMessage message = new ChangePremiumMessage(target, activate, true);
-            plugin.getBungeeManager().sendPluginMessage((PluginMessageRecipient) invoker, message);
+            plugin.sendPluginMessage((PluginMessageRecipient) invoker, message);
         } else {
             Optional<? extends Player> optPlayer = Bukkit.getServer().getOnlinePlayers().stream().findFirst();
             if (!optPlayer.isPresent()) {
@@ -88,7 +63,7 @@ public abstract class ToggleCommand implements CommandExecutor {
 
             Player sender = optPlayer.get();
             ChannelMessage message = new ChangePremiumMessage(target, activate, false);
-            plugin.getBungeeManager().sendPluginMessage(sender, message);
+            plugin.sendPluginMessage(sender, message);
         }
     }
 }

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

@@ -1,78 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-public class BukkitFastLoginAutoLoginEvent extends Event implements FastLoginAutoLoginEvent, Cancellable {
-
-    private static final HandlerList handlers = new HandlerList();
-    private final LoginSession session;
-    private final StoredProfile profile;
-    private boolean cancelled;
-
-    public BukkitFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile) {
-        super(true);
-
-        this.session = session;
-        this.profile = profile;
-    }
-
-    @Override
-    public LoginSession getSession() {
-        return session;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

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

@@ -1,73 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSource;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-public class BukkitFastLoginPreLoginEvent extends Event implements FastLoginPreLoginEvent {
-
-    private static final HandlerList handlers = new HandlerList();
-    private final String username;
-    private final LoginSource source;
-    private final StoredProfile profile;
-
-    public BukkitFastLoginPreLoginEvent(String username, LoginSource source, StoredProfile profile) {
-        super(true);
-
-        this.username = username;
-        this.source = source;
-        this.profile = profile;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public LoginSource getSource() {
-        return source;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

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

@@ -1,64 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-public class BukkitFastLoginPremiumToggleEvent extends Event implements FastLoginPremiumToggleEvent {
-
-    private static final HandlerList handlers = new HandlerList();
-    private final StoredProfile profile;
-    private final PremiumToggleReason reason;
-
-    public BukkitFastLoginPremiumToggleEvent(StoredProfile profile, PremiumToggleReason reason) {
-        super(true);
-        this.profile = profile;
-        this.reason = reason;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-
-    @Override
-    public PremiumToggleReason getReason() {
-        return reason;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.hook;
 
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
@@ -31,11 +6,6 @@ import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
 import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.events.RestoreSessionEvent;
-import fr.xephi.authme.process.Management;
-import fr.xephi.authme.process.register.executors.ApiPasswordRegisterParams;
-import fr.xephi.authme.process.register.executors.RegistrationMethod;
-
-import java.lang.reflect.Field;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -55,29 +25,16 @@ public class AuthMeHook implements AuthPlugin<Player>, Listener {
 
     private final FastLoginBukkit plugin;
 
-    private final AuthMeApi authmeAPI;
-    private Management authmeManagement;
-
     public AuthMeHook(FastLoginBukkit plugin) {
         this.plugin = plugin;
-        this.authmeAPI = AuthMeApi.getInstance();
-
-        if (plugin.getConfig().getBoolean("respectIpLimit", false)) {
-            try {
-                Field managementField = this.authmeAPI.getClass().getDeclaredField("management");
-                managementField.setAccessible(true);
-                this.authmeManagement = (Management) managementField.get(this.authmeAPI);
-            } catch (NoSuchFieldException | IllegalAccessException exception) {
-                this.authmeManagement = null;
-            }
-        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onSessionRestore(RestoreSessionEvent restoreSessionEvent) {
         Player player = restoreSessionEvent.getPlayer();
 
-        BukkitLoginSession session = plugin.getSession(player.spigot().getRawAddress());
+        String id = '/' + player.getAddress().getAddress().getHostAddress() + ':' + player.getAddress().getPort();
+        BukkitLoginSession session = plugin.getLoginSessions().get(id);
         if (session != null && session.isVerified()) {
             restoreSessionEvent.setCancelled(true);
         }
@@ -85,32 +42,24 @@ public class AuthMeHook implements AuthPlugin<Player>, Listener {
 
     @Override
     public boolean forceLogin(Player player) {
-        if (authmeAPI.isAuthenticated(player)) {
-            plugin.getLog().warn(ALREADY_AUTHENTICATED, player);
+        if (AuthMeApi.getInstance().isAuthenticated(player)) {
             return false;
         }
 
         //skips registration and login
-        authmeAPI.forceLogin(player);
+        AuthMeApi.getInstance().forceLogin(player);
         return true;
     }
 
     @Override
     public boolean isRegistered(String playerName) {
-        return authmeAPI.isRegistered(playerName);
+        return AuthMeApi.getInstance().isRegistered(playerName);
     }
 
     @Override
-    //this automatically login the player too
     public boolean forceRegister(Player player, String password) {
-        //if we have the management - we can trigger register with IP limit checks
-        if (authmeManagement != null) {
-            authmeManagement.performRegister(RegistrationMethod.PASSWORD_REGISTRATION,
-                    ApiPasswordRegisterParams.of(player, password, true));
-        } else {
-            authmeAPI.forceRegister(player, password);
-        }
-
+        //this automatically login the player too
+        AuthMeApi.getInstance().forceRegister(player, password);
         return true;
     }
 }

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

@@ -1,31 +1,5 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.hook;
 
-import com.comphenix.protocol.reflect.FieldUtils;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
@@ -39,6 +13,7 @@ import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import org.apache.commons.lang.reflect.FieldUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -121,11 +96,11 @@ public class CrazyLoginHook implements AuthPlugin<Player> {
     public boolean forceRegister(Player player, String password) {
         CrazyLoginDataDatabase crazyDatabase = crazyLoginPlugin.getCrazyDatabase();
 
-        //this executes a sql query and accesses only thread safe collections, so we can run it async
+        //this executes a sql query and accesses only thread safe collections so we can run it async
         LoginPlayerData playerData = crazyLoginPlugin.getPlayerData(player.getName());
         if (playerData == null) {
             //create a fake account - this will be saved to the database with the password=FAILEDLOADING
-            //user cannot log in with that password unless the admin uses plain text
+            //user cannot login with that password unless the admin uses plain text
             //this automatically marks the player as logged in
             crazyDatabase.save(new LoginPlayerData(player));
             return forceLogin(player);

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

@@ -1,31 +1,5 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.hook;
 
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
 import io.github.lucaseasedup.logit.CancelledState;
@@ -48,21 +22,11 @@ import org.bukkit.entity.Player;
  */
 public class LogItHook implements AuthPlugin<Player> {
 
-    private final FastLoginBukkit plugin;
-
-    public LogItHook(FastLoginBukkit plugin) {
-        this.plugin = plugin;
-    }
-
     @Override
     public boolean forceLogin(Player player) {
         SessionManager sessionManager = LogItCore.getInstance().getSessionManager();
-        if (sessionManager.isSessionAlive(player)) {
-            plugin.getLog().warn(ALREADY_AUTHENTICATED, player);
-            return false;
-        }
-
-        return sessionManager.startSession(player) == CancelledState.NOT_CANCELLED;
+        return sessionManager.isSessionAlive(player)
+                || sessionManager.startSession(player) == CancelledState.NOT_CANCELLED;
     }
 
     @Override

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.hook;
 
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
@@ -36,7 +11,7 @@ import com.lenis0012.bukkit.loginsecurity.session.action.RegisterAction;
 import org.bukkit.entity.Player;
 
 /**
- * GitHub: https://github.com/lenis0012/LoginSecurity-2
+ * GitHub: https://github.com/lenis0012/LoginSecurity-2 
  * <p>
  * Project page:
  * <p>
@@ -55,13 +30,8 @@ public class LoginSecurityHook implements AuthPlugin<Player> {
     @Override
     public boolean forceLogin(Player player) {
         PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player);
-        if (session.isAuthorized()) {
-            plugin.getLog().warn(ALREADY_AUTHENTICATED, player);
-            return true;
-        }
+        return session.isAuthorized() || session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess();
 
-        return session.isAuthorized()
-                || session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess();
     }
 
     @Override

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

@@ -1,78 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.hook;
-
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import org.bukkit.entity.Player;
-import red.mohist.sodionauth.bukkit.implementation.BukkitPlayer;
-import red.mohist.sodionauth.core.SodionAuthApi;
-import red.mohist.sodionauth.core.exception.AuthenticatedException;
-
-/**
- * GitHub: https://github.com/Mohist-Community/SodionAuth
- * <p>
- * Project page: https://gitea.e-loli.com/SodionAuth/SodionAuth
- * <p>
- * Bukkit: Unknown
- * <p>
- * Spigot: https://www.spigotmc.org/resources/sodionauth.76944/
- */
-public class SodionAuthHook implements AuthPlugin<Player> {
-
-    private final FastLoginBukkit plugin;
-
-    public SodionAuthHook(FastLoginBukkit plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean forceLogin(Player player) {
-        try {
-            SodionAuthApi.login(new BukkitPlayer(player));
-        } catch (AuthenticatedException e) {
-            plugin.getLog().warn(ALREADY_AUTHENTICATED, player);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean forceRegister(Player player, String password) {
-        try{
-            return SodionAuthApi.register(new BukkitPlayer(player), password);
-        } catch (UnsupportedOperationException e){
-            plugin.getLog().warn("Currently SodionAuth is not accepting forceRegister, " +
-                    "It may be caused by unsupported AuthBackend");
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isRegistered(String playerName) {
-        return SodionAuthApi.isRegistered(playerName);
-    }
-}

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.hook;
 
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
@@ -33,7 +8,9 @@ import java.util.concurrent.Future;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 import ultraauth.api.UltraAuthAPI;
+import ultraauth.main.Main;
 import ultraauth.managers.PlayerManager;
 
 /**
@@ -45,6 +22,7 @@ import ultraauth.managers.PlayerManager;
  */
 public class UltraAuthHook implements AuthPlugin<Player> {
 
+    private final Plugin ultraAuthPlugin = Main.main;
     private final FastLoginBukkit plugin;
 
     public UltraAuthHook(FastLoginBukkit plugin) {
@@ -56,8 +34,7 @@ public class UltraAuthHook implements AuthPlugin<Player> {
         //not thread-safe
         Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(plugin, () -> {
             if (UltraAuthAPI.isAuthenticated(player)) {
-                plugin.getLog().warn(ALREADY_AUTHENTICATED, player);
-                return false;
+                return true;
             }
 
             UltraAuthAPI.authenticatedPlayer(player);

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.hook;
 
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
@@ -60,8 +35,7 @@ public class xAuthHook implements AuthPlugin<Player> {
             xAuthPlayer xAuthPlayer = xAuthPlugin.getPlayerManager().getPlayer(player);
             if (xAuthPlayer != null) {
                 if (xAuthPlayer.isAuthenticated()) {
-                    plugin.getLog().warn(ALREADY_AUTHENTICATED, player);
-                    return false;
+                    return true;
                 }
 
                 //we checked that the player is premium (paid account)

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener;
 
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
@@ -35,13 +10,20 @@ import com.github.games647.fastlogin.core.message.LoginActionMessage.Type;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
 
+import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Stream;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.messaging.PluginMessageListener;
-import org.jetbrains.annotations.NotNull;
+
+import static java.util.stream.Collectors.toSet;
 
 /**
  * Responsible for receiving messages from a BungeeCord instance.
@@ -51,40 +33,51 @@ import org.jetbrains.annotations.NotNull;
  */
 public class BungeeListener implements PluginMessageListener {
 
+    private static final String FILE_NAME = "proxy-whitelist.txt";
+
     private final FastLoginBukkit plugin;
+    //null if whitelist is empty so bungeecord support is disabled
+    private final Set<UUID> proxyIds;
 
     public BungeeListener(FastLoginBukkit plugin) {
         this.plugin = plugin;
+        this.proxyIds = loadBungeeCordIds();
     }
 
     @Override
-    public void onPluginMessageReceived(@NotNull String channel, Player player, byte[] message) {
+    public void onPluginMessageReceived(String channel, Player player, byte[] message) {
+        if (!channel.equals(plugin.getName())) {
+            return;
+        }
+
         ByteArrayDataInput dataInput = ByteStreams.newDataInput(message);
+        String subChannel = dataInput.readUTF();
+        if (!"LoginAction".equals(subChannel)) {
+            plugin.getLog().info("Unknown sub channel {}", subChannel);
+            return;
+        }
 
         LoginActionMessage loginMessage = new LoginActionMessage();
         loginMessage.readFrom(dataInput);
 
         plugin.getLog().debug("Received plugin message {}", loginMessage);
 
-        Player targetPlayer = player;
-        if (!loginMessage.getPlayerName().equals(player.getName())) {
-            targetPlayer = Bukkit.getPlayerExact(loginMessage.getPlayerName());
-        }
-
-        if (targetPlayer == null) {
-            plugin.getLog().warn("Force action player {} not found", loginMessage.getPlayerName());
+        //check if the player is still online or disconnected
+        Player checkedPlayer = Bukkit.getPlayerExact(loginMessage.getPlayerName());
+        if (checkedPlayer == null) {
             return;
         }
 
-        // fail if target player is blocked because already authenticated or wrong bungeecord id
-        if (targetPlayer.hasMetadata(plugin.getName())) {
-            plugin.getLog().warn("Received message {} from a blocked player {}", loginMessage, targetPlayer);
+        //fail if target player is blacklisted because already authenticated or wrong bungeecord id
+        if (checkedPlayer.hasMetadata(plugin.getName())) {
+            plugin.getLog().warn("Received message {} from a blacklisted player {}", loginMessage, checkedPlayer);
         } else {
+            //fail if BungeeCord support is disabled (id = null)
             UUID sourceId = loginMessage.getProxyId();
-            if (plugin.getBungeeManager().isProxyAllowed(sourceId)) {
-                readMessage(targetPlayer, loginMessage);
+            if (proxyIds.contains(sourceId)) {
+                readMessage(checkedPlayer, loginMessage);
             } else {
-                plugin.getLog().warn("Received proxy id: {} that doesn't exist in the proxy file", sourceId);
+                plugin.getLog().warn("Received proxy id: {} that doesn't exist in the proxy whitelist file", sourceId);
             }
         }
     }
@@ -94,47 +87,52 @@ public class BungeeListener implements PluginMessageListener {
         Type type = message.getType();
 
         InetSocketAddress address = player.getAddress();
-        plugin.getLog().info("Player info {} command for {} from proxy", type, playerName);
+        String id = '/' + address.getAddress().getHostAddress() + ':' + address.getPort();
         if (type == Type.LOGIN) {
-            onLoginMessage(player, playerName, address);
+            BukkitLoginSession playerSession = new BukkitLoginSession(playerName, true);
+            playerSession.setVerified(true);
+            plugin.getLoginSessions().put(id, playerSession);
+
+            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new ForceLoginTask(plugin.getCore(), player), 10L);
         } else if (type == Type.REGISTER) {
-            onRegisterMessage(player, playerName, address);
+            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> {
+                AuthPlugin<Player> authPlugin = plugin.getCore().getAuthPluginHook();
+                try {
+                    //we need to check if the player is registered on Bukkit too
+                    if (authPlugin == null || !authPlugin.isRegistered(playerName)) {
+                        BukkitLoginSession playerSession = new BukkitLoginSession(playerName, false);
+                        playerSession.setVerified(true);
+                        plugin.getLoginSessions().put(id, playerSession);
+                        new ForceLoginTask(plugin.getCore(), player).run();
+                    }
+                } catch (Exception ex) {
+                    plugin.getLog().error("Failed to query isRegistered for player: {}", player, ex);
+                }
+            }, 10L);
         } else if (type == Type.CRACKED) {
-            //we don't start a force login task here so update it manually
+            //we don't start a forcelogin task here so update it manually
             plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
         }
     }
 
-    private void onLoginMessage(Player player, String playerName, InetSocketAddress address) {
-        BukkitLoginSession playerSession = new BukkitLoginSession(playerName, true);
-        startLoginTaskIfReady(player, playerSession);
-    }
-
-    private void onRegisterMessage(Player player, String playerName, InetSocketAddress address) {
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-            AuthPlugin<Player> authPlugin = plugin.getCore().getAuthPluginHook();
-            try {
-                //we need to check if the player is registered on Bukkit too
-                if (authPlugin == null || !authPlugin.isRegistered(playerName)) {
-                    BukkitLoginSession playerSession = new BukkitLoginSession(playerName, false);
-                    startLoginTaskIfReady(player, playerSession);
-                }
-            } catch (Exception ex) {
-                plugin.getLog().error("Failed to query isRegistered for player: {}", player, ex);
+    public Set<UUID> loadBungeeCordIds() {
+        Path whitelistFile = plugin.getPluginFolder().resolve(FILE_NAME);
+        try {
+            if (Files.notExists(whitelistFile)) {
+                Files.createFile(whitelistFile);
             }
-        });
-    }
 
-    private void startLoginTaskIfReady(Player player, BukkitLoginSession session) {
-        session.setVerified(true);
-        plugin.putSession(player.spigot().getRawAddress(), session);
-
-        // only start a new login task if the join event fired earlier. This event then didn't
-        boolean result = plugin.getBungeeManager().didJoinEventFired(player);
-        plugin.getLog().info("Delaying force login until join event fired?: {}", result);
-        if (result) {
-            Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player, session);
-            Bukkit.getScheduler().runTaskAsynchronously(plugin, forceLoginTask);
+            try (Stream<String> lines = Files.lines(whitelistFile)) {
+                return lines.map(String::trim)
+                        .map(UUID::fromString)
+                        .collect(toSet());
+            }
+        } catch (IOException ex) {
+            plugin.getLog().error("Failed to create file for Proxy whitelist", ex);
+        } catch (Exception ex) {
+            plugin.getLog().error("Failed to retrieve proxy Id. Disabling BungeeCord support", ex);
         }
+
+        return Collections.emptySet();
     }
 }

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

@@ -1,35 +1,7 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener;
 
-import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.task.FloodgateAuthTask;
 import com.github.games647.fastlogin.bukkit.task.ForceLoginTask;
-import com.github.games647.fastlogin.core.hooks.bedrock.FloodgateService;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -40,11 +12,9 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.metadata.Metadatable;
-import org.geysermc.floodgate.api.player.FloodgatePlayer;
 
 /**
- * This listener tells authentication plugins weather the player has a premium account. So the
+ * This listener tells authentication plugins if the player has a premium account and we checked it successfully. So the
  * plugin can skip authentication.
  */
 public class ConnectionListener implements Listener {
@@ -59,7 +29,6 @@ public class ConnectionListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerLogin(PlayerLoginEvent loginEvent) {
-        removeBlockedStatus(loginEvent.getPlayer());
         if (loginEvent.getResult() == Result.ALLOWED && !plugin.isServerFullyStarted()) {
             loginEvent.disallow(Result.KICK_OTHER, plugin.getCore().getMessage("not-started"));
         }
@@ -69,53 +38,19 @@ public class ConnectionListener implements Listener {
     public void onPlayerJoin(PlayerJoinEvent joinEvent) {
         Player player = joinEvent.getPlayer();
 
-        Bukkit.getScheduler().runTaskLater(plugin, () -> {
-            delayForceLogin(player);
-            // delay the login process to let auth plugins initialize the player
-            // Magic number however as there is no direct event from those plugins
-        }, DELAY_LOGIN);
-    }
-
-    private void delayForceLogin(Player player) {
-        // session exists so the player is ready for force login
-        // cases: Paper (firing BungeeCord message before PlayerJoinEvent) or not running BungeeCord and already
-        // having the login session from the login process
-        BukkitLoginSession session = plugin.getSession(player.spigot().getRawAddress());
-
-        if (session == null) {
-            // Floodgate players usually don't have a session at this point
-            // exception: if force login by bungee message had been delayed
-            FloodgateService floodgateService = plugin.getFloodgateService();
-            if (floodgateService != null) {
-                FloodgatePlayer floodgatePlayer = floodgateService.getBedrockPlayer(player.getUniqueId());
-                if (floodgatePlayer != null) {
-                    Runnable floodgateAuthTask = new FloodgateAuthTask(plugin.getCore(), player, floodgatePlayer);
-                    Bukkit.getScheduler().runTaskAsynchronously(plugin, floodgateAuthTask);
-                    return;
-                }
-            }
-
-            String sessionId = plugin.getSessionId(player.spigot().getRawAddress());
-            plugin.getLog().info("No on-going login session for player: {} with ID {}", player, sessionId);
-        } else {
-            Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player, session);
-            Bukkit.getScheduler().runTaskAsynchronously(plugin, forceLoginTask);
+        if (!plugin.isBungeeEnabled()) {
+            //Wait before auth plugin and we received a message from BungeeCord initializes the player
+            Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player);
+            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, forceLoginTask, DELAY_LOGIN);
         }
-
-        plugin.getBungeeManager().markJoinEventFired(player);
     }
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent quitEvent) {
         Player player = quitEvent.getPlayer();
+        player.removeMetadata(plugin.getName(), plugin);
 
-        removeBlockedStatus(player);
         plugin.getCore().getPendingConfirms().remove(player.getUniqueId());
         plugin.getPremiumPlayers().remove(player.getUniqueId());
-        plugin.getBungeeManager().cleanup(player);
-    }
-
-    private void removeBlockedStatus(Metadatable player) {
-        player.removeMetadata(plugin.getName(), plugin);
     }
 }

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

@@ -1,66 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener;
-
-import com.destroystokyo.paper.profile.ProfileProperty;
-import com.github.games647.craftapi.model.skin.Textures;
-import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
-import org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result;
-
-public class PaperCacheListener implements Listener {
-
-    private final FastLoginBukkit plugin;
-
-    public PaperCacheListener(final FastLoginBukkit plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    //if paper is used - player skin must be set at pre login, otherwise user cache is used
-    // user cache makes premium name change basically impossible
-    public void onAsyncPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
-        if (event.getLoginResult() != Result.ALLOWED) {
-            return;
-        }
-
-        // event gives us only IP, not the port, so we need to loop through all the sessions
-        for (BukkitLoginSession session : plugin.getLoginSessions().values()) {
-            if (!event.getName().equals(session.getUsername())) {
-                continue;
-            }
-
-            session.getSkin().ifPresent(skin -> event.getPlayerProfile().setProperty(new ProfileProperty(Textures.KEY,
-                    skin.getValue(), skin.getSignature())));
-            break;
-        }
-    }
-
-}

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

@@ -1,157 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocollib;
-
-import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.util.Random;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-/**
- * Encryption and decryption minecraft util for connection between servers
- * and paid Minecraft account clients.
- *
- * @see net.minecraft.server.MinecraftEncryption
- */
-public class EncryptionUtil {
-
-    public static final int VERIFY_TOKEN_LENGTH = 4;
-    public static final String KEY_PAIR_ALGORITHM = "RSA";
-
-    private EncryptionUtil() {
-        // utility
-    }
-
-    /**
-     * Generate an RSA key pair
-     *
-     * @return The RSA key pair.
-     */
-    public static KeyPair generateKeyPair() {
-        // KeyPair b()
-        try {
-            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KEY_PAIR_ALGORITHM);
-
-            keyPairGenerator.initialize(1_024);
-            return keyPairGenerator.generateKeyPair();
-        } catch (NoSuchAlgorithmException nosuchalgorithmexception) {
-            // Should be existing in every vm
-            throw new ExceptionInInitializerError(nosuchalgorithmexception);
-        }
-    }
-
-    /**
-     * Generate a random token. This is used to verify that we are communicating with the same player
-     * in a login session.
-     *
-     * @param random random generator
-     * @return an error with 4 bytes long
-     */
-    public static byte[] generateVerifyToken(Random random) {
-        // extracted from LoginListener
-        byte[] token = new byte[VERIFY_TOKEN_LENGTH];
-        random.nextBytes(token);
-        return token;
-    }
-
-    /**
-     * Generate the server id based on client and server data.
-     *
-     * @param sessionId session for the current login attempt
-     * @param sharedSecret shared secret between the client and the server
-     * @param publicKey public key of the server
-     * @return the server id formatted as a hexadecimal string.
-     */
-    public static String getServerIdHashString(String sessionId, SecretKey sharedSecret, PublicKey publicKey) {
-        // found in LoginListener
-        try {
-            byte[] serverHash = getServerIdHash(sessionId, publicKey, sharedSecret);
-            return (new BigInteger(serverHash)).toString(16);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        }
-
-        return "";
-    }
-
-    /**
-     * Decrypts the content and extracts the key spec.
-     *
-     * @param privateKey private server key
-     * @param sharedKey the encrypted shared key
-     * @return shared secret key
-     * @throws GeneralSecurityException if it fails to decrypt the data
-     */
-    public static SecretKey decryptSharedKey(PrivateKey privateKey, byte[] sharedKey) throws GeneralSecurityException {
-        // SecretKey a(PrivateKey var0, byte[] var1)
-        return new SecretKeySpec(decrypt(privateKey, sharedKey), "AES");
-    }
-
-    public static byte[] decrypt(PrivateKey key, byte[] data) throws GeneralSecurityException {
-        // b(Key var0, byte[] var1)
-        Cipher cipher = Cipher.getInstance(key.getAlgorithm());
-        cipher.init(Cipher.DECRYPT_MODE, key);
-        return decrypt(cipher, data);
-    }
-
-    /**
-     * Decrypted the given data using the cipher.
-     *
-     * @param cipher decryption cypher initialized with the private key
-     * @param data the encrypted data
-     * @return clear text data
-     * @throws GeneralSecurityException if it fails to decrypt the data
-     */
-    private static byte[] decrypt(Cipher cipher, byte[] data) throws GeneralSecurityException {
-        // inlined: byte[] a(int var0, Key var1, byte[] var2), Cipher a(int var0, String var1, Key
-        // var2)
-        return cipher.doFinal(data);
-    }
-
-    private static byte[] getServerIdHash(
-            String sessionId, PublicKey publicKey, SecretKey sharedSecret)
-            throws NoSuchAlgorithmException {
-        // byte[] a(String var0, PublicKey var1, SecretKey var2)
-        MessageDigest digest = MessageDigest.getInstance("SHA-1");
-
-        // inlined from byte[] a(String var0, byte[]... var1)
-        digest.update(sessionId.getBytes(StandardCharsets.ISO_8859_1));
-        digest.update(sharedSecret.getEncoded());
-        digest.update(publicKey.getEncoded());
-
-        return digest.digest();
-    }
-}

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

@@ -1,85 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocollib;
-
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.wrappers.WrappedGameProfile;
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.core.hooks.bedrock.FloodgateService;
-
-import org.geysermc.floodgate.api.FloodgateApi;
-
-import static com.comphenix.protocol.PacketType.Login.Client.START;
-
-import com.comphenix.protocol.ProtocolLibrary;
-
-/**
- * Manually inject Floodgate player name prefixes.
- * <br>
- * This is used as a workaround, because Floodgate fails to inject
- * the prefixes when it's used together with ProtocolLib and FastLogin.
- * <br>
- * For more information visit: https://github.com/games647/FastLogin/issues/493
- */
-public class ManualNameChange extends PacketAdapter {
-
-    private final FloodgateService floodgate;
-
-    public ManualNameChange(FastLoginBukkit plugin, FloodgateService floodgate) {
-        super(params()
-                .plugin(plugin)
-                .types(START));
-
-        this.plugin = plugin;
-        this.floodgate = floodgate;
-    }
-
-    public static void register(FastLoginBukkit plugin, FloodgateService floodgate) {
-        // they will be created with a static builder, because otherwise it will throw a NoClassDefFoundError
-        ProtocolLibrary.getProtocolManager()
-                .getAsynchronousManager()
-                .registerAsyncHandler(new ManualNameChange(plugin, floodgate))
-                .start();
-    }
-
-    @Override
-    public void onPacketReceiving(PacketEvent packetEvent) {
-        PacketContainer packet = packetEvent.getPacket();
-        WrappedGameProfile originalProfile = packet.getGameProfiles().read(0);
-
-        if (floodgate.getBedrockPlayer(originalProfile.getName()) == null) {
-            //not a Floodgate player, no need to add a prefix
-            return;
-        }
-
-        packet.setMeta("original_name", originalProfile.getName());
-        String prefixedName = FloodgateApi.getInstance().getPlayerPrefix() + originalProfile.getName();
-        WrappedGameProfile updatedProfile = originalProfile.withName(prefixedName);
-        packet.getGameProfiles().write(0, updatedProfile);
-    }
-}

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

@@ -1,38 +1,11 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocollib;
 
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketEvent;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.event.BukkitFastLoginPreLoginEvent;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
 
 import java.security.PublicKey;
 import java.util.Random;
@@ -52,9 +25,9 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
     private final Player player;
     private final String username;
 
-    public NameCheckTask(FastLoginBukkit plugin, Random random, Player player, PacketEvent packetEvent,
-                         String username, PublicKey publicKey) {
-        super(plugin.getCore(), plugin.getCore().getAuthPluginHook(), plugin.getBedrockService());
+    public NameCheckTask(FastLoginBukkit plugin, PacketEvent packetEvent, Random random,
+                         Player player, String username, PublicKey publicKey) {
+        super(plugin.getCore(), plugin.getCore().getAuthPluginHook());
 
         this.plugin = plugin;
         this.packetEvent = packetEvent;
@@ -67,27 +40,19 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
     @Override
     public void run() {
         try {
-            super.onLogin(username, new ProtocolLibLoginSource(player, random, publicKey));
+            super.onLogin(username, new ProtocolLibLoginSource(packetEvent, player, random, publicKey));
         } finally {
             ProtocolLibrary.getProtocolManager().getAsynchronousManager().signalPacketTransmission(packetEvent);
         }
     }
 
-    @Override
-    public FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, ProtocolLibLoginSource source,
-                                                             StoredProfile profile) {
-        BukkitFastLoginPreLoginEvent event = new BukkitFastLoginPreLoginEvent(username, source, profile);
-        plugin.getServer().getPluginManager().callEvent(event);
-        return event;
-    }
-
     //Minecraft server implementation
     //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L161
     @Override
     public void requestPremiumLogin(ProtocolLibLoginSource source, StoredProfile profile
             , String username, boolean registered) {
         try {
-            source.enableOnlinemode();
+            source.setOnlineMode();
         } catch (Exception ex) {
             plugin.getLog().error("Cannot send encryption packet. Falling back to cracked login for: {}", profile, ex);
             return;
@@ -96,10 +61,11 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
         String ip = player.getAddress().getAddress().getHostAddress();
         core.getPendingLogin().put(ip + username, new Object());
 
+        String serverId = source.getServerId();
         byte[] verify = source.getVerifyToken();
 
-        BukkitLoginSession playerSession = new BukkitLoginSession(username, verify, registered, profile);
-        plugin.putSession(player.getAddress(), playerSession);
+        BukkitLoginSession playerSession = new BukkitLoginSession(username, serverId, verify, registered, profile);
+        plugin.getLoginSessions().put(player.getAddress().toString(), playerSession);
         //cancel only if the player has a paid account otherwise login as normal offline player
         synchronized (packetEvent.getAsyncMarker().getProcessingLock()) {
             packetEvent.setCancelled(true);
@@ -109,6 +75,6 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
     @Override
     public void startCrackedSession(ProtocolLibLoginSource source, StoredProfile profile, String username) {
         BukkitLoginSession loginSession = new BukkitLoginSession(username, profile);
-        plugin.putSession(player.getAddress(), loginSession);
+        plugin.getLoginSessions().put(player.getAddress().toString(), loginSession);
     }
 }

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocollib;
 
 import com.comphenix.protocol.PacketType;
@@ -30,12 +5,13 @@ 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.github.games647.fastlogin.bukkit.EncryptionUtil;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.core.RateLimiter;
 
 import java.security.KeyPair;
 import java.security.SecureRandom;
 
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import static com.comphenix.protocol.PacketType.Login.Client.ENCRYPTION_BEGIN;
@@ -43,16 +19,15 @@ import static com.comphenix.protocol.PacketType.Login.Client.START;
 
 public class ProtocolLibListener extends PacketAdapter {
 
-    public static final String SOURCE_META_KEY = "source";
+    private static final int WORKER_THREADS = 3;
 
     private final FastLoginBukkit plugin;
 
     //just create a new once on plugin enable. This used for verify token generation
     private final SecureRandom random = new SecureRandom();
     private final KeyPair keyPair = EncryptionUtil.generateKeyPair();
-    private final RateLimiter rateLimiter;
 
-    public ProtocolLibListener(FastLoginBukkit plugin, RateLimiter rateLimiter) {
+    public ProtocolLibListener(FastLoginBukkit plugin) {
         //run async in order to not block the server, because we are making api calls to Mojang
         super(params()
                 .plugin(plugin)
@@ -60,57 +35,39 @@ public class ProtocolLibListener extends PacketAdapter {
                 .optionAsync());
 
         this.plugin = plugin;
-        this.rateLimiter = rateLimiter;
     }
 
-    public static void register(FastLoginBukkit plugin, RateLimiter rateLimiter) {
-        // they will be created with a static builder, because otherwise it will throw a NoClassDefFoundError
-        // TODO: make synchronous processing, but do web or database requests async
+    public static void register(FastLoginBukkit plugin) {
+        //they will be created with a static builder, because otherwise it will throw a NoClassDefFoundError
         ProtocolLibrary.getProtocolManager()
                 .getAsynchronousManager()
-                .registerAsyncHandler(new ProtocolLibListener(plugin, rateLimiter))
-                .start();
+                .registerAsyncHandler(new ProtocolLibListener(plugin))
+                .start(WORKER_THREADS);
     }
 
     @Override
     public void onPacketReceiving(PacketEvent packetEvent) {
         if (packetEvent.isCancelled()
-                || plugin.getCore().getAuthPluginHook() == null
+                || plugin.getCore().getAuthPluginHook()== null
                 || !plugin.isServerFullyStarted()) {
             return;
         }
 
-        if (isFastLoginPacket(packetEvent)) {
-            // this is our own packet
-            return;
-        }
-
         Player sender = packetEvent.getPlayer();
         PacketType packetType = packetEvent.getPacketType();
         if (packetType == START) {
-            if (!rateLimiter.tryAcquire()) {
-                plugin.getLog().warn("Simple Anti-Bot join limit - Ignoring {}", sender);
-                return;
-            }
-
             onLogin(packetEvent, sender);
         } else {
             onEncryptionBegin(packetEvent, sender);
         }
     }
 
-    private Boolean isFastLoginPacket(PacketEvent packetEvent) {
-        return packetEvent.getPacket().getMeta(SOURCE_META_KEY)
-                .map(val -> val.equals(plugin.getName()))
-                .orElse(false);
-    }
-
     private void onEncryptionBegin(PacketEvent packetEvent, Player sender) {
         byte[] sharedSecret = packetEvent.getPacket().getByteArrays().read(0);
 
         packetEvent.getAsyncMarker().incrementProcessingDelay();
         Runnable verifyTask = new VerifyResponseTask(plugin, packetEvent, sender, sharedSecret, keyPair);
-        plugin.getScheduler().runAsync(verifyTask);
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, verifyTask);
     }
 
     private void onLogin(PacketEvent packetEvent, Player player) {
@@ -118,22 +75,16 @@ public class ProtocolLibListener extends PacketAdapter {
         String sessionKey = player.getAddress().toString();
 
         //remove old data every time on a new login in order to keep the session only for one person
-        plugin.removeSession(player.getAddress());
+        plugin.getLoginSessions().remove(sessionKey);
 
         //player.getName() won't work at this state
         PacketContainer packet = packetEvent.getPacket();
 
         String username = packet.getGameProfiles().read(0).getName();
-
-        if (packetEvent.getPacket().getMeta("original_name").isPresent()) {
-            //username has been injected by ManualNameChange.java
-            username = (String) packetEvent.getPacket().getMeta("original_name").get();
-        }
-
         plugin.getLog().trace("GameProfile {} with {} connecting", sessionKey, username);
 
         packetEvent.getAsyncMarker().incrementProcessingDelay();
-        Runnable nameCheckTask = new NameCheckTask(plugin, random, player, packetEvent, username, keyPair.getPublic());
-        plugin.getScheduler().runAsync(nameCheckTask);
+        Runnable nameCheckTask = new NameCheckTask(plugin, packetEvent, random, player, username, keyPair.getPublic());
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, nameCheckTask);
     }
 }

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

@@ -1,35 +1,11 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocollib;
 
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import com.github.games647.fastlogin.bukkit.EncryptionUtil;
 import com.github.games647.fastlogin.core.shared.LoginSource;
 
 import java.lang.reflect.InvocationTargetException;
@@ -38,13 +14,15 @@ import java.security.PublicKey;
 import java.util.Arrays;
 import java.util.Random;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.bukkit.entity.Player;
 
 import static com.comphenix.protocol.PacketType.Login.Server.DISCONNECT;
 import static com.comphenix.protocol.PacketType.Login.Server.ENCRYPTION_BEGIN;
 
-class ProtocolLibLoginSource implements LoginSource {
+public class ProtocolLibLoginSource implements LoginSource {
 
+    private final PacketEvent packetEvent;
     private final Player player;
 
     private final Random random;
@@ -53,37 +31,30 @@ class ProtocolLibLoginSource implements LoginSource {
     private final String serverId = "";
     private byte[] verifyToken;
 
-    public ProtocolLibLoginSource(Player player, Random random, PublicKey publicKey) {
+    public ProtocolLibLoginSource(PacketEvent packetEvent, Player player, Random random, PublicKey publicKey) {
+        this.packetEvent = packetEvent;
         this.player = player;
         this.random = random;
         this.publicKey = publicKey;
     }
 
     @Override
-    public void enableOnlinemode() throws InvocationTargetException {
+    public void setOnlineMode() throws Exception {
         verifyToken = EncryptionUtil.generateVerifyToken(random);
 
         /*
-         * Packet Information: https://wiki.vg/Protocol#Encryption_Request
+         * Packet Information: http://wiki.vg/Protocol#Encryption_Request
          *
          * ServerID="" (String) key=public server key verifyToken=random 4 byte array
          */
         PacketContainer newPacket = new PacketContainer(ENCRYPTION_BEGIN);
 
         newPacket.getStrings().write(0, serverId);
-        StructureModifier<PublicKey> keyModifier = newPacket.getSpecificModifier(PublicKey.class);
-        int verifyField = 0;
-        if (keyModifier.getFields().isEmpty()) {
-            // Since 1.16.4 this is now a byte field
-            newPacket.getByteArrays().write(0, publicKey.getEncoded());
-            verifyField++;
-        } else {
-            keyModifier.write(0, publicKey);
-        }
+        newPacket.getSpecificModifier(PublicKey.class).write(0, publicKey);
 
-        newPacket.getByteArrays().write(verifyField, verifyToken);
+        newPacket.getByteArrays().write(0, verifyToken);
 
-        //serverId is an empty string
+        //serverId is a empty string
         ProtocolLibrary.getProtocolManager().sendServerPacket(player, newPacket);
     }
 
@@ -106,7 +77,7 @@ class ProtocolLibLoginSource implements LoginSource {
 
     @Override
     public InetSocketAddress getAddress() {
-        return player.getAddress();
+        return packetEvent.getPlayer().getAddress();
     }
 
     public String getServerId() {
@@ -114,13 +85,14 @@ class ProtocolLibLoginSource implements LoginSource {
     }
 
     public byte[] getVerifyToken() {
-        return verifyToken.clone();
+        return ArrayUtils.clone(verifyToken);
     }
 
     @Override
     public String toString() {
         return this.getClass().getSimpleName() + '{' +
-                "player=" + player +
+                "packetEvent=" + packetEvent +
+                ", player=" + player +
                 ", random=" + random +
                 ", serverId='" + serverId + '\'' +
                 ", verifyToken=" + Arrays.toString(verifyToken) +

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocollib;
 
 import com.comphenix.protocol.reflect.MethodUtils;
@@ -31,9 +6,12 @@ import com.comphenix.protocol.reflect.accessors.MethodAccessor;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedSignedProperty;
-import com.github.games647.craftapi.model.skin.Textures;
+import com.github.games647.craftapi.model.skin.Property;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
+
+import java.lang.reflect.InvocationTargetException;
+
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -41,8 +19,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
 
-import java.lang.reflect.InvocationTargetException;
-
 public class SkinApplyListener implements Listener {
 
     private static final Class<?> GAME_PROFILE = MinecraftReflection.getGameProfileClass();
@@ -63,12 +39,14 @@ public class SkinApplyListener implements Listener {
 
         Player player = loginEvent.getPlayer();
 
-        //go through every session, because player.getAddress is null
-        //loginEvent.getAddress is just a InetAddress not InetSocketAddress, so not unique enough
-        for (BukkitLoginSession session : plugin.getLoginSessions().values()) {
-            if (session.getUsername().equals(player.getName())) {
-                session.getSkin().ifPresent(skin -> applySkin(player, skin.getValue(), skin.getSignature()));
-                break;
+        if (plugin.getConfig().getBoolean("forwardSkin")) {
+            //go through every session, because player.getAddress is null 
+            //loginEvent.getAddress is just a InetAddress not InetSocketAddress, so not unique enough
+            for (BukkitLoginSession session : plugin.getLoginSessions().values()) {
+                if (session.getUsername().equals(player.getName())) {
+                    session.getSkin().ifPresent(skin -> applySkin(player, skin.getValue(), skin.getSignature()));
+                    break;
+                }
             }
         }
     }
@@ -76,14 +54,14 @@ public class SkinApplyListener implements Listener {
     private void applySkin(Player player, String skinData, String signature) {
         WrappedGameProfile gameProfile = WrappedGameProfile.fromPlayer(player);
 
-        WrappedSignedProperty skin = WrappedSignedProperty.fromValues(Textures.KEY, skinData, signature);
+        WrappedSignedProperty skin = WrappedSignedProperty.fromValues(Property.TEXTURE_KEY, skinData, signature);
         try {
-            gameProfile.getProperties().put(Textures.KEY, skin);
+            gameProfile.getProperties().put(Property.TEXTURE_KEY, skin);
         } catch (ClassCastException castException) {
             //Cauldron, MCPC, Thermos, ...
             Object map = GET_PROPERTIES.invoke(gameProfile.getHandle());
             try {
-                MethodUtils.invokeMethod(map, "put", new Object[]{Textures.KEY, skin.getHandle()});
+                MethodUtils.invokeMethod(map, "put", new Object[]{Property.TEXTURE_KEY, skin.getHandle()});
             } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
                 plugin.getLog().error("Error setting premium skin of: {}", player, ex);
             }

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocollib;
 
 import com.comphenix.protocol.ProtocolLibrary;
@@ -31,22 +6,22 @@ import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.server.TemporaryPlayerFactory;
 import com.comphenix.protocol.reflect.FieldUtils;
 import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.github.games647.craftapi.model.auth.Verification;
-import com.github.games647.craftapi.model.skin.SkinProperty;
+import com.github.games647.craftapi.model.skin.Property;
 import com.github.games647.craftapi.resolver.MojangResolver;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
+import com.github.games647.fastlogin.bukkit.EncryptionUtil;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.security.GeneralSecurityException;
-import java.security.Key;
 import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.util.Arrays;
@@ -63,13 +38,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;
-
-    static {
-        ENCRYPTION_CLASS = MinecraftReflection.getMinecraftClass("util." + ENCRYPTION_CLASS_NAME, ENCRYPTION_CLASS_NAME);
-    }
-
     private final FastLoginBukkit plugin;
     private final PacketEvent packetEvent;
     private final KeyPair serverKey;
@@ -78,9 +46,6 @@ public class VerifyResponseTask implements Runnable {
 
     private final byte[] sharedSecret;
 
-    private static Method encryptMethod;
-    private static Method cipherMethod;
-
     public VerifyResponseTask(FastLoginBukkit plugin, PacketEvent packetEvent, Player player,
                               byte[] sharedSecret, KeyPair keyPair) {
         this.plugin = plugin;
@@ -93,15 +58,15 @@ public class VerifyResponseTask implements Runnable {
     @Override
     public void run() {
         try {
-            BukkitLoginSession session = plugin.getSession(player.getAddress());
+            BukkitLoginSession session = plugin.getLoginSessions().get(player.getAddress().toString());
             if (session == null) {
-                disconnect("invalid-request", true
+                disconnect(plugin.getCore().getMessage("invalid-request"), true
                         , "GameProfile {0} tried to send encryption response at invalid state", player.getAddress());
             } else {
                 verifyResponse(session);
             }
         } finally {
-            //this is a fake packet; it shouldn't be sent to the server
+            //this is a fake packet; it shouldn't be send to the server
             synchronized (packetEvent.getAsyncMarker().getProcessingLock()) {
                 packetEvent.setCancelled(true);
             }
@@ -113,16 +78,19 @@ public class VerifyResponseTask implements Runnable {
     private void verifyResponse(BukkitLoginSession session) {
         PrivateKey privateKey = serverKey.getPrivate();
 
+        Cipher cipher;
         SecretKey loginKey;
         try {
-            loginKey = EncryptionUtil.decryptSharedKey(privateKey, sharedSecret);
+            cipher = Cipher.getInstance(privateKey.getAlgorithm());
+
+            loginKey = EncryptionUtil.decryptSharedKey(cipher, privateKey, sharedSecret);
         } catch (GeneralSecurityException securityEx) {
             disconnect("error-kick", false, "Cannot decrypt received contents", securityEx);
             return;
         }
 
         try {
-            if (!checkVerifyToken(session) || !enableEncryption(loginKey)) {
+            if (!checkVerifyToken(session, cipher, privateKey) || !encryptConnection(loginKey)) {
                 return;
             }
         } catch (Exception ex) {
@@ -132,37 +100,33 @@ public class VerifyResponseTask implements Runnable {
 
         String serverId = EncryptionUtil.getServerIdHashString("", loginKey, serverKey.getPublic());
 
-        String requestedUsername = session.getRequestUsername();
+        String username = session.getUsername();
         InetSocketAddress socketAddress = player.getAddress();
         try {
             MojangResolver resolver = plugin.getCore().getResolver();
             InetAddress address = socketAddress.getAddress();
-            Optional<Verification> response = resolver.hasJoined(requestedUsername, serverId, address);
+            Optional<Verification> response = resolver.hasJoined(username, serverId, address);
             if (response.isPresent()) {
                 Verification verification = response.get();
-                plugin.getLog().info("Profile {} has a verified premium account", requestedUsername);
-                String realUsername = verification.getName();
-                if (realUsername == null) {
-                    disconnect("invalid-session", true, "Username field null for {}", requestedUsername);
-                    return;
-                }
+                UUID id = verification.getId();
 
-                SkinProperty[] properties = verification.getProperties();
+                plugin.getLog().info("GameProfile {} with {} has a verified premium account", username, id);
+
+                Property[] properties = verification.getProperties();
                 if (properties.length > 0) {
                     session.setSkinProperty(properties[0]);
                 }
 
-                session.setVerifiedUsername(realUsername);
-                session.setUuid(verification.getId());
+                session.setUuid(id);
                 session.setVerified(true);
 
                 setPremiumUUID(session.getUuid());
-                receiveFakeStartPacket(realUsername);
+                receiveFakeStartPacket(username);
             } else {
-                //user tried to fake an authentication
-                disconnect("invalid-session", true
+                //user tried to fake a authentication
+                disconnect(plugin.getCore().getMessage("invalid-session"), true
                         , "GameProfile {0} ({1}) tried to log in with an invalid session ServerId: {2}"
-                        , session.getRequestUsername(), socketAddress, serverId);
+                        , session.getUsername(), socketAddress, serverId);
             }
         } catch (IOException ioEx) {
             disconnect("error-kick", false, "Failed to connect to session server", ioEx);
@@ -170,7 +134,19 @@ public class VerifyResponseTask implements Runnable {
     }
 
     private void setPremiumUUID(UUID premiumUUID) {
-        if (plugin.getConfig().getBoolean("premiumUuid") && premiumUUID != null) {
+        boolean uuidEnabled = plugin.getConfig().getBoolean("premiumUuid");
+        plugin.getLog().info("Setting UUID {} based on config: {}", premiumUUID, uuidEnabled);
+        try {
+            Object networkManager = getNetworkManager();
+            Field uuidField = FieldUtils.getField(networkManager.getClass(), "spoofedUUID");
+            Object oldValue = uuidField.get(player);
+
+            plugin.getLog().info("spoofed UUID field exits? {} with {}", uuidField, oldValue);
+        } catch (ReflectiveOperationException e) {
+            plugin.getLog().error("Failed to query field of {}", player);
+        }
+
+        if (uuidEnabled && premiumUUID != null) {
             try {
                 Object networkManager = getNetworkManager();
                 //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/NetworkManager.java#L69
@@ -181,17 +157,18 @@ public class VerifyResponseTask implements Runnable {
         }
     }
 
-    private boolean checkVerifyToken(BukkitLoginSession session) throws GeneralSecurityException {
+    private boolean checkVerifyToken(BukkitLoginSession session, Cipher cipher, PrivateKey privateKey)
+            throws GeneralSecurityException {
         byte[] requestVerify = session.getVerifyToken();
         //encrypted verify token
         byte[] responseVerify = packetEvent.getPacket().getByteArrays().read(1);
 
         //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L182
-        if (!Arrays.equals(requestVerify, EncryptionUtil.decrypt(serverKey.getPrivate(), responseVerify))) {
-            //check if the verify-token are equal to the server sent one
-            disconnect("invalid-verify-token", true
+        if (!Arrays.equals(requestVerify, EncryptionUtil.decrypt(cipher, privateKey, responseVerify))) {
+            //check if the verify token are equal to the server sent one
+            disconnect(plugin.getCore().getMessage("invalid-verify-token"), true
                     , "GameProfile {0} ({1}) tried to login with an invalid verify token. Server: {2} Client: {3}"
-                    , session.getRequestUsername(), packetEvent.getPlayer().getAddress(), requestVerify, responseVerify);
+                    , session.getUsername(), packetEvent.getPlayer().getAddress(), requestVerify, responseVerify);
             return false;
         }
 
@@ -202,48 +179,24 @@ public class VerifyResponseTask implements Runnable {
     private Object getNetworkManager() throws IllegalAccessException, ClassNotFoundException {
         Object injectorContainer = TemporaryPlayerFactory.getInjectorFromPlayer(player);
 
-        // ChannelInjector
+        //ChannelInjector
         Class<?> injectorClass = Class.forName("com.comphenix.protocol.injector.netty.Injector");
         Object rawInjector = FuzzyReflection.getFieldValue(injectorContainer, injectorClass, true);
         return FieldUtils.readField(rawInjector, "networkManager", true);
     }
 
-    private boolean enableEncryption(SecretKey loginKey) throws IllegalArgumentException {
-        plugin.getLog().info("Enabling onlinemode encryption for {}", player.getAddress());
-        // Initialize method reflections
-        if (encryptMethod == null) {
-            Class<?> networkManagerClass = MinecraftReflection.getNetworkManagerClass();
-
-            try {
-                // Try to get the old (pre MC 1.16.4) encryption method
-                encryptMethod = 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);
-
-                // Get the needed Cipher helper method (used to generate ciphers from login key)
-                cipherMethod = FuzzyReflection.fromClass(ENCRYPTION_CLASS)
-                        .getMethodByParameters("a", int.class, Key.class);
-            }
-        }
-
+    private boolean encryptConnection(SecretKey loginKey) throws IllegalArgumentException {
         try {
-            Object networkManager = this.getNetworkManager();
+            //get the NMS connection handle of this player
+            Object networkManager = getNetworkManager();
 
-            // If cipherMethod is null - use old encryption (pre MC 1.16.4), otherwise use the new cipher one
-            if (cipherMethod == null) {
-                // Encrypt/decrypt packet flow, this behaviour is expected by the client
-                encryptMethod.invoke(networkManager, loginKey);
-            } else {
-                // Create ciphers from login key
-                Object decryptionCipher = cipherMethod.invoke(null, Cipher.DECRYPT_MODE, loginKey);
-                Object encryptionCipher = cipherMethod.invoke(null, Cipher.ENCRYPT_MODE, loginKey);
+            //try to detect the method by parameters
+            Method encryptMethod = FuzzyReflection
+                    .fromObject(networkManager).getMethodByParameters("a", SecretKey.class);
 
-                // Encrypt/decrypt packet flow, this behaviour is expected by the client
-                encryptMethod.invoke(networkManager, decryptionCipher, encryptionCipher);
-            }
+            //encrypt/decrypt following packets
+            //the client expects this behaviour
+            encryptMethod.invoke(networkManager, loginKey);
         } catch (Exception ex) {
             disconnect("error-kick", false, "Couldn't enable encryption", ex);
             return false;
@@ -252,14 +205,14 @@ public class VerifyResponseTask implements Runnable {
         return true;
     }
 
-    private void disconnect(String reasonKey, boolean debug, String logMessage, Object... arguments) {
+    private void disconnect(String kickReason, boolean debug, String logMessage, Object... arguments) {
         if (debug) {
             plugin.getLog().debug(logMessage, arguments);
         } else {
             plugin.getLog().error(logMessage, arguments);
         }
 
-        kickPlayer(plugin.getCore().getMessage(reasonKey));
+        kickPlayer(plugin.getCore().getMessage(kickReason));
     }
 
     private void kickPlayer(String reason) {
@@ -286,8 +239,7 @@ public class VerifyResponseTask implements Runnable {
         startPacket.getGameProfiles().write(0, fakeProfile);
         try {
             //we don't want to handle our own packets so ignore filters
-            startPacket.setMeta(ProtocolLibListener.SOURCE_META_KEY, plugin.getName());
-            ProtocolLibrary.getProtocolManager().recieveClientPacket(player, startPacket, true);
+            ProtocolLibrary.getProtocolManager().recieveClientPacket(player, startPacket, false);
         } catch (InvocationTargetException | IllegalAccessException ex) {
             plugin.getLog().warn("Failed to fake a new start packet for: {}", username, ex);
             //cancel the event in order to prevent the server receiving an invalid packet

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocolsupport;
 
 import com.github.games647.fastlogin.core.shared.LoginSource;
@@ -40,7 +15,7 @@ public class ProtocolLoginSource implements LoginSource {
     }
 
     @Override
-    public void enableOnlinemode() {
+    public void setOnlineMode() {
         loginStartEvent.setOnlineMode(true);
     }
 
@@ -51,7 +26,7 @@ public class ProtocolLoginSource implements LoginSource {
 
     @Override
     public InetSocketAddress getAddress() {
-        return loginStartEvent.getConnection().getRawAddress();
+        return loginStartEvent.getAddress();
     }
 
     public PlayerLoginStartEvent getLoginStartEvent() {

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

@@ -1,61 +1,29 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocolsupport;
 
-import com.github.games647.craftapi.UUIDAdapter;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.event.BukkitFastLoginPreLoginEvent;
-import com.github.games647.fastlogin.core.RateLimiter;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
 
 import java.net.InetSocketAddress;
-import java.util.Optional;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import protocolsupport.api.events.ConnectionCloseEvent;
+import protocolsupport.api.events.PlayerLoginFinishEvent;
 import protocolsupport.api.events.PlayerLoginStartEvent;
-import protocolsupport.api.events.PlayerProfileCompleteEvent;
 
 public class ProtocolSupportListener extends JoinManagement<Player, CommandSender, ProtocolLoginSource>
         implements Listener {
 
     private final FastLoginBukkit plugin;
-    private final RateLimiter rateLimiter;
 
-    public ProtocolSupportListener(FastLoginBukkit plugin, RateLimiter rateLimiter) {
-        super(plugin.getCore(), plugin.getCore().getAuthPluginHook(), plugin.getBedrockService());
+    public ProtocolSupportListener(FastLoginBukkit plugin) {
+        super(plugin.getCore(), plugin.getCore().getAuthPluginHook());
 
         this.plugin = plugin;
-        this.rateLimiter = rateLimiter;
     }
 
     @EventHandler
@@ -64,66 +32,54 @@ public class ProtocolSupportListener extends JoinManagement<Player, CommandSende
             return;
         }
 
-        if (!rateLimiter.tryAcquire()) {
-            plugin.getLog().warn("Simple Anti-Bot join limit - Ignoring {}", loginStartEvent.getConnection());
-            return;
-        }
-
-        String username = loginStartEvent.getConnection().getProfile().getName();
-        InetSocketAddress address = loginStartEvent.getConnection().getRawAddress();
+        String username = loginStartEvent.getName();
+        InetSocketAddress address = loginStartEvent.getAddress();
 
         //remove old data every time on a new login in order to keep the session only for one person
-        plugin.removeSession(address);
+        plugin.getLoginSessions().remove(address.toString());
 
-        ProtocolLoginSource source = new ProtocolLoginSource(loginStartEvent);
-        super.onLogin(username, source);
+        super.onLogin(username, new ProtocolLoginSource(loginStartEvent));
     }
 
     @EventHandler
     public void onConnectionClosed(ConnectionCloseEvent closeEvent) {
-        InetSocketAddress address = closeEvent.getConnection().getRawAddress();
-        plugin.removeSession(address);
+        InetSocketAddress address = closeEvent.getConnection().getAddress();
+        plugin.getLoginSessions().remove(address.toString());
     }
 
     @EventHandler
-    public void onPropertiesResolve(PlayerProfileCompleteEvent profileCompleteEvent) {
-        InetSocketAddress address = profileCompleteEvent.getConnection().getRawAddress();
-
-        BukkitLoginSession session = plugin.getSession(address);
-
-        if (session != null && profileCompleteEvent.getConnection().getProfile().isOnlineMode()) {
-            session.setVerified(true);
-
-            if (!plugin.getConfig().getBoolean("premiumUuid")) {
-                String username = Optional.ofNullable(profileCompleteEvent.getForcedName())
-                        .orElse(profileCompleteEvent.getConnection().getProfile().getName());
-                profileCompleteEvent.setForcedUUID(UUIDAdapter.generateOfflineId(username));
-            }
+    public void onPropertiesResolve(PlayerLoginFinishEvent loginFinishEvent) {
+        if (!loginFinishEvent.isOnlineMode()) {
+            return;
         }
-    }
 
-    @Override
-    public FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, ProtocolLoginSource source, StoredProfile profile) {
-        BukkitFastLoginPreLoginEvent event = new BukkitFastLoginPreLoginEvent(username, source, profile);
-        plugin.getServer().getPluginManager().callEvent(event);
-        return event;
+        InetSocketAddress address = loginFinishEvent.getAddress();
+        BukkitLoginSession session = plugin.getLoginSessions().get(address.toString());
+
+        if (session != null) {
+            session.setVerified(true);
+        }
     }
 
     @Override
     public void requestPremiumLogin(ProtocolLoginSource source, StoredProfile profile, String username
             , boolean registered) {
-        source.enableOnlinemode();
+        source.setOnlineMode();
 
         String ip = source.getAddress().getAddress().getHostAddress();
         plugin.getCore().getPendingLogin().put(ip + username, new Object());
 
-        BukkitLoginSession playerSession = new BukkitLoginSession(username, registered, profile);
-        plugin.putSession(source.getAddress(), playerSession);
+        BukkitLoginSession playerSession = new BukkitLoginSession(username, null, null
+                , registered, profile);
+        plugin.getLoginSessions().put(source.getAddress().toString(), playerSession);
+        if (plugin.getConfig().getBoolean("premiumUuid")) {
+            source.getLoginStartEvent().setUseOnlineModeUUID(true);
+        }
     }
 
     @Override
     public void startCrackedSession(ProtocolLoginSource source, StoredProfile profile, String username) {
         BukkitLoginSession loginSession = new BukkitLoginSession(username, profile);
-        plugin.putSession(source.getAddress(), loginSession);
+        plugin.getLoginSessions().put(source.getAddress().toString(), loginSession);
     }
 }

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.task;
 
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
@@ -32,7 +7,6 @@ import com.github.games647.fastlogin.bukkit.hook.LogItHook;
 import com.github.games647.fastlogin.bukkit.hook.LoginSecurityHook;
 import com.github.games647.fastlogin.bukkit.hook.UltraAuthHook;
 import com.github.games647.fastlogin.bukkit.hook.xAuthHook;
-import com.github.games647.fastlogin.bukkit.hook.SodionAuthHook;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
 import java.lang.reflect.Constructor;
@@ -54,7 +28,7 @@ public class DelayedAuthHook implements Runnable {
     @Override
     public void run() {
         boolean hookFound = isHookFound();
-        if (plugin.getBungeeManager().isEnabled()) {
+        if (plugin.isBungeeEnabled()) {
             plugin.getLog().info("BungeeCord setting detected. No auth plugin is required");
         } else if (!hookFound) {
             plugin.getLog().warn("No auth plugin were found by this plugin "
@@ -64,7 +38,7 @@ public class DelayedAuthHook implements Runnable {
         }
 
         if (hookFound) {
-            plugin.markInitialized();
+            plugin.setServerStarted();
         }
     }
 
@@ -94,13 +68,13 @@ public class DelayedAuthHook implements Runnable {
 
     private AuthPlugin<Player> getAuthHook() {
         try {
+            @SuppressWarnings("unchecked")
             List<Class<? extends AuthPlugin<Player>>> hooks = Arrays.asList(AuthMeHook.class,
-                    CrazyLoginHook.class, LogItHook.class, LoginSecurityHook.class,
-                    SodionAuthHook.class, UltraAuthHook.class, xAuthHook.class);
+                    CrazyLoginHook.class, LogItHook.class, LoginSecurityHook.class, UltraAuthHook.class,
+                    xAuthHook.class);
 
             for (Class<? extends AuthPlugin<Player>> clazz : hooks) {
-                String pluginName = clazz.getSimpleName();
-                pluginName = pluginName.substring(0, pluginName.length() - "Hook".length());
+                String pluginName = clazz.getSimpleName().replace("Hook", "");
                 //uses only member classes which uses AuthPlugin interface (skip interfaces)
                 if (Bukkit.getPluginManager().isPluginEnabled(pluginName)) {
                     //check only for enabled plugins. A single plugin could be disabled by plugin managers

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

@@ -1,72 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.task;
-
-import java.net.InetSocketAddress;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.geysermc.floodgate.api.player.FloodgatePlayer;
-
-import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.github.games647.fastlogin.core.shared.FloodgateManagement;
-
-public class FloodgateAuthTask extends FloodgateManagement<Player, CommandSender, BukkitLoginSession, FastLoginBukkit> {
-
-    public FloodgateAuthTask(FastLoginCore<Player, CommandSender, FastLoginBukkit> core, Player player, FloodgatePlayer floodgatePlayer) {
-        super(core, player, floodgatePlayer);
-    }
-
-    @Override
-    protected void startLogin() {
-        BukkitLoginSession session = new BukkitLoginSession(player.getName(), isRegistered, profile);
-
-        // enable auto login based on the value of 'autoLoginFloodgate' in config.yml
-        session.setVerified(autoLoginFloodgate.equals("true")
-                || (autoLoginFloodgate.equals("linked") && isLinked));
-
-        // run login task
-        Runnable forceLoginTask = new ForceLoginTask(core.getPlugin().getCore(), player, session);
-        Bukkit.getScheduler().runTaskAsynchronously(core.getPlugin(), forceLoginTask);
-    }
-
-    protected String getName(Player player) {
-        return player.getName();
-    }
-
-    protected UUID getUUID(Player player) {
-        return player.getUniqueId();
-    }
-
-    protected InetSocketAddress getAddress(Player player) {
-        return player.getAddress();
-    }
-
-}

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

@@ -1,40 +1,12 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.task;
 
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.event.BukkitFastLoginAutoLoginEvent;
 import com.github.games647.fastlogin.core.PremiumStatus;
-import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.message.SuccessMessage;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.ForceLoginManagement;
 import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
 
 import java.util.concurrent.ExecutionException;
 
@@ -45,44 +17,35 @@ import org.bukkit.metadata.FixedMetadataValue;
 
 public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender, BukkitLoginSession, FastLoginBukkit> {
 
-    public ForceLoginTask(FastLoginCore<Player, CommandSender, FastLoginBukkit> core, Player player,
-                          BukkitLoginSession session) {
-        super(core, player, session);
+    public ForceLoginTask(FastLoginCore<Player, CommandSender, FastLoginBukkit> core, Player player) {
+        super(core, player, getSession(core.getPlugin(), player));
+    }
+
+    private static BukkitLoginSession getSession(FastLoginBukkit plugin, Player player) {
+        //remove the bungeecord identifier if there is ones
+        String id = '/' + player.getAddress().getAddress().getHostAddress() + ':' + player.getAddress().getPort();
+        return plugin.getLoginSessions().remove(id);
     }
 
     @Override
     public void run() {
-        // block this target player for BungeeCord ID brute force attacks
+        //blacklist this target player for BungeeCord ID brute force attacks
         FastLoginBukkit plugin = core.getPlugin();
         player.setMetadata(core.getPlugin().getName(), new FixedMetadataValue(plugin, true));
 
-        if (session != null && !session.getUsername().equals(player.getName())) {
-            String playerName = player.getName();
-            plugin.getLog().warn("Player username {} is not matching session {}", playerName, session.getUsername());
-            return;
-        }
-
         super.run();
 
-        PremiumStatus status = PremiumStatus.CRACKED;
         if (isOnlineMode()) {
-            status = PremiumStatus.PREMIUM;
+            plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.PREMIUM);
+        } else {
+            plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
         }
-
-        plugin.getPremiumPlayers().put(player.getUniqueId(), status);
-    }
-
-    @Override
-    public FastLoginAutoLoginEvent callFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile) {
-        BukkitFastLoginAutoLoginEvent event = new BukkitFastLoginAutoLoginEvent(session, profile);
-        core.getPlugin().getServer().getPluginManager().callEvent(event);
-        return event;
     }
 
     @Override
     public void onForceActionSuccess(LoginSession session) {
-        if (core.getPlugin().getBungeeManager().isEnabled()) {
-            core.getPlugin().getBungeeManager().sendPluginMessage(player, new SuccessMessage());
+        if (core.getPlugin().isBungeeEnabled()) {
+            core.getPlugin().sendPluginMessage(player, new SuccessMessage());
         }
     }
 
@@ -104,6 +67,6 @@ public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender,
 
     @Override
     public boolean isOnlineMode() {
-        return session.isVerified();
+        return session.isVerified() && player.getName().equals(session.getUsername());
     }
 }

bukkit/src/main/resources/plugin.yml

@@ -1,4 +1,4 @@
-# project data for Bukkit in order to register our plugin with all it's components
+# project data for Bukkit in order to register our plugin with all it components
 # ${-} are variables from Maven (pom.xml) which will be replaced after the build
 name: ${project.parent.name}
 version: ${project.version}-${git.commit.id.abbrev}
@@ -11,26 +11,14 @@ description: |
 website: ${project.url}
 dev-url: ${project.url}
 
-# This plugin doesn't have to be transformed for compatibility with Minecraft >= 1.13
-api-version: '1.13'
+# Load the plugin as early as possible to inject it for all players
+load: STARTUP
 
 softdepend:
-    # We depend on either ProtocolLib or ProtocolSupport
+    # We depend either ProtocolLib or ProtocolSupport
     - ProtocolSupport
     - ProtocolLib
-    # Premium variable
     - PlaceholderAPI
-    # Bedrock Player Bridge
-    - Geyser-Spigot
-    - floodgate
-    # Auth plugins
-    - AuthMe
-    - LoginSecurity
-    - SodionAuth
-    - xAuth
-    - LogIt
-    - UltraAuth
-    - CrazyLogin
 
 commands:
     ${project.parent.name}:
@@ -40,7 +28,7 @@ commands:
         permission: ${project.artifactId}.command.premium
 
     cracked:
-        description: 'Label the invoker or the player specified as cracked if marked premium before'
+        description: 'Label the invoker or the player specified as cracked if he was marked premium before'
         aliases: [unpremium]
         usage: /<command> [player]
         permission: ${project.artifactId}.command.cracked

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

@@ -0,0 +1,42 @@
+package com.github.games647.fastlogin.bukkit;
+
+import java.security.SecureRandom;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+
+import static org.junit.Assert.assertThat;
+
+public class EncryptionUtilTest {
+
+    @Test
+    public void testVerifyToken() throws Exception {
+        SecureRandom random = new SecureRandom();
+        byte[] token = EncryptionUtil.generateVerifyToken(random);
+
+        assertThat(token, notNullValue());
+        assertThat(token.length, is(4));
+    }
+
+    // @Test
+    // public void testDecryptSharedSecret() throws Exception {
+    //
+    // }
+    //
+    // @Test
+    // public void testDecryptData() throws Exception {
+    //
+    // }
+
+    // private static SecretKey createNewSharedKey() {
+    //     try {
+    //         KeyGenerator keygenerator = KeyGenerator.getInstance("AES");
+    //         keygenerator.init(128);
+    //         return keygenerator.generateKey();
+    //     } catch (NoSuchAlgorithmException nosuchalgorithmexception) {
+    //         throw new Error(nosuchalgorithmexception);
+    //     }
+    // }
+}

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

@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bukkit.listener.protocollib;
-
-import java.security.SecureRandom;
-
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class EncryptionUtilTest {
-
-    @Test
-    public void testVerifyToken() {
-        SecureRandom random = new SecureRandom();
-        byte[] token = EncryptionUtil.generateVerifyToken(random);
-
-        assertThat(token, notNullValue());
-        assertThat(token.length, is(4));
-    }
-}

bungee/pom.xml

@@ -1,32 +1,5 @@
-<!--
-
-    SPDX-License-Identifier: MIT
-
-    The MIT License (MIT)
-
-    Copyright (c) 2015-2021 <Your name 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.
-
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -36,7 +9,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <!--This has to be in lowercase because it's used by plugin.yml-->
+    <!--This have to be in lowercase because it's used by plugin.yml-->
     <artifactId>fastlogin.bungee</artifactId>
     <packaging>jar</packaging>
 
@@ -48,7 +21,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.1.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
@@ -57,7 +30,6 @@
                             <!--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>
@@ -70,11 +42,6 @@
                             <shadedPattern>fastlogin.slf4j</shadedPattern>
                         </relocation>
                     </relocations>
-                    <!-- Rename the service file too to let SLF4J api find our own relocated jdk logger -->
-                    <!-- Located in META-INF/services -->
-                    <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                    </transformers>
                 </configuration>
                 <executions>
                     <execution>
@@ -89,22 +56,14 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>vik1395-repo</id>
+            <url>https://vik1395.github.io/repo.vik1395.me/repositories</url>
+        </repository>
+
         <repository>
             <id>codemc-repo</id>
-            <url>https://repo.codemc.io/repository/maven-public/</url>
-        </repository>
-
-        <repository>
-            <id>spigotplugins-repo</id>
-            <url>https://maven.gamestrike.de/mvn/</url>
-        </repository>
-
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
     </repositories>
 
@@ -120,54 +79,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-proxy</artifactId>
-            <version>1.18-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-            <!-- Use our own newer api version -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!--Floodgate for Xbox Live Authentication-->
-        <dependency>
-            <groupId>org.geysermc.floodgate</groupId>
-            <artifactId>api</artifactId>
-            <version>${floodgate.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.geysermc.cumulus</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Bedrock player bridge -->
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>core</artifactId>
-            <version>${geyser.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- We need the API, but it was excluded above -->
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>geyser-api</artifactId>
-            <version>${geyser.version}</version>
+            <version>1.12-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -176,14 +88,6 @@
             <groupId>me.vik1395</groupId>
             <artifactId>BungeeAuth</artifactId>
             <version>1.4</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/BungeeAuth-1.4.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>de.xxschrandxx.bca</groupId>
-            <artifactId>BungeeCordAuthenticator</artifactId>
-            <version>0.0.2</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -192,19 +96,5 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <dependency>
-            <groupId>com.github.Mohist-Community.SodionAuth</groupId>
-            <artifactId>SodionAuth-Bungee</artifactId>
-            <version>2bdfdc854b</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.Mohist-Community.SodionAuth</groupId>
-                    <artifactId>SodionAuth-Libs</artifactId>
-                </exclusion>
-            </exclusions>
-            <optional>true</optional>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee;
 
 import com.github.games647.fastlogin.core.StoredProfile;
@@ -37,28 +12,28 @@ public class BungeeLoginSession extends LoginSession {
         super(username, registered, profile);
     }
 
-    public synchronized void setRegistered(boolean registered) {
+    public void setRegistered(boolean registered) {
         this.registered = registered;
     }
 
-    public synchronized boolean isAlreadySaved() {
+    public boolean isAlreadySaved() {
         return alreadySaved;
     }
 
-    public synchronized void setAlreadySaved(boolean alreadySaved) {
+    public void setAlreadySaved(boolean alreadySaved) {
         this.alreadySaved = alreadySaved;
     }
 
-    public synchronized boolean isAlreadyLogged() {
+    public boolean isAlreadyLogged() {
         return alreadyLogged;
     }
 
-    public synchronized void setAlreadyLogged(boolean alreadyLogged) {
+    public void setAlreadyLogged(boolean alreadyLogged) {
         this.alreadyLogged = alreadyLogged;
     }
 
     @Override
-    public synchronized String toString() {
+    public String toString() {
         return this.getClass().getSimpleName() + '{' +
                 "alreadySaved=" + alreadySaved +
                 ", alreadyLogged=" + alreadyLogged +

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

@@ -1,64 +1,28 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee;
 
 import com.github.games647.fastlogin.core.shared.LoginSource;
 
 import java.net.InetSocketAddress;
 
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.PendingConnection;
-import net.md_5.bungee.api.event.PreLoginEvent;
 
 public class BungeeLoginSource implements LoginSource {
 
     private final PendingConnection connection;
-    private final PreLoginEvent preLoginEvent;
 
-    public BungeeLoginSource(PendingConnection connection, PreLoginEvent preLoginEvent) {
+    public BungeeLoginSource(PendingConnection connection) {
         this.connection = connection;
-        this.preLoginEvent = preLoginEvent;
     }
 
     @Override
-    public void enableOnlinemode() {
+    public void setOnlineMode() {
         connection.setOnlineMode(true);
     }
 
     @Override
     public void kick(String message) {
-        preLoginEvent.setCancelled(true);
-
-        if (message == null) {
-            preLoginEvent.setCancelReason(new ComponentBuilder("Kicked").color(ChatColor.WHITE).create());
-        } else {
-            preLoginEvent.setCancelReason(TextComponent.fromLegacyText(message));
-        }
+        connection.disconnect(TextComponent.fromLegacyText(message));
     }
 
     @Override

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

@@ -1,45 +1,10 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee;
 
 import com.github.games647.fastlogin.bungee.hook.BungeeAuthHook;
-import com.github.games647.fastlogin.bungee.hook.BungeeCordAuthenticatorBungeeHook;
-import com.github.games647.fastlogin.bungee.hook.SodionAuthHook;
 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.bungee.listener.MessageListener;
 import com.github.games647.fastlogin.core.CommonUtil;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-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;
-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.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.PlatformPlugin;
 import com.google.common.collect.MapMaker;
@@ -48,8 +13,6 @@ import com.google.common.io.ByteStreams;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ThreadFactory;
 
@@ -59,11 +22,8 @@ import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.connection.Server;
 import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.api.plugin.PluginManager;
 import net.md_5.bungee.api.scheduler.GroupedThreadFactory;
 
-import org.geysermc.floodgate.api.FloodgateApi;
-import org.geysermc.geyser.GeyserImpl;
 import org.slf4j.Logger;
 
 /**
@@ -74,15 +34,11 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
     private final ConcurrentMap<PendingConnection, BungeeLoginSession> session = new MapMaker().weakKeys().makeMap();
 
     private FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core;
-    private AsyncScheduler scheduler;
-    private FloodgateService floodgateService;
-    private GeyserService geyserService;
     private Logger logger;
 
     @Override
     public void onEnable() {
-        logger = CommonUtil.initializeLoggerService(getLogger());
-        scheduler = new AsyncScheduler(logger, getThreadFactory());
+        logger = CommonUtil.createLoggerFromJDK(getLogger());
 
         core = new FastLoginCore<>(this);
         core.load();
@@ -90,24 +46,12 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
             return;
         }
 
-        if (isPluginInstalled("floodgate")) {
-            floodgateService = new FloodgateService(FloodgateApi.getInstance(), core);
-        }
-
-        if (isPluginInstalled("Geyser-BungeeCord")) {
-            geyserService = new GeyserService(GeyserImpl.getInstance(), core);
-        }
-
         //events
-        PluginManager pluginManager = getProxy().getPluginManager();
+        getProxy().getPluginManager().registerListener(this, new ConnectListener(this));
+        getProxy().getPluginManager().registerListener(this, new MessageListener(this));
 
-        ConnectListener connectListener = new ConnectListener(this, core.getRateLimiter());
-        pluginManager.registerListener(this, connectListener);
-        pluginManager.registerListener(this, new PluginMessageListener(this));
-
-        //this is required to listen to incoming messages from the server
-        getProxy().registerChannel(NamespaceKey.getCombined(getName(), ChangePremiumMessage.CHANGE_CHANNEL));
-        getProxy().registerChannel(NamespaceKey.getCombined(getName(), SuccessMessage.SUCCESS_CHANNEL));
+        //this is required to listen to messages from the server
+        getProxy().registerChannel(getName());
 
         registerHook();
     }
@@ -128,34 +72,20 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
     }
 
     private void registerHook() {
-        try {
-            List<Class<? extends AuthPlugin<ProxiedPlayer>>> hooks = Arrays.asList(
-                    BungeeAuthHook.class, BungeeCordAuthenticatorBungeeHook.class, SodionAuthHook.class);
-
-            for (Class<? extends AuthPlugin<ProxiedPlayer>> clazz : hooks) {
-                String pluginName = clazz.getSimpleName();
-                pluginName = pluginName.substring(0, pluginName.length() - "Hook".length());
-                //uses only member classes which uses AuthPlugin interface (skip interfaces)
-                Plugin plugin = getProxy().getPluginManager().getPlugin(pluginName);
-                if (plugin != null) {
-                    logger.info("Hooking into auth plugin: {}", pluginName);
-                    core.setAuthPluginHook(
-                            clazz.getDeclaredConstructor(FastLoginBungee.class).newInstance(this));
-                    break;
-                }
-            }
-        } catch (ReflectiveOperationException ex) {
-            logger.error("Couldn't load the auth hook class", ex);
+        Plugin plugin = getProxy().getPluginManager().getPlugin("BungeeAuth");
+        if (plugin != null) {
+            core.setAuthPluginHook(new BungeeAuthHook());
+            logger.info("Hooked into BungeeAuth");
         }
     }
 
     public void sendPluginMessage(Server server, ChannelMessage message) {
         if (server != null) {
             ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
-            message.writeTo(dataOutput);
+            dataOutput.writeUTF(message.getChannelName());
 
-            NamespaceKey channel = new NamespaceKey(getName(), message.getChannelName());
-            server.sendData(channel.getCombinedName(), dataOutput.toByteArray());
+            message.writeTo(dataOutput);
+            server.sendData(core.getPlugin().getName(), dataOutput.toByteArray());
         }
     }
 
@@ -183,36 +113,10 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
     @SuppressWarnings("deprecation")
     public ThreadFactory getThreadFactory() {
         return new ThreadFactoryBuilder()
-                .setNameFormat(getName() + " Pool Thread #%1$d")
+                .setNameFormat(core.getPlugin().getName() + " Database Pool Thread #%1$d")
                 //Hikari create daemons by default
                 .setDaemon(true)
                 .setThreadFactory(new GroupedThreadFactory(this, getName()))
                 .build();
     }
-
-    @Override
-    public AsyncScheduler getScheduler() {
-        return scheduler;
-    }
-
-    @Override
-    public boolean isPluginInstalled(String name) {
-        return getProxy().getPluginManager().getPlugin(name) != null;
-    }
-
-    public FloodgateService getFloodgateService() {
-        return floodgateService;
-    }
-
-    public GeyserService getGeyserService() {
-        return geyserService;
-    }
-
-    @Override
-    public BedrockService<?> getBedrockService() {
-        if (floodgateService != null) {
-            return floodgateService;
-        }
-        return geyserService;
-    }
 }

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

@@ -1,64 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
-import net.md_5.bungee.api.plugin.Cancellable;
-import net.md_5.bungee.api.plugin.Event;
-
-public class BungeeFastLoginAutoLoginEvent extends Event implements FastLoginAutoLoginEvent, Cancellable {
-
-    private final LoginSession session;
-    private final StoredProfile profile;
-    private boolean cancelled;
-
-    public BungeeFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile) {
-        this.session = session;
-        this.profile = profile;
-    }
-
-    @Override
-    public LoginSession getSession() {
-        return session;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}

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

@@ -1,59 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSource;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
-import net.md_5.bungee.api.plugin.Event;
-
-public class BungeeFastLoginPreLoginEvent extends Event implements FastLoginPreLoginEvent {
-
-    private final String username;
-    private final LoginSource source;
-    private final StoredProfile profile;
-
-    public BungeeFastLoginPreLoginEvent(String username, LoginSource source, StoredProfile profile) {
-        this.username = username;
-        this.source = source;
-        this.profile = profile;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public LoginSource getSource() {
-        return source;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-}

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

@@ -1,52 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent;
-
-import net.md_5.bungee.api.plugin.Event;
-
-public class BungeeFastLoginPremiumToggleEvent extends Event implements FastLoginPremiumToggleEvent {
-
-    private final StoredProfile profile;
-    private final PremiumToggleReason reason;
-
-    public BungeeFastLoginPremiumToggleEvent(StoredProfile profile, PremiumToggleReason reason) {
-        this.profile = profile;
-        this.reason = reason;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-
-    @Override
-    public PremiumToggleReason getReason() {
-        return reason;
-    }
-}

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

@@ -1,31 +1,5 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.hook;
 
-import com.github.games647.fastlogin.bungee.FastLoginBungee;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
 import me.vik1395.BungeeAuth.Main;
@@ -44,9 +18,6 @@ public class BungeeAuthHook implements AuthPlugin<ProxiedPlayer> {
 
     private final RequestHandler requestHandler = new RequestHandler();
 
-    public BungeeAuthHook(FastLoginBungee plugin) {
-    }
-
     @Override
     public boolean forceLogin(ProxiedPlayer player) {
         String playerName = player.getName();

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

@@ -1,92 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.hook;
-
-import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-
-import de.xxschrandxx.bca.bungee.BungeeCordAuthenticatorBungee;
-import de.xxschrandxx.bca.bungee.api.BungeeCordAuthenticatorBungeeAPI;
-
-import java.sql.SQLException;
-import java.util.logging.Level;
-
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-
-/**
- * GitHub:
- * https://github.com/xXSchrandXx/SpigotPlugins/tree/master/BungeeCordAuthenticator
- * <p>
- * Project page:
- * <p>
- * Spigot: https://www.spigotmc.org/resources/bungeecordauthenticator.87669/
- */
-public class BungeeCordAuthenticatorBungeeHook implements AuthPlugin<ProxiedPlayer> {
-
-    public final BungeeCordAuthenticatorBungeeAPI api;
-
-    public BungeeCordAuthenticatorBungeeHook(FastLoginBungee plugin) {
-        api = ((BungeeCordAuthenticatorBungee) plugin.getProxy().getPluginManager()
-            .getPlugin("BungeeCordAuthenticatorBungee")).getAPI();
-        plugin.getLog().info("BungeeCordAuthenticatorHook | Hooked successful!");
-    }
-
-    @Override
-    public boolean forceLogin(ProxiedPlayer player) {
-        if (api.isAuthenticated(player)) {
-            return true;
-        }
-
-        try {
-            api.setAuthenticated(player);
-        } catch (SQLException sqlEx) {
-            api.getLogger().log(Level.WARNING, "Failed to force login", sqlEx);
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean isRegistered(String playerName) {
-        try {
-            return api.getSQL().checkPlayerEntry(playerName);
-        } catch (SQLException sqlEx) {
-            api.getLogger().log(Level.WARNING, "Failed to check registration", sqlEx);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean forceRegister(ProxiedPlayer player, String password) {
-        try {
-            return api.createPlayerEntry(player, password);
-        } catch (SQLException sqlEx) {
-            api.getLogger().log(Level.WARNING, "Failed to force register", sqlEx);
-            return false;
-        }
-    }
-}

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

@@ -1,78 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.hook;
-
-import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import red.mohist.sodionauth.bungee.implementation.BungeePlayer;
-import red.mohist.sodionauth.core.SodionAuthApi;
-import red.mohist.sodionauth.core.exception.AuthenticatedException;
-
-/**
- * GitHub: https://github.com/Mohist-Community/SodionAuth
- * <p>
- * Project page: https://gitea.e-loli.com/SodionAuth/SodionAuth
- * <p>
- * Bukkit: Unknown
- * <p>
- * Spigot: https://www.spigotmc.org/resources/sodionauth.76944/
- */
-public class SodionAuthHook implements AuthPlugin<ProxiedPlayer> {
-
-    private final FastLoginBungee plugin;
-
-    public SodionAuthHook(FastLoginBungee plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean forceLogin(ProxiedPlayer player) {
-        try {
-            SodionAuthApi.login(new BungeePlayer(player));
-        } catch (AuthenticatedException e) {
-            plugin.getLog().warn(ALREADY_AUTHENTICATED, player);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean forceRegister(ProxiedPlayer player, String password) {
-        try{
-            return SodionAuthApi.register(new BungeePlayer(player), password);
-        } catch (UnsupportedOperationException e){
-            plugin.getLog().warn("Currently SodionAuth is not accepting forceRegister, " +
-                    "It may be caused by unsupported AuthBackend");
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isRegistered(String playerName) {
-        return SodionAuthApi.isRegistered(playerName);
-    }
-}

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

@@ -1,48 +1,16 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.listener;
 
 import com.github.games647.craftapi.UUIDAdapter;
-import com.github.games647.fastlogin.bungee.BungeeLoginSession;
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
 import com.github.games647.fastlogin.bungee.task.AsyncPremiumCheck;
-import com.github.games647.fastlogin.bungee.task.FloodgateAuthTask;
 import com.github.games647.fastlogin.bungee.task.ForceLoginTask;
-import com.github.games647.fastlogin.core.RateLimiter;
 import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.hooks.bedrock.FloodgateService;
 import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.google.common.base.Throwables;
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.reflect.Field;
 import java.util.UUID;
 
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.connection.Server;
@@ -57,67 +25,30 @@ import net.md_5.bungee.connection.LoginResult.Property;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 
-import org.geysermc.floodgate.api.player.FloodgatePlayer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Enables online mode logins for specified users and sends plugin message to the Bukkit version of this plugin in
  * order to clear that the connection is online mode.
  */
 public class ConnectListener implements Listener {
 
-    private static final String UUID_FIELD_NAME = "uniqueId";
-    private static final MethodHandle uniqueIdSetter;
-
-    static {
-        MethodHandle setHandle = null;
-        try {
-            Lookup lookup = MethodHandles.lookup();
-
-            Class.forName("net.md_5.bungee.connection.InitialHandler");
-
-            Field uuidField = InitialHandler.class.getDeclaredField(UUID_FIELD_NAME);
-            uuidField.setAccessible(true);
-            setHandle = lookup.unreflectSetter(uuidField);
-        } catch (ReflectiveOperationException reflectiveOperationException) {
-            Logger logger = LoggerFactory.getLogger(ConnectListener.class);
-            logger.error(
-                    "Cannot find Bungee initial handler; Disabling premium UUID and skin won't work.",
-                reflectiveOperationException
-            );
-        }
-
-        uniqueIdSetter = setHandle;
-    }
-
     private final FastLoginBungee plugin;
-    private final RateLimiter rateLimiter;
     private final Property[] emptyProperties = {};
 
-    public ConnectListener(FastLoginBungee plugin, RateLimiter rateLimiter) {
+    public ConnectListener(FastLoginBungee plugin) {
         this.plugin = plugin;
-        this.rateLimiter = rateLimiter;
     }
 
     @EventHandler
     public void onPreLogin(PreLoginEvent preLoginEvent) {
-        PendingConnection connection = preLoginEvent.getConnection();
         if (preLoginEvent.isCancelled()) {
             return;
         }
 
-        if (!rateLimiter.tryAcquire()) {
-            plugin.getLog().warn("Simple Anti-Bot join limit - Ignoring {}", connection);
-            return;
-        }
-
-        String username = connection.getName();
-        plugin.getLog().info("Incoming login request for {} from {}", username, connection.getSocketAddress());
-
         preLoginEvent.registerIntent(plugin);
-        Runnable asyncPremiumCheck = new AsyncPremiumCheck(plugin, preLoginEvent, connection, username);
-        plugin.getScheduler().runAsync(asyncPremiumCheck);
+
+        PendingConnection connection = preLoginEvent.getConnection();
+        Runnable asyncPremiumCheck = new AsyncPremiumCheck(plugin, preLoginEvent, connection);
+        ProxyServer.getInstance().getScheduler().runAsync(plugin, asyncPremiumCheck);
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
@@ -129,79 +60,48 @@ public class ConnectListener implements Listener {
         //use the login event instead of the post login event in order to send the login success packet to the client
         //with the offline uuid this makes it possible to set the skin then
         PendingConnection connection = loginEvent.getConnection();
+        InitialHandler initialHandler = (InitialHandler) connection;
+
+        String username = initialHandler.getLoginRequest().getData();
         if (connection.isOnlineMode()) {
             LoginSession session = plugin.getSession().get(connection);
-
-            UUID verifiedUUID = connection.getUniqueId();
-            String verifiedUsername = connection.getName();
-            session.setUuid(verifiedUUID);
-            session.setVerifiedUsername(verifiedUsername);
+            session.setUuid(connection.getUniqueId());
 
             StoredProfile playerProfile = session.getProfile();
-            playerProfile.setId(verifiedUUID);
+            playerProfile.setId(connection.getUniqueId());
 
-            // bungeecord will do this automatically so override it on disabled option
-            if (uniqueIdSetter != null) {
-                InitialHandler initialHandler = (InitialHandler) connection;
+            //bungeecord will do this automatically so override it on disabled option
+            if (!plugin.getCore().getConfig().get("premiumUuid", true)) {
+                try {
+                    UUID offlineUUID = UUIDAdapter.generateOfflineId(username);
 
-                if (!plugin.getCore().getConfig().get("premiumUuid", true)) {
-                    setOfflineId(initialHandler, verifiedUsername);
+                    //bungeecord doesn't support overriding the premium uuid
+                    //so we have to do it with reflection
+                    Field idField = InitialHandler.class.getDeclaredField("uniqueId");
+                    idField.setAccessible(true);
+                    idField.set(connection, offlineUUID);
+                } catch (NoSuchFieldException | IllegalAccessException ex) {
+                    plugin.getLog().error("Failed to set offline uuid of {}", username, ex);
                 }
+            }
 
-                if (!plugin.getCore().getConfig().get("forwardSkin", true)) {
-                    // this is null on offline mode
-                    LoginResult loginProfile = initialHandler.getLoginProfile();
+            if (!plugin.getCore().getConfig().get("forwardSkin", true)) {
+                //this is null on offline mode
+                LoginResult loginProfile = initialHandler.getLoginProfile();
+                if (loginProfile != null) {
                     loginProfile.setProperties(emptyProperties);
                 }
             }
         }
     }
 
-    private void setOfflineId(InitialHandler connection, String username) {
-        try {
-            UUID oldPremiumId = connection.getUniqueId();
-            UUID offlineUUID = UUIDAdapter.generateOfflineId(username);
-
-            // BungeeCord only allows setting the UUID in PreLogin events and before requesting online mode
-            // However if online mode is requested, it will override previous values
-            // So we have to do it with reflection
-            uniqueIdSetter.invokeExact(connection, offlineUUID);
-
-            String format = "Overridden UUID from {} to {} (based of {}) on {}";
-            plugin.getLog().info(format, oldPremiumId, offlineUUID, username, connection);
-        } catch (Exception ex) {
-            plugin.getLog().error("Failed to set offline uuid of {}", username, ex);
-        } catch (Throwable throwable) {
-            // throw remaining exceptions like out of memory that we shouldn't handle ourselves
-            Throwables.throwIfUnchecked(throwable);
-        }
-    }
-
     @EventHandler
     public void onServerConnected(ServerConnectedEvent serverConnectedEvent) {
         ProxiedPlayer player = serverConnectedEvent.getPlayer();
         Server server = serverConnectedEvent.getServer();
 
-        FloodgateService floodgateService = plugin.getFloodgateService();
-        if (floodgateService != null) {
-            FloodgatePlayer floodgatePlayer = floodgateService.getBedrockPlayer(player.getUniqueId());
-            if (floodgatePlayer != null) {
-                Runnable floodgateAuthTask = new FloodgateAuthTask(plugin.getCore(), player, floodgatePlayer, server);
-                plugin.getScheduler().runAsync(floodgateAuthTask);
-                return;
-            }
-        }
-
-        BungeeLoginSession session = plugin.getSession().get(player.getPendingConnection());
-        if (session == null) {
-            return;
-        }
-
-        // delay sending force command, because Paper will process the login event asynchronously
-        // In this case it means that the force command (plugin message) is already received and processed while
-        // player is still in the login phase and reported to be offline.
-        Runnable loginTask = new ForceLoginTask(plugin.getCore(), player, server, session);
-        plugin.getScheduler().runAsync(loginTask);
+        Runnable loginTask = new ForceLoginTask(plugin.getCore(), player, server);
+        ProxyServer.getInstance().getScheduler().runAsync(plugin, loginTask);
     }
 
     @EventHandler

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

@@ -1,38 +1,10 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.listener;
 
 import com.github.games647.fastlogin.bungee.BungeeLoginSession;
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
 import com.github.games647.fastlogin.bungee.task.AsyncToggleMessage;
 import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.hooks.bedrock.FloodgateService;
 import com.github.games647.fastlogin.core.message.ChangePremiumMessage;
-import com.github.games647.fastlogin.core.message.NamespaceKey;
-import com.github.games647.fastlogin.core.message.SuccessMessage;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
@@ -40,6 +12,7 @@ import com.google.common.io.ByteStreams;
 import java.util.Arrays;
 
 import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.connection.Server;
@@ -47,29 +20,23 @@ import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
-public class PluginMessageListener implements Listener {
+public class MessageListener implements Listener {
 
     private final FastLoginBungee plugin;
 
-    private final String successChannel;
-    private final String changeChannel;
-
-    public PluginMessageListener(FastLoginBungee plugin) {
+    public MessageListener(FastLoginBungee plugin) {
         this.plugin = plugin;
-
-        this.successChannel = new NamespaceKey(plugin.getName(), SuccessMessage.SUCCESS_CHANNEL).getCombinedName();
-        this.changeChannel = new NamespaceKey(plugin.getName(), ChangePremiumMessage.CHANGE_CHANNEL).getCombinedName();
     }
 
     @EventHandler
     public void onPluginMessage(PluginMessageEvent pluginMessageEvent) {
         String channel = pluginMessageEvent.getTag();
-        if (pluginMessageEvent.isCancelled() || !channel.startsWith(plugin.getName().toLowerCase())) {
+        if (pluginMessageEvent.isCancelled() || !plugin.getName().equals(channel)) {
             return;
         }
 
         //the client shouldn't be able to read the messages in order to know something about server internal states
-        //moreover the client shouldn't be able to fake a running premium check by sending the result message
+        //moreover the client shouldn't be able fake a running premium check by sending the result message
         pluginMessageEvent.setCancelled(true);
 
         if (!(pluginMessageEvent.getSender() instanceof Server)) {
@@ -81,16 +48,17 @@ public class PluginMessageListener implements Listener {
         byte[] data = Arrays.copyOf(pluginMessageEvent.getData(), pluginMessageEvent.getData().length);
         ProxiedPlayer forPlayer = (ProxiedPlayer) pluginMessageEvent.getReceiver();
 
-        plugin.getScheduler().runAsync(() -> readMessage(forPlayer, channel, data));
+        ProxyServer.getInstance().getScheduler().runAsync(plugin, () -> readMessage(forPlayer, data));
     }
 
-    private void readMessage(ProxiedPlayer forPlayer, String channel, byte[] data) {
+    private void readMessage(ProxiedPlayer forPlayer, byte[] data) {
         FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core = plugin.getCore();
 
         ByteArrayDataInput dataInput = ByteStreams.newDataInput(data);
-        if (successChannel.equals(channel)) {
+        String subChannel = dataInput.readUTF();
+        if ("Success".equals(subChannel)) {
             onSuccessMessage(forPlayer);
-        } else if (changeChannel.equals(channel)) {
+        } else if ("ChangeStatus".equals(subChannel)) {
             ChangePremiumMessage changeMessage = new ChangePremiumMessage();
             changeMessage.readFrom(dataInput);
 
@@ -107,24 +75,16 @@ public class PluginMessageListener implements Listener {
 
                 core.getPendingConfirms().remove(forPlayer.getUniqueId());
                 Runnable task = new AsyncToggleMessage(core, forPlayer, playerName, true, isSourceInvoker);
-                plugin.getScheduler().runAsync(task);
+                ProxyServer.getInstance().getScheduler().runAsync(plugin, task);
             } else {
                 Runnable task = new AsyncToggleMessage(core, forPlayer, playerName, false, isSourceInvoker);
-                plugin.getScheduler().runAsync(task);
+                ProxyServer.getInstance().getScheduler().runAsync(plugin, task);
             }
         }
     }
 
     private void onSuccessMessage(ProxiedPlayer forPlayer) {
-        boolean shouldPersist = forPlayer.getPendingConnection().isOnlineMode();
-
-        FloodgateService floodgateService = plugin.getFloodgateService();
-        if (!shouldPersist && floodgateService != null) {
-            // always save floodgate players to lock this username
-            shouldPersist = floodgateService.isBedrockPlayer(forPlayer.getUniqueId());
-        }
-
-        if (shouldPersist) {
+        if (forPlayer.getPendingConnection().isOnlineMode()) {
             //bukkit module successfully received and force logged in the user
             //update only on success to prevent corrupt data
             BungeeLoginSession loginSession = plugin.getSession().get(forPlayer.getPendingConnection());

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

@@ -1,84 +1,50 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.task;
 
 import com.github.games647.fastlogin.bungee.BungeeLoginSession;
 import com.github.games647.fastlogin.bungee.BungeeLoginSource;
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.bungee.event.BungeeFastLoginPreLoginEvent;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
 
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.event.PreLoginEvent;
+import net.md_5.bungee.api.event.AsyncEvent;
+import net.md_5.bungee.connection.InitialHandler;
 
 public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, CommandSender, BungeeLoginSource>
         implements Runnable {
 
     private final FastLoginBungee plugin;
-    private final PreLoginEvent preLoginEvent;
+    private final AsyncEvent<?> preLoginEvent;
 
-    private final String username;
     private final PendingConnection connection;
 
-    public AsyncPremiumCheck(FastLoginBungee plugin, PreLoginEvent preLoginEvent, PendingConnection connection,
-                             String username) {
-        super(plugin.getCore(), plugin.getCore().getAuthPluginHook(), plugin.getBedrockService());
+    public AsyncPremiumCheck(FastLoginBungee plugin, AsyncEvent<?> preLoginEvent, PendingConnection connection) {
+        super(plugin.getCore(), plugin.getCore().getAuthPluginHook());
 
         this.plugin = plugin;
         this.preLoginEvent = preLoginEvent;
         this.connection = connection;
-        this.username = username;
     }
 
     @Override
     public void run() {
         plugin.getSession().remove(connection);
 
+        InitialHandler initialHandler = (InitialHandler) connection;
+        String username = initialHandler.getLoginRequest().getData();
         try {
-            super.onLogin(username, new BungeeLoginSource(connection, preLoginEvent));
+            super.onLogin(username, new BungeeLoginSource(connection));
         } finally {
             preLoginEvent.completeIntent(plugin);
         }
     }
 
-    @Override
-    public FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, BungeeLoginSource source,
-                                                             StoredProfile profile) {
-        return plugin.getProxy().getPluginManager()
-                .callEvent(new BungeeFastLoginPreLoginEvent(username, source, profile));
-    }
-
     @Override
     public void requestPremiumLogin(BungeeLoginSource source, StoredProfile profile,
                                     String username, boolean registered) {
-        source.enableOnlinemode();
+        source.setOnlineMode();
         plugin.getSession().put(source.getConnection(), new BungeeLoginSession(username, registered, profile));
 
         String ip = source.getAddress().getAddress().getHostAddress();

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

@@ -1,36 +1,9 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.task;
 
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.bungee.event.BungeeFastLoginPremiumToggleEvent;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 
-import com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent.PremiumToggleReason;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -73,10 +46,6 @@ public class AsyncToggleMessage implements Runnable {
         playerProfile.setPremium(false);
         playerProfile.setId(null);
         core.getStorage().save(playerProfile);
-        PremiumToggleReason reason = (!isPlayerSender || !sender.getName().equalsIgnoreCase(playerProfile.getName())) ?
-                PremiumToggleReason.COMMAND_OTHER : PremiumToggleReason.COMMAND_SELF;
-        core.getPlugin().getProxy().getPluginManager().callEvent(
-                new BungeeFastLoginPremiumToggleEvent(playerProfile, reason));
         sendMessage("remove-premium");
     }
 
@@ -89,10 +58,6 @@ public class AsyncToggleMessage implements Runnable {
 
         playerProfile.setPremium(true);
         core.getStorage().save(playerProfile);
-        PremiumToggleReason reason = (!isPlayerSender || !sender.getName().equalsIgnoreCase(playerProfile.getName())) ?
-                PremiumToggleReason.COMMAND_OTHER : PremiumToggleReason.COMMAND_SELF;
-        core.getPlugin().getProxy().getPluginManager().callEvent(
-                new BungeeFastLoginPremiumToggleEvent(playerProfile, reason));
         sendMessage("add-premium");
     }
 

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

@@ -1,83 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.task;
-
-import java.net.InetSocketAddress;
-import java.util.UUID;
-
-import org.geysermc.floodgate.api.player.FloodgatePlayer;
-
-import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.connection.Server;
-
-import com.github.games647.fastlogin.bungee.BungeeLoginSession;
-import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.github.games647.fastlogin.core.shared.FloodgateManagement;
-
-public class FloodgateAuthTask
-        extends FloodgateManagement<ProxiedPlayer, CommandSender, BungeeLoginSession, FastLoginBungee> {
-
-    private final Server server;
-
-    public FloodgateAuthTask(FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core, ProxiedPlayer player,
-            FloodgatePlayer floodgatePlayer, Server server) {
-        super(core, player, floodgatePlayer);
-        this.server = server;
-    }
-
-    @Override
-    protected void startLogin() {
-        BungeeLoginSession session = new BungeeLoginSession(player.getName(), isRegistered, profile);
-        core.getPlugin().getSession().put(player.getPendingConnection(), session);
-
-        // enable auto login based on the value of 'autoLoginFloodgate' in config.yml
-        boolean forcedOnlineMode = autoLoginFloodgate.equals("true")
-                || (autoLoginFloodgate.equals("linked") && isLinked);
-
-        // run login task
-        Runnable forceLoginTask = new ForceLoginTask(core.getPlugin().getCore(), player, server, session,
-                forcedOnlineMode);
-        core.getPlugin().getScheduler().runAsync(forceLoginTask);
-    }
-
-    @Override
-    protected String getName(ProxiedPlayer player) {
-        return player.getName();
-    }
-
-    @Override
-    protected UUID getUUID(ProxiedPlayer player) {
-        return player.getUniqueId();
-    }
-
-    @Override
-    protected InetSocketAddress getAddress(ProxiedPlayer player) {
-        return player.getAddress();
-    }
-
-}

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

@@ -1,41 +1,13 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.bungee.task;
 
 import com.github.games647.fastlogin.bungee.BungeeLoginSession;
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.bungee.event.BungeeFastLoginAutoLoginEvent;
-import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.message.ChannelMessage;
 import com.github.games647.fastlogin.core.message.LoginActionMessage;
 import com.github.games647.fastlogin.core.message.LoginActionMessage.Type;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.ForceLoginManagement;
 import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
 
 import java.util.UUID;
 
@@ -49,21 +21,11 @@ public class ForceLoginTask
 
     private final Server server;
 
-    //treat player as if they had a premium account, even when they don't
-    //use for Floodgate auto login/register
-    private final boolean forcedOnlineMode;
-
     public ForceLoginTask(FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core,
-                          ProxiedPlayer player, Server server, BungeeLoginSession session, boolean forcedOnlineMode) {
-        super(core, player, session);
+             ProxiedPlayer player, Server server) {
+        super(core, player, core.getPlugin().getSession().get(player.getPendingConnection()));
 
         this.server = server;
-        this.forcedOnlineMode = forcedOnlineMode;
-    }
-
-    public ForceLoginTask(FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core, ProxiedPlayer player,
-            Server server, BungeeLoginSession session) {
-        this(core, player, server, session, false);
     }
 
     @Override
@@ -89,12 +51,6 @@ public class ForceLoginTask
         return super.forceLogin(player);
     }
 
-    @Override
-    public FastLoginAutoLoginEvent callFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile) {
-        return core.getPlugin().getProxy().getPluginManager()
-                .callEvent(new BungeeFastLoginAutoLoginEvent(session, profile));
-    }
-
     @Override
     public boolean forceRegister(ProxiedPlayer player) {
         return session.isAlreadyLogged() || super.forceRegister(player);
@@ -126,6 +82,6 @@ public class ForceLoginTask
 
     @Override
     public boolean isOnlineMode() {
-        return forcedOnlineMode || player.getPendingConnection().isOnlineMode();
+        return player.getPendingConnection().isOnlineMode();
     }
 }

bungee/src/main/resources/bungee.yml

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

core/pom.xml

@@ -1,32 +1,5 @@
-<!--
-
-    SPDX-License-Identifier: MIT
-
-    The MIT License (MIT)
-
-    Copyright (c) 2015-2021 <Your name 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.
-
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -45,18 +18,11 @@
         <repository>
             <id>luck-repo</id>
             <url>https://ci.lucko.me/plugin/repository/everything</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
         </repository>
+
         <repository>
             <id>codemc-repo</id>
-            <url>https://repo.codemc.io/repository/maven-public/</url>
-        </repository>
-        <!-- Floodgate -->
-        <repository>
-            <id>opencollab-snapshot</id>
-            <url>https://repo.opencollab.dev/maven-snapshots/</url>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
     </repositories>
 
@@ -67,29 +33,28 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>4.0.3</version>
-            <exclusions>
-                <!-- HikariCP uses an old version of this API that has a typo in the service interface -->
-                <!-- We will use the api provided by the jdk14 dependency -->
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>3.0.0</version>
         </dependency>
 
         <!--Logging framework implements slf4j which is required by hikari-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>2.0.0-alpha6</version>
+            <version>1.7.25</version>
         </dependency>
 
-        <!-- snakeyaml is present in Bungee, Spigot, Cauldron, so we could use this independent implementation -->
+        <!--GSON is not at the right position for Minecraft 1.7-->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.2.4</version>
+        </dependency>
+
+        <!-- snakeyaml is present in Bungee, Spigot, Cauldron and so we could use this independent implementation -->
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-config</artifactId>
-            <version>1.16-R0.4</version>
+            <version>1.12-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -98,88 +63,21 @@
             </exclusions>
         </dependency>
 
-        <!--Floodgate for Xbox Live Authentication-->
-        <dependency>
-            <groupId>org.geysermc.floodgate</groupId>
-            <artifactId>api</artifactId>
-            <version>${floodgate.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.geysermc.cumulus</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Bedrock player bridge -->
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>core</artifactId>
-            <version>${geyser.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- We need the API, but it was excluded above -->
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>geyser-api</artifactId>
-            <version>${geyser.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <!--Common component for contacting the Mojang API-->
         <dependency>
             <groupId>com.github.games647</groupId>
             <artifactId>craftapi</artifactId>
-            <version>0.5.1</version>
+            <version>0.1.3-SNAPSHOT</version>
         </dependency>
 
-        <!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Velocity) -->
+        <!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Cauldron) -->
         <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.8.9</version>
+            <!-- The Uranium project (fork of Cauldron) uses 17.0 like Spigot 1.8 as experimental feature -->
+            <!-- Project url: https://github.com/UraniumMC/Uranium -->
+            <version>10.0.1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

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

@@ -1,94 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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;
-
-import com.google.common.util.concurrent.MoreExecutors;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-
-/**
- * This limits the number of threads that are used at maximum. Thread creation can be very heavy for the CPU and
- * context switching between threads too. However, we need many threads for blocking HTTP and database calls.
- * Nevertheless, this number can be further limited, because the number of actually working database threads
- * 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 ExecutorService processingPool;
-
-    /*
-    private final ExecutorService databaseExecutor = new ThreadPoolExecutor(1, 10,
-            0L, TimeUnit.MILLISECONDS,
-            new LinkedBlockingQueue<>(MAX_CAPACITY));
-     */
-
-    public AsyncScheduler(Logger logger, ThreadFactory threadFactory) {
-        this.logger = logger;
-        processingPool = new ThreadPoolExecutor(6, 32,
-                60L, TimeUnit.SECONDS,
-                new LinkedBlockingQueue<>(MAX_CAPACITY), threadFactory);
-    }
-
-    /*
-    public <R> CompletableFuture<R> runDatabaseTask(Supplier<R> databaseTask) {
-        return CompletableFuture.supplyAsync(databaseTask, databaseExecutor)
-                .exceptionally(error -> {
-                    logger.warn("Error occurred on thread pool", error);
-                    return null;
-                })
-                // change context to the processing pool
-                .thenApplyAsync(r -> r, processingPool);
-    }
-     */
-
-    public CompletableFuture<Void> runAsync(Runnable task) {
-        return CompletableFuture.runAsync(task, processingPool).exceptionally(error -> {
-            logger.warn("Error occurred on thread pool", error);
-            return null;
-        });
-    }
-
-    public void shutdown() {
-        MoreExecutors.shutdownAndAwaitTermination(processingPool, 1, TimeUnit.MINUTES);
-        //MoreExecutors.shutdownAndAwaitTermination(databaseExecutor, 1, TimeUnit.MINUTES);
-    }
-}

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

@@ -0,0 +1,180 @@
+package com.github.games647.fastlogin.core;
+
+import com.github.games647.craftapi.UUIDAdapter;
+import com.github.games647.fastlogin.core.shared.FastLoginCore;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.ThreadFactory;
+
+import static java.sql.Statement.RETURN_GENERATED_KEYS;
+
+public class AuthStorage {
+
+    private static final String PREMIUM_TABLE = "premium";
+
+    private static final String LOAD_BY_NAME = "SELECT * FROM " + PREMIUM_TABLE + " WHERE Name=? LIMIT 1";
+    private static final String LOAD_BY_UUID = "SELECT * FROM " + PREMIUM_TABLE + " WHERE UUID=? LIMIT 1";
+    private static final String INSERT_PROFILE = "INSERT INTO " + PREMIUM_TABLE + " (UUID, Name, Premium, LastIp) "
+            + "VALUES (?, ?, ?, ?) ";
+    private static final String UPDATE_PROFILE = "UPDATE " + PREMIUM_TABLE
+            + " SET UUID=?, Name=?, Premium=?, LastIp=?, LastLogin=CURRENT_TIMESTAMP WHERE UserID=?";
+
+    private final FastLoginCore<?, ?, ?> core;
+    private final HikariDataSource dataSource;
+
+    public AuthStorage(FastLoginCore<?, ?, ?> core, String driver, String host, int port, String databasePath
+            , String user, String pass, boolean useSSL) {
+        this.core = core;
+
+        HikariConfig config = new HikariConfig();
+        config.setPoolName(core.getPlugin().getName());
+
+        config.setUsername(user);
+        config.setPassword(pass);
+        config.setDriverClassName(driver);
+
+        //a try to fix https://www.spigotmc.org/threads/fastlogin.101192/page-26#post-1874647
+        Properties properties = new Properties();
+        properties.setProperty("date_string_format", "yyyy-MM-dd HH:mm:ss");
+        properties.setProperty("useSSL", String.valueOf(useSSL));
+        config.setDataSourceProperties(properties);
+
+        ThreadFactory platformThreadFactory = core.getPlugin().getThreadFactory();
+        if (platformThreadFactory != null) {
+            config.setThreadFactory(platformThreadFactory);
+        }
+
+        String jdbcUrl = "jdbc:";
+        if (driver.contains("sqlite")) {
+            String pluginFolder = core.getPlugin().getPluginFolder().toAbsolutePath().toString();
+            databasePath = databasePath.replace("{pluginDir}", pluginFolder);
+
+            jdbcUrl += "sqlite://" + databasePath;
+            config.setConnectionTestQuery("SELECT 1");
+            config.setMaximumPoolSize(1);
+        } else {
+            jdbcUrl += "mysql://" + host + ':' + port + '/' + databasePath;
+        }
+
+        config.setJdbcUrl(jdbcUrl);
+        this.dataSource = new HikariDataSource(config);
+    }
+
+    public void createTables() throws SQLException {
+        try (Connection con = dataSource.getConnection();
+             Statement createStmt = con.createStatement()) {
+            String createDataStmt = "CREATE TABLE IF NOT EXISTS " + PREMIUM_TABLE + " ("
+                    + "UserID INTEGER PRIMARY KEY AUTO_INCREMENT, "
+                    + "UUID CHAR(36), "
+                    + "Name VARCHAR(16) NOT NULL, "
+                    + "Premium BOOLEAN NOT NULL, "
+                    + "LastIp VARCHAR(255) NOT NULL, "
+                    + "LastLogin TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
+                    //the premium shouldn't steal the cracked account by changing the name
+                    + "UNIQUE (Name) "
+                    + ')';
+
+            if (dataSource.getJdbcUrl().contains("sqlite")) {
+                createDataStmt = createDataStmt.replace("AUTO_INCREMENT", "AUTOINCREMENT");
+            }
+
+            createStmt.executeUpdate(createDataStmt);
+        }
+    }
+
+    public StoredProfile loadProfile(String name) {
+        try (Connection con = dataSource.getConnection();
+             PreparedStatement loadStmt = con.prepareStatement(LOAD_BY_NAME)
+        ) {
+            loadStmt.setString(1, name);
+
+            try (ResultSet resultSet = loadStmt.executeQuery()) {
+                return parseResult(resultSet).orElseGet(() -> new StoredProfile(null, name, false, ""));
+            }
+        } catch (SQLException sqlEx) {
+            core.getPlugin().getLog().error("Failed to query profile: {}", name, sqlEx);
+        }
+
+        return null;
+    }
+
+    public StoredProfile loadProfile(UUID uuid) {
+        try (Connection con = dataSource.getConnection();
+             PreparedStatement loadStmt = con.prepareStatement(LOAD_BY_UUID)) {
+            loadStmt.setString(1, UUIDAdapter.toMojangId(uuid));
+
+            try (ResultSet resultSet = loadStmt.executeQuery()) {
+                return parseResult(resultSet).orElse(null);
+            }
+        } catch (SQLException sqlEx) {
+            core.getPlugin().getLog().error("Failed to query profile: {}", uuid, sqlEx);
+        }
+
+        return null;
+    }
+
+    private Optional<StoredProfile> parseResult(ResultSet resultSet) throws SQLException {
+        if (resultSet.next()) {
+            long userId = resultSet.getInt(1);
+
+            UUID uuid = Optional.ofNullable(resultSet.getString(2)).map(UUIDAdapter::parseId).orElse(null);
+
+            String name = resultSet.getString(3);
+            boolean premium = resultSet.getBoolean(4);
+            String lastIp = resultSet.getString(5);
+            Instant lastLogin = resultSet.getTimestamp(6).toInstant();
+            return Optional.of(new StoredProfile(userId, uuid, name, premium, lastIp, lastLogin));
+        }
+
+        return Optional.empty();
+    }
+
+    public void save(StoredProfile playerProfile) {
+        try (Connection con = dataSource.getConnection()) {
+            String uuid = playerProfile.getOptId().map(UUIDAdapter::toMojangId).orElse(null);
+
+            if (playerProfile.isSaved()) {
+                try (PreparedStatement saveStmt = con.prepareStatement(UPDATE_PROFILE)) {
+                    saveStmt.setString(1, uuid);
+                    saveStmt.setString(2, playerProfile.getName());
+                    saveStmt.setBoolean(3, playerProfile.isPremium());
+                    saveStmt.setString(4, playerProfile.getLastIp());
+
+                    saveStmt.setLong(5, playerProfile.getRowId());
+                    saveStmt.execute();
+                }
+            } else {
+                try (PreparedStatement saveStmt = con.prepareStatement(INSERT_PROFILE, RETURN_GENERATED_KEYS)) {
+                    saveStmt.setString(1, uuid);
+
+                    saveStmt.setString(2, playerProfile.getName());
+                    saveStmt.setBoolean(3, playerProfile.isPremium());
+                    saveStmt.setString(4, playerProfile.getLastIp());
+
+                    saveStmt.execute();
+                    try (ResultSet generatedKeys = saveStmt.getGeneratedKeys()) {
+                        if (generatedKeys != null && generatedKeys.next()) {
+                            playerProfile.setRowId(generatedKeys.getInt(1));
+                        }
+                    }
+                }
+            }
+        } catch (SQLException ex) {
+            core.getPlugin().getLog().error("Failed to save playerProfile {}", playerProfile, ex);
+        }
+    }
+
+    public void close() {
+        dataSource.close();
+    }
+}

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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;
 
 import com.github.games647.craftapi.cache.SafeCacheBuilder;
@@ -35,7 +10,7 @@ import java.util.logging.Level;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.jul.JDK14LoggerAdapter;
+import org.slf4j.impl.JDK14LoggerAdapter;
 
 public class CommonUtil {
 
@@ -70,27 +45,7 @@ public class CommonUtil {
         return new String(chars);
     }
 
-    /**
-     * This creates a SLF4J logger. In the process it initializes the SLF4J service provider. This method looks
-     * for the provider in the plugin jar instead of in the server jar when creating a Logger. The provider is only
-     * initialized once, so this method should be called early.
-     *
-     * The provider is bound to the service class `SLF4JServiceProvider`. Relocating this class makes it available
-     * for exclusive own usage. Other dependencies will use the relocated service too, and therefore will find the
-     * initialized provider.
-     *
-     * @param parent JDK logger
-     * @return slf4j logger
-     */
-    public static Logger initializeLoggerService(java.util.logging.Logger parent) {
-        // set the class loader to the plugin one to find our own SLF4J provider in the plugin jar and not in the global
-        ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-
-        ClassLoader pluginLoader = CommonUtil.class.getClassLoader();
-        Thread.currentThread().setContextClassLoader(pluginLoader);
-
-        // Trigger provider search
-        LoggerFactory.getLogger(parent.getName()).info("Initialize logging service");
+    public static Logger createLoggerFromJDK(java.util.logging.Logger parent) {
         try {
             parent.setLevel(Level.ALL);
 
@@ -102,9 +57,6 @@ public class CommonUtil {
             parent.log(Level.WARNING, "Cannot create slf4j logging adapter", reflectEx);
             parent.log(Level.WARNING, "Creating logger instance manually...");
             return LoggerFactory.getLogger(parent.getName());
-        } finally {
-            // restore previous class loader
-            Thread.currentThread().setContextClassLoader(oldLoader);
         }
     }
 

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

@@ -1,45 +1,10 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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;
 
 public enum PremiumStatus {
 
-    PREMIUM("Premium"),
+    PREMIUM,
 
-    CRACKED("Cracked"),
+    CRACKED,
 
-    UNKNOWN("Unknown");
-
-    private final String readableName;
-
-    PremiumStatus(String readableName) {
-        this.readableName = readableName;
-    }
-
-    public String getReadableName() {
-        return readableName;
-    }
+    UNKNOWN
 }

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

@@ -1,7 +0,0 @@
-package com.github.games647.fastlogin.core;
-
-@FunctionalInterface
-public interface RateLimiter {
-
-    boolean tryAcquire();
-}

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

@@ -1,42 +1,16 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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;
 
 import com.github.games647.craftapi.model.Profile;
 
 import java.time.Instant;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.locks.ReentrantLock;
+
+import javax.annotation.Nullable;
 
 public class StoredProfile extends Profile {
 
     private long rowId;
-    private final ReentrantLock saveLock = new ReentrantLock();
 
     private boolean premium;
     private String lastIp;
@@ -55,10 +29,6 @@ public class StoredProfile extends Profile {
         this(-1, uuid, playerName, premium, lastIp, Instant.now());
     }
 
-    public ReentrantLock getSaveLock() {
-        return saveLock;
-    }
-
     public synchronized boolean isSaved() {
         return rowId >= 0;
     }
@@ -75,7 +45,7 @@ public class StoredProfile extends Profile {
         this.rowId = generatedId;
     }
 
-    // can be null
+    @Nullable
     public synchronized UUID getId() {
         return id;
     }
@@ -112,21 +82,6 @@ public class StoredProfile extends Profile {
         this.lastLogin = lastLogin;
     }
 
-    @Override
-    public synchronized boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof StoredProfile)) return false;
-        if (!super.equals(o)) return false;
-        StoredProfile that = (StoredProfile) o;
-        return rowId == that.rowId && premium == that.premium
-                && Objects.equals(lastIp, that.lastIp) && lastLogin.equals(that.lastLogin);
-    }
-
-    @Override
-    public synchronized int hashCode() {
-        return Objects.hash(super.hashCode(), rowId, premium, lastIp, lastLogin);
-    }
-
     @Override
     public synchronized String toString() {
         return this.getClass().getSimpleName() + '{' +

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

@@ -1,77 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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;
-
-import com.google.common.base.Ticker;
-
-import java.util.Arrays;
-
-/**
- * Limit the number of requests with a maximum size. Each requests expire after the specified time making it available
- * for another request.
- */
-public class TickingRateLimiter implements RateLimiter {
-
-    private final Ticker ticker;
-
-    private final long[] requests;
-    private final long expireTime;
-    private int position;
-
-    public TickingRateLimiter(Ticker ticker, int maxLimit, long expireTime) {
-        this.ticker = ticker;
-
-        this.requests = new long[maxLimit];
-        this.expireTime = expireTime;
-
-        // fill the array with expired entry, because nanoTime could overflow and include negative numbers
-        long nowMilli = ticker.read() / 1_000_000;
-        long initialVal = nowMilli - expireTime;
-        Arrays.fill(requests, initialVal);
-    }
-
-    /**
-     * Ask if access is allowed. If so register the request.
-     *
-     * @return true if allowed - false otherwise without any side effects
-     */
-    @Override
-    public boolean tryAcquire() {
-        // current time millis is not monotonic - it can jump back depending on user choice or NTP
-        long nowMilli = ticker.read() / 1_000_000;
-        synchronized (this) {
-            // having synchronized will limit the amount of concurrency a lot
-            long oldest = requests[position];
-            if (nowMilli - oldest >= expireTime) {
-                requests[position] = nowMilli;
-                position = (position + 1) % requests.length;
-                return true;
-            }
-
-            return false;
-        }
-    }
-}

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.hooks;
 
 /**
@@ -33,8 +8,6 @@ package com.github.games647.fastlogin.core.hooks;
  */
 public interface AuthPlugin<P> {
 
-    String ALREADY_AUTHENTICATED = "Player {} is already authenticated. Cancelling force login.";
-
     /**
      * Login the premium (paid account) player after the player joined successfully the server.
      *
@@ -72,7 +45,7 @@ public interface AuthPlugin<P> {
     /**
      * Checks whether an account exists for this player name.
      *
-     * This check should check if a cracked player account exists,
+     * This check should check if a cracked player account exists
      * so we can be sure the premium player doesn't steal the account
      * of that player.
      *

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.hooks;
 
 import java.security.SecureRandom;

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.hooks;
 
 @FunctionalInterface

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

@@ -1,135 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.hooks.bedrock;
-
-import com.github.games647.craftapi.model.Profile;
-import com.github.games647.craftapi.resolver.RateLimitException;
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.github.games647.fastlogin.core.shared.LoginSource;
-
-import java.io.IOException;
-import java.util.Optional;
-import java.util.UUID;
-
-/**
- * @param <B> is an instance of either FloodgatePlayer or GeyserSession
- */
-public abstract class BedrockService<B> {
-
-    protected final FastLoginCore<?, ?, ?> core;
-    protected final String allowConflict;
-
-    public BedrockService(FastLoginCore<?, ?, ?> core) {
-        this.core = core;
-        this.allowConflict = core.getConfig().get("allowFloodgateNameConflict").toString().toLowerCase();
-    }
-
-    /**
-     * Perform every packet level check needed on a Bedrock player.
-     *
-     * @param username the name of the player
-     * @param source   an instance of LoginSource
-     * @return true if Java specific checks can be skipped
-     */
-    public abstract boolean performChecks(String username, LoginSource source);
-
-    /**
-     * Check if the player's name conflicts an existing Java player's name, and kick
-     * them if it does
-     *
-     * @param username the name of the player
-     * @param source   an instance of LoginSource
-     */
-    protected void checkNameConflict(String username, LoginSource source) {
-        // check for conflicting Premium Java name
-        Optional<Profile> premiumUUID = Optional.empty();
-        try {
-            premiumUUID = core.getResolver().findProfile(username);
-        } catch (IOException ioEx) {
-            core.getPlugin().getLog().error(
-                "Could not check whether Bedrock Player {}'s name conflicts a premium Java player's name.",
-                username);
-
-            kickPlayer(source, username, "Could not check if your name conflicts an existing " +
-                "premium Java account's name. This is usually a serverside error.");
-        } catch (RateLimitException rateLimitException) {
-            core.getPlugin().getLog().warn("Mojang API rate limit hit");
-            kickPlayer(source, username, "Could not check if your name conflicts an existing premium " +
-                "Java account's name. Try again in a few minutes");
-        }
-
-        if (premiumUUID.isPresent()) {
-            core.getPlugin().getLog().info("Bedrock Player {}'s name conflicts an existing premium Java account's name",
-                    username);
-            kickPlayer(source, username, "Your name conflicts an existing premium Java account's name");
-        }
-    }
-
-    private void kickPlayer(LoginSource source, String username, String message) {
-        try {
-            source.kick(message);
-        } catch (Exception ex) {
-            core.getPlugin().getLog().error("Could not kick Player {}", username, ex);
-        }
-    }
-
-    /**
-     * The Floodgate / Geyser API does not support querying players by name, so this function
-     * iterates over every online Bedrock Player and checks if the requested
-     * username can be found
-     * <br>
-     * <i>Falls back to non-prefixed name checks, if ProtocolLib is installed</i>
-     *
-     * @param prefixedUsername the name of the player with the prefix appended
-     * @return Bedrock Player if found, null otherwise
-     */
-    public B getBedrockPlayer(String prefixedUsername) {
-        return null;
-    }
-
-    public B getBedrockPlayer(UUID uuid) {
-        return null;
-    }
-
-    public boolean isBedrockPlayer(UUID uuid) {
-        return getBedrockPlayer(uuid) != null;
-    }
-
-    public boolean isBedrockConnection(String username) {
-        return getBedrockPlayer(username) != null;
-    }
-
-    /**
-     * Checks if a profile's name starts with the Floodgate prefix, if it's available
-     * @param profile profile of the connecting player
-     * @return true if the username is forbidden
-     */
-    public boolean isUsernameForbidden(StoredProfile profile) {
-        return false;
-    }
-
-}

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

@@ -1,136 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.hooks.bedrock;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.github.games647.fastlogin.core.shared.LoginSource;
-
-import java.util.Locale;
-import java.util.UUID;
-
-import org.geysermc.floodgate.api.FloodgateApi;
-import org.geysermc.floodgate.api.player.FloodgatePlayer;
-
-public class FloodgateService extends BedrockService<FloodgatePlayer> {
-
-    private final FloodgateApi floodgate;
-
-    public FloodgateService(FloodgateApi floodgate, FastLoginCore<?, ?, ?> core) {
-        super(core);
-        this.floodgate = floodgate;
-    }
-
-    /**
-     * Checks if a config entry (related to Floodgate) is valid. <br>
-     * Writes to Log if the value is invalid.
-     * <p>
-     * This should be used for:
-     * <ul>
-     * <li>allowFloodgateNameConflict
-     * <li>autoLoginFloodgate
-     * <li>autoRegisterFloodgate
-     * </ul>
-     * </p>
-     *
-     * @param key the key of the entry in config.yml
-     * @return <b>true</b> if the entry's value is "true", "false", or "linked"
-     */
-    public boolean isValidFloodgateConfigString(String key) {
-        String value = core.getConfig().get(key).toString().toLowerCase(Locale.ENGLISH);
-        if (!value.equals("true") && !value.equals("linked") && !value.equals("false") && !value.equals("no-conflict")) {
-            core.getPlugin().getLog().error("Invalid value detected for {} in FastLogin/config.yml.", key);
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean isUsernameForbidden(StoredProfile profile) {
-        String playerPrefix = floodgate.getPlayerPrefix();
-        return profile.getName().startsWith(playerPrefix) && !playerPrefix.isEmpty();
-    }
-
-    @Override
-    public boolean performChecks(String username, LoginSource source) {
-        // check if the Bedrock player is linked to a Java account
-        FloodgatePlayer floodgatePlayer = getBedrockPlayer(username);
-        boolean isLinked = floodgatePlayer.getLinkedPlayer() != null;
-
-        if ("false".equals(allowConflict)
-            || "linked".equals(allowConflict) && !isLinked) {
-                super.checkNameConflict(username, source);
-        } else {
-            core.getPlugin().getLog().info("Skipping name conflict checking for player {}", username);
-        }
-        
-        //Floodgate users don't need Java specific checks
-        return true;
-    }
-
-    /**
-     * The FloodgateApi does not support querying players by name, so this function
-     * iterates over every online FloodgatePlayer and checks if the requested
-     * username can be found
-     * <br>
-     * <i>Falls back to non-prefixed name checks, if ProtocolLib is installed</i>
-     * 
-     * @param prefixedUsername the name of the player with the prefix appended
-     * @return FloodgatePlayer if found, null otherwise
-     */
-    public FloodgatePlayer getBedrockPlayer(String prefixedUsername) {
-        //prefixes are broken with ProtocolLib, so fall back to name checks without prefixes
-        //this should be removed if #493 gets fixed
-        if (core.getPlugin().isPluginInstalled("ProtocolLib")) {
-            for (FloodgatePlayer floodgatePlayer : floodgate.getPlayers()) {
-                if (floodgatePlayer.getUsername().equals(prefixedUsername)) {
-                    return floodgatePlayer;
-                }
-            }
-            return null;
-        }
-        for (FloodgatePlayer floodgatePlayer : floodgate.getPlayers()) {
-            if (floodgatePlayer.getCorrectUsername().equals(prefixedUsername)) {
-                return floodgatePlayer;
-            }
-        }
-
-        return null;
-    }
-
-    public FloodgatePlayer getBedrockPlayer(UUID uuid) {
-        return floodgate.getPlayer(uuid);
-    }
-
-    public boolean isBedrockPlayer(UUID uuid) {
-        return getBedrockPlayer(uuid) != null;
-    }
-
-    public boolean isBedrockConnection(String username) {
-        return getBedrockPlayer(username) != null;
-    }
-}

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

@@ -1,75 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.hooks.bedrock;
-
-import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.github.games647.fastlogin.core.shared.LoginSource;
-
-import java.util.UUID;
-
-import org.geysermc.geyser.GeyserImpl;
-import org.geysermc.geyser.session.GeyserSession;
-import org.geysermc.geyser.session.auth.AuthType;
-
-public class GeyserService extends BedrockService<GeyserSession> {
-
-    private final GeyserImpl geyser;
-    private final FastLoginCore<?, ?, ?> core;
-    private final AuthType authType;
-
-    public GeyserService(GeyserImpl geyser, FastLoginCore<?, ?, ?> core) {
-        super(core);
-        this.geyser = geyser;
-        this.core = core;
-        this.authType = GeyserImpl.getInstance().getConfig().getRemote().getAuthType();
-    }
-
-    @Override
-    public boolean performChecks(String username, LoginSource source) {
-        // AuthType.FLOODGATE will be handled by FloodgateService
-        if (authType == AuthType.ONLINE) {
-            // authenticate everyone, as if they were Java players, since they have signed
-            // in through Mojang
-            return false;
-        }
-        if ("true".equals(allowConflict)) {
-            core.getPlugin().getLog().info("Skipping name conflict checking for player {}", username);
-        } else {
-            super.checkNameConflict(username, source);
-        }
-        return true;
-    }
-
-    @Override
-    public GeyserSession getBedrockPlayer(String username) {
-        return geyser.connectionByName(username);
-    }
-
-    @Override
-    public GeyserSession getBedrockPlayer(UUID uuid) {
-        return geyser.connectionByUuid(uuid);
-    }
-}

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.message;
 
 import com.google.common.io.ByteArrayDataInput;
@@ -30,8 +5,6 @@ import com.google.common.io.ByteArrayDataOutput;
 
 public class ChangePremiumMessage implements ChannelMessage {
 
-    public static final String CHANGE_CHANNEL = "ch-st";
-
     private String playerName;
     private boolean willEnable;
     private boolean isSourceInvoker;
@@ -60,7 +33,7 @@ public class ChangePremiumMessage implements ChannelMessage {
 
     @Override
     public String getChannelName() {
-        return CHANGE_CHANNEL;
+        return "ChangeStatus";
     }
 
     @Override

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.message;
 
 import com.google.common.io.ByteArrayDataInput;

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.message;
 
 import com.google.common.io.ByteArrayDataInput;
@@ -32,8 +7,6 @@ import java.util.UUID;
 
 public class LoginActionMessage implements ChannelMessage {
 
-    public static final String FORCE_CHANNEL = "force";
-
     private Type type;
 
     private String playerName;
@@ -87,7 +60,7 @@ public class LoginActionMessage implements ChannelMessage {
 
     @Override
     public String getChannelName() {
-        return FORCE_CHANNEL;
+        return "LoginAction";
     }
 
     @Override

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

@@ -1,51 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.message;
-
-public class NamespaceKey {
-
-    private static final char SEPARATOR_CHAR = ':';
-
-    private final String namespace;
-    private final String key;
-
-    private final String combined;
-
-    public NamespaceKey(String namespace, String key) {
-        this.namespace = namespace.toLowerCase();
-        this.key = key.toLowerCase();
-
-        this.combined = this.namespace + SEPARATOR_CHAR + this.key;
-    }
-
-    public String getCombinedName()  {
-        return combined;
-    }
-
-    public static String getCombined(String namespace, String key) {
-        return new NamespaceKey(namespace, key).combined;
-    }
-}

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

@@ -1,28 +1,3 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.message;
 
 import com.google.common.io.ByteArrayDataInput;
@@ -30,11 +5,9 @@ import com.google.common.io.ByteArrayDataOutput;
 
 public class SuccessMessage implements ChannelMessage {
 
-    public static final String SUCCESS_CHANNEL = "succ";
-
     @Override
     public String getChannelName() {
-        return SUCCESS_CHANNEL;
+        return "Success";
     }
 
     @Override

core/src/main/java/com/github/games647/fastlogin/core/mojang/MojangApiConnector.java

@@ -1,25 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.
- */

core/src/main/java/com/github/games647/fastlogin/core/mojang/UUIDTypeAdapter.java

@@ -1,25 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.
- */

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

@@ -1,44 +1,13 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared;
 
 import com.github.games647.craftapi.resolver.MojangResolver;
 import com.github.games647.craftapi.resolver.http.RotatingProxySelector;
+import com.github.games647.fastlogin.core.AuthStorage;
 import com.github.games647.fastlogin.core.CommonUtil;
-import com.github.games647.fastlogin.core.RateLimiter;
-import com.github.games647.fastlogin.core.TickingRateLimiter;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 import com.github.games647.fastlogin.core.hooks.DefaultPasswordGenerator;
 import com.github.games647.fastlogin.core.hooks.PasswordGenerator;
-import com.github.games647.fastlogin.core.storage.MySQLStorage;
-import com.github.games647.fastlogin.core.storage.SQLStorage;
-import com.github.games647.fastlogin.core.storage.SQLiteStorage;
-import com.google.common.base.Ticker;
 import com.google.common.net.HostAndPort;
-import com.zaxxer.hikari.HikariConfig;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -53,7 +22,6 @@ import java.nio.file.Path;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -76,8 +44,6 @@ import static java.util.stream.Collectors.toSet;
  */
 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 Collection<UUID> pendingConfirms = new HashSet<>();
@@ -86,8 +52,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
     private final MojangResolver resolver = new MojangResolver();
 
     private Configuration config;
-    private SQLStorage storage;
-    private RateLimiter rateLimiter;
+    private AuthStorage storage;
     private PasswordGenerator<P> passwordGenerator = new DefaultPasswordGenerator<>();
     private AuthPlugin<P> authPlugin;
 
@@ -115,14 +80,12 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
                     });
         } catch (IOException ioEx) {
             plugin.getLog().error("Failed to load yaml files", ioEx);
-            return;
         }
 
-        rateLimiter = createRateLimiter(config.getSection("anti-bot"));
         Set<Proxy> proxies = config.getStringList("proxies")
                 .stream()
                 .map(HostAndPort::fromString)
-                .map(proxy -> new InetSocketAddress(proxy.getHost(), proxy.getPort()))
+                .map(proxy -> new InetSocketAddress(proxy.getHostText(), proxy.getPort()))
                 .map(sa -> new Proxy(Type.HTTP, sa))
                 .collect(toSet());
 
@@ -140,22 +103,6 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         resolver.setOutgoingAddresses(addresses);
     }
 
-    private RateLimiter createRateLimiter(Configuration botSection) {
-        boolean enabled = botSection.getBoolean("enabled", true);
-        if (!enabled) {
-            // no-op rate limiter
-            return () -> true;
-        }
-
-        int maxCon = botSection.getInt("anti-bot.connections", 200);
-        long expireTime = botSection.getLong("anti-bot.expire", 5) * 60 * 1_000L;
-        if (expireTime > MAX_EXPIRE_RATE) {
-            expireTime = MAX_EXPIRE_RATE;
-        }
-
-        return new TickingRateLimiter(Ticker.systemTicker(), maxCon, expireTime);
-    }
-
     private Configuration loadFile(String fileName) throws IOException {
         ConfigurationProvider configProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);
 
@@ -171,7 +118,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
             config = configProvider.load(reader, defaults);
         }
 
-        // explicitly add keys here, because Configuration.getKeys doesn't return the keys from the default configuration
+        //explicitly add keys here, because Configuration.getKeys doesn't return the keys from the default configuration
         for (String key : defaults.getKeys()) {
             config.set(key, config.get(key));
         }
@@ -183,7 +130,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         return resolver;
     }
 
-    public SQLStorage getStorage() {
+    public AuthStorage getStorage() {
         return storage;
     }
 
@@ -194,7 +141,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
     public void sendLocaleMessage(String key, C receiver) {
         String message = localeMessages.get(key);
         if (message != null) {
-            plugin.sendMultiLineMessage(receiver, message);
+            plugin.sendMessage(receiver, message);
         }
     }
 
@@ -208,32 +155,16 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
             return false;
         }
 
-        HikariConfig databaseConfig = new HikariConfig();
-        databaseConfig.setDriverClassName(driver);
-
+        String host = config.get("host", "");
+        int port = config.get("port", 3306);
         String database = config.getString("database");
 
-        databaseConfig.setConnectionTimeout(config.getInt("timeout", 30) * 1_000L);
-        databaseConfig.setMaxLifetime(config.getInt("lifetime", 30) * 1_000L);
+        String user = config.get("username", "");
+        String password = config.get("password", "");
 
-        if (driver.contains("sqlite")) {
-            storage = new SQLiteStorage(this, database, databaseConfig);
-        } else {
-            String host = config.get("host", "");
-            int port = config.get("port", 3306);
-            boolean useSSL = config.get("useSSL", false);
-
-            if (useSSL) {
-                databaseConfig.addDataSourceProperty("allowPublicKeyRetrieval", config.getBoolean("allowPublicKeyRetrieval", false));
-                databaseConfig.addDataSourceProperty("serverRSAPublicKeyFile", config.getString("ServerRSAPublicKeyFile"));
-                databaseConfig.addDataSourceProperty("sslMode", config.getString("sslMode", "Required"));
-            }
-
-            databaseConfig.setUsername(config.get("username", ""));
-            databaseConfig.setPassword(config.getString("password"));
-            storage = new MySQLStorage(this, host, port, database, databaseConfig, useSSL);
-        }
+        boolean useSSL = config.get("useSSL", false);
 
+        storage = new AuthStorage(this, driver, host, port, database, user, password, useSSL);
         try {
             storage.createTables();
             return true;
@@ -256,6 +187,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         return false;
     }
 
+
     public Configuration getConfig() {
         return config;
     }
@@ -280,10 +212,6 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         return authPlugin;
     }
 
-    public RateLimiter getRateLimiter() {
-        return rateLimiter;
-    }
-
     public void setAuthPluginHook(AuthPlugin<P> authPlugin) {
         this.authPlugin = authPlugin;
     }
@@ -292,12 +220,14 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         Path dataFolder = plugin.getPluginFolder();
 
         try {
-            Files.createDirectories(dataFolder);
+            if (Files.notExists(dataFolder)) {
+                Files.createDirectories(dataFolder);
+            }
 
             Path configFile = dataFolder.resolve(fileName);
             if (Files.notExists(configFile)) {
                 try (InputStream defaultStream = getClass().getClassLoader().getResourceAsStream(fileName)) {
-                    Files.copy(Objects.requireNonNull(defaultStream), configFile);
+                    Files.copy(defaultStream, configFile);
                 }
             }
         } catch (IOException ioExc) {
@@ -306,9 +236,6 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
     }
 
     public void close() {
-        plugin.getLog().info("Safely shutting down scheduler. This could take up to one minute.");
-        plugin.getScheduler().shutdown();
-
         if (storage != null) {
             storage.close();
         }

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

@@ -1,174 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared;
-
-import com.github.games647.craftapi.model.Profile;
-import com.github.games647.craftapi.resolver.RateLimitException;
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.Optional;
-import java.util.UUID;
-
-import org.geysermc.floodgate.api.player.FloodgatePlayer;
-
-public abstract class FloodgateManagement<P extends C, C, L extends LoginSession, T extends PlatformPlugin<C>>
-        implements Runnable {
-
-    protected final FastLoginCore<P, C, T> core;
-    protected final P player;
-    private final FloodgatePlayer floodgatePlayer;
-    private final String username;
-
-    //config.yml values that might be accessed by multiple methods
-    protected final String autoLoginFloodgate;
-    protected final String autoRegisterFloodgate;
-    protected final String allowNameConflict;
-
-    //variables initialized through run() and accesses by subclasss
-    protected boolean isRegistered;
-    protected StoredProfile profile;
-    protected boolean isLinked;
-
-    public FloodgateManagement(FastLoginCore<P, C, T> core, P player, FloodgatePlayer floodgatePlayer) {
-        this.core = core;
-        this.player = player;
-        this.floodgatePlayer = floodgatePlayer;
-        this.username = getName(player);
-
-        //load values from config.yml
-        autoLoginFloodgate = core.getConfig().get("autoLoginFloodgate").toString().toLowerCase();
-        autoRegisterFloodgate = core.getConfig().get("autoRegisterFloodgate").toString().toLowerCase();
-        allowNameConflict = core.getConfig().get("allowFloodgateNameConflict").toString().toLowerCase();
-    }
-
-    @Override
-    public void run() {
-        core.getPlugin().getLog().info("Player {} is connecting through Geyser Floodgate.", username);
-
-        // check if the Bedrock player is linked to a Java account 
-        isLinked = floodgatePlayer.getLinkedPlayer() != null;
-
-        //this happens on Bukkit if it's connected to Bungee
-        //if that's the case, players will be logged in via plugin messages
-        if (core.getStorage() == null) {
-            return;
-        }
-
-        profile = core.getStorage().loadProfile(username);
-        AuthPlugin<P> authPlugin = core.getAuthPluginHook();
-
-        try {
-            //maybe Bungee without auth plugin
-            if (authPlugin == null) {
-                if (profile != null) {
-                    isRegistered = profile.isPremium();
-                } else {
-                    isRegistered = false;
-                }
-            } else {
-                isRegistered = authPlugin.isRegistered(username);
-            }
-        } catch (Exception ex) {
-            core.getPlugin().getLog().error(
-                    "An error has occured while checking if player {} is registered",
-                    username, ex);
-            return;
-        }
-
-        //decide if checks should be made for conflicting Java player names
-        if (isNameCheckRequired()) {
-            // check for conflicting Premium Java name
-            Optional<Profile> premiumUUID = Optional.empty();
-            try {
-                premiumUUID = core.getResolver().findProfile(username);
-            } catch (IOException | RateLimitException e) {
-                core.getPlugin().getLog().error(
-                        "Could not check whether Floodgate Player {}'s name conflicts a premium Java account's name.",
-                        username, e);
-                return;
-            }
-
-            //stop execution if player's name is conflicting
-            if (premiumUUID.isPresent()) {
-                return;
-            }
-        }
-
-        if (!isRegistered && !isAutoRegisterAllowed()) {
-            return;
-        }
-
-        //logging in from bedrock for a second time threw an error with UUID
-        if (profile == null) {
-            profile = new StoredProfile(getUUID(player), username, true, getAddress(player).toString());
-        }
-
-        //start Bukkit/Bungee specific tasks
-        startLogin();
-
-    }
-
-    /**
-     * Decude if the player can be auto registered.
-     * The config option 'non-conflicting' is ignored by this function.
-     * @return true if the Player can be registered automatically
-     */
-    private boolean isAutoRegisterAllowed() {
-        return "true".equals(autoRegisterFloodgate)
-                || "no-conflict".equals(autoRegisterFloodgate) // this was checked before
-                || ("linked".equals(autoRegisterFloodgate) && isLinked);
-    }
-
-    /**
-     * Decides wether checks for conflicting Java names should be made
-     * @return ture if an API call to Mojang is needed
-     */
-    private boolean isNameCheckRequired() {
-        //linked players have the same name as their Java profile
-        //OR
-        //if allowNameConflict is 'false' or 'linked' and the player had a conflicting
-        //name, than they would have been kicked in FloodgateHook#checkNameConflict
-        if (isLinked || !"true".equals(allowNameConflict)) {
-            return false;
-        }
-
-        //autoRegisterFloodgate should only be checked if then player is not yet registered
-        if (!isRegistered && "no-conflict".equals(autoRegisterFloodgate)) {
-            return true;
-        }
-
-        return "no-conflict".equals(autoLoginFloodgate);
-    }
-
-    protected abstract void startLogin();
-    protected abstract String getName(P player);
-    protected abstract UUID getUUID(P player);
-    protected abstract InetSocketAddress getAddress(P player);
-
-}

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

@@ -1,34 +1,8 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared;
 
-import com.github.games647.fastlogin.core.storage.SQLStorage;
+import com.github.games647.fastlogin.core.AuthStorage;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
 
 public abstract class ForceLoginManagement<P extends C, C, L extends LoginSession, T extends PlatformPlugin<C>>
         implements Runnable {
@@ -45,17 +19,11 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
 
     @Override
     public void run() {
-        if (!isOnline(player)) {
-            core.getPlugin().getLog().info("Player {} disconnected", player);
+        if (!isOnline(player) || session == null) {
             return;
         }
 
-        if (session == null) {
-            core.getPlugin().getLog().info("No valid session found for {}", player);
-            return;
-        }
-
-        SQLStorage storage = core.getStorage();
+        AuthStorage storage = core.getStorage();
         StoredProfile playerProfile = session.getProfile();
         try {
             if (isOnlineMode()) {
@@ -72,7 +40,7 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
                                 || (core.getConfig().get("auto-register-unknown", false)
                                 && !authPlugin.isRegistered(playerName))) {
                             success = forceRegister(player);
-                        } else if (!callFastLoginAutoLoginEvent(session, playerProfile).isCancelled()) {
+                        } else {
                             success = forceLogin(player);
                         }
                     }
@@ -125,8 +93,6 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
         return success;
     }
 
-    public abstract FastLoginAutoLoginEvent callFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile);
-
     public abstract void onForceActionSuccess(LoginSession session);
 
     public abstract String getName(P player);

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

@@ -1,36 +1,9 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared;
 
 import com.github.games647.craftapi.model.Profile;
 import com.github.games647.craftapi.resolver.RateLimitException;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import com.github.games647.fastlogin.core.hooks.bedrock.BedrockService;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
 
 import java.util.Optional;
 
@@ -40,31 +13,18 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
 
     protected final FastLoginCore<P, C, ?> core;
     protected final AuthPlugin<P> authHook;
-    private final BedrockService<?> bedrockService;
 
-    public JoinManagement(FastLoginCore<P, C, ?> core, AuthPlugin<P> authHook, BedrockService<?> bedrockService) {
+    public JoinManagement(FastLoginCore<P, C, ?> core, AuthPlugin<P> authHook) {
         this.core = core;
         this.authHook = authHook;
-        this.bedrockService = bedrockService;
     }
 
     public void onLogin(String username, S source) {
-        core.getPlugin().getLog().info("Handling player {}", username);
         StoredProfile profile = core.getStorage().loadProfile(username);
         if (profile == null) {
             return;
         }
 
-        //check if the player is connecting through Bedrock Edition
-        if (bedrockService != null && bedrockService.isBedrockConnection(username)) {
-            //perform Bedrock specific checks and skip Java checks, if they are not needed
-            if (bedrockService.performChecks(username, source)) {
-                return;
-            }
-        }
-
-        callFastLoginPreLoginEvent(username, source, profile);
-
         Configuration config = core.getConfig();
 
         String ip = source.getAddress().getAddress().getHostAddress();
@@ -72,12 +32,9 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         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);
-                    }
+                    startCrackedSession(source, profile, username);
                 }
             } else {
                 if (core.getPendingLogin().remove(ip + username) != null && config.get("secondAttemptCracked", false)) {
@@ -115,16 +72,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         }
     }
 
-    protected boolean isValidUsername(LoginSource source, StoredProfile profile) throws Exception {
-        if (bedrockService != null && bedrockService.isUsernameForbidden(profile)) {
-            core.getPlugin().getLog().info("Floodgate Prefix detected on cracked player");
-            source.kick("Your username contains illegal characters");
-            return false;
-        }
-
-        return true;
-    }
-
     private boolean checkPremiumName(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))) {
@@ -154,8 +101,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         return false;
     }
 
-    public abstract FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, S source, StoredProfile profile);
-
     public abstract void requestPremiumLogin(S source, StoredProfile profile, String username, boolean registered);
 
     public abstract void startCrackedSession(S source, StoredProfile profile, String username);

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

@@ -1,70 +1,34 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared;
 
 import com.github.games647.fastlogin.core.StoredProfile;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 
 import java.util.UUID;
 
 public abstract class LoginSession {
 
+    private final String username;
     private final StoredProfile profile;
-
-    private String requestUsername;
-    private String username;
+    
     private UUID uuid;
 
     protected boolean registered;
 
-    public LoginSession(String requestUsername, boolean registered, StoredProfile profile) {
-        this.requestUsername = requestUsername;
-        this.username = requestUsername;
-
+    public LoginSession(String username, boolean registered, StoredProfile profile) {
+        this.username = username;
         this.registered = registered;
         this.profile = profile;
     }
 
-    public String getRequestUsername() {
-        return requestUsername;
-    }
-
     public String getUsername() {
         return username;
     }
 
-    public synchronized void setVerifiedUsername(String username) {
-        this.username = username;
-    }
-
     /**
-     * @return This value is always false if we authenticate the player with a cracked authentication
+     * This value is always false if we authenticate the player with a cracked authentication
+     *
+     * @return
      */
-    public synchronized boolean needsRegistration() {
+    public boolean needsRegistration() {
         return !registered;
     }
 
@@ -92,12 +56,11 @@ public abstract class LoginSession {
 
     @Override
     public synchronized String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("profile", profile)
-                .add("requestUsername", requestUsername)
-                .add("username", username)
-                .add("uuid", uuid)
-                .add("registered", registered)
-                .toString();
+        return this.getClass().getSimpleName() + '{' +
+                "username='" + username + '\'' +
+                ", profile=" + profile +
+                ", uuid=" + uuid +
+                ", registered=" + registered +
+                '}';
     }
 }

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

@@ -1,35 +1,10 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared;
 
 import java.net.InetSocketAddress;
 
 public interface LoginSource {
 
-    void enableOnlinemode() throws Exception;
+    void setOnlineMode() throws Exception;
 
     void kick(String message) throws Exception;
 

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

@@ -1,34 +1,5 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared;
 
-import com.github.games647.fastlogin.core.AsyncScheduler;
-import com.github.games647.fastlogin.core.hooks.bedrock.BedrockService;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
 import java.nio.file.Path;
 import java.util.concurrent.ThreadFactory;
 
@@ -44,24 +15,7 @@ public interface PlatformPlugin<C> {
 
     void sendMessage(C receiver, String message);
 
-    AsyncScheduler getScheduler();
-
-    boolean isPluginInstalled(String name);
-
-    default void sendMultiLineMessage(C receiver, String message) {
-        for (String line : message.split("%nl%")) {
-            sendMessage(receiver, line);
-        }
-    }
-
-    BedrockService<?> getBedrockService();
-
     default ThreadFactory getThreadFactory() {
-        return new ThreadFactoryBuilder()
-                .setNameFormat(getName() + " Pool Thread #%1$d")
-                // Hikari create daemons by default and we could daemon threads for our own scheduler too
-                // because we safely shutdown
-                .setDaemon(true)
-                .build();
+        return null;
     }
 }

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

@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSession;
-
-public interface FastLoginAutoLoginEvent extends FastLoginCancellableEvent {
-    LoginSession getSession();
-    StoredProfile getProfile();
-}

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

@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared.event;
-
-public interface FastLoginCancellableEvent {
-
-    boolean isCancelled();
-    void setCancelled(boolean cancelled);
-}

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

@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2021 <Your name 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.shared.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSource;
-
-public interface FastLoginPreLoginEvent {
-
-    String getUsername();
-    LoginSource getSource();
-    StoredProfile getProfile();
-}