More debug calls to set the premiumUUID

.github/ISSUE_TEMPLATE.md

@@ -1,14 +1,6 @@
----
-name: Bug report
-about: Something isn't working
-title: ''
-labels: 'bug'
-assignees: ''
-
----
-
 [//]: # (Lines in this format are considered as comments and will not be displayed.)
-[//]: # (Before reporting make sure you're running the **latest build** of the plugin and checked for existing issues!)
+[//]: #
+[//]: # (Before reporting make sure you're running the **latest build** of the plugin and checked for duplicate issues!)
 
 ### What behaviour is observed:
 [//]: # (What happened?)
@@ -19,23 +11,18 @@ assignees: ''
 ### Steps/models to reproduce:
 [//]: # (The actions that cause the issue. Please explain it in detail)
 
-### Screenshots (if applicable)
-[//]: # (You can drop the files here directly)
-
 ### Plugin list:
 [//]: # (This can be found by running `/pl`)
 
 ### Environment description
-[//]: # (Server software with exact version number, Minecraft version, SQLite/MySQL/MariaDB, ...)
+[//]: # (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`.)
 
-### Server Log:
-[//]: # (No images please - only the textual representation)
-[Hastebin](https://hastebin.com/) / [Gist](https://gist.github.com/) link of the error, stacktrace or the complete log (if any)
+### Error Log:
+[Hastebin](https://hastebin.com/) / [Gist](https://gist.github.com/) link of the error or stacktrace (if any)
 
 ### Configuration:
-[//]: # (No images please - only the textual representation)
 [//]: # (remember to delete any sensitive data)
 [Hastebin](https://hastebin.com/) / [Gist](https://gist.github.com/) link of your config.yml file 

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -1,22 +0,0 @@
----
-name: Enhancement request
-about: New feature or change request
-title: ''
-labels: 'enhancement'
-assignees: ''
-
----
-
-[//]: # (Lines in this format are considered as comments and will not be displayed.)
-
-### Is your feature request related to a problem? Please describe.
-[//]: # (A clear and concise description of what the problem is. Ex. I'm always frustrated when [...])
-
-### Describe the solution you'd like
-[//]: # (A clear and concise description of what you want to happen.)
-
-### Describe alternatives you've considered
-[//]: # (A clear and concise description of any alternative solutions or features you've considered.)
-
-### Additional context
-[//]: # (Add any other context or screenshots about the feature request here.)

.github/ISSUE_TEMPLATE/question.md

@@ -1,10 +0,0 @@
----
-name: Question
-about: You want to ask something
-title: ''
-labels: 'question'
-assignees: ''
-
----
-
-

.github/pull_request_template.md

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

.github/workflows/maven.yml

@@ -1,42 +0,0 @@
-# Human readable name
-name: Java CI
-
-# Build on every push and pull request regardless of the branch
-# Wiki: https://help.github.com/en/actions/reference/events-that-trigger-workflows
-on:
-    - push
-    - pull_request
-
-jobs:
-  # job id
-  build_and_test:
-
-    # Environment image - always newest OS
-    runs-on: ubuntu-latest
-
-    # Run steps
-    steps:
-    # Pull changes
-    - uses: actions/checkout@v2
-    # Cache artifacts - however this has the downside that we don't get notified of
-    # artifact resolution failures like invalid repository
-    # Nevertheless the repositories should be more stable and it makes no sense to pull
-    # a same version every time
-    # A dry run would make more sense
-    - uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
-    # Setup Java
-    - name: Set up JDK
-      uses: actions/setup-java@v1.3.0
-      with:
-        # Use Java 8, because it's minimum required version
-        java-version: 8
-    # Build and test (included in package)
-    - name: Build with Maven and test
-    # Run non-interactive, package (with compile+test),
-    # ignore snapshot updates, because they are likely to have breaking changes, enforce checksums to validate posssible errors in depdendencies
-      run: mvn --batch-mode package --no-snapshot-updates --strict-checksums --file pom.xml

.travis.yml

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

README.md

@@ -70,13 +70,6 @@ https://ci.codemc.org/job/Games647/job/FastLogin/changes
 
 * [BungeeAuth](https://www.spigotmc.org/resources/bungeeauth.493/)
 
-## Network requests
-
-This plugin performs network requests to:
-
-* https://api.mojang.com - retrieving uuid data to decide if we should activate premium login
-* https://sessionserver.mojang.com - verify if the player is the owner of that account
-
 ***
 
 ## How to install

bukkit/pom.xml

@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -20,7 +20,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.1.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
@@ -56,47 +56,40 @@
     </build>
 
     <repositories>
-        <!-- Bukkit-Server-API -->
+        <!--Bukkit-Server-API -->
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-            <!-- Disable snapshot release policy to speed up, when finding a artifact -->
-            <releases>
-                <enabled>false</enabled>
-            </releases>
         </repository>
 
-        <!-- ProtocolLib -->
+        <!--LoginSecurity-->
+        <repository>
+            <id>lenis0012-repo</id>
+            <url>http://ci.lenis0012.com/plugin/repository/everything/</url>
+        </repository>
+
+        <!--ProtocolLib-->
         <repository>
             <id>dmulloy2-repo</id>
-            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
+            <url>http://repo.dmulloy2.net/content/groups/public/</url>
         </repository>
 
-        <!-- AuthMe Reloaded, xAuth and LoginSecurity -->
+        <!--AuthMe Reloaded and xAuth -->
         <repository>
-            <id>codemc-releases</id>
-            <url>https://repo.codemc.io/repository/maven-public/</url>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
 
-        <!-- GitHub automatic maven builds -->
+        <!--GitHub automatic maven builds-->
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
         </repository>
 
-        <!-- PlaceholderAPI -->
+        <!--PlaceholderAPI -->
         <repository>
             <id>placeholderapi</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
+            <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
     </repositories>
 
@@ -120,7 +113,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.5.0</version>
+            <version>4.3.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -128,8 +121,8 @@
         <dependency>
             <groupId>com.github.ProtocolSupport</groupId>
             <artifactId>ProtocolSupport</artifactId>
-            <!--4.29.dev after commit about API improvements-->
-            <version>3a80c661fe</version>
+            <!--4.25.dev-->
+            <version>a4f060dc46</version>
             <scope>provided</scope>
         </dependency>
 
@@ -137,7 +130,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.10.4</version>
+            <version>2.8.5</version>
             <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
@@ -166,7 +159,7 @@
         <dependency>
             <groupId>com.lenis0012.bukkit</groupId>
             <artifactId>loginsecurity</artifactId>
-            <version>3.0.1</version>
+            <version>2.1.7</version>
             <scope>provided</scope>
             <optional>true</optional>
             <exclusions>

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

@@ -1,11 +1,13 @@
 package com.github.games647.fastlogin.bukkit;
 
-import com.github.games647.craftapi.model.skin.SkinProperty;
+import com.github.games647.craftapi.model.skin.Property;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.LoginSession;
 
 import java.util.Optional;
 
+import org.apache.commons.lang.ArrayUtils;
+
 /**
  * Represents a client connecting to the server.
  *
@@ -13,36 +15,29 @@ import java.util.Optional;
  */
 public class BukkitLoginSession extends LoginSession {
 
-    private static final byte[] EMPTY_ARRAY = {};
-
     private final String serverId;
     private final byte[] verifyToken;
 
     private boolean verified;
 
-    private SkinProperty skinProperty;
+    private Property skinProperty;
 
     public BukkitLoginSession(String username, String serverId, byte[] verifyToken, boolean registered
             , StoredProfile profile) {
         super(username, registered, profile);
 
         this.serverId = serverId;
-        this.verifyToken = verifyToken.clone();
+        this.verifyToken = ArrayUtils.clone(verifyToken);
     }
 
     //available for BungeeCord
     public BukkitLoginSession(String username, boolean registered) {
-        this(username, "", EMPTY_ARRAY, registered, null);
+        this(username, "", ArrayUtils.EMPTY_BYTE_ARRAY, registered, null);
     }
 
     //cracked player
     public BukkitLoginSession(String username, StoredProfile profile) {
-        this(username, "", EMPTY_ARRAY, false, profile);
-    }
-
-    //ProtocolSupport
-    public BukkitLoginSession(String username, boolean registered, StoredProfile profile) {
-        this(username, "", EMPTY_ARRAY, registered, profile);
+        this(username, "", ArrayUtils.EMPTY_BYTE_ARRAY, false, profile);
     }
 
     /**
@@ -52,14 +47,14 @@ public class BukkitLoginSession extends LoginSession {
      *
      * @return the verify token from the server
      */
-    public synchronized byte[] getVerifyToken() {
-        return verifyToken.clone();
+    public byte[] getVerifyToken() {
+        return ArrayUtils.clone(verifyToken);
     }
 
     /**
      * @return premium skin if available
      */
-    public synchronized Optional<SkinProperty> getSkin() {
+    public synchronized Optional<Property> getSkin() {
         return Optional.ofNullable(skinProperty);
     }
 
@@ -67,7 +62,7 @@ public class BukkitLoginSession extends LoginSession {
      * Sets the premium skin property which was retrieved by the session server
      * @param skinProperty premium skin
      */
-    public synchronized void setSkinProperty(SkinProperty skinProperty) {
+    public synchronized void setSkinProperty(Property skinProperty) {
         this.skinProperty = skinProperty;
     }
 

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

@@ -8,6 +8,7 @@ import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.util.Random;
 
@@ -82,24 +83,28 @@ public class EncryptionUtil {
     /**
      * Decrypts the content and extracts the key spec.
      *
-     * @param cipher     decryption cipher initialized with the private key
+     * @param cipher     decryption cipher
+     * @param privateKey private key of the server
      * @param sharedKey  the encrypted shared key
      * @return shared secret key
-     * @throws GeneralSecurityException if it fails to decrypt the data
+     * @throws GeneralSecurityException
      */
-    public static SecretKey decryptSharedKey(Cipher cipher, byte[] sharedKey) throws GeneralSecurityException {
-        return new SecretKeySpec(decrypt(cipher, sharedKey), "AES");
+    public static SecretKey decryptSharedKey(Cipher cipher, PrivateKey privateKey, byte[] sharedKey)
+            throws GeneralSecurityException {
+        return new SecretKeySpec(decrypt(cipher, privateKey, sharedKey), "AES");
     }
 
     /**
      * Decrypted the given data using the cipher.
      *
-     * @param cipher decryption cypher initialized with the private key
+     * @param cipher decryption cypher
+     * @param key    server private key
      * @param data   the encrypted data
      * @return clear text data
-     * @throws GeneralSecurityException if it fails to decrypt the data
+     * @throws GeneralSecurityException if it fails to initialize and decrypt the data
      */
-    public static byte[] decrypt(Cipher cipher, byte[] data) throws GeneralSecurityException {
+    public static byte[] decrypt(Cipher cipher, PrivateKey key, byte[] data) throws GeneralSecurityException {
+        cipher.init(Cipher.DECRYPT_MODE, key);
         return cipher.doFinal(data);
     }
 

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

@@ -11,8 +11,6 @@ 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.message.LoginActionMessage;
-import com.github.games647.fastlogin.core.message.NamespaceKey;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.PlatformPlugin;
 import com.google.common.io.ByteArrayDataOutput;
@@ -26,15 +24,11 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.messaging.PluginMessageRecipient;
 import org.slf4j.Logger;
 
-import static com.github.games647.fastlogin.core.message.ChangePremiumMessage.CHANGE_CHANNEL;
-import static com.github.games647.fastlogin.core.message.SuccessMessage.SUCCESS_CHANNEL;
-
 /**
  * This plugin checks if a player has a paid account and if so tries to skip offline mode authentication.
  */
@@ -69,26 +63,12 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
         }
 
         PluginManager pluginManager = getServer().getPluginManager();
-        Plugin protocolLib = pluginManager.getPlugin("ProtocolLib");
-        if (protocolLib != null && !protocolLib.isEnabled()) {
-            logger.warn("Dependency graph issue. ProtocolLib should be loaded first.");
-            logger.warn(getDescription().getSoftDepend().toString());
-            logger.warn(getDescription().getDepend().toString());
-            logger.warn(getDescription().getLoadBefore().toString());
-        }
-
         if (bungeeCord) {
             setServerStarted();
 
-            // check for incoming messages from the bungeecord version of this plugin
-            String forceChannel = new NamespaceKey(getName(), LoginActionMessage.FORCE_CHANNEL).getCombinedName();
-            getServer().getMessenger().registerIncomingPluginChannel(this, forceChannel, new BungeeListener(this));
-
-            // outgoing
-            String successChannel = new NamespaceKey(getName(), SUCCESS_CHANNEL).getCombinedName();
-            String changeChannel = new NamespaceKey(getName(), CHANGE_CHANNEL).getCombinedName();
-            getServer().getMessenger().registerOutgoingPluginChannel(this, successChannel);
-            getServer().getMessenger().registerOutgoingPluginChannel(this, changeChannel);
+            //check for incoming messages from the bungeecord version of this plugin
+            getServer().getMessenger().registerIncomingPluginChannel(this, getName(), new BungeeListener(this));
+            getServer().getMessenger().registerOutgoingPluginChannel(this, getName());
         } else {
             if (!core.setupDatabase()) {
                 setEnabled(false);
@@ -187,10 +167,10 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
     public void sendPluginMessage(PluginMessageRecipient player, ChannelMessage message) {
         if (player != null) {
             ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
-            message.writeTo(dataOutput);
+            dataOutput.writeUTF(message.getChannelName());
 
-            NamespaceKey channel = new NamespaceKey(getName(), message.getChannelName());
-            player.sendPluginMessage(this, channel.getCombinedName(), dataOutput.toByteArray());
+            message.writeTo(dataOutput);
+            player.sendPluginMessage(this, this.getName(), dataOutput.toByteArray());
         }
     }
 

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

@@ -1,52 +0,0 @@
-package com.github.games647.fastlogin.bukkit.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-public class BukkitFastLoginAutoLoginEvent extends Event implements FastLoginAutoLoginEvent, Cancellable {
-
-    private static final HandlerList handlers = new HandlerList();
-    private final LoginSession session;
-    private final StoredProfile profile;
-    private boolean cancelled;
-
-    public BukkitFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile) {
-        super(true);
-
-        this.session = session;
-        this.profile = profile;
-    }
-
-    @Override
-    public LoginSession getSession() {
-        return session;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

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

@@ -1,47 +0,0 @@
-package com.github.games647.fastlogin.bukkit.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSource;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-public class BukkitFastLoginPreLoginEvent extends Event implements FastLoginPreLoginEvent {
-
-    private static final HandlerList handlers = new HandlerList();
-    private final String username;
-    private final LoginSource source;
-    private final StoredProfile profile;
-
-    public BukkitFastLoginPreLoginEvent(String username, LoginSource source, StoredProfile profile) {
-        super(true);
-
-        this.username = username;
-        this.source = source;
-        this.profile = profile;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public LoginSource getSource() {
-        return source;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

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

@@ -1,6 +1,5 @@
 package com.github.games647.fastlogin.bukkit.hook;
 
-import com.comphenix.protocol.reflect.FieldUtils;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 
@@ -14,6 +13,7 @@ import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import org.apache.commons.lang.reflect.FieldUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 

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

@@ -11,7 +11,7 @@ import com.lenis0012.bukkit.loginsecurity.session.action.RegisterAction;
 import org.bukkit.entity.Player;
 
 /**
- * GitHub: https://github.com/lenis0012/LoginSecurity-2
+ * GitHub: https://github.com/lenis0012/LoginSecurity-2 
  * <p>
  * Project page:
  * <p>
@@ -30,8 +30,8 @@ public class LoginSecurityHook implements AuthPlugin<Player> {
     @Override
     public boolean forceLogin(Player player) {
         PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player);
-        return session.isAuthorized()
-                || session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess();
+        return session.isAuthorized() || session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess();
+
     }
 
     @Override

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

@@ -46,7 +46,16 @@ public class BungeeListener implements PluginMessageListener {
 
     @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);
@@ -101,7 +110,7 @@ public class BungeeListener implements PluginMessageListener {
                 }
             }, 10L);
         } else if (type == Type.CRACKED) {
-            //we don't start a force login task here so update it manually
+            //we don't start a forcelogin task here so update it manually
             plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
         }
     }

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

@@ -38,7 +38,6 @@ public class ConnectionListener implements Listener {
     public void onPlayerJoin(PlayerJoinEvent joinEvent) {
         Player player = joinEvent.getPlayer();
 
-        removeBlacklistStatus(player);
         if (!plugin.isBungeeEnabled()) {
             //Wait before auth plugin and we received a message from BungeeCord initializes the player
             Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player);
@@ -49,13 +48,9 @@ public class ConnectionListener implements Listener {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent quitEvent) {
         Player player = quitEvent.getPlayer();
-        removeBlacklistStatus(player);
+        player.removeMetadata(plugin.getName(), plugin);
 
         plugin.getCore().getPendingConfirms().remove(player.getUniqueId());
         plugin.getPremiumPlayers().remove(player.getUniqueId());
     }
-
-    private void removeBlacklistStatus(Player player) {
-        player.removeMetadata(plugin.getName(), plugin);
-    }
 }

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

@@ -4,14 +4,12 @@ import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketEvent;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.event.BukkitFastLoginPreLoginEvent;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
 
 import java.security.PublicKey;
 import java.util.Random;
 
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -48,13 +46,6 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
         }
     }
 
-    @Override
-    public FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, ProtocolLibLoginSource source, StoredProfile profile) {
-        BukkitFastLoginPreLoginEvent event = new BukkitFastLoginPreLoginEvent(username, source, profile);
-        plugin.getServer().getPluginManager().callEvent(event);
-        return event;
-    }
-
     //Minecraft server implementation
     //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L161
     @Override

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

@@ -14,6 +14,7 @@ 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;
@@ -42,7 +43,7 @@ public class ProtocolLibLoginSource implements LoginSource {
         verifyToken = EncryptionUtil.generateVerifyToken(random);
 
         /*
-         * Packet Information: https://wiki.vg/Protocol#Encryption_Request
+         * Packet Information: http://wiki.vg/Protocol#Encryption_Request
          *
          * ServerID="" (String) key=public server key verifyToken=random 4 byte array
          */
@@ -84,7 +85,7 @@ public class ProtocolLibLoginSource implements LoginSource {
     }
 
     public byte[] getVerifyToken() {
-        return verifyToken.clone();
+        return ArrayUtils.clone(verifyToken);
     }
 
     @Override

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

@@ -6,7 +6,7 @@ import com.comphenix.protocol.reflect.accessors.MethodAccessor;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedSignedProperty;
-import com.github.games647.craftapi.model.skin.Textures;
+import com.github.games647.craftapi.model.skin.Property;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 
@@ -54,14 +54,14 @@ public class SkinApplyListener implements Listener {
     private void applySkin(Player player, String skinData, String signature) {
         WrappedGameProfile gameProfile = WrappedGameProfile.fromPlayer(player);
 
-        WrappedSignedProperty skin = WrappedSignedProperty.fromValues(Textures.KEY, skinData, signature);
+        WrappedSignedProperty skin = WrappedSignedProperty.fromValues(Property.TEXTURE_KEY, skinData, signature);
         try {
-            gameProfile.getProperties().put(Textures.KEY, skin);
+            gameProfile.getProperties().put(Property.TEXTURE_KEY, skin);
         } catch (ClassCastException castException) {
             //Cauldron, MCPC, Thermos, ...
             Object map = GET_PROPERTIES.invoke(gameProfile.getHandle());
             try {
-                MethodUtils.invokeMethod(map, "put", new Object[]{Textures.KEY, skin.getHandle()});
+                MethodUtils.invokeMethod(map, "put", new Object[]{Property.TEXTURE_KEY, skin.getHandle()});
             } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
                 plugin.getLog().error("Error setting premium skin of: {}", player, ex);
             }

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

@@ -9,13 +9,14 @@ 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.SkinProperty;
+import com.github.games647.craftapi.model.skin.Property;
 import com.github.games647.craftapi.resolver.MojangResolver;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.EncryptionUtil;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
@@ -59,7 +60,7 @@ public class VerifyResponseTask implements Runnable {
         try {
             BukkitLoginSession session = plugin.getLoginSessions().get(player.getAddress().toString());
             if (session == null) {
-                disconnect("invalid-request", true
+                disconnect(plugin.getCore().getMessage("invalid-request"), true
                         , "GameProfile {0} tried to send encryption response at invalid state", player.getAddress());
             } else {
                 verifyResponse(session);
@@ -81,9 +82,8 @@ public class VerifyResponseTask implements Runnable {
         SecretKey loginKey;
         try {
             cipher = Cipher.getInstance(privateKey.getAlgorithm());
-            cipher.init(Cipher.DECRYPT_MODE, privateKey);
 
-            loginKey = EncryptionUtil.decryptSharedKey(cipher, sharedSecret);
+            loginKey = EncryptionUtil.decryptSharedKey(cipher, privateKey, sharedSecret);
         } catch (GeneralSecurityException securityEx) {
             disconnect("error-kick", false, "Cannot decrypt received contents", securityEx);
             return;
@@ -107,21 +107,24 @@ public class VerifyResponseTask implements Runnable {
             InetAddress address = socketAddress.getAddress();
             Optional<Verification> response = resolver.hasJoined(username, serverId, address);
             if (response.isPresent()) {
-                plugin.getLog().info("GameProfile {} has a verified premium account", username);
+                Verification verification = response.get();
+                UUID id = verification.getId();
 
-                SkinProperty[] properties = response.get().getProperties();
+                plugin.getLog().info("GameProfile {} with {} has a verified premium account", username, id);
+
+                Property[] properties = verification.getProperties();
                 if (properties.length > 0) {
                     session.setSkinProperty(properties[0]);
                 }
 
-                session.setUuid(response.get().getId());
+                session.setUuid(id);
                 session.setVerified(true);
 
                 setPremiumUUID(session.getUuid());
                 receiveFakeStartPacket(username);
             } else {
                 //user tried to fake a authentication
-                disconnect("invalid-session", true
+                disconnect(plugin.getCore().getMessage("invalid-session"), true
                         , "GameProfile {0} ({1}) tried to log in with an invalid session ServerId: {2}"
                         , session.getUsername(), socketAddress, serverId);
             }
@@ -131,7 +134,19 @@ public class VerifyResponseTask implements Runnable {
     }
 
     private void setPremiumUUID(UUID premiumUUID) {
-        if (plugin.getConfig().getBoolean("premiumUuid") && premiumUUID != null) {
+        boolean uuidEnabled = plugin.getConfig().getBoolean("premiumUuid");
+        plugin.getLog().info("Setting UUID {} based on config: {}", premiumUUID, uuidEnabled);
+        try {
+            Object networkManager = getNetworkManager();
+            Field uuidField = FieldUtils.getField(networkManager.getClass(), "spoofedUUID");
+            Object oldValue = uuidField.get(player);
+
+            plugin.getLog().info("spoofed UUID field exits? {} with {}", uuidField, oldValue);
+        } catch (ReflectiveOperationException e) {
+            plugin.getLog().error("Failed to query field of {}", player);
+        }
+
+        if (uuidEnabled && premiumUUID != null) {
             try {
                 Object networkManager = getNetworkManager();
                 //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/NetworkManager.java#L69
@@ -149,9 +164,9 @@ public class VerifyResponseTask implements Runnable {
         byte[] responseVerify = packetEvent.getPacket().getByteArrays().read(1);
 
         //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L182
-        if (!Arrays.equals(requestVerify, EncryptionUtil.decrypt(cipher, responseVerify))) {
+        if (!Arrays.equals(requestVerify, EncryptionUtil.decrypt(cipher, privateKey, responseVerify))) {
             //check if the verify token are equal to the server sent one
-            disconnect("invalid-verify-token", true
+            disconnect(plugin.getCore().getMessage("invalid-verify-token"), true
                     , "GameProfile {0} ({1}) tried to login with an invalid verify token. Server: {2} Client: {3}"
                     , session.getUsername(), packetEvent.getPlayer().getAddress(), requestVerify, responseVerify);
             return false;
@@ -190,14 +205,14 @@ public class VerifyResponseTask implements Runnable {
         return true;
     }
 
-    private void disconnect(String reasonKey, boolean debug, String logMessage, Object... arguments) {
+    private void disconnect(String kickReason, boolean debug, String logMessage, Object... arguments) {
         if (debug) {
             plugin.getLog().debug(logMessage, arguments);
         } else {
             plugin.getLog().error(logMessage, arguments);
         }
 
-        kickPlayer(plugin.getCore().getMessage(reasonKey));
+        kickPlayer(plugin.getCore().getMessage(kickReason));
     }
 
     private void kickPlayer(String reason) {

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

@@ -1,23 +1,19 @@
 package com.github.games647.fastlogin.bukkit.listener.protocolsupport;
 
-import com.github.games647.craftapi.UUIDAdapter;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.event.BukkitFastLoginPreLoginEvent;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
 
 import java.net.InetSocketAddress;
-import java.util.Optional;
 
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import protocolsupport.api.events.ConnectionCloseEvent;
+import protocolsupport.api.events.PlayerLoginFinishEvent;
 import protocolsupport.api.events.PlayerLoginStartEvent;
-import protocolsupport.api.events.PlayerProfileCompleteEvent;
 
 public class ProtocolSupportListener extends JoinManagement<Player, CommandSender, ProtocolLoginSource>
         implements Listener {
@@ -36,7 +32,7 @@ public class ProtocolSupportListener extends JoinManagement<Player, CommandSende
             return;
         }
 
-        String username = loginStartEvent.getConnection().getProfile().getName();
+        String username = loginStartEvent.getName();
         InetSocketAddress address = loginStartEvent.getAddress();
 
         //remove old data every time on a new login in order to keep the session only for one person
@@ -52,28 +48,19 @@ public class ProtocolSupportListener extends JoinManagement<Player, CommandSende
     }
 
     @EventHandler
-    public void onPropertiesResolve(PlayerProfileCompleteEvent profileCompleteEvent) {
-        InetSocketAddress address = profileCompleteEvent.getAddress();
+    public void onPropertiesResolve(PlayerLoginFinishEvent loginFinishEvent) {
+        if (!loginFinishEvent.isOnlineMode()) {
+            return;
+        }
+
+        InetSocketAddress address = loginFinishEvent.getAddress();
         BukkitLoginSession session = plugin.getLoginSessions().get(address.toString());
 
-        if (session != null && profileCompleteEvent.getConnection().getProfile().isOnlineMode()) {
+        if (session != null) {
             session.setVerified(true);
-
-            if (!plugin.getConfig().getBoolean("premiumUuid")) {
-                String username = Optional.ofNullable(profileCompleteEvent.getForcedName())
-                        .orElse(profileCompleteEvent.getConnection().getProfile().getName());
-                profileCompleteEvent.setForcedUUID(UUIDAdapter.generateOfflineId(username));
-            }
         }
     }
 
-    @Override
-    public FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, ProtocolLoginSource source, StoredProfile profile) {
-        BukkitFastLoginPreLoginEvent event = new BukkitFastLoginPreLoginEvent(username, source, profile);
-        plugin.getServer().getPluginManager().callEvent(event);
-        return event;
-    }
-
     @Override
     public void requestPremiumLogin(ProtocolLoginSource source, StoredProfile profile, String username
             , boolean registered) {
@@ -82,10 +69,11 @@ public class ProtocolSupportListener extends JoinManagement<Player, CommandSende
         String ip = source.getAddress().getAddress().getHostAddress();
         plugin.getCore().getPendingLogin().put(ip + username, new Object());
 
-        BukkitLoginSession playerSession = new BukkitLoginSession(username, registered, profile);
+        BukkitLoginSession playerSession = new BukkitLoginSession(username, null, null
+                , registered, profile);
         plugin.getLoginSessions().put(source.getAddress().toString(), playerSession);
         if (plugin.getConfig().getBoolean("premiumUuid")) {
-            source.getLoginStartEvent().setOnlineMode(true);
+            source.getLoginStartEvent().setUseOnlineModeUUID(true);
         }
     }
 

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

@@ -2,9 +2,7 @@ package com.github.games647.fastlogin.bukkit.task;
 
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.event.BukkitFastLoginAutoLoginEvent;
 import com.github.games647.fastlogin.core.PremiumStatus;
-import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.message.SuccessMessage;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.ForceLoginManagement;
@@ -12,7 +10,6 @@ import com.github.games647.fastlogin.core.shared.LoginSession;
 
 import java.util.concurrent.ExecutionException;
 
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -38,19 +35,11 @@ public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender,
 
         super.run();
 
-        PremiumStatus status = PremiumStatus.CRACKED;
         if (isOnlineMode()) {
-            status = PremiumStatus.PREMIUM;
+            plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.PREMIUM);
+        } else {
+            plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
         }
-
-        plugin.getPremiumPlayers().put(player.getUniqueId(), status);
-    }
-
-    @Override
-    public FastLoginAutoLoginEvent callFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile) {
-        BukkitFastLoginAutoLoginEvent event = new BukkitFastLoginAutoLoginEvent(session, profile);
-        core.getPlugin().getServer().getPluginManager().callEvent(event);
-        return event;
     }
 
     @Override
@@ -78,10 +67,6 @@ public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender,
 
     @Override
     public boolean isOnlineMode() {
-        if (session == null) {
-            return false;
-        }
-
         return session.isVerified() && player.getName().equals(session.getUsername());
     }
 }

bukkit/src/main/resources/plugin.yml

@@ -14,11 +14,11 @@ dev-url: ${project.url}
 # Load the plugin as early as possible to inject it for all players
 load: STARTUP
 
-# This plugin don't have to be transformed for compatibility with Minecraft >= 1.13
-api-version: '1.13'
-
-# We depend either ProtocolLib or ProtocolSupport
-depend: [ProtocolLib]
+softdepend:
+    # We depend either ProtocolLib or ProtocolSupport
+    - ProtocolSupport
+    - ProtocolLib
+    - PlaceholderAPI
 
 commands:
     ${project.parent.name}:

bungee/pom.xml

@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -21,7 +21,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.1.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
@@ -56,9 +56,14 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>vik1395-repo</id>
+            <url>https://vik1395.github.io/repo.vik1395.me/repositories</url>
+        </repository>
+
         <repository>
             <id>codemc-repo</id>
-            <url>https://repo.codemc.io/repository/maven-public/</url>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
     </repositories>
 
@@ -74,7 +79,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-proxy</artifactId>
-            <version>1.14-SNAPSHOT</version>
+            <version>1.12-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -83,8 +88,13 @@
             <groupId>me.vik1395</groupId>
             <artifactId>BungeeAuth</artifactId>
             <version>1.4</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/BungeeAuth-1.4.jar</systemPath>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>

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

@@ -12,28 +12,28 @@ public class BungeeLoginSession extends LoginSession {
         super(username, registered, profile);
     }
 
-    public synchronized void setRegistered(boolean registered) {
+    public void setRegistered(boolean registered) {
         this.registered = registered;
     }
 
-    public synchronized boolean isAlreadySaved() {
+    public boolean isAlreadySaved() {
         return alreadySaved;
     }
 
-    public synchronized void setAlreadySaved(boolean alreadySaved) {
+    public void setAlreadySaved(boolean alreadySaved) {
         this.alreadySaved = alreadySaved;
     }
 
-    public synchronized boolean isAlreadyLogged() {
+    public boolean isAlreadyLogged() {
         return alreadyLogged;
     }
 
-    public synchronized void setAlreadyLogged(boolean alreadyLogged) {
+    public void setAlreadyLogged(boolean alreadyLogged) {
         this.alreadyLogged = alreadyLogged;
     }
 
     @Override
-    public synchronized String toString() {
+    public String toString() {
         return this.getClass().getSimpleName() + '{' +
                 "alreadySaved=" + alreadySaved +
                 ", alreadyLogged=" + alreadyLogged +

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

@@ -4,20 +4,15 @@ import com.github.games647.fastlogin.core.shared.LoginSource;
 
 import java.net.InetSocketAddress;
 
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.PendingConnection;
-import net.md_5.bungee.api.event.PreLoginEvent;
 
 public class BungeeLoginSource implements LoginSource {
 
     private final PendingConnection connection;
-    private final PreLoginEvent preLoginEvent;
 
-    public BungeeLoginSource(PendingConnection connection, PreLoginEvent preLoginEvent) {
+    public BungeeLoginSource(PendingConnection connection) {
         this.connection = connection;
-        this.preLoginEvent = preLoginEvent;
     }
 
     @Override
@@ -27,12 +22,7 @@ public class BungeeLoginSource implements LoginSource {
 
     @Override
     public void kick(String message) {
-        preLoginEvent.setCancelled(true);
-
-        if (message != null)
-            preLoginEvent.setCancelReason(TextComponent.fromLegacyText(message));
-        else
-            preLoginEvent.setCancelReason(new ComponentBuilder("Kicked").color(ChatColor.WHITE).create());
+        connection.disconnect(TextComponent.fromLegacyText(message));
     }
 
     @Override

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

@@ -2,12 +2,9 @@ package com.github.games647.fastlogin.bungee;
 
 import com.github.games647.fastlogin.bungee.hook.BungeeAuthHook;
 import com.github.games647.fastlogin.bungee.listener.ConnectListener;
-import com.github.games647.fastlogin.bungee.listener.PluginMessageListener;
+import com.github.games647.fastlogin.bungee.listener.MessageListener;
 import com.github.games647.fastlogin.core.CommonUtil;
-import com.github.games647.fastlogin.core.message.ChangePremiumMessage;
 import com.github.games647.fastlogin.core.message.ChannelMessage;
-import com.github.games647.fastlogin.core.message.NamespaceKey;
-import com.github.games647.fastlogin.core.message.SuccessMessage;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.PlatformPlugin;
 import com.google.common.collect.MapMaker;
@@ -51,11 +48,10 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
 
         //events
         getProxy().getPluginManager().registerListener(this, new ConnectListener(this));
-        getProxy().getPluginManager().registerListener(this, new PluginMessageListener(this));
+        getProxy().getPluginManager().registerListener(this, new MessageListener(this));
 
-        //this is required to listen to incoming messages from the server
-        getProxy().registerChannel(new NamespaceKey(getName(), ChangePremiumMessage.CHANGE_CHANNEL).getCombinedName());
-        getProxy().registerChannel(new NamespaceKey(getName(), SuccessMessage.SUCCESS_CHANNEL).getCombinedName());
+        //this is required to listen to messages from the server
+        getProxy().registerChannel(getName());
 
         registerHook();
     }
@@ -86,10 +82,10 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
     public void sendPluginMessage(Server server, ChannelMessage message) {
         if (server != null) {
             ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
-            message.writeTo(dataOutput);
+            dataOutput.writeUTF(message.getChannelName());
 
-            NamespaceKey channel = new NamespaceKey(getName(), message.getChannelName());
-            server.sendData(channel.getCombinedName(), dataOutput.toByteArray());
+            message.writeTo(dataOutput);
+            server.sendData(core.getPlugin().getName(), dataOutput.toByteArray());
         }
     }
 
@@ -117,7 +113,7 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
     @SuppressWarnings("deprecation")
     public ThreadFactory getThreadFactory() {
         return new ThreadFactoryBuilder()
-                .setNameFormat(getName() + " Database Pool Thread #%1$d")
+                .setNameFormat(core.getPlugin().getName() + " Database Pool Thread #%1$d")
                 //Hikari create daemons by default
                 .setDaemon(true)
                 .setThreadFactory(new GroupedThreadFactory(this, getName()))

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

@@ -1,39 +0,0 @@
-package com.github.games647.fastlogin.bungee.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSession;
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
-import net.md_5.bungee.api.plugin.Cancellable;
-import net.md_5.bungee.api.plugin.Event;
-
-public class BungeeFastLoginAutoLoginEvent extends Event implements FastLoginAutoLoginEvent, Cancellable {
-
-    private final LoginSession session;
-    private final StoredProfile profile;
-    private boolean cancelled;
-
-    public BungeeFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile) {
-        this.session = session;
-        this.profile = profile;
-    }
-
-    @Override
-    public LoginSession getSession() {
-        return session;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}

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

@@ -1,34 +0,0 @@
-package com.github.games647.fastlogin.bungee.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSource;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
-import net.md_5.bungee.api.plugin.Event;
-
-public class BungeeFastLoginPreLoginEvent extends Event implements FastLoginPreLoginEvent {
-
-    private final String username;
-    private final LoginSource source;
-    private final StoredProfile profile;
-
-    public BungeeFastLoginPreLoginEvent(String username, LoginSource source, StoredProfile profile) {
-        this.username = username;
-        this.source = source;
-        this.profile = profile;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public LoginSource getSource() {
-        return source;
-    }
-
-    @Override
-    public StoredProfile getProfile() {
-        return profile;
-    }
-}

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

@@ -5,8 +5,6 @@ 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.message.NamespaceKey;
-import com.github.games647.fastlogin.core.message.SuccessMessage;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
@@ -22,24 +20,18 @@ import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
-public class PluginMessageListener implements Listener {
+public class MessageListener implements Listener {
 
     private final FastLoginBungee plugin;
 
-    private final String successChannel;
-    private final String changeChannel;
-
-    public PluginMessageListener(FastLoginBungee plugin) {
+    public MessageListener(FastLoginBungee plugin) {
         this.plugin = plugin;
-
-        this.successChannel = new NamespaceKey(plugin.getName(), SuccessMessage.SUCCESS_CHANNEL).getCombinedName();
-        this.changeChannel = new NamespaceKey(plugin.getName(), ChangePremiumMessage.CHANGE_CHANNEL).getCombinedName();
     }
 
     @EventHandler
     public void onPluginMessage(PluginMessageEvent pluginMessageEvent) {
         String channel = pluginMessageEvent.getTag();
-        if (pluginMessageEvent.isCancelled() || !channel.startsWith(plugin.getName().toLowerCase())) {
+        if (pluginMessageEvent.isCancelled() || !plugin.getName().equals(channel)) {
             return;
         }
 
@@ -56,16 +48,17 @@ public class PluginMessageListener implements Listener {
         byte[] data = Arrays.copyOf(pluginMessageEvent.getData(), pluginMessageEvent.getData().length);
         ProxiedPlayer forPlayer = (ProxiedPlayer) pluginMessageEvent.getReceiver();
 
-        ProxyServer.getInstance().getScheduler().runAsync(plugin, () -> readMessage(forPlayer, channel, data));
+        ProxyServer.getInstance().getScheduler().runAsync(plugin, () -> readMessage(forPlayer, data));
     }
 
-    private void readMessage(ProxiedPlayer forPlayer, String channel, byte[] data) {
+    private void readMessage(ProxiedPlayer forPlayer, byte[] data) {
         FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core = plugin.getCore();
 
         ByteArrayDataInput dataInput = ByteStreams.newDataInput(data);
-        if (successChannel.equals(channel)) {
+        String subChannel = dataInput.readUTF();
+        if ("Success".equals(subChannel)) {
             onSuccessMessage(forPlayer);
-        } else if (changeChannel.equals(channel)) {
+        } else if ("ChangeStatus".equals(subChannel)) {
             ChangePremiumMessage changeMessage = new ChangePremiumMessage();
             changeMessage.readFrom(dataInput);
 

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

@@ -3,26 +3,24 @@ package com.github.games647.fastlogin.bungee.task;
 import com.github.games647.fastlogin.bungee.BungeeLoginSession;
 import com.github.games647.fastlogin.bungee.BungeeLoginSource;
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.bungee.event.BungeeFastLoginPreLoginEvent;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
 
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.event.PreLoginEvent;
+import net.md_5.bungee.api.event.AsyncEvent;
 import net.md_5.bungee.connection.InitialHandler;
 
 public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, CommandSender, BungeeLoginSource>
         implements Runnable {
 
     private final FastLoginBungee plugin;
-    private final PreLoginEvent preLoginEvent;
+    private final AsyncEvent<?> preLoginEvent;
 
     private final PendingConnection connection;
 
-    public AsyncPremiumCheck(FastLoginBungee plugin, PreLoginEvent preLoginEvent, PendingConnection connection) {
+    public AsyncPremiumCheck(FastLoginBungee plugin, AsyncEvent<?> preLoginEvent, PendingConnection connection) {
         super(plugin.getCore(), plugin.getCore().getAuthPluginHook());
 
         this.plugin = plugin;
@@ -37,19 +35,12 @@ public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, CommandSend
         InitialHandler initialHandler = (InitialHandler) connection;
         String username = initialHandler.getLoginRequest().getData();
         try {
-            super.onLogin(username, new BungeeLoginSource(connection, preLoginEvent));
+            super.onLogin(username, new BungeeLoginSource(connection));
         } finally {
             preLoginEvent.completeIntent(plugin);
         }
     }
 
-    @Override
-    public FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, BungeeLoginSource source,
-                                                             StoredProfile profile) {
-        return plugin.getProxy().getPluginManager()
-                .callEvent(new BungeeFastLoginPreLoginEvent(username, source, profile));
-    }
-
     @Override
     public void requestPremiumLogin(BungeeLoginSource source, StoredProfile profile,
                                     String username, boolean registered) {

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

@@ -2,8 +2,6 @@ package com.github.games647.fastlogin.bungee.task;
 
 import com.github.games647.fastlogin.bungee.BungeeLoginSession;
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.bungee.event.BungeeFastLoginAutoLoginEvent;
-import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.message.ChannelMessage;
 import com.github.games647.fastlogin.core.message.LoginActionMessage;
 import com.github.games647.fastlogin.core.message.LoginActionMessage.Type;
@@ -13,7 +11,6 @@ import com.github.games647.fastlogin.core.shared.LoginSession;
 
 import java.util.UUID;
 
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -54,12 +51,6 @@ public class ForceLoginTask
         return super.forceLogin(player);
     }
 
-    @Override
-    public FastLoginAutoLoginEvent callFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile) {
-        return core.getPlugin().getProxy().getPluginManager()
-                .callEvent(new BungeeFastLoginAutoLoginEvent(session, profile));
-    }
-
     @Override
     public boolean forceRegister(ProxiedPlayer player) {
         return session.isAlreadyLogged() || super.forceRegister(player);

core/pom.xml

@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -18,13 +18,11 @@
         <repository>
             <id>luck-repo</id>
             <url>https://ci.lucko.me/plugin/repository/everything</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
         </repository>
+
         <repository>
             <id>codemc-repo</id>
-            <url>https://repo.codemc.io/repository/maven-public/</url>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
     </repositories>
 
@@ -35,14 +33,14 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>3.4.2</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.30</version>
+            <version>1.7.25</version>
         </dependency>
 
         <!--GSON is not at the right position for Minecraft 1.7-->
@@ -69,7 +67,7 @@
         <dependency>
             <groupId>com.github.games647</groupId>
             <artifactId>craftapi</artifactId>
-            <version>0.3</version>
+            <version>0.1.3-SNAPSHOT</version>
         </dependency>
 
         <!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Cauldron) -->

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

@@ -22,34 +22,40 @@ public class AuthStorage {
 
     private static final String PREMIUM_TABLE = "premium";
 
-    private static final String LOAD_BY_NAME = "SELECT * FROM `" + PREMIUM_TABLE + "` WHERE `Name`=? LIMIT 1";
-    private static final String LOAD_BY_UUID = "SELECT * FROM `" + PREMIUM_TABLE + "` WHERE `UUID`=? LIMIT 1";
-    private static final String INSERT_PROFILE = "INSERT INTO `" + PREMIUM_TABLE
-            + "` (`UUID`, `Name`, `Premium`, `LastIp`) " + "VALUES (?, ?, ?, ?) ";
-    // limit not necessary here, because it's unique
-    private static final String UPDATE_PROFILE = "UPDATE `" + PREMIUM_TABLE
-            + "` SET `UUID`=?, `Name`=?, `Premium`=?, `LastIp`=?, `LastLogin`=CURRENT_TIMESTAMP WHERE `UserID`=?";
+    private static final String LOAD_BY_NAME = "SELECT * FROM " + PREMIUM_TABLE + " WHERE Name=? LIMIT 1";
+    private static final String LOAD_BY_UUID = "SELECT * FROM " + PREMIUM_TABLE + " WHERE UUID=? LIMIT 1";
+    private static final String INSERT_PROFILE = "INSERT INTO " + PREMIUM_TABLE + " (UUID, Name, Premium, LastIp) "
+            + "VALUES (?, ?, ?, ?) ";
+    private static final String UPDATE_PROFILE = "UPDATE " + PREMIUM_TABLE
+            + " SET UUID=?, Name=?, Premium=?, LastIp=?, LastLogin=CURRENT_TIMESTAMP WHERE UserID=?";
 
     private final FastLoginCore<?, ?, ?> core;
     private final HikariDataSource dataSource;
 
-    public AuthStorage(FastLoginCore<?, ?, ?> core, String host, int port, String databasePath,
-                       HikariConfig config, boolean useSSL) {
+    public AuthStorage(FastLoginCore<?, ?, ?> core, String driver, String host, int port, String databasePath
+            , String user, String pass, boolean useSSL) {
         this.core = core;
+
+        HikariConfig config = new HikariConfig();
         config.setPoolName(core.getPlugin().getName());
 
+        config.setUsername(user);
+        config.setPassword(pass);
+        config.setDriverClassName(driver);
+
         //a try to fix https://www.spigotmc.org/threads/fastlogin.101192/page-26#post-1874647
         Properties properties = new Properties();
         properties.setProperty("date_string_format", "yyyy-MM-dd HH:mm:ss");
         properties.setProperty("useSSL", String.valueOf(useSSL));
         config.setDataSourceProperties(properties);
+
         ThreadFactory platformThreadFactory = core.getPlugin().getThreadFactory();
         if (platformThreadFactory != null) {
             config.setThreadFactory(platformThreadFactory);
         }
 
         String jdbcUrl = "jdbc:";
-        if (config.getDriverClassName().contains("sqlite")) {
+        if (driver.contains("sqlite")) {
             String pluginFolder = core.getPlugin().getPluginFolder().toAbsolutePath().toString();
             databasePath = databasePath.replace("{pluginDir}", pluginFolder);
 
@@ -58,13 +64,6 @@ public class AuthStorage {
             config.setMaximumPoolSize(1);
         } else {
             jdbcUrl += "mysql://" + host + ':' + port + '/' + databasePath;
-            // enable MySQL specific optimizations
-            // default prepStmtCacheSize 25 - amount of cached statements - enough for us
-            // default prepStmtCacheSqlLimit 256 - length of SQL - our queries are not longer
-            // disabled by default - will return the same prepared statement instance
-            config.addDataSourceProperty("cachePrepStmts", true);
-            // default false - available in newer versions caches the statements server-side
-            config.addDataSourceProperty("useServerPrepStmts", true);
         }
 
         config.setJdbcUrl(jdbcUrl);
@@ -72,24 +71,23 @@ public class AuthStorage {
     }
 
     public void createTables() throws SQLException {
-        String createDataStmt = "CREATE TABLE IF NOT EXISTS `" + PREMIUM_TABLE + "` ("
-                + "`UserID` INTEGER PRIMARY KEY AUTO_INCREMENT, "
-                + "`UUID` CHAR(36), "
-                + "`Name` VARCHAR(16) NOT NULL, "
-                + "`Premium` BOOLEAN NOT NULL, "
-                + "`LastIp` VARCHAR(255) NOT NULL, "
-                + "`LastLogin` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
-                //the premium shouldn't steal the cracked account by changing the name
-                + "UNIQUE (`Name`) "
-                + ')';
-
-        if (dataSource.getJdbcUrl().contains("sqlite")) {
-            createDataStmt = createDataStmt.replace("AUTO_INCREMENT", "AUTOINCREMENT");
-        }
-
-        //todo: add uuid index usage
         try (Connection con = dataSource.getConnection();
              Statement createStmt = con.createStatement()) {
+            String createDataStmt = "CREATE TABLE IF NOT EXISTS " + PREMIUM_TABLE + " ("
+                    + "UserID INTEGER PRIMARY KEY AUTO_INCREMENT, "
+                    + "UUID CHAR(36), "
+                    + "Name VARCHAR(16) NOT NULL, "
+                    + "Premium BOOLEAN NOT NULL, "
+                    + "LastIp VARCHAR(255) NOT NULL, "
+                    + "LastLogin TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
+                    //the premium shouldn't steal the cracked account by changing the name
+                    + "UNIQUE (Name) "
+                    + ')';
+
+            if (dataSource.getJdbcUrl().contains("sqlite")) {
+                createDataStmt = createDataStmt.replace("AUTO_INCREMENT", "AUTOINCREMENT");
+            }
+
             createStmt.executeUpdate(createDataStmt);
         }
     }

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

@@ -5,8 +5,6 @@ import com.google.common.io.ByteArrayDataOutput;
 
 public class ChangePremiumMessage implements ChannelMessage {
 
-    public static final String CHANGE_CHANNEL = "ch-st";
-
     private String playerName;
     private boolean willEnable;
     private boolean isSourceInvoker;
@@ -35,7 +33,7 @@ public class ChangePremiumMessage implements ChannelMessage {
 
     @Override
     public String getChannelName() {
-        return CHANGE_CHANNEL;
+        return "ChangeStatus";
     }
 
     @Override

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

@@ -7,8 +7,6 @@ import java.util.UUID;
 
 public class LoginActionMessage implements ChannelMessage {
 
-    public static final String FORCE_CHANNEL = "force";
-
     private Type type;
 
     private String playerName;
@@ -62,7 +60,7 @@ public class LoginActionMessage implements ChannelMessage {
 
     @Override
     public String getChannelName() {
-        return FORCE_CHANNEL;
+        return "LoginAction";
     }
 
     @Override

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

@@ -1,26 +0,0 @@
-package com.github.games647.fastlogin.core.message;
-
-public class NamespaceKey {
-
-    private static final char SEPARATOR_CHAR = ':';
-
-    private final String namespace;
-    private final String key;
-
-    private final String combined;
-
-    public NamespaceKey(String namespace, String key) {
-        this.namespace = namespace.toLowerCase();
-        this.key = key.toLowerCase();
-
-        this.combined = this.namespace + SEPARATOR_CHAR + this.key;
-    }
-
-    public String getCombinedName()  {
-        return combined;
-    }
-
-    public static String getCombined(String namespace, String key) {
-        return new NamespaceKey(namespace, key).combined;
-    }
-}

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

@@ -5,11 +5,9 @@ import com.google.common.io.ByteArrayDataOutput;
 
 public class SuccessMessage implements ChannelMessage {
 
-    public static final String SUCCESS_CHANNEL = "succ";
-
     @Override
     public String getChannelName() {
-        return SUCCESS_CHANNEL;
+        return "Success";
     }
 
     @Override

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

@@ -8,7 +8,6 @@ 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.google.common.net.HostAndPort;
-import com.zaxxer.hikari.HikariConfig;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -142,7 +141,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
     public void sendLocaleMessage(String key, C receiver) {
         String message = localeMessages.get(key);
         if (message != null) {
-            plugin.sendMultiLineMessage(receiver, message);
+            plugin.sendMessage(receiver, message);
         }
     }
 
@@ -151,9 +150,8 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
     }
 
     public boolean setupDatabase() {
-        HikariConfig databaseConfig = new HikariConfig();
-        databaseConfig.setDriverClassName(config.getString("driver"));
-        if (!checkDriver(databaseConfig.getDriverClassName())) {
+        String driver = config.getString("driver");
+        if (!checkDriver(driver)) {
             return false;
         }
 
@@ -161,15 +159,12 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         int port = config.get("port", 3306);
         String database = config.getString("database");
 
+        String user = config.get("username", "");
+        String password = config.get("password", "");
+
         boolean useSSL = config.get("useSSL", false);
 
-        databaseConfig.setUsername(config.get("username", ""));
-        databaseConfig.setPassword(config.getString("password"));
-
-        databaseConfig.setConnectionTimeout(config.getInt("timeout", 30) * 1_000L);
-        databaseConfig.setMaxLifetime(config.getInt("lifetime", 30) * 1_000L);
-
-        storage = new AuthStorage(this, host, port, database, databaseConfig, useSSL);
+        storage = new AuthStorage(this, driver, host, port, database, user, password, useSSL);
         try {
             storage.createTables();
             return true;
@@ -192,6 +187,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         return false;
     }
 
+
     public Configuration getConfig() {
         return config;
     }

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

@@ -3,7 +3,6 @@ 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;
-import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
 
 public abstract class ForceLoginManagement<P extends C, C, L extends LoginSession, T extends PlatformPlugin<C>>
         implements Runnable {
@@ -41,7 +40,7 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
                                 || (core.getConfig().get("auto-register-unknown", false)
                                 && !authPlugin.isRegistered(playerName))) {
                             success = forceRegister(player);
-                        } else if (!callFastLoginAutoLoginEvent(session, playerProfile).isCancelled()) {
+                        } else {
                             success = forceLogin(player);
                         }
                     }
@@ -94,8 +93,6 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
         return success;
     }
 
-    public abstract FastLoginAutoLoginEvent callFastLoginAutoLoginEvent(LoginSession session, StoredProfile profile);
-
     public abstract void onForceActionSuccess(LoginSession session);
 
     public abstract String getName(P player);

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

@@ -4,7 +4,6 @@ import com.github.games647.craftapi.model.Profile;
 import com.github.games647.craftapi.resolver.RateLimitException;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
-import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
 
 import java.util.Optional;
 
@@ -26,8 +25,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
             return;
         }
 
-        callFastLoginPreLoginEvent(username, source, profile);
-
         Configuration config = core.getConfig();
 
         String ip = source.getAddress().getAddress().getHostAddress();
@@ -104,8 +101,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         return false;
     }
 
-    public abstract FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, S source, StoredProfile profile);
-
     public abstract void requestPremiumLogin(S source, StoredProfile profile, String username, boolean registered);
 
     public abstract void startCrackedSession(S source, StoredProfile profile, String username);

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

@@ -15,12 +15,6 @@ public interface PlatformPlugin<C> {
 
     void sendMessage(C receiver, String message);
 
-    default void sendMultiLineMessage(C receiver, String message) {
-        for (String line : message.split("%nl%")) {
-            sendMessage(receiver, line);
-        }
-    }
-
     default ThreadFactory getThreadFactory() {
         return null;
     }

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

@@ -1,9 +0,0 @@
-package com.github.games647.fastlogin.core.shared.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSession;
-
-public interface FastLoginAutoLoginEvent extends FastLoginCancellableEvent {
-    LoginSession getSession();
-    StoredProfile getProfile();
-}

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

@@ -1,7 +0,0 @@
-package com.github.games647.fastlogin.core.shared.event;
-
-public interface FastLoginCancellableEvent {
-
-    boolean isCancelled();
-    void setCancelled(boolean cancelled);
-}

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

@@ -1,11 +0,0 @@
-package com.github.games647.fastlogin.core.shared.event;
-
-import com.github.games647.fastlogin.core.StoredProfile;
-import com.github.games647.fastlogin.core.shared.LoginSource;
-
-public interface FastLoginPreLoginEvent {
-
-    String getUsername();
-    LoginSource getSource();
-    StoredProfile getProfile();
-}

core/src/main/resources/config.yml

@@ -161,22 +161,18 @@ autoLogin: true
 # Recommended is the use of MariaDB (a better version of MySQL)
 
 # Single file SQLite database
-driver: 'org.sqlite.JDBC'
+driver: org.sqlite.JDBC
 # File location
 database: '{pluginDir}/FastLogin.db'
 
 # MySQL/MariaDB
 # If you want to enable it uncomment only the lines below this not this line.
-#driver: 'com.mysql.jdbc.Driver'
-#host: '127.0.0.1'
+#driver: com.mysql.jdbc.Driver
+#host: 127.0.0.1
 #port: 3306
-#database: 'fastlogin'
-#username: 'myUser'
-#password: 'myPassword'
-
-# Advanced Connection Pool settings in seconds
-#timeout: 30
-#lifetime: 30
+#database: fastlogin
+#username: myUser
+#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

pom.xml

@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.github.games647</groupId>
@@ -21,9 +21,8 @@
         <!-- Set default for non-git clones -->
         <git.commit.id>Unknown</git.commit.id>
 
-        <java.version>1.8</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <modules>
@@ -36,11 +35,11 @@
     <distributionManagement>
         <snapshotRepository>
             <id>codemc-snapshots</id>
-            <url>https://repo.codemc.io/repository/maven-snapshots/</url>
+            <url>https://repo.codemc.org/repository/maven-snapshots/</url>
         </snapshotRepository>
         <repository>
             <id>codemc-releases</id>
-            <url>https://repo.codemc.io/repository/maven-releases/</url>
+            <url>https://repo.codemc.org/repository/maven-releases/</url>
         </repository>
     </distributionManagement>
 
@@ -52,7 +51,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.0</version>
+                <version>2.2.4</version>
                 <configuration>
                     <failOnNoGitDirectory>false</failOnNoGitDirectory>
                 </configuration>