v2.2.5: Add support for velocity 3.2.0-SNAPSHOT

#177

Author: Exceptionflug

README.md

@@ -31,7 +31,7 @@ We provide some documentation on how to migrate your existing plugin to use the
 <dependency>
     <groupId>dev.simplix</groupId>
     <artifactId>protocolize-api</artifactId>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <scope>provided</scope>
 </dependency>
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>dev.simplix</groupId>
     <artifactId>protocolize</artifactId>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -21,7 +21,7 @@
 
         <build.number>unknown</build.number>
         <bungeecord.version>1.17-R0.1-SNAPSHOT</bungeecord.version>
-        <velocity.version>3.1.0</velocity.version>
+        <velocity.version>3.2.0-SNAPSHOT</velocity.version>
         <bytebuddy.version>1.11.13</bytebuddy.version>
         <data.version>2.2.4</data.version>
     </properties>

protocolize-api/pom.xml

@@ -7,11 +7,11 @@
     <parent>
         <groupId>dev.simplix</groupId>
         <artifactId>protocolize</artifactId>
-        <version>2.2.4</version>
+        <version>2.2.5</version>
     </parent>
 
     <artifactId>protocolize-api</artifactId>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
 
     <dependencies>
         <dependency>

protocolize-bungeecord/pom.xml

@@ -7,11 +7,11 @@
     <parent>
         <groupId>dev.simplix</groupId>
         <artifactId>protocolize</artifactId>
-        <version>2.2.4</version>
+        <version>2.2.5</version>
     </parent>
 
     <artifactId>protocolize-bungeecord</artifactId>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>dev.simplix</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>2.2.4</version>
+            <version>2.2.5</version>
             <scope>compile</scope>
         </dependency>
 

protocolize-velocity/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>dev.simplix</groupId>
         <artifactId>protocolize</artifactId>
-        <version>2.2.4</version>
+        <version>2.2.5</version>
     </parent>
 
     <properties>
@@ -17,7 +17,7 @@
 
     <groupId>dev.simplix</groupId>
     <artifactId>protocolize-velocity</artifactId>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
 
     <dependencies>
         <dependency>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-proxy</artifactId>
-            <version>3.0.1</version>
+            <version>3.2.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>dev.simplix</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>2.2.4</version>
+            <version>2.2.5</version>
             <scope>compile</scope>
         </dependency>
 

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

@@ -158,7 +158,7 @@ public int packetId(Object packet, Protocol protocol, PacketDirection direction,
             if (stateRegistry == null) {
                 return -1;
             }
-            StateRegistry.PacketRegistry.ProtocolRegistry registry = velocityDirection.getProtocolRegistry(stateRegistry,
+            StateRegistry.PacketRegistry.ProtocolRegistry registry = stateRegistry.getProtocolRegistry(velocityDirection,
                 ProtocolVersion.getProtocolVersion(protocolVersion));
             return registry.getPacketId((MinecraftPacket) packet);
         }
@@ -177,7 +177,7 @@ public Object createPacket(Class<? extends AbstractPacket> clazz, Protocol proto
             log.debug("Unable to construct wrapper instance for " + clazz.getName() + ": Unknown protocol: " + protocol.name());
             return null;
         }
-        StateRegistry.PacketRegistry.ProtocolRegistry registry = velocityDirection.getProtocolRegistry(stateRegistry,
+        StateRegistry.PacketRegistry.ProtocolRegistry registry = stateRegistry.getProtocolRegistry(velocityDirection,
             ProtocolVersion.getProtocolVersion(protocolVersion));
         ProtocolIdMapping protocolIdMapping = mappingProvider.mapping(new RegisteredPacket(direction, clazz), protocolVersion);
         if (protocolIdMapping != null) {
@@ -202,7 +202,7 @@ private String examineDirection(ProtocolUtils.Direction direction) {
             builder.append("  - ").append(stateRegistry.name()).append(":\n");
             for (ProtocolVersion version : ProtocolVersion.SUPPORTED_VERSIONS) {
                 builder.append("    - ").append("Minecraft ").append(version.getVersionsSupportedBy()).append(":\n");
-                StateRegistry.PacketRegistry.ProtocolRegistry registry = direction.getProtocolRegistry(stateRegistry, version);
+                StateRegistry.PacketRegistry.ProtocolRegistry registry = stateRegistry.getProtocolRegistry(direction, version);
                 Map<Class<? extends MinecraftPacket>, Integer> packetMap = (Map<Class<? extends MinecraftPacket>, Integer>) packetClassToIdField.get(registry);
                 for (Class<? extends MinecraftPacket> clazz : packetMap.keySet()) {
                     builder.append("      - ").append(clazz.getName()).append(" id = 0x").append(Integer.toHexString(packetMap.get(clazz))).append("\n");