More debug calls to set the premiumUUID

affects only ProtocolSupport

.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 

.gitignore

@@ -1,38 +1,22 @@
-# Eclipse stuff
-/.classpath
-/.project
-/.settings
+# Eclipse
+.classpath
+.project
+.settings/
 
-# netbeans
-/nbproject
+# NetBeans
+nbproject/
 nb-configuration.xml
-/bukkit/nbproject/
 
-# maven
-/target
-
-# vim
-.*.sw[a-p]
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# various other potential build files
-/build
-/bin
-/dist
-/manifest.mf
-*.log
-
-# Mac filesystem dust
-.DS_Store
-
-# intellij
+# IntelliJ
 *.iml
 *.ipr
 *.iws
 .idea/
 
+# Maven
+target/
+pom.xml.versionsBackup
+
 # Gradle
 .gradle
 
@@ -42,8 +26,19 @@ gradle-app.setting
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 
-# Project module targets
-bukkit/target
-universal/target
-bungee/target
-core/target
+# various other potential build files
+build/
+bin/
+dist/
+manifest.mf
+*.log
+
+# Vim
+.*.sw[a-p]
+
+# virtual machine crash logs, see https://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Mac filesystem dust
+.DS_Store
+

.travis.yml

@@ -1,12 +1,13 @@
-# Use https://travis-ci.org/ for automatic tests
+# Use https://travis-ci.org/ for automatic testing
 
-# speed up testing http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
+# 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 compile test
+script: mvn test -B
 
-# We run on 8
-jdk: [oraclejdk8]
+jdk:
+  - oraclejdk8
+  - oraclejdk9

CHANGELOG.md

@@ -1,4 +1,44 @@
-######1.9
+### 1.11
+
+* 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
+* Fix address rotating for contacting the Mojang API
+* Optimize issue template
+* Use Instant for timestamps
+* Migrate SLF4J logging (Fixes #177)
+* Use Gson's TypeAdapter for more type safety
+* Add support for IPv6 proxies
+* Shared configuration implementation for easier maintained code
+* Use Gson for json parsing, because it's supported on all platforms and removes code duplicates
+* Clean up project code
+* Drop support for deprecated AuthMe API
+* Remove legacy database migration code
+* Drop support for RoyalAuth, because it doesn't seem to be supported anymore
+* Clean up client-server encryption -> use only one cipher per connection, simplify code
+
+### 1.10
+
+* Prevent authentication proxies
+* Drop database importer
+* More logging by default
+* Add support for HTTP proxies
+* Set the fake offline UUID on lowest priority (-> as soon as possible)
+* Remove bungee chatcolor for Bukkit to support KCauldron
+* Minor cleanup using inspections + Https
+* Increase hook delay to let ProtocolLib inject the listener
+* Drop support for old AuthMe API + Add support for new AuthMe API
+* Remove eBean util usage to make it compatible with 1.12
+* Do not try to hook into a plugin if auth plugin hook is already set using the FastLogin API
+* Automatically register accounts if they are not in the auth plugin database but in the FastLogin database
+* Update BungeeAuth dependency and use the new API. Please update your plugin if you still use the old one.
+* Remove deprecated API methods from the last version
+* Finally update the IP column on every login
+* No duplicate session login
+* Fix timestamp parsing in newer versions of SQLite
+* Fix Spigot console command invocation sends result to in game players
+
+### 1.9
 
 * Added second attempt login -> cracked login
 * Added cracked whitelist (switch-mode -> switching to online-mode from offlinemode)
@@ -6,7 +46,7 @@
 * Added missing add-premium-other message
 * Upgrade to Java 8 -> Minimize file size
 * Refactored/Cleaned up a lot of code
-* [API] Deprecated platform specific authplugin. Please use AuthPlugin< platform specific player type >
+* [API] Deprecated platform specific auth-plugin. Please use AuthPlugin< platform specific player type >
 * [API] Deprecated bukkit's password generator. Please use PasswordGenerator< platform specific player type >
 * Fix ProtocolSupport autoRegister
 * Fix update username in FastLogin database after nameChange
@@ -17,7 +57,7 @@
 * Drop support for LoginSecurity 1.X since 2.X seems to be stable
 * Remove the nasty UltraAuth fakeplayer workaround by using a new api method. You should UltraAuth if you have it
 
-######1.8
+### 1.8
 
 * Added autoIn importer
 * Added BFA importer
@@ -26,12 +66,12 @@
 * Fix ProtocolSupport BungeeCord
 * Fix duplicate logins for BungeeAuth users
 
-######1.7.1
+### 1.7.1
 
 * Fix BungeeCord autoRegister (Fixes #46)
-* Fix protocollsupport autoregister
+* Fix ProtocolSupport auto-register
 
-######1.7
+### 1.7
 
 * Added support for making requests to Mojang from different IPv4 addresses
 * Added us.mcapi.com as third-party APIs to workaround rate-limits
@@ -44,15 +84,15 @@
 * Fix setting skin on Cauldron
 * Fix saving on name change
 
-######1.6.2
+### 1.6.2
 
 * Fixed support for new LoginSecurity version
 
-######1.6.1
+### 1.6.1
 
 * Fix message typo in BungeeCord which created a NPE if premium-warning is activated
 
-######1.6
+### 1.6
 
 * Add a warning message if the user tries to invoke the premium command
 * Added missing translation if the server isn't fully started
@@ -63,34 +103,34 @@
 * Fixed cracked command not working on BungeeCord
 * Fix error if forward skins is disabled
 
-######1.5.2
+### 1.5.2
 
 * Fixed BungeeCord force logins if there is a lobby server
 * Removed cache expire in BungeeCord
 * Applies skin earlier to make it visible for other plugins listening on login events
 
-######1.5.1
+### 1.5.1
 
 * Fixed BungeeCord support by correctly saving the proxy ids
 
-######1.5
+### 1.5
 
 * Added localization
 * Fixed NPE on premium name check if it's pure cracked player
 * Fixed NPE in BungeeCord on cracked login for existing players
 * Fixed saving of existing cracked players
 
-######1.4
+### 1.4
 
 * Added Bungee setAuthPlugin method
 * Added nameChangeCheck
 * Multiple BungeeCord support
 
-######1.3.1
+### 1.3.1
 
 * Prevent thread create violation in BungeeCord
 
-######1.3
+### 1.3
 
 * Added support for AuthMe 3.X
 * Fixed premium logins if the server is not fully started
@@ -99,11 +139,11 @@
 * Fixed 1.7 Minecraft support by removing guava 11+ only features -> Cauldron support
 * Fixed BungeeCord support in Cauldron
 
-######1.2.1
+### 1.2.1
 
 * Fix premium status change notification message on BungeeCord
 
-######1.2
+### 1.2
 
 * Fix race condition in BungeeCord
 * Fix dead lock in xAuth
@@ -111,20 +151,20 @@
 * Added API methods for plugins to set their own auth plugin hook
 => Added support for AdvancedLogin
 
-######1.1
+### 1.1
 
 * Make the configuration options also work under BungeeCord (premiumUUID, forwardSkin)
 * Catch configuration loading exception if it's not spigot build
 * Fix config loading for older Spigot builds
 
-######1.0
+### 1.0
 
 * Massive refactor to handle errors on force actions safely
 * force Methods now runs async too
 * force methods now returns a boolean to reflect if the method was successful
 * isRegistered method should now throw an exception if the plugin was unable to query the requested data
 
-######0.8
+### 0.8
 
 * Fixed BungeeCord support for the Bukkit module
 * Added database storage to save the premium state
@@ -132,7 +172,7 @@
 * Fixed issues with host lookup from hosts file (Thanks to @NorbiPeti)
 * Remove handshake listener because it creates errors on some systems
 
-######0.7
+### 0.7
 
 * Added BungeeAuth support
 * Added /premium [player] command with optional player parameter
@@ -143,69 +183,69 @@
 * Removes the need of an Bukkit auth plugin if you use a bungeecord one
 * Optimize performance and thread-safety
 * Fixed BungeeCord support
-* Changed config option autologin to autoregister to clarify the usage
+* Changed config option auto-login to auto-register to clarify the usage
 
-######0.6
+### 0.6
 
 * Fixed 1.9 bugs
 * Added UltraAuth support
 
-######0.5
+### 0.5
 
-* Added unpremium command
-* Added autologin - See config
+* Added cracked command
+* Added auto-login - See config
 * Added config
 * Added isRegistered API method
 * Added forceRegister API method
 
 * Fixed CrazyLogin player data restore -> Fixes memory leaks with this plugin
-* Fixed premium name check to protocolsupport
+* Fixed premium name check to ProtocolSupport
 * Improved permissions management
 
-######0.4
+### 0.4
 
 * Added forward premium skin
-* Added plugin support for protocolsupport
+* Added plugin support for ProtocolSupport
 
-######0.3.2
+### 0.3.2
 
 * Run packet readers in a different thread (separated from the Netty I/O Thread)
 -> Improves performance
 * Fixed Plugin disable if the server is in online mode but have to be in offline mode
 
-######0.3.1
+### 0.3.1
 
 * Improved BungeeCord security
 
-#####0.3
+### 0.3
 
 * Added BungeeCord support
 * Decrease timeout checks in order to fail faster on connection problems
 * Code style improvements
 
-######0.2.4
+### 0.2.4
 
 * Fixed NPE on invalid sessions
 * Improved security by generating a randomized serverId
 * Removed /premium [player] because it's safer for premium players who join without registration
 
-######0.2.3
+### 0.2.3
 
-* Remove useless AuthMe forcelogin code
+* Remove useless AuthMe force-login code
 * Send a kick message to the client instead of just "Disconnect"
 * Reformat source code
 * Fix thread safety for fake start packets (Bukkit.getOfflinePlayer doesn't look like to be thread-safe)
 * Added more documentation
 
-######0.2.2
+### 0.2.2
 
 * Compile project with Java 7 :(
 
-######0.2.1
+### 0.2.1
 * A couple of security fixes (premium players cannot longer steal the account of a cracked account)
 * Added a /premium command to mark you as premium player
 
-#####0.2
+### 0.2
 
 * Added support for CrazyLogin and LoginSecurity
 * Now minecraft version independent
@@ -214,5 +254,5 @@
 * More state validation
 * Added better error handling
 
-#####0.1
+### 0.1
 * First release

LICENSE

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

@@ -1,12 +1,9 @@
 # FastLogin
 
-[![Build Status](https://travis-ci.org/games647/FastLogin.svg?branch=master)](https://travis-ci.org/games647/FastLogin)
-[![Donate Button](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8ZBULMAPN7MZC)
-
 Checks if a Minecraft player has a paid account (premium). If so, they can skip offline authentication (auth plugins).
 So they don't need to enter passwords. This is also called auto login (auto-login).
 
-###Features:
+## Features
 
 * Detect paid accounts from others
 * Automatically login paid accounts (premium)
@@ -23,162 +20,77 @@ So they don't need to enter passwords. This is also called auto login (auto-logi
 * Good performance by using async non blocking operations
 * Locale messages
 * Import the database from similar plugins
-* Free
-* Open source
+
+## Development builds
+
+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.
+
+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
 
 ***
 
-###Commands:
-    * /premium [player] Label the invoker or the argument as paid account
-    * /cracked [player] Label the invoker or the argument as cracked account
-    * /importdb <autoIn/bpa/eldzi> <mysql/sqlite> [host:port] [database] [username] [password] - Imports the database from another plugin
+## Commands
 
-###Permissions:
-    * fastlogin.bukkit.command.premium
-    * fastlogin.bukkit.command.cracked
-    * fastlogin.command.premium.other
-    * fastlogin.command.cracked.other
-    * fastlogin.command.import
+    /premium [player] Label the invoker or the argument as paid account
+    /cracked [player] Label the invoker or the argument as cracked account
 
-###Requirements:
-* Plugin: [ProtocolLib](http://www.spigotmc.org/resources/protocollib.1997/) or [ProtocolSupport](http://www.spigotmc.org/resources/protocolsupport.7201/)
-* Tested Bukkit/[Spigot](https://www.spigotmc.org) 1.9 (could also work with other versions)
-* Java 7+
+## Permissions
+
+    fastlogin.bukkit.command.premium
+    fastlogin.bukkit.command.cracked
+    fastlogin.command.premium.other
+    fastlogin.command.cracked.other
+
+## Requirements
+
+* Plugin: 
+    * [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/) or 
+    * [ProtocolSupport](https://www.spigotmc.org/resources/protocolsupport.7201/)
+* [Spigot](https://www.spigotmc.org) 1.7.10+
+* Java 8+
 * Run Spigot and/or BungeeCord/Waterfall in offline mode (see server.properties or config.yml)
 * An auth plugin. Supported plugins
 
-####Bukkit/Spigot/PaperSpigot
+### Bukkit/Spigot/Paper
 
-* [AuthMe (both 5.X and 3.X)](http://dev.bukkit.org/bukkit-plugins/authme-reloaded/)
-* [xAuth](http://dev.bukkit.org/bukkit-plugins/xauth/)
-* [LogIt](https://github.com/XziomekX/LogIt)
+* [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](http://dev.bukkit.org/bukkit-plugins/crazylogin/)
-* [LoginSecurity](http://dev.bukkit.org/bukkit-plugins/loginsecurity/)
-* [RoyalAuth](http://dev.bukkit.org/bukkit-plugins/royalauth/)
-* [UltraAuth](http://dev.bukkit.org/bukkit-plugins/ultraauth-aa/)
+* [CrazyLogin](https://dev.bukkit.org/bukkit-plugins/crazylogin/)
+* [LoginSecurity](https://dev.bukkit.org/bukkit-plugins/loginsecurity/)
+* [UltraAuth](https://dev.bukkit.org/bukkit-plugins/ultraauth-aa/)
 
-####BungeeCord/Waterfall
+### BungeeCord/Waterfall
 
 * [BungeeAuth](https://www.spigotmc.org/resources/bungeeauth.493/)
 
-###Downloads
-
-https://www.spigotmc.org/resources/fastlogin.14153/history
-
 ***
 
-###How to install
+## How to install
 
-####Bukkit/Spigot/PaperSpigot
+### Bukkit/Spigot/Paper
 
-1. Download and install ProtocolLib
-2. Download and install FastLogin
+1. Download and install ProtocolLib/ProtocolSupport
+2. Download and install FastLogin (or FastLoginBukkit for newer versions)
 3. Set your server in offline mode by setting the value onlinemode in your server.properties to false
 
-####BungeeCord/Waterfall
+### BungeeCord/Waterfall
 
 1. Activate BungeeCord in the Spigot configuration
 2. Restart your server
 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 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 your proxy (BungeeCord) in offline mode by setting the value onlinemode in your config.yml to false
-8. (BungeeCord doesn't support SQLite per default, so you should change the configuration to MySQL or MariaDB)
-
-***
-
-###FAQ
-
-####Index
-1. [How does Minecraft logins work?](#how-does-minecraft-logins-work)
-2. [How does this plugin work?](#how-does-this-plugin-work)
-3. [Why does the plugin require offline mode?](#why-does-the-plugin-require-offline-mode)
-4. [Can cracked player join with premium usernames?](#can-cracked-player-join-with-premium-usernames)
-5. [Why do players have to invoke a command?](#why-do-players-have-to-invoke-a-command)
-6. [What happens if a paid account joins with a used username?](#what-happens-if-a-paid-account-joins-with-a-used-username)
-7. [Does the plugin have BungeeCord support?](#does-the-plugin-have-bungeecord-support)
-8. [Could premium players have a premium UUID and Skin?](#could-premium-players-have-a-premium-uuid-and-skin)
-9. [Is this plugin compatible with Cauldron?](#is-this-plugin-compatible-with-cauldron)
-
-####How does minecraft logins work?
-######Online Mode
-1. Client -> Server: I want to login, here is my username
-2. Server -> Client: Okay. I'm in online mode so here is my public key for encryption and my serverid
-3. Client -> Mojang: I'm player "xyz". I want to join a server with that serverid
-4. Mojang -> Client: Session data checked. You can continue
-5. Client -> Server: I received a successful response from Mojang. Heres our shared secret key
-6. Server -> Mojang: Does the player "xyz" with this shared secret key has a valid account to join me?
-7. Mojang -> Server: Yes, the player has the following additionally properties (UUID, Skin)
-8. Client and Server: encrypt all following communication packet
-9. Server -> Client: Everything checked you can play now
-
-
-######Offline Mode
-In offline mode step 2-7 is skipped. So a login request is directly followed by 8.
-
-######More details
-http://wiki.vg/Protocol#Login
-
-####How does this plugin work?
-By using ProtocolLib, this plugin works as a proxy between the client and server. This plugin will fake that the server
-runs in online mode. It does everything an online mode server would do. This will be for example, generating keys or
-checking for valid sessions. Because everything is the same compared to an offline mode login after an encrypted
-connection, we will intercept only **login** packets of **premium** players.
-
-1. Player is connecting to the server.
-2. Plugin checks if the username we received activated the fast login method (i.e. using command)
-3. Run a check if the username is currently used by a paid account.
-(We don't know yet if the client connecting is premium)
-4. Request an Mojang Session Server authentication
-5. On response check if all data is correct
-6. Encrypt the connection
-7. On success intercept all related login packets and fake a new login packet as a normal offline login
-
-####Why does the plugin require offline mode?
-1. As you can see in the question "how does minecraft login works", offline mode is equivalent to online mode except of
-the encryption and session checks on login. So we can intercept and cancel the first packets for premium players and
-enable an encrypted connection. Then we send a new fake packet in order to pretend that this a new login request from
-a offline mode player. The server will handle the rest.
-2. Some plugins check if the server is in online mode. If so, they could process the real offline (cracked) accounts
-incorrectly. For example, a plugin tries to fetch the UUID from Mojang, but the name of the player is not associated to
-a paid account.
-3. Servers, who allow cracked players and just speed up logins for premium players, are **already** in offline mode.
-
-####Can cracked player join with premium usernames?
-Yes, indeed. Therefore the command for toggling the fast login method exists.
-
-####Why do players have to invoke a command?
-1. It's a secure way to make sure a person with a paid account cannot steal the account
-of a cracked player that has the same username. The player have to proof first that it's his own account.
-2. We only receive the username from the player on login. We could check if that username is associated
-to a paid account but if we request a online mode login from a cracked player (who uses a username from
-a paid account), the player will disconnect with the reason "bad login" or "Invalid session". There is no way to change
-that message on the server side (without client modifications), because it's a connection between the Client and the
-Sessionserver.
-3. If a premium player would skip registration too, a player of a cracked account could later still register the
-account and would claim and steal the account from the premium player. Because commands cannot be invoked unless the
-player has a account or is logged in, protects this method also premium players
-
-###What happens if a paid account joins with a used username?
-The player on the server have to activate the feature of this plugin by command. If a person buys the username
-of his own account, it's still secured. A normal offline mode login makes sure he's the owner of the server account
-and Mojang account. Then the command can be executed. So someone different cannot steal the account of cracked player
-by buying the username.
-
-####Does the plugin have BungeeCord support?
-Yes it has. See the how to install above.
-
-####Could premium players have a premium UUID and Skin?
-Since 0.7 both features are implemented. You can check the config.yml in order to activate it.
-
-####Is this plugin compatible with Cauldron?
-It's not tested yet, but all needed methods also exists in Cauldron so it could work together.
-
-***
-
-###Useful Links:
-* [Login Protocol](http://wiki.vg/Protocol#Login)
-* [Protocol Encryption](http://wiki.vg/Protocol_Encryption)
+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

bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.9</version>
+        <version>1.11-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -15,6 +15,46 @@
 
     <name>FastLoginBukkit</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <shadedArtifactAttached>false</shadedArtifactAttached>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.zaxxer.hikari</pattern>
+                            <shadedPattern>fastlogin.hikari</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.slf4j</pattern>
+                            <shadedPattern>fastlogin.slf4j</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>net.md_5.bungee.config</pattern>
+                            <shadedPattern>fastlogin.config</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.google.gson</pattern>
+                            <shadedPattern>fastlogin.gson</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <repositories>
         <!--Bukkit-Server-API -->
         <repository>
@@ -34,38 +74,38 @@
             <url>http://repo.dmulloy2.net/content/groups/public/</url>
         </repository>
 
-        <!--Authme Reloaded-->
+        <!--AuthMe Reloaded and xAuth -->
         <repository>
-            <id>xephi-repo</id>
-            <url>http://ci.xephi.fr/plugin/repository/everything/</url>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
 
-        <!--xAuth-->
-        <repository>
-            <id>luricos.de-repo</id>
-            <url>http://repo.luricos.de/bukkit-plugins/</url>
-        </repository>
-
-        <!--Github automatic maven builds-->
+        <!--GitHub automatic maven builds-->
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+
+        <!--PlaceholderAPI -->
+        <repository>
+            <id>placeholderapi</id>
+            <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+        </repository>
     </repositories>
 
     <dependencies>
+        <!--Common plugin component-->
         <dependency>
             <groupId>com.github.games647</groupId>
             <artifactId>fastlogin.core</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
 
         <!--Server API-->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.10-R0.1-SNAPSHOT</version>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -73,21 +113,40 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>3.6.5</version>
+            <version>4.3.0</version>
+            <scope>provided</scope>
         </dependency>
 
-	<dependency>
-	    <groupId>com.github.ProtocolSupport</groupId>
-	    <artifactId>ProtocolSupport</artifactId>
+        <!--Changing onlinemode on login process-->
+        <dependency>
+            <groupId>com.github.ProtocolSupport</groupId>
+            <artifactId>ProtocolSupport</artifactId>
             <!--4.25.dev-->
-	    <version>5554413b51</version>
-	</dependency>
+            <version>a4f060dc46</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--Provide premium placeholders-->
+        <dependency>
+            <groupId>me.clip</groupId>
+            <artifactId>placeholderapi</artifactId>
+            <version>2.8.5</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!--Login Plugins-->
         <dependency>
             <groupId>fr.xephi</groupId>
             <artifactId>authme</artifactId>
-            <version>5.2-SNAPSHOT</version>
+            <version>5.4.0</version>
+            <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -100,7 +159,8 @@
         <dependency>
             <groupId>com.lenis0012.bukkit</groupId>
             <artifactId>loginsecurity</artifactId>
-            <version>2.1.3-SNAPSHOT</version>
+            <version>2.1.7</version>
+            <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -110,24 +170,11 @@
             </exclusions>
         </dependency>
 
-	<dependency>
-	    <groupId>com.github.games647</groupId>
-	    <artifactId>LogIt</artifactId>
-	    <version>9e3581db27</version>
-            <optional>true</optional>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-	</dependency>
-
         <dependency>
-            <groupId>com.github.RoyalDev</groupId>
-            <artifactId>RoyalAuth</artifactId>
-            <version>-e21354a9b7-1</version>
+            <groupId>com.github.games647</groupId>
+            <artifactId>LogIt</artifactId>
+            <version>9e3581db27</version>
+            <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -141,6 +188,7 @@
             <groupId>de.luricos.bukkit</groupId>
             <artifactId>xAuth</artifactId>
             <version>2.6</version>
+            <scope>provided</scope>
             <optional>true</optional>
             <!--These artifacts produce conflicts on downloading-->
             <exclusions>

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

@@ -1,72 +0,0 @@
-package com.github.games647.fastlogin.bukkit;
-
-import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.github.games647.fastlogin.core.shared.MojangApiConnector;
-import com.google.common.base.Charsets;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import java.io.File;
-import java.io.InputStreamReader;
-import java.util.List;
-import java.util.concurrent.ThreadFactory;
-import java.util.logging.Logger;
-
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-
-public class BukkitCore extends FastLoginCore<Player> {
-
-    private final FastLoginBukkit plugin;
-
-    public BukkitCore(FastLoginBukkit plugin) {
-        super(plugin.getConfig().getValues(false));
-
-        this.plugin = plugin;
-    }
-
-    @Override
-    public File getDataFolder() {
-        return plugin.getDataFolder();
-    }
-
-    @Override
-    public Logger getLogger() {
-        return plugin.getLogger();
-    }
-
-    @Override
-    public ThreadFactory getThreadFactory() {
-        String pluginName = plugin.getName();
-        return new ThreadFactoryBuilder()
-                .setNameFormat(pluginName + " Database Pool Thread #%1$d")
-                //Hikari create daemons by default
-                .setDaemon(true)
-                .build();
-    }
-
-    @Override
-    public void loadMessages() {
-        plugin.saveResource("messages.yml", false);
-
-        File messageFile = new File(plugin.getDataFolder(), "messages.yml");
-        YamlConfiguration messageConfig = YamlConfiguration.loadConfiguration(messageFile);
-
-        InputStreamReader defaultReader = new InputStreamReader(plugin.getResource("messages.yml"), Charsets.UTF_8);
-        YamlConfiguration defaults = YamlConfiguration.loadConfiguration(defaultReader);
-
-        messageConfig.setDefaults(defaults);
-
-        messageConfig.getKeys(false).forEach((key) -> {
-            String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
-            if (!message.isEmpty()) {
-                localeMessages.put(key, message);
-            }
-        });
-    }
-
-    @Override
-    public MojangApiConnector makeApiConnector(Logger logger, List<String> addresses, int requests) {
-        return new MojangApiBukkit(logger, addresses, requests);
-    }
-}

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

@@ -1,8 +1,11 @@
 package com.github.games647.fastlogin.bukkit;
 
-import com.github.games647.fastlogin.core.PlayerProfile;
+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;
 
 /**
@@ -17,40 +20,26 @@ public class BukkitLoginSession extends LoginSession {
 
     private boolean verified;
 
-    private String encodedSkinData;
-    private String skinSignature;
+    private Property skinProperty;
 
     public BukkitLoginSession(String username, String serverId, byte[] verifyToken, boolean registered
-            , PlayerProfile profile) {
+            , StoredProfile profile) {
         super(username, registered, profile);
 
         this.serverId = serverId;
         this.verifyToken = ArrayUtils.clone(verifyToken);
     }
 
-    //available for bungeecord
+    //available for BungeeCord
     public BukkitLoginSession(String username, boolean registered) {
         this(username, "", ArrayUtils.EMPTY_BYTE_ARRAY, registered, null);
     }
 
     //cracked player
-    public BukkitLoginSession(String username, PlayerProfile profile) {
+    public BukkitLoginSession(String username, StoredProfile profile) {
         this(username, "", ArrayUtils.EMPTY_BYTE_ARRAY, false, profile);
     }
 
-    /**
-     * Gets the random generated server id. This makes sure the request sent from the client is just for this server.
-     *
-     * See this for details http://www.sk89q.com/2011/09/minecraft-name-spoofing-exploit/
-     *
-     * Empty if it's a BungeeCord connection
-     *
-     * @return random generated server id
-     */
-    public String getServerId() {
-        return serverId;
-    }
-
     /**
      * Gets the verify token the server sent to the client.
      *
@@ -62,23 +51,19 @@ public class BukkitLoginSession extends LoginSession {
         return ArrayUtils.clone(verifyToken);
     }
 
-    public synchronized String getEncodedSkinData() {
-        return encodedSkinData;
-    }
-
-    public synchronized String getSkinSignature() {
-        return skinSignature;
+    /**
+     * @return premium skin if available
+     */
+    public synchronized Optional<Property> getSkin() {
+        return Optional.ofNullable(skinProperty);
     }
 
     /**
      * Sets the premium skin property which was retrieved by the session server
-     *
-     * @param encodedData
-     * @param skinSignature
+     * @param skinProperty premium skin
      */
-    public synchronized void setSkin(String encodedData, String skinSignature) {
-        this.encodedSkinData = encodedData;
-        this.skinSignature = skinSignature;
+    public synchronized void setSkinProperty(Property skinProperty) {
+        this.skinProperty = skinProperty;
     }
 
     /**

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

@@ -1,8 +1,8 @@
 package com.github.games647.fastlogin.bukkit;
 
-import com.google.common.base.Charsets;
-
-import java.security.InvalidKeyException;
+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;
@@ -10,28 +10,35 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
-import java.util.stream.Stream;
+import java.util.Random;
 
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
 /**
  * Encryption and decryption minecraft util for connection between servers
- * and paid minecraft account clients.
+ * and paid Minecraft account clients.
  *
- * Source: https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/MinecraftEncryption.java
- *
- * Remapped by: https://github.com/Techcable/MinecraftMappings/tree/master/1.8
+ * @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("RSA");
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KEY_PAIR_ALGORITHM);
 
             keyPairGenerator.initialize(1_024);
             return keyPairGenerator.generateKeyPair();
@@ -41,82 +48,74 @@ public class EncryptionUtil {
         }
     }
 
-    public static byte[] getServerIdHash(String serverId, PublicKey publicKey, SecretKey secretKey) {
-        return digestOperation("SHA-1"
-                , new byte[][]{serverId.getBytes(Charsets.ISO_8859_1), secretKey.getEncoded(), publicKey.getEncoded()});
+    /**
+     * 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;
     }
 
-    private static byte[] digestOperation(String algo, byte[]... content) {
+    /**
+     * 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 {
-            MessageDigest messagedigest = MessageDigest.getInstance(algo);
-            Stream.of(content).forEach(messagedigest::update);
-
-            return messagedigest.digest();
-        } catch (NoSuchAlgorithmException nosuchalgorithmexception) {
-            nosuchalgorithmexception.printStackTrace();
-            return null;
-        }
-    }
-
-//    public static PublicKey decodePublicKey(byte[] encodedKey) {
-//        try {
-//            KeyFactory keyfactory = KeyFactory.getInstance("RSA");
-//
-//            X509EncodedKeySpec x509encodedkeyspec = new X509EncodedKeySpec(encodedKey);
-//            return keyfactory.generatePublic(x509encodedkeyspec);
-//        } catch (NoSuchAlgorithmException | InvalidKeySpecException nosuchalgorithmexception) {
-//            //ignore
-//        }
-//
-//        System.err.println("Public key reconstitute failed!");
-//        return null;
-//    }
-
-    public static SecretKey decryptSharedKey(PrivateKey privateKey, byte[] encryptedSharedKey) {
-        return new SecretKeySpec(decryptData(privateKey, encryptedSharedKey), "AES");
-    }
-
-    public static byte[] decryptData(Key key, byte[] data) {
-        return cipherOperation(Cipher.DECRYPT_MODE, key, data);
-    }
-
-    private static byte[] cipherOperation(int operationMode, Key key, byte[] data) {
-        try {
-            return createCipherInstance(operationMode, key.getAlgorithm(), key).doFinal(data);
-        } catch (IllegalBlockSizeException | BadPaddingException illegalblocksizeexception) {
-            illegalblocksizeexception.printStackTrace();
+            byte[] serverHash = getServerIdHash(sessionId, sharedSecret, publicKey);
+            return (new BigInteger(serverHash)).toString(16);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
         }
 
-        System.err.println("Cipher data failed!");
-        return null;
+        return "";
     }
 
-    private static Cipher createCipherInstance(int operationMode, String cipherName, Key key) {
-        try {
-            Cipher cipher = Cipher.getInstance(cipherName);
-
-            cipher.init(operationMode, key);
-            return cipher;
-        } catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException invalidkeyexception) {
-            invalidkeyexception.printStackTrace();
-        }
-
-        System.err.println("Cipher creation failed!");
-        return null;
+    /**
+     * 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");
     }
-//
-//    public static Cipher createBufferedBlockCipher(int operationMode, Key key) {
-//        try {
-//            Cipher cipher = Cipher.getInstance("AES/CFB8/NoPadding");
-//
-//            cipher.init(operationMode, key, new IvParameterSpec(key.getEncoded()));
-//            return cipher;
-//        } catch (GeneralSecurityException generalsecurityexception) {
-//            throw new RuntimeException(generalsecurityexception);
-//        }
-//    }
 
-    private EncryptionUtil() {
-        //utility
+    /**
+     * 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,116 +1,109 @@
 package com.github.games647.fastlogin.bukkit;
 
-import com.avaje.ebeaninternal.api.ClassUtil;
-import com.comphenix.protocol.AsynchronousManager;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.github.games647.fastlogin.bukkit.commands.CrackedCommand;
-import com.github.games647.fastlogin.bukkit.commands.ImportCommand;
-import com.github.games647.fastlogin.bukkit.commands.PremiumCommand;
-import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin;
-import com.github.games647.fastlogin.bukkit.listener.BukkitJoinListener;
-import com.github.games647.fastlogin.bukkit.listener.BungeeCordListener;
-import com.github.games647.fastlogin.bukkit.listener.protocollib.EncryptionPacketListener;
-import com.github.games647.fastlogin.bukkit.listener.protocollib.LoginSkinApplyListener;
-import com.github.games647.fastlogin.bukkit.listener.protocollib.StartPacketListener;
+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.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.tasks.DelayedAuthHook;
+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.message.ChannelMessage;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.google.common.collect.Iterables;
+import com.github.games647.fastlogin.core.shared.PlatformPlugin;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 
-import java.security.KeyPair;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.messaging.PluginMessageRecipient;
+import org.slf4j.Logger;
 
 /**
  * This plugin checks if a player has a paid account and if so tries to skip offline mode authentication.
  */
-public class FastLoginBukkit extends JavaPlugin {
-
-    private static final int WORKER_THREADS = 3;
-
-    //provide a immutable key pair to be thread safe | used for encrypting and decrypting traffic
-    private final KeyPair keyPair = EncryptionUtil.generateKeyPair();
-
-    private boolean bungeeCord;
-    private BukkitCore core;
-    private boolean serverStarted;
+public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<CommandSender> {
 
     //1 minutes should be enough as a timeout for bad internet connection (Server, Client and Mojang)
-    private final ConcurrentMap<String, BukkitLoginSession> session = FastLoginCore.buildCache(1, -1);
+    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 boolean serverStarted;
+    private boolean bungeeCord;
+    private FastLoginCore<Player, CommandSender, FastLoginBukkit> core;
 
     @Override
     public void onEnable() {
-        saveDefaultConfig();
-        core = new BukkitCore(this);
-
-        core.loadMessages();
-        core.setApiConnector();
+        core = new FastLoginCore<>(this);
+        core.load();
         try {
-            if (ClassUtil.isPresent("org.spigotmc.SpigotConfig")) {
-                bungeeCord = Class.forName("org.spigotmc.SpigotConfig").getDeclaredField("bungee").getBoolean(null);
-            }
+            bungeeCord = Class.forName("org.spigotmc.SpigotConfig").getDeclaredField("bungee").getBoolean(null);
+        } catch (ClassNotFoundException notFoundEx) {
+            //ignore server has no bungee support
         } catch (Exception ex) {
-            getLogger().log(Level.WARNING, "Cannot check bungeecord support. You use a non-spigot build", 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 session request for a offline player
-            getLogger().severe("Server have 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;
         }
 
+        PluginManager pluginManager = getServer().getPluginManager();
         if (bungeeCord) {
             setServerStarted();
 
             //check for incoming messages from the bungeecord version of this plugin
-            getServer().getMessenger().registerIncomingPluginChannel(this, getName(), new BungeeCordListener(this));
+            getServer().getMessenger().registerIncomingPluginChannel(this, getName(), new BungeeListener(this));
             getServer().getMessenger().registerOutgoingPluginChannel(this, getName());
-            //register listeners on success
         } else {
             if (!core.setupDatabase()) {
                 setEnabled(false);
                 return;
             }
 
-            if (getServer().getPluginManager().isPluginEnabled("ProtocolSupport")) {
-                getServer().getPluginManager().registerEvents(new ProtocolSupportListener(this), this);
-            } else if (getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
-                //we are performing HTTP request on these so run it async (seperate from the Netty IO threads)
-                AsynchronousManager asynchronousManager = ProtocolLibrary.getProtocolManager().getAsynchronousManager();
-
-                StartPacketListener startPacketListener = new StartPacketListener(this);
-                EncryptionPacketListener encryptionPacketListener = new EncryptionPacketListener(this);
-
-                asynchronousManager.registerAsyncHandler(startPacketListener).start(WORKER_THREADS);
-                asynchronousManager.registerAsyncHandler(encryptionPacketListener).start(WORKER_THREADS);
-                getServer().getPluginManager().registerEvents(new LoginSkinApplyListener(this), this);
+            if (pluginManager.isPluginEnabled("ProtocolSupport")) {
+                pluginManager.registerEvents(new ProtocolSupportListener(this), this);
+            } else if (pluginManager.isPluginEnabled("ProtocolLib")) {
+                ProtocolLibListener.register(this);
+                pluginManager.registerEvents(new SkinApplyListener(this), this);
             } else {
-                getLogger().warning("Either ProtocolLib or ProtocolSupport have to be installed "
-                        + "if you don't use BungeeCord");
+                logger.warn("Either ProtocolLib or ProtocolSupport have to be installed if you don't use BungeeCord");
             }
         }
 
         //delay dependency setup because we load the plugin very early where plugins are initialized yet
-        getServer().getScheduler().runTask(this, new DelayedAuthHook(this));
+        getServer().getScheduler().runTaskLater(this, new DelayedAuthHook(this), 5L);
 
-        getServer().getPluginManager().registerEvents(new BukkitJoinListener(this), this);
+        pluginManager.registerEvents(new ConnectionListener(this), this);
 
         //register commands using a unique name
         getCommand("premium").setExecutor(new PremiumCommand(this));
         getCommand("cracked").setExecutor(new CrackedCommand(this));
-        getCommand("import-auth").setExecutor(new ImportCommand(core));
+
+        if (pluginManager.isPluginEnabled("PlaceholderAPI")) {
+            //prevents NoClassDef errors if it's not available
+            PremiumPlaceholder.register(this);
+        }
     }
 
     @Override
     public void onDisable() {
-        session.clear();
+        loginSession.clear();
+        premiumPlayers.clear();
 
         if (core != null) {
             core.close();
@@ -120,73 +113,46 @@ public class FastLoginBukkit extends JavaPlugin {
         getServer().getOnlinePlayers().forEach(player -> player.removeMetadata(getName(), this));
     }
 
-    public BukkitCore getCore() {
+    public FastLoginCore<Player, CommandSender, FastLoginBukkit> getCore() {
         return core;
     }
 
-    public void sendBungeeActivateMessage(CommandSender sender, String target, boolean activate) {
-        if (sender instanceof Player) {
-            notifiyBungeeCord((Player) sender, target, activate);
-        } else {
-            Player firstPlayer = Iterables.getFirst(getServer().getOnlinePlayers(), null);
-            if (firstPlayer == null) {
-                getLogger().info("No player online to send a plugin message to the proxy");
-                return;
-            }
-
-            notifiyBungeeCord(firstPlayer, target, activate);
-        }
-    }
-
-    @Deprecated
-    public void setPasswordGenerator(PasswordGenerator passwordGenerator) {
-        core.setPasswordGenerator(passwordGenerator);
-    }
-
     /**
      * Gets a thread-safe map about players which are connecting to the server are being checked to be premium (paid
      * account)
      *
-     * @return a thread-safe session map
+     * @return a thread-safe loginSession map
      */
-    public ConcurrentMap<String, BukkitLoginSession> getSessions() {
-        return session;
+    public ConcurrentMap<String, BukkitLoginSession> getLoginSessions() {
+        return loginSession;
     }
 
-    /**
-     * Gets the server KeyPair. This is used to encrypt or decrypt traffic between the client and server
-     *
-     * @return the server KeyPair
-     */
-    public KeyPair getServerKey() {
-        return keyPair;
+    public Map<UUID, PremiumStatus> getPremiumPlayers() {
+        return premiumPlayers;
     }
 
-    /**
-     * Gets the auth plugin hook in order to interact with the plugins. This can be null if no supporting auth plugin
-     * was found.
-     *
-     * @return interface to any supported auth plugin
-     */
-    @Deprecated
-    public BukkitAuthPlugin getAuthPlugin() {
-        return (BukkitAuthPlugin) core.getAuthPluginHook();
-    }
-
-    @Deprecated
-    public void setAuthPluginHook(BukkitAuthPlugin authPlugin) {
-        core.setAuthPluginHook(authPlugin);
-    }
-
-    public boolean isBungeeCord() {
+    public boolean isBungeeEnabled() {
         return bungeeCord;
     }
 
+    /**
+     * Fetches the premium status of an online player.
+     *
+     * @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);
+    }
+
     /**
      * Wait before the server is fully started. This is workaround, because connections right on startup are not
      * injected by ProtocolLib
      *
-     * @return
+     * @return true if ProtocolLib can now intercept packets
      */
     public boolean isServerFullyStarted() {
         return serverStarted;
@@ -198,15 +164,28 @@ public class FastLoginBukkit extends JavaPlugin {
         }
     }
 
-    private void notifiyBungeeCord(Player sender, String target, boolean activate) {
-        ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
-        if (activate) {
-            dataOutput.writeUTF("ON");
-        } else {
-            dataOutput.writeUTF("OFF");
-        }
+    public void sendPluginMessage(PluginMessageRecipient player, ChannelMessage message) {
+        if (player != null) {
+            ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
+            dataOutput.writeUTF(message.getChannelName());
 
-        dataOutput.writeUTF(target);
-        sender.sendPluginMessage(this, getName(), dataOutput.toByteArray());
+            message.writeTo(dataOutput);
+            player.sendPluginMessage(this, this.getName(), dataOutput.toByteArray());
+        }
+    }
+
+    @Override
+    public Path getPluginFolder() {
+        return getDataFolder().toPath();
+    }
+
+    @Override
+    public Logger getLog() {
+        return logger;
+    }
+
+    @Override
+    public void sendMessage(CommandSender receiver, String message) {
+        receiver.sendMessage(message);
     }
 }

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

@@ -1,83 +0,0 @@
-package com.github.games647.fastlogin.bukkit;
-
-import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.github.games647.fastlogin.core.shared.MojangApiConnector;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-
-public class MojangApiBukkit extends MojangApiConnector {
-
-    //mojang api check to prove a player is logged in minecraft and made a join server request
-    private static final String HAS_JOINED_URL = "https://sessionserver.mojang.com/session/minecraft/hasJoined?";
-
-    public MojangApiBukkit(Logger logger, List<String> localAddresses, int rateLimit) {
-        super(logger, localAddresses, rateLimit);
-    }
-
-    @Override
-    public boolean hasJoinedServer(LoginSession session, String serverId) {
-        BukkitLoginSession playerSession = (BukkitLoginSession) session;
-        try {
-            String url = HAS_JOINED_URL + "username=" + playerSession.getUsername() + "&serverId=" + serverId;
-            HttpURLConnection conn = getConnection(url);
-
-            BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line = reader.readLine();
-            if (line != null && !line.equals("null")) {
-                //validate parsing
-                //http://wiki.vg/Protocol_Encryption#Server
-                JSONObject userData = (JSONObject) JSONValue.parseWithException(line);
-                String uuid = (String) userData.get("id");
-                playerSession.setUuid(FastLoginCore.parseId(uuid));
-
-                JSONArray properties = (JSONArray) userData.get("properties");
-                JSONObject skinProperty = (JSONObject) properties.get(0);
-
-                String propertyName = (String) skinProperty.get("name");
-                if (propertyName.equals("textures")) {
-                    String skinValue = (String) skinProperty.get("value");
-                    String signature = (String) skinProperty.get("signature");
-                    playerSession.setSkin(skinValue, signature);
-                }
-
-                return true;
-            }
-        } catch (Exception ex) {
-            //catch not only ioexceptions also parse and NPE on unexpected json format
-            logger.log(Level.WARNING, "Failed to verify session", ex);
-        }
-
-        //this connection doesn't need to be closed. So can make use of keep alive in java
-        return false;
-    }
-
-    @Override
-    protected String getUUIDFromJson(String json) {
-        boolean isArray = json.startsWith("[");
-
-        JSONObject mojangPlayer;
-        if (isArray) {
-            JSONArray array = (JSONArray) JSONValue.parse(json);
-            mojangPlayer = (JSONObject) array.get(0);
-        } else {
-            mojangPlayer = (JSONObject) JSONValue.parse(json);
-        }
-
-        String uuid = (String) mojangPlayer.get("id");
-        if ("null".equals(uuid)) {
-            return null;
-        }
-        
-        return uuid;
-    }
-}

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

@@ -1,14 +0,0 @@
-package com.github.games647.fastlogin.bukkit;
-
-import org.bukkit.entity.Player;
-
-/**
- *
- * @deprecated please use com.github.games647.fastlogin.core.hooks.PasswordGenerator<org.bukkit.entity.Player>
- */
-@Deprecated
-public interface PasswordGenerator extends com.github.games647.fastlogin.core.hooks.PasswordGenerator<Player> {
-
-    @Override
-    String getRandomPassword(Player player);
-}

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

@@ -0,0 +1,53 @@
+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.entity.Player;
+
+public class PremiumPlaceholder extends PlaceholderExpansion {
+
+    private static final String PLACEHOLDER_VARIABLE = "fastlogin_status";
+
+    private final FastLoginBukkit plugin;
+
+    public PremiumPlaceholder(FastLoginBukkit plugin) {
+        this.plugin = plugin;
+    }
+
+    public static void register(FastLoginBukkit plugin) {
+        PremiumPlaceholder placeholderHook = new PremiumPlaceholder(plugin);
+        PlaceholderAPI.registerPlaceholderHook(PLACEHOLDER_VARIABLE, placeholderHook);
+    }
+
+    @Override
+    public String onPlaceholderRequest(Player player, String variable) {
+        if (player != null && PLACEHOLDER_VARIABLE.equals(variable)) {
+            return plugin.getStatus(player.getUniqueId()).name();
+        }
+
+        return "";
+    }
+
+    @Override
+    public String getIdentifier() {
+        return PLACEHOLDER_VARIABLE;
+    }
+
+    @Override
+    public String getPlugin() {
+        return plugin.getName();
+    }
+
+    @Override
+    public String getAuthor() {
+        return plugin.getDescription().getAuthors().stream().collect(Collectors.joining(", "));
+    }
+
+    @Override
+    public String getVersion() {
+        return plugin.getName();
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.github.games647.fastlogin.bukkit.command;
+
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
+import com.github.games647.fastlogin.core.StoredProfile;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+
+public class CrackedCommand extends ToggleCommand {
+
+    public CrackedCommand(FastLoginBukkit plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length == 0) {
+            onCrackedSelf(sender, command, args);
+        } else {
+            onCrackedOther(sender, command, args);
+        }
+
+        return true;
+    }
+
+    private void onCrackedSelf(CommandSender sender, Command cmd, String[] args) {
+        if (isConsole(sender)) {
+            return;
+        }
+
+        if (forwardCrackedCommand(sender, sender.getName())) {
+            return;
+        }
+
+        if (plugin.isBungeeEnabled()) {
+            sendBungeeActivateMessage(sender, sender.getName(), false);
+            plugin.getCore().sendLocaleMessage("wait-on-proxy", sender);
+        } else {
+            //todo: load async if
+            StoredProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
+            if (profile.isPremium()) {
+                plugin.getCore().sendLocaleMessage("remove-premium", sender);
+
+                profile.setPremium(false);
+                profile.setId(null);
+                Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                    plugin.getCore().getStorage().save(profile);
+                });
+            } else {
+                plugin.getCore().sendLocaleMessage("not-premium", sender);
+            }
+        }
+    }
+
+    private void onCrackedOther(CommandSender sender, Command command, String[] args) {
+        if (!hasOtherPermission(sender, command)) {
+            return;
+        }
+
+        if (forwardCrackedCommand(sender, args[0])) {
+            return;
+        }
+
+        //todo: load async
+        StoredProfile profile = plugin.getCore().getStorage().loadProfile(args[0]);
+        if (profile == null) {
+            sender.sendMessage("Error occurred");
+            return;
+        }
+
+        //existing player is already cracked
+        if (profile.isSaved() && !profile.isPremium()) {
+            plugin.getCore().sendLocaleMessage("not-premium-other", sender);
+        } else {
+            plugin.getCore().sendLocaleMessage("remove-premium", sender);
+
+            profile.setPremium(false);
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                plugin.getCore().getStorage().save(profile);
+            });
+        }
+    }
+
+    private boolean forwardCrackedCommand(CommandSender sender, String target) {
+        return forwardBungeeCommand(sender, target, false);
+    }
+}

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

@@ -0,0 +1,99 @@
+package com.github.games647.fastlogin.bukkit.command;
+
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
+import com.github.games647.fastlogin.core.StoredProfile;
+
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+/**
+ * Let users activate fast login by command. This only be accessible if
+ * 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 {
+
+    public PremiumCommand(FastLoginBukkit plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length == 0) {
+            onPremiumSelf(sender, command, args);
+        } else {
+            onPremiumOther(sender, command, args);
+        }
+
+        return true;
+    }
+
+    private void onPremiumSelf(CommandSender sender, Command cmd, String[] args) {
+        if (isConsole(sender)) {
+            return;
+        }
+
+        if (forwardPremiumCommand(sender, sender.getName())) {
+            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);
+                Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                    plugin.getCore().getStorage().save(profile);
+                });
+
+                plugin.getCore().sendLocaleMessage("add-premium", sender);
+            }
+    }
+
+    private void onPremiumOther(CommandSender sender, Command command, String[] args) {
+        if (!hasOtherPermission(sender, command)) {
+            return;
+        }
+
+        if (forwardPremiumCommand(sender, args[0])) {
+            return;
+        }
+
+        //todo: load async
+        StoredProfile profile = plugin.getCore().getStorage().loadProfile(args[0]);
+        if (profile == null) {
+            plugin.getCore().sendLocaleMessage("player-unknown", sender);
+            return;
+        }
+
+        if (profile.isPremium()) {
+            plugin.getCore().sendLocaleMessage("already-exists-other", sender);
+        } else {
+            //todo: resolve uuid
+            profile.setPremium(true);
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                plugin.getCore().getStorage().save(profile);
+            });
+
+            plugin.getCore().sendLocaleMessage("add-premium-other", sender);
+        }
+    }
+
+    private boolean forwardPremiumCommand(CommandSender sender, String target) {
+        return forwardBungeeCommand(sender, target, true);
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.github.games647.fastlogin.bukkit.command;
+
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
+import com.github.games647.fastlogin.core.message.ChangePremiumMessage;
+import com.github.games647.fastlogin.core.message.ChannelMessage;
+
+import java.util.Optional;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.messaging.PluginMessageRecipient;
+
+public abstract class ToggleCommand implements CommandExecutor {
+
+    protected final FastLoginBukkit plugin;
+
+    public ToggleCommand(FastLoginBukkit plugin) {
+        this.plugin = plugin;
+    }
+
+    protected boolean hasOtherPermission(CommandSender sender, Command cmd) {
+        if (!sender.hasPermission(cmd.getPermission() + ".other")) {
+            plugin.getCore().sendLocaleMessage("no-permission", sender);
+            return false;
+        }
+
+        return true;
+    }
+
+    protected boolean forwardBungeeCommand(CommandSender sender, String target, boolean activate) {
+        if (plugin.isBungeeEnabled()) {
+            sendBungeeActivateMessage(sender, target, activate);
+            plugin.getCore().sendLocaleMessage("wait-on-proxy", sender);
+            return true;
+        }
+
+        return false;
+    }
+
+    protected boolean isConsole(CommandSender sender) {
+        if (sender instanceof Player) {
+            return false;
+        }
+
+        //console or command block
+        sender.sendMessage(plugin.getCore().getMessage("no-console"));
+        return true;
+    }
+
+    protected void sendBungeeActivateMessage(CommandSender invoker, String target, boolean activate) {
+        if (invoker instanceof PluginMessageRecipient) {
+            ChannelMessage message = new ChangePremiumMessage(target, activate, true);
+            plugin.sendPluginMessage((PluginMessageRecipient) invoker, message);
+        } else {
+            Optional<? extends Player> optPlayer = Bukkit.getServer().getOnlinePlayers().stream().findFirst();
+            if (!optPlayer.isPresent()) {
+                plugin.getLog().info("No player online to send a plugin message to the proxy");
+                return;
+            }
+
+            Player sender = optPlayer.get();
+            ChannelMessage message = new ChangePremiumMessage(target, activate, false);
+            plugin.sendPluginMessage(sender, message);
+        }
+    }
+}

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

@@ -1,91 +0,0 @@
-package com.github.games647.fastlogin.bukkit.commands;
-
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.core.PlayerProfile;
-
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class CrackedCommand implements CommandExecutor {
-
-    private final FastLoginBukkit plugin;
-
-    public CrackedCommand(FastLoginBukkit plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (args.length == 0) {
-            if (!(sender instanceof Player)) {
-                //console or command block
-                sender.sendMessage(plugin.getCore().getMessage("no-console"));
-                return true;
-            }
-
-            if (plugin.isBungeeCord()) {
-                plugin.sendBungeeActivateMessage(sender, sender.getName(), false);
-                String message = plugin.getCore().getMessage("wait-on-proxy");
-                if (message != null) {
-                    sender.sendMessage(message);
-                }
-            } else {
-                //todo: load async if
-                PlayerProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
-                if (profile.isPremium()) {
-                    sender.sendMessage(plugin.getCore().getMessage("remove-premium"));
-
-                    profile.setPremium(false);
-                    profile.setUuid(null);
-                    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                        plugin.getCore().getStorage().save(profile);
-                    });
-                } else {
-                    sender.sendMessage(plugin.getCore().getMessage("not-premium"));
-                }
-            }
-
-            return true;
-        } else {
-            onCrackedOther(sender, command, args);
-        }
-
-        return true;
-    }
-
-    private void onCrackedOther(CommandSender sender, Command command, String[] args) {
-        if (!sender.hasPermission(command.getPermission() + ".other")) {
-            sender.sendMessage(plugin.getCore().getMessage("no-permission"));
-            return;
-        }
-        
-        if (plugin.isBungeeCord()) {
-            plugin.sendBungeeActivateMessage(sender, args[0], false);
-            String message = plugin.getCore().getMessage("wait-on-proxy");
-            if (message != null) {
-                sender.sendMessage(message);
-            }
-        } else {
-            //todo: load async
-            PlayerProfile profile = plugin.getCore().getStorage().loadProfile(args[0]);
-            if (profile == null) {
-                sender.sendMessage("Error occured");
-                return;
-            }
-
-            //existing player is already cracked
-            if (profile.getUserId() != -1 && !profile.isPremium()) {
-                sender.sendMessage(plugin.getCore().getMessage("not-premium-other"));
-            } else {
-                sender.sendMessage(plugin.getCore().getMessage("remove-premium"));
-                profile.setPremium(false);
-                Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                    plugin.getCore().getStorage().save(profile);
-                });
-            }
-        }
-    }
-}

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/ImportCommand.java

@@ -1,83 +0,0 @@
-package com.github.games647.fastlogin.bukkit.commands;
-
-import com.github.games647.fastlogin.bukkit.BukkitCore;
-import com.github.games647.fastlogin.core.AuthStorage;
-import com.github.games647.fastlogin.core.importer.ImportPlugin;
-import org.bukkit.ChatColor;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-public class ImportCommand implements CommandExecutor {
-
-    private final BukkitCore core;
-
-    public ImportCommand(BukkitCore core) {
-        this.core = core;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (args.length < 2) {
-            sender.sendMessage(ChatColor.DARK_RED + "You need to specify the import plugin and database type");
-            return true;
-        }
-
-        ImportPlugin importPlugin;
-        switch (args[0].toLowerCase()) {
-            case "autoin":
-                importPlugin = ImportPlugin.AUTO_IN;
-                break;
-            case "bpa":
-                importPlugin = ImportPlugin.BPA;
-                break;
-            case "eldzi":
-                importPlugin = ImportPlugin.ELDZI;
-                break;
-            default:
-                sender.sendMessage(ChatColor.DARK_RED + "Unknown auto login plugin");
-                return true;
-        }
-
-        boolean sqlite;
-        switch (args[1].toLowerCase()) {
-            case "sqlite":
-                sqlite = true;
-                break;
-            case "mysql":
-                sqlite = false;
-                break;
-            default:
-                sender.sendMessage(ChatColor.DARK_RED + "Unknown storage type to import from. Either SQLite or MySQL");
-                return true;
-        }
-
-        String host = "";
-        String database = "";
-        String username = "";
-        String password = "";
-        if (!sqlite) {
-            if (args.length <= 5) {
-                sender.sendMessage(ChatColor.DARK_RED + "If importing from MySQL, you need to specify host database "
-                        + "and username passowrd too");
-                return true;
-            }
-
-            host = args[2];
-            database = args[3];
-            username = args[4];
-            password = args[5];
-        }
-
-        AuthStorage storage = core.getStorage();
-        boolean success = core.importDatabase(importPlugin, true, storage, host, database, username, password);
-        if (success) {
-            sender.sendMessage(ChatColor.DARK_GREEN + "Successful imported the data");
-        } else {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to import the data. Check out the logs");
-        }
-
-        return true;
-    }
-}

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

@@ -1,108 +0,0 @@
-package com.github.games647.fastlogin.bukkit.commands;
-
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.core.PlayerProfile;
-
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-/**
- * Let users activate fast login by command. This only be accessible if
- * 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 implements CommandExecutor {
-
-    private final FastLoginBukkit plugin;
-
-    public PremiumCommand(FastLoginBukkit plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (args.length == 0) {
-            if (!(sender instanceof Player)) {
-                //console or command block
-                sender.sendMessage(plugin.getCore().getMessage("no-console"));
-                return true;
-            }
-
-            if (plugin.isBungeeCord()) {
-                plugin.sendBungeeActivateMessage(sender, sender.getName(), true);
-                String message = plugin.getCore().getMessage("wait-on-proxy");
-                if (message != null) {
-                    sender.sendMessage(message);
-                }
-            } else {
-                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 true;
-                }
-
-                plugin.getCore().getPendingConfirms().remove(id);
-                //todo: load async
-                PlayerProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
-                if (profile.isPremium()) {
-                    sender.sendMessage(plugin.getCore().getMessage("already-exists"));
-                } else {
-                    //todo: resolve uuid
-                    profile.setPremium(true);
-                    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                        plugin.getCore().getStorage().save(profile);
-                    });
-
-                    sender.sendMessage(plugin.getCore().getMessage("add-premium"));
-                }
-            }
-
-            return true;
-        } else {
-            onPremiumOther(sender, command, args);
-        }
-
-        return true;
-    }
-
-    private void onPremiumOther(CommandSender sender, Command command, String[] args) {
-        if (!sender.hasPermission(command.getPermission() + ".other")) {
-            sender.sendMessage(plugin.getCore().getMessage("no-permission"));
-            return ;
-        }
-
-        if (plugin.isBungeeCord()) {
-            plugin.sendBungeeActivateMessage(sender, args[0], true);
-            String message = plugin.getCore().getMessage("wait-on-proxy");
-            if (message != null) {
-                sender.sendMessage(message);
-            }
-        } else {
-            //todo: load async
-            PlayerProfile profile = plugin.getCore().getStorage().loadProfile(args[0]);
-            if (profile == null) {
-                sender.sendMessage(plugin.getCore().getMessage("player-unknown"));
-                return;
-            }
-            
-            if (profile.isPremium()) {
-                sender.sendMessage(plugin.getCore().getMessage("already-exists-other"));
-            } else {
-                //todo: resolve uuid
-                profile.setPremium(true);
-                Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                    plugin.getCore().getStorage().save(profile);
-                });
-
-                sender.sendMessage(plugin.getCore().getMessage("add-premium-other"));
-            }
-        }
-    }
-}

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

@@ -0,0 +1,65 @@
+package com.github.games647.fastlogin.bukkit.hook;
+
+import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
+import com.github.games647.fastlogin.core.hooks.AuthPlugin;
+
+import fr.xephi.authme.api.v3.AuthMeApi;
+import fr.xephi.authme.events.RestoreSessionEvent;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+/**
+ * GitHub: https://github.com/Xephi/AuthMeReloaded/
+ * <p>
+ * Project page:
+ * <p>
+ * Bukkit: https://dev.bukkit.org/bukkit-plugins/authme-reloaded/
+ * <p>
+ * Spigot: https://www.spigotmc.org/resources/authme-reloaded.6269/
+ */
+public class AuthMeHook implements AuthPlugin<Player>, Listener {
+
+    private final FastLoginBukkit plugin;
+
+    public AuthMeHook(FastLoginBukkit plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onSessionRestore(RestoreSessionEvent restoreSessionEvent) {
+        Player player = restoreSessionEvent.getPlayer();
+
+        String id = '/' + player.getAddress().getAddress().getHostAddress() + ':' + player.getAddress().getPort();
+        BukkitLoginSession session = plugin.getLoginSessions().get(id);
+        if (session != null && session.isVerified()) {
+            restoreSessionEvent.setCancelled(true);
+        }
+    }
+
+    @Override
+    public boolean forceLogin(Player player) {
+        if (AuthMeApi.getInstance().isAuthenticated(player)) {
+            return false;
+        }
+
+        //skips registration and login
+        AuthMeApi.getInstance().forceLogin(player);
+        return true;
+    }
+
+    @Override
+    public boolean isRegistered(String playerName) {
+        return AuthMeApi.getInstance().isRegistered(playerName);
+    }
+
+    @Override
+    public boolean forceRegister(Player player, String 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,5 +1,6 @@
-package com.github.games647.fastlogin.bukkit.hooks;
+package com.github.games647.fastlogin.bukkit.hook;
 
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
 import de.st_ddt.crazylogin.CrazyLogin;
@@ -8,37 +9,46 @@ import de.st_ddt.crazylogin.databases.CrazyLoginDataDatabase;
 import de.st_ddt.crazylogin.listener.PlayerListener;
 import de.st_ddt.crazylogin.metadata.Authenticated;
 
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.logging.Level;
 
 import org.apache.commons.lang.reflect.FieldUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 /**
- * Github: https://github.com/ST-DDT/CrazyLogin
- *
+ * GitHub: https://github.com/ST-DDT/CrazyLogin
+ * <p>
  * Project page:
- *
- * Bukkit: http://dev.bukkit.org/server-mods/crazylogin/
+ * <p>
+ * Bukkit: https://dev.bukkit.org/server-mods/crazylogin/
  */
 public class CrazyLoginHook implements AuthPlugin<Player> {
 
-    private final CrazyLogin crazyLoginPlugin = CrazyLogin.getPlugin();
-    private final PlayerListener playerListener = getListener();
+    private final FastLoginBukkit plugin;
+
+    private final CrazyLogin crazyLoginPlugin;
+    private final PlayerListener playerListener;
+
+    public CrazyLoginHook(FastLoginBukkit plugin) {
+        this.plugin = plugin;
+
+        crazyLoginPlugin = CrazyLogin.getPlugin();
+        playerListener = getListener();
+    }
 
     @Override
     public boolean forceLogin(Player player) {
         //not thread-safe operation
-        Future<LoginPlayerData> future = Bukkit.getScheduler().callSyncMethod(crazyLoginPlugin, () -> {
+        Future<Optional<LoginPlayerData>> future = Bukkit.getScheduler().callSyncMethod(plugin, () -> {
             LoginPlayerData playerData = crazyLoginPlugin.getPlayerData(player);
             if (playerData != null) {
                 //mark the account as logged in
                 playerData.setLoggedIn(true);
 
                 String ip = player.getAddress().getAddress().getHostAddress();
-//this should be done after login to restore the inventory, unhide players, prevent potential memory leaks...
+//this should be done after login to restore the inventory, show players, prevent potential memory leaks...
 //from: https://github.com/ST-DDT/CrazyLogin/blob/master/src/main/java/de/st_ddt/crazylogin/CrazyLogin.java#L1948
                 playerData.resetLoginFails();
                 player.setFireTicks(0);
@@ -56,21 +66,21 @@ public class CrazyLoginHook implements AuthPlugin<Player> {
                 playerData.addIP(ip);
                 player.setMetadata("Authenticated", new Authenticated(crazyLoginPlugin, player));
                 crazyLoginPlugin.unregisterDynamicHooks();
-                return playerData;
+                return Optional.of(playerData);
             }
 
-            return null;
+            return Optional.empty();
         });
 
         try {
-            LoginPlayerData result = future.get();
-            if (result != null && result.isLoggedIn()) {
+            Optional<LoginPlayerData> result = future.get().filter(LoginPlayerData::isLoggedIn);
+            if (result.isPresent()) {
                 //SQL-Queries should run async
-                crazyLoginPlugin.getCrazyDatabase().saveWithoutPassword(result);
+                crazyLoginPlugin.getCrazyDatabase().saveWithoutPassword(result.get());
                 return true;
             }
         } catch (InterruptedException | ExecutionException ex) {
-            crazyLoginPlugin.getLogger().log(Level.SEVERE, "Failed to forceLogin", ex);
+            plugin.getLog().error("Failed to forceLogin player: {}", player, ex);
             return false;
         }
 
@@ -78,7 +88,7 @@ public class CrazyLoginHook implements AuthPlugin<Player> {
     }
 
     @Override
-    public boolean isRegistered(String playerName) throws Exception {
+    public boolean isRegistered(String playerName) {
         return crazyLoginPlugin.getPlayerData(playerName) != null;
     }
 
@@ -92,9 +102,7 @@ public class CrazyLoginHook implements AuthPlugin<Player> {
             //create a fake account - this will be saved to the database with the password=FAILEDLOADING
             //user cannot login with that password unless the admin uses plain text
             //this automatically marks the player as logged in
-            playerData = new LoginPlayerData(player);
-            crazyDatabase.save(playerData);
-
+            crazyDatabase.save(new LoginPlayerData(player));
             return forceLogin(player);
         }
 
@@ -106,7 +114,7 @@ public class CrazyLoginHook implements AuthPlugin<Player> {
         try {
             listener = (PlayerListener) FieldUtils.readField(crazyLoginPlugin, "playerListener", true);
         } catch (IllegalAccessException ex) {
-            crazyLoginPlugin.getLogger().log(Level.SEVERE, "Failed to get the listener instance for auto login", ex);
+            plugin.getLog().error("Failed to get the listener instance for auto login", ex);
             listener = null;
         }
 

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

@@ -1,29 +1,36 @@
-package com.github.games647.fastlogin.bukkit.hooks;
+package com.github.games647.fastlogin.bukkit.hook;
 
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
 import io.github.lucaseasedup.logit.CancelledState;
 import io.github.lucaseasedup.logit.LogItCore;
 import io.github.lucaseasedup.logit.account.Account;
+import io.github.lucaseasedup.logit.session.SessionManager;
+
+import java.time.Instant;
 
 import org.bukkit.entity.Player;
 
 /**
- * Github: https://github.com/XziomekX/LogIt
+ * GitHub: https://github.com/XziomekX/LogIt
+ * <p>
  * Project page:
- *
+ * <p>
  * Bukkit: Unknown
+ * <p>
  * Spigot: Unknown
  */
 public class LogItHook implements AuthPlugin<Player> {
 
     @Override
     public boolean forceLogin(Player player) {
-        return LogItCore.getInstance().getSessionManager().startSession(player) == CancelledState.NOT_CANCELLED;
+        SessionManager sessionManager = LogItCore.getInstance().getSessionManager();
+        return sessionManager.isSessionAlive(player)
+                || sessionManager.startSession(player) == CancelledState.NOT_CANCELLED;
     }
 
     @Override
-    public boolean isRegistered(String playerName) throws Exception {
+    public boolean isRegistered(String playerName) {
         return LogItCore.getInstance().getAccountManager().isRegistered(playerName);
     }
 
@@ -31,8 +38,10 @@ public class LogItHook implements AuthPlugin<Player> {
     public boolean forceRegister(Player player, String password) {
         Account account = new Account(player.getName());
         account.changePassword(password);
-        account.setLastActiveDate(System.currentTimeMillis() / 1000);
-        account.setRegistrationDate(System.currentTimeMillis() / 1000);
+
+        Instant now = Instant.now();
+        account.setLastActiveDate(now.getEpochSecond());
+        account.setRegistrationDate(now.getEpochSecond());
         return LogItCore.getInstance().getAccountManager().insertAccount(account) == CancelledState.NOT_CANCELLED;
     }
 }

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

@@ -1,4 +1,4 @@
-package com.github.games647.fastlogin.bukkit.hooks;
+package com.github.games647.fastlogin.bukkit.hook;
 
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
@@ -8,27 +8,34 @@ import com.lenis0012.bukkit.loginsecurity.session.PlayerSession;
 import com.lenis0012.bukkit.loginsecurity.session.action.LoginAction;
 import com.lenis0012.bukkit.loginsecurity.session.action.RegisterAction;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 /**
- * Github: https://github.com/lenis0012/LoginSecurity-2 Project page:
- *
- * Bukkit: http://dev.bukkit.org/bukkit-plugins/loginsecurity/
+ * GitHub: https://github.com/lenis0012/LoginSecurity-2 
+ * <p>
+ * Project page:
+ * <p>
+ * Bukkit: https://dev.bukkit.org/bukkit-plugins/loginsecurity/
+ * <p>
  * Spigot: https://www.spigotmc.org/resources/loginsecurity.19362/
  */
 public class LoginSecurityHook implements AuthPlugin<Player> {
 
-    private final FastLoginBukkit plugin = (FastLoginBukkit) Bukkit.getPluginManager().getPlugin("FastLogin");
+    private final FastLoginBukkit plugin;
+
+    public LoginSecurityHook(FastLoginBukkit plugin) {
+        this.plugin = plugin;
+    }
 
     @Override
     public boolean forceLogin(Player player) {
         PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player);
-        return session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess();
+        return session.isAuthorized() || session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess();
+
     }
 
     @Override
-    public boolean isRegistered(String playerName) throws Exception {
+    public boolean isRegistered(String playerName) {
         PlayerSession session = LoginSecurity.getSessionManager().getOfflineSession(playerName);
         return session.isRegistered();
     }

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

@@ -1,33 +1,42 @@
-package com.github.games647.fastlogin.bukkit.hooks;
+package com.github.games647.fastlogin.bukkit.hook;
 
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.logging.Level;
 
 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;
 
 /**
  * Project page:
- *
- * Bukkit: http://dev.bukkit.org/bukkit-plugins/ultraauth-aa/
+ * <p>
+ * Bukkit: https://dev.bukkit.org/bukkit-plugins/ultraauth-aa/
+ * <p>
  * Spigot: https://www.spigotmc.org/resources/ultraauth.17044/
  */
 public class UltraAuthHook implements AuthPlugin<Player> {
 
     private final Plugin ultraAuthPlugin = Main.main;
+    private final FastLoginBukkit plugin;
+
+    public UltraAuthHook(FastLoginBukkit plugin) {
+        this.plugin = plugin;
+    }
 
     @Override
     public boolean forceLogin(Player player) {
         //not thread-safe
-        Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(ultraAuthPlugin, () -> {
+        Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(plugin, () -> {
+            if (UltraAuthAPI.isAuthenticated(player)) {
+                return true;
+            }
+
             UltraAuthAPI.authenticatedPlayer(player);
             return UltraAuthAPI.isAuthenticated(player);
         });
@@ -35,24 +44,20 @@ public class UltraAuthHook implements AuthPlugin<Player> {
         try {
             return future.get();
         } catch (InterruptedException | ExecutionException ex) {
-            ultraAuthPlugin.getLogger().log(Level.SEVERE, "Failed to forceLogin", ex);
+            plugin.getLog().error("Failed to forceLogin player: {}", player, ex);
             return false;
         }
     }
 
     @Override
-    public boolean isRegistered(String playerName) throws Exception {
+    public boolean isRegistered(String playerName) {
         return UltraAuthAPI.isRegisterd(playerName);
     }
 
     @Override
     public boolean forceRegister(Player player, String password) {
         UltraAuthAPI.setPlayerPasswordOnline(player, password);
-        if (PlayerManager.getInstance().checkPlayerPassword(player, password)) {
-            //the register method silents any excpetion so check if our entry was saved
-            return forceLogin(player);
-        }
-
-        return false;
+        //the register method silents any exception so check if our entry was saved
+        return PlayerManager.getInstance().checkPlayerPassword(player, password) && forceLogin(player);
     }
 }

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

@@ -1,5 +1,6 @@
-package com.github.games647.fastlogin.bukkit.hooks;
+package com.github.games647.fastlogin.bukkit.hook;
 
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
 import de.luricos.bukkit.xAuth.xAuth;
@@ -7,29 +8,36 @@ import de.luricos.bukkit.xAuth.xAuthPlayer;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.logging.Level;
 
 import org.bukkit.Bukkit;
-
 import org.bukkit.entity.Player;
 
 /**
- * Github: https://github.com/LycanDevelopment/xAuth/
- *
+ * GitHub: https://github.com/LycanDevelopment/xAuth/
+ * <p>
  * Project page:
- *
- * Bukkit: http://dev.bukkit.org/bukkit-plugins/xauth/
+ * <p>
+ * Bukkit: https://dev.bukkit.org/bukkit-plugins/xauth/
  */
 public class xAuthHook implements AuthPlugin<Player> {
 
     private final xAuth xAuthPlugin = xAuth.getPlugin();
+    private final FastLoginBukkit plugin;
+
+    public xAuthHook(FastLoginBukkit plugin) {
+        this.plugin = plugin;
+    }
 
     @Override
     public boolean forceLogin(Player player) {
         //not thread-safe
-        Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(xAuthPlugin, () -> {
+        Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(plugin, () -> {
             xAuthPlayer xAuthPlayer = xAuthPlugin.getPlayerManager().getPlayer(player);
             if (xAuthPlayer != null) {
+                if (xAuthPlayer.isAuthenticated()) {
+                    return true;
+                }
+
                 //we checked that the player is premium (paid account)
                 xAuthPlayer.setPremium(true);
 
@@ -43,13 +51,13 @@ public class xAuthHook implements AuthPlugin<Player> {
         try {
             return future.get();
         } catch (InterruptedException | ExecutionException ex) {
-            xAuthPlugin.getLogger().log(Level.SEVERE, "Failed to forceLogin", ex);
+            plugin.getLog().error("Failed to forceLogin player: {}", player, ex);
             return false;
         }
     }
 
     @Override
-    public boolean isRegistered(String playerName) throws Exception {
+    public boolean isRegistered(String playerName) {
         //this will load the player if it's not in the cache
         xAuthPlayer xAuthPlayer = xAuthPlugin.getPlayerManager().getPlayer(playerName);
         return xAuthPlayer != null && xAuthPlayer.isRegistered();
@@ -60,23 +68,18 @@ public class xAuthHook implements AuthPlugin<Player> {
         //not thread-safe
         Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(xAuthPlugin, () -> {
             xAuthPlayer xAuthPlayer = xAuthPlugin.getPlayerManager().getPlayer(player);
-            if (xAuthPlayer != null) {
-                //this should run async because the plugin executes a sql query, but the method
-                //accesses non thread-safe collections :(
-                boolean registerSuccess = xAuthPlugin.getAuthClass(xAuthPlayer)
-                        .adminRegister(player.getName(), password, null);
+            //this should run async because the plugin executes a sql query, but the method
+            //accesses non thread-safe collections :(
+            return xAuthPlayer != null
+                    && xAuthPlugin.getAuthClass(xAuthPlayer).adminRegister(player.getName(), password, null);
 
-                return registerSuccess;
-            }
-
-            return false;
         });
 
         try {
             //login in the player after registration
             return future.get() && forceLogin(player);
         } catch (InterruptedException | ExecutionException ex) {
-            xAuthPlugin.getLogger().log(Level.SEVERE, "Failed to forceLogin", ex);
+            plugin.getLog().error("Failed to forceRegister player: {}", player, ex);
             return false;
         }
     }

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

@@ -1,61 +0,0 @@
-package com.github.games647.fastlogin.bukkit.hooks;
-
-import com.avaje.ebeaninternal.api.ClassUtil;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-
-import fr.xephi.authme.api.API;
-import fr.xephi.authme.api.NewAPI;
-
-import org.bukkit.entity.Player;
-
-/**
- * Github: https://github.com/Xephi/AuthMeReloaded/
- * Project page:
- *
- * Bukkit: http://dev.bukkit.org/bukkit-plugins/authme-reloaded/
- * Spigot: https://www.spigotmc.org/resources/authme-reloaded.6269/
- */
-public class AuthMeHook implements AuthPlugin<Player> {
-
-    private final boolean isNewAPIAvailable;
-
-    public AuthMeHook() {
-        this.isNewAPIAvailable = ClassUtil.isPresent("fr.​xephi.​authme.​api.NewAPI");
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public boolean forceLogin(Player player) {
-        //skips registration and login
-        if (isNewAPIAvailable) {
-            NewAPI.getInstance().forceLogin(player);
-        } else {
-            API.forceLogin(player);
-        }
-        
-        return true;
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public boolean isRegistered(String playerName) throws Exception {
-        if (isNewAPIAvailable) {
-            return NewAPI.getInstance().isRegistered(playerName);
-        } else {
-            return API.isRegistered(playerName);
-        }
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public boolean forceRegister(Player player, String password) {
-        if (isNewAPIAvailable) {
-            NewAPI.getInstance().forceRegister(player, password);
-        } else {
-            API.registerPlayer(player.getName(), password);
-            forceLogin(player);
-        }
-
-        return true;
-    }
-}

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/BukkitAuthPlugin.java

@@ -1,21 +0,0 @@
-package com.github.games647.fastlogin.bukkit.hooks;
-
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-
-import org.bukkit.entity.Player;
-
-/**
- * @deprecated please use com.github.games647.fastlogin.core.hooks.AuthPlugin<org.bukkit.entity.Player>
- */
-@Deprecated
-public interface BukkitAuthPlugin extends AuthPlugin<Player> {
-
-    @Override
-    boolean forceLogin(Player player);
-
-    @Override
-    boolean isRegistered(String playerName) throws Exception;
-
-    @Override
-    boolean forceRegister(Player player, String password);
-}

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/RoyalAuthHook.java

@@ -1,62 +0,0 @@
-package com.github.games647.fastlogin.bukkit.hooks;
-
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.logging.Level;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.royaldev.royalauth.AuthPlayer;
-import org.royaldev.royalauth.Config;
-import org.royaldev.royalauth.RoyalAuth;
-
-/**
- * Github: https://github.com/RoyalDev/RoyalAuth
- *
- * Project page:
- *
- * Bukkit: http://dev.bukkit.org/bukkit-plugins/royalauth/
- */
-public class RoyalAuthHook implements AuthPlugin<Player> {
-
-    private final RoyalAuth royalAuthPlugin = (RoyalAuth) Bukkit.getPluginManager().getPlugin("RoyalAuth");
-
-    @Override
-    public boolean forceLogin(Player player) {
-        AuthPlayer authPlayer = AuthPlayer.getAuthPlayer(player);
-
-        Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(royalAuthPlugin, () -> {
-//https://github.com/RoyalDev/RoyalAuth/blob/master/src/main/java/org/royaldev/royalauth/commands/CmdLogin.java#L62
-//not thread-safe
-            authPlayer.login();
-
-            return authPlayer.isLoggedIn();
-        });
-
-        try {
-            return future.get();
-        } catch (InterruptedException | ExecutionException ex) {
-            royalAuthPlugin.getLogger().log(Level.SEVERE, "Failed to forceLogin", ex);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isRegistered(String playerName) throws Exception {
-        AuthPlayer authPlayer = AuthPlayer.getAuthPlayer(playerName);
-        return authPlayer.isRegistered();
-    }
-
-    @Override
-    public boolean forceRegister(Player player, String password) {
-//https://github.com/RoyalDev/RoyalAuth/blob/master/src/main/java/org/royaldev/royalauth/commands/CmdRegister.java#L50
-        AuthPlayer authPlayer = AuthPlayer.getAuthPlayer(player);
-
-        boolean registerSuccess = authPlayer.setPassword(password, Config.passwordHashType);
-
-        //login in the player after registration
-        return registerSuccess && forceLogin(player);
-    }
-}

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

@@ -1,120 +0,0 @@
-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.tasks.ForceLoginTask;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteStreams;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.metadata.FixedMetadataValue;
-import org.bukkit.plugin.messaging.PluginMessageListener;
-
-/**
- * Responsible for receiving messages from a BungeeCord instance.
- *
- * This class also receives the plugin message from the bungeecord version of this plugin in order to get notified if
- * the connection is in online mode.
- */
-public class BungeeCordListener 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 BungeeCordListener(FastLoginBukkit plugin) {
-        this.plugin = plugin;
-        this.proxyIds = loadBungeeCordIds();
-    }
-
-    @Override
-    public void onPluginMessageReceived(String channel, Player player, byte[] message) {
-        if (!channel.equals(plugin.getName())) {
-            return;
-        }
-
-        ByteArrayDataInput dataInput = ByteStreams.newDataInput(message);
-        String subchannel = dataInput.readUTF();
-        plugin.getLogger().log(Level.FINEST, "Received plugin message for subchannel {0} from {1}"
-                , new Object[]{subchannel, player});
-
-        String playerName = dataInput.readUTF();
-
-        //check if the player is still online or disconnected
-        Player checkedPlayer = plugin.getServer().getPlayerExact(playerName);
-        //fail if target player is blacklisted because already authed or wrong bungeecord id
-        if (checkedPlayer != null && !checkedPlayer.hasMetadata(plugin.getName())) {
-            //blacklist this target player for BungeeCord Id brute force attacks
-            player.setMetadata(plugin.getName(), new FixedMetadataValue(plugin, true));
-
-            //bungeecord UUID
-            long mostSignificantBits = dataInput.readLong();
-            long leastSignificantBits = dataInput.readLong();
-            UUID sourceId = new UUID(mostSignificantBits, leastSignificantBits);
-            plugin.getLogger().log(Level.FINEST, "Received proxy id {0} from {1}", new Object[]{sourceId, player});
-
-            //fail if BungeeCord support is disabled (id = null)
-            if (proxyIds.contains(sourceId)) {
-                readMessage(checkedPlayer, subchannel, playerName, player);
-            }
-        }
-    }
-
-    private void readMessage(Player checkedPlayer, String subchannel, String playerName, Player player) {
-        InetSocketAddress address = checkedPlayer.getAddress();
-        String id = '/' + address.getAddress().getHostAddress() + ':' + address.getPort();
-        if ("AUTO_LOGIN".equalsIgnoreCase(subchannel)) {
-            BukkitLoginSession playerSession = new BukkitLoginSession(playerName, true);
-            playerSession.setVerified(true);
-            plugin.getSessions().put(id, playerSession);
-            Bukkit.getScheduler().runTaskAsynchronously(plugin, new ForceLoginTask(plugin, player));
-        } else if ("AUTO_REGISTER".equalsIgnoreCase(subchannel)) {
-            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);
-                        playerSession.setVerified(true);
-                        plugin.getSessions().put(id, playerSession);
-                        new ForceLoginTask(plugin, player).run();
-                    }
-                } catch (Exception ex) {
-                    plugin.getLogger().log(Level.SEVERE, "Failed to query isRegistered", ex);
-                }
-            });
-        }
-    }
-
-    public Set<UUID> loadBungeeCordIds() {
-        File whitelistFile = new File(plugin.getDataFolder(), FILE_NAME);
-        try {
-            if (!whitelistFile.exists()) {
-                whitelistFile.createNewFile();
-            }
-
-            List<String> lines = Files.readAllLines(whitelistFile.toPath());
-            return lines.stream().map(String::trim).map(UUID::fromString).collect(Collectors.toSet());
-        } catch (IOException ex) {
-            plugin.getLogger().log(Level.SEVERE, "Failed to create file for Proxy whitelist", ex);
-        } catch (Exception ex) {
-            plugin.getLogger().log(Level.SEVERE, "Failed to retrieve proxy Id. Disabling BungeeCord support", ex);
-        }
-
-        return null;
-    }
-}

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

@@ -0,0 +1,138 @@
+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.ForceLoginTask;
+import com.github.games647.fastlogin.core.PremiumStatus;
+import com.github.games647.fastlogin.core.hooks.AuthPlugin;
+import com.github.games647.fastlogin.core.message.LoginActionMessage;
+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 static java.util.stream.Collectors.toSet;
+
+/**
+ * Responsible for receiving messages from a BungeeCord instance.
+ *
+ * This class also receives the plugin message from the bungeecord version of this plugin in order to get notified if
+ * the connection is in online mode.
+ */
+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(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);
+
+        //check if the player is still online or disconnected
+        Player checkedPlayer = Bukkit.getPlayerExact(loginMessage.getPlayerName());
+        if (checkedPlayer == null) {
+            return;
+        }
+
+        //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 (proxyIds.contains(sourceId)) {
+                readMessage(checkedPlayer, loginMessage);
+            } else {
+                plugin.getLog().warn("Received proxy id: {} that doesn't exist in the proxy whitelist file", sourceId);
+            }
+        }
+    }
+
+    private void readMessage(Player player, LoginActionMessage message) {
+        String playerName = message.getPlayerName();
+        Type type = message.getType();
+
+        InetSocketAddress address = player.getAddress();
+        String id = '/' + address.getAddress().getHostAddress() + ':' + address.getPort();
+        if (type == Type.LOGIN) {
+            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) {
+            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 forcelogin task here so update it manually
+            plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
+        }
+    }
+
+    public Set<UUID> loadBungeeCordIds() {
+        Path whitelistFile = plugin.getPluginFolder().resolve(FILE_NAME);
+        try {
+            if (Files.notExists(whitelistFile)) {
+                Files.createFile(whitelistFile);
+            }
+
+            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,7 +1,7 @@
 package com.github.games647.fastlogin.bukkit.listener;
 
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.tasks.ForceLoginTask;
+import com.github.games647.fastlogin.bukkit.task.ForceLoginTask;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -17,13 +17,13 @@ import org.bukkit.event.player.PlayerQuitEvent;
  * 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 BukkitJoinListener implements Listener {
+public class ConnectionListener implements Listener {
 
     private static final long DELAY_LOGIN = 20L / 2;
 
     private final FastLoginBukkit plugin;
 
-    public BukkitJoinListener(FastLoginBukkit plugin) {
+    public ConnectionListener(FastLoginBukkit plugin) {
         this.plugin = plugin;
     }
 
@@ -38,9 +38,10 @@ public class BukkitJoinListener implements Listener {
     public void onPlayerJoin(PlayerJoinEvent joinEvent) {
         Player player = joinEvent.getPlayer();
 
-        if (!plugin.isBungeeCord()) {
+        if (!plugin.isBungeeEnabled()) {
             //Wait before auth plugin and we received a message from BungeeCord initializes the player
-            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new ForceLoginTask(plugin, player), DELAY_LOGIN);
+            Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player);
+            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, forceLoginTask, DELAY_LOGIN);
         }
     }
 
@@ -48,6 +49,8 @@ public class BukkitJoinListener implements Listener {
     public void onPlayerQuit(PlayerQuitEvent quitEvent) {
         Player player = quitEvent.getPlayer();
         player.removeMetadata(plugin.getName(), plugin);
+
         plugin.getCore().getPendingConfirms().remove(player.getUniqueId());
+        plugin.getPremiumPlayers().remove(player.getUniqueId());
     }
 }

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

@@ -1,65 +0,0 @@
-package com.github.games647.fastlogin.bukkit.listener.protocollib;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketEvent;
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-
-/**
- * Handles incoming encryption responses from connecting clients.
- * It prevents them from reaching the server because that cannot handle
- * it in offline mode.
- *
- * Moreover this manages a started premium check from
- * this plugin. So check if all data is correct and we can prove him as a
- * owner of a paid minecraft account.
- *
- * Receiving packet information:
- * http://wiki.vg/Protocol#Encryption_Response
- *
- * sharedSecret=encrypted byte array
- * verify token=encrypted byte array
- */
-public class EncryptionPacketListener extends PacketAdapter {
-
-    //hides the inherit Plugin plugin field, but we need this type
-    private final FastLoginBukkit plugin;
-
-    public EncryptionPacketListener(FastLoginBukkit plugin) {
-        //run async in order to not block the server, because we make api calls to Mojang
-        super(params(plugin, PacketType.Login.Client.ENCRYPTION_BEGIN).optionAsync());
-
-        this.plugin = plugin;
-    }
-
-    /**
-     * C->S : Handshake State=2
-     * C->S : Login Start
-     * S->C : Encryption Key Request
-     * (Client Auth)
-     * C->S : Encryption Key Response
-     * (Server Auth, Both enable encryption)
-     * S->C : Login Success (*)
-     *
-     * On offline logins is Login Start followed by Login Success
-     *
-     * Minecraft Server implementation
-     * https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L180
-     */
-    @Override
-    public void onPacketReceiving(PacketEvent packetEvent) {
-        if (packetEvent.isCancelled()) {
-            return;
-        }
-
-        Player sender = packetEvent.getPlayer();
-        byte[] sharedSecret = packetEvent.getPacket().getByteArrays().read(0);
-        
-        packetEvent.getAsyncMarker().incrementProcessingDelay();
-        VerifyResponseTask verifyTask = new VerifyResponseTask(plugin, packetEvent, sender, sharedSecret);
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, verifyTask);
-    }
-}

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

@@ -4,29 +4,34 @@ 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.core.PlayerProfile;
+import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
 
+import java.security.PublicKey;
 import java.util.Random;
-import java.util.logging.Level;
 
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class NameCheckTask extends JoinManagement<Player, ProtocolLibLoginSource> implements Runnable {
+public class NameCheckTask extends JoinManagement<Player, CommandSender, ProtocolLibLoginSource>
+        implements Runnable {
 
     private final FastLoginBukkit plugin;
     private final PacketEvent packetEvent;
+    private final PublicKey publicKey;
 
     private final Random random;
 
     private final Player player;
     private final String username;
 
-    public NameCheckTask(FastLoginBukkit plugin, PacketEvent packetEvent, Random random, Player player, String username) {
+    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;
+        this.publicKey = publicKey;
         this.random = random;
         this.player = player;
         this.username = username;
@@ -35,31 +40,32 @@ public class NameCheckTask extends JoinManagement<Player, ProtocolLibLoginSource
     @Override
     public void run() {
         try {
-            super.onLogin(username, new ProtocolLibLoginSource(plugin, packetEvent, player, random));
+            super.onLogin(username, new ProtocolLibLoginSource(packetEvent, player, random, publicKey));
         } finally {
             ProtocolLibrary.getProtocolManager().getAsynchronousManager().signalPacketTransmission(packetEvent);
         }
     }
 
-    //minecraft server implementation
+    //Minecraft server implementation
     //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L161
     @Override
-    public void requestPremiumLogin(ProtocolLibLoginSource source, PlayerProfile profile, String username, boolean registered) {
+    public void requestPremiumLogin(ProtocolLibLoginSource source, StoredProfile profile
+            , String username, boolean registered) {
         try {
             source.setOnlineMode();
         } catch (Exception ex) {
-            plugin.getLogger().log(Level.SEVERE, "Cannot send encryption packet. Falling back to cracked login", ex);
+            plugin.getLog().error("Cannot send encryption packet. Falling back to cracked login for: {}", profile, ex);
             return;
         }
 
         String ip = player.getAddress().getAddress().getHostAddress();
-        core.getPendingLogins().put(ip + username, new Object());
+        core.getPendingLogin().put(ip + username, new Object());
 
         String serverId = source.getServerId();
         byte[] verify = source.getVerifyToken();
 
         BukkitLoginSession playerSession = new BukkitLoginSession(username, serverId, verify, registered, profile);
-        plugin.getSessions().put(player.getAddress().toString(), playerSession);
+        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);
@@ -67,8 +73,8 @@ public class NameCheckTask extends JoinManagement<Player, ProtocolLibLoginSource
     }
 
     @Override
-    public void startCrackedSession(ProtocolLibLoginSource source, PlayerProfile profile, String username) {
+    public void startCrackedSession(ProtocolLibLoginSource source, StoredProfile profile, String username) {
         BukkitLoginSession loginSession = new BukkitLoginSession(username, profile);
-        plugin.getSessions().put(player.getAddress().toString(), loginSession);
+        plugin.getLoginSessions().put(player.getAddress().toString(), loginSession);
     }
 }

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

@@ -0,0 +1,90 @@
+package com.github.games647.fastlogin.bukkit.listener.protocollib;
+
+import com.comphenix.protocol.PacketType;
+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 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;
+import static com.comphenix.protocol.PacketType.Login.Client.START;
+
+public class ProtocolLibListener extends PacketAdapter {
+
+    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();
+
+    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)
+                .types(START, ENCRYPTION_BEGIN)
+                .optionAsync());
+
+        this.plugin = plugin;
+    }
+
+    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))
+                .start(WORKER_THREADS);
+    }
+
+    @Override
+    public void onPacketReceiving(PacketEvent packetEvent) {
+        if (packetEvent.isCancelled()
+                || plugin.getCore().getAuthPluginHook()== null
+                || !plugin.isServerFullyStarted()) {
+            return;
+        }
+
+        Player sender = packetEvent.getPlayer();
+        PacketType packetType = packetEvent.getPacketType();
+        if (packetType == START) {
+            onLogin(packetEvent, sender);
+        } else {
+            onEncryptionBegin(packetEvent, sender);
+        }
+    }
+
+    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);
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, verifyTask);
+    }
+
+    private void onLogin(PacketEvent packetEvent, Player player) {
+        //this includes ip:port. Should be unique for an incoming login request with a timeout of 2 minutes
+        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.getLoginSessions().remove(sessionKey);
+
+        //player.getName() won't work at this state
+        PacketContainer packet = packetEvent.getPacket();
+
+        String username = packet.getGameProfiles().read(0).getName();
+        plugin.getLog().trace("GameProfile {} with {} connecting", sessionKey, username);
+
+        packetEvent.getAsyncMarker().incrementProcessingDelay();
+        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,59 +1,68 @@
 package com.github.games647.fastlogin.bukkit.listener.protocollib;
 
-import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
+import com.github.games647.fastlogin.bukkit.EncryptionUtil;
 import com.github.games647.fastlogin.core.shared.LoginSource;
 
 import java.lang.reflect.InvocationTargetException;
 import java.net.InetSocketAddress;
 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;
+
 public class ProtocolLibLoginSource implements LoginSource {
 
-    private static final int VERIFY_TOKEN_LENGTH = 4;
-
-    private final FastLoginBukkit plugin;
-
     private final PacketEvent packetEvent;
     private final Player player;
 
     private final Random random;
+    private final PublicKey publicKey;
 
-    private String serverId;
-    private final byte[] verifyToken = new byte[VERIFY_TOKEN_LENGTH];
+    private final String serverId = "";
+    private byte[] verifyToken;
 
-    public ProtocolLibLoginSource(FastLoginBukkit plugin, PacketEvent packetEvent, Player player, Random random) {
-        this.plugin = plugin;
+    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 setOnlineMode() throws Exception {
-        //randomized server id to make sure the request is for our server
-        //this could be relevant http://www.sk89q.com/2011/09/minecraft-name-spoofing-exploit/
-        serverId = Long.toString(random.nextLong(), 16);
+        verifyToken = EncryptionUtil.generateVerifyToken(random);
 
-        //generate a random token which should be the same when we receive it from the client
-        random.nextBytes(verifyToken);
-        
-        sentEncryptionRequest();
+        /*
+         * 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);
+        newPacket.getSpecificModifier(PublicKey.class).write(0, publicKey);
+
+        newPacket.getByteArrays().write(0, verifyToken);
+
+        //serverId is a empty string
+        ProtocolLibrary.getProtocolManager().sendServerPacket(player, newPacket);
     }
 
     @Override
-    public void kick(String message) throws Exception {
+    public void kick(String message) throws InvocationTargetException {
         ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
 
-        PacketContainer kickPacket = protocolManager.createPacket(PacketType.Login.Server.DISCONNECT);
+        PacketContainer kickPacket = new PacketContainer(DISCONNECT);
         kickPacket.getChatComponents().write(0, WrappedChatComponent.fromText(message));
 
         try {
@@ -71,29 +80,22 @@ public class ProtocolLibLoginSource implements LoginSource {
         return packetEvent.getPlayer().getAddress();
     }
 
-    private void sentEncryptionRequest() throws InvocationTargetException {
-        ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
-        /**
-         * Packet Information: http://wiki.vg/Protocol#Encryption_Request
-         *
-         * ServerID="" (String) key=public server key verifyToken=random 4 byte array
-         */
-        PacketContainer newPacket = protocolManager.createPacket(PacketType.Login.Server.ENCRYPTION_BEGIN);
-
-        newPacket.getStrings().write(0, serverId);
-        newPacket.getSpecificModifier(PublicKey.class).write(0, plugin.getServerKey().getPublic());
-
-        newPacket.getByteArrays().write(0, verifyToken);
-
-        //serverId is a empty string
-        protocolManager.sendServerPacket(player, newPacket);
-    }
-
     public String getServerId() {
         return serverId;
     }
 
     public byte[] getVerifyToken() {
-        return verifyToken;
+        return ArrayUtils.clone(verifyToken);
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + '{' +
+                "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

@@ -6,11 +6,11 @@ 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.Property;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -19,20 +19,19 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
 
-public class LoginSkinApplyListener implements Listener {
+public class SkinApplyListener implements Listener {
 
     private static final Class<?> GAME_PROFILE = MinecraftReflection.getGameProfileClass();
-
     private static final MethodAccessor GET_PROPERTIES = Accessors.getMethodAccessor(GAME_PROFILE, "getProperties");
 
     private final FastLoginBukkit plugin;
 
-    public LoginSkinApplyListener(FastLoginBukkit plugin) {
+    public SkinApplyListener(FastLoginBukkit plugin) {
         this.plugin = plugin;
     }
 
     @EventHandler(priority = EventPriority.LOW)
-    //run this on the loginEvent to let skins plugins see the skin like in normal minecraft behaviour
+    //run this on the loginEvent to let skins plugins see the skin like in normal Minecraft behaviour
     public void onPlayerLogin(PlayerLoginEvent loginEvent) {
         if (loginEvent.getResult() != Result.ALLOWED) {
             return;
@@ -42,13 +41,10 @@ public class LoginSkinApplyListener implements Listener {
 
         if (plugin.getConfig().getBoolean("forwardSkin")) {
             //go through every session, because player.getAddress is null 
-            //loginEvent.getAddress is just a InetAddress not InetSocketAddres, so not unique enough
-            for (BukkitLoginSession session : plugin.getSessions().values()) {
+            //loginEvent.getAddress is just a InetAddress not InetSocketAddress, so not unique enough
+            for (BukkitLoginSession session : plugin.getLoginSessions().values()) {
                 if (session.getUsername().equals(player.getName())) {
-                    String signature = session.getSkinSignature();
-                    String skinData = session.getEncodedSkinData();
-
-                    applySkin(player, skinData, signature);
+                    session.getSkin().ifPresent(skin -> applySkin(player, skin.getValue(), skin.getSignature()));
                     break;
                 }
             }
@@ -57,17 +53,17 @@ public class LoginSkinApplyListener implements Listener {
 
     private void applySkin(Player player, String skinData, String signature) {
         WrappedGameProfile gameProfile = WrappedGameProfile.fromPlayer(player);
-        if (skinData != null && signature != null) {
-            WrappedSignedProperty skin = WrappedSignedProperty.fromValues("textures", skinData, signature);
+
+        WrappedSignedProperty skin = WrappedSignedProperty.fromValues(Property.TEXTURE_KEY, skinData, signature);
+        try {
+            gameProfile.getProperties().put(Property.TEXTURE_KEY, skin);
+        } catch (ClassCastException castException) {
+            //Cauldron, MCPC, Thermos, ...
+            Object map = GET_PROPERTIES.invoke(gameProfile.getHandle());
             try {
-                gameProfile.getProperties().put("textures", skin);
-            } catch (ClassCastException castException) {
-                Object map = GET_PROPERTIES.invoke(gameProfile.getHandle());
-                try {
-                    MethodUtils.invokeMethod(map, "put", new Object[]{"textures", skin.getHandle()});
-                } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
-                    plugin.getLogger().log(Level.SEVERE, "Error setting premium skin", ex);
-                }
+                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/StartPacketListener.java

@@ -1,77 +0,0 @@
-package com.github.games647.fastlogin.bukkit.listener.protocollib;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-
-import java.util.Random;
-import java.util.logging.Level;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-/**
- * Handles incoming start packets from connecting clients. It
- * checks if we can start checking if the player is premium and
- * start a request to the client that it should start online mode
- * login.
- *
- * Receiving packet information:
- * http://wiki.vg/Protocol#Login_Start
- *
- * String=Username
- */
-public class StartPacketListener extends PacketAdapter {
-
-    //hides the inherit Plugin plugin field, but we need a more detailed type than just Plugin
-    private final FastLoginBukkit plugin;
-
-    //just create a new once on plugin enable. This used for verify token generation
-    private final Random random = new Random();
-
-    public StartPacketListener(FastLoginBukkit plugin) {
-        //run async in order to not block the server, because we are making api calls to Mojang
-        super(params(plugin, PacketType.Login.Client.START).optionAsync());
-
-        this.plugin = plugin;
-    }
-
-    /**
-     * C->S : Handshake State=2
-     * C->S : Login Start
-     * S->C : Encryption Key Request
-     * (Client Auth)
-     * C->S : Encryption Key Response
-     * (Server Auth, Both enable encryption)
-     * S->C : Login Success (*)
-     *
-     * On offline logins is Login Start followed by Login Success
-     */
-    @Override
-    public void onPacketReceiving(PacketEvent packetEvent) {
-        if (packetEvent.isCancelled()
-                || plugin.getCore().getAuthPluginHook()== null || !plugin.isServerFullyStarted()) {
-            return;
-        }
-
-        Player player = packetEvent.getPlayer();
-
-        //this includes ip:port. Should be unique for an incoming login request with a timeout of 2 minutes
-        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.getSessions().remove(sessionKey);
-
-        //player.getName() won't work at this state
-        PacketContainer packet = packetEvent.getPacket();
-
-        String username = packet.getGameProfiles().read(0).getName();
-        plugin.getLogger().log(Level.FINER, "Player {0} with {1} connecting", new Object[]{sessionKey, username});
-
-        packetEvent.getAsyncMarker().incrementProcessingDelay();
-        NameCheckTask nameCheckTask = new NameCheckTask(plugin, packetEvent, random, player, username);
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, nameCheckTask);
-    }
-}

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

@@ -1,59 +1,68 @@
 package com.github.games647.fastlogin.bukkit.listener.protocollib;
 
-import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.injector.netty.Injector;
 import com.comphenix.protocol.injector.server.TemporaryPlayerFactory;
 import com.comphenix.protocol.reflect.FieldUtils;
 import com.comphenix.protocol.reflect.FuzzyReflection;
 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.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.math.BigInteger;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.security.GeneralSecurityException;
+import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.UUID;
-import java.util.logging.Level;
 
+import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 
 import org.bukkit.entity.Player;
 
+import static com.comphenix.protocol.PacketType.Login.Client.START;
+import static com.comphenix.protocol.PacketType.Login.Server.DISCONNECT;
+
 public class VerifyResponseTask implements Runnable {
 
     private final FastLoginBukkit plugin;
     private final PacketEvent packetEvent;
+    private final KeyPair serverKey;
 
-    private final Player fromPlayer;
+    private final Player player;
 
     private final byte[] sharedSecret;
 
-    public VerifyResponseTask(FastLoginBukkit plugin, PacketEvent packetEvent, Player fromPlayer, byte[] sharedSecret) {
+    public VerifyResponseTask(FastLoginBukkit plugin, PacketEvent packetEvent, Player player,
+                              byte[] sharedSecret, KeyPair keyPair) {
         this.plugin = plugin;
         this.packetEvent = packetEvent;
-        this.fromPlayer = fromPlayer;
-        this.sharedSecret = sharedSecret;
+        this.player = player;
+        this.sharedSecret = Arrays.copyOf(sharedSecret, sharedSecret.length);
+        this.serverKey = keyPair;
     }
 
     @Override
     public void run() {
         try {
-            BukkitLoginSession session = plugin.getSessions().get(fromPlayer.getAddress().toString());
+            BukkitLoginSession session = plugin.getLoginSessions().get(player.getAddress().toString());
             if (session == null) {
-                disconnect(plugin.getCore().getMessage("invalid-requst"), true
-                        , "Player {0} tried to send encryption response at invalid state", fromPlayer.getAddress());
+                disconnect(plugin.getCore().getMessage("invalid-request"), true
+                        , "GameProfile {0} tried to send encryption response at invalid state", player.getAddress());
             } else {
-                String ip = fromPlayer.getAddress().getAddress().getHostAddress();
-                plugin.getCore().getPendingLogins().remove(ip + session.getUsername());
-
                 verifyResponse(session);
             }
         } finally {
@@ -67,59 +76,98 @@ public class VerifyResponseTask implements Runnable {
     }
 
     private void verifyResponse(BukkitLoginSession session) {
-        PrivateKey privateKey = plugin.getServerKey().getPrivate();
+        PrivateKey privateKey = serverKey.getPrivate();
 
-        SecretKey loginKey = EncryptionUtil.decryptSharedKey(privateKey, sharedSecret);
-        if (!checkVerifyToken(session, privateKey) || !encryptConnection(loginKey)) {
+        Cipher cipher;
+        SecretKey loginKey;
+        try {
+            cipher = Cipher.getInstance(privateKey.getAlgorithm());
+
+            loginKey = EncryptionUtil.decryptSharedKey(cipher, privateKey, sharedSecret);
+        } catch (GeneralSecurityException securityEx) {
+            disconnect("error-kick", false, "Cannot decrypt received contents", securityEx);
             return;
         }
 
-        //this makes sure the request from the client is for us
-        //this might be relevant http://www.sk89q.com/2011/09/minecraft-name-spoofing-exploit/
-        String generatedId = session.getServerId();
+        try {
+            if (!checkVerifyToken(session, cipher, privateKey) || !encryptConnection(loginKey)) {
+                return;
+            }
+        } catch (Exception ex) {
+            disconnect("error-kick", false, "Cannot decrypt received contents", ex);
+            return;
+        }
 
-        //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L193
-        //generate the server id based on client and server data
-        byte[] serverIdHash = EncryptionUtil.getServerIdHash(generatedId, plugin.getServerKey().getPublic(), loginKey);
-        String serverId = (new BigInteger(serverIdHash)).toString(16);
+        String serverId = EncryptionUtil.getServerIdHashString("", loginKey, serverKey.getPublic());
 
         String username = session.getUsername();
-        if (plugin.getCore().getApiConnector().hasJoinedServer(session, serverId)) {
-            plugin.getLogger().log(Level.FINE, "Player {0} has a verified premium account", username);
+        InetSocketAddress socketAddress = player.getAddress();
+        try {
+            MojangResolver resolver = plugin.getCore().getResolver();
+            InetAddress address = socketAddress.getAddress();
+            Optional<Verification> response = resolver.hasJoined(username, serverId, address);
+            if (response.isPresent()) {
+                Verification verification = response.get();
+                UUID id = verification.getId();
 
-            session.setVerified(true);
-            setPremiumUUID(session.getUuid());
-            receiveFakeStartPacket(username);
-        } else {
-            //user tried to fake a authentication
-            disconnect(plugin.getCore().getMessage("invalid-session"), true
-                    , "Player {0} ({1}) tried to log in with an invalid session ServerId: {2}"
-                    , session.getUsername(), fromPlayer.getAddress(), serverId);
+                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.setUuid(id);
+                session.setVerified(true);
+
+                setPremiumUUID(session.getUuid());
+                receiveFakeStartPacket(username);
+            } else {
+                //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.getUsername(), socketAddress, serverId);
+            }
+        } catch (IOException ioEx) {
+            disconnect("error-kick", false, "Failed to connect to session server", ioEx);
         }
     }
 
     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
                 FieldUtils.writeField(networkManager, "spoofedUUID", premiumUUID, true);
             } catch (Exception exc) {
-                plugin.getLogger().log(Level.SEVERE, "Error setting premium uuid", exc);
+                plugin.getLog().error("Error setting premium uuid of {}", player, exc);
             }
         }
     }
 
-    private boolean checkVerifyToken(BukkitLoginSession session, PrivateKey privateKey) {
+    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.decryptData(privateKey, responseVerify))) {
+        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
-                    , "Player {0} ({1}) tried to login with an invalid verify token. Server: {2} Client: {3}"
+                    , "GameProfile {0} ({1}) tried to login with an invalid verify token. Server: {2} Client: {3}"
                     , session.getUsername(), packetEvent.getPlayer().getAddress(), requestVerify, responseVerify);
             return false;
         }
@@ -128,11 +176,12 @@ public class VerifyResponseTask implements Runnable {
     }
 
     //try to get the networkManager from ProtocolLib
-    private Object getNetworkManager() throws IllegalAccessException, NoSuchFieldException {
-        Object injectorContainer = TemporaryPlayerFactory.getInjectorFromPlayer(fromPlayer);
+    private Object getNetworkManager() throws IllegalAccessException, ClassNotFoundException {
+        Object injectorContainer = TemporaryPlayerFactory.getInjectorFromPlayer(player);
 
         //ChannelInjector
-        Injector rawInjector = FuzzyReflection.getFieldValue(injectorContainer, Injector.class, true);
+        Class<?> injectorClass = Class.forName("com.comphenix.protocol.injector.netty.Injector");
+        Object rawInjector = FuzzyReflection.getFieldValue(injectorContainer, injectorClass, true);
         return FieldUtils.readField(rawInjector, "networkManager", true);
     }
 
@@ -149,8 +198,7 @@ public class VerifyResponseTask implements Runnable {
             //the client expects this behaviour
             encryptMethod.invoke(networkManager, loginKey);
         } catch (Exception ex) {
-            plugin.getLogger().log(Level.SEVERE, "Couldn't enable encryption", ex);
-            disconnect(plugin.getCore().getMessage("error-kick"), false, "Couldn't enable encryption");
+            disconnect("error-kick", false, "Couldn't enable encryption", ex);
             return false;
         }
 
@@ -159,48 +207,43 @@ public class VerifyResponseTask implements Runnable {
 
     private void disconnect(String kickReason, boolean debug, String logMessage, Object... arguments) {
         if (debug) {
-            plugin.getLogger().log(Level.FINE, logMessage, arguments);
+            plugin.getLog().debug(logMessage, arguments);
         } else {
-            plugin.getLogger().log(Level.SEVERE, logMessage, arguments);
+            plugin.getLog().error(logMessage, arguments);
         }
 
-        kickPlayer(packetEvent.getPlayer(), kickReason);
+        kickPlayer(plugin.getCore().getMessage(kickReason));
     }
 
-    private void kickPlayer(Player player, String reason) {
-        ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
-
-        PacketContainer kickPacket = protocolManager.createPacket(PacketType.Login.Server.DISCONNECT);
+    private void kickPlayer(String reason) {
+        PacketContainer kickPacket = new PacketContainer(DISCONNECT);
         kickPacket.getChatComponents().write(0, WrappedChatComponent.fromText(reason));
-
         try {
             //send kick packet at login state
             //the normal event.getPlayer.kickPlayer(String) method does only work at play state
-            protocolManager.sendServerPacket(player, kickPacket);
+            ProtocolLibrary.getProtocolManager().sendServerPacket(player, kickPacket);
             //tell the server that we want to close the connection
             player.kickPlayer("Disconnect");
         } catch (InvocationTargetException ex) {
-            plugin.getLogger().log(Level.SEVERE, "Error sending kickpacket", ex);
+            plugin.getLog().error("Error sending kick packet for: {}", player, ex);
         }
     }
 
     //fake a new login packet in order to let the server handle all the other stuff
     private void receiveFakeStartPacket(String username) {
-        ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
-        
         //see StartPacketListener for packet information
-        PacketContainer startPacket = protocolManager.createPacket(PacketType.Login.Client.START);
+        PacketContainer startPacket = new PacketContainer(START);
 
         //uuid is ignored by the packet definition
         WrappedGameProfile fakeProfile = new WrappedGameProfile(UUID.randomUUID(), username);
         startPacket.getGameProfiles().write(0, fakeProfile);
         try {
             //we don't want to handle our own packets so ignore filters
-            protocolManager.recieveClientPacket(fromPlayer, startPacket, false);
+            ProtocolLibrary.getProtocolManager().recieveClientPacket(player, startPacket, false);
         } catch (InvocationTargetException | IllegalAccessException ex) {
-            plugin.getLogger().log(Level.WARNING, "Failed to fake a new start packet", 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
-            kickPlayer(fromPlayer, plugin.getCore().getMessage("error-kick"));
+            kickPlayer(plugin.getCore().getMessage("error-kick"));
         }
     }
 }

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

@@ -32,4 +32,11 @@ public class ProtocolLoginSource implements LoginSource {
     public PlayerLoginStartEvent getLoginStartEvent() {
         return loginStartEvent;
     }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + '{' +
+                "loginStartEvent=" + loginStartEvent +
+                '}';
+    }
 }

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

@@ -2,19 +2,21 @@ package com.github.games647.fastlogin.bukkit.listener.protocolsupport;
 
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
+import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
-import com.github.games647.fastlogin.core.PlayerProfile;
 
 import java.net.InetSocketAddress;
 
+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.PlayerPropertiesResolveEvent;
 
-public class ProtocolSupportListener extends JoinManagement<Player, ProtocolLoginSource> implements Listener {
+public class ProtocolSupportListener extends JoinManagement<Player, CommandSender, ProtocolLoginSource>
+        implements Listener {
 
     private final FastLoginBukkit plugin;
 
@@ -26,7 +28,6 @@ public class ProtocolSupportListener extends JoinManagement<Player, ProtocolLogi
 
     @EventHandler
     public void onLoginStart(PlayerLoginStartEvent loginStartEvent) {
-        plugin.setServerStarted();
         if (loginStartEvent.isLoginDenied() || plugin.getCore().getAuthPluginHook() == null) {
             return;
         }
@@ -35,42 +36,50 @@ public class ProtocolSupportListener extends JoinManagement<Player, ProtocolLogi
         InetSocketAddress address = loginStartEvent.getAddress();
 
         //remove old data every time on a new login in order to keep the session only for one person
-        plugin.getSessions().remove(address.toString());
+        plugin.getLoginSessions().remove(address.toString());
 
         super.onLogin(username, new ProtocolLoginSource(loginStartEvent));
     }
 
     @EventHandler
-    public void onPropertiesResolve(PlayerPropertiesResolveEvent propertiesResolveEvent) {
-        InetSocketAddress address = propertiesResolveEvent.getAddress();
-        BukkitLoginSession session = plugin.getSessions().get(address.toString());
+    public void onConnectionClosed(ConnectionCloseEvent closeEvent) {
+        InetSocketAddress address = closeEvent.getConnection().getAddress();
+        plugin.getLoginSessions().remove(address.toString());
+    }
 
-        //skin was resolved -> premium player
-        if (propertiesResolveEvent.hasProperty("textures") && session != null) {
-            String ip = address.getAddress().getHostAddress();
-            plugin.getCore().getPendingLogins().remove(ip + session.getUsername());
+    @EventHandler
+    public void onPropertiesResolve(PlayerLoginFinishEvent loginFinishEvent) {
+        if (!loginFinishEvent.isOnlineMode()) {
+            return;
+        }
 
+        InetSocketAddress address = loginFinishEvent.getAddress();
+        BukkitLoginSession session = plugin.getLoginSessions().get(address.toString());
+
+        if (session != null) {
             session.setVerified(true);
         }
     }
 
     @Override
-    public void requestPremiumLogin(ProtocolLoginSource source, PlayerProfile profile, String username, boolean registered) {
+    public void requestPremiumLogin(ProtocolLoginSource source, StoredProfile profile, String username
+            , boolean registered) {
         source.setOnlineMode();
 
         String ip = source.getAddress().getAddress().getHostAddress();
-        plugin.getCore().getPendingLogins().put(ip + username, new Object());
+        plugin.getCore().getPendingLogin().put(ip + username, new Object());
 
-        BukkitLoginSession playerSession = new BukkitLoginSession(username, null, null, registered, profile);
-        plugin.getSessions().put(source.getAddress().toString(), 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, PlayerProfile profile, String username) {
+    public void startCrackedSession(ProtocolLoginSource source, StoredProfile profile, String username) {
         BukkitLoginSession loginSession = new BukkitLoginSession(username, profile);
-        plugin.getSessions().put(source.getAddress().toString(), loginSession);
+        plugin.getLoginSessions().put(source.getAddress().toString(), loginSession);
     }
 }

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

@@ -0,0 +1,100 @@
+package com.github.games647.fastlogin.bukkit.task;
+
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
+import com.github.games647.fastlogin.bukkit.hook.AuthMeHook;
+import com.github.games647.fastlogin.bukkit.hook.CrazyLoginHook;
+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.core.hooks.AuthPlugin;
+
+import java.lang.reflect.Constructor;
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+
+public class DelayedAuthHook implements Runnable {
+
+    private final FastLoginBukkit plugin;
+
+    public DelayedAuthHook(FastLoginBukkit plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void run() {
+        boolean hookFound = isHookFound();
+        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 "
+                    + "(other plugins could hook into this after the initialization of this plugin)"
+                    + "and BungeeCord is deactivated. "
+                    + "Either one or both of the checks have to pass in order to use this plugin");
+        }
+
+        if (hookFound) {
+            plugin.setServerStarted();
+        }
+    }
+
+    private boolean isHookFound() {
+        return plugin.getCore().getAuthPluginHook() != null || registerHooks();
+    }
+
+    private boolean registerHooks() {
+        AuthPlugin<Player> authPluginHook = getAuthHook();
+        if (authPluginHook == null) {
+            //run this check for exceptions (errors) and not found plugins
+            plugin.getLog().warn("No support offline Auth plugin found. ");
+            return false;
+        }
+
+        if (authPluginHook instanceof Listener) {
+            Bukkit.getPluginManager().registerEvents((Listener) authPluginHook, plugin);
+        }
+
+        if (plugin.getCore().getAuthPluginHook() == null) {
+            plugin.getLog().info("Hooking into auth plugin: {}", authPluginHook.getClass().getSimpleName());
+            plugin.getCore().setAuthPluginHook(authPluginHook);
+        }
+
+        return true;
+    }
+
+    private AuthPlugin<Player> getAuthHook() {
+        try {
+            @SuppressWarnings("unchecked")
+            List<Class<? extends AuthPlugin<Player>>> hooks = Arrays.asList(AuthMeHook.class,
+                    CrazyLoginHook.class, LogItHook.class, LoginSecurityHook.class, UltraAuthHook.class,
+                    xAuthHook.class);
+
+            for (Class<? extends AuthPlugin<Player>> clazz : hooks) {
+                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
+                    return newInstance(clazz);
+                }
+            }
+        } catch (ReflectiveOperationException ex) {
+            plugin.getLog().error("Couldn't load the auth hook class", ex);
+        }
+
+        return null;
+    }
+
+    private AuthPlugin<Player> newInstance(Class<? extends AuthPlugin<Player>> clazz)
+            throws ReflectiveOperationException {
+        try {
+            Constructor<? extends AuthPlugin<Player>> cons = clazz.getDeclaredConstructor(FastLoginBukkit.class);
+            return cons.newInstance(plugin);
+        } catch (NoSuchMethodException noMethodEx) {
+            return clazz.getDeclaredConstructor().newInstance();
+        }
+    }
+}

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

@@ -0,0 +1,72 @@
+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.core.PremiumStatus;
+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 java.util.concurrent.ExecutionException;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.metadata.FixedMetadataValue;
+
+public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender, BukkitLoginSession, FastLoginBukkit> {
+
+    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() {
+        //blacklist this target player for BungeeCord ID brute force attacks
+        FastLoginBukkit plugin = core.getPlugin();
+        player.setMetadata(core.getPlugin().getName(), new FixedMetadataValue(plugin, true));
+
+        super.run();
+
+        if (isOnlineMode()) {
+            plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.PREMIUM);
+        } else {
+            plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
+        }
+    }
+
+    @Override
+    public void onForceActionSuccess(LoginSession session) {
+        if (core.getPlugin().isBungeeEnabled()) {
+            core.getPlugin().sendPluginMessage(player, new SuccessMessage());
+        }
+    }
+
+    @Override
+    public String getName(Player player) {
+        return player.getName();
+    }
+
+    @Override
+    public boolean isOnline(Player player) {
+        try {
+            //the player-list isn't thread-safe
+            return Bukkit.getScheduler().callSyncMethod(core.getPlugin(), player::isOnline).get();
+        } catch (InterruptedException | ExecutionException ex) {
+            core.getPlugin().getLog().error("Failed to perform thread-safe online check for {}", player, ex);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean isOnlineMode() {
+        return session.isVerified() && player.getName().equals(session.getUsername());
+    }
+}

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

@@ -1,75 +0,0 @@
-package com.github.games647.fastlogin.bukkit.tasks;
-
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.hooks.AuthMeHook;
-import com.github.games647.fastlogin.bukkit.hooks.CrazyLoginHook;
-import com.github.games647.fastlogin.bukkit.hooks.LogItHook;
-import com.github.games647.fastlogin.bukkit.hooks.LoginSecurityHook;
-import com.github.games647.fastlogin.bukkit.hooks.UltraAuthHook;
-import com.github.games647.fastlogin.bukkit.hooks.xAuthHook;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import com.google.common.collect.Lists;
-
-import java.util.List;
-import java.util.logging.Level;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class DelayedAuthHook implements Runnable {
-
-    private final FastLoginBukkit plugin;
-
-    public DelayedAuthHook(FastLoginBukkit plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public void run() {
-        boolean hookFound = registerHooks();
-        if (plugin.isBungeeCord()) {
-            plugin.getLogger().info("BungeeCord setting detected. No auth plugin is required");
-        } else if (!hookFound) {
-            plugin.getLogger().warning("No auth plugin were found by this plugin "
-                    + "(other plugins could hook into this after the intialization of this plugin)"
-                    + "and bungeecord is deactivated. "
-                    + "Either one or both of the checks have to pass in order to use this plugin");
-        }
-    }
-
-    private boolean registerHooks() {
-        AuthPlugin<Player> authPluginHook = null;
-        try {
-            @SuppressWarnings("unchecked")
-            List<Class<? extends AuthPlugin<Player>>> supportedHooks = Lists.newArrayList(AuthMeHook.class
-                    , CrazyLoginHook.class, LogItHook.class, LoginSecurityHook.class, UltraAuthHook.class
-                    , xAuthHook.class);
-
-            for (Class<? extends AuthPlugin<Player>> clazz : supportedHooks) {
-                String pluginName = clazz.getSimpleName().replace("Hook", "");
-                //uses only member classes which uses AuthPlugin interface (skip interfaces)
-                if (Bukkit.getServer().getPluginManager().getPlugin(pluginName) != null) {
-                    //check only for enabled plugins. A single plugin could be disabled by plugin managers
-                    authPluginHook = clazz.newInstance();
-                    plugin.getLogger().log(Level.INFO, "Hooking into auth plugin: {0}", pluginName);
-                    break;
-                }
-            }
-        } catch (InstantiationException | IllegalAccessException ex) {
-            plugin.getLogger().log(Level.SEVERE, "Couldn't load the integration class", ex);
-        }
-
-        if (authPluginHook == null) {
-            //run this check for exceptions (errors) and not found plugins
-            plugin.getLogger().warning("No support offline Auth plugin found. ");
-            return false;
-        }
-
-        if (plugin.getCore().getAuthPluginHook() == null) {
-            plugin.getCore().setAuthPluginHook(authPluginHook);
-            plugin.setServerStarted();
-        }
-        
-        return true;
-    }
-}

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

@@ -1,133 +0,0 @@
-package com.github.games647.fastlogin.bukkit.tasks;
-
-import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.core.AuthStorage;
-import com.github.games647.fastlogin.core.PlayerProfile;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.logging.Level;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class ForceLoginTask implements Runnable {
-
-    private final FastLoginBukkit plugin;
-    private final Player player;
-
-    public ForceLoginTask(FastLoginBukkit plugin, Player player) {
-        this.plugin = plugin;
-        this.player = player;
-    }
-
-    @Override
-    public void run() {
-        if (!isOnlineThreadSafe()) {
-            return;
-        }
-
-        //remove the bungeecord identifier if there is ones
-        String id = '/' + player.getAddress().getAddress().getHostAddress() + ':' + player.getAddress().getPort();
-        BukkitLoginSession session = plugin.getSessions().remove(id);
-        if (session == null) {
-            return;
-        }
-
-        AuthStorage storage = plugin.getCore().getStorage();
-        PlayerProfile playerProfile = session.getProfile();
-
-        //check if it's the same player as we checked before
-        if (session.isVerified() && player.getName().equals(session.getUsername())) {
-            //premium player
-            AuthPlugin<Player> authPlugin = plugin.getCore().getAuthPluginHook();
-            if (authPlugin == null) {
-                //maybe only bungeecord plugin
-                sendSuccessNotification();
-            } else {
-                boolean success = false;
-                if (isOnlineThreadSafe()) {
-                    if (plugin.getConfig().getBoolean("autoLogin")) {
-                        if (session.needsRegistration()) {
-                            success = forceRegister(authPlugin, player);
-                        } else {
-                            success = forceLogin(authPlugin, player);
-                        }
-                    } else {
-                        success = true;
-                    }
-                }
-
-                if (success) {
-                    //update only on success to prevent corrupt data
-                    if (playerProfile != null) {
-                        playerProfile.setUuid(session.getUuid());
-                        //save cracked players too
-                        playerProfile.setPremium(true);
-                        storage.save(playerProfile);
-                    }
-
-                    sendSuccessNotification();
-                }
-            }
-        } else {
-            //cracked player
-            if (playerProfile != null) {
-                playerProfile.setUuid(null);
-                playerProfile.setPremium(false);
-                storage.save(playerProfile);
-            }
-        }
-    }
-
-    private boolean forceRegister(AuthPlugin<Player> authPlugin, Player player) {
-        plugin.getLogger().log(Level.FINE, "Register player {0}", player.getName());
-
-        String generatedPassword = plugin.getCore().getPasswordGenerator().getRandomPassword(player);
-        boolean success = authPlugin.forceRegister(player, generatedPassword);
-        String message = plugin.getCore().getMessage("auto-register");
-        if (success && message != null) {
-            message = message.replace("%password", generatedPassword);
-            player.sendMessage(message);
-        }
-
-        return success;
-    }
-
-    private boolean forceLogin(AuthPlugin<Player> authPlugin, Player player) {
-        plugin.getLogger().log(Level.FINE, "Logging player {0} in", player.getName());
-        boolean success = authPlugin.forceLogin(player);
-
-        String message = plugin.getCore().getMessage("auto-login");
-        if (success && message != null) {
-            player.sendMessage(message);
-        }
-
-        return success;
-    }
-
-    private void sendSuccessNotification() {
-        if (plugin.isBungeeCord()) {
-            ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
-            dataOutput.writeUTF("SUCCESS");
-
-            player.sendPluginMessage(plugin, plugin.getName(), dataOutput.toByteArray());
-        }
-    }
-
-    private boolean isOnlineThreadSafe() {
-        //the playerlist isn't thread-safe
-        Future<Boolean> onlineFuture = Bukkit.getScheduler().callSyncMethod(plugin, player::isOnline);
-
-        try {
-            return onlineFuture.get();
-        } catch (InterruptedException | ExecutionException ex) {
-            plugin.getLogger().log(Level.SEVERE, "Failed to perform thread-safe online check", ex);
-            return false;
-        }
-    }
-}

bukkit/src/main/resources/plugin.yml

@@ -1,10 +1,10 @@
-# project informations for Bukkit in order to register our plugin with all it 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}
+version: ${project.version}-${git.commit.id.abbrev}
 main: ${project.groupId}.${project.artifactId}.${project.name}
 
-# meta informations for plugin managers
+# meta data for plugin managers
 authors: [games647, 'https://github.com/games647/FastLogin/graphs/contributors']
 description: |
     ${project.description}
@@ -18,6 +18,7 @@ softdepend:
     # We depend either ProtocolLib or ProtocolSupport
     - ProtocolSupport
     - ProtocolLib
+    - PlaceholderAPI
 
 commands:
     ${project.parent.name}:
@@ -32,11 +33,6 @@ commands:
         usage: /<command> [player]
         permission: ${project.artifactId}.command.cracked
 
-    import-auth:
-        description: 'Imports the auth data from another auto login'
-        usage: /<command> [player]
-        permission: ${project.artifactId}.command.import
-
 permissions:
     ${project.artifactId}.command.premium:
         description: 'Label themselves as premium'
@@ -54,4 +50,4 @@ permissions:
     ${project.artifactId}.command.cracked.other:
         description: 'Label others as cracked'
         children:
-            ${project.artifactId}.command.cracked: true
+            ${project.artifactId}.command.cracked: true

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);
+    //     }
+    // }
+}

bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.9</version>
+        <version>1.11-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -16,38 +16,85 @@
     <!--Represents the main plugin-->
     <name>FastLoginBungee</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <shadedArtifactAttached>false</shadedArtifactAttached>
+                    <artifactSet>
+                        <excludes>
+                            <!--Those classes are already present in BungeeCord version-->
+                            <exclude>net.md-5:bungeecord-config</exclude>
+                            <exclude>com.google.code.gson:gson</exclude>
+                        </excludes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.zaxxer.hikari</pattern>
+                            <shadedPattern>fastlogin.hikari</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.slf4j</pattern>
+                            <shadedPattern>fastlogin.slf4j</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <repositories>
-        <!--BungeeCord with also the part outside the API-->
         <repository>
-            <id>myplayplanet-REPO</id>
-            <url>http://maven.myplayplanet.net/</url>
+            <id>vik1395-repo</id>
+            <url>https://vik1395.github.io/repo.vik1395.me/repositories</url>
         </repository>
 
         <repository>
-            <id>vik1395-repo</id>
-            <url>http://repo.vik1395.me/repositories</url>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
     </repositories>
 
     <dependencies>
+        <!--Common plugin component-->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>fastlogin.core</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
 
+        <!--BungeeCord with also the part outside the API-->
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-proxy</artifactId>
-            <version>1.8-SNAPSHOT</version>
+            <version>1.12-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
+        <!--Login plugin-->
         <dependency>
             <groupId>me.vik1395</groupId>
             <artifactId>BungeeAuth</artifactId>
-            <version>1.3.1</version>
+            <version>1.4</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>

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

@@ -1,87 +0,0 @@
-package com.github.games647.fastlogin.bungee;
-
-import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.github.games647.fastlogin.core.shared.MojangApiConnector;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ThreadFactory;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.scheduler.GroupedThreadFactory;
-import net.md_5.bungee.config.Configuration;
-import net.md_5.bungee.config.ConfigurationProvider;
-import net.md_5.bungee.config.YamlConfiguration;
-
-public class BungeeCore extends FastLoginCore<ProxiedPlayer> {
-
-    private static Map<String, Object> generateConfigMap(Configuration config) {
-        return config.getKeys().stream()
-                .filter(key -> config.get(key) != null)
-                .collect(Collectors.toMap(key -> key, config::get));
-    }
-
-    private final FastLoginBungee plugin;
-
-    public BungeeCore(FastLoginBungee plugin, Configuration config) {
-        super(generateConfigMap(config));
-
-        this.plugin = plugin;
-    }
-
-    @Override
-    public File getDataFolder() {
-        return plugin.getDataFolder();
-    }
-
-    @Override
-    public Logger getLogger() {
-        return plugin.getLogger();
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public ThreadFactory getThreadFactory() {
-        String pluginName = plugin.getDescription().getName();
-        return new ThreadFactoryBuilder()
-                .setNameFormat(pluginName + " Database Pool Thread #%1$d")
-                //Hikari create daemons by default
-                .setDaemon(true)
-                .setThreadFactory(new GroupedThreadFactory(plugin, pluginName))
-                .build();
-    }
-
-    @Override
-    public void loadMessages() {
-        try {
-            plugin.saveDefaultFile("messages.yml");
-            ConfigurationProvider configProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);
-
-            Configuration defaults = configProvider.load(getClass().getResourceAsStream("/messages.yml"));
-
-            File messageFile = new File(getDataFolder(), "messages.yml");
-            Configuration messageConfig = configProvider.load(messageFile, defaults);
-
-            messageConfig.getKeys().forEach(key -> {
-                String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
-                if (!message.isEmpty()) {
-                    localeMessages.put(key, message);
-                }
-            });
-        } catch (IOException ex) {
-            getLogger().log(Level.SEVERE, "Failed to load messages", ex);
-        }
-    }
-
-    @Override
-    public MojangApiConnector makeApiConnector(Logger logger, List<String> addresses, int requests) {
-        return new MojangApiBungee(logger, addresses, requests);
-    }
-}

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

@@ -1,6 +1,6 @@
 package com.github.games647.fastlogin.bungee;
 
-import com.github.games647.fastlogin.core.PlayerProfile;
+import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.LoginSession;
 
 public class BungeeLoginSession extends LoginSession {
@@ -8,7 +8,7 @@ public class BungeeLoginSession extends LoginSession {
     private boolean alreadySaved;
     private boolean alreadyLogged;
 
-    public BungeeLoginSession(String username, boolean registered, PlayerProfile profile) {
+    public BungeeLoginSession(String username, boolean registered, StoredProfile profile) {
         super(username, registered, profile);
     }
 
@@ -31,4 +31,13 @@ public class BungeeLoginSession extends LoginSession {
     public void setAlreadyLogged(boolean alreadyLogged) {
         this.alreadyLogged = alreadyLogged;
     }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + '{' +
+                "alreadySaved=" + alreadySaved +
+                ", alreadyLogged=" + alreadyLogged +
+                ", registered=" + registered +
+                "} " + super.toString();
+    }
 }

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

@@ -33,4 +33,11 @@ public class BungeeLoginSource implements LoginSource {
     public PendingConnection getConnection() {
         return connection;
     }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + '{' +
+                "connection=" + connection +
+                '}';
+    }
 }

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

@@ -1,65 +1,57 @@
 package com.github.games647.fastlogin.bungee;
 
-import com.github.games647.fastlogin.bungee.hooks.BungeeAuthHook;
-import com.github.games647.fastlogin.bungee.hooks.BungeeAuthPlugin;
-import com.github.games647.fastlogin.bungee.listener.PlayerConnectionListener;
-import com.github.games647.fastlogin.bungee.listener.PluginMessageListener;
-import com.google.common.collect.Maps;
+import com.github.games647.fastlogin.bungee.hook.BungeeAuthHook;
+import com.github.games647.fastlogin.bungee.listener.ConnectListener;
+import com.github.games647.fastlogin.bungee.listener.MessageListener;
+import com.github.games647.fastlogin.core.CommonUtil;
+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.collect.MapMaker;
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
+import java.util.concurrent.ThreadFactory;
 
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.TextComponent;
 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.config.Configuration;
-import net.md_5.bungee.config.ConfigurationProvider;
-import net.md_5.bungee.config.YamlConfiguration;
+import net.md_5.bungee.api.scheduler.GroupedThreadFactory;
+
+import org.slf4j.Logger;
 
 /**
  * BungeeCord version of FastLogin. This plugin keeps track on online mode connections.
  */
-public class FastLoginBungee extends Plugin {
+public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSender> {
 
-    private final ConcurrentMap<PendingConnection, BungeeLoginSession> session = Maps.newConcurrentMap();
+    private final ConcurrentMap<PendingConnection, BungeeLoginSession> session = new MapMaker().weakKeys().makeMap();
 
-    private BungeeCore core;
-    private Configuration config;
+    private FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core;
+    private Logger logger;
 
     @Override
     public void onEnable() {
-        saveDefaultFile("config.yml");
+        logger = CommonUtil.createLoggerFromJDK(getLogger());
 
-        try {
-            File configFile = new File(getDataFolder(), "config.yml");
-            ConfigurationProvider provider = ConfigurationProvider.getProvider(YamlConfiguration.class);
-            Configuration defaults = provider.load(getResourceAsStream("config.yml"));
-            config = provider.load(configFile, defaults);
-
-            core = new BungeeCore(this, config);
-            if (!core.setupDatabase()) {
-                return;
-            }
-        } catch (IOException ioExc) {
-            getLogger().log(Level.SEVERE, "Error loading config. Disabling plugin...", ioExc);
+        core = new FastLoginCore<>(this);
+        core.load();
+        if (!core.setupDatabase()) {
             return;
         }
 
-        core.setApiConnector();
-        core.loadMessages();
-
         //events
-        getProxy().getPluginManager().registerListener(this, new PlayerConnectionListener(this));
-        getProxy().getPluginManager().registerListener(this, new PluginMessageListener(this));
-
-        //bungee only commands
-        getProxy().getPluginManager().registerCommand(this, new ImportCommand(this));
+        getProxy().getPluginManager().registerListener(this, new ConnectListener(this));
+        getProxy().getPluginManager().registerListener(this, new MessageListener(this));
 
         //this is required to listen to messages from the server
-        getProxy().registerChannel(getDescription().getName());
+        getProxy().registerChannel(getName());
 
         registerHook();
     }
@@ -71,60 +63,60 @@ public class FastLoginBungee extends Plugin {
         }
     }
 
-    public void saveDefaultFile(String fileName) {
-        if (!getDataFolder().exists()) {
-            getDataFolder().mkdir();
-        }
-
-        File configFile = new File(getDataFolder(), fileName);
-        if (!configFile.exists()) {
-            InputStream in = getResourceAsStream(fileName);
-            try {
-                Files.copy(in, configFile.toPath());
-            } catch (IOException ioExc) {
-                getLogger().log(Level.SEVERE, "Error saving default " + fileName, ioExc);
-            } finally {
-                try {
-                    in.close();
-                } catch (IOException ex) {
-                    getLogger().log(Level.SEVERE, null, ex);
-                }
-            }
-        }
-    }
-
-    public BungeeCore getCore() {
+    public FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> getCore() {
         return core;
     }
 
-    @Deprecated
-    public void setAuthPluginHook(BungeeAuthPlugin authPlugin) {
-        core.setAuthPluginHook(authPlugin);
-    }
-
-    public Configuration getConfig() {
-        return config;
-    }
-
     public ConcurrentMap<PendingConnection, BungeeLoginSession> getSession() {
         return session;
     }
 
-    /**
-     * Get the auth plugin hook for BungeeCord
-     *
-     * @return the auth hook for BungeeCord. null if none found
-     */
-    @Deprecated
-    public BungeeAuthPlugin getBungeeAuthPlugin() {
-        return (BungeeAuthPlugin) core.getAuthPluginHook();
-    }
-
     private void registerHook() {
         Plugin plugin = getProxy().getPluginManager().getPlugin("BungeeAuth");
         if (plugin != null) {
             core.setAuthPluginHook(new BungeeAuthHook());
-            getLogger().info("Hooked into BungeeAuth");
+            logger.info("Hooked into BungeeAuth");
         }
     }
+
+    public void sendPluginMessage(Server server, ChannelMessage message) {
+        if (server != null) {
+            ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
+            dataOutput.writeUTF(message.getChannelName());
+
+            message.writeTo(dataOutput);
+            server.sendData(core.getPlugin().getName(), dataOutput.toByteArray());
+        }
+    }
+
+    @Override
+    public String getName() {
+        return getDescription().getName();
+    }
+
+    @Override
+    public Path getPluginFolder() {
+        return getDataFolder().toPath();
+    }
+
+    @Override
+    public Logger getLog() {
+        return logger;
+    }
+
+    @Override
+    public void sendMessage(CommandSender receiver, String message) {
+        receiver.sendMessage(TextComponent.fromLegacyText(message));
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public ThreadFactory getThreadFactory() {
+        return new ThreadFactoryBuilder()
+                .setNameFormat(core.getPlugin().getName() + " Database Pool Thread #%1$d")
+                //Hikari create daemons by default
+                .setDaemon(true)
+                .setThreadFactory(new GroupedThreadFactory(this, getName()))
+                .build();
+    }
 }

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

@@ -1,91 +0,0 @@
-package com.github.games647.fastlogin.bungee;
-
-import com.github.games647.fastlogin.core.AuthStorage;
-import com.github.games647.fastlogin.core.importer.ImportPlugin;
-
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.plugin.Command;
-
-public class ImportCommand extends Command {
-
-    private final BungeeCore core;
-
-    public ImportCommand(FastLoginBungee plugin) {
-        super("import-db", plugin.getDescription().getName().toLowerCase() + ".import");
-
-        this.core = plugin.getCore();
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (args.length < 2) {
-            String message = ChatColor.DARK_RED + "You need to specify the import plugin and database type";
-            sender.sendMessage(convertFromLegacy(message));
-            return;
-        }
-
-        ImportPlugin importPlugin;
-        switch (args[0].toLowerCase()) {
-            case "autoin":
-                importPlugin = ImportPlugin.AUTO_IN;
-                break;
-            case "bpa":
-                importPlugin = ImportPlugin.BPA;
-                break;
-            case "eldzi":
-                importPlugin = ImportPlugin.ELDZI;
-                break;
-            default:
-                String message = ChatColor.DARK_RED + "Unknown auto login plugin";
-                sender.sendMessage(convertFromLegacy(message));
-                return;
-        }
-
-        boolean sqlite;
-        switch (args[1].toLowerCase()) {
-            case "sqlite":
-                sqlite = true;
-                break;
-            case "mysql":
-                sqlite = false;
-                break;
-            default:
-                String message = ChatColor.DARK_RED + "Unknown storage type to import from. Either SQLite or MySQL";
-                sender.sendMessage(convertFromLegacy(message));
-                return;
-        }
-
-        String host = "";
-        String database = "";
-        String username = "";
-        String password = "";
-        if (!sqlite) {
-            if (args.length <= 5) {
-                String message = ChatColor.DARK_RED + "If importing from MySQL, you need to specify host database "
-                        + "and username passowrd too";
-                sender.sendMessage(convertFromLegacy(message));
-                return;
-            }
-
-            host = args[2];
-            database = args[3];
-            username = args[4];
-            password = args[5];
-        }
-
-        AuthStorage storage = core.getStorage();
-        boolean success = core.importDatabase(importPlugin, true, storage, host, database, username, password);
-        if (success) {
-            sender.sendMessage(convertFromLegacy(ChatColor.DARK_GREEN + "Successful imported the data"));
-        } else {
-            sender.sendMessage(convertFromLegacy(ChatColor.DARK_RED + "Failed to import the data. Check out the logs"));
-        }
-    }
-
-    private BaseComponent[] convertFromLegacy(String message) {
-        return TextComponent.fromLegacyText(message);
-    }
-}

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

@@ -1,41 +0,0 @@
-package com.github.games647.fastlogin.bungee;
-
-import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.github.games647.fastlogin.core.shared.MojangApiConnector;
-
-import java.util.List;
-import java.util.logging.Logger;
-
-import net.md_5.bungee.BungeeCord;
-
-public class MojangApiBungee extends MojangApiConnector {
-
-    public MojangApiBungee(Logger logger, List<String> localAddresses, int rateLimit) {
-        super(logger, localAddresses, rateLimit);
-    }
-
-    @Override
-    protected String getUUIDFromJson(String json) {
-        boolean isArray = json.startsWith("[");
-
-        MojangPlayer mojangPlayer;
-        if (isArray) {
-            mojangPlayer = BungeeCord.getInstance().gson.fromJson(json, MojangPlayer[].class)[0];
-        } else {
-            mojangPlayer = BungeeCord.getInstance().gson.fromJson(json, MojangPlayer.class);
-        }
-
-        String id = mojangPlayer.getId();
-        if ("null".equals(id)) {
-            return null;
-        }
-        
-        return id;
-    }
-
-    @Override
-    public boolean hasJoinedServer(LoginSession session, String serverId) {
-        //this is not needed in Bungee
-        throw new UnsupportedOperationException("Not supported");
-    }
-}

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

@@ -1,15 +0,0 @@
-package com.github.games647.fastlogin.bungee;
-
-public class MojangPlayer {
-
-    private String id;
-    private String name;
-
-    public String getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

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

@@ -0,0 +1,36 @@
+package com.github.games647.fastlogin.bungee.hook;
+
+import com.github.games647.fastlogin.core.hooks.AuthPlugin;
+
+import me.vik1395.BungeeAuth.Main;
+import me.vik1395.BungeeAuthAPI.RequestHandler;
+
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+/**
+ * GitHub: https://github.com/vik1395/BungeeAuth-Minecraft
+ *
+ * Project page:
+ *
+ * Spigot: https://www.spigotmc.org/resources/bungeeauth.493/
+ */
+public class BungeeAuthHook implements AuthPlugin<ProxiedPlayer> {
+
+    private final RequestHandler requestHandler = new RequestHandler();
+
+    @Override
+    public boolean forceLogin(ProxiedPlayer player) {
+        String playerName = player.getName();
+        return Main.plonline.contains(playerName) || requestHandler.forceLogin(playerName);
+    }
+
+    @Override
+    public boolean isRegistered(String playerName) {
+        return requestHandler.isRegistered(playerName);
+    }
+
+    @Override
+    public boolean forceRegister(ProxiedPlayer player, String password) {
+        return requestHandler.forceRegister(player, password);
+    }
+}

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

@@ -1,111 +0,0 @@
-package com.github.games647.fastlogin.bungee.hooks;
-
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Random;
-import java.util.logging.Level;
-
-import me.vik1395.BungeeAuth.ListenerClass;
-import me.vik1395.BungeeAuth.Main;
-import me.vik1395.BungeeAuth.Password.PasswordHandler;
-import me.vik1395.BungeeAuth.Tables;
-
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-
-/**
- * Github: https://github.com/MatteCarra/BungeeAuth
- *
- * Project page:
- *
- * Spigot: https://www.spigotmc.org/resources/bungeeauth.493/
- */
-public class BungeeAuthHook implements AuthPlugin<ProxiedPlayer> {
-
-    //https://github.com/MatteCarra/BungeeAuth/blob/master/src/me/vik1395/BungeeAuth/Login.java#L32
-    private final Tables databaseConnection = new Tables();
-
-    @Override
-    public boolean forceLogin(ProxiedPlayer player) {
-        String playerName = player.getName();
-//https://github.com/MatteCarra/BungeeAuth/blob/master/src/me/vik1395/BungeeAuth/Login.java#L92-95
-        if (Main.plonline.contains(playerName)) {
-            return true;
-        }
-
-        Main.plonline.add(playerName);
-
-        //renamed from ct to databaseConnection
-//            databaseConnection.setStatus(player.getName(), "online");
-        Class<?>[] parameterTypes = new Class<?>[]{String.class, String.class};
-        Object[] arguments = new Object[]{playerName, "online"};
-
-        try {
-            callProtected("setStatus", parameterTypes, arguments);
-            ListenerClass.movePlayer(player, false);
-
-            //proparly not thread-safe
-            ListenerClass.prelogin.get(playerName).cancel();
-        } catch (Exception ex) {
-            Main.plugin.getLogger().log(Level.SEVERE, "Error force loging in player", ex);
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean isRegistered(String playerName) throws Exception {
-        //https://github.com/MatteCarra/BungeeAuth/blob/master/src/me/vik1395/BungeeAuth/Register.java#L46
-        //renamed t to databaseConnection
-        return databaseConnection.checkPlayerEntry(playerName);
-    }
-
-    @Override
-    public boolean forceRegister(ProxiedPlayer player, String password) {
-        //https://github.com/MatteCarra/BungeeAuth/blob/master/src/me/vik1395/BungeeAuth/Register.java#L102
-        PasswordHandler ph = new PasswordHandler();
-        Random rand = new Random();
-        int maxp = 7; //Total Password Hashing methods.
-        Date dNow = new Date();
-        SimpleDateFormat ft = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
-
-        String Pw = password;
-        String pType = "" + rand.nextInt(maxp + 1);
-        String regdate = ft.format(dNow);
-        //https://github.com/MatteCarra/BungeeAuth/blob/master/src/me/vik1395/BungeeAuth/Register.java#L60
-        String lastip = player.getAddress().getAddress().getHostAddress();
-        String lastseen = regdate;
-        String hash = ph.newHash(Pw, pType);
-
-        //creates a new SQL entry with the player's details.
-        Class<?>[] parameterTypes = new Class<?>[] {String.class, String.class, String.class, String.class
-                , String.class, String.class, String.class, String.class};
-        Object[] arguments = new Object[] {player.getName(), hash, pType, "", lastip, regdate, lastip, lastseen};
-
-        try {
-
-            callProtected("newPlayerEntry", parameterTypes, arguments);
-            //proparly not thread-safe
-            forceLogin(player);
-        } catch (Exception ex) {
-            Main.plugin.getLogger().log(Level.SEVERE, "[BungeeAuth] Error when creating a new player in the Database", ex);
-            return false;
-        }
-
-        return true;
-    }
-
-    //pail ;(
-    private void callProtected(String methodName, Class<?>[] parameterTypes, Object[] arguments) throws Exception {
-        Class<Tables> tableClass = Tables.class;
-
-        Method method = tableClass.getDeclaredMethod(methodName, parameterTypes);
-        method.setAccessible(true);
-        //renamed t to databaseConnection
-        //databaseConnection.newPlayerEntry(player.getName(), hash, pType, "", lastip, regdate, lastip, lastseen);
-        method.invoke(databaseConnection, arguments);
-    }
-}

bungee/src/main/java/com/github/games647/fastlogin/bungee/hooks/BungeeAuthPlugin.java

@@ -1,20 +0,0 @@
-package com.github.games647.fastlogin.bungee.hooks;
-
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-
-/**
- * @deprecated please use com.github.games647.fastlogin.core.hooks.AuthPlugin<net.md_5.bungee.api.connection.ProxiedPlayer>
- */
-@Deprecated
-public interface BungeeAuthPlugin extends AuthPlugin<ProxiedPlayer> {
-
-    @Override
-    boolean forceLogin(ProxiedPlayer player);
-
-    @Override
-    boolean isRegistered(String playerName) throws Exception;
-
-    @Override
-    boolean forceRegister(ProxiedPlayer player, String password);
-}

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

@@ -1,19 +1,19 @@
 package com.github.games647.fastlogin.bungee.listener;
 
+import com.github.games647.craftapi.UUIDAdapter;
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.bungee.tasks.AsyncPremiumCheck;
-import com.github.games647.fastlogin.bungee.tasks.ForceLoginTask;
-import com.github.games647.fastlogin.core.PlayerProfile;
+import com.github.games647.fastlogin.bungee.task.AsyncPremiumCheck;
+import com.github.games647.fastlogin.bungee.task.ForceLoginTask;
+import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.google.common.base.Charsets;
 
 import java.lang.reflect.Field;
 import java.util.UUID;
-import java.util.logging.Level;
 
 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;
 import net.md_5.bungee.api.event.LoginEvent;
 import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.event.PreLoginEvent;
@@ -26,15 +26,15 @@ import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 
 /**
- * Enables online mode logins for specified users and sends
- * plugin message to the Bukkit version of this plugin in
+ * 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 PlayerConnectionListener implements Listener {
+public class ConnectListener implements Listener {
 
     private final FastLoginBungee plugin;
+    private final Property[] emptyProperties = {};
 
-    public PlayerConnectionListener(FastLoginBungee plugin) {
+    public ConnectListener(FastLoginBungee plugin) {
         this.plugin = plugin;
     }
 
@@ -45,37 +45,35 @@ public class PlayerConnectionListener implements Listener {
         }
 
         preLoginEvent.registerIntent(plugin);
-        
+
         PendingConnection connection = preLoginEvent.getConnection();
-        AsyncPremiumCheck asyncPremiumCheck = new AsyncPremiumCheck(plugin, preLoginEvent, connection);
+        Runnable asyncPremiumCheck = new AsyncPremiumCheck(plugin, preLoginEvent, connection);
         ProxyServer.getInstance().getScheduler().runAsync(plugin, asyncPremiumCheck);
     }
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onLogin(LoginEvent loginEvent) {
         if (loginEvent.isCancelled()) {
             return;
         }
 
-        //use the loginevent instead of the postlogin event in order to send the loginsuccess packet to the client
+        //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();
-        String username = connection.getName();
-        if (connection.isOnlineMode()) {
-            String ip = connection.getAddress().getAddress().getHostAddress();
-            plugin.getCore().getPendingLogins().remove(ip + username);
+        InitialHandler initialHandler = (InitialHandler) connection;
 
+        String username = initialHandler.getLoginRequest().getData();
+        if (connection.isOnlineMode()) {
             LoginSession session = plugin.getSession().get(connection);
             session.setUuid(connection.getUniqueId());
 
-            PlayerProfile playerProfile = session.getProfile();
-            playerProfile.setUuid(connection.getUniqueId());
+            StoredProfile playerProfile = session.getProfile();
+            playerProfile.setId(connection.getUniqueId());
 
             //bungeecord will do this automatically so override it on disabled option
-            InitialHandler initialHandler = (InitialHandler) connection;
-            if (!plugin.getConfig().getBoolean("premiumUuid")) {
+            if (!plugin.getCore().getConfig().get("premiumUuid", true)) {
                 try {
-                    UUID offlineUUID = UUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes(Charsets.UTF_8));
+                    UUID offlineUUID = UUIDAdapter.generateOfflineId(username);
 
                     //bungeecord doesn't support overriding the premium uuid
                     //so we have to do it with reflection
@@ -83,15 +81,15 @@ public class PlayerConnectionListener implements Listener {
                     idField.setAccessible(true);
                     idField.set(connection, offlineUUID);
                 } catch (NoSuchFieldException | IllegalAccessException ex) {
-                    plugin.getLogger().log(Level.SEVERE, "Failed to set offline uuid", ex);
+                    plugin.getLog().error("Failed to set offline uuid of {}", username, ex);
                 }
             }
 
-            if (!plugin.getConfig().getBoolean("forwardSkin")) {
+            if (!plugin.getCore().getConfig().get("forwardSkin", true)) {
                 //this is null on offline mode
                 LoginResult loginProfile = initialHandler.getLoginProfile();
                 if (loginProfile != null) {
-                    loginProfile.setProperties(new Property[]{});
+                    loginProfile.setProperties(emptyProperties);
                 }
             }
         }
@@ -100,7 +98,9 @@ public class PlayerConnectionListener implements Listener {
     @EventHandler
     public void onServerConnected(ServerConnectedEvent serverConnectedEvent) {
         ProxiedPlayer player = serverConnectedEvent.getPlayer();
-        ForceLoginTask loginTask = new ForceLoginTask(plugin, player, serverConnectedEvent.getServer());
+        Server server = serverConnectedEvent.getServer();
+
+        Runnable loginTask = new ForceLoginTask(plugin.getCore(), player, server);
         ProxyServer.getInstance().getScheduler().runAsync(plugin, loginTask);
     }
 

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

@@ -0,0 +1,101 @@
+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.message.ChangePremiumMessage;
+import com.github.games647.fastlogin.core.shared.FastLoginCore;
+import com.google.common.io.ByteArrayDataInput;
+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;
+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 MessageListener implements Listener {
+
+    private final FastLoginBungee plugin;
+
+    public MessageListener(FastLoginBungee plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void onPluginMessage(PluginMessageEvent pluginMessageEvent) {
+        String channel = pluginMessageEvent.getTag();
+        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 fake a running premium check by sending the result message
+        pluginMessageEvent.setCancelled(true);
+
+        if (!(pluginMessageEvent.getSender() instanceof Server)) {
+            //check if the message is sent from the server
+            return;
+        }
+
+        //so that we can safely process this in the background
+        byte[] data = Arrays.copyOf(pluginMessageEvent.getData(), pluginMessageEvent.getData().length);
+        ProxiedPlayer forPlayer = (ProxiedPlayer) pluginMessageEvent.getReceiver();
+
+        ProxyServer.getInstance().getScheduler().runAsync(plugin, () -> readMessage(forPlayer, data));
+    }
+
+    private void readMessage(ProxiedPlayer forPlayer, byte[] data) {
+        FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core = plugin.getCore();
+
+        ByteArrayDataInput dataInput = ByteStreams.newDataInput(data);
+        String subChannel = dataInput.readUTF();
+        if ("Success".equals(subChannel)) {
+            onSuccessMessage(forPlayer);
+        } else if ("ChangeStatus".equals(subChannel)) {
+            ChangePremiumMessage changeMessage = new ChangePremiumMessage();
+            changeMessage.readFrom(dataInput);
+
+            String playerName = changeMessage.getPlayerName();
+            boolean isSourceInvoker = changeMessage.isSourceInvoker();
+            if (changeMessage.shouldEnable()) {
+                if (playerName.equals(forPlayer.getName()) && plugin.getCore().getConfig().get("premium-warning", true)
+                        && !core.getPendingConfirms().contains(forPlayer.getUniqueId())) {
+                    String message = core.getMessage("premium-warning");
+                    forPlayer.sendMessage(TextComponent.fromLegacyText(message));
+                    core.getPendingConfirms().add(forPlayer.getUniqueId());
+                    return;
+                }
+
+                core.getPendingConfirms().remove(forPlayer.getUniqueId());
+                Runnable task = new AsyncToggleMessage(core, forPlayer, playerName, true, isSourceInvoker);
+                ProxyServer.getInstance().getScheduler().runAsync(plugin, task);
+            } else {
+                Runnable task = new AsyncToggleMessage(core, forPlayer, playerName, false, isSourceInvoker);
+                ProxyServer.getInstance().getScheduler().runAsync(plugin, task);
+            }
+        }
+    }
+
+    private void onSuccessMessage(ProxiedPlayer forPlayer) {
+        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());
+            StoredProfile playerProfile = loginSession.getProfile();
+            loginSession.setRegistered(true);
+
+            if (!loginSession.isAlreadySaved()) {
+                playerProfile.setPremium(true);
+                plugin.getCore().getStorage().save(playerProfile);
+                loginSession.setAlreadySaved(true);
+            }
+        }
+    }
+}

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

@@ -1,91 +0,0 @@
-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.tasks.AsyncToggleMessage;
-import com.github.games647.fastlogin.core.PlayerProfile;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteStreams;
-
-import java.util.Arrays;
-
-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;
-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 {
-
-    private final FastLoginBungee plugin;
-
-    public PluginMessageListener(FastLoginBungee plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void onPluginMessage(PluginMessageEvent pluginMessageEvent) {
-        String channel = pluginMessageEvent.getTag();
-        if (pluginMessageEvent.isCancelled() || !plugin.getDescription().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 fake a running premium check by sending the result message
-        pluginMessageEvent.setCancelled(true);
-
-        //check if the message is sent from the server
-        if (Server.class.isAssignableFrom(pluginMessageEvent.getSender().getClass())) {
-            //so that we can safely process this in the background
-            byte[] data = Arrays.copyOf(pluginMessageEvent.getData(), pluginMessageEvent.getData().length);
-            ProxiedPlayer forPlayer = (ProxiedPlayer) pluginMessageEvent.getReceiver();
-            
-            ProxyServer.getInstance().getScheduler().runAsync(plugin, () -> readMessage(forPlayer, data));
-        }
-    }
-
-    private void readMessage(ProxiedPlayer forPlayer, byte[] data) {
-        ByteArrayDataInput dataInput = ByteStreams.newDataInput(data);
-        String subchannel = dataInput.readUTF();
-        if ("ON".equals(subchannel)) {
-            String playerName = dataInput.readUTF();
-
-            if (playerName.equals(forPlayer.getName()) && plugin.getConfig().getBoolean("premium-warning")
-                    && !plugin.getCore().getPendingConfirms().contains(forPlayer.getUniqueId())) {
-                String message = plugin.getCore().getMessage("premium-warning");
-                forPlayer.sendMessage(TextComponent.fromLegacyText(message));
-                plugin.getCore().getPendingConfirms().add(forPlayer.getUniqueId());
-                return;
-            }
-
-            plugin.getCore().getPendingConfirms().remove(forPlayer.getUniqueId());
-            AsyncToggleMessage task = new AsyncToggleMessage(plugin.getCore(), forPlayer, playerName, true);
-            ProxyServer.getInstance().getScheduler().runAsync(plugin, task);
-        } else if ("OFF".equals(subchannel)) {
-            String playerName = dataInput.readUTF();
-
-            AsyncToggleMessage task = new AsyncToggleMessage(plugin.getCore(), forPlayer, playerName, false);
-            ProxyServer.getInstance().getScheduler().runAsync(plugin, task);
-        } else if ("SUCCESS".equals(subchannel)) {
-            onSuccessMessage(forPlayer);
-        }
-    }
-
-    private void onSuccessMessage(ProxiedPlayer forPlayer) {
-        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());
-            PlayerProfile playerProfile = loginSession.getProfile();
-            loginSession.setRegistered(true);
-
-            if (!loginSession.isAlreadySaved()) {
-                playerProfile.setPremium(true);
-                plugin.getCore().getStorage().save(playerProfile);
-                loginSession.setAlreadySaved(true);
-            }
-        }
-    }
-}

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

@@ -1,16 +1,19 @@
-package com.github.games647.fastlogin.bungee.tasks;
+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.core.PlayerProfile;
+import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
 
+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.AsyncEvent;
+import net.md_5.bungee.connection.InitialHandler;
 
-public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, BungeeLoginSource> implements Runnable {
+public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, CommandSender, BungeeLoginSource>
+        implements Runnable {
 
     private final FastLoginBungee plugin;
     private final AsyncEvent<?> preLoginEvent;
@@ -29,7 +32,8 @@ public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, BungeeLogin
     public void run() {
         plugin.getSession().remove(connection);
 
-        String username = connection.getName();
+        InitialHandler initialHandler = (InitialHandler) connection;
+        String username = initialHandler.getLoginRequest().getData();
         try {
             super.onLogin(username, new BungeeLoginSource(connection));
         } finally {
@@ -38,16 +42,17 @@ public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, BungeeLogin
     }
 
     @Override
-    public void requestPremiumLogin(BungeeLoginSource source, PlayerProfile profile, String username, boolean registered) {
+    public void requestPremiumLogin(BungeeLoginSource source, StoredProfile profile,
+                                    String username, boolean registered) {
         source.setOnlineMode();
         plugin.getSession().put(source.getConnection(), new BungeeLoginSession(username, registered, profile));
 
         String ip = source.getAddress().getAddress().getHostAddress();
-        plugin.getCore().getPendingLogins().put(ip + username, new Object());
+        plugin.getCore().getPendingLogin().put(ip + username, new Object());
     }
 
     @Override
-    public void startCrackedSession(BungeeLoginSource source, PlayerProfile profile, String username) {
+    public void startCrackedSession(BungeeLoginSource source, StoredProfile profile, String username) {
         plugin.getSession().put(source.getConnection(), new BungeeLoginSession(username, false, profile));
     }
 }

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

@@ -0,0 +1,73 @@
+package com.github.games647.fastlogin.bungee.task;
+
+import com.github.games647.fastlogin.bungee.FastLoginBungee;
+import com.github.games647.fastlogin.core.StoredProfile;
+import com.github.games647.fastlogin.core.shared.FastLoginCore;
+
+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;
+
+public class AsyncToggleMessage implements Runnable {
+
+    private final FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core;
+    private final ProxiedPlayer sender;
+    private final String targetPlayer;
+    private final boolean toPremium;
+    private final boolean isPlayerSender;
+
+    public AsyncToggleMessage(FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core,
+             ProxiedPlayer sender, String playerName, boolean toPremium, boolean playerSender) {
+        this.core = core;
+        this.sender = sender;
+        this.targetPlayer = playerName;
+        this.toPremium = toPremium;
+        this.isPlayerSender = playerSender;
+    }
+
+    @Override
+    public void run() {
+        if (toPremium) {
+            activatePremium();
+        } else {
+            turnOffPremium();
+        }
+    }
+
+    private void turnOffPremium() {
+        StoredProfile playerProfile = core.getStorage().loadProfile(targetPlayer);
+        //existing player is already cracked
+        if (playerProfile.isSaved() && !playerProfile.isPremium()) {
+            sendMessage("not-premium");
+            return;
+        }
+
+        playerProfile.setPremium(false);
+        playerProfile.setId(null);
+        core.getStorage().save(playerProfile);
+        sendMessage("remove-premium");
+    }
+
+    private void activatePremium() {
+        StoredProfile playerProfile = core.getStorage().loadProfile(targetPlayer);
+        if (playerProfile.isPremium()) {
+            sendMessage("already-exists");
+            return;
+        }
+
+        playerProfile.setPremium(true);
+        core.getStorage().save(playerProfile);
+        sendMessage("add-premium");
+    }
+
+    private void sendMessage(String localeId) {
+        String message = core.getMessage(localeId);
+        if (isPlayerSender) {
+            sender.sendMessage(TextComponent.fromLegacyText(message));
+        } else {
+            CommandSender console = ProxyServer.getInstance().getConsole();
+            console.sendMessage(TextComponent.fromLegacyText(message));
+        }
+    }
+}

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

@@ -0,0 +1,87 @@
+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.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 java.util.UUID;
+
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.connection.Server;
+
+public class ForceLoginTask
+        extends ForceLoginManagement<ProxiedPlayer, CommandSender, BungeeLoginSession, FastLoginBungee> {
+
+    private final Server server;
+
+    public ForceLoginTask(FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core,
+             ProxiedPlayer player, Server server) {
+        super(core, player, core.getPlugin().getSession().get(player.getPendingConnection()));
+
+        this.server = server;
+    }
+
+    @Override
+    public void run() {
+        if (session == null) {
+            return;
+        }
+
+        super.run();
+
+        if (!isOnlineMode()) {
+            session.setAlreadySaved(true);
+        }
+    }
+
+    @Override
+    public boolean forceLogin(ProxiedPlayer player) {
+        if (session.isAlreadyLogged()) {
+            return true;
+        }
+
+        session.setAlreadyLogged(true);
+        return super.forceLogin(player);
+    }
+
+    @Override
+    public boolean forceRegister(ProxiedPlayer player) {
+        return session.isAlreadyLogged() || super.forceRegister(player);
+    }
+
+    @Override
+    public void onForceActionSuccess(LoginSession session) {
+        //sub channel name
+        Type type = Type.LOGIN;
+        if (session.needsRegistration()) {
+            type = Type.REGISTER;
+        }
+
+        UUID proxyId = UUID.fromString(ProxyServer.getInstance().getConfig().getUuid());
+        ChannelMessage loginMessage = new LoginActionMessage(type, player.getName(), proxyId);
+
+        core.getPlugin().sendPluginMessage(server, loginMessage);
+    }
+
+    @Override
+    public String getName(ProxiedPlayer player) {
+        return player.getName();
+    }
+
+    @Override
+    public boolean isOnline(ProxiedPlayer player) {
+        return player.isConnected();
+    }
+
+    @Override
+    public boolean isOnlineMode() {
+        return player.getPendingConnection().isOnlineMode();
+    }
+}

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

@@ -1,57 +0,0 @@
-package com.github.games647.fastlogin.bungee.tasks;
-
-import com.github.games647.fastlogin.bungee.BungeeCore;
-import com.github.games647.fastlogin.core.PlayerProfile;
-
-import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-
-public class AsyncToggleMessage implements Runnable {
-
-    private final BungeeCore core;
-    private final ProxiedPlayer fromPlayer;
-    private final String targetPlayer;
-    private final boolean toPremium;
-
-    public AsyncToggleMessage(BungeeCore core, ProxiedPlayer fromPlayer, String targetPlayer, boolean toPremium) {
-        this.core = core;
-        this.fromPlayer = fromPlayer;
-        this.targetPlayer = targetPlayer;
-        this.toPremium = toPremium;
-    }
-
-    @Override
-    public void run() {
-        if (toPremium) {
-            activatePremium();
-        } else {
-            turnOffPremium();
-        }
-    }
-
-    private void turnOffPremium() {
-        PlayerProfile playerProfile = core.getStorage().loadProfile(targetPlayer);
-        //existing player is already cracked
-        if (playerProfile.getUserId() != -1 && !playerProfile.isPremium()) {
-            fromPlayer.sendMessage(TextComponent.fromLegacyText(core.getMessage("not-premium")));
-            return;
-        }
-
-        playerProfile.setPremium(false);
-        playerProfile.setUuid(null);
-        core.getStorage().save(playerProfile);
-        fromPlayer.sendMessage(TextComponent.fromLegacyText(core.getMessage("remove-premium")));
-    }
-
-    private void activatePremium() {
-        PlayerProfile playerProfile = core.getStorage().loadProfile(targetPlayer);
-        if (playerProfile.isPremium()) {
-            fromPlayer.sendMessage(TextComponent.fromLegacyText(core.getMessage("already-exists")));
-            return;
-        }
-
-        playerProfile.setPremium(true);
-        core.getStorage().save(playerProfile);
-        fromPlayer.sendMessage(TextComponent.fromLegacyText(core.getMessage("add-premium")));
-    }
-}

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

@@ -1,135 +0,0 @@
-package com.github.games647.fastlogin.bungee.tasks;
-
-import com.github.games647.fastlogin.bungee.BungeeLoginSession;
-import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.core.PlayerProfile;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-import java.util.UUID;
-import java.util.logging.Level;
-
-import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.connection.PendingConnection;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.connection.Server;
-
-public class ForceLoginTask implements Runnable {
-
-    private final FastLoginBungee plugin;
-    private final ProxiedPlayer player;
-    private final Server server;
-
-    public ForceLoginTask(FastLoginBungee plugin, ProxiedPlayer player, Server server) {
-        this.plugin = plugin;
-        this.player = player;
-        this.server = server;
-    }
-
-    @Override
-    public void run() {
-        try {
-            PendingConnection pendingConnection = player.getPendingConnection();
-            BungeeLoginSession session = plugin.getSession().get(pendingConnection);
-
-            if (session == null || !player.isConnected()) {
-                plugin.getLogger().log(Level.FINE, "Invalid session player {0} propaly left the server", player);
-                return;
-            }
-
-            PlayerProfile playerProfile = session.getProfile();
-
-            //force login only on success
-            if (pendingConnection.isOnlineMode()) {
-                boolean autoRegister = session.needsRegistration();
-
-                //2fa authentication - no need to send bukkit force login notification and so we also don't need
-                // to wait for a response -> save immediatly
-                if (!plugin.getConfig().getBoolean("autoLogin")) {
-                    playerProfile.setPremium(true);
-                    plugin.getCore().getStorage().save(playerProfile);
-                    session.setAlreadySaved(true);
-                }
-
-                AuthPlugin<ProxiedPlayer> authPlugin = plugin.getCore().getAuthPluginHook();
-                if (authPlugin == null) {
-                    //save will happen on success message from bukkit
-                    sendBukkitLoginNotification(autoRegister);
-                } else if (session.needsRegistration()) {
-                    forceRegister(session, authPlugin);
-                } else if (authPlugin.forceLogin(player)) {
-                    forceLogin(session, authPlugin);
-                }
-            } else {
-                //cracked player
-                if (!session.isAlreadySaved()) {
-                    playerProfile.setPremium(false);
-                    plugin.getCore().getStorage().save(playerProfile);
-                    session.setAlreadySaved(true);
-                }
-            }
-        } catch (Exception ex) {
-            plugin.getLogger().log(Level.INFO, "ERROR ON FORCE LOGIN", ex);
-        }
-    }
-
-    private void forceRegister(BungeeLoginSession session, AuthPlugin<ProxiedPlayer> authPlugin) {
-        if (session.isAlreadyLogged()) {
-            sendBukkitLoginNotification(true);
-            return;
-        }
-
-        session.setAlreadyLogged(true);
-
-        String password = plugin.getCore().getPasswordGenerator().getRandomPassword(player);
-        if (authPlugin.forceRegister(player, password)) {
-            //save will happen on success message from bukkit
-            sendBukkitLoginNotification(true);
-            String message = plugin.getCore().getMessage("auto-register");
-            if (message != null) {
-                message = message.replace("%password", password);
-                player.sendMessage(TextComponent.fromLegacyText(message));
-            }
-        }
-    }
-
-    private void forceLogin(BungeeLoginSession session, AuthPlugin<ProxiedPlayer> authPlugin) {
-        if (session.isAlreadyLogged()) {
-            sendBukkitLoginNotification(false);
-            return;
-        }
-
-        session.setAlreadyLogged(true);
-        if (authPlugin.forceLogin(player)) {
-            //save will happen on success message from bukkit
-            sendBukkitLoginNotification(false);
-            String message = plugin.getCore().getMessage("auto-login");
-            if (message != null) {
-                player.sendMessage(TextComponent.fromLegacyText(message));
-            }
-        }
-    }
-
-    private void sendBukkitLoginNotification(boolean autoRegister) {
-        ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
-        //subchannel name
-        if (autoRegister) {
-            dataOutput.writeUTF("AUTO_REGISTER");
-        } else {
-            dataOutput.writeUTF("AUTO_LOGIN");
-        }
-
-        //Data is sent through a random player. We have to tell the Bukkit version of this plugin the target
-        dataOutput.writeUTF(player.getName());
-
-        //proxy identifier to check if it's a acceptable proxy
-        UUID proxyId = UUID.fromString(plugin.getProxy().getConfig().getUuid());
-        dataOutput.writeLong(proxyId.getMostSignificantBits());
-        dataOutput.writeLong(proxyId.getLeastSignificantBits());
-
-        if (server != null) {
-            server.sendData(plugin.getDescription().getName(), dataOutput.toByteArray());
-        }
-    }
-}

bungee/src/main/resources/bungee.yml

@@ -1,16 +1,16 @@
-# project informations for BungeeCord
+# project data for BungeeCord
 # This file will be prioritised over plugin.yml which can be also used for Bungee
 # This make it easy to combine BungeeCord and Bukkit support in one plugin
 name: ${project.parent.name}
 # ${-} will be automatically replaced by Maven
 main: ${project.groupId}.${project.artifactId}.${project.name}
 
-version: ${project.version}
-author: games647, http://github.com/games647/FastLogin/graphs/contributors
+version: ${project.version}-${git.commit.id.abbrev}
+author: games647, https://github.com/games647/FastLogin/graphs/contributors
 
-softdepend:
+softDepends:
     # BungeeCord auth plugins
     - BungeeAuth
 
 description: |
-    ${project.description}
+    ${project.description}

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.9</version>
+        <version>1.11-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -14,24 +14,68 @@
 
     <name>FastLoginCore</name>
 
+    <repositories>
+        <repository>
+            <id>luck-repo</id>
+            <url>https://ci.lucko.me/plugin/repository/everything</url>
+        </repository>
+
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
+        <!-- Libraries that we shade into the project -->
+
         <!--Database pooling-->
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>2.5.0</version>
+            <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>1.7.21</version>
+            <version>1.7.25</version>
         </dependency>
-        
+
+        <!--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.12-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!--Common component for contacting the Mojang API-->
+        <dependency>
+            <groupId>com.github.games647</groupId>
+            <artifactId>craftapi</artifactId>
+            <version>0.1.3-SNAPSHOT</version>
+        </dependency>
+
+        <!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Cauldron) -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <!-- 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>

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

@@ -1,5 +1,6 @@
 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;
@@ -9,56 +10,69 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Calendar;
-import java.util.Locale;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.Properties;
 import java.util.UUID;
-import java.util.logging.Level;
+import java.util.concurrent.ThreadFactory;
+
+import static java.sql.Statement.RETURN_GENERATED_KEYS;
 
 public class AuthStorage {
 
     private static final String PREMIUM_TABLE = "premium";
 
-    private final FastLoginCore<?> core;
+    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;
 
-    //a try to fix https://www.spigotmc.org/threads/fastlogin.101192/page-26#post-1874647
-    private final Calendar calendar = Calendar.getInstance(Locale.US);
-
-    public AuthStorage(FastLoginCore<?> core, String driver, String host, int port, String databasePath
-            , String user, String pass) {
+    public AuthStorage(FastLoginCore<?, ?, ?> core, String driver, String host, int port, String databasePath
+            , String user, String pass, boolean useSSL) {
         this.core = core;
 
-        HikariConfig databaseConfig = new HikariConfig();
-        databaseConfig.setUsername(user);
-        databaseConfig.setPassword(pass);
-        databaseConfig.setDriverClassName(driver);
-        databaseConfig.setThreadFactory(core.getThreadFactory());
+        HikariConfig config = new HikariConfig();
+        config.setPoolName(core.getPlugin().getName());
 
-        databasePath = databasePath.replace("{pluginDir}", core.getDataFolder().getAbsolutePath());
+        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")) {
-            jdbcUrl += "sqlite" + "://" + databasePath;
-            databaseConfig.setConnectionTestQuery("SELECT 1");
+            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;
+            jdbcUrl += "mysql://" + host + ':' + port + '/' + databasePath;
         }
 
-        databaseConfig.setJdbcUrl(jdbcUrl);
-        this.dataSource = new HikariDataSource(databaseConfig);
-    }
-
-    public HikariDataSource getDataSource() {
-        return dataSource;
+        config.setJdbcUrl(jdbcUrl);
+        this.dataSource = new HikariDataSource(config);
     }
 
     public void createTables() throws SQLException {
-        Connection con = null;
-        Statement createStmt = null;
-        try {
-            con = dataSource.getConnection();
-            createStmt = con.createStatement();
-
+        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), "
@@ -68,186 +82,99 @@ public class AuthStorage {
                     + "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);
-
-            //drop the old unique uuid index
-            try {
-                if (dataSource.getJdbcUrl().contains("sqlite")) {
-                    String tempTableCreate = createDataStmt.replace(PREMIUM_TABLE, PREMIUM_TABLE + "_TEMP")
-                            //if we already imported the table fail here
-                            .replace("IF NOT EXISTS", "");
-                    //create a temp table insert it there and then back
-                    createStmt.executeUpdate(tempTableCreate);
-                    createStmt.executeUpdate("INSERT INTO " + PREMIUM_TABLE + "_TEMP SELECT * FROM " + PREMIUM_TABLE);
-
-                    createStmt.executeUpdate("DROP TABLE " + PREMIUM_TABLE);
-                    createStmt.executeUpdate(createDataStmt);
-
-                    //insert it back into the new table
-                    createStmt.executeUpdate("INSERT INTO " + PREMIUM_TABLE + " SELECT * FROM " + PREMIUM_TABLE + "_TEMP");
-                } else {
-                    createStmt.executeUpdate("ALTER TABLE premium DROP INDEX UUID");
-                }
-            } catch (SQLException sqlEx) {
-                //silent - we already migrated
-            }
-
-            try {
-                createStmt.executeUpdate("CREATE INDEX uuid_idx on premium (UUID)");
-            } catch (SQLException sqlEx) {
-                //silent - we already migrated
-            }
-        } finally {
-            closeQuietly(con);
-            closeQuietly(createStmt);
         }
     }
 
-    public PlayerProfile loadProfile(String name) {
-        Connection con = null;
-        PreparedStatement loadStmt = null;
-        ResultSet resultSet = null;
-        try {
-            con = dataSource.getConnection();
-            loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE Name=? LIMIT 1");
+    public StoredProfile loadProfile(String name) {
+        try (Connection con = dataSource.getConnection();
+             PreparedStatement loadStmt = con.prepareStatement(LOAD_BY_NAME)
+        ) {
             loadStmt.setString(1, name);
 
-            resultSet = loadStmt.executeQuery();
-            if (resultSet.next()) {
-                long userId = resultSet.getInt(1);
-
-                UUID uuid = FastLoginCore.parseId(resultSet.getString(2));
-
-                boolean premium = resultSet.getBoolean(4);
-                String lastIp = resultSet.getString(5);
-                long lastLogin = resultSet.getTimestamp(6, calendar).getTime();
-                PlayerProfile playerProfile = new PlayerProfile(userId, uuid, name, premium, lastIp, lastLogin);
-                return playerProfile;
-            } else {
-                PlayerProfile crackedProfile = new PlayerProfile(null, name, false, "");
-                return crackedProfile;
+            try (ResultSet resultSet = loadStmt.executeQuery()) {
+                return parseResult(resultSet).orElseGet(() -> new StoredProfile(null, name, false, ""));
             }
         } catch (SQLException sqlEx) {
-            core.getLogger().log(Level.SEVERE, "Failed to query profile", sqlEx);
-        } finally {
-            closeQuietly(con);
-            closeQuietly(loadStmt);
-            closeQuietly(resultSet);
+            core.getPlugin().getLog().error("Failed to query profile: {}", name, sqlEx);
         }
 
         return null;
     }
 
-    public PlayerProfile loadProfile(UUID uuid) {
-        Connection con = null;
-        PreparedStatement loadStmt = null;
-        ResultSet resultSet = null;
-        try {
-            con = dataSource.getConnection();
-            loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE UUID=? LIMIT 1");
-            loadStmt.setString(1, uuid.toString().replace("-", ""));
+    public StoredProfile loadProfile(UUID uuid) {
+        try (Connection con = dataSource.getConnection();
+             PreparedStatement loadStmt = con.prepareStatement(LOAD_BY_UUID)) {
+            loadStmt.setString(1, UUIDAdapter.toMojangId(uuid));
 
-            resultSet = loadStmt.executeQuery();
-            if (resultSet.next()) {
-                long userId = resultSet.getInt(1);
-
-                String name = resultSet.getString(3);
-                boolean premium = resultSet.getBoolean(4);
-                String lastIp = resultSet.getString(5);
-                long lastLogin = resultSet.getTimestamp(6, calendar).getTime();
-                PlayerProfile playerProfile = new PlayerProfile(userId, uuid, name, premium, lastIp, lastLogin);
-                return playerProfile;
+            try (ResultSet resultSet = loadStmt.executeQuery()) {
+                return parseResult(resultSet).orElse(null);
             }
         } catch (SQLException sqlEx) {
-            core.getLogger().log(Level.SEVERE, "Failed to query profile", sqlEx);
-        } finally {
-            closeQuietly(con);
-            closeQuietly(loadStmt);
-            closeQuietly(resultSet);
+            core.getPlugin().getLog().error("Failed to query profile: {}", uuid, sqlEx);
         }
 
         return null;
     }
 
-    public boolean save(PlayerProfile playerProfile) {
-        Connection con = null;
-        PreparedStatement updateStmt = null;
-        PreparedStatement saveStmt = null;
+    private Optional<StoredProfile> parseResult(ResultSet resultSet) throws SQLException {
+        if (resultSet.next()) {
+            long userId = resultSet.getInt(1);
 
-        ResultSet generatedKeys = null;
-        try {
-            con = dataSource.getConnection();
+            UUID uuid = Optional.ofNullable(resultSet.getString(2)).map(UUIDAdapter::parseId).orElse(null);
 
-            UUID uuid = playerProfile.getUuid();
-            
-            if (playerProfile.getUserId() == -1) {
-                saveStmt = con.prepareStatement("INSERT INTO " + PREMIUM_TABLE
-                        + " (UUID, Name, Premium, LastIp) VALUES (?, ?, ?, ?) ", Statement.RETURN_GENERATED_KEYS);
+            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));
+        }
 
-                if (uuid == null) {
-                    saveStmt.setString(1, null);
-                } else {
-                    saveStmt.setString(1, uuid.toString().replace("-", ""));
-                }
+        return Optional.empty();
+    }
 
-                saveStmt.setString(2, playerProfile.getPlayerName());
-                saveStmt.setBoolean(3, playerProfile.isPremium());
-                saveStmt.setString(4, playerProfile.getLastIp());
+    public void save(StoredProfile playerProfile) {
+        try (Connection con = dataSource.getConnection()) {
+            String uuid = playerProfile.getOptId().map(UUIDAdapter::toMojangId).orElse(null);
 
-                saveStmt.execute();
+            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());
 
-                generatedKeys = saveStmt.getGeneratedKeys();
-                if (generatedKeys != null && generatedKeys.next()) {
-                    playerProfile.setUserId(generatedKeys.getInt(1));
+                    saveStmt.setLong(5, playerProfile.getRowId());
+                    saveStmt.execute();
                 }
             } else {
-                saveStmt = con.prepareStatement("UPDATE " + PREMIUM_TABLE
-                        + " SET UUID=?, Name=?, Premium=?, LastIp=?, LastLogin=CURRENT_TIMESTAMP WHERE UserID=?");
+                try (PreparedStatement saveStmt = con.prepareStatement(INSERT_PROFILE, RETURN_GENERATED_KEYS)) {
+                    saveStmt.setString(1, uuid);
 
-                if (uuid == null) {
-                    saveStmt.setString(1, null);
-                } else {
-                    saveStmt.setString(1, uuid.toString().replace("-", ""));
+                    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));
+                        }
+                    }
                 }
-
-                saveStmt.setString(2, playerProfile.getPlayerName());
-                saveStmt.setBoolean(3, playerProfile.isPremium());
-                saveStmt.setString(4, playerProfile.getLastIp());
-
-                saveStmt.setLong(5, playerProfile.getUserId());
-                saveStmt.execute();
             }
-
-            return true;
         } catch (SQLException ex) {
-            core.getLogger().log(Level.SEVERE, "Failed to save playerProfile", ex);
-        } finally {
-            closeQuietly(con);
-            closeQuietly(updateStmt);
-            closeQuietly(saveStmt);
-            closeQuietly(generatedKeys);
+            core.getPlugin().getLog().error("Failed to save playerProfile {}", playerProfile, ex);
         }
-
-        return false;
     }
 
     public void close() {
         dataSource.close();
     }
-
-    private void closeQuietly(AutoCloseable closeable) {
-        if (closeable != null) {
-            try {
-                closeable.close();
-            } catch (Exception closeEx) {
-                core.getLogger().log(Level.SEVERE, "Failed to close connection", closeEx);
-            }
-        }
-    }
 }

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

@@ -1,70 +0,0 @@
-package com.github.games647.fastlogin.core;
-
-import com.google.common.collect.ImmutableList;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.net.ssl.SSLSocketFactory;
-
-public class BalancedSSLFactory extends SSLSocketFactory {
-
-    private final SSLSocketFactory oldFactory;
-
-    //in order to be thread-safe
-    private final List<InetAddress> localAddresses;
-
-    private AtomicInteger id;
-
-    public BalancedSSLFactory(SSLSocketFactory oldFactory, Iterable<InetAddress> localAddresses) {
-        this.oldFactory = oldFactory;
-        this.localAddresses = ImmutableList.copyOf(localAddresses);
-    }
-
-    @Override
-    public String[] getDefaultCipherSuites() {
-        return oldFactory.getDefaultCipherSuites();
-    }
-
-    @Override
-    public String[] getSupportedCipherSuites() {
-        return oldFactory.getSupportedCipherSuites();
-    }
-
-    @Override
-    public Socket createSocket(Socket socket, String host, int port, boolean autoclose) throws IOException {
-        return oldFactory.createSocket(host, port, getNextLocalAddress(), 0);
-    }
-
-    @Override
-    public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-        return oldFactory.createSocket(host, port, getNextLocalAddress(), 0);
-    }
-
-    @Override
-    public Socket createSocket(String host, int port, InetAddress localAddress, int localPort)
-            throws IOException, UnknownHostException {
-        //default
-        return oldFactory.createSocket(host, port, localAddress, localPort);
-    }
-
-    @Override
-    public Socket createSocket(InetAddress host, int port) throws IOException {
-        return oldFactory.createSocket(host, port, getNextLocalAddress(), 0);
-    }
-
-    @Override
-    public Socket createSocket(InetAddress host, int port, InetAddress local, int localPort) throws IOException {
-        //Default
-        return oldFactory.createSocket(host, port, local, localPort);
-    }
-
-    private InetAddress getNextLocalAddress() {
-        int index = id.incrementAndGet() % localAddresses.size();
-        return localAddresses.get(index);
-    }
-}

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

@@ -0,0 +1,66 @@
+package com.github.games647.fastlogin.core;
+
+import com.github.games647.craftapi.cache.SafeCacheBuilder;
+import com.google.common.cache.CacheLoader;
+
+import java.lang.reflect.Constructor;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.impl.JDK14LoggerAdapter;
+
+public class CommonUtil {
+
+    private static final char COLOR_CHAR = '&';
+    private static final char TRANSLATED_CHAR = '§';
+
+    public static <K, V> ConcurrentMap<K, V> buildCache(int expireAfterWrite, int maxSize) {
+        SafeCacheBuilder<Object, Object> builder = SafeCacheBuilder.newBuilder();
+
+        if (expireAfterWrite > 0) {
+            builder.expireAfterWrite(expireAfterWrite, TimeUnit.MINUTES);
+        }
+
+        if (maxSize > 0) {
+            builder.maximumSize(maxSize);
+        }
+
+        return builder.build(CacheLoader.from(() -> {
+            throw new UnsupportedOperationException();
+        }));
+    }
+
+    public static String translateColorCodes(String rawMessage) {
+        char[] chars = rawMessage.toCharArray();
+        for (int i = 0; i < chars.length - 1; i++) {
+            if (chars[i] == COLOR_CHAR && "0123456789AaBbCcDdEeFfKkLlMmNnOoRr".indexOf(chars[i + 1]) > -1) {
+                chars[i] = TRANSLATED_CHAR;
+                chars[i + 1] = Character.toLowerCase(chars[i + 1]);
+            }
+        }
+
+        return new String(chars);
+    }
+
+    public static Logger createLoggerFromJDK(java.util.logging.Logger parent) {
+        try {
+            parent.setLevel(Level.ALL);
+
+            Class<JDK14LoggerAdapter> adapterClass = JDK14LoggerAdapter.class;
+            Constructor<JDK14LoggerAdapter> cons = adapterClass.getDeclaredConstructor(java.util.logging.Logger.class);
+            cons.setAccessible(true);
+            return cons.newInstance(parent);
+        } catch (ReflectiveOperationException reflectEx) {
+            parent.log(Level.WARNING, "Cannot create slf4j logging adapter", reflectEx);
+            parent.log(Level.WARNING, "Creating logger instance manually...");
+            return LoggerFactory.getLogger(parent.getName());
+        }
+    }
+
+    private CommonUtil() {
+        //Utility class
+    }
+}

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

@@ -1,321 +0,0 @@
-package com.github.games647.fastlogin.core;
-
-import java.lang.reflect.Method;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-
-import com.google.common.base.Ticker;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.RemovalListener;
-
-/**
- * Represents a Guava CacheBuilder that is compatible with both Guava 10 (Minecraft 1.7.X) and 13
- */
-public class CompatibleCacheBuilder<K, V> {
-
-    private static Method BUILD_METHOD;
-    private static Method AS_MAP_METHOD;
-
-    /**
-     * Construct a new safe cache builder.
-     *
-     * @param <K> Key type
-     * @param <V> Value type
-     *
-     * @return A new cache builder.
-     */
-    public static <K, V> CompatibleCacheBuilder<K, V> newBuilder() {
-        return new CompatibleCacheBuilder<>();
-    }
-
-    private final CacheBuilder<K, V> builder;
-    
-    @SuppressWarnings("unchecked")
-    private CompatibleCacheBuilder() {
-        builder = (CacheBuilder<K, V>) CacheBuilder.newBuilder();
-    }
-
-    /**
-     * Guides the allowed concurrency among update operations. Used as a hint for internal sizing. The table is
-     * internally partitioned to try to permit the indicated number of concurrent updates without contention. Because
-     * assignment of entries to these partitions is not necessarily uniform, the actual concurrency observed may vary.
-     * Ideally, you should choose a value to accommodate as many threads as will ever concurrently modify the table.
-     * Using a significantly higher value than you need can waste space and time, and a significantly lower value can
-     * lead to thread contention. But overestimates and underestimates within an order of magnitude do not usually have
-     * much noticeable impact. A value of one permits only one thread to modify the cache at a time, but since read
-     * operations can proceed concurrently, this still yields higher concurrency than full synchronization. Defaults to
-     * 4.
-     *
-     * <p>
-     * <b>Note:</b>The default may change in the future. If you care about this value, you should always choose it
-     * explicitly.
-     *
-     * @param concurrencyLevel New concurrency level
-     * @return This for chaining
-     *
-     * @throws IllegalArgumentException if {@code concurrencyLevel} is nonpositive
-     * @throws IllegalStateException if a concurrency level was already set
-     */
-    public CompatibleCacheBuilder<K, V> concurrencyLevel(int concurrencyLevel) {
-        builder.concurrencyLevel(concurrencyLevel);
-        return this;
-    }
-
-    /**
-     * Specifies that each entry should be automatically removed from the cache once a fixed duration has elapsed after
-     * the entry's creation, or last access. Access time is reset by
-     * {@link com.google.common.cache.Cache#get Cache.get()}, but not by operations on the view returned by
-     * {@link com.google.common.cache.Cache#asMap() Cache.asMap()}.
-     *
-     * <p>
-     * When {@code duration} is zero, elements will be evicted immediately after being loaded into the cache. This has
-     * the same effect as invoking {@link #maximumSize maximumSize}{@code (0)}. It can be useful in testing, or to
-     * disable caching temporarily without a code change.
-     *
-     * <p>
-     * Expired entries may be counted by {@link com.google.common.cache.Cache#size Cache.size()}, but will never be
-     * visible to read or write operations. Expired entries are currently cleaned up during write operations, or during
-     * occasional read operations in the absense of writes; though this behavior may change in the future.
-     *
-     * @param duration the length of time after an entry is last accessed that it should be automatically removed
-     * @param unit the unit that {@code duration} is expressed in
-     * @return This for chaining
-     *
-     * @throws IllegalArgumentException if {@code duration} is negative
-     * @throws IllegalStateException if the time to idle or time to live was already set
-     */
-    public CompatibleCacheBuilder<K, V> expireAfterAccess(long duration, TimeUnit unit) {
-        builder.expireAfterAccess(duration, unit);
-        return this;
-    }
-
-    /**
-     * Specifies that each entry should be automatically removed from the cache once a fixed duration has elapsed after
-     * the entry's creation, or the most recent replacement of its value.
-     *
-     * <p>
-     * When {@code duration} is zero, elements will be evicted immediately after being loaded into the cache. This has
-     * the same effect as invoking {@link #maximumSize maximumSize}{@code (0)}. It can be useful in testing, or to
-     * disable caching temporarily without a code change.
-     *
-     * <p>
-     * Expired entries may be counted by {@link com.google.common.cache.Cache#size Cache.size()}, but will never be
-     * visible to read or write operations. Expired entries are currently cleaned up during write operations, or during
-     * occasional read operations in the absense of writes; though this behavior may change in the future.
-     *
-     * @param duration the length of time after an entry is created that it should be automatically removed
-     * @param unit the unit that {@code duration} is expressed in
-     * @return This for chaining
-     *
-     * @throws IllegalArgumentException if {@code duration} is negative
-     * @throws IllegalStateException if the time to live or time to idle was already set
-     */
-    public CompatibleCacheBuilder<K, V> expireAfterWrite(long duration, TimeUnit unit) {
-        builder.expireAfterWrite(duration, unit);
-        return this;
-    }
-
-    /**
-     * Sets the minimum total size for the internal hash tables. For example, if the initial capacity is {@code 60}, and
-     * the concurrency level is {@code 8}, then eight segments are created, each having a hash table of size eight.
-     * Providing a large enough estimate at construction time avoids the need for expensive resizing operations later,
-     * but setting this value unnecessarily high wastes memory.
-     *
-     * @param initialCapacity - initial capacity
-     * @return This for chaining
-     *
-     * @throws IllegalArgumentException if {@code initialCapacity} is negative
-     * @throws IllegalStateException if an initial capacity was already set
-     */
-    public CompatibleCacheBuilder<K, V> initialCapacity(int initialCapacity) {
-        builder.initialCapacity(initialCapacity);
-        return this;
-    }
-
-    /**
-     * Specifies the maximum number of entries the cache may contain. Note that the cache <b>may evict an entry before
-     * this limit is exceeded</b>. As the cache size grows close to the maximum, the cache evicts entries that are less
-     * likely to be used again. For example, the cache may evict an entry because it hasn't been used recently or very
-     * often.
-     *
-     * <p>
-     * When {@code size} is zero, elements will be evicted immediately after being loaded into the cache. This has the
-     * same effect as invoking {@link #expireAfterWrite expireAfterWrite}{@code (0, unit)} or      {@link #expireAfterAccess expireAfterAccess}{@code (0,
-	 * unit)}. It can be useful in testing, or to disable caching temporarily without a code change.
-     *
-     * @param size the maximum size of the cache
-     * @return This for chaining
-     *
-     * @throws IllegalArgumentException if {@code size} is negative
-     * @throws IllegalStateException if a maximum size was already set
-     */
-    public CompatibleCacheBuilder<K, V> maximumSize(int size) {
-        builder.maximumSize(size);
-        return this;
-    }
-
-    /**
-     * Specifies a listener instance, which all caches built using this {@code CacheBuilder} will notify each time an
-     * entry is removed from the cache by any means.
-     *
-     * <p>
-     * Each cache built by this {@code CacheBuilder} after this method is called invokes the supplied listener after
-     * removing an element for any reason (see removal causes in
-     * {@link com.google.common.cache.RemovalCause RemovalCause}). It will invoke the listener during invocations of any
-     * of that cache's public methods (even read-only methods).
-     *
-     * <p>
-     * <b>Important note:</b> Instead of returning <em>this</em> as a {@code CacheBuilder} instance, this method returns
-     * {@code CacheBuilder<K1, V1>}. From this point on, either the original reference or the returned reference may be
-     * used to complete configuration and build the cache, but only the "generic" one is type-safe. That is, it will
-     * properly prevent you from building caches whose key or value types are incompatible with the types accepted by
-     * the listener already provided; the {@code CacheBuilder} type cannot do this. For best results, simply use the
-     * standard method-chaining idiom, as illustrated in the documentation at top, configuring a {@code CacheBuilder}
-     * and building your {@link com.google.common.cache.Cache Cache} all in a single statement.
-     *
-     * <p>
-     * <b>Warning:</b> if you ignore the above advice, and use this {@code CacheBuilder} to build a cache whose key or
-     * value type is incompatible with the listener, you will likely experience a {@link ClassCastException} at some
-     * <i>undefined</i> point in the future.
-     *
-     * @param <K1> Key type
-     * @param <V1> Value type
-     * @param listener - removal listener
-     * @return This for chaining
-     *
-     * @throws IllegalStateException if a removal listener was already set
-     */
-    @SuppressWarnings("unchecked")
-    public <K1 extends K, V1 extends V> CompatibleCacheBuilder<K1, V1> removalListener(RemovalListener<? super K1, ? super V1> listener) {
-        builder.removalListener(listener);
-        return (CompatibleCacheBuilder<K1, V1>) this;
-    }
-
-    /**
-     * Specifies a nanosecond-precision time source for use in determining when entries should be expired. By default,
-     * {@link System#nanoTime} is used.
-     *
-     * <p>
-     * The primary intent of this method is to facilitate testing of caches which have been configured with
-     * {@link #expireAfterWrite} or {@link #expireAfterAccess}.
-     *
-     * @param ticker - ticker
-     * @return This for chaining
-     *
-     * @throws IllegalStateException if a ticker was already set
-     */
-    public CompatibleCacheBuilder<K, V> ticker(Ticker ticker) {
-        builder.ticker(ticker);
-        return this;
-    }
-
-    /**
-     * Specifies that each value (not key) stored in the cache should be wrapped in a
-     * {@link java.lang.ref.SoftReference SoftReference} (by default, strong references are used). Softly-referenced
-     * objects will be garbage-collected in a <i>globally</i>
-     * least-recently-used manner, in response to memory demand.
-     *
-     * <p>
-     * <b>Warning:</b> in most circumstances it is better to set a per-cache {@linkplain #maximumSize maximum size}
-     * instead of using soft references. You should only use this method if you are well familiar with the practical
-     * consequences of soft references.
-     *
-     * <p>
-     * <b>Note:</b> when this method is used, the resulting cache will use identity ({@code ==}) comparison to determine
-     * equality of values.
-     *
-     * @return This for chaining
-     *
-     * @throws IllegalStateException if the value strength was already set
-     */
-    public CompatibleCacheBuilder<K, V> softValues() {
-        builder.softValues();
-        return this;
-    }
-
-    /**
-     * Specifies that each key (not value) stored in the cache should be wrapped in a
-     * {@link java.lang.ref.WeakReference WeakReference} (by default, strong references are used).
-     *
-     * <p>
-     * <b>Warning:</b> when this method is used, the resulting cache will use identity ({@code ==}) comparison to
-     * determine equality of keys.
-     *
-     * @return This for chaining
-     *
-     * @throws IllegalStateException if the key strength was already set
-     */
-    public CompatibleCacheBuilder<K, V> weakKeys() {
-        builder.weakKeys();
-        return this;
-    }
-
-    /**
-     * Specifies that each value (not key) stored in the cache should be wrapped in a
-     * {@link java.lang.ref.WeakReference WeakReference} (by default, strong references are used).
-     *
-     * <p>
-     * Weak values will be garbage collected once they are weakly reachable. This makes them a poor candidate for
-     * caching; consider {@link #softValues} instead.
-     *
-     * <p>
-     * <b>Note:</b> when this method is used, the resulting cache will use identity ({@code ==}) comparison to determine
-     * equality of values.
-     *
-     * @return This for chaining
-     *
-     * @throws IllegalStateException if the value strength was already set
-     */
-    public CompatibleCacheBuilder<K, V> weakValues() {
-        builder.weakValues();
-        return this;
-    }
-
-    /**
-     * Returns the cache wrapped as a ConcurrentMap.
-     * <p>
-     * We can't return the direct Cache instance as it changed in Guava 13.
-     *
-     * @param <K1> Key type
-     * @param <V1> Value type
-     * @param loader - cache loader
-     * @return The cache as a a map.
-     */
-    @SuppressWarnings("unchecked")
-    public <K1 extends K, V1 extends V> ConcurrentMap<K1, V1> build(CacheLoader<? super K1, V1> loader) {
-        Object cache = null;
-
-        if (BUILD_METHOD == null) {
-            try {
-                BUILD_METHOD = builder.getClass().getDeclaredMethod("build", CacheLoader.class);
-                BUILD_METHOD.setAccessible(true);
-            } catch (Exception e) {
-                throw new IllegalStateException("Unable to find CacheBuilder.build(CacheLoader)", e);
-            }
-        }
-
-        // Attempt to build the Cache
-        try {
-            cache = BUILD_METHOD.invoke(builder, loader);
-        } catch (Exception e) {
-            throw new IllegalStateException("Unable to invoke " + BUILD_METHOD + " on " + builder, e);
-        }
-
-        if (AS_MAP_METHOD == null) {
-            try {
-                AS_MAP_METHOD = cache.getClass().getMethod("asMap");
-                AS_MAP_METHOD.setAccessible(true);
-            } catch (Exception e) {
-                throw new IllegalStateException("Unable to find Cache.asMap() in " + cache, e);
-            }
-        }
-
-        // Retrieve it as a map
-        try {
-            return (ConcurrentMap<K1, V1>) AS_MAP_METHOD.invoke(cache);
-        } catch (Exception e) {
-            throw new IllegalStateException("Unable to invoke " + AS_MAP_METHOD + " on " + cache, e);
-        }
-    }
-}

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

@@ -1,76 +0,0 @@
-package com.github.games647.fastlogin.core;
-
-import java.util.UUID;
-
-public class PlayerProfile {
-
-    private String playerName;
-
-    private long userId;
-
-    private UUID uuid;
-    private boolean premium;
-    private String lastIp;
-    private long lastLogin;
-
-    public PlayerProfile(long userId, UUID uuid, String playerName, boolean premium, String lastIp, long lastLogin) {
-        this.userId = userId;
-        this.uuid = uuid;
-        this.playerName = playerName;
-        this.premium = premium;
-        this.lastIp = lastIp;
-        this.lastLogin = lastLogin;
-    }
-
-    public PlayerProfile(UUID uuid, String playerName, boolean premium, String lastIp) {
-        this(-1, uuid, playerName, premium, lastIp, System.currentTimeMillis());
-    }
-
-    public synchronized String getPlayerName() {
-        return playerName;
-    }
-
-    public synchronized void setPlayerName(String playerName) {
-        this.playerName = playerName;
-    }
-
-    public synchronized long getUserId() {
-        return userId;
-    }
-
-    public synchronized void setUserId(long generatedId) {
-        this.userId = generatedId;
-    }
-
-    public synchronized UUID getUuid() {
-        return uuid;
-    }
-
-    public synchronized void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
-    public synchronized boolean isPremium() {
-        return premium;
-    }
-
-    public synchronized void setPremium(boolean premium) {
-        this.premium = premium;
-    }
-
-    public synchronized String getLastIp() {
-        return lastIp;
-    }
-
-    public synchronized void setLastIp(String lastIp) {
-        this.lastIp = lastIp;
-    }
-
-    public synchronized long getLastLogin() {
-        return lastLogin;
-    }
-
-    public synchronized void setLastLogin(long lastLogin) {
-        this.lastLogin = lastLogin;
-    }
-}

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

@@ -0,0 +1,10 @@
+package com.github.games647.fastlogin.core;
+
+public enum PremiumStatus {
+
+    PREMIUM,
+
+    CRACKED,
+
+    UNKNOWN
+}

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

@@ -1,26 +0,0 @@
-package com.github.games647.fastlogin.core;
-
-import java.util.Map;
-
-public class SharedConfig {
-
-    private final Map<String, Object> configValues;
-
-    public SharedConfig(Map<String, Object> configValues) {
-        this.configValues = configValues;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T get(String path, T def) {
-        Object val = configValues.get(path);
-        return ( val != null ) ? (T) val : def;
-    }
-
-    public <T> T get(String path) {
-        return get(path, null);
-    }
-
-    public Map<String, Object> getConfigValues() {
-        return configValues;
-    }
-}

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

@@ -0,0 +1,94 @@
+package com.github.games647.fastlogin.core;
+
+import com.github.games647.craftapi.model.Profile;
+
+import java.time.Instant;
+import java.util.Optional;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+
+public class StoredProfile extends Profile {
+
+    private long rowId;
+
+    private boolean premium;
+    private String lastIp;
+    private Instant lastLogin;
+
+    public StoredProfile(long rowId, UUID uuid, String playerName, boolean premium, String lastIp, Instant lastLogin) {
+        super(uuid, playerName);
+
+        this.rowId = rowId;
+        this.premium = premium;
+        this.lastIp = lastIp;
+        this.lastLogin = lastLogin;
+    }
+
+    public StoredProfile(UUID uuid, String playerName, boolean premium, String lastIp) {
+        this(-1, uuid, playerName, premium, lastIp, Instant.now());
+    }
+
+    public synchronized boolean isSaved() {
+        return rowId >= 0;
+    }
+
+    public synchronized void setPlayerName(String playerName) {
+        this.name = playerName;
+    }
+
+    public synchronized long getRowId() {
+        return rowId;
+    }
+
+    public synchronized void setRowId(long generatedId) {
+        this.rowId = generatedId;
+    }
+
+    @Nullable
+    public synchronized UUID getId() {
+        return id;
+    }
+
+    public synchronized Optional<UUID> getOptId() {
+        return Optional.ofNullable(id);
+    }
+
+    public synchronized void setId(UUID uniqueId) {
+        this.id = uniqueId;
+    }
+
+    public synchronized boolean isPremium() {
+        return premium;
+    }
+
+    public synchronized void setPremium(boolean premium) {
+        this.premium = premium;
+    }
+
+    public synchronized String getLastIp() {
+        return lastIp;
+    }
+
+    public synchronized void setLastIp(String lastIp) {
+        this.lastIp = lastIp;
+    }
+
+    public synchronized Instant getLastLogin() {
+        return lastLogin;
+    }
+
+    public synchronized void setLastLogin(Instant lastLogin) {
+        this.lastLogin = lastLogin;
+    }
+
+    @Override
+    public synchronized String toString() {
+        return this.getClass().getSimpleName() + '{' +
+                "rowId=" + rowId +
+                ", premium=" + premium +
+                ", lastIp='" + lastIp + '\'' +
+                ", lastLogin=" + lastLogin +
+                "} " + super.toString();
+    }
+}

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

@@ -3,7 +3,8 @@ package com.github.games647.fastlogin.core.hooks;
 /**
  * Represents a supporting authentication plugin in BungeeCord and Bukkit/Spigot/... servers
  *
- * @param <P> either org.bukkit.entity.Player for Bukkit or net.md_5.bungee.api.connection.ProxiedPlayer for BungeeCord
+ * @param <P> either {@link org.bukkit.entity.Player} for Bukkit or {@link net.md_5.bungee.api.connection.ProxiedPlayer}
+ *           for BungeeCord
  */
 public interface AuthPlugin<P> {
 

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

@@ -1,19 +1,24 @@
 package com.github.games647.fastlogin.core.hooks;
 
+import java.security.SecureRandom;
 import java.util.Random;
+import java.util.stream.IntStream;
 
 public class DefaultPasswordGenerator<P> implements PasswordGenerator<P> {
 
+    private static final int PASSWORD_LENGTH = 8;
     private static final char[] PASSWORD_CHARACTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
             .toCharArray();
-    private final Random random = new Random();
+
+    private final Random random = new SecureRandom();
 
     @Override
     public String getRandomPassword(P player) {
         StringBuilder generatedPassword = new StringBuilder(8);
-        for (int i = 1; i <= 8; i++) {
-            generatedPassword.append(PASSWORD_CHARACTERS[random.nextInt(PASSWORD_CHARACTERS.length - 1)]);
-        }
+        IntStream.rangeClosed(1, PASSWORD_LENGTH)
+                .map(i -> random.nextInt(PASSWORD_CHARACTERS.length - 1))
+                .mapToObj(pos -> PASSWORD_CHARACTERS[pos])
+                .forEach(generatedPassword::append);
 
         return generatedPassword.toString();
     }

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

@@ -1,5 +1,6 @@
 package com.github.games647.fastlogin.core.hooks;
 
+@FunctionalInterface
 public interface PasswordGenerator<P> {
 
     String getRandomPassword(P player);

core/src/main/java/com/github/games647/fastlogin/core/importer/AutoInImporter.java

@@ -1,73 +0,0 @@
-package com.github.games647.fastlogin.core.importer;
-
-import com.github.games647.fastlogin.core.AuthStorage;
-import com.github.games647.fastlogin.core.PlayerProfile;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.UUID;
-
-import javax.sql.DataSource;
-
-public class AutoInImporter extends Importer {
-
-    private static final String PLUGIN_NAME = "AutoIn";
-
-    private static final String SQLITE_FILE = "plugins/" + PLUGIN_NAME + "/AutoIn_PlayerOptions.db";
-
-    private static final String USER_TABLE = "nicknames";
-    private static final String UUID_TABLE = "uuids";
-    private static final String SESSION_TABLE = "sessions";
-
-    public static String getSQLitePath() {
-        return SQLITE_FILE;
-    }
-
-    @Override
-    public int importData(Connection source, DataSource target, AuthStorage storage) throws SQLException {
-        Statement stmt = null;
-        ResultSet resultSet = null;
-        try {
-            stmt = source.createStatement();
-            resultSet = stmt.executeQuery("SELECT name, protection, premium, puuid FROM " + USER_TABLE
-                    + " LEFT JOIN " + " ("
-                    /* Prevent duplicates */
-                    + "SELECT * FROM " + UUID_TABLE + " GROUP BY nickname_id"
-                    + ") uuids"
-                    + " ON " + USER_TABLE + ".id = uuids.nickname_id");
-
-            int rows = 0;
-            while (resultSet.next()) {
-                String name = resultSet.getString(1);
-                boolean protection = resultSet.getBoolean(2);
-                /* Enable premium authentication only for those who want to be auto logged in,
-                so they have their cracked protection disabled */
-                boolean premium = !protection && resultSet.getBoolean(3);
-                String puuid = resultSet.getString(4);
-
-                /* FastLogin will also make lookups on the uuid column for name changes
-                the old 1.6.2 version won't check if those user have premium enabled
-
-                so it could happen that a premium could steal the account if we don't do this
-
-                It seems the uuid is saved on autoin too if the player is cracked */
-                PlayerProfile profile;
-                if (premium) {
-                    profile = new PlayerProfile(UUID.fromString(puuid), name, premium, "");
-                } else {
-                    profile = new PlayerProfile(null, name, premium, "");
-                }
-
-                storage.save(profile);
-                rows++;
-            }
-
-            return rows;
-        } finally {
-            closeQuietly(stmt);
-            closeQuietly(resultSet);
-        }
-    }
-}

core/src/main/java/com/github/games647/fastlogin/core/importer/BPAImporter.java

@@ -1,50 +0,0 @@
-package com.github.games647.fastlogin.core.importer;
-
-import com.github.games647.fastlogin.core.AuthStorage;
-import com.github.games647.fastlogin.core.PlayerProfile;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-
-import javax.sql.DataSource;
-
-public class BPAImporter extends Importer {
-
-    private static final String DEFAULT_TABLE_NAME = "users";
-
-    @Override
-    public int importData(Connection source, DataSource target, AuthStorage storage) throws SQLException {
-        Statement stmt = null;
-        ResultSet resultSet = null;
-        try {
-            stmt = source.createStatement();
-            resultSet = stmt.executeQuery("SELECT "
-                    + "nick, "
-                    + "checked, "
-                    + "lastIP, "
-                    + "FROM_UNIXTIME(lastJoined * 0.001) AS LastLogin "
-                    + "FROM " + DEFAULT_TABLE_NAME);
-
-            int rows = 0;
-            while (resultSet.next()) {
-                String name = resultSet.getString(1);
-                boolean premium = resultSet.getBoolean(2);
-                String lastIP = resultSet.getString(3);
-                Timestamp lastLogin = resultSet.getTimestamp(4);
-
-                //uuid doesn't exist here
-                PlayerProfile profile = new PlayerProfile(null, name, premium, lastIP);
-                storage.save(profile);
-                rows++;
-            }
-
-            return rows;
-        } finally {
-            closeQuietly(stmt);
-            closeQuietly(resultSet);
-        }
-    }
-}

core/src/main/java/com/github/games647/fastlogin/core/importer/ElDziAuthImporter.java

@@ -1,58 +0,0 @@
-package com.github.games647.fastlogin.core.importer;
-
-import com.github.games647.fastlogin.core.AuthStorage;
-import com.github.games647.fastlogin.core.PlayerProfile;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.util.UUID;
-
-import javax.sql.DataSource;
-
-public class ElDziAuthImporter extends Importer {
-
-    private static final String TABLE_NAME = "accounts";
-
-    @Override
-    public int importData(Connection source, DataSource target, AuthStorage storage) throws SQLException {
-        Statement stmt = null;
-        ResultSet resultSet = null;
-        try {
-            stmt = source.createStatement();
-            resultSet = stmt.executeQuery("SELECT "
-                    + "nick, "
-                    + "premium, "
-                    + "lastIP, "
-                    + "FROM_UNIXTIME(lastPlayed * 0.001) AS LastLogin "
-                    + "FROM " + TABLE_NAME);
-
-            int rows = 0;
-            while (resultSet.next()) {
-                String name = resultSet.getString(1);
-                boolean premium = resultSet.getBoolean(2);
-                String lastIP = resultSet.getString(3);
-                Timestamp lastLogin = resultSet.getTimestamp(4);
-
-                String uuid = resultSet.getString(5);
-
-                PlayerProfile profile;
-                if (premium) {
-                    profile = new PlayerProfile(UUID.fromString(uuid), name, premium, lastIP);
-                } else {
-                    profile = new PlayerProfile(null, name, premium, "");
-                }
-
-                storage.save(profile);
-                rows++;
-            }
-
-            return rows;
-        } finally {
-            closeQuietly(stmt);
-            closeQuietly(resultSet);
-        }
-    }
-}

core/src/main/java/com/github/games647/fastlogin/core/importer/ImportPlugin.java

@@ -1,20 +0,0 @@
-package com.github.games647.fastlogin.core.importer;
-
-public enum ImportPlugin {
-
-    AUTO_IN(AutoInImporter.class),
-    
-    BPA(BPAImporter.class),
-
-    ELDZI(ElDziAuthImporter.class);
-
-    private final Class<? extends Importer> importerClass;
-
-    ImportPlugin(Class<? extends Importer> importer) {
-        this.importerClass = importer;
-    }
-
-    public Class<? extends Importer> getImporter() {
-        return importerClass;
-    }
-}

core/src/main/java/com/github/games647/fastlogin/core/importer/Importer.java

@@ -1,21 +0,0 @@
-package com.github.games647.fastlogin.core.importer;
-
-import com.github.games647.fastlogin.core.AuthStorage;
-import java.sql.Connection;
-import java.sql.SQLException;
-import javax.sql.DataSource;
-
-public abstract class Importer {
-
-    public abstract int importData(Connection source, DataSource target, AuthStorage storage) throws SQLException;
-
-    protected void closeQuietly(AutoCloseable closeable) {
-        if (closeable != null) {
-            try {
-                closeable.close();
-            } catch (Exception ignore) {
-                //ignore
-            }
-        }
-    }
-}

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

@@ -0,0 +1,61 @@
+package com.github.games647.fastlogin.core.message;
+
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteArrayDataOutput;
+
+public class ChangePremiumMessage implements ChannelMessage {
+
+    private String playerName;
+    private boolean willEnable;
+    private boolean isSourceInvoker;
+
+    public ChangePremiumMessage(String playerName, boolean willEnable, boolean isSourceInvoker) {
+        this.playerName = playerName;
+        this.willEnable = willEnable;
+        this.isSourceInvoker = isSourceInvoker;
+    }
+
+    public ChangePremiumMessage() {
+        //reading from
+    }
+
+    public String getPlayerName() {
+        return playerName;
+    }
+
+    public boolean shouldEnable() {
+        return willEnable;
+    }
+
+    public boolean isSourceInvoker() {
+        return isSourceInvoker;
+    }
+
+    @Override
+    public String getChannelName() {
+        return "ChangeStatus";
+    }
+
+    @Override
+    public void readFrom(ByteArrayDataInput input) {
+        willEnable = input.readBoolean();
+        playerName = input.readUTF();
+        isSourceInvoker = input.readBoolean();
+    }
+
+    @Override
+    public void writeTo(ByteArrayDataOutput output) {
+        output.writeBoolean(willEnable);
+        output.writeUTF(playerName);
+        output.writeBoolean(isSourceInvoker);
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + '{' +
+                "playerName='" + playerName + '\'' +
+                ", shouldEnable=" + willEnable +
+                ", isSourceInvoker=" + isSourceInvoker +
+                '}';
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.github.games647.fastlogin.core.message;
+
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteArrayDataOutput;
+
+public interface ChannelMessage {
+
+    String getChannelName();
+
+    void readFrom(ByteArrayDataInput input);
+
+    void writeTo(ByteArrayDataOutput output);
+}

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

@@ -0,0 +1,83 @@
+package com.github.games647.fastlogin.core.message;
+
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteArrayDataOutput;
+
+import java.util.UUID;
+
+public class LoginActionMessage implements ChannelMessage {
+
+    private Type type;
+
+    private String playerName;
+    private UUID proxyId;
+
+    public LoginActionMessage(Type type, String playerName, UUID proxyId) {
+        this.type = type;
+        this.playerName = playerName;
+        this.proxyId = proxyId;
+    }
+
+    public LoginActionMessage() {
+        //reading mode
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public String getPlayerName() {
+        return playerName;
+    }
+
+    public UUID getProxyId() {
+        return proxyId;
+    }
+
+    @Override
+    public void readFrom(ByteArrayDataInput input) {
+        this.type = Type.values()[input.readInt()];
+
+        this.playerName = input.readUTF();
+
+        //bungeecord UUID
+        long mostSignificantBits = input.readLong();
+        long leastSignificantBits = input.readLong();
+        this.proxyId = new UUID(mostSignificantBits, leastSignificantBits);
+    }
+
+    @Override
+    public void writeTo(ByteArrayDataOutput output) {
+        output.writeInt(type.ordinal());
+
+        //Data is sent through a random player. We have to tell the Bukkit version of this plugin the target
+        output.writeUTF(playerName);
+
+        //proxy identifier to check if it's a acceptable proxy
+        output.writeLong(proxyId.getMostSignificantBits());
+        output.writeLong(proxyId.getLeastSignificantBits());
+    }
+
+    @Override
+    public String getChannelName() {
+        return "LoginAction";
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + '{' +
+                "type='" + type + '\'' +
+                ", playerName='" + playerName + '\'' +
+                ", proxyId=" + proxyId +
+                '}';
+    }
+
+    public enum Type {
+
+        LOGIN,
+
+        REGISTER,
+
+        CRACKED
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.github.games647.fastlogin.core.message;
+
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteArrayDataOutput;
+
+public class SuccessMessage implements ChannelMessage {
+
+    @Override
+    public String getChannelName() {
+        return "Success";
+    }
+
+    @Override
+    public void readFrom(ByteArrayDataInput input) {
+        //empty
+    }
+
+    @Override
+    public void writeTo(ByteArrayDataOutput output) {
+        //empty
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + "{}";
+    }
+}

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

@@ -1,169 +1,195 @@
 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.CompatibleCacheBuilder;
-import com.github.games647.fastlogin.core.SharedConfig;
+import com.github.games647.fastlogin.core.CommonUtil;
 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.importer.AutoInImporter;
-import com.github.games647.fastlogin.core.importer.ImportPlugin;
-import com.github.games647.fastlogin.core.importer.Importer;
-import com.google.common.cache.CacheLoader;
-import com.google.common.collect.Sets;
+import com.google.common.net.HostAndPort;
 
-import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.List;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.Proxy.Type;
+import java.net.UnknownHostException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+
+import org.slf4j.Logger;
+
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
 
 /**
- * @param <P> Player class
+ * @param <P> GameProfile class
+ * @param <C> CommandSender
+ * @param <T> Plugin class
  */
-public abstract class FastLoginCore<P> {
+public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
 
-    public static <K, V> ConcurrentMap<K, V> buildCache(int expireAfterWrite, int maxSize) {
-        CompatibleCacheBuilder<Object, Object> builder = CompatibleCacheBuilder.newBuilder();
+    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<>();
+    private final T plugin;
 
-        if (expireAfterWrite > 0) {
-            builder.expireAfterWrite(expireAfterWrite, TimeUnit.MINUTES);
-        }
+    private final MojangResolver resolver = new MojangResolver();
 
-        if (maxSize > 0) {
-            builder.maximumSize(maxSize);
-        }
-
-        return builder.build(CacheLoader.from(() -> {
-            throw new UnsupportedOperationException();
-        }));
-    }
-
-    public static UUID parseId(String withoutDashes) {
-        if (withoutDashes == null) {
-            return null;
-        }
-
-        return UUID.fromString(withoutDashes.substring(0, 8)
-                + "-" + withoutDashes.substring(8, 12)
-                + "-" + withoutDashes.substring(12, 16)
-                + "-" + withoutDashes.substring(16, 20)
-                + "-" + withoutDashes.substring(20, 32));
-    }
-
-    protected final Map<String, String> localeMessages = new ConcurrentHashMap<>();
-
-    private final ConcurrentMap<String, Object> pendingLogins = FastLoginCore.buildCache(5, 0);
-    private final Set<UUID> pendingConfirms = Sets.newHashSet();
-    private final SharedConfig sharedConfig;
-
-    private MojangApiConnector apiConnector;
+    private Configuration config;
     private AuthStorage storage;
     private PasswordGenerator<P> passwordGenerator = new DefaultPasswordGenerator<>();
     private AuthPlugin<P> authPlugin;
 
-    public FastLoginCore(Map<String, Object> config) {
-        this.sharedConfig = new SharedConfig(config);
-    }
-    
-    public void setApiConnector() {
-        List<String> ipAddresses = sharedConfig.get("ip-addresses");
-        int requestLimit = sharedConfig.get("mojang-request-limit");
-        this.apiConnector = makeApiConnector(getLogger(), ipAddresses, requestLimit);
+    public FastLoginCore(T plugin) {
+        this.plugin = plugin;
     }
 
-    public MojangApiConnector getApiConnector() {
-        return apiConnector;
+    public void load() {
+        saveDefaultFile("messages.yml");
+        saveDefaultFile("config.yml");
+
+        try {
+            config = loadFile("config.yml");
+            Configuration messages = loadFile("messages.yml");
+
+            messages.getKeys()
+                    .stream()
+                    .filter(key -> messages.get(key) != null)
+                    .collect(toMap(identity(), messages::get))
+                    .forEach((key, message) -> {
+                        String colored = CommonUtil.translateColorCodes((String) message);
+                        if (!colored.isEmpty()) {
+                            localeMessages.put(key, colored.replace("/newline", "\n"));
+                        }
+                    });
+        } catch (IOException ioEx) {
+            plugin.getLog().error("Failed to load yaml files", ioEx);
+        }
+
+        Set<Proxy> proxies = config.getStringList("proxies")
+                .stream()
+                .map(HostAndPort::fromString)
+                .map(proxy -> new InetSocketAddress(proxy.getHostText(), proxy.getPort()))
+                .map(sa -> new Proxy(Type.HTTP, sa))
+                .collect(toSet());
+
+        Collection<InetAddress> addresses = new HashSet<>();
+        for (String localAddress : config.getStringList("ip-addresses")) {
+            try {
+                addresses.add(InetAddress.getByName(localAddress.replace('-', '.')));
+            } catch (UnknownHostException ex) {
+                plugin.getLog().error("IP-Address is unknown to us", ex);
+            }
+        }
+
+        resolver.setMaxNameRequests(config.getInt("mojang-request-limit"));
+        resolver.setProxySelector(new RotatingProxySelector(proxies));
+        resolver.setOutgoingAddresses(addresses);
+    }
+
+    private Configuration loadFile(String fileName) throws IOException {
+        ConfigurationProvider configProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);
+
+        Configuration defaults;
+        try (InputStream defaultStream = getClass().getClassLoader().getResourceAsStream(fileName)) {
+            defaults = configProvider.load(defaultStream);
+        }
+
+        Path file = plugin.getPluginFolder().resolve(fileName);
+
+        Configuration config;
+        try (Reader reader = Files.newBufferedReader(file)) {
+            config = configProvider.load(reader, defaults);
+        }
+
+        //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));
+        }
+
+        return config;
+    }
+
+    public MojangResolver getResolver() {
+        return resolver;
     }
 
     public AuthStorage getStorage() {
         return storage;
     }
 
-    public abstract File getDataFolder();
+    public T getPlugin() {
+        return plugin;
+    }
 
-    public abstract Logger getLogger();
-
-    public abstract ThreadFactory getThreadFactory();
+    public void sendLocaleMessage(String key, C receiver) {
+        String message = localeMessages.get(key);
+        if (message != null) {
+            plugin.sendMessage(receiver, message);
+        }
+    }
 
     public String getMessage(String key) {
         return localeMessages.get(key);
     }
 
-    public abstract void loadMessages();
-
-    public abstract MojangApiConnector makeApiConnector(Logger logger, List<String> addresses, int requests);
-
     public boolean setupDatabase() {
-        String driver = sharedConfig.get("driver");
-        String host = sharedConfig.get("host", "");
-        int port = sharedConfig.get("port", 3306);
-        String database = sharedConfig.get("database");
+        String driver = config.getString("driver");
+        if (!checkDriver(driver)) {
+            return false;
+        }
 
-        String user = sharedConfig.get("username", "");
-        String password = sharedConfig.get("password", "");
+        String host = config.get("host", "");
+        int port = config.get("port", 3306);
+        String database = config.getString("database");
 
-        storage = new AuthStorage(this, driver, host, port, database, user, password);
+        String user = config.get("username", "");
+        String password = config.get("password", "");
+
+        boolean useSSL = config.get("useSSL", false);
+
+        storage = new AuthStorage(this, driver, host, port, database, user, password, useSSL);
         try {
             storage.createTables();
             return true;
         } catch (Exception ex) {
-            getLogger().log(Level.SEVERE, "Failed to setup database. Disabling plugin...", ex);
+            plugin.getLog().warn("Failed to setup database. Disabling plugin...", ex);
             return false;
         }
     }
 
-    public boolean importDatabase(ImportPlugin plugin, boolean sqlite, AuthStorage storage, String host, String database
-            , String username, String pass) {
-        if (sqlite && (plugin == ImportPlugin.BPA || plugin == ImportPlugin.ELDZI)) {
-            throw new IllegalArgumentException("These plugins doesn't support flat file databases");
-        }
-
-        Importer importer;
+    private boolean checkDriver(String className) {
         try {
-            importer = plugin.getImporter().newInstance();
-        } catch (Exception ex) {
-            getLogger().log(Level.SEVERE, "Couldn't not setup importer class", ex);
-            return false;
-        } 
-
-        try {
-            if (sqlite && plugin == ImportPlugin.AUTO_IN) {
-                //load sqlite driver
-                Class.forName("org.sqlite.JDBC");
-
-                String jdbcUrl = "jdbc:sqlite:" + AutoInImporter.getSQLitePath();
-                Connection con = DriverManager.getConnection(jdbcUrl);
-                importer.importData(con, storage.getDataSource(), storage);
-                return true;
-            } else {
-                Class.forName("com.mysql.jdbc.Driver");
-
-                String jdbcUrl = "jdbc:mysql://" + host + "/" + database;
-                Connection con = DriverManager.getConnection(jdbcUrl, username, pass);
-                importer.importData(con, storage.getDataSource(), storage);
-                return true;
-            }
-        } catch (ClassNotFoundException ex) {
-            getLogger().log(Level.SEVERE, "Cannot find SQL driver. Do you removed it?", ex);
-        } catch (SQLException ex) {
-            getLogger().log(Level.SEVERE, "Couldn't import data. Aborting...", ex);
+            Class.forName(className);
+            return true;
+        } catch (ClassNotFoundException notFoundEx) {
+            Logger log = plugin.getLog();
+            log.warn("This driver {} is not supported on this platform", className);
+            log.warn("Please choose MySQL (Spigot+BungeeCord), SQLite (Spigot+Sponge) or MariaDB (Sponge)", notFoundEx);
         }
 
         return false;
     }
 
-    public SharedConfig getConfig() {
-        return sharedConfig;
+
+    public Configuration getConfig() {
+        return config;
     }
 
     public PasswordGenerator<P> getPasswordGenerator() {
@@ -174,11 +200,11 @@ public abstract class FastLoginCore<P> {
         this.passwordGenerator = passwordGenerator;
     }
 
-    public ConcurrentMap<String, Object> getPendingLogins() {
-        return pendingLogins;
+    public ConcurrentMap<String, Object> getPendingLogin() {
+        return pendingLogin;
     }
 
-    public Set<UUID> getPendingConfirms() {
+    public Collection<UUID> getPendingConfirms() {
         return pendingConfirms;
     }
 
@@ -190,6 +216,25 @@ public abstract class FastLoginCore<P> {
         this.authPlugin = authPlugin;
     }
 
+    public void saveDefaultFile(String fileName) {
+        Path dataFolder = plugin.getPluginFolder();
+
+        try {
+            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(defaultStream, configFile);
+                }
+            }
+        } catch (IOException ioExc) {
+            plugin.getLog().error("Cannot create plugin folder {}", dataFolder, ioExc);
+        }
+    }
+
     public void close() {
         if (storage != null) {
             storage.close();

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

@@ -0,0 +1,103 @@
+package com.github.games647.fastlogin.core.shared;
+
+import com.github.games647.fastlogin.core.AuthStorage;
+import com.github.games647.fastlogin.core.StoredProfile;
+import com.github.games647.fastlogin.core.hooks.AuthPlugin;
+
+public abstract class ForceLoginManagement<P extends C, C, L extends LoginSession, T extends PlatformPlugin<C>>
+        implements Runnable {
+
+    protected final FastLoginCore<P, C, T> core;
+    protected final P player;
+    protected final L session;
+
+    public ForceLoginManagement(FastLoginCore<P, C, T> core, P player, L session) {
+        this.core = core;
+        this.player = player;
+        this.session = session;
+    }
+
+    @Override
+    public void run() {
+        if (!isOnline(player) || session == null) {
+            return;
+        }
+
+        AuthStorage storage = core.getStorage();
+        StoredProfile playerProfile = session.getProfile();
+        try {
+            if (isOnlineMode()) {
+                //premium player
+                AuthPlugin<P> authPlugin = core.getAuthPluginHook();
+                if (authPlugin == null) {
+                    //maybe only bungeecord plugin
+                    onForceActionSuccess(session);
+                } else {
+                    boolean success = true;
+                    String playerName = getName(player);
+                    if (core.getConfig().get("autoLogin", true)) {
+                        if (session.needsRegistration()
+                                || (core.getConfig().get("auto-register-unknown", false)
+                                && !authPlugin.isRegistered(playerName))) {
+                            success = forceRegister(player);
+                        } else {
+                            success = forceLogin(player);
+                        }
+                    }
+
+                    if (success) {
+                        //update only on success to prevent corrupt data
+                        if (playerProfile != null) {
+                            playerProfile.setId(session.getUuid());
+                            playerProfile.setPremium(true);
+                            storage.save(playerProfile);
+                        }
+
+                        onForceActionSuccess(session);
+                    }
+                }
+            } else if (playerProfile != null) {
+                //cracked player
+                playerProfile.setId(null);
+                playerProfile.setPremium(false);
+                storage.save(playerProfile);
+            }
+        } catch (Exception ex) {
+            core.getPlugin().getLog().warn("ERROR ON FORCE LOGIN of {}", getName(player), ex);
+        }
+    }
+
+    public boolean forceRegister(P player) {
+        core.getPlugin().getLog().info("Register player {}", getName(player));
+
+        String generatedPassword = core.getPasswordGenerator().getRandomPassword(player);
+        boolean success = core.getAuthPluginHook().forceRegister(player, generatedPassword);
+
+        String message = core.getMessage("auto-register");
+        if (success && message != null) {
+            message = message.replace("%password", generatedPassword);
+            core.getPlugin().sendMessage(player, message);
+        }
+
+        return success;
+    }
+
+    public boolean forceLogin(P player) {
+        core.getPlugin().getLog().info("Logging player {} in", getName(player));
+
+        boolean success = core.getAuthPluginHook().forceLogin(player);
+        if (success) {
+            core.sendLocaleMessage("auto-login", player);
+        }
+
+        return success;
+    }
+
+    public abstract void onForceActionSuccess(LoginSession session);
+
+    public abstract String getName(P player);
+
+    public abstract boolean isOnline(P player);
+
+    public abstract boolean isOnlineMode();
+}

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

@@ -1,49 +1,57 @@
 package com.github.games647.fastlogin.core.shared;
 
-import com.github.games647.fastlogin.core.PlayerProfile;
-import com.github.games647.fastlogin.core.SharedConfig;
+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.util.UUID;
-import java.util.logging.Level;
+import java.util.Optional;
 
-public abstract class JoinManagement<T, S extends LoginSource> {
+import net.md_5.bungee.config.Configuration;
 
-    protected final FastLoginCore<T> core;
-    protected final AuthPlugin<T> authHook;
+public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
 
-    public JoinManagement(FastLoginCore<T> core, AuthPlugin<T> authHook) {
+    protected final FastLoginCore<P, C, ?> core;
+    protected final AuthPlugin<P> authHook;
+
+    public JoinManagement(FastLoginCore<P, C, ?> core, AuthPlugin<P> authHook) {
         this.core = core;
         this.authHook = authHook;
     }
 
     public void onLogin(String username, S source) {
-        PlayerProfile profile = core.getStorage().loadProfile(username);
+        StoredProfile profile = core.getStorage().loadProfile(username);
         if (profile == null) {
             return;
         }
 
-        SharedConfig config = core.getConfig();
+        Configuration config = core.getConfig();
 
         String ip = source.getAddress().getAddress().getHostAddress();
+        profile.setLastIp(ip);
         try {
-            if (profile.getUserId() == -1) {
-                if (core.getPendingLogins().containsKey(ip + username) && config.get("secondAttemptCracked", false)) {
-                    core.getLogger().log(Level.INFO, "Second attempt login -> cracked {0}", username);
+            if (profile.isSaved()) {
+                if (profile.isPremium()) {
+                    requestPremiumLogin(source, profile, username, true);
+                } else {
+                    startCrackedSession(source, profile, username);
+                }
+            } else {
+                if (core.getPendingLogin().remove(ip + username) != null && config.get("secondAttemptCracked", false)) {
+                    core.getPlugin().getLog().info("Second attempt login -> cracked {}", username);
 
                     //first login request failed so make a cracked session
                     startCrackedSession(source, profile, username);
                     return;
                 }
 
-                UUID premiumUUID = null;
+                Optional<Profile> premiumUUID = Optional.empty();
                 if (config.get("nameChangeCheck", false) || config.get("autoRegister", false)) {
-                    core.getLogger().log(Level.FINER, "Player {0} uses a premium username", username);
-                    premiumUUID = core.getApiConnector().getPremiumUUID(username);
+                    premiumUUID = core.getResolver().findProfile(username);
                 }
 
-                if (premiumUUID == null
-                        || (!checkNameChange(source, username, premiumUUID)
+                if (!premiumUUID.isPresent()
+                        || (!checkNameChange(source, username, premiumUUID.get())
                         && !checkPremiumName(source, username, profile))) {
                     //nothing detected the player as premium -> start a cracked session
                     if (core.getConfig().get("switchMode", false)) {
@@ -53,18 +61,19 @@ public abstract class JoinManagement<T, S extends LoginSource> {
 
                     startCrackedSession(source, profile, username);
                 }
-            } else if (profile.isPremium()) {
-                requestPremiumLogin(source, profile, username, true);
-            } else {
-
-                startCrackedSession(source, profile, username);
             }
+        } catch (RateLimitException rateLimitEx) {
+            core.getPlugin().getLog().error("Mojang's rate limit reached for {}. The public IPv4 address of this" +
+                    " server issued more than 600 Name -> UUID requests within 10 minutes. After those 10" +
+                    " minutes we can make requests again.", username);
         } catch (Exception ex) {
-            core.getLogger().log(Level.SEVERE, "Failed to check premium state", ex);
+            core.getPlugin().getLog().error("Failed to check premium state for {}", username, ex);
+            core.getPlugin().getLog().error("Failed to check premium state of {}", username, ex);
         }
     }
 
-    private boolean checkPremiumName(S source, String username, PlayerProfile profile) throws Exception {
+    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))) {
             requestPremiumLogin(source, profile, username, false);
             return true;
@@ -73,18 +82,18 @@ public abstract class JoinManagement<T, S extends LoginSource> {
         return false;
     }
 
-    private boolean checkNameChange(S source, String username, UUID premiumUUID) {
+    private boolean checkNameChange(S source, String username, Profile profile) {
         //user not exists in the db
         if (core.getConfig().get("nameChangeCheck", false)) {
-            PlayerProfile profile = core.getStorage().loadProfile(premiumUUID);
-            if (profile != null) {
+            StoredProfile storedProfile = core.getStorage().loadProfile(profile.getId());
+            if (storedProfile != null) {
                 //uuid exists in the database
-                core.getLogger().log(Level.FINER, "Player {0} changed it's username", premiumUUID);
+                core.getPlugin().getLog().info("GameProfile {} changed it's username", profile);
 
                 //update the username to the new one in the database
-                profile.setPlayerName(username);
+                storedProfile.setPlayerName(username);
 
-                requestPremiumLogin(source, profile, username, false);
+                requestPremiumLogin(source, storedProfile, username, false);
                 return true;
             }
         }
@@ -92,7 +101,7 @@ public abstract class JoinManagement<T, S extends LoginSource> {
         return false;
     }
 
-    public abstract void requestPremiumLogin(S source, PlayerProfile profile, String username, boolean registered);
+    public abstract void requestPremiumLogin(S source, StoredProfile profile, String username, boolean registered);
 
-    public abstract void startCrackedSession(S source, PlayerProfile profile, String username);
+    public abstract void startCrackedSession(S source, StoredProfile profile, String username);
 }

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

@@ -1,19 +1,19 @@
 package com.github.games647.fastlogin.core.shared;
 
-import com.github.games647.fastlogin.core.PlayerProfile;
+import com.github.games647.fastlogin.core.StoredProfile;
 
 import java.util.UUID;
 
 public abstract class LoginSession {
 
     private final String username;
-    private final PlayerProfile profile;
+    private final StoredProfile profile;
     
     private UUID uuid;
 
     protected boolean registered;
 
-    public LoginSession(String username, boolean registered, PlayerProfile profile) {
+    public LoginSession(String username, boolean registered, StoredProfile profile) {
         this.username = username;
         this.registered = registered;
         this.profile = profile;
@@ -32,7 +32,7 @@ public abstract class LoginSession {
         return !registered;
     }
 
-    public PlayerProfile getProfile() {
+    public StoredProfile getProfile() {
         return profile;
     }
 
@@ -53,4 +53,14 @@ public abstract class LoginSession {
     public synchronized void setUuid(UUID uuid) {
         this.uuid = uuid;
     }
+
+    @Override
+    public synchronized String toString() {
+        return this.getClass().getSimpleName() + '{' +
+                "username='" + username + '\'' +
+                ", profile=" + profile +
+                ", uuid=" + uuid +
+                ", registered=" + registered +
+                '}';
+    }
 }

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

@@ -1,158 +0,0 @@
-package com.github.games647.fastlogin.core.shared;
-
-import com.github.games647.fastlogin.core.BalancedSSLFactory;
-import com.google.common.collect.Sets;
-import com.google.common.io.CharStreams;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-
-import javax.net.ssl.HttpsURLConnection;
-
-public abstract class MojangApiConnector {
-
-    //http connection, read timeout and user agent for a connection to mojang api servers
-    private static final int TIMEOUT = 3 * 1_000;
-    private static final String USER_AGENT = "Premium-Checker";
-
-    private static final String MCAPI_UUID_URL = "https://mcapi.ca/uuid/player/";
-
-    //only premium (paid account) users have a uuid from here
-    private static final String UUID_LINK = "https://api.mojang.com/users/profiles/minecraft/";
-    //this includes a-zA-Z1-9_
-    private static final String VALID_PLAYERNAME = "^\\w{2,16}$";
-
-    private static final int RATE_LIMIT_CODE = 429;
-
-    //compile the pattern only on plugin enable -> and this have to be threadsafe
-    private final Pattern playernameMatcher = Pattern.compile(VALID_PLAYERNAME);
-
-    private final ConcurrentMap<Object, Object> requests = FastLoginCore.buildCache(10, -1);
-    private final BalancedSSLFactory sslFactory;
-    private final int rateLimit;
-    private long lastRateLimit;
-
-    protected final Logger logger;
-
-    public MojangApiConnector(Logger logger, List<String> localAddresses, int rateLimit) {
-        this.logger = logger;
-        
-        if (rateLimit > 600) {
-            this.rateLimit = 600;
-        } else {
-            this.rateLimit = rateLimit;
-        }
-
-        if (localAddresses.isEmpty()) {
-            this.sslFactory = null;
-        } else {
-            Set<InetAddress> addresses = Sets.newHashSet();
-            for (String localAddress : localAddresses) {
-                try {
-                    InetAddress address = InetAddress.getByName(localAddress);
-                    if (!address.isAnyLocalAddress()) {
-                        logger.log(Level.WARNING, "Submitted IP-Address is not local {0}", address);
-                        continue;
-                    }
-
-                    addresses.add(address);
-                } catch (UnknownHostException ex) {
-                    logger.log(Level.SEVERE, "IP-Address is unknown to us", ex);
-                }
-            }
-
-            this.sslFactory = new BalancedSSLFactory(HttpsURLConnection.getDefaultSSLSocketFactory(), addresses);
-        }
-    }
-
-    /**
-     *
-     * @param playerName
-     * @return null on non-premium
-     */
-    public UUID getPremiumUUID(String playerName) {
-        //check if it's a valid playername
-        if (playernameMatcher.matcher(playerName).matches()) {
-//            only make a API call if the name is valid existing mojang account
-
-            if (requests.size() >= rateLimit || System.currentTimeMillis() - lastRateLimit < 1_000 * 60 * 10) {
-//                plugin.getLogger().fine("STILL WAITING FOR RATE_LIMIT - TRYING Third-party API");
-                return getUUIDFromAPI(playerName);
-            }
-
-            requests.put(new Object(), new Object());
-
-            try {
-                HttpsURLConnection connection = getConnection(UUID_LINK + playerName);
-                if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-                    String line = reader.readLine();
-                    if (!line.equals("null")) {
-                        return FastLoginCore.parseId(getUUIDFromJson(line));
-                    }
-                } else if (connection.getResponseCode() == RATE_LIMIT_CODE) {
-                    logger.info("RATE_LIMIT REACHED - TRYING THIRD-PARTY API");
-                    lastRateLimit = System.currentTimeMillis();
-                    return getUUIDFromAPI(playerName);
-                }
-                //204 - no content for not found
-            } catch (Exception ex) {
-                logger.log(Level.SEVERE, "Failed to check if player has a paid account", ex);
-            }
-            //this connection doesn't need to be closed. So can make use of keep alive in java
-        }
-
-        return null;
-    }
-
-    public UUID getUUIDFromAPI(String playerName) {
-        try {
-            HttpURLConnection httpConnection = getConnection(MCAPI_UUID_URL + playerName);
-
-            if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
-                //cracked
-                return null;
-            }
-
-            Reader reader = new InputStreamReader(httpConnection.getInputStream());
-            String json = CharStreams.toString(reader);
-            return FastLoginCore.parseId(getUUIDFromJson(json));
-        } catch (IOException iOException) {
-            logger.log(Level.SEVERE, "Tried converting name->uuid from third-party api", iOException);
-        }
-
-        return null;
-    }
-
-    public abstract boolean hasJoinedServer(LoginSession session, String serverId);
-
-    protected abstract String getUUIDFromJson(String json);
-
-    protected HttpsURLConnection getConnection(String url) throws IOException {
-        HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection();
-        connection.setConnectTimeout(TIMEOUT);
-        connection.setReadTimeout(2 * TIMEOUT);
-        //the new Mojang API just uses json as response
-        connection.setRequestProperty("Content-Type", "application/json");
-        connection.setRequestProperty("User-Agent", USER_AGENT);
-
-        if (sslFactory != null) {
-            connection.setSSLSocketFactory(sslFactory);
-        }
-
-        return connection;
-    }
-}

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

@@ -0,0 +1,21 @@
+package com.github.games647.fastlogin.core.shared;
+
+import java.nio.file.Path;
+import java.util.concurrent.ThreadFactory;
+
+import org.slf4j.Logger;
+
+public interface PlatformPlugin<C> {
+
+    String getName();
+
+    Path getPluginFolder();
+
+    Logger getLog();
+
+    void sendMessage(C receiver, String message);
+
+    default ThreadFactory getThreadFactory() {
+        return null;
+    }
+}

core/src/main/resources/config.yml

@@ -37,8 +37,8 @@ secondAttemptCracked: false
 switchMode: false
 
 # If this plugin detected that a player has a premium, it can also set the associated
-# uuid from that account. So if the players changes their usernames, they will still have
-# the same playerdata (inventory, permissions, ...)
+# uuid from that account. So if the player changes the username, they will still have
+# the same player data (inventory, permissions, ...)
 #
 # Warning: This also means that the UUID will be different if the player is connecting
 # through a offline mode connection. This **could** cause plugin compatibility issues.
@@ -49,21 +49,21 @@ switchMode: false
 # players could still join the server, because they have different UUID.
 #
 # Moreover you may want to convert the offline UUID to a premium UUID. This will ensure that the player
-# will have the same inventory, permissions, ... if they switched to premium authentification from offline/cracked
-# authentification.
+# will have the same inventory, permissions, ... if they switched to premium authentication from offline/cracked
+# authentication.
 #
-# This feature requires Cauldron, Spigot or a fork of Spigot (PaperSpigot, TacoSpigot)
+# This feature requires Cauldron, Spigot or a fork of Spigot (Paper)
 premiumUuid: false
 
 # This will make an additional check (only for player names which are not in the database) against the mojang servers
-# in order to get the premium UUID. If that premium UUID is in the database, we can assume on sucessful login that the
+# in order to get the premium UUID. If that premium UUID is in the database, we can assume on successful login that the
 # player changed it's  username and we just update the name in the database.
 # Examples:
 # #### Case 1
 # nameChangeCheck = false ----- autoRegister = false
 #
-# Player logins as cracked until the player invoked the command /premium. Then we could override the existing database
-# record.
+# GameProfile logins as cracked until the player invoked the command /premium. Then we could override the existing
+# database record.
 #
 # #### Case 2
 #
@@ -82,7 +82,7 @@ premiumUuid: false
 #
 # nameChangeCheck = false ----- autoRegister = true
 #
-# We will always request a premium authentication if the username is unknown to us, but is in use by a paid minecraft
+# We will always request a premium authentication if the username is unknown to us, but is in use by a paid Minecraft
 # account. This means it's kind of a more aggressive check like nameChangeCheck = true and autoRegister = false, because
 # it request a premium authentication which are completely new to us, that even the premium UUID is not in our database.
 #
@@ -95,7 +95,7 @@ premiumUuid: false
 # Based on autoRegister it checks if the player name is premium and login using a premium authentication. After that
 # fastlogin receives the premium UUID and can update the database record.
 #
-# **Limitation from autoRegister**: New offline players who uses the username of an existing minecraft cannot join the
+# **Limitation from autoRegister**: New offline players who uses the username of an existing Minecraft cannot join the
 # server.
 nameChangeCheck: false
 
@@ -104,7 +104,7 @@ nameChangeCheck: false
 #
 # Keep in mind that this will only works if the player:
 # * is the owner of the premium account
-# * the serverconnection is established through a premium connection (paid account authentification)
+# * the server connection is established through a premium connection (paid account authentication)
 # * has a skin
 #
 # This means this plugin doesn't need to create a new connection to the Mojang servers, because
@@ -112,7 +112,7 @@ nameChangeCheck: false
 # players like cracked player, you have to use other plugins.
 #
 # If you want to use skins for your cracked player, you need an additional plugin like
-# ChangeSkin, SkinRestoer, ...
+# ChangeSkin, SkinRestorer, ...
 forwardSkin: true
 
 # Displays a warning message that this message SHOULD only be invoked by
@@ -128,8 +128,8 @@ premium-warning: true
 # Once the limit is reached, new players are always logged in as cracked until the rate-limit is expired.
 # (to the next ten minutes)
 #
-# The limit is IP-wide. If you have multiple IPv4-Addreses you specify them here. FastLogin will then use it in rotating
-# order --> 5 different IP-addreses 5 * 600 per 10 minutes
+# The limit is IP-wide. If you have multiple IPv4-addresses you specify them here. FastLogin will then use it in
+# rotating order --> 5 different IP-addresses 5 * 600 per 10 minutes
 # If this list is empty only the default one will be used
 #
 # Lists are created like this:
@@ -137,32 +137,52 @@ premium-warning: true
 #    - 192-168-0-2
 ip-addresses: []
 
-# How many requests should be established until the plugin uses the third-party API https://mcapi.ca/
-# Once this number is reached in a range of ten minutes it will start connecting to https://mcapi.ca/ for the next ten minutes
-# This option exists in order to workaround the rate-limiting. Name -> UUID are fetched in the same way like heads
+# How many requests should be established to the Mojang API for Name -> UUID requests. Some other plugins as well
+# as the head Minecraft block make such requests as well. Using this option you can limit the amount requests this
+# plugin should make.
 #
-# If you want to join the discussion visit this: https://github.com/games647/FastLogin/issues/27#issuecomment-226954350
+# If you lower this value, other plugins could still make requests while FastLogin cannot.
+# Mojang limits the amount of request to 600 per 10 minutes per IPv4-address.
 mojang-request-limit: 600
 
+# This option automatically registers players which are in the FastLogin database, but not in the auth plugin database.
+# This can happen if you switch your auth plugin or cleared the database of the auth plugin.
+# https://github.com/games647/FastLogin/issues/85
+auto-register-unknown: false
+
 # This disables the auto login from fastlogin. So a premium (like a paid account) authentication is requested, but
 # the player won't be auto logged into the account.
 #
 # This can be used as 2Factor authentication for better security of your accounts. A hacker then needs both passwords.
-# The password of your minecraft and the password to login in with your auth plugin
+# The password of your Minecraft and the password to login in with your auth plugin
 autoLogin: true
 
 # Database configuration
-# Recommened is the use of MariaDB (a better version of MySQL)
+# Recommended is the use of MariaDB (a better version of MySQL)
 
 # Single file SQLite database
 driver: org.sqlite.JDBC
 # File location
 database: '{pluginDir}/FastLogin.db'
 
-# MySQL
+# MySQL/MariaDB
+# If you want to enable it uncomment only the lines below this not this line.
 #driver: com.mysql.jdbc.Driver
-#host: localhost
+#host: 127.0.0.1
 #port: 3306
 #database: fastlogin
 #username: myUser
-#password: myPassword
+#password: myPassword
+
+# It's strongly recommended to enable SSL and setup a SSL certificate if the MySQL server isn't running on the same
+# machine
+#useSSL: false
+
+# HTTP proxies for connecting to the Mojang servers in order to check if the username of a player is premium.
+# This is a workaround to prevent rate-limiting by Mojang. These proxies will only be used once your server hit
+# the rate-limit or the custom value above.
+# Please make sure you use reliable proxies.
+proxies:
+  # 'IP:Port' or 'Domain:Port'
+  # - 'xyz.com:1337'
+  # - 'test.com:5131'

core/src/main/resources/messages.yml

@@ -5,10 +5,10 @@
 # You can access the newest locale here:
 # https://github.com/games647/FastLogin/blob/master/core/src/main/resources/messages.yml
 #
-# You want to have language template? Visit the Github Wiki here:
+# You want to have language template? Visit the GitHub Wiki here:
 # https://github.com/games647/FastLogin/wiki/English
 
-# In order to split a message into seperate lines you could just make a new line, but keep the '
+# In order to split a message into separate lines you could just make a new line, but keep the '
 # Example:
 # bla: '&aFirst line
 # Second line
@@ -22,33 +22,33 @@
 # ========= Shared (BungeeCord and Bukkit)   ============
 
 # Switch mode is activated and a new (non-whitelist) cracked player tries to join
-switch-kick-message: '&4Only paid minecraft whitelisted accounts are allowed to join this server'
+switch-kick-message: '&4Only paid Minecraft whitelisted accounts are allowed to join this server'
 
-# Player activated premium logins in order to skip offline authentication
+# GameProfile activated premium login in order to skip offline authentication
 add-premium: '&2Added to the list of premium players'
 
-# Player activated premium logins in order to skip offline authentication
+# GameProfile activated premium login in order to skip offline authentication
 add-premium-other: '&2Player has been added to the premium list'
 
-# Player is already set be a paid account
+# GameProfile is already set be a paid account
 already-exists: '&4You are already on the premium list'
 
-# Player is already set be a paid account
+# GameProfile is already set be a paid account
 already-exists-other: '&4Player is already on the premium list'
 
-# Player was changed to be cracked
+# GameProfile was changed to be cracked
 remove-premium: '&2Removed from the list of premium players'
 
-# Player is already set to be cracked
+# GameProfile is already set to be cracked
 not-premium: '&4You are not in the premium list'
 
-# Player is already set to be cracked
+# GameProfile is already set to be cracked
 not-premium-other: '&4Player is not in the premium list'
 
 # Admin wanted to change the premium of a user that isn't known to the plugin
 player-unknown: '&4Player not in the database'
 
-# ========= Bukkit/Spigot/PaperSpigot/TacoSpigot only ================================
+# ========= Bukkit/Spigot ================
 
 # The user skipped the authentication, because it was a premium player
 auto-login: '&2Auto logged in'
@@ -58,7 +58,7 @@ auto-login: '&2Auto logged in'
 auto-register: '&2Auto registered with password: %password
 You may want change it?'
 
-# Player is not able to toggle the premium state of other players
+# GameProfile is not able to toggle the premium state of other players
 no-permission: '&4Not enough permissions'
 
 # Although the console can toggle the premium state, it's not possible for the console itself.
@@ -67,30 +67,30 @@ no-console: '&4You are not a player. You cannot toggle the premium state for YOU
 
 # The user wants to toggle premium state, but BungeeCord support is enabled. This means the server have to communicate
 # with the BungeeCord first which will establish a connection with the database server.
-wait-on-proxy: '&6Sending request...'
+wait-on-proxy: '&6Sending request... (Do not forget to follow the BungeeCord setup guide)'
 
 # When ProtocolLib is enabled and the plugin is unable to continue handling a login request after a requested premium
 # authentication. In this state the client expects a success packet with a encrypted connection or disconnect packet.
 # So we kick the player, if we cannot encrypt the connection. In other situation (example: premium name check),
 # the player will be just authenticated as cracked
-error-kick: '&4Error occured'
+error-kick: '&4Error occurred'
 
-# The server sents a verify token within the premium authentication reqest. If this doesn't match on response,
+# The server sends a verify token within the premium authentication request. If this doesn't match on response,
 # it could be another client sending malicious packets
 invalid-verify-token: '&4Invalid token'
 
 # The client sent no request join server request to the mojang servers which would proof that it's owner of that
-# acciunt. Only modified clients would do this.
+# account. Only modified clients would do this.
 invalid-session: '&4Invalid session'
 
-# The client sent a malicous packet without a login request packet
+# The client sent a malicious packet without a login request packet
 invalid-requst: '&4Invalid request'
 
-# Message if the bukkit isn't fully started to inject the packets
+# Message if the Bukkit isn't fully started to inject the packets
 not-started: '&cServer is not fully started yet. Please retry'
 
 # Warning message if a user invoked /premium command
-premium-warning: '&c&lWARNING: &6This command should &lonly&6 be invoked if you are the owner of this paid minecraft account
+premium-warning: '&c&lWARNING: &6This command should &lonly&6 be invoked if you are the owner of this paid Minecraft account
 Type &a/premium&6 again to confirm'
 
 # ========= Bungee/Waterfall only ================================

pom.xml

@@ -8,53 +8,61 @@
     <packaging>pom</packaging>
 
     <name>FastLogin</name>
-    <version>1.9</version>
-    <inceptionYear>2015</inceptionYear>
+    <version>1.11-SNAPSHOT</version>
+
     <url>https://www.spigotmc.org/resources/fastlogin.14153/</url>
     <description>
-        Automatically logins premium (paid accounts) player on a offline mode server
+        Automatically login premium (paid accounts) player on a offline mode server
     </description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!--Possibility to deploy directly to the plugins folder-->
-        <outputDir>${basedir}/target</outputDir>
+
+        <!-- Set default for non-git clones -->
+        <git.commit.id>Unknown</git.commit.id>
+
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <modules>
         <module>core</module>
         <module>bukkit</module>
         <module>bungee</module>
-        <module>universal</module>
     </modules>
 
-    <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/games647/FastLogin/issues</url>
-    </issueManagement>
-
-    <scm>
-        <url>https://github.com/games647/FastLogin</url>
-        <connection>scm:git:git://github.com/games647/FastLogin.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com:games647/FastLogin.git</developerConnection>
-    </scm>
+    <!--Deployment configuration for the Maven repository-->
+    <distributionManagement>
+        <snapshotRepository>
+            <id>codemc-snapshots</id>
+            <url>https://repo.codemc.org/repository/maven-snapshots/</url>
+        </snapshotRepository>
+        <repository>
+            <id>codemc-releases</id>
+            <url>https://repo.codemc.org/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
 
     <build>
-        <defaultGoal>install</defaultGoal>
         <!--Just use the project name to replace an old version of the plugin if the user does only copy-paste-->
         <finalName>${project.name}</finalName>
 
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>2.2.4</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <showWarnings>true</showWarnings>
-                    <showDeprecation>true</showDeprecation>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
 
@@ -64,15 +72,6 @@
                 <!--Replace variables-->
                 <filtering>true</filtering>
             </resource>
-
-            <!--Add the license to jar in order to see it in the final jar-->
-            <resource>
-                <!--Parent folder-->
-                <directory>${basedir}/..</directory>
-                <includes>
-                    <include>LICENSE</include>
-                </includes>
-            </resource>
         </resources>
     </build>
 </project>

universal/pom.xml

@@ -1,77 +0,0 @@
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.github.games647</groupId>
-        <artifactId>fastlogin</artifactId>
-        <version>1.9</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>fastlogin-universal</artifactId>
-    <packaging>jar</packaging>
-
-    <name>FastLoginUniversal</name>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <finalName>${project.parent.name}</finalName>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <shadedArtifactAttached>false</shadedArtifactAttached>
-                    <artifactSet>
-                        <includes>
-                            <include>${project.groupId}:*</include>
-                            <include>com.zaxxer:HikariCP</include>
-                            <include>org.slf4j:*</include>
-                        </includes>
-                    </artifactSet>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <outputDirectory>${outputDir}</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fastlogin.core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fastlogin.bukkit</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fastlogin.bungee</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>