Fix more stuff and add support for config phase

Author: Exceptionflug

pom.xml

@@ -20,7 +20,7 @@
         <maven.compiler.target>8</maven.compiler.target>
 
         <build.number>unknown</build.number>
-        <bungeecord.version>1.17-R0.1-SNAPSHOT</bungeecord.version>
+        <bungeecord.version>1.20-R0.2-SNAPSHOT</bungeecord.version>
         <velocity.version>3.2.0-SNAPSHOT</velocity.version>
         <bytebuddy.version>1.11.13</bytebuddy.version>
         <data.version>2.3.1</data.version>

protocolize-api/src/main/java/dev/simplix/protocolize/api/Protocol.java

@@ -9,6 +9,6 @@
  */
 public enum Protocol {
 
-    STATUS, HANDSHAKE, LOGIN, PLAY
+    STATUS, HANDSHAKE, LOGIN, PLAY, CONFIGURATION
 
 }

protocolize-bungeecord/src/main/java/dev/simplix/protocolize/bungee/netty/ProtocolizeDecoderChannelHandler.java

@@ -20,7 +20,6 @@
 import net.md_5.bungee.protocol.ProtocolConstants.Direction;
 
 import java.nio.channels.ClosedChannelException;
-import java.sql.Ref;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.logging.Level;
@@ -118,6 +117,8 @@ private dev.simplix.protocolize.api.Protocol protocolizeProtocol() {
                 return dev.simplix.protocolize.api.Protocol.STATUS;
             case HANDSHAKE:
                 return dev.simplix.protocolize.api.Protocol.HANDSHAKE;
+            case CONFIGURATION:
+                return dev.simplix.protocolize.api.Protocol.CONFIGURATION;
         }
         return null;
     }

protocolize-bungeecord/src/main/java/dev/simplix/protocolize/bungee/providers/BungeeCordPacketListenerProvider.java

@@ -137,7 +137,8 @@ public Map.Entry<DefinedPacket, Boolean> handleInboundPacket(DefinedPacket packe
             apiPacket = packet;
         }
         List<AbstractPacketListener<?>> listeners = listenersForType(clazz);
-        final boolean sentByServer = ReflectionUtil.downstreamBridgeClass.isInstance(abstractPacketHandler);
+        final boolean sentByServer = ReflectionUtil.downstreamBridgeClass.isInstance(abstractPacketHandler) ||
+            ReflectionUtil.serverConnectorClass.isInstance(abstractPacketHandler);
         final Connection connection = ReflectionUtil.getConnection(abstractPacketHandler, sentByServer);
         if (connection == null) {
             return null;
@@ -147,10 +148,7 @@ public Map.Entry<DefinedPacket, Boolean> handleInboundPacket(DefinedPacket packe
             Direction stream = it.direction();
             if (stream == Direction.DOWNSTREAM && sentByServer) {
                 return true;
-            } else if (stream == Direction.UPSTREAM && !sentByServer) {
-                return true;
-            }
-            return false;
+            } else return stream == Direction.UPSTREAM && !sentByServer;
         }).forEach(it -> {
             try {
                 it.packetReceive(event);

protocolize-velocity/src/main/java/dev/simplix/protocolize/velocity/providers/VelocityPacketListenerProvider.java

@@ -159,10 +159,7 @@ public Map.Entry<MinecraftPacket, Boolean> handleInboundPacket(MinecraftPacket p
             Direction stream = it.direction();
             if (stream == Direction.DOWNSTREAM && sentByServer) {
                 return true;
-            } else if (stream == Direction.UPSTREAM && !sentByServer) {
-                return true;
-            }
-            return false;
+            } else return stream == Direction.UPSTREAM && !sentByServer;
         }).forEach(it -> {
             try {
                 it.packetReceive(event);
@@ -225,10 +222,7 @@ public MinecraftPacket handleOutboundPacket(MinecraftPacket packet, InboundConne
             Direction stream = it.direction();
             if (stream == Direction.DOWNSTREAM && sentToServer) {
                 return true;
-            } else if (stream == Direction.UPSTREAM && !sentToServer) {
-                return true;
-            }
-            return false;
+            } else return stream == Direction.UPSTREAM && !sentToServer;
         }).forEach(it -> {
             try {
                 it.packetSend(event);

protocolize-velocity/src/main/java/dev/simplix/protocolize/velocity/providers/VelocityProtocolRegistrationProvider.java

@@ -243,6 +243,8 @@ private StateRegistry velocityProtocol(Protocol protocol) {
                 return StateRegistry.STATUS;
             case PLAY:
                 return StateRegistry.PLAY;
+            case CONFIGURATION:
+                return StateRegistry.CONFIG;
         }
         return null;
     }