diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 339a92aa..51348fa5 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,6 +2,24 @@
   <code_scheme name="Project" version="173">
     <option name="RIGHT_MARGIN" value="100" />
     <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <ScalaCodeStyleSettings>
       <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
     </ScalaCodeStyleSettings>
diff --git a/api/pom.xml b/api/pom.xml
index 6298e853..6aab86bc 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>common</artifactId>
-            <version>${geyser-version}</version>
+            <version>${geyser.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
diff --git a/api/src/main/java/org/geysermc/floodgate/api/FloodgateApi.java b/api/src/main/java/org/geysermc/floodgate/api/FloodgateApi.java
index ad194b20..36cda767 100644
--- a/api/src/main/java/org/geysermc/floodgate/api/FloodgateApi.java
+++ b/api/src/main/java/org/geysermc/floodgate/api/FloodgateApi.java
@@ -75,7 +75,6 @@ public interface FloodgateApi {
 
     /**
      * Returns the Floodgate API instance.
-     * This method is equal to running {@link InstanceHolder#getInstance()}
      */
     static FloodgateApi getInstance() {
         return InstanceHolder.getInstance();
diff --git a/api/src/main/java/org/geysermc/floodgate/api/InstanceHolder.java b/api/src/main/java/org/geysermc/floodgate/api/InstanceHolder.java
index 56f89f05..260c226a 100644
--- a/api/src/main/java/org/geysermc/floodgate/api/InstanceHolder.java
+++ b/api/src/main/java/org/geysermc/floodgate/api/InstanceHolder.java
@@ -27,6 +27,7 @@
 package org.geysermc.floodgate.api;
 
 import lombok.Getter;
+import org.geysermc.floodgate.api.inject.PlatformInjector;
 import org.geysermc.floodgate.api.link.PlayerLink;
 
 import java.util.UUID;
@@ -34,9 +35,11 @@ import java.util.UUID;
 public final class InstanceHolder {
     @Getter private static FloodgateApi instance;
     @Getter private static PlayerLink playerLink;
+    @Getter private static PlatformInjector injector;
     private static UUID key;
 
-    public static boolean setInstance(FloodgateApi floodgateApi, PlayerLink link, UUID key) {
+    public static boolean setInstance(FloodgateApi floodgateApi, PlayerLink link,
+                                      PlatformInjector platformInjector, UUID key) {
         if (instance == null) {
             InstanceHolder.key = key;
         } else if (!InstanceHolder.key.equals(key)) {
@@ -44,6 +47,7 @@ public final class InstanceHolder {
         }
         instance = floodgateApi;
         playerLink = link;
+        injector = platformInjector;
         return true;
     }
 
diff --git a/api/src/main/java/org/geysermc/floodgate/api/logger/FloodgateLogger.java b/api/src/main/java/org/geysermc/floodgate/api/logger/FloodgateLogger.java
index fbd21ebf..7fc35017 100644
--- a/api/src/main/java/org/geysermc/floodgate/api/logger/FloodgateLogger.java
+++ b/api/src/main/java/org/geysermc/floodgate/api/logger/FloodgateLogger.java
@@ -77,4 +77,16 @@ public interface FloodgateLogger {
      * @param args    the arguments to fill the missing spots in the message
      */
     void trace(String message, Object... args);
+
+    /**
+     * Enables debug mode for the Floodgate logger.
+     */
+    void enableDebug();
+
+    /**
+     * Disables debug mode for the Floodgate logger.
+     * Debug messages can still be sent after running this method,
+     * but they will be hidden from the console.
+     */
+    void disableDebug();
 }
diff --git a/api/src/main/java/org/geysermc/floodgate/api/player/FloodgatePlayer.java b/api/src/main/java/org/geysermc/floodgate/api/player/FloodgatePlayer.java
index 09826b88..031be4ef 100644
--- a/api/src/main/java/org/geysermc/floodgate/api/player/FloodgatePlayer.java
+++ b/api/src/main/java/org/geysermc/floodgate/api/player/FloodgatePlayer.java
@@ -42,7 +42,8 @@ public interface FloodgatePlayer {
 
     /**
      * Returns the real username of the Bedrock client.
-     * No prefix nor shortened nor replaced spaces.
+     * This username doesn't have a prefix, spaces aren't replaced and the username hasn't been
+     * shortened.
      */
     String getUsername();
 
@@ -52,7 +53,7 @@ public interface FloodgatePlayer {
     String getXuid();
 
     /**
-     * Returns the Operation System of the Bedrock client
+     * Returns the Operating System of the Bedrock client
      */
     DeviceOs getDeviceOs();
 
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 43b8b651..00dbdc67 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -22,20 +22,24 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>${bungee-version}</version>
+            <version>${bungee.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-protocol</artifactId>
-            <version>${bungee-version}</version>
+            <version>${bungee.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.geysermc.floodgate</groupId>
             <artifactId>common</artifactId>
             <version>${project.version}</version>
-            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.27.0-GA</version>
         </dependency>
     </dependencies>
 
diff --git a/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java b/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java
index c022d4d1..3fb1cd7f 100644
--- a/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java
+++ b/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java
@@ -30,14 +30,14 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.geysermc.floodgate.module.*;
-import org.geysermc.floodgate.util.ReflectionUtil;
+import org.geysermc.floodgate.util.ReflectionUtils;
 
 public final class BungeePlugin extends Plugin {
     private FloodgatePlatform platform;
 
     @Override
     public void onLoad() {
-        ReflectionUtil.setPrefix("net.md_5.bungee");
+        ReflectionUtils.setPrefix("net.md_5.bungee");
 
         long ctm = System.currentTimeMillis();
         Injector injector = Guice.createInjector(
@@ -45,12 +45,12 @@ public final class BungeePlugin extends Plugin {
                 new BungeePlatformModule(this)
         );
 
-        long endCtm = System.currentTimeMillis();
-        getLogger().info("Took " + (endCtm - ctm) + "ms to boot Floodgate");
-
         // Bungeecord doesn't have a build-in function to disable plugins,
         // so there is no need to have a custom Platform class like Spigot
         platform = injector.getInstance(FloodgatePlatform.class);
+
+        long endCtm = System.currentTimeMillis();
+        getLogger().info("Took " + (endCtm - ctm) + "ms to boot Floodgate");
     }
 
     @Override
diff --git a/bungee/src/main/java/org/geysermc/floodgate/handler/BungeeDataHandler.java b/bungee/src/main/java/org/geysermc/floodgate/handler/BungeeDataHandler.java
index 975420ba..f09cd3b6 100644
--- a/bungee/src/main/java/org/geysermc/floodgate/handler/BungeeDataHandler.java
+++ b/bungee/src/main/java/org/geysermc/floodgate/handler/BungeeDataHandler.java
@@ -26,9 +26,10 @@
 
 package org.geysermc.floodgate.handler;
 
+import io.netty.channel.Channel;
+import io.netty.util.AttributeKey;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PreLoginEvent;
-import net.md_5.bungee.api.event.ServerConnectEvent;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.protocol.packet.Handshake;
 import org.geysermc.floodgate.HandshakeHandler;
@@ -38,20 +39,20 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
 import org.geysermc.floodgate.util.BedrockData;
-import org.geysermc.floodgate.util.ReflectionUtil;
+import org.geysermc.floodgate.util.ReflectionUtils;
 
 import java.lang.reflect.Field;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.geysermc.floodgate.HandshakeHandler.*;
-import static org.geysermc.floodgate.util.BedrockData.FLOODGATE_IDENTIFIER;
+import static org.geysermc.floodgate.HandshakeHandler.ResultType;
 
 public final class BungeeDataHandler {
     private static final Field EXTRA_HANDSHAKE_DATA;
     private static final Field PLAYER_NAME;
     private static final Field PLAYER_CHANNEL_WRAPPER;
+    private static final Field PLAYER_CHANNEL;
     private static final Field PLAYER_REMOTE_ADDRESS;
     private static final Field CACHED_HANDSHAKE_PACKET;
 
@@ -59,28 +60,30 @@ public final class BungeeDataHandler {
     private final ProxyFloodgateConfig config;
     private final ProxyFloodgateApi api;
     private final HandshakeHandler handler;
+    private final AttributeKey<FloodgatePlayer> playerAttribute;
     private final FloodgateLogger logger;
 
-    public BungeeDataHandler(Plugin plugin, ProxyFloodgateConfig config, ProxyFloodgateApi api,
-                             HandshakeHandler handshakeHandler, FloodgateLogger logger) {
+    public BungeeDataHandler(Plugin plugin, ProxyFloodgateConfig config,
+                             ProxyFloodgateApi api, HandshakeHandler handshakeHandler,
+                             AttributeKey<FloodgatePlayer> playerAttribute,
+                             FloodgateLogger logger) {
         this.plugin = plugin;
         this.config = config;
         this.handler = handshakeHandler;
         this.api = api;
+        this.playerAttribute = playerAttribute;
         this.logger = logger;
     }
 
-    public void handle(PreLoginEvent event) {
+    public void handlePreLogin(PreLoginEvent event) {
         event.registerIntent(plugin);
         plugin.getProxy().getScheduler().runAsync(plugin, () -> {
-            String extraData = ReflectionUtil.getCastedValue(
+            String extraData = ReflectionUtils.getCastedValue(
                     event.getConnection(), EXTRA_HANDSHAKE_DATA
             );
 
             HandshakeResult result = handler.handle(extraData);
             switch (result.getResultType()) {
-                case SUCCESS:
-                    break;
                 case EXCEPTION:
                     event.setCancelReason(config.getMessages().getInvalidKey());
                     break;
@@ -99,23 +102,23 @@ public final class BungeeDataHandler {
             }
 
             FloodgatePlayer player = result.getFloodgatePlayer();
-            api.addEncryptedData(
-                    player.getCorrectUniqueId(),
-                    result.getHandshakeData()[2] + '\0' + result.getHandshakeData()[3]
-            );
+            api.addEncryptedData(player.getCorrectUniqueId(), result.getHandshakeData()[1]);
 
             event.getConnection().setOnlineMode(false);
             event.getConnection().setUniqueId(player.getCorrectUniqueId());
 
-            ReflectionUtil.setValue(
+            ReflectionUtils.setValue(
                     event.getConnection(), PLAYER_NAME, player.getCorrectUsername()
             );
 
             Object channelWrapper =
-                    ReflectionUtil.getValue(event.getConnection(), PLAYER_CHANNEL_WRAPPER);
+                    ReflectionUtils.getValue(event.getConnection(), PLAYER_CHANNEL_WRAPPER);
 
             SocketAddress remoteAddress =
-                    ReflectionUtil.getCastedValue(channelWrapper, PLAYER_REMOTE_ADDRESS);
+                    ReflectionUtils.getCastedValue(channelWrapper, PLAYER_REMOTE_ADDRESS);
+
+            Channel channel = ReflectionUtils.getCastedValue(channelWrapper, PLAYER_CHANNEL);
+            channel.attr(playerAttribute).set(player);
 
             if (!(remoteAddress instanceof InetSocketAddress)) {
                 logger.info("Player {} doesn't use an InetSocketAddress. " +
@@ -124,7 +127,7 @@ public final class BungeeDataHandler {
                 );
             } else {
                 int port = ((InetSocketAddress) remoteAddress).getPort();
-                ReflectionUtil.setValue(
+                ReflectionUtils.setValue(
                         channelWrapper, PLAYER_REMOTE_ADDRESS,
                         new InetSocketAddress(result.getBedrockData().getIp(), port)
                 );
@@ -133,42 +136,42 @@ public final class BungeeDataHandler {
         });
     }
 
-    public void handle(ServerConnectEvent event) {
-        ProxiedPlayer player = event.getPlayer();
+    public void handleServerConnect(ProxiedPlayer player) {
         // Passes the information through to the connecting server if enabled
         if (config.isSendFloodgateData() && api.isBedrockPlayer(player.getUniqueId())) {
-            Handshake handshake = ReflectionUtil.getCastedValue(
+            Handshake handshake = ReflectionUtils.getCastedValue(
                     player.getPendingConnection(), CACHED_HANDSHAKE_PACKET
             );
 
             // Ensures that only the hostname remains,
             // this way it can't mess up the Floodgate data format
             String initialHostname = handshake.getHost().split("\0")[0];
-            handshake.setHost(initialHostname + '\0' + FLOODGATE_IDENTIFIER + '\0' +
-                    api.getEncryptedData(player.getUniqueId())
-            );
+            handshake.setHost(initialHostname + '\0' + api.getEncryptedData(player.getUniqueId()));
 
             // Bungeecord will add his data after our data
         }
     }
 
     static {
-        Class<?> initialHandler = ReflectionUtil.getPrefixedClass("connection.InitialHandler");
-        EXTRA_HANDSHAKE_DATA = ReflectionUtil.getField(initialHandler, "extraDataInHandshake");
+        Class<?> initialHandler = ReflectionUtils.getPrefixedClass("connection.InitialHandler");
+        EXTRA_HANDSHAKE_DATA = ReflectionUtils.getField(initialHandler, "extraDataInHandshake");
         checkNotNull(EXTRA_HANDSHAKE_DATA, "extraDataInHandshake field cannot be null");
 
-        PLAYER_NAME = ReflectionUtil.getField(initialHandler, "name");
+        PLAYER_NAME = ReflectionUtils.getField(initialHandler, "name");
         checkNotNull(PLAYER_NAME, "Initial name field cannot be null");
 
-        Class<?> channelWrapper = ReflectionUtil.getPrefixedClass("netty.ChannelWrapper");
-        PLAYER_CHANNEL_WRAPPER = ReflectionUtil.getFieldOfType(initialHandler, channelWrapper);
+        Class<?> channelWrapper = ReflectionUtils.getPrefixedClass("netty.ChannelWrapper");
+        PLAYER_CHANNEL_WRAPPER = ReflectionUtils.getFieldOfType(initialHandler, channelWrapper);
         checkNotNull(PLAYER_CHANNEL_WRAPPER, "ChannelWrapper field cannot be null");
 
-        PLAYER_REMOTE_ADDRESS = ReflectionUtil.getFieldOfType(channelWrapper, SocketAddress.class);
+        PLAYER_CHANNEL = ReflectionUtils.getFieldOfType(channelWrapper, Channel.class);
+        checkNotNull(PLAYER_CHANNEL, "Channel field cannot be null");
+
+        PLAYER_REMOTE_ADDRESS = ReflectionUtils.getFieldOfType(channelWrapper, SocketAddress.class);
         checkNotNull(PLAYER_REMOTE_ADDRESS, "Remote address field cannot be null");
 
-        Class<?> handshakePacket = ReflectionUtil.getPrefixedClass("protocol.packet.Handshake");
-        CACHED_HANDSHAKE_PACKET = ReflectionUtil.getFieldOfType(initialHandler, handshakePacket);
+        Class<?> handshakePacket = ReflectionUtils.getPrefixedClass("protocol.packet.Handshake");
+        CACHED_HANDSHAKE_PACKET = ReflectionUtils.getFieldOfType(initialHandler, handshakePacket);
         checkNotNull(CACHED_HANDSHAKE_PACKET, "Cached handshake packet field cannot be null");
     }
 }
diff --git a/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java b/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java
index 4c408bf5..1842fac4 100644
--- a/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java
+++ b/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java
@@ -27,23 +27,15 @@
 package org.geysermc.floodgate.inject.bungee;
 
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInitializer;
-import lombok.AllArgsConstructor;
+import javassist.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import net.md_5.bungee.protocol.MinecraftEncoder;
-import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.inject.CommonPlatformInjector;
-import org.geysermc.floodgate.util.ReflectionUtil;
+import org.geysermc.floodgate.util.ReflectionUtils;
 
 import javax.naming.OperationNotSupportedException;
-import java.lang.reflect.Field;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.nio.channels.ServerSocketChannel;
+import java.util.function.Consumer;
 
 @RequiredArgsConstructor
 public final class BungeeInjector extends CommonPlatformInjector {
@@ -53,14 +45,45 @@ public final class BungeeInjector extends CommonPlatformInjector {
 
     @Override
     public boolean inject() {
-        Class<?> pipelineUtils = ReflectionUtil.getPrefixedClass("netty.PipelineUtils");
-        Field framePrepender = ReflectionUtil.getField(pipelineUtils, "framePrepender");
-        Object customPrepender = new CustomVarint21LengthFieldPrepender(this, logger);
+        try {
+            // short version: needed a reliable way to access the encoder and decoder before the
+            // handshake packet.
 
-        ReflectionUtil.setFinalValue(null, framePrepender, customPrepender);
+            ClassPool classPool = ClassPool.getDefault();
 
-        injected = true;
-        return true;
+            CtClass handlerBossClass = classPool.get("net.md_5.bungee.netty.HandlerBoss");
+
+            // create a new field that we can access
+            CtField channelConsumerField = new CtField(
+                    classPool.get("java.util.function.Consumer"), "channelConsumer", handlerBossClass
+            );
+            channelConsumerField.setModifiers(Modifier.PUBLIC | Modifier.STATIC);
+            handlerBossClass.addField(channelConsumerField);
+
+            // edit a method to call the new field when we need it
+            CtMethod channelActiveMethod = handlerBossClass.getMethod(
+                    "channelActive", "(Lio/netty/channel/ChannelHandlerContext;)V");
+            channelActiveMethod.insertBefore("" +
+                    "{if (handler != null) {channelConsumer.accept(ctx.channel());}}");
+
+            Class<?> clazz = handlerBossClass.toClass();
+
+            Consumer<Channel> channelConsumer = channel ->
+                    injectClient(channel, channel.parent() != null);
+
+            // set the field we just made
+            ReflectionUtils.setValue(
+                    null,
+                    ReflectionUtils.getField(clazz, "channelConsumer"),
+                    channelConsumer
+            );
+
+            injected = true;
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
     @Override
@@ -70,74 +93,9 @@ public final class BungeeInjector extends CommonPlatformInjector {
                 "Floodgate cannot remove the Bungee injection at the moment");
     }
 
-    public void injectClient(Channel channel) {
-        boolean clientToProxy = channel.parent() instanceof ServerSocketChannel;
+    public void injectClient(Channel channel, boolean clientToProxy) {
         logger.info("Client to proxy? " + clientToProxy);
-
-        channel.pipeline().addLast(new ChannelInitializer<Channel>() {
-            @Override
-            protected void initChannel(Channel channel) {
-                injectAddonsCall(channel, !clientToProxy);
-                addInjectedClient(channel);
-            }
-        });
-    }
-
-    @AllArgsConstructor
-    @ChannelHandler.Sharable
-    private static class CustomVarint21LengthFieldPrepender extends Varint21LengthFieldPrepender {
-        private final BungeeInjector injector;
-        private final FloodgateLogger logger;
-
-        @Override
-        public void handlerAdded(ChannelHandlerContext ctx) {
-            // we're getting called before the encoder and decoder are added,
-            // so we have to wait a little, so we have a nice while loop here :D
-            //todo look if we can make this nicer
-            ctx.executor().execute(() -> {
-                logger.debug("Channel: {} {} {}",
-                        ctx.channel().isActive(),
-                        ctx.channel().isOpen(),
-                        ctx.channel().isRegistered()
-                );
-
-                long ctm = System.currentTimeMillis();
-                while (ctx.channel().isOpen()) {
-                    logger.debug("Trying to find decoder for {} {}",
-                            getHostString(ctx, true),
-                            getParentName(ctx, true)
-                    );
-
-                    if (ctx.channel().pipeline().get(MinecraftEncoder.class) != null) {
-                        logger.debug("Found decoder for {}",
-                                getHostString(ctx, true)
-                        );
-
-                        injector.injectClient(ctx.channel());
-                        break;
-                    }
-
-                    if (System.currentTimeMillis() - ctm > 3000) {
-                        logger.error("Failed to find decoder for client after 3 seconds!");
-                    }
-                }
-            });
-        }
-    }
-
-    public static String getHostString(ChannelHandlerContext ctx, boolean alwaysString) {
-        SocketAddress address = ctx.channel().remoteAddress();
-        if (address != null) {
-            return ((InetSocketAddress) address).getHostString();
-        }
-        return alwaysString ? "null" : null;
-    }
-
-    public static String getParentName(ChannelHandlerContext ctx, boolean alwaysString) {
-        Channel parent = ctx.channel().parent();
-        if (parent != null) {
-            return parent.getClass().getSimpleName();
-        }
-        return alwaysString ? "null" : null;
+        injectAddonsCall(channel, !clientToProxy);
+        addInjectedClient(channel);
     }
 }
diff --git a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java
index 2af73209..61faa986 100644
--- a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java
+++ b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java
@@ -1,5 +1,6 @@
 package org.geysermc.floodgate.listener;
 
+import io.netty.util.AttributeKey;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.LoginEvent;
 import net.md_5.bungee.api.event.PlayerDisconnectEvent;
@@ -24,21 +25,24 @@ public final class BungeeListener implements Listener {
     private final ProxyFloodgateApi api;
     private final FloodgateLogger logger;
 
-    public BungeeListener(Plugin plugin, ProxyFloodgateConfig config, ProxyFloodgateApi api,
-                          HandshakeHandler handshakeHandler, FloodgateLogger logger) {
-        this.dataHandler = new BungeeDataHandler(plugin, config, api, handshakeHandler, logger);
+    public BungeeListener(Plugin plugin, ProxyFloodgateConfig config,
+                          ProxyFloodgateApi api, HandshakeHandler handshakeHandler,
+                          AttributeKey<FloodgatePlayer> playerAttribute, FloodgateLogger logger) {
+        this.dataHandler = new BungeeDataHandler(
+                plugin, config, api, handshakeHandler, playerAttribute, logger
+        );
         this.api = api;
         this.logger = logger;
     }
 
     @EventHandler(priority = EventPriority.LOW)
     public void onServerConnect(ServerConnectEvent event) {
-        dataHandler.handle(event);
+        dataHandler.handleServerConnect(event.getPlayer());
     }
 
     @EventHandler(priority = EventPriority.LOW)
     public void onPreLogin(PreLoginEvent event) {
-        dataHandler.handle(event);
+        dataHandler.handlePreLogin(event);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
@@ -54,7 +58,6 @@ public final class BungeeListener implements Listener {
         // he has been disconnected by now
         UUID uniqueId = event.getConnection().getUniqueId();
         FloodgatePlayer player = api.getPlayer(uniqueId);
-        logger.info("Login" + (player != null) + " " + uniqueId);
         if (player != null) {
             player.as(FloodgatePlayerImpl.class).setLogin(false);
             logger.info("Floodgate player who is logged in as {} {} joined",
@@ -64,7 +67,6 @@ public final class BungeeListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onLoginMonitor(LoginEvent event) {
-        logger.info("LoginMonitor" + event.isCancelled());
         if (event.isCancelled()) {
             api.removePlayer(event.getConnection().getUniqueId());
         }
@@ -73,14 +75,12 @@ public final class BungeeListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerDisconnect(PlayerDisconnectEvent event) {
         ProxiedPlayer player = event.getPlayer();
-        FloodgatePlayer fPlayer;
-        if ((fPlayer = api.removePlayer(player.getUniqueId())) != null) {
+        if (api.removePlayer(player.getUniqueId()) != null) {
             api.removeEncryptedData(player.getUniqueId());
             logger.info(
                     "Floodgate player who was logged in as {} {} disconnected",
                     player.getName(), player.getUniqueId()
             );
         }
-        logger.info("Disconnected " + fPlayer);
     }
 }
diff --git a/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java b/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java
index 2d58dd4e..66cb26bb 100644
--- a/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java
+++ b/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java
@@ -30,15 +30,19 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import com.google.inject.multibindings.ProvidesIntoSet;
+import io.netty.util.AttributeKey;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.geysermc.floodgate.HandshakeHandler;
 import org.geysermc.floodgate.api.ProxyFloodgateApi;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
+import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
 import org.geysermc.floodgate.listener.BungeeListener;
 import org.geysermc.floodgate.register.ListenerRegister;
 
+import javax.inject.Named;
+
 public final class BungeeListenerModule extends AbstractModule {
     @Override
     protected void configure() {
@@ -49,7 +53,8 @@ public final class BungeeListenerModule extends AbstractModule {
     @ProvidesIntoSet
     public Listener bungeeListener(Plugin plugin, ProxyFloodgateConfig config,
                                    ProxyFloodgateApi api, HandshakeHandler handshakeHandler,
+                                   @Named("playerAttribute") AttributeKey<FloodgatePlayer> playerAttribute,
                                    FloodgateLogger logger) {
-        return new BungeeListener(plugin, config, api, handshakeHandler, logger);
+        return new BungeeListener(plugin, config, api, handshakeHandler, playerAttribute, logger);
     }
 }
diff --git a/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java b/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java
index 5ceb1f8d..0c068cc4 100644
--- a/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java
+++ b/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java
@@ -40,10 +40,11 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.command.BungeeCommandRegistration;
 import org.geysermc.floodgate.config.FloodgateConfig;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
+import org.geysermc.floodgate.crypto.FloodgateCipher;
 import org.geysermc.floodgate.inject.CommonPlatformInjector;
 import org.geysermc.floodgate.inject.bungee.BungeeInjector;
 import org.geysermc.floodgate.listener.BungeeListenerRegistration;
-import org.geysermc.floodgate.logger.JavaDefaultFloodgateLogger;
+import org.geysermc.floodgate.logger.JavaUtilFloodgateLogger;
 import org.geysermc.floodgate.platform.command.CommandRegistration;
 import org.geysermc.floodgate.platform.command.util.CommandUtil;
 import org.geysermc.floodgate.platform.listener.ListenerRegistration;
@@ -73,14 +74,14 @@ public final class BungeePlatformModule extends AbstractModule {
 
     @Provides
     @Singleton
-    public ProxyFloodgateApi proxyFloodgateApi() {
-        return new ProxyFloodgateApi();
+    public ProxyFloodgateApi proxyFloodgateApi(FloodgateCipher cipher) {
+        return new ProxyFloodgateApi(cipher);
     }
 
     @Provides
     @Singleton
     public FloodgateLogger floodgateLogger() {
-        return new JavaDefaultFloodgateLogger(plugin.getLogger());
+        return new JavaUtilFloodgateLogger(plugin.getLogger());
     }
 
     /*
diff --git a/common/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java b/common/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
index 569b8b2a..9f7ecf6d 100644
--- a/common/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
+++ b/common/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
@@ -50,11 +50,9 @@ import java.util.UUID;
 public class FloodgatePlatform {
     private static final UUID KEY = UUID.randomUUID();
 
-    @Getter(AccessLevel.PROTECTED)
     private final FloodgateConfig config;
     private final FloodgateApi api;
 
-    @Getter(AccessLevel.PROTECTED)
     private final FloodgateLogger logger;
 
     private final Injector guice;
@@ -65,7 +63,7 @@ public class FloodgatePlatform {
     public FloodgatePlatform(@Named("dataDirectory") Path dataDirectory, FloodgateApi api,
                              ConfigLoader configLoader, PlayerLinkLoader playerLinkLoader,
                              HandshakeHandler handshakeHandler, FloodgateLogger logger,
-                             Injector injector) {
+                             PlatformInjector platformInjector, Injector injector) {
         this.api = api;
         this.logger = logger;
 
@@ -79,35 +77,38 @@ public class FloodgatePlatform {
         }
 
         config = configLoader.load();
+        if (config.isDebug()) {
+            logger.enableDebug();
+        }
 
         // make the config available for other classes
-        guice = injector.createChildInjector(new ConfigLoadedModule(config, api));
+        guice = injector.createChildInjector(new ConfigLoadedModule(config));
 
         guice.injectMembers(playerLinkLoader);
         guice.injectMembers(handshakeHandler);
 
         PlayerLink link = playerLinkLoader.load();
 
-        InstanceHolder.setInstance(api, link, KEY);
+        InstanceHolder.setInstance(api, link, platformInjector, KEY);
     }
 
-    public boolean enable(Module... postCreateModules) {
+    public boolean enable(Module... postInitializeModules) {
         if (injector == null) {
-            getLogger().error("Failed to find the platform injector!");
+            logger.error("Failed to find the platform injector!");
             return false;
         }
 
         try {
             if (!injector.inject()) {
-                getLogger().error("Failed to inject the packet listener!");
+                logger.error("Failed to inject the packet listener!");
                 return false;
             }
         } catch (Exception exception) {
-            getLogger().error("Failed to inject the packet listener!", exception);
+            logger.error("Failed to inject the packet listener!", exception);
             return false;
         }
 
-        guice.createChildInjector(new PostInitializeModule(postCreateModules));
+        guice.createChildInjector(new PostInitializeModule(postInitializeModules));
         return true;
     }
 
@@ -115,10 +116,10 @@ public class FloodgatePlatform {
         if (injector != null) {
             try {
                 if (!injector.removeInjection()) {
-                    getLogger().error("Failed to remove the injection!");
+                    logger.error("Failed to remove the injection!");
                 }
             } catch (Exception exception) {
-                getLogger().error("Failed to remove the injection!", exception);
+                logger.error("Failed to remove the injection!", exception);
             }
         }
 
diff --git a/common/src/main/java/org/geysermc/floodgate/FloodgatePlayerImpl.java b/common/src/main/java/org/geysermc/floodgate/FloodgatePlayerImpl.java
index c4e3ab51..dcc28cad 100644
--- a/common/src/main/java/org/geysermc/floodgate/FloodgatePlayerImpl.java
+++ b/common/src/main/java/org/geysermc/floodgate/FloodgatePlayerImpl.java
@@ -87,12 +87,12 @@ public final class FloodgatePlayerImpl implements FloodgatePlayer {
             return;
         }
 
-        // every implementation (Bukkit, Bungee and Velocity) run this constructor async, so we
-        // should be fine doing this synchronised.
+        // every implementation (Bukkit, Bungee and Velocity) run this constructor async,
+        // so we should be fine doing this synchronised.
         linkedPlayer = fetchLinkedPlayer(api.getPlayerLink());
 
+        // oh oh, now our encrypted data is incorrect. We have to update it...
         if (linkedPlayer != null && api instanceof ProxyFloodgateApi) {
-            // oh oh, now our encrypted data is incorrect. Updating...
             InstanceHolder.castApi(ProxyFloodgateApi.class)
                     .updateEncryptedData(getCorrectUniqueId(), toBedrockData());
         }
@@ -114,7 +114,10 @@ public final class FloodgatePlayerImpl implements FloodgatePlayer {
      * @see #fetchLinkedPlayerAsync(PlayerLink) for the asynchronously alternative
      */
     public LinkedPlayer fetchLinkedPlayer(PlayerLink link) {
-        if (!link.isEnabledAndAllowed()) return null;
+        if (!link.isEnabledAndAllowed()) {
+            return null;
+        }
+
         try {
             return link.getLinkedPlayer(javaUniqueId).get();
         } catch (InterruptedException | ExecutionException exception) {
diff --git a/common/src/main/java/org/geysermc/floodgate/HandshakeHandler.java b/common/src/main/java/org/geysermc/floodgate/HandshakeHandler.java
index 081df282..ba13d1fe 100644
--- a/common/src/main/java/org/geysermc/floodgate/HandshakeHandler.java
+++ b/common/src/main/java/org/geysermc/floodgate/HandshakeHandler.java
@@ -31,24 +31,18 @@ import lombok.*;
 import org.geysermc.floodgate.api.SimpleFloodgateApi;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.config.FloodgateConfig;
+import org.geysermc.floodgate.crypto.FloodgateCipher;
 import org.geysermc.floodgate.util.BedrockData;
-import org.geysermc.floodgate.util.EncryptionUtil;
+import org.geysermc.floodgate.util.InvalidHeaderException;
 
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
+import java.util.Base64;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static org.geysermc.floodgate.util.BedrockData.EXPECTED_LENGTH;
-import static org.geysermc.floodgate.util.BedrockData.FLOODGATE_IDENTIFIER;
 
 @RequiredArgsConstructor
 public final class HandshakeHandler {
     private final SimpleFloodgateApi api;
-    private PrivateKey privateKey;
+    private final FloodgateCipher cipher;
     private boolean proxy;
 
     private String usernamePrefix;
@@ -56,8 +50,6 @@ public final class HandshakeHandler {
 
     @Inject
     public void init(FloodgateConfig config) {
-        this.privateKey = config.getPrivateKey();
-        checkNotNull(privateKey, "Floodgate key cannot be null");
         this.proxy = config.isProxy();
         this.usernamePrefix = config.getUsernamePrefix();
         this.replaceSpaces = config.isReplaceSpaces();
@@ -66,16 +58,19 @@ public final class HandshakeHandler {
     public HandshakeResult handle(@NonNull String handshakeData) {
         try {
             String[] data = handshakeData.split("\0");
-            boolean isBungeeData = data.length == 6 || data.length == 7;
 
-            if (proxy && isBungeeData || !isBungeeData && data.length != 4
-                    || !data[1].equals(FLOODGATE_IDENTIFIER)) {
+            boolean isBungeeData = data.length == 5;
+            // this can be Bungee data (without skin) or Floodgate data
+            if (data.length == 4) {
+                isBungeeData = FloodgateCipher.hasHeader(data[3]);
+            }
+
+            if (proxy && isBungeeData || !isBungeeData && data.length != 2) {
                 return ResultType.NOT_FLOODGATE_DATA.getCachedResult();
             }
 
-            BedrockData bedrockData = EncryptionUtil.decryptBedrockData(
-                    privateKey, data[2] + '\0' + data[3]
-            );
+            String decrypted = cipher.decryptToString(Base64.getDecoder().decode(data[1]));
+            BedrockData bedrockData = BedrockData.fromString(decrypted);
 
             if (bedrockData.getDataLength() != EXPECTED_LENGTH) {
                 return ResultType.INVALID_DATA_LENGTH.getCachedResult();
@@ -86,9 +81,11 @@ public final class HandshakeHandler {
             api.addPlayer(player.getJavaUniqueId(), player);
 
             return new HandshakeResult(ResultType.SUCCESS, data, bedrockData, player);
-        } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException |
-                IllegalBlockSizeException | BadPaddingException exception) {
+        } catch (InvalidHeaderException headerException) {
+            return ResultType.NOT_FLOODGATE_DATA.getCachedResult();
+        } catch (Exception exception) {
             exception.printStackTrace();
+            System.out.println(handshakeData);
             return ResultType.EXCEPTION.getCachedResult();
         }
     }
@@ -100,6 +97,10 @@ public final class HandshakeHandler {
         private final String[] handshakeData;
         private final BedrockData bedrockData;
         private final FloodgatePlayer floodgatePlayer;
+
+        public boolean isBungeeData() {
+            return handshakeData.length == 4 || handshakeData.length == 5;
+        }
     }
 
     public enum ResultType {
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java b/common/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java
index 3258a7e0..87b60cca 100644
--- a/common/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java
+++ b/common/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java
@@ -28,6 +28,7 @@ package org.geysermc.floodgate.addon;
 
 import com.google.inject.Inject;
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
 import org.geysermc.floodgate.addon.addonmanager.AddonManagerHandler;
 import org.geysermc.floodgate.api.inject.InjectorAddon;
 import org.geysermc.floodgate.inject.CommonPlatformInjector;
@@ -37,19 +38,20 @@ public final class AddonManagerAddon implements InjectorAddon {
 
     @Override
     public void onInject(Channel channel, boolean proxyToServer) {
-        channel.pipeline().addLast(
-                "floodgate_addon", new AddonManagerHandler(injector, channel)
-        );
+        channel.pipeline().addLast("floodgate_addon", new AddonManagerHandler(injector, channel));
     }
 
     @Override
     public void onLoginDone(Channel channel) {
-        onRemoveInject(channel);
+        // AddonManagerHandler is also responsible for removing the addons when the channel closes
     }
 
     @Override
     public void onRemoveInject(Channel channel) {
-        channel.pipeline().remove("floodgate_addon");
+        ChannelHandler handler = channel.pipeline().get("floodgate_addon");
+        if (handler != null) {
+            channel.pipeline().remove(handler);
+        }
     }
 
     @Override
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java b/common/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java
index 09f67325..1881c93b 100644
--- a/common/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java
+++ b/common/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java
@@ -53,7 +53,6 @@ public final class DebugAddon implements InjectorAddon {
 
     @Override
     public void onInject(Channel channel, boolean proxyToServer) {
-        //todo enable debug mode in our logger
         channel.pipeline().addBefore(
                 packetEncoder, "floodgate_debug_out",
                 new ChannelOutDebugHandler(implementationName, !proxyToServer, logger)
@@ -76,7 +75,6 @@ public final class DebugAddon implements InjectorAddon {
 
     @Override
     public boolean shouldInject() {
-        logger.info("Is debug? " + config.isDebug());
         return config.isDebug();
     }
 }
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/addonmanager/AddonManagerHandler.java b/common/src/main/java/org/geysermc/floodgate/addon/addonmanager/AddonManagerHandler.java
index f18ced16..aecb5876 100644
--- a/common/src/main/java/org/geysermc/floodgate/addon/addonmanager/AddonManagerHandler.java
+++ b/common/src/main/java/org/geysermc/floodgate/addon/addonmanager/AddonManagerHandler.java
@@ -38,18 +38,32 @@ public final class AddonManagerHandler extends MessageToByteEncoder<ByteBuf> {
     private final CommonPlatformInjector injector;
     private final Channel channel;
 
+    private boolean loggedIn;
+    private boolean removed;
+
     @Override
     public void handlerRemoved(ChannelHandlerContext ctx) {
-        injector.removeAddonsCall(channel);
+        // without this check, addons will be removed twice
+        if (!removed) {
+            removed = true;
+            injector.removeAddonsCall(channel);
+        }
     }
 
     @Override
     protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out) {
+        if (loggedIn) {
+            out.writeBytes(msg);
+            return;
+        }
+
         int index = msg.readerIndex();
         // LoginSuccess packet = 2
         if (readVarInt(msg) == 2) {
+            loggedIn = true;
             injector.loginSuccessCall(channel);
         }
+
         msg.readerIndex(index);
         out.writeBytes(msg);
     }
diff --git a/common/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java b/common/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java
index 1d33a986..81bb3ff6 100644
--- a/common/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java
+++ b/common/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java
@@ -26,24 +26,20 @@
 
 package org.geysermc.floodgate.api;
 
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import lombok.RequiredArgsConstructor;
+import org.geysermc.floodgate.crypto.FloodgateCipher;
 import org.geysermc.floodgate.util.BedrockData;
-import org.geysermc.floodgate.util.EncryptionUtil;
 
-import java.security.PrivateKey;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+@RequiredArgsConstructor
 public final class ProxyFloodgateApi extends SimpleFloodgateApi {
     private final Map<UUID, String> encryptedData = new HashMap<>();
-    private PrivateKey key;
-
-    @Inject
-    public void init(@Named("floodgateKey") PrivateKey key) {
-        this.key = key;
-    }
+    private final FloodgateCipher cipher;
 
     public String getEncryptedData(UUID uuid) {
         return encryptedData.get(uuid);
@@ -58,16 +54,15 @@ public final class ProxyFloodgateApi extends SimpleFloodgateApi {
     }
 
     public void updateEncryptedData(UUID uuid, BedrockData bedrockData) {
-        //todo move away from public/private key system
         try {
-            String data = EncryptionUtil.encryptBedrockData(key, bedrockData);
-            addEncryptedData(uuid, data);
+            byte[] encryptedData = cipher.encryptFromString(bedrockData.toString());
+            encryptedData = Base64.getEncoder().encode(encryptedData);
+            //todo maybe bake Base64 support into it?
+
+            addEncryptedData(uuid, new String(encryptedData, StandardCharsets.UTF_8));
         } catch (Exception exception) {
-//            throw new IllegalStateException("We failed to update the BedrockData, " +
-//                    "but we can't continue without the updated version!", exception);
-            System.out.println("We failed to update the BedrockData, " +
-                    "but we can't continue without the updated version!");
-            exception.printStackTrace();
+            throw new IllegalStateException("We failed to update the BedrockData, " +
+                    "but we can't continue without the updated version!", exception);
         }
     }
 }
diff --git a/common/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java b/common/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java
index 006dbf0e..b0dc46c3 100644
--- a/common/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java
+++ b/common/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 
-import java.security.PrivateKey;
+import java.security.Key;
 
 /**
  * The global Floodgate configuration file used in every platform.
@@ -59,7 +59,7 @@ public class FloodgateConfig {
     private boolean configVersion;
 
     @JsonIgnore
-    private PrivateKey privateKey = null;
+    private Key key = null;
 
     @Getter
     public static class DisconnectMessages {
@@ -83,9 +83,9 @@ public class FloodgateConfig {
         private boolean autoDownload;
     }
 
-    public void setPrivateKey(PrivateKey privateKey) {
-        if (this.privateKey == null) {
-            this.privateKey = privateKey;
+    public void setKey(Key key) {
+        if (this.key == null) {
+            this.key = key;
         }
     }
 
diff --git a/common/src/main/java/org/geysermc/floodgate/config/loader/ConfigLoader.java b/common/src/main/java/org/geysermc/floodgate/config/loader/ConfigLoader.java
index 38a7b1df..0347231b 100644
--- a/common/src/main/java/org/geysermc/floodgate/config/loader/ConfigLoader.java
+++ b/common/src/main/java/org/geysermc/floodgate/config/loader/ConfigLoader.java
@@ -33,17 +33,14 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.config.FloodgateConfig;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
 import org.geysermc.floodgate.config.updater.ConfigUpdater;
-import org.geysermc.floodgate.util.EncryptionUtil;
+import org.geysermc.floodgate.crypto.FloodgateCipher;
+import org.geysermc.floodgate.crypto.KeyProducer;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.spec.InvalidKeySpecException;
+import java.security.Key;
 
 @RequiredArgsConstructor
 public class ConfigLoader {
@@ -51,6 +48,9 @@ public class ConfigLoader {
     private final Class<? extends FloodgateConfig> configClass;
     private final ConfigUpdater updater;
 
+    private final KeyProducer keyProducer;
+    private final FloodgateCipher cipher;
+
     private final FloodgateLogger logger;
 
     @SuppressWarnings("unchecked")
@@ -76,21 +76,19 @@ public class ConfigLoader {
             if (newConfig) {
                 Files.copy(defaultConfigPath, configPath);
 
-                KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");
-                generator.initialize(2048);
-                KeyPair pair = generator.generateKeyPair();
+                Key key = keyProducer.produce();
+                cipher.init(key);
 
                 String test = "abcdefghijklmnopqrstuvwxyz0123456789";
-
-                String encrypted = EncryptionUtil.encrypt(pair.getPublic(), test);
-                String decrypted = new String(EncryptionUtil.decrypt(pair.getPrivate(), encrypted));
+                byte[] encrypted = cipher.encryptFromString(test);
+                String decrypted = cipher.decryptToString(encrypted);
 
                 if (!test.equals(decrypted)) {
                     logger.error("Whoops, we tested the generated Floodgate keys but " +
                             "the decrypted test message doesn't match the original.\n" +
                             "Original message: " + test + "." +
                             "Decrypted message: " + decrypted + ".\n" +
-                            "The encrypted message itself: " + encrypted
+                            "The encrypted message itself: " + new String(encrypted)
                     );
                     throw new RuntimeException(
                             "Tested the generated public and private key but, " +
@@ -98,8 +96,7 @@ public class ConfigLoader {
                     );
                 }
 
-                Files.write(dataFolder.resolve("public-key.pem"), pair.getPublic().getEncoded());
-                Files.write(dataFolder.resolve("key.pem"), pair.getPrivate().getEncoded());
+                Files.write(dataFolder.resolve("key.pem"), key.getEncoded());
             }
         } catch (Exception exception) {
             logger.error("Error while creating config", exception);
@@ -126,12 +123,12 @@ public class ConfigLoader {
         }
 
         try {
-            PrivateKey key = EncryptionUtil.getKeyFromFile(
-                    dataFolder.resolve(configInstance.getKeyFileName()), PrivateKey.class);
-            configInstance.setPrivateKey(key);
-        } catch (IOException | InvalidKeySpecException | NoSuchAlgorithmException exception) {
-            logger.error("Error while reading private key", exception);
-            throw new RuntimeException("Failed to read the private key!");
+            Key key = keyProducer.produceFrom(dataFolder.resolve(configInstance.getKeyFileName()));
+            cipher.init(key);
+            configInstance.setKey(key);
+        } catch (IOException exception) {
+            logger.error("Error while reading the key", exception);
+            throw new RuntimeException("Failed to read the key!");
         }
 
         return configInstance;
diff --git a/common/src/main/java/org/geysermc/floodgate/config/updater/ConfigUpdater.java b/common/src/main/java/org/geysermc/floodgate/config/updater/ConfigUpdater.java
index 4ffaef7b..503e92d4 100644
--- a/common/src/main/java/org/geysermc/floodgate/config/updater/ConfigUpdater.java
+++ b/common/src/main/java/org/geysermc/floodgate/config/updater/ConfigUpdater.java
@@ -78,6 +78,12 @@ public class ConfigUpdater {
             if (version == 1) {
                 return;
             }
+        } else {
+            logger.warn("You're using a pre-rewrite config file, please note that Floodgate will " +
+                    "throw an exception if you didn't already update your Floodgate key" +
+                    "(across all your servers, including Geyser)." +
+                    "We'll still try to update the config," +
+                    "but please regenerate the keys if it failed before asking for support.");
         }
 
         try {
diff --git a/common/src/main/java/org/geysermc/floodgate/logger/JavaDefaultFloodgateLogger.java b/common/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java
similarity index 82%
rename from common/src/main/java/org/geysermc/floodgate/logger/JavaDefaultFloodgateLogger.java
rename to common/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java
index f0ba377d..bb888ebf 100644
--- a/common/src/main/java/org/geysermc/floodgate/logger/JavaDefaultFloodgateLogger.java
+++ b/common/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java
@@ -26,8 +26,7 @@
 
 package org.geysermc.floodgate.logger;
 
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 
 import java.util.logging.Level;
@@ -35,10 +34,10 @@ import java.util.logging.Logger;
 
 import static org.geysermc.floodgate.util.MessageFormatter.format;
 
-@AllArgsConstructor
-@NoArgsConstructor
-public final class JavaDefaultFloodgateLogger implements FloodgateLogger {
-    private Logger logger = Logger.getLogger(LOGGER_NAME);
+@RequiredArgsConstructor
+public final class JavaUtilFloodgateLogger implements FloodgateLogger {
+    private final Logger logger;
+    private Level originLevel = null;
 
     @Override
     public void error(String message, Object... args) {
@@ -69,4 +68,17 @@ public final class JavaDefaultFloodgateLogger implements FloodgateLogger {
     public void trace(String message, Object... args) {
         logger.finer(format(message, args));
     }
+
+    @Override
+    public void enableDebug() {
+        originLevel = logger.getLevel();
+        logger.setLevel(Level.ALL);
+    }
+
+    @Override
+    public void disableDebug() {
+        if (originLevel != null) {
+            logger.setLevel(originLevel);
+        }
+    }
 }
diff --git a/common/src/main/java/org/geysermc/floodgate/module/CommonModule.java b/common/src/main/java/org/geysermc/floodgate/module/CommonModule.java
index 31149502..08af75eb 100644
--- a/common/src/main/java/org/geysermc/floodgate/module/CommonModule.java
+++ b/common/src/main/java/org/geysermc/floodgate/module/CommonModule.java
@@ -42,6 +42,10 @@ import org.geysermc.floodgate.config.FloodgateConfig;
 import org.geysermc.floodgate.config.loader.ConfigLoader;
 import org.geysermc.floodgate.config.updater.ConfigFileUpdater;
 import org.geysermc.floodgate.config.updater.ConfigUpdater;
+import org.geysermc.floodgate.crypto.AesCipher;
+import org.geysermc.floodgate.crypto.AesKeyProducer;
+import org.geysermc.floodgate.crypto.FloodgateCipher;
+import org.geysermc.floodgate.crypto.KeyProducer;
 import org.geysermc.floodgate.inject.CommonPlatformInjector;
 import org.geysermc.floodgate.link.PlayerLinkLoader;
 
@@ -59,9 +63,14 @@ public final class CommonModule extends AbstractModule {
 
     @Provides
     @Singleton
-    @Named("playerAttribute")
-    public AttributeKey<FloodgatePlayer> playerAttribute() {
-        return AttributeKey.newInstance("floodgate-player");
+    public KeyProducer keyProducer() {
+        return new AesKeyProducer();
+    }
+
+    @Provides
+    @Singleton
+    public FloodgateCipher cipher() {
+        return new AesCipher();
     }
 
     @Provides
@@ -74,8 +83,11 @@ public final class CommonModule extends AbstractModule {
     @Provides
     @Singleton
     public ConfigLoader configLoader(@Named("configClass") Class<? extends FloodgateConfig> configClass,
-                                     ConfigUpdater configUpdater, FloodgateLogger logger) {
-        return new ConfigLoader(dataDirectory, configClass, configUpdater, logger);
+                                     ConfigUpdater configUpdater, KeyProducer producer,
+                                     FloodgateCipher cipher, FloodgateLogger logger) {
+        return new ConfigLoader(
+                dataDirectory, configClass, configUpdater, producer, cipher, logger
+        );
     }
 
     @Provides
@@ -93,7 +105,14 @@ public final class CommonModule extends AbstractModule {
 
     @Provides
     @Singleton
-    public HandshakeHandler handshakeHandler(SimpleFloodgateApi api) {
-        return new HandshakeHandler(api);
+    public HandshakeHandler handshakeHandler(SimpleFloodgateApi api, FloodgateCipher cipher) {
+        return new HandshakeHandler(api, cipher);
+    }
+
+    @Provides
+    @Singleton
+    @Named("playerAttribute")
+    public AttributeKey<FloodgatePlayer> playerAttribute() {
+        return AttributeKey.newInstance("floodgate-player");
     }
 }
diff --git a/common/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java b/common/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java
index dc42e5ed..72efc717 100644
--- a/common/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java
+++ b/common/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java
@@ -29,25 +29,18 @@ package org.geysermc.floodgate.module;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
-import com.google.inject.name.Named;
 import lombok.RequiredArgsConstructor;
-import org.geysermc.floodgate.api.FloodgateApi;
 import org.geysermc.floodgate.config.FloodgateConfig;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
 
-import java.security.PrivateKey;
-
 @RequiredArgsConstructor
 public final class ConfigLoadedModule extends AbstractModule {
     private final FloodgateConfig config;
-    private final FloodgateApi api;
 
     @Override
     protected void configure() {
         if (config instanceof ProxyFloodgateConfig) {
             bind(ProxyFloodgateConfig.class).toInstance((ProxyFloodgateConfig) config);
-            // The ProxyFloodgateApi needs the floodgateKey
-            requestInjection(api);
         }
     }
 
@@ -56,11 +49,4 @@ public final class ConfigLoadedModule extends AbstractModule {
     public FloodgateConfig floodgateConfig() {
         return config;
     }
-
-    @Provides
-    @Singleton
-    @Named("floodgateKey")
-    public PrivateKey floodgateKey() {
-        return config.getPrivateKey();
-    }
 }
diff --git a/common/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java b/common/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java
index ce2813df..c9534f01 100644
--- a/common/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java
+++ b/common/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java
@@ -32,12 +32,11 @@ import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public final class PostInitializeModule extends AbstractModule {
-    private final Module[] postCreateModules;
+    private final Module[] postInitializeModules;
 
     @Override
     protected void configure() {
-        //todo move this to FloodgatePlatform itself
-        for (Module module : postCreateModules) {
+        for (Module module : postInitializeModules) {
             install(module);
         }
     }
diff --git a/common/src/main/java/org/geysermc/floodgate/util/ReflectionUtil.java b/common/src/main/java/org/geysermc/floodgate/util/ReflectionUtil.java
deleted file mode 100644
index 66aef2e8..00000000
--- a/common/src/main/java/org/geysermc/floodgate/util/ReflectionUtil.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
- *
- *  @author GeyserMC
- *  @link https://github.com/GeyserMC/Floodgate
- *
- */
-
-package org.geysermc.floodgate.util;
-
-import lombok.Setter;
-
-import java.lang.reflect.*;
-
-public final class ReflectionUtil {
-    /**
-     * Prefix without dot<br>
-     * Example net.minecraft.server.v1_8R3.PacketHandhakingInSetProtocol will become:<br>
-     *     net.minecraft.server.v1_8R3
-     */
-    @Setter private static String prefix = null;
-
-    private static Field modifiersField = null;
-
-    public static Class<?> getPrefixedClass(String className) {
-        return getClass(prefix + "." + className);
-    }
-
-    public static Class<?> getClass(String className) {
-        try {
-            return Class.forName(className);
-        } catch (ClassNotFoundException exception) {
-            exception.printStackTrace();
-            // class is not found, so we return null
-            return null;
-        }
-    }
-
-
-    public static Field getField(Class<?> clazz, String fieldName, boolean isPublic) {
-        try {
-            if (isPublic) {
-                return clazz.getField(fieldName);
-            }
-            return clazz.getDeclaredField(fieldName);
-        } catch (NoSuchFieldException exception) {
-            // field is not found, so we return null
-            return null;
-        }
-    }
-
-    public static Field getField(Class<?> clazz, String fieldName) {
-        Field field = getField(clazz, fieldName, false);
-        if (field != null) {
-            return field;
-        }
-        return getField(clazz, fieldName, true);
-    }
-
-    public static Field getFieldOfType(Class<?> clazz, Class<?> fieldType) {
-        return getFieldOfType(clazz, fieldType, true);
-    }
-
-    public static Field getFieldOfType(Class<?> clazz, Class<?> fieldType, boolean declared) {
-        Field[] fields = declared ? clazz.getDeclaredFields() : clazz.getFields();
-        for (Field field : fields) {
-            makeAccessible(field);
-            if (field.getType() == fieldType) return field;
-        }
-        return null;
-    }
-
-    public static Object getValue(Object instance, Field field) {
-        makeAccessible(field);
-        try {
-            return field.get(instance);
-        } catch (IllegalArgumentException | IllegalAccessException exception) {
-            exception.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * This method is equal to running:<br>
-     * <code>{@link #getValue(Object, Field) getValue}(instance,
-     * {@link #getField(Class, String) getField}(instance.getClass(), fieldName))</code>
-     */
-    public static Object getValue(Object instance, String fieldName) {
-        return getValue(instance, getField(instance.getClass(), fieldName));
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> T getCastedValue(Object instance, Field field) {
-        return (T) getValue(instance, field);
-    }
-
-    /**
-     * This method is equal to running:<br>
-     * <code>{@link #getCastedValue(Object, Field) getCastedValue}(instance,
-     * {@link #getField(Class, String) getField}(instance.getClass(), fieldName))</code>
-     */
-    public static <T> T getCastedValue(Object instance, String fieldName) {
-        return getCastedValue(instance, getField(instance.getClass(), fieldName));
-    }
-
-    public static boolean setValue(Object instance, String fieldName, Object value) {
-        Field field = getField(instance.getClass(), fieldName);
-        if (field != null) {
-            setValue(instance, field, value);
-        }
-        return field != null;
-    }
-
-    public static void setValue(Object instance, Field field, Object value) {
-        makeAccessible(field);
-        try {
-            field.set(instance, value);
-        } catch (IllegalAccessException exception) {
-            exception.printStackTrace();
-        }
-    }
-
-    public static boolean setFinalValue(Object instance, Field field, Object value) {
-        try {
-            makeAccessible(field);
-
-            int modifiers = field.getModifiers();
-            if (Modifier.isFinal(modifiers)) {
-                Field modifiersField = getModifiersField();
-                makeAccessible(modifiersField);
-                modifiersField.setInt(field, modifiers & ~Modifier.FINAL);
-            }
-            setValue(instance, field, value);
-            return true;
-        } catch (Exception exception) {
-            exception.printStackTrace();
-            return false;
-        }
-    }
-
-    public static Field getModifiersField(){
-        if (modifiersField != null) return modifiersField;
-
-        try {
-            modifiersField = Field.class.getDeclaredField("modifiers");
-        } catch (NoSuchFieldException exception) {
-            // Java 12 compatibility, thanks to https://github.com/powermock/powermock/pull/1010
-            try {
-                Method getDeclaredFields0 = Class.class.getDeclaredMethod(
-                        "getDeclaredFields0", boolean.class
-                );
-                makeAccessible(getDeclaredFields0);
-
-                Field[] fields = (Field[]) getDeclaredFields0.invoke(Field.class, false);
-                for (Field field : fields) {
-                    if ("modifiers".equals(field.getName())) {
-                        modifiersField = field;
-                        break;
-                    }
-                }
-            } catch (Exception exception1) {
-                exception1.printStackTrace();
-                return null;
-            }
-        }
-        return modifiersField;
-    }
-
-    public static Method getMethod(Class<?> clazz, String method,
-                                    boolean isPublic, Class<?>... args) {
-        try {
-            return isPublic ? clazz.getMethod(method, args) : clazz.getDeclaredMethod(method, args);
-        } catch (NoSuchMethodException exception) {
-            // method is not found, so we return null
-            return null;
-        }
-    }
-
-    public static Method getMethod(Class<?> clazz, String methodName, Class<?>... args) {
-        Method method = getMethod(clazz, methodName, false, args);
-        if (method != null) {
-            return method;
-        }
-        return getMethod(clazz, methodName, true, args);
-    }
-
-    public static Method getMethod(Object instance, String method, Class<?>... args) {
-        return getMethod(instance.getClass(), method, args);
-    }
-
-    public static Object invoke(Object instance, Method method, Object... args) {
-        makeAccessible(method);
-        try {
-            return method.invoke(instance, args);
-        } catch (IllegalAccessException | InvocationTargetException exception) {
-            exception.printStackTrace();
-            return null;
-        }
-    }
-
-    public static Object invoke(Object instance, String method) {
-        return invoke(instance, getMethod(instance.getClass(), method));
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> T castedInvoke(Object instance, Method method, Object... args) {
-        try {
-            return (T) invoke(instance, method, args);
-        } catch (NullPointerException exception) {
-            return null;
-        }
-    }
-
-    public static <T> T castedInvoke(Object instance, String method) {
-        return castedInvoke(instance, getMethod(instance.getClass(), method));
-    }
-
-    public static Object invokeStatic(Class<?> clazz, String method) {
-        try {
-            return invoke(null, getMethod(clazz, method));
-        } catch (NullPointerException exception) {
-            exception.printStackTrace();
-            return null;
-        }
-    }
-
-    public static <T extends AccessibleObject> T makeAccessible(T accessibleObject) {
-        if (!accessibleObject.isAccessible()) {
-            accessibleObject.setAccessible(true);
-        }
-        return accessibleObject;
-    }
-}
diff --git a/common/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java b/common/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java
new file mode 100644
index 00000000..9268b9f0
--- /dev/null
+++ b/common/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java
@@ -0,0 +1,443 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ *
+ *  @author GeyserMC
+ *  @link https://github.com/GeyserMC/Floodgate
+ *
+ */
+
+package org.geysermc.floodgate.util;
+
+import com.google.common.base.Preconditions;
+import lombok.Setter;
+
+import javax.annotation.Nullable;
+import java.lang.reflect.*;
+
+import static org.geysermc.floodgate.util.MessageFormatter.format;
+
+public final class ReflectionUtils {
+    private static final Field MODIFIERS_FIELD;
+
+    /**
+     * The package name that is shared between all the {@link #getPrefixedClass(String)} calls so
+     * that the className will be a lot shorter.
+     * Example net.minecraft.server.v1_8R3.PacketHandshakingInSetProtocol will become
+     * PacketHandshakingInSetProtocol if the prefix is set to net.minecraft.server.v1_8R3
+     */
+    @Setter
+    private static String prefix = null;
+
+    /**
+     * Get a class that is prefixed with the prefix provided in {@link #setPrefix(String)}.
+     * Calling this method is equal to calling {@link #getClass(String)}
+     * with <i>prefix</i>.<i>classname</i> as class name.
+     *
+     * @param className the prefix class to find
+     * @return the class if found, otherwise null
+     */
+    @Nullable
+    public static Class<?> getPrefixedClass(String className) {
+        return getClass(prefix + "." + className);
+    }
+
+    /**
+     * Get the class from a class name.
+     * Calling this method is equal to calling {@link Class#forName(String)} where String is the
+     * class name.<br>
+     * This method will return null when the class isn't found instead of throwing the exception,
+     * but the exception will be printed to the console.
+     *
+     * @param className the name of the class to find
+     * @return the class or null if the class wasn't found.
+     */
+    @Nullable
+    public static Class<?> getClass(String className) {
+        try {
+            return Class.forName(className);
+        } catch (ClassNotFoundException exception) {
+            exception.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * Get a field of a class.
+     * Calling this method is equal to calling {@link Class#getField(String)} where String is the
+     * fieldName when isPublic is true and calling this method is equal to calling
+     * {@link Class#getDeclaredField(String)} where String is the fieldName when isPublic is
+     * false.<br>
+     * Please note that this method will return null instead of throwing the exception.
+     *
+     * @param clazz     the class name to get the field from
+     * @param fieldName the name of the field
+     * @param declared  if the field is declared or public.
+     * @return the field if found, otherwise null
+     */
+    @Nullable
+    public static Field getField(Class<?> clazz, String fieldName, boolean declared) {
+        try {
+            if (declared) {
+                return clazz.getField(fieldName);
+            }
+            return clazz.getDeclaredField(fieldName);
+        } catch (NoSuchFieldException ignored) {
+            return null;
+        }
+    }
+
+    /**
+     * Get a field from a class, it doesn't matter if the field is public or not.
+     * This method will first try to get a declared field and if that failed it'll try to get a
+     * public field.
+     *
+     * @param clazz     the class to get the field from
+     * @param fieldName the name of the field
+     * @return the field if found, otherwise null
+     */
+    @Nullable
+    public static Field getField(Class<?> clazz, String fieldName) {
+        Field field = getField(clazz, fieldName, true);
+        if (field != null) {
+            return field;
+        }
+        return getField(clazz, fieldName, false);
+    }
+
+    /**
+     * Get a field from a class without having to provide a field name.
+     *
+     * @param clazz     the class to search the field from
+     * @param fieldType the type of the field
+     * @param declared  if the field is declared or public
+     * @return the field if it has been found, otherwise null
+     */
+    @Nullable
+    public static Field getFieldOfType(Class<?> clazz, Class<?> fieldType, boolean declared) {
+        Field[] fields = declared ? clazz.getDeclaredFields() : clazz.getFields();
+        for (Field field : fields) {
+            makeAccessible(field);
+            if (field.getType() == fieldType) return field;
+        }
+        return null;
+    }
+
+    /**
+     * Get a declared field from a class without having to provide a field name.<br>
+     * Calling this method is equal to calling {@link #getFieldOfType(Class, Class, boolean)}
+     * with declared = true.
+     *
+     * @param clazz     the class to search the field from
+     * @param fieldType the type of the declared field
+     * @return the field if it has been found, otherwise null
+     */
+    @Nullable
+    public static Field getFieldOfType(Class<?> clazz, Class<?> fieldType) {
+        return getFieldOfType(clazz, fieldType, true);
+    }
+
+    /**
+     * Get the value of a field.
+     * This method first makes the field accessible and then gets the value.<br>
+     * This method will return null instead of throwing an exception,
+     * but it'll log the stacktrace to the console.
+     *
+     * @param instance the instance to get the value from
+     * @param field    the field to get the value from
+     * @return the value when succeeded, otherwise null
+     */
+    @Nullable
+    public static Object getValue(Object instance, Field field) {
+        makeAccessible(field);
+        try {
+            return field.get(instance);
+        } catch (IllegalArgumentException | IllegalAccessException exception) {
+            exception.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * Get the value of a field and cast it to <T>.
+     *
+     * @param instance the instance to get the value from
+     * @param field    the field to get the value from
+     * @param <T>      the type to cast the value to
+     * @return the casted value when succeeded, otherwise null
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public static <T> T getCastedValue(Object instance, Field field) {
+        return (T) getValue(instance, field);
+    }
+
+    /**
+     * Get the value of the given field by finding the field and then get the value of it.
+     *
+     * @param instance  the instance of the object
+     * @param fieldName the name of the field to get the value from
+     * @return the value of the field when succeeded, otheriwse null
+     */
+    @Nullable
+    public static Object getValue(Object instance, String fieldName) {
+        return getValue(instance, getField(instance.getClass(), fieldName));
+    }
+
+    /**
+     * Set the value of a field.
+     * This method make the field accessible and then sets the value.<br>
+     * This method doesn't throw an exception when failed, but it'll log the error to the console.
+     *
+     * @param instance the instance to set the value to
+     * @param field    the field to set the value to
+     * @param value    the value to set
+     */
+    public static void setValue(Object instance, Field field, Object value) {
+        makeAccessible(field);
+        try {
+            field.set(instance, value);
+        } catch (IllegalAccessException exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    /**
+     * Set the value of a field.
+     * This method finds the field, and then calls {@link #setValue(Object, Field, Object)}.
+     *
+     * @param instance  the instance to set the value to
+     * @param fieldName the field to set the value to
+     * @param value     the value to set
+     * @return true if the field was found
+     */
+    public static boolean setValue(Object instance, String fieldName, Object value) {
+        Field field = getField(instance.getClass(), fieldName);
+        if (field != null) {
+            setValue(instance, field, value);
+        }
+        return field != null;
+    }
+
+    /**
+     * Set the value of a <b>final</b> field.
+     * This method first makes the field accessible, then removes the final modifier and then
+     * sets the value.<br>
+     * This method will not throw exceptions when failed, but it'll log the error to the console.
+     *
+     * @param instance the instance to set the value to
+     * @param field    the field to set the value to
+     * @param value    the value to set
+     * @return true if succeeded
+     */
+    public static boolean setFinalValue(Object instance, Field field, Object value) {
+        try {
+            makeAccessible(field);
+
+            int modifiers = field.getModifiers();
+            if (Modifier.isFinal(modifiers)) {
+                makeAccessible(MODIFIERS_FIELD);
+                MODIFIERS_FIELD.setInt(field, modifiers & ~Modifier.FINAL);
+            }
+            setValue(instance, field, value);
+            return true;
+        } catch (Exception exception) {
+            exception.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * Get a method from a class, it doesn't matter if the field is public or not.
+     * This method will first try to get a declared field and if that failed it'll try to get a
+     * public field.<br>
+     * Instead of throwing an exception when the method wasn't found, it will return null, but
+     * the exception will be printed in the console.
+     *
+     * @param clazz     the class to get the method from
+     * @param method    the name of the method to find
+     * @param declared  if the the method is declared or public
+     * @param arguments the classes of the method arguments
+     * @return the requested method if it has been found, otherwise null
+     */
+    @Nullable
+    public static Method getMethod(Class<?> clazz, String method, boolean declared,
+                                   Class<?>... arguments) {
+        try {
+            if (declared) {
+                return clazz.getMethod(method, arguments);
+            }
+            return clazz.getDeclaredMethod(method, arguments);
+        } catch (NoSuchMethodException exception) {
+            return null;
+        }
+    }
+
+    /**
+     * Get a method from a class, it doesn't matter if the method is public or not.
+     * This method will first try to get a declared method and if that fails it'll try to get a
+     * public method.
+     *
+     * @param clazz      the class to get the method from
+     * @param methodName the name of the method to find
+     * @param arguments  the classes of the method arguments
+     * @return the requested method if it has been found, otherwise null
+     */
+    @Nullable
+    public static Method getMethod(Class<?> clazz, String methodName, Class<?>... arguments) {
+        Method method = getMethod(clazz, methodName, true, arguments);
+        if (method != null) {
+            return method;
+        }
+        return getMethod(clazz, methodName, false, arguments);
+    }
+
+    /**
+     * Get a method from a class, it doesn't matter if the method is public or not.
+     * This method will first try to get a declared method and if that fails it'll try to get a
+     * public method.
+     *
+     * @param instance   the class to get the method from
+     * @param methodName the name of the method to find
+     * @param arguments  the classes of the method arguments
+     * @return the requested method if it has been found, otherwise null
+     */
+    @Nullable
+    public static Method getMethod(Object instance, String methodName, Class<?>... arguments) {
+        return getMethod(instance.getClass(), methodName, arguments);
+    }
+
+    /**
+     * Invoke the given method of the given instance with the given arguments.
+     *
+     * @param instance  the instance to get the value from
+     * @param method    the method to invoke
+     * @param arguments the arguments of the method
+     * @return the value got from invoking the method, or null when failed to invoke
+     */
+    @Nullable
+    public static Object invoke(Object instance, Method method, Object... arguments) {
+        makeAccessible(method);
+        try {
+            return method.invoke(instance, arguments);
+        } catch (IllegalAccessException | InvocationTargetException exception) {
+            exception.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * Invoke the given method of the given instance with the given arguments and cast the value.
+     *
+     * @param instance  the instance to get the value from
+     * @param method    the method to invoke
+     * @param arguments the arguments of the method
+     * @return the casted value got from invoking the method, or null when failed to invoke
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public static <T> T castedInvoke(Object instance, Method method, Object... arguments) {
+        try {
+            return (T) invoke(instance, method, arguments);
+        } catch (NullPointerException exception) {
+            return null;
+        }
+    }
+
+    /**
+     * Invoke the given method of the given instance and cast the value.
+     *
+     * @param instance the instance to get the value from
+     * @param method   the method to invoke
+     * @return the casted value got from invoking the method, or null when failed to invoke
+     */
+    @Nullable
+    public static <T> T castedInvoke(Object instance, String method) {
+        return castedInvoke(instance, getMethod(instance.getClass(), method));
+    }
+
+    /**
+     * Invoke the given static method.
+     *
+     * @param clazz  the class to get the method from
+     * @param method the name of the method to invoke
+     * @return the value got from invoking the status method, or null when failed to invoke
+     */
+    @Nullable
+    public static Object invokeStatic(Class<?> clazz, String method) {
+        try {
+            return invoke(null, getMethod(clazz, method));
+        } catch (NullPointerException exception) {
+            exception.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * Make the object accessible if it isn't accessible yet
+     *
+     * @param accessibleObject the object to make accessible
+     * @param <T>              accessible object type
+     * @return the accessibleObject
+     */
+    public static <T extends AccessibleObject> T makeAccessible(T accessibleObject) {
+        if (!accessibleObject.isAccessible()) {
+            accessibleObject.setAccessible(true);
+        }
+        return accessibleObject;
+    }
+
+    static {
+        Field modifiersField = null;
+        try {
+            modifiersField = Field.class.getDeclaredField("modifiers");
+        } catch (NoSuchFieldException ignored) {
+            // Java 12 compatibility, thanks to https://github.com/powermock/powermock/pull/1010
+            try {
+                Method declaredFields = getMethod(Class.class, "getDeclaredFields0", boolean.class);
+                if (declaredFields == null) {
+                    throw new NoSuchMethodException();
+                }
+
+                Field[] fields = castedInvoke(Field.class, declaredFields, false);
+                if (fields == null) {
+                    throw new Exception();
+                }
+
+                for (Field field : fields) {
+                    if ("modifiers".equals(field.getName())) {
+                        modifiersField = field;
+                        break;
+                    }
+                }
+            } catch (Exception exception) {
+                throw new RuntimeException(format("Cannot find the modifiers field :/\n" +
+                                "Java version: {}\nVendor: {} ({})",
+                        System.getProperty("java.version"),
+                        System.getProperty("java.vendor"),
+                        System.getProperty("java.vendor.url")
+                ));
+            }
+        }
+
+        Preconditions.checkNotNull(modifiersField, "Modifiers field cannot be null!");
+        MODIFIERS_FIELD = modifiersField;
+    }
+}
diff --git a/common/src/main/resources/proxy-config.yml b/common/src/main/resources/proxy-config.yml
index 87d797af..49e55be8 100644
--- a/common/src/main/resources/proxy-config.yml
+++ b/common/src/main/resources/proxy-config.yml
@@ -11,8 +11,7 @@ username-prefix: "*"
 # Should spaces be replaced with '_' in bedrock usernames?
 replace-spaces: true
 
-# todo impl args like {proxy}
-# Should {proxy} send the bedrock player data to the servers it is connecting to?
+# Should the proxy send the bedrock player data to the servers it is connecting to?
 # This requires Floodgate to be installed on the servers.
 # You'll get kicked if you don't use the plugin. The default value is false because of it
 send-floodgate-data: false
diff --git a/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java b/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java
index 58fef691..5ac6090b 100644
--- a/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java
+++ b/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java
@@ -39,7 +39,9 @@ import java.util.concurrent.CompletionException;
 
 public class SqliteDatabase extends CommonPlayerLink {
     private Connection connection;
-    @Inject @Named("dataDirectory")
+
+    @Inject
+    @Named("dataDirectory")
     private Path dataDirectory;
 
     @Override
@@ -51,7 +53,7 @@ public class SqliteDatabase extends CommonPlayerLink {
             Statement statement = connection.createStatement();
             statement.setQueryTimeout(30);  // set timeout to 30 sec.
             statement.executeUpdate("create table if not exists LinkedPlayers (bedrockId string, javaUniqueId string, javaUsername string)");
-        } catch (ClassNotFoundException ignored) {
+        } catch (ClassNotFoundException exception) {
             getLogger().error("The required class to load the SQLite database wasn't found");
         } catch (SQLException exception) {
             getLogger().error("Error while loading database", exception);
diff --git a/pom.xml b/pom.xml
index 2264049f..f892bb3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,10 @@
     <url>https://github.com/GeyserMC/Floodgate</url>
 
     <properties>
-        <geyser-version>1.0-SNAPSHOT</geyser-version>
-        <bukkit-version>1.8.8-R0.1-SNAPSHOT</bukkit-version>
-        <bungee-version>1.15-SNAPSHOT</bungee-version>
-        <velocity-version>1.1.0-SNAPSHOT</velocity-version>
+        <geyser.version>1.0.0</geyser.version>
+        <bukkit.version>1.8.8-R0.1-SNAPSHOT</bukkit.version>
+        <bungee.version>1.15-SNAPSHOT</bungee.version>
+        <velocity.version>1.1.0-SNAPSHOT</velocity.version>
 
         <outputName>floodgate-${project.name}</outputName>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/spigot/pom.xml b/spigot/pom.xml
index d708d39c..1ebd3fd9 100644
--- a/spigot/pom.xml
+++ b/spigot/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>${bukkit-version}</version>
+            <version>${bukkit.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/spigot/src/main/java/org/geysermc/floodgate/SpigotPlatform.java b/spigot/src/main/java/org/geysermc/floodgate/SpigotPlatform.java
index d1f2c9f5..885dca85 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/SpigotPlatform.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/SpigotPlatform.java
@@ -33,6 +33,7 @@ import com.google.inject.name.Named;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.geysermc.floodgate.api.FloodgateApi;
+import org.geysermc.floodgate.api.inject.PlatformInjector;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.config.loader.ConfigLoader;
 import org.geysermc.floodgate.link.PlayerLinkLoader;
@@ -46,14 +47,14 @@ public final class SpigotPlatform extends FloodgatePlatform {
     public SpigotPlatform(@Named("dataDirectory") Path dataDirectory, FloodgateApi api,
                           ConfigLoader configLoader, PlayerLinkLoader playerLinkLoader,
                           HandshakeHandler handshakeHandler, FloodgateLogger logger,
-                          Injector injector) {
+                          PlatformInjector platformInjector, Injector injector) {
         super(dataDirectory, api, configLoader, playerLinkLoader,
-                handshakeHandler, logger, injector);
+                handshakeHandler, logger, platformInjector, injector);
     }
 
     @Override
-    public boolean enable(Module... postCreateModules) {
-        boolean success = super.enable(postCreateModules);
+    public boolean enable(Module... postInitializeModules) {
+        boolean success = super.enable(postInitializeModules);
         if (!success) {
             Bukkit.getPluginManager().disablePlugin(plugin);
         }
diff --git a/spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java b/spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java
index 2df7cbd4..510b1ec4 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java
@@ -30,7 +30,7 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.geysermc.floodgate.module.*;
-import org.geysermc.floodgate.util.ReflectionUtil;
+import org.geysermc.floodgate.util.ReflectionUtils;
 
 public final class SpigotPlugin extends JavaPlugin {
     private SpigotPlatform platform;
@@ -38,7 +38,7 @@ public final class SpigotPlugin extends JavaPlugin {
     @Override
     public void onLoad() {
         String minecraftVersion = getServer().getClass().getPackage().getName().split("\\.")[3];
-        ReflectionUtil.setPrefix("net.minecraft.server." + minecraftVersion);
+        ReflectionUtils.setPrefix("net.minecraft.server." + minecraftVersion);
 
         long ctm = System.currentTimeMillis();
         Injector injector = Guice.createInjector(
@@ -46,10 +46,10 @@ public final class SpigotPlugin extends JavaPlugin {
                 new SpigotPlatformModule(this)
         );
 
+        platform = injector.getInstance(SpigotPlatform.class);
+
         long endCtm = System.currentTimeMillis();
         getLogger().info("Took " + (endCtm - ctm) + "ms to boot Floodgate");
-
-        platform = injector.getInstance(SpigotPlatform.class);
     }
 
     @Override
diff --git a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java
index fc23cba8..e72ba21c 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java
@@ -29,9 +29,11 @@ package org.geysermc.floodgate.addon.data;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.netty.channel.Channel;
+import io.netty.util.AttributeKey;
 import org.geysermc.floodgate.HandshakeHandler;
 import org.geysermc.floodgate.api.inject.InjectorAddon;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
+import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.config.FloodgateConfig;
 
 public final class SpigotDataAddon implements InjectorAddon {
@@ -39,6 +41,9 @@ public final class SpigotDataAddon implements InjectorAddon {
     @Inject private FloodgateConfig config;
     @Inject private FloodgateLogger logger;
 
+    @Inject @Named("playerAttribute")
+    private AttributeKey<FloodgatePlayer> playerAttribute;
+
     @Inject @Named("packetHandler")
     private String packetHandlerName;
 
@@ -46,7 +51,7 @@ public final class SpigotDataAddon implements InjectorAddon {
     public void onInject(Channel channel, boolean proxyToServer) {
         channel.pipeline().addBefore(
                 packetHandlerName, "floodgate_data_handler",
-                new SpigotDataHandler(handshakeHandler, config, logger)
+                new SpigotDataHandler(config, handshakeHandler, playerAttribute, logger)
         );
     }
 
diff --git a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java
index af1b1e90..96eb739c 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java
@@ -28,6 +28,7 @@ package org.geysermc.floodgate.addon.data;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.util.AttributeKey;
 import lombok.RequiredArgsConstructor;
 import org.geysermc.floodgate.HandshakeHandler;
 import org.geysermc.floodgate.HandshakeHandler.HandshakeResult;
@@ -35,7 +36,7 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.config.FloodgateConfig;
 import org.geysermc.floodgate.util.BedrockData;
-import org.geysermc.floodgate.util.ReflectionUtil;
+import org.geysermc.floodgate.util.ReflectionUtils;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -45,7 +46,7 @@ import java.net.SocketAddress;
 import java.util.UUID;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.geysermc.floodgate.util.ReflectionUtil.*;
+import static org.geysermc.floodgate.util.ReflectionUtils.*;
 
 @RequiredArgsConstructor
 public final class SpigotDataHandler extends SimpleChannelInboundHandler<Object> {
@@ -70,8 +71,9 @@ public final class SpigotDataHandler extends SimpleChannelInboundHandler<Object>
     private static final Object READY_TO_ACCEPT_PROTOCOL_STATE;
 
     /* per player stuff */
-    private final HandshakeHandler handshakeHandler;
     private final FloodgateConfig config;
+    private final HandshakeHandler handshakeHandler;
+    private final AttributeKey<FloodgatePlayer> playerAttribute;
     private final FloodgateLogger logger;
 
     private Object networkManager;
@@ -110,15 +112,17 @@ public final class SpigotDataHandler extends SimpleChannelInboundHandler<Object>
                         return;
                 }
 
+                ctx.channel().attr(playerAttribute).set(result.getFloodgatePlayer());
+
                 fPlayer = result.getFloodgatePlayer();
                 BedrockData bedrockData = result.getBedrockData();
                 String[] data = result.getHandshakeData();
 
-                if (bungee = (data.length == 6 || data.length == 7)) {
+                if (bungee = result.isBungeeData()) {
                     setValue(packet, HANDSHAKE_HOST, data[0] + '\0' +
-                            bedrockData.getIp() + '\0' + fPlayer.getCorrectUniqueId() +
-                            (data.length == 7 ? '\0' + data[6] : "")
-                    );
+                            bedrockData.getIp() + '\0' +
+                            fPlayer.getCorrectUniqueId() +
+                            (data.length == 5 ? '\0' + data[4] : ""));
                 } else {
                     // Use a spoofedUUID for initUUID (just like Bungeecord)
                     setValue(networkManager, "spoofedUUID", fPlayer.getCorrectUniqueId());
@@ -157,7 +161,9 @@ public final class SpigotDataHandler extends SimpleChannelInboundHandler<Object>
         } finally {
             // don't let the packet through if the packet is the login packet
             // because we want to skip the login cycle
-            if (!isLogin) ctx.fireChannelRead(packet);
+            if (!isLogin) {
+                ctx.fireChannelRead(packet);
+            }
 
             if (isHandshake && bungee || isLogin && !bungee || fPlayer == null) {
                 // we're done, we'll just wait for the loginSuccessCall
@@ -181,13 +187,13 @@ public final class SpigotDataHandler extends SimpleChannelInboundHandler<Object>
 
         HANDSHAKE_PACKET = getPrefixedClass("PacketHandshakingInSetProtocol");
         checkNotNull(HANDSHAKE_PACKET, "PacketHandshakingInSetProtocol cannot be null");
-        HANDSHAKE_HOST = getFieldOfType(HANDSHAKE_PACKET, String.class, true);
+        HANDSHAKE_HOST = getFieldOfType(HANDSHAKE_PACKET, String.class);
         checkNotNull(HANDSHAKE_HOST, "Host field from handshake packet cannot be null");
 
         LOGIN_START_PACKET = getPrefixedClass("PacketLoginInStart");
         checkNotNull(LOGIN_START_PACKET, "PacketLoginInStart cannot be null");
 
-        GAME_PROFILE = ReflectionUtil.getClass("com.mojang.authlib.GameProfile");
+        GAME_PROFILE = ReflectionUtils.getClass("com.mojang.authlib.GameProfile");
         checkNotNull(GAME_PROFILE, "GameProfile class cannot be null");
 
         Constructor<?> gameProfileConstructor = null;
@@ -201,7 +207,7 @@ public final class SpigotDataHandler extends SimpleChannelInboundHandler<Object>
 
         LOGIN_LISTENER = getPrefixedClass("LoginListener");
         checkNotNull(LOGIN_LISTENER, "LoginListener cannot be null");
-        LOGIN_PROFILE = getFieldOfType(LOGIN_LISTENER, GAME_PROFILE, true);
+        LOGIN_PROFILE = getFieldOfType(LOGIN_LISTENER, GAME_PROFILE);
         checkNotNull(LOGIN_PROFILE, "Profile from LoginListener cannot be null");
         INIT_UUID = getMethod(LOGIN_LISTENER, "initUUID");
         checkNotNull(INIT_UUID, "initUUID from LoginListener cannot be null");
@@ -227,7 +233,7 @@ public final class SpigotDataHandler extends SimpleChannelInboundHandler<Object>
                 "Ready to accept state from Protocol state cannot be null");
 
         Class<?> packetListenerClass = getPrefixedClass("PacketListener");
-        PACKET_LISTENER = getFieldOfType(networkManager, packetListenerClass, true);
+        PACKET_LISTENER = getFieldOfType(networkManager, packetListenerClass);
         checkNotNull(PACKET_LISTENER, "PacketListener cannot be null");
 
         LOGIN_HANDLER = getPrefixedClass("LoginListener$LoginHandler");
diff --git a/spigot/src/main/java/org/geysermc/floodgate/inject/spigot/SpigotInjector.java b/spigot/src/main/java/org/geysermc/floodgate/inject/spigot/SpigotInjector.java
index 02647263..517b3153 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/inject/spigot/SpigotInjector.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/inject/spigot/SpigotInjector.java
@@ -30,7 +30,7 @@ import io.netty.channel.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.geysermc.floodgate.inject.CommonPlatformInjector;
-import org.geysermc.floodgate.util.ReflectionUtil;
+import org.geysermc.floodgate.util.ReflectionUtils;
 
 import java.lang.reflect.*;
 import java.util.*;
@@ -128,11 +128,11 @@ public final class SpigotInjector extends CommonPlatformInjector {
         // and change the list back to the original
         Object serverConnection = getServerConnection();
         if (serverConnection != null) {
-            Field field = ReflectionUtil.getField(serverConnection.getClass(), injectedFieldName);
-            List<?> list = (List<?>) ReflectionUtil.getValue(serverConnection, field);
+            Field field = ReflectionUtils.getField(serverConnection.getClass(), injectedFieldName);
+            List<?> list = (List<?>) ReflectionUtils.getValue(serverConnection, field);
             if (list instanceof CustomList) {
                 CustomList customList = (CustomList) list;
-                ReflectionUtil.setValue(serverConnection, field, customList.getOriginalList());
+                ReflectionUtils.setValue(serverConnection, field, customList.getOriginalList());
                 customList.clear();
                 customList.addAll(list);
             }
@@ -145,10 +145,10 @@ public final class SpigotInjector extends CommonPlatformInjector {
 
     public Object getServerConnection() throws IllegalAccessException, InvocationTargetException {
         if (serverConnection != null) return serverConnection;
-        Class<?> minecraftServer = ReflectionUtil.getPrefixedClass("MinecraftServer");
+        Class<?> minecraftServer = ReflectionUtils.getPrefixedClass("MinecraftServer");
         assert minecraftServer != null;
 
-        Object minecraftServerInstance = ReflectionUtil.invokeStatic(minecraftServer, "getServer");
+        Object minecraftServerInstance = ReflectionUtils.invokeStatic(minecraftServer, "getServer");
         for (Method m : minecraftServer.getDeclaredMethods()) {
             if (m.getReturnType().getSimpleName().equals("ServerConnection")) {
                 if (m.getParameterTypes().length == 0) {
diff --git a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotPlatformModule.java b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotPlatformModule.java
index 60218087..4c2853ba 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotPlatformModule.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotPlatformModule.java
@@ -41,7 +41,7 @@ import org.geysermc.floodgate.config.FloodgateConfig;
 import org.geysermc.floodgate.inject.CommonPlatformInjector;
 import org.geysermc.floodgate.inject.spigot.SpigotInjector;
 import org.geysermc.floodgate.listener.SpigotListenerRegistration;
-import org.geysermc.floodgate.logger.JavaDefaultFloodgateLogger;
+import org.geysermc.floodgate.logger.JavaUtilFloodgateLogger;
 import org.geysermc.floodgate.platform.command.CommandRegistration;
 import org.geysermc.floodgate.platform.listener.ListenerRegistration;
 import org.geysermc.floodgate.platform.command.util.CommandUtil;
@@ -73,7 +73,7 @@ public final class SpigotPlatformModule extends AbstractModule {
     @Provides
     @Singleton
     public FloodgateLogger floodgateLogger() {
-        return new JavaDefaultFloodgateLogger(plugin.getLogger());
+        return new JavaUtilFloodgateLogger(plugin.getLogger());
     }
 
     /*
diff --git a/velocity/pom.xml b/velocity/pom.xml
index a18569b5..bc9cadd2 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -12,6 +12,10 @@
 
     <artifactId>velocity</artifactId>
 
+    <properties>
+        <log4j.version>2.11.2</log4j.version>
+    </properties>
+
     <repositories>
         <repository>
             <id>velocity-repo</id>
@@ -33,7 +37,13 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>${velocity-version}</version>
+            <version>${velocity.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java b/velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java
index a9475f0e..945c9cd5 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java
@@ -32,7 +32,7 @@ import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import org.geysermc.floodgate.module.*;
-import org.geysermc.floodgate.util.ReflectionUtil;
+import org.geysermc.floodgate.util.ReflectionUtils;
 import org.slf4j.Logger;
 
 import java.nio.file.Path;
@@ -42,7 +42,7 @@ public final class VelocityPlugin {
 
     @Inject
     public VelocityPlugin(@DataDirectory Path dataDirectory, Injector guice, Logger logger) {
-        ReflectionUtil.setPrefix("com.velocitypowered.proxy");
+        ReflectionUtils.setPrefix("com.velocitypowered.proxy");
 
         long ctm = System.currentTimeMillis();
         Injector injector = guice.createChildInjector(
@@ -50,10 +50,10 @@ public final class VelocityPlugin {
                 new VelocityPlatformModule()
         );
 
+        platform = injector.getInstance(FloodgatePlatform.class);
+
         long endCtm = System.currentTimeMillis();
         logger.info("Took " + (endCtm - ctm) + "ms to boot Floodgate");
-
-        platform = injector.getInstance(FloodgatePlatform.class);
     }
 
     @Subscribe
diff --git a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java
index 91a17bb8..b8748189 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java
@@ -63,25 +63,23 @@ public final class VelocityDataAddon implements InjectorAddon {
     @Named("kickMessageAttribute")
     private AttributeKey<String> kickMessageAttribute;
 
-    private final Map<EventLoop, FloodgatePlayer> playerMap = new HashMap<>();
-
     @Override
     public void onInject(Channel channel, boolean proxyToServer) {
         if (proxyToServer) {
             channel.pipeline().addAfter(
                     packetEncoder, "floodgate_data_handler",
-                    new VelocityServerDataHandler(config, api, playerMap)
-            );
-        } else {
-            // The handler is already added so we should add our handler before it
-            channel.pipeline().addBefore(
-                    packetHandler, "floodgate_data_handler",
-                    new VelocityProxyDataHandler(
-                            config, api, handshakeHandler, playerAttribute,
-                            kickMessageAttribute, playerMap, logger
-                    )
+                    new VelocityServerDataHandler(config, api)
             );
+            return;
         }
+        // The handler is already added so we should add our handler before it
+        channel.pipeline().addBefore(
+                packetHandler, "floodgate_data_handler",
+                new VelocityProxyDataHandler(
+                        config, api, handshakeHandler, playerAttribute,
+                        kickMessageAttribute, logger
+                )
+        );
     }
 
     @Override
diff --git a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
index b0eda845..4c926788 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
@@ -27,9 +27,9 @@
 package org.geysermc.floodgate.addon.data;
 
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.EventLoop;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.util.AttributeKey;
+import io.netty.util.ReferenceCountUtil;
 import lombok.RequiredArgsConstructor;
 import org.geysermc.floodgate.HandshakeHandler;
 import org.geysermc.floodgate.HandshakeHandler.HandshakeResult;
@@ -39,10 +39,9 @@ import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
 
 import java.lang.reflect.Field;
-import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.geysermc.floodgate.util.ReflectionUtil.*;
+import static org.geysermc.floodgate.util.ReflectionUtils.*;
 
 @RequiredArgsConstructor
 public final class VelocityProxyDataHandler extends SimpleChannelInboundHandler<Object> {
@@ -56,20 +55,24 @@ public final class VelocityProxyDataHandler extends SimpleChannelInboundHandler<
 
     private final AttributeKey<FloodgatePlayer> playerAttribute;
     private final AttributeKey<String> kickMessageAttribute;
-    private final Map<EventLoop, FloodgatePlayer> playerMap;
 
     private final FloodgateLogger logger;
 
+    private boolean done;
+
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, Object msg) {
+        ReferenceCountUtil.retain(msg);
         // we're only interested in the Handshake packet
-        if (!HANDSHAKE_PACKET.isInstance(msg)) {
+        if (done || !HANDSHAKE_PACKET.isInstance(msg)) {
             ctx.fireChannelRead(msg);
+            done = true;
             return;
         }
 
         handleClientToProxy(ctx, msg);
         ctx.fireChannelRead(msg);
+        done = true;
     }
 
     private void handleClientToProxy(ChannelHandlerContext ctx, Object packet) {
@@ -95,10 +98,8 @@ public final class VelocityProxyDataHandler extends SimpleChannelInboundHandler<
         // system we only have to check if the connection (which is already closed at that time)
         // has the FloodgatePlayer attribute
         ctx.channel().attr(playerAttribute).set(player);
-        playerMap.put(ctx.channel().eventLoop(), player);
 
-        api.addEncryptedData(player.getCorrectUniqueId(),
-                result.getHandshakeData()[2] + '\0' + result.getHandshakeData()[3]);
+        api.addEncryptedData(player.getCorrectUniqueId(), result.getHandshakeData()[1]);
         logger.info("Floodgate player who is logged in as {} {} joined",
                 player.getCorrectUsername(), player.getCorrectUniqueId());
     }
diff --git a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityServerDataHandler.java b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityServerDataHandler.java
index 37a534e6..e3aebf57 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityServerDataHandler.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityServerDataHandler.java
@@ -26,8 +26,8 @@
 
 package org.geysermc.floodgate.addon.data;
 
+import com.velocitypowered.api.proxy.Player;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.EventLoop;
 import io.netty.handler.codec.MessageToMessageEncoder;
 import io.netty.util.ReferenceCountUtil;
 import lombok.RequiredArgsConstructor;
@@ -36,39 +36,49 @@ import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.List;
-import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.geysermc.floodgate.util.BedrockData.FLOODGATE_IDENTIFIER;
-import static org.geysermc.floodgate.util.ReflectionUtil.*;
+import static org.geysermc.floodgate.util.ReflectionUtils.*;
 
 @RequiredArgsConstructor
 public class VelocityServerDataHandler extends MessageToMessageEncoder<Object> {
     private static final Class<?> HANDSHAKE_PACKET;
-    private static final Field HANDSHAKE_SERVER_ADDRESS;
+    private static final Field HANDSHAKE_ADDRESS;
+    private static final Method GET_ASSOCIATION;
+    private static final Method GET_PLAYER;
 
     private final ProxyFloodgateConfig config;
     private final ProxyFloodgateApi api;
 
-    private final Map<EventLoop, FloodgatePlayer> playerMap;
+    private boolean done;
 
     @Override
     protected void encode(ChannelHandlerContext ctx, Object packet, List<Object> out) {
         ReferenceCountUtil.retain(packet);
-        if (!HANDSHAKE_PACKET.isInstance(packet) || !config.isSendFloodgateData()) {
-            System.out.println(HANDSHAKE_PACKET.isInstance(packet)+" "+config.isSendFloodgateData());
+        if (done) {
             out.add(packet);
             return;
         }
 
-        String address = getCastedValue(packet, HANDSHAKE_SERVER_ADDRESS);
+        if (!HANDSHAKE_PACKET.isInstance(packet) || !config.isSendFloodgateData()) {
+            System.out.println(HANDSHAKE_PACKET.isInstance(packet)+" "+config.isSendFloodgateData());
+            done = true;
+            out.add(packet);
+            return;
+        }
 
-        // works because the EventLoop is shared between the Player and the ServerConnection
-        // todo check if it actually works (by using multiple accounts and log if the map
-        //  overrides older ones)
-        FloodgatePlayer player = playerMap.get(ctx.channel().eventLoop());
+        String address = getCastedValue(packet, HANDSHAKE_ADDRESS);
+
+        // get the FloodgatePlayer from the ConnectedPlayer
+        Object minecraftConnection = ctx.pipeline().get("handler");
+        Object association = invoke(minecraftConnection, GET_ASSOCIATION);
+        Player velocityPlayer = castedInvoke(association, GET_PLAYER);
+
+        //noinspection ConstantConditions
+        FloodgatePlayer player = api.getPlayer(velocityPlayer.getUniqueId());
 
         // player is not a Floodgate player
         if (player == null) {
@@ -81,12 +91,13 @@ public class VelocityServerDataHandler extends MessageToMessageEncoder<Object> {
         checkArgument(encryptedData != null, "Encrypted data cannot be null");
 
         // use the same system that we use on bungee, our data goes before all the other data
-        String[] split = address.split("\0");
-        String remaining = address.substring(split[0].length());
+        int addressFinished = address.indexOf("\0");
+        String originalAddress = address.substring(0, addressFinished);
+        String remaining = address.substring(addressFinished);
 
-        setValue(packet, HANDSHAKE_SERVER_ADDRESS,
-                split[0] + '\0' + FLOODGATE_IDENTIFIER + '\0' + encryptedData + remaining);
-        System.out.println("done");
+        setValue(packet, HANDSHAKE_ADDRESS, originalAddress + '\0' + encryptedData + remaining);
+
+        done = true;
         out.add(packet);
     }
 
@@ -94,7 +105,17 @@ public class VelocityServerDataHandler extends MessageToMessageEncoder<Object> {
         HANDSHAKE_PACKET = getPrefixedClass("protocol.packet.Handshake");
         checkNotNull(HANDSHAKE_PACKET, "Handshake packet class cannot be null");
 
-        HANDSHAKE_SERVER_ADDRESS = getField(HANDSHAKE_PACKET, "serverAddress");
-        checkNotNull(HANDSHAKE_SERVER_ADDRESS, "Address field of the Handshake packet cannot be null");
+        HANDSHAKE_ADDRESS = getField(HANDSHAKE_PACKET, "serverAddress");
+        checkNotNull(HANDSHAKE_ADDRESS, "Address field of the Handshake packet cannot be null");
+
+        Class<?> minecraftConnection = getPrefixedClass("connection.MinecraftConnection");
+
+        GET_ASSOCIATION = getMethod(minecraftConnection, "getAssociation");
+        checkNotNull(GET_ASSOCIATION, "getAssociation in MinecraftConnection cannot be null");
+
+        Class<?> serverConnection = getPrefixedClass("connection.backend.VelocityServerConnection");
+
+        GET_PLAYER = getMethod(serverConnection, "getPlayer");
+        checkNotNull(GET_PLAYER, "getPlayer in VelocityServerConnection cannot be null");
     }
 }
diff --git a/velocity/src/main/java/org/geysermc/floodgate/inject/velocity/VelocityInjector.java b/velocity/src/main/java/org/geysermc/floodgate/inject/velocity/VelocityInjector.java
index 968057f2..f42b2bc3 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/inject/velocity/VelocityInjector.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/inject/velocity/VelocityInjector.java
@@ -36,7 +36,7 @@ import org.geysermc.floodgate.inject.CommonPlatformInjector;
 import javax.naming.OperationNotSupportedException;
 import java.lang.reflect.Method;
 
-import static org.geysermc.floodgate.util.ReflectionUtil.*;
+import static org.geysermc.floodgate.util.ReflectionUtils.*;
 
 @RequiredArgsConstructor
 public final class VelocityInjector extends CommonPlatformInjector {
@@ -79,7 +79,7 @@ public final class VelocityInjector extends CommonPlatformInjector {
     @RequiredArgsConstructor
     @SuppressWarnings("rawtypes")
     private static final class VelocityChannelInitializer extends ChannelInitializer<Channel> {
-        private static Method initChannel;
+        private static final Method initChannel;
 
         private final VelocityInjector injector;
         private final ChannelInitializer original;
diff --git a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java
index 7d0e51b5..9c316f17 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java
@@ -47,7 +47,7 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
-import static org.geysermc.floodgate.util.ReflectionUtil.*;
+import static org.geysermc.floodgate.util.ReflectionUtils.*;
 
 public final class VelocityListener {
     private static final Field INITIAL_MINECRAFT_CONNECTION;
@@ -85,10 +85,6 @@ public final class VelocityListener {
             Channel channel = getCastedValue(mcConnection, CHANNEL);
 
             player = channel.attr(playerAttribute).get();
-            if (player != null) {
-                event.setResult(PreLoginEvent.PreLoginComponentResult.forceOfflineMode());
-            }
-
             kickMessage = channel.attr(kickMessageAttribute).get();
         } catch (Exception exception) {
             logger.error("Failed get the FloodgatePlayer from the player's channel", exception);
@@ -101,6 +97,7 @@ public final class VelocityListener {
         }
 
         if (player != null) {
+            event.setResult(PreLoginEvent.PreLoginComponentResult.forceOfflineMode());
             playerCache.put(event.getConnection(), player);
         }
     }
@@ -125,7 +122,7 @@ public final class VelocityListener {
 
             if (fPlayer != null && api.removePlayer(fPlayer)) {
                 api.removeEncryptedData(event.getPlayer().getUniqueId());
-                logger.info("Removed Bedrock player who was logged in as {} {} ",
+                logger.info("Floodgate player who was logged in as {} {} disconnected",
                         player.getUsername(), player.getUniqueId());
             }
         } catch (Exception exception) {
@@ -137,9 +134,9 @@ public final class VelocityListener {
         Class<?> initialConnection = getPrefixedClass("connection.client.InitialInboundConnection");
 
         Class<?> minecraftConnection = getPrefixedClass("connection.MinecraftConnection");
-        INITIAL_MINECRAFT_CONNECTION = getFieldOfType(initialConnection, minecraftConnection, true);
+        INITIAL_MINECRAFT_CONNECTION = getFieldOfType(initialConnection, minecraftConnection);
         Class<?> connectedPlayer = getPrefixedClass("connection.client.ConnectedPlayer");
-        MINECRAFT_CONNECTION = getFieldOfType(connectedPlayer, minecraftConnection, true);
-        CHANNEL = getFieldOfType(minecraftConnection, Channel.class, true);
+        MINECRAFT_CONNECTION = getFieldOfType(connectedPlayer, minecraftConnection);
+        CHANNEL = getFieldOfType(minecraftConnection, Channel.class);
     }
 }
diff --git a/velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jLogger.java b/velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jFloodgateLogger.java
similarity index 78%
rename from velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jLogger.java
rename to velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jFloodgateLogger.java
index 99aaf6dc..40d3b021 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jLogger.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jFloodgateLogger.java
@@ -26,18 +26,17 @@
 
 package org.geysermc.floodgate.logger;
 
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.config.Configurator;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import static org.geysermc.floodgate.util.MessageFormatter.format;
 
-@AllArgsConstructor
-@NoArgsConstructor
-public final class Slf4jLogger implements FloodgateLogger {
-    private Logger logger = LoggerFactory.getLogger(LOGGER_NAME);
+@RequiredArgsConstructor
+public final class Slf4jFloodgateLogger implements FloodgateLogger {
+    private final Logger logger;
 
     @Override
     public void error(String message, Object... args) {
@@ -68,4 +67,18 @@ public final class Slf4jLogger implements FloodgateLogger {
     public void trace(String message, Object... args) {
         logger.trace(message, args);
     }
+
+    @Override
+    public void enableDebug() {
+        if (!logger.isDebugEnabled()) {
+            Configurator.setLevel(logger.getName(), Level.DEBUG);
+        }
+    }
+
+    @Override
+    public void disableDebug() {
+        if (logger.isDebugEnabled()) {
+            Configurator.setLevel(logger.getName(), Level.INFO);
+        }
+    }
 }
diff --git a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java
index 264a17b8..86d7a4fb 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java
@@ -41,10 +41,11 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.command.VelocityCommandRegistration;
 import org.geysermc.floodgate.config.FloodgateConfig;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
+import org.geysermc.floodgate.crypto.FloodgateCipher;
 import org.geysermc.floodgate.inject.CommonPlatformInjector;
 import org.geysermc.floodgate.inject.velocity.VelocityInjector;
 import org.geysermc.floodgate.listener.VelocityListenerRegistration;
-import org.geysermc.floodgate.logger.Slf4jLogger;
+import org.geysermc.floodgate.logger.Slf4jFloodgateLogger;
 import org.geysermc.floodgate.platform.command.CommandRegistration;
 import org.geysermc.floodgate.platform.command.util.CommandUtil;
 import org.geysermc.floodgate.platform.listener.ListenerRegistration;
@@ -67,14 +68,14 @@ public final class VelocityPlatformModule extends AbstractModule {
 
     @Provides
     @Singleton
-    public ProxyFloodgateApi proxyFloodgateApi() {
-        return new ProxyFloodgateApi();
+    public ProxyFloodgateApi proxyFloodgateApi(FloodgateCipher cipher) {
+        return new ProxyFloodgateApi(cipher);
     }
 
     @Provides
     @Singleton
     public FloodgateLogger floodgateLogger(Logger logger) {
-        return new Slf4jLogger(logger);
+        return new Slf4jFloodgateLogger(logger);
     }
 
     /*