Minecraft 1.19 support

api/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-api</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-API</name>
@@ -52,21 +52,21 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-resolver-provider</artifactId>
-            <version>3.8.4</version>
+            <version>3.8.5</version>
             <!-- not part of the API proper -->
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-connector-basic</artifactId>
-            <version>1.7.2</version>
+            <version>1.8.0</version>
             <!-- not part of the API proper -->
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-transport-http</artifactId>
-            <version>1.7.2</version>
+            <version>1.8.0</version>
             <!-- not part of the API proper -->
             <scope>provided</scope>
         </dependency>

bootstrap/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-bootstrap</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Bootstrap</name>

chat/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-chat</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Chat</name>

config/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-config</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Config</name>

event/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-event</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Event</name>

log/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-log</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Log</name>

module/cmd-alert/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-alert</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_alert</name>

module/cmd-find/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-find</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_find</name>

module/cmd-list/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-list</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_list</name>

module/cmd-send/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-send</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_send</name>

module/cmd-server/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-server</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_server</name>

module/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord Modules</name>

module/reconnect-yaml/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-reconnect-yaml</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>reconnect_yaml</name>

native/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-native</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Native</name>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-parent</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord-Parent</name>
@@ -73,7 +73,7 @@
     <properties>
         <build.number>unknown</build.number>
         <lombok.version>1.18.22</lombok.version>
-        <netty.version>4.1.72.Final</netty.version>
+        <netty.version>4.1.77.Final</netty.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

protocol/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-protocol</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Protocol</name>

protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java

@@ -3,6 +3,8 @@ package net.md_5.bungee.protocol;
 import net.md_5.bungee.protocol.packet.BossBar;
 import net.md_5.bungee.protocol.packet.Chat;
 import net.md_5.bungee.protocol.packet.ClearTitles;
+import net.md_5.bungee.protocol.packet.ClientChat;
+import net.md_5.bungee.protocol.packet.ClientCommand;
 import net.md_5.bungee.protocol.packet.ClientSettings;
 import net.md_5.bungee.protocol.packet.ClientStatus;
 import net.md_5.bungee.protocol.packet.Commands;
@@ -21,6 +23,7 @@ import net.md_5.bungee.protocol.packet.LoginPayloadResponse;
 import net.md_5.bungee.protocol.packet.LoginRequest;
 import net.md_5.bungee.protocol.packet.LoginSuccess;
 import net.md_5.bungee.protocol.packet.PingPacket;
+import net.md_5.bungee.protocol.packet.PlayerChat;
 import net.md_5.bungee.protocol.packet.PlayerListHeaderFooter;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
 import net.md_5.bungee.protocol.packet.PluginMessage;
@@ -32,6 +35,7 @@ import net.md_5.bungee.protocol.packet.SetCompression;
 import net.md_5.bungee.protocol.packet.StatusRequest;
 import net.md_5.bungee.protocol.packet.StatusResponse;
 import net.md_5.bungee.protocol.packet.Subtitle;
+import net.md_5.bungee.protocol.packet.SystemChat;
 import net.md_5.bungee.protocol.packet.TabCompleteRequest;
 import net.md_5.bungee.protocol.packet.TabCompleteResponse;
 import net.md_5.bungee.protocol.packet.Team;
@@ -78,6 +82,22 @@ public abstract class AbstractPacketHandler
     {
     }
 
+    public void handle(ClientChat chat) throws Exception
+    {
+    }
+
+    public void handle(PlayerChat chat) throws Exception
+    {
+    }
+
+    public void handle(SystemChat chat) throws Exception
+    {
+    }
+
+    public void handle(ClientCommand command) throws Exception
+    {
+    }
+
     public void handle(Respawn respawn) throws Exception
     {
     }

protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java

@@ -214,6 +214,67 @@ public abstract class DefinedPacket
         return new UUID( input.readLong(), input.readLong() );
     }
 
+    public static void writeProperties(Property[] properties, ByteBuf buf)
+    {
+        writeVarInt( properties.length, buf );
+        for ( Property prop : properties )
+        {
+            writeString( prop.getName(), buf );
+            writeString( prop.getValue(), buf );
+            if ( prop.getSignature() != null )
+            {
+                buf.writeBoolean( true );
+                writeString( prop.getSignature(), buf );
+            } else
+            {
+                buf.writeBoolean( false );
+            }
+        }
+    }
+
+    public static Property[] readProperties(ByteBuf buf)
+    {
+        Property[] properties = new Property[ DefinedPacket.readVarInt( buf ) ];
+        for ( int j = 0; j < properties.length; j++ )
+        {
+            String name = readString( buf );
+            String value = readString( buf );
+            if ( buf.readBoolean() )
+            {
+                properties[j] = new Property( name, value, DefinedPacket.readString( buf ) );
+            } else
+            {
+                properties[j] = new Property( name, value );
+            }
+        }
+
+        return properties;
+    }
+
+    public static void writePublicKey(PlayerPublicKey publicKey, ByteBuf buf)
+    {
+        if ( publicKey != null )
+        {
+            buf.writeBoolean( true );
+            buf.writeLong( publicKey.getExpiry() );
+            writeArray( publicKey.getKey(), buf );
+            writeArray( publicKey.getSignature(), buf );
+        } else
+        {
+            buf.writeBoolean( false );
+        }
+    }
+
+    public static PlayerPublicKey readPublicKey(ByteBuf buf)
+    {
+        if ( buf.readBoolean() )
+        {
+            return new PlayerPublicKey( buf.readLong(), readArray( buf ), readArray( buf ) );
+        }
+
+        return null;
+    }
+
     public static Tag readTag(ByteBuf input)
     {
         Tag tag = NamedTag.read( new DataInputStream( new ByteBufInputStream( input ) ) );

protocol/src/main/java/net/md_5/bungee/protocol/Location.java

@@ -0,0 +1,11 @@
+package net.md_5.bungee.protocol;
+
+import lombok.Data;
+
+@Data
+public class Location
+{
+
+    private final String dimension;
+    private final long pos;
+}

protocol/src/main/java/net/md_5/bungee/protocol/PlayerPublicKey.java

@@ -0,0 +1,12 @@
+package net.md_5.bungee.protocol;
+
+import lombok.Data;
+
+@Data
+public class PlayerPublicKey
+{
+
+    private final long expiry;
+    private final byte[] key;
+    private final byte[] signature;
+}

protocol/src/main/java/net/md_5/bungee/protocol/Property.java

@@ -0,0 +1,19 @@
+package net.md_5.bungee.protocol;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class Property
+{
+
+    private String name;
+    private String value;
+    private String signature;
+
+    public Property(String name, String value)
+    {
+        this( name, value, null );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java

@@ -12,6 +12,8 @@ import lombok.Getter;
 import net.md_5.bungee.protocol.packet.BossBar;
 import net.md_5.bungee.protocol.packet.Chat;
 import net.md_5.bungee.protocol.packet.ClearTitles;
+import net.md_5.bungee.protocol.packet.ClientChat;
+import net.md_5.bungee.protocol.packet.ClientCommand;
 import net.md_5.bungee.protocol.packet.ClientSettings;
 import net.md_5.bungee.protocol.packet.Commands;
 import net.md_5.bungee.protocol.packet.EncryptionRequest;
@@ -27,6 +29,7 @@ import net.md_5.bungee.protocol.packet.LoginPayloadResponse;
 import net.md_5.bungee.protocol.packet.LoginRequest;
 import net.md_5.bungee.protocol.packet.LoginSuccess;
 import net.md_5.bungee.protocol.packet.PingPacket;
+import net.md_5.bungee.protocol.packet.PlayerChat;
 import net.md_5.bungee.protocol.packet.PlayerListHeaderFooter;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
 import net.md_5.bungee.protocol.packet.PluginMessage;
@@ -38,6 +41,7 @@ import net.md_5.bungee.protocol.packet.SetCompression;
 import net.md_5.bungee.protocol.packet.StatusRequest;
 import net.md_5.bungee.protocol.packet.StatusResponse;
 import net.md_5.bungee.protocol.packet.Subtitle;
+import net.md_5.bungee.protocol.packet.SystemChat;
 import net.md_5.bungee.protocol.packet.TabCompleteRequest;
 import net.md_5.bungee.protocol.packet.TabCompleteResponse;
 import net.md_5.bungee.protocol.packet.Team;
@@ -75,7 +79,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x21 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x20 ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x1F ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x21 )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x21 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x1E )
             );
             TO_CLIENT.registerPacket(
                     Login.class,
@@ -86,17 +91,18 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x26 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x25 ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x24 ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x26 )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x26 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x23 )
             );
-            TO_CLIENT.registerPacket(
+            TO_CLIENT.registerPacket( Chat.class,
-                    Chat.class,
                     Chat::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x0F ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x0F ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x0E ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x0F )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x0F ),
+                    map( ProtocolConstants.MINECRAFT_1_19, -1 )
             );
             TO_CLIENT.registerPacket(
                     Respawn.class,
@@ -110,7 +116,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x3B ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x3A ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x39 ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x3D )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x3D ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x3B )
             );
             TO_CLIENT.registerPacket(
                     BossBar.class,
@@ -118,7 +125,13 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_9, 0x0C ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x0D ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x0C ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x0D )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x0D ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0A )
+            );
+            TO_CLIENT.registerPacket(
+                    PlayerChat.class,
+                    PlayerChat::new,
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x30 )
             );
             TO_CLIENT.registerPacket(
                     PlayerListItem.class, // PlayerInfo
@@ -131,7 +144,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x34 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x33 ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x32 ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x36 )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x36 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x34 )
             );
             TO_CLIENT.registerPacket(
                     TabCompleteResponse.class,
@@ -142,7 +156,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x11 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x10 ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x0F ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x11 )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x11 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0E )
             );
             TO_CLIENT.registerPacket(
                     ScoreboardObjective.class,
@@ -202,7 +217,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x19 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x18 ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x17 ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x18 )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x18 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x15 )
             );
             TO_CLIENT.registerPacket(
                     Kick.class,
@@ -214,7 +230,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x1B ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x1A ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x19 ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x1A )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x1A ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x17 )
             );
             TO_CLIENT.registerPacket(
                     Title.class,
@@ -232,7 +249,8 @@ public enum Protocol
             TO_CLIENT.registerPacket(
                     ClearTitles.class,
                     ClearTitles::new,
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x10 )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x10 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0D )
             );
             TO_CLIENT.registerPacket(
                     Subtitle.class,
@@ -246,6 +264,11 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_17, 0x5A ),
                     map( ProtocolConstants.MINECRAFT_1_18, 0x5B )
             );
+            TO_CLIENT.registerPacket(
+                    SystemChat.class,
+                    SystemChat::new,
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x5F )
+            );
             TO_CLIENT.registerPacket(
                     PlayerListHeaderFooter.class,
                     PlayerListHeaderFooter::new,
@@ -259,7 +282,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x54 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x53 ),
                     map( ProtocolConstants.MINECRAFT_1_17, 0x5E ),
-                    map( ProtocolConstants.MINECRAFT_1_18, 0x5F )
+                    map( ProtocolConstants.MINECRAFT_1_18, 0x5F ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x60 )
             );
             TO_CLIENT.registerPacket(
                     EntityStatus.class,
@@ -271,7 +295,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x1C ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x1B ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x1A ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x1B )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x1B ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x18 )
             );
             TO_CLIENT.registerPacket(
                     Commands.class,
@@ -280,7 +305,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x12 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x11 ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x10 ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x12 )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x12 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0F )
             );
             TO_CLIENT.registerPacket(
                     GameState.class,
@@ -288,7 +314,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_15, 0x1F ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x1E ),
                     map( ProtocolConstants.MINECRAFT_1_16_2, 0x1D ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x1E )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x1E ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x1B )
             );
             TO_CLIENT.registerPacket(
                     ViewDistance.class,
@@ -296,7 +323,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_14, 0x41 ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x42 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x41 ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x4A )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x4A ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x49 )
             );
 
             TO_SERVER.registerPacket(
@@ -309,16 +337,27 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x0F ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x10 ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x0F )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x0F ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x11 )
             );
-            TO_SERVER.registerPacket(
+            TO_SERVER.registerPacket( Chat.class,
-                    Chat.class,
                     Chat::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x03 ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x02 ),
-                    map( ProtocolConstants.MINECRAFT_1_14, 0x03 )
+                    map( ProtocolConstants.MINECRAFT_1_14, 0x03 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, -1 )
+            );
+            TO_SERVER.registerPacket(
+                    ClientCommand.class,
+                    ClientCommand::new,
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x03 )
+            );
+            TO_SERVER.registerPacket(
+                    ClientChat.class,
+                    ClientChat::new,
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x04 )
             );
             TO_SERVER.registerPacket(
                     TabCompleteRequest.class,
@@ -328,7 +367,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_12, 0x02 ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x01 ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x05 ),
-                    map( ProtocolConstants.MINECRAFT_1_14, 0x06 )
+                    map( ProtocolConstants.MINECRAFT_1_14, 0x06 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x08 )
             );
             TO_SERVER.registerPacket(
                     ClientSettings.class,
@@ -337,7 +377,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x05 ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x04 ),
-                    map( ProtocolConstants.MINECRAFT_1_14, 0x05 )
+                    map( ProtocolConstants.MINECRAFT_1_14, 0x05 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x07 )
             );
             TO_SERVER.registerPacket(
                     PluginMessage.class,
@@ -348,7 +389,8 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x09 ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x0A ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x0B ),
-                    map( ProtocolConstants.MINECRAFT_1_17, 0x0A )
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x0A ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0C )
             );
         }
     },
@@ -554,6 +596,11 @@ public enum Protocol
                 {
                     // Mapping is non current, but the next one may be ok
                     ProtocolMapping nextMapping = mappings[mappingIndex + 1];
+                    if ( nextMapping.packetID < 0 )
+                    {
+                        break;
+                    }
+
                     if ( nextMapping.protocolVersion == protocol )
                     {
                         Preconditions.checkState( nextMapping.packetID != mapping.packetID, "Duplicate packet mapping (%s, %s)", mapping.protocolVersion, nextMapping.protocolVersion );

protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java

@@ -38,6 +38,7 @@ public class ProtocolConstants
     public static final int MINECRAFT_1_17_1 = 756;
     public static final int MINECRAFT_1_18 = 757;
     public static final int MINECRAFT_1_18_2 = 758;
+    public static final int MINECRAFT_1_19 = 759;
     public static final List<String> SUPPORTED_VERSIONS;
     public static final List<Integer> SUPPORTED_VERSION_IDS;
 
@@ -54,7 +55,8 @@ public class ProtocolConstants
                 "1.15.x",
                 "1.16.x",
                 "1.17.x",
-                "1.18.x"
+                "1.18.x",
+                "1.19.x"
         );
         ImmutableList.Builder<Integer> supportedVersionIds = ImmutableList.<Integer>builder().add(
                 ProtocolConstants.MINECRAFT_1_8,
@@ -87,13 +89,14 @@ public class ProtocolConstants
                 ProtocolConstants.MINECRAFT_1_17,
                 ProtocolConstants.MINECRAFT_1_17_1,
                 ProtocolConstants.MINECRAFT_1_18,
-                ProtocolConstants.MINECRAFT_1_18_2
+                ProtocolConstants.MINECRAFT_1_18_2,
+                ProtocolConstants.MINECRAFT_1_19
         );
 
         if ( SNAPSHOT_SUPPORT )
         {
-            // supportedVersions.add( "1.18.x" );
+            // supportedVersions.add( "1.19.x" );
-            // supportedVersionIds.add( ProtocolConstants.MINECRAFT_1_18 );
+            // supportedVersionIds.add( ProtocolConstants.MINECRAFT_1_19 );
         }
 
         SUPPORTED_VERSIONS = supportedVersions.build();

protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java

@@ -0,0 +1,50 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import net.md_5.bungee.protocol.AbstractPacketHandler;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class ClientChat extends DefinedPacket
+{
+
+    private String message;
+    private long timestamp;
+    private long salt;
+    private byte[] signature;
+    private boolean signedPreview;
+
+    @Override
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        message = readString( buf, 256 );
+        timestamp = buf.readLong();
+        salt = buf.readLong();
+        signature = readArray( buf );
+        signedPreview = buf.readBoolean();
+    }
+
+    @Override
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        writeString( message, buf );
+        buf.writeLong( timestamp );
+        buf.writeLong( salt );
+        writeArray( signature, buf );
+        buf.writeBoolean( signedPreview );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java

@@ -0,0 +1,68 @@
+package net.md_5.bungee.protocol.packet;
+
+import com.google.common.base.Preconditions;
+import io.netty.buffer.ByteBuf;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import net.md_5.bungee.protocol.AbstractPacketHandler;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class ClientCommand extends DefinedPacket
+{
+
+    private String command;
+    private long timestamp;
+    private long salt;
+    private Map<String, byte[]> signatures;
+    private boolean signedPreview;
+
+    @Override
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        command = readString( buf );
+        timestamp = buf.readLong();
+        salt = buf.readLong();
+
+        int cnt = readVarInt( buf );
+        Preconditions.checkArgument( cnt <= 8, "Too many signatures" );
+        signatures = new HashMap<>( cnt );
+        for ( int i = 0; i < cnt; i++ )
+        {
+            signatures.put( readString( buf, 16 ), readArray( buf ) );
+        }
+
+        signedPreview = buf.readBoolean();
+    }
+
+    @Override
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        writeString( command, buf );
+        buf.writeLong( timestamp );
+        buf.writeLong( salt );
+
+        writeVarInt( signatures.size(), buf );
+        for ( Map.Entry<String, byte[]> entry : signatures.entrySet() )
+        {
+            writeString( entry.getKey(), buf );
+            writeArray( entry.getValue(), buf );
+        }
+
+        buf.writeBoolean( signedPreview );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java

@@ -23,11 +23,13 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayDeque;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import lombok.AllArgsConstructor;
@@ -36,6 +38,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
 
 @Data
 @NoArgsConstructor
@@ -56,7 +59,7 @@ public class Commands extends DefinedPacket
     private RootCommandNode root;
 
     @Override
-    public void read(ByteBuf buf)
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
         int nodeCount = readVarInt( buf );
         NetworkNode[] nodes = new NetworkNode[ nodeCount ];
@@ -79,9 +82,7 @@ public class Commands extends DefinedPacket
                     break;
                 case NODE_ARGUMENT:
                     String name = readString( buf );
-                    String parser = readString( buf );
+                    argumentBuilder = RequiredArgumentBuilder.argument( name, ArgumentRegistry.read( buf, protocolVersion ) );
-
-                    argumentBuilder = RequiredArgumentBuilder.argument( name, ArgumentRegistry.read( parser, buf ) );
 
                     if ( ( flags & FLAG_SUGGESTIONS ) != 0 )
                     {
@@ -126,7 +127,7 @@ public class Commands extends DefinedPacket
     }
 
     @Override
-    public void write(ByteBuf buf)
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
         Map<CommandNode, Integer> indexMap = new LinkedHashMap<>();
         Deque<CommandNode> nodeQueue = new ArrayDeque<>();
@@ -210,7 +211,7 @@ public class Commands extends DefinedPacket
                 ArgumentCommandNode argumentNode = (ArgumentCommandNode) node;
 
                 writeString( argumentNode.getName(), buf );
-                ArgumentRegistry.write( argumentNode.getType(), buf );
+                ArgumentRegistry.write( argumentNode.getType(), buf, protocolVersion );
 
                 if ( argumentNode.getCustomSuggestions() != null )
                 {
@@ -308,6 +309,7 @@ public class Commands extends DefinedPacket
     {
 
         private static final Map<String, ArgumentSerializer> PROVIDERS = new HashMap<>();
+        private static final List<ArgumentSerializer> PROVIDER_LIST = new ArrayList<>();
         private static final Map<Class<?>, ProperArgumentSerializer<?>> PROPER_PROVIDERS = new HashMap<>();
         //
         private static final ArgumentSerializer<Void> VOID = new ArgumentSerializer<Void>()
@@ -492,6 +494,12 @@ public class Commands extends DefinedPacket
                 writeVarInt( t.getType().ordinal(), buf );
             }
 
+            @Override
+            protected int getIntKey()
+            {
+                return 5;
+            }
+
             @Override
             protected String getKey()
             {
@@ -515,82 +523,113 @@ public class Commands extends DefinedPacket
 
         static
         {
-            PROVIDERS.put( "brigadier:bool", VOID );
+            register( "brigadier:bool", VOID );
-            PROVIDERS.put( "brigadier:float", FLOAT );
+            register( "brigadier:float", FLOAT );
-            PROVIDERS.put( "brigadier:double", DOUBLE );
+            register( "brigadier:double", DOUBLE );
-            PROVIDERS.put( "brigadier:integer", INTEGER );
+            register( "brigadier:integer", INTEGER );
-            PROVIDERS.put( "brigadier:long", LONG );
+            register( "brigadier:long", LONG );
 
-            PROVIDERS.put( "brigadier:string", STRING );
+            register( "brigadier:string", STRING );
             PROPER_PROVIDERS.put( StringArgumentType.class, STRING );
 
-            PROVIDERS.put( "minecraft:entity", BYTE );
+            register( "minecraft:entity", BYTE );
-            PROVIDERS.put( "minecraft:game_profile", VOID );
+            register( "minecraft:game_profile", VOID );
-            PROVIDERS.put( "minecraft:block_pos", VOID );
+            register( "minecraft:block_pos", VOID );
-            PROVIDERS.put( "minecraft:column_pos", VOID );
+            register( "minecraft:column_pos", VOID );
-            PROVIDERS.put( "minecraft:vec3", VOID );
+            register( "minecraft:vec3", VOID );
-            PROVIDERS.put( "minecraft:vec2", VOID );
+            register( "minecraft:vec2", VOID );
-            PROVIDERS.put( "minecraft:block_state", VOID );
+            register( "minecraft:block_state", VOID );
-            PROVIDERS.put( "minecraft:block_predicate", VOID );
+            register( "minecraft:block_predicate", VOID );
-            PROVIDERS.put( "minecraft:item_stack", VOID );
+            register( "minecraft:item_stack", VOID );
-            PROVIDERS.put( "minecraft:item_predicate", VOID );
+            register( "minecraft:item_predicate", VOID );
-            PROVIDERS.put( "minecraft:color", VOID );
+            register( "minecraft:color", VOID );
-            PROVIDERS.put( "minecraft:component", VOID );
+            register( "minecraft:component", VOID );
-            PROVIDERS.put( "minecraft:message", VOID );
+            register( "minecraft:message", VOID );
-            PROVIDERS.put( "minecraft:nbt_compound_tag", VOID ); // 1.14
+            register( "minecraft:nbt_compound_tag", VOID ); // 1.14
-            PROVIDERS.put( "minecraft:nbt_tag", VOID ); // 1.14
+            register( "minecraft:nbt_tag", VOID ); // 1.14
-            PROVIDERS.put( "minecraft:nbt", VOID ); // 1.13
+            register( "minecraft:nbt_path", VOID );
-            PROVIDERS.put( "minecraft:nbt_path", VOID );
+            register( "minecraft:objective", VOID );
-            PROVIDERS.put( "minecraft:objective", VOID );
+            register( "minecraft:objective_criteria", VOID );
-            PROVIDERS.put( "minecraft:objective_criteria", VOID );
+            register( "minecraft:operation", VOID );
-            PROVIDERS.put( "minecraft:operation", VOID );
+            register( "minecraft:particle", VOID );
-            PROVIDERS.put( "minecraft:particle", VOID );
+            register( "minecraft:angle", VOID ); // 1.16.2
-            PROVIDERS.put( "minecraft:rotation", VOID );
+            register( "minecraft:rotation", VOID );
-            PROVIDERS.put( "minecraft:scoreboard_slot", VOID );
+            register( "minecraft:scoreboard_slot", VOID );
-            PROVIDERS.put( "minecraft:score_holder", BYTE );
+            register( "minecraft:score_holder", BYTE );
-            PROVIDERS.put( "minecraft:swizzle", VOID );
+            register( "minecraft:swizzle", VOID );
-            PROVIDERS.put( "minecraft:team", VOID );
+            register( "minecraft:team", VOID );
-            PROVIDERS.put( "minecraft:item_slot", VOID );
+            register( "minecraft:item_slot", VOID );
-            PROVIDERS.put( "minecraft:resource_location", VOID );
+            register( "minecraft:resource_location", VOID );
-            PROVIDERS.put( "minecraft:mob_effect", VOID );
+            register( "minecraft:mob_effect", VOID );
-            PROVIDERS.put( "minecraft:function", VOID );
+            register( "minecraft:function", VOID );
-            PROVIDERS.put( "minecraft:entity_anchor", VOID );
+            register( "minecraft:entity_anchor", VOID );
-            PROVIDERS.put( "minecraft:int_range", VOID );
+            register( "minecraft:int_range", VOID );
-            PROVIDERS.put( "minecraft:float_range", VOID );
+            register( "minecraft:float_range", VOID );
-            PROVIDERS.put( "minecraft:item_enchantment", VOID );
+            register( "minecraft:item_enchantment", VOID );
-            PROVIDERS.put( "minecraft:entity_summon", VOID );
+            register( "minecraft:entity_summon", VOID );
-            PROVIDERS.put( "minecraft:dimension", VOID );
+            register( "minecraft:dimension", VOID );
-            PROVIDERS.put( "minecraft:time", VOID ); // 1.14
+            register( "minecraft:time", VOID ); // 1.14
-            PROVIDERS.put( "minecraft:uuid", VOID ); // 1.16
+            register( "minecraft:resource_or_tag", RAW_STRING ); // 1.18.2
-            PROVIDERS.put( "minecraft:test_argument", VOID ); // 1.16, debug
+            register( "minecraft:resource", RAW_STRING ); // 1.18.2
-            PROVIDERS.put( "minecraft:test_class", VOID ); // 1.16, debug
+            register( "minecraft:template_mirror", VOID ); // 1.19
-            PROVIDERS.put( "minecraft:angle", VOID ); // 1.16.2
+            register( "minecraft:template_rotation", VOID ); // 1.19
-            PROVIDERS.put( "minecraft:resource", RAW_STRING ); // 1.18.2
+            register( "minecraft:uuid", VOID ); // 1.16
-            PROVIDERS.put( "minecraft:resource_or_tag", RAW_STRING ); // 1.18.2
+
+            register( "minecraft:nbt", VOID ); // 1.13 // removed
         }
 
-        private static ArgumentType<?> read(String key, ByteBuf buf)
+        private static void register(String name, ArgumentSerializer serializer)
         {
-            ArgumentSerializer reader = PROVIDERS.get( key );
+            PROVIDERS.put( name, serializer );
+            PROVIDER_LIST.add( serializer );
+        }
+
+        private static ArgumentType<?> read(ByteBuf buf, int protocolVersion)
+        {
+            Object key;
+            ArgumentSerializer reader;
+
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+            {
+                key = readVarInt( buf );
+                reader = PROVIDER_LIST.get( (Integer) key );
+            } else
+            {
+                key = readString( buf );
+                reader = PROVIDERS.get( (String) key );
+            }
+
             Preconditions.checkArgument( reader != null, "No provider for argument " + key );
 
             Object val = reader.read( buf );
             return val != null && PROPER_PROVIDERS.containsKey( val.getClass() ) ? (ArgumentType<?>) val : new DummyType( key, reader, val );
         }
 
-        private static void write(ArgumentType<?> arg, ByteBuf buf)
+        private static void write(ArgumentType<?> arg, ByteBuf buf, int protocolVersion)
         {
             ProperArgumentSerializer proper = PROPER_PROVIDERS.get( arg.getClass() );
             if ( proper != null )
             {
-                writeString( proper.getKey(), buf );
+                if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+                {
+                    writeVarInt( proper.getIntKey(), buf );
+                } else
+                {
+                    writeString( proper.getKey(), buf );
+                }
                 proper.write( buf, arg );
             } else
             {
                 Preconditions.checkArgument( arg instanceof DummyType, "Non dummy arg " + arg.getClass() );
 
                 DummyType dummy = (DummyType) arg;
-                writeString( dummy.key, buf );
+                if ( dummy.key instanceof Integer )
+                {
+                    writeVarInt( (Integer) dummy.key, buf );
+                } else
+                {
+                    writeString( (String) dummy.key, buf );
+                }
                 dummy.serializer.write( buf, dummy.value );
             }
         }
@@ -599,7 +638,7 @@ public class Commands extends DefinedPacket
         private static class DummyType<T> implements ArgumentType<T>
         {
 
-            private final String key;
+            private final Object key;
             private final ArgumentSerializer<T> serializer;
             private final T value;
 
@@ -621,6 +660,8 @@ public class Commands extends DefinedPacket
         private abstract static class ProperArgumentSerializer<T> extends ArgumentSerializer<T>
         {
 
+            protected abstract int getIntKey();
+
             protected abstract String getKey();
         }
     }

protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java

@@ -18,19 +18,36 @@ public class EncryptionResponse extends DefinedPacket
 
     private byte[] sharedSecret;
     private byte[] verifyToken;
+    private EncryptionData encryptionData;
 
-    @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
         sharedSecret = readArray( buf, 128 );
-        verifyToken = readArray( buf, 128 );
+        if ( protocolVersion < ProtocolConstants.MINECRAFT_1_19 || buf.readBoolean() )
+        {
+            verifyToken = readArray( buf, 128 );
+        } else
+        {
+            encryptionData = new EncryptionData( buf.readLong(), readArray( buf ) );
+        }
     }
 
     @Override
     public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
         writeArray( sharedSecret, buf );
-        writeArray( verifyToken, buf );
+        if ( verifyToken != null )
+        {
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+            {
+                buf.writeBoolean( true );
+            }
+            writeArray( verifyToken, buf );
+        } else
+        {
+            buf.writeLong( encryptionData.getSalt() );
+            writeArray( encryptionData.getSignature(), buf );
+        }
     }
 
     @Override
@@ -38,4 +55,12 @@ public class EncryptionResponse extends DefinedPacket
     {
         handler.handle( this );
     }
+
+    @Data
+    public static class EncryptionData
+    {
+
+        private final long salt;
+        private final byte[] signature;
+    }
 }

protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.Location;
 import net.md_5.bungee.protocol.ProtocolConstants;
 import se.llbit.nbt.Tag;
 
@@ -37,6 +38,7 @@ public class Login extends DefinedPacket
     private boolean normalRespawn;
     private boolean debug;
     private boolean flat;
+    private Location deathLocation;
 
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
@@ -63,7 +65,7 @@ public class Login extends DefinedPacket
 
         if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
         {
-            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 )
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 && protocolVersion < ProtocolConstants.MINECRAFT_1_19 )
             {
                 dimension = readTag( buf );
             } else
@@ -118,6 +120,13 @@ public class Login extends DefinedPacket
             debug = buf.readBoolean();
             flat = buf.readBoolean();
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            if ( buf.readBoolean() )
+            {
+                deathLocation = new Location( readString( buf ), buf.readLong() );
+            }
+        }
     }
 
     @Override
@@ -144,7 +153,7 @@ public class Login extends DefinedPacket
 
         if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
         {
-            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 )
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 && protocolVersion < ProtocolConstants.MINECRAFT_1_19 )
             {
                 writeTag( (Tag) dimension, buf );
             } else
@@ -199,6 +208,18 @@ public class Login extends DefinedPacket
             buf.writeBoolean( debug );
             buf.writeBoolean( flat );
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            if ( deathLocation != null )
+            {
+                buf.writeBoolean( true );
+                writeString( deathLocation.getDimension(), buf );
+                buf.writeLong( deathLocation.getPos() );
+            } else
+            {
+                buf.writeBoolean( false );
+            }
+        }
     }
 
     @Override

protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java

@@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.PlayerPublicKey;
+import net.md_5.bungee.protocol.ProtocolConstants;
 
 @Data
 @NoArgsConstructor
@@ -16,17 +18,26 @@ public class LoginRequest extends DefinedPacket
 {
 
     private String data;
+    private PlayerPublicKey publicKey;
 
     @Override
-    public void read(ByteBuf buf)
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
         data = readString( buf, 16 );
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            publicKey = readPublicKey( buf );
+        }
     }
 
     @Override
-    public void write(ByteBuf buf)
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
         writeString( data, buf );
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            writePublicKey( publicKey, buf );
+        }
     }
 
     @Override

protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.Property;
 import net.md_5.bungee.protocol.ProtocolConstants;
 
 @Data
@@ -19,6 +20,7 @@ public class LoginSuccess extends DefinedPacket
 
     private UUID uuid;
     private String username;
+    private Property[] properties;
 
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
@@ -31,6 +33,10 @@ public class LoginSuccess extends DefinedPacket
             uuid = UUID.fromString( readString( buf ) );
         }
         username = readString( buf );
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            properties = readProperties( buf );
+        }
     }
 
     @Override
@@ -44,6 +50,10 @@ public class LoginSuccess extends DefinedPacket
             writeString( uuid.toString(), buf );
         }
         writeString( username, buf );
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            writeProperties( properties, buf );
+        }
     }
 
     @Override

protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerChat.java

@@ -0,0 +1,84 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import java.util.UUID;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import net.md_5.bungee.protocol.AbstractPacketHandler;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class PlayerChat extends DefinedPacket
+{
+
+    private static final UUID EMPTY_UUID = new UUID( 0L, 0L );
+    private String signedContent;
+    private String unsignedContent; // nullable
+    private UUID sender;
+    private int typeId;
+    private String displayName;
+    private String teamName; // nullable
+    private long timestamp;
+    private long salt;
+    private byte[] signature;
+
+    @Override
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        signedContent = readString( buf, 262144 );
+        if ( buf.readBoolean() )
+        {
+            unsignedContent = readString( buf, 262144 );
+        }
+        typeId = readVarInt( buf );
+        sender = readUUID( buf );
+        displayName = readString( buf, 262144 );
+        if ( buf.readBoolean() )
+        {
+            teamName = readString( buf, 262144 );
+        }
+        timestamp = buf.readLong();
+        salt = buf.readLong();
+        signature = readArray( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        writeString( signedContent, buf );
+        if ( unsignedContent != null )
+        {
+            buf.writeBoolean( true );
+            writeString( unsignedContent, buf );
+        } else
+        {
+            buf.writeBoolean( false );
+        }
+        writeVarInt( typeId, buf );
+        writeUUID( sender, buf );
+        writeString( displayName, buf );
+        if ( teamName != null )
+        {
+            buf.writeBoolean( true );
+            writeString( teamName, buf );
+        } else
+        {
+            buf.writeBoolean( false );
+        }
+        buf.writeLong( timestamp );
+        buf.writeLong( salt );
+        writeArray( signature, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java

@@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.PlayerPublicKey;
+import net.md_5.bungee.protocol.Property;
 import net.md_5.bungee.protocol.ProtocolConstants;
 
 @Data
@@ -31,31 +33,17 @@ public class PlayerListItem extends DefinedPacket
             {
                 case ADD_PLAYER:
                     item.username = DefinedPacket.readString( buf );
-                    item.properties = new String[ DefinedPacket.readVarInt( buf ) ][];
+                    item.properties = DefinedPacket.readProperties( buf );
-                    for ( int j = 0; j < item.properties.length; j++ )
-                    {
-                        String name = DefinedPacket.readString( buf );
-                        String value = DefinedPacket.readString( buf );
-                        if ( buf.readBoolean() )
-                        {
-                            item.properties[j] = new String[]
-                            {
-                                name, value, DefinedPacket.readString( buf )
-                            };
-                        } else
-                        {
-                            item.properties[j] = new String[]
-                            {
-                                name, value
-                            };
-                        }
-                    }
                     item.gamemode = DefinedPacket.readVarInt( buf );
                     item.ping = DefinedPacket.readVarInt( buf );
                     if ( buf.readBoolean() )
                     {
                         item.displayName = DefinedPacket.readString( buf );
                     }
+                    if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+                    {
+                        item.publicKey = readPublicKey( buf );
+                    }
                     break;
                 case UPDATE_GAMEMODE:
                     item.gamemode = DefinedPacket.readVarInt( buf );
@@ -84,20 +72,7 @@ public class PlayerListItem extends DefinedPacket
             {
                 case ADD_PLAYER:
                     DefinedPacket.writeString( item.username, buf );
-                    DefinedPacket.writeVarInt( item.properties.length, buf );
+                    DefinedPacket.writeProperties( item.properties, buf );
-                    for ( String[] prop : item.properties )
-                    {
-                        DefinedPacket.writeString( prop[0], buf );
-                        DefinedPacket.writeString( prop[1], buf );
-                        if ( prop.length >= 3 )
-                        {
-                            buf.writeBoolean( true );
-                            DefinedPacket.writeString( prop[2], buf );
-                        } else
-                        {
-                            buf.writeBoolean( false );
-                        }
-                    }
                     DefinedPacket.writeVarInt( item.gamemode, buf );
                     DefinedPacket.writeVarInt( item.ping, buf );
                     buf.writeBoolean( item.displayName != null );
@@ -105,6 +80,10 @@ public class PlayerListItem extends DefinedPacket
                     {
                         DefinedPacket.writeString( item.displayName, buf );
                     }
+                    if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+                    {
+                        writePublicKey( item.publicKey, buf );
+                    }
                     break;
                 case UPDATE_GAMEMODE:
                     DefinedPacket.writeVarInt( item.gamemode, buf );
@@ -148,7 +127,8 @@ public class PlayerListItem extends DefinedPacket
 
         // ADD_PLAYER
         private String username;
-        private String[][] properties;
+        private Property[] properties;
+        private PlayerPublicKey publicKey;
 
         // ADD_PLAYER & UPDATE_GAMEMODE
         private int gamemode;

protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.Location;
 import net.md_5.bungee.protocol.ProtocolConstants;
 import se.llbit.nbt.Tag;
 
@@ -27,13 +28,14 @@ public class Respawn extends DefinedPacket
     private boolean debug;
     private boolean flat;
     private boolean copyMeta;
+    private Location deathLocation;
 
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
         if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
         {
-            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 )
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 && protocolVersion < ProtocolConstants.MINECRAFT_1_19 )
             {
                 dimension = readTag( buf );
             } else
@@ -64,6 +66,13 @@ public class Respawn extends DefinedPacket
         {
             levelType = readString( buf );
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            if ( buf.readBoolean() )
+            {
+                deathLocation = new Location( readString( buf ), buf.readLong() );
+            }
+        }
     }
 
     @Override
@@ -71,7 +80,7 @@ public class Respawn extends DefinedPacket
     {
         if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
         {
-            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 )
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 && protocolVersion < ProtocolConstants.MINECRAFT_1_19 )
             {
                 writeTag( (Tag) dimension, buf );
             } else
@@ -102,6 +111,18 @@ public class Respawn extends DefinedPacket
         {
             writeString( levelType, buf );
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            if ( deathLocation != null )
+            {
+                buf.writeBoolean( true );
+                writeString( deathLocation.getDimension(), buf );
+                buf.writeLong( deathLocation.getPos() );
+            } else
+            {
+                buf.writeBoolean( false );
+            }
+        }
     }
 
     @Override

protocol/src/main/java/net/md_5/bungee/protocol/packet/SystemChat.java

@@ -0,0 +1,41 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import net.md_5.bungee.protocol.AbstractPacketHandler;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SystemChat extends DefinedPacket
+{
+
+    private String message;
+    private int position;
+
+    @Override
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        message = readString( buf, 262144 );
+        position = readVarInt( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        writeString( message, buf );
+        writeVarInt( position, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

proxy/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-proxy</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Proxy</name>
@@ -94,36 +94,27 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.27</version>
+            <version>8.0.29</version>
             <scope>runtime</scope>
         </dependency>
         <!-- add these back in as they are not exposed by the API -->
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-resolver-provider</artifactId>
-            <version>3.8.4</version>
+            <version>3.8.5</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-connector-basic</artifactId>
-            <version>1.7.2</version>
+            <version>1.8.0</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-transport-http</artifactId>
-            <version>1.7.2</version>
+            <version>1.8.0</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
 </project>

proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java

@@ -1,5 +1,9 @@
 package net.md_5.bungee;
 
+import com.google.common.io.ByteStreams;
+import com.google.common.primitives.Longs;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.Key;
 import java.security.KeyFactory;
@@ -7,8 +11,11 @@ import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
 import java.security.PublicKey;
+import java.security.Signature;
+import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Random;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
@@ -18,6 +25,7 @@ import net.md_5.bungee.jni.NativeCode;
 import net.md_5.bungee.jni.cipher.BungeeCipher;
 import net.md_5.bungee.jni.cipher.JavaCipher;
 import net.md_5.bungee.jni.cipher.NativeCipher;
+import net.md_5.bungee.protocol.PlayerPublicKey;
 import net.md_5.bungee.protocol.packet.EncryptionRequest;
 import net.md_5.bungee.protocol.packet.EncryptionResponse;
 
@@ -28,10 +36,12 @@ public class EncryptionUtil
 {
 
     private static final Random random = new Random();
+    private static final Base64.Encoder MIME_ENCODER = Base64.getMimeEncoder( 76, "\n".getBytes( StandardCharsets.UTF_8 ) );
     public static final KeyPair keys;
     @Getter
     private static final SecretKey secret = new SecretKeySpec( new byte[ 16 ], "AES" );
     public static final NativeCode<BungeeCipher> nativeFactory = new NativeCode<>( "native-cipher", JavaCipher::new, NativeCipher::new );
+    private static final PublicKey MOJANG_KEY;
 
     static
     {
@@ -44,6 +54,14 @@ public class EncryptionUtil
         {
             throw new ExceptionInInitializerError( ex );
         }
+
+        try
+        {
+            MOJANG_KEY = KeyFactory.getInstance( "RSA" ).generatePublic( new X509EncodedKeySpec( ByteStreams.toByteArray( EncryptionUtil.class.getResourceAsStream( "/yggdrasil_session_pubkey.der" ) ) ) );
+        } catch ( IOException | NoSuchAlgorithmException | InvalidKeySpecException ex )
+        {
+            throw new ExceptionInInitializerError( ex );
+        }
     }
 
     public static EncryptionRequest encryptRequest()
@@ -55,17 +73,40 @@ public class EncryptionUtil
         return new EncryptionRequest( hash, pubKey, verify );
     }
 
+    public static boolean check(PlayerPublicKey publicKey) throws GeneralSecurityException
+    {
+        Signature signature = Signature.getInstance( "SHA1withRSA" );
+        signature.initVerify( MOJANG_KEY );
+
+        signature.update( ( publicKey.getExpiry() + "-----BEGIN RSA PUBLIC KEY-----\n" + MIME_ENCODER.encodeToString( getPubkey( publicKey.getKey() ).getEncoded() ) + "\n-----END RSA PUBLIC KEY-----\n" ).getBytes( StandardCharsets.US_ASCII ) );
+
+        return signature.verify( publicKey.getSignature() );
+    }
+
+    public static boolean check(PlayerPublicKey publicKey, EncryptionResponse resp, EncryptionRequest request) throws GeneralSecurityException
+    {
+        if ( publicKey != null )
+        {
+            Signature signature = Signature.getInstance( "SHA256withRSA" );
+            signature.initVerify( getPubkey( publicKey.getKey() ) );
+
+            signature.update( request.getVerifyToken() );
+            signature.update( Longs.toByteArray( resp.getEncryptionData().getSalt() ) );
+
+            return signature.verify( resp.getEncryptionData().getSignature() );
+        } else
+        {
+            Cipher cipher = Cipher.getInstance( "RSA" );
+            cipher.init( Cipher.DECRYPT_MODE, keys.getPrivate() );
+            byte[] decrypted = cipher.doFinal( resp.getVerifyToken() );
+
+            return Arrays.equals( request.getVerifyToken(), decrypted );
+        }
+    }
+
     public static SecretKey getSecret(EncryptionResponse resp, EncryptionRequest request) throws GeneralSecurityException
     {
         Cipher cipher = Cipher.getInstance( "RSA" );
-        cipher.init( Cipher.DECRYPT_MODE, keys.getPrivate() );
-        byte[] decrypted = cipher.doFinal( resp.getVerifyToken() );
-
-        if ( !Arrays.equals( request.getVerifyToken(), decrypted ) )
-        {
-            throw new IllegalStateException( "Key pairs do not match!" );
-        }
-
         cipher.init( Cipher.DECRYPT_MODE, keys.getPrivate() );
         return new SecretKeySpec( cipher.doFinal( resp.getSharedSecret() ), "AES" );
     }
@@ -80,7 +121,12 @@ public class EncryptionUtil
 
     public static PublicKey getPubkey(EncryptionRequest request) throws GeneralSecurityException
     {
-        return KeyFactory.getInstance( "RSA" ).generatePublic( new X509EncodedKeySpec( request.getPublicKey() ) );
+        return getPubkey( request.getPublicKey() );
+    }
+
+    private static PublicKey getPubkey(byte[] b) throws GeneralSecurityException
+    {
+        return KeyFactory.getInstance( "RSA" ).generatePublic( new X509EncodedKeySpec( b ) );
     }
 
     public static byte[] encrypt(Key key, byte[] b) throws GeneralSecurityException

proxy/src/main/java/net/md_5/bungee/ServerConnector.java

@@ -123,7 +123,7 @@ public class ServerConnector extends PacketHandler
         channel.write( copiedHandshake );
 
         channel.setProtocol( Protocol.LOGIN );
-        channel.write( new LoginRequest( user.getName() ) );
+        channel.write( new LoginRequest( user.getName(), null ) );
     }
 
     @Override
@@ -225,7 +225,7 @@ public class ServerConnector extends PacketHandler
 
             // Set tab list size, TODO: what shall we do about packet mutability
             Login modLogin = new Login( login.getEntityId(), login.isHardcore(), login.getGameMode(), login.getPreviousGameMode(), login.getWorldNames(), login.getDimensions(), login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(),
-                    (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat() );
+                    (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat(), login.getDeathLocation() );
 
             user.unsafe().sendPacket( modLogin );
 
@@ -243,7 +243,7 @@ public class ServerConnector extends PacketHandler
                 }
                 user.getSentBossBars().clear();
 
-                user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+                user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
                 user.getServer().disconnect( "Quitting" );
             } else
             {
@@ -292,11 +292,11 @@ public class ServerConnector extends PacketHandler
             user.setDimensionChange( true );
             if ( login.getDimension() == user.getDimension() )
             {
-                user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+                user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
             }
 
             user.setServerEntityId( login.getEntityId() );
-            user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+            user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
             if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
             {
                 user.unsafe().sendPacket( new ViewDistance( login.getViewDistance() ) );

proxy/src/main/java/net/md_5/bungee/UserConnection.java

@@ -59,6 +59,7 @@ import net.md_5.bungee.protocol.packet.Kick;
 import net.md_5.bungee.protocol.packet.PlayerListHeaderFooter;
 import net.md_5.bungee.protocol.packet.PluginMessage;
 import net.md_5.bungee.protocol.packet.SetCompression;
+import net.md_5.bungee.protocol.packet.SystemChat;
 import net.md_5.bungee.tab.ServerUnique;
 import net.md_5.bungee.tab.TabList;
 import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -416,6 +417,10 @@ public final class UserConnection implements ProxiedPlayer
     public void chat(String message)
     {
         Preconditions.checkState( server != null, "Not connected to server" );
+        if ( getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            throw new UnsupportedOperationException( "Cannot spoof chat on this client version!" );
+        }
         server.getCh().write( new Chat( message ) );
     }
 
@@ -472,7 +477,13 @@ public final class UserConnection implements ProxiedPlayer
 
     private void sendMessage(ChatMessageType position, UUID sender, String message)
     {
-        unsafe().sendPacket( new Chat( message, (byte) position.ordinal(), sender ) );
+        if ( getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            unsafe().sendPacket( new SystemChat( message, position.ordinal() ) );
+        } else
+        {
+            unsafe().sendPacket( new Chat( message, (byte) position.ordinal(), sender ) );
+        }
     }
 
     private void sendMessage(ChatMessageType position, UUID sender, BaseComponent... message)

proxy/src/main/java/net/md_5/bungee/conf/Configuration.java

@@ -47,6 +47,10 @@ public class Configuration implements ProxyConfig
      * Should we check minecraft.net auth.
      */
     private boolean onlineMode = true;
+    /**
+     * Whether to check the authentication server public key.
+     */
+    private boolean enforceSecureProfile;
     /**
      * Whether we log proxy commands to the proxy log
      */
@@ -86,6 +90,7 @@ public class Configuration implements ProxyConfig
         timeout = adapter.getInt( "timeout", timeout );
         uuid = adapter.getString( "stats", uuid );
         onlineMode = adapter.getBoolean( "online_mode", onlineMode );
+        enforceSecureProfile = adapter.getBoolean( "enforce_secure_profile", enforceSecureProfile );
         logCommands = adapter.getBoolean( "log_commands", logCommands );
         logPings = adapter.getBoolean( "log_pings", logPings );
         remotePingCache = adapter.getInt( "remote_ping_cache", remotePingCache );

proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java

@@ -9,6 +9,7 @@ import java.net.SocketAddress;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
+import java.time.Instant;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
@@ -49,6 +50,7 @@ import net.md_5.bungee.netty.cipher.CipherDecoder;
 import net.md_5.bungee.netty.cipher.CipherEncoder;
 import net.md_5.bungee.protocol.DefinedPacket;
 import net.md_5.bungee.protocol.PacketWrapper;
+import net.md_5.bungee.protocol.PlayerPublicKey;
 import net.md_5.bungee.protocol.Protocol;
 import net.md_5.bungee.protocol.ProtocolConstants;
 import net.md_5.bungee.protocol.packet.EncryptionRequest;
@@ -358,6 +360,29 @@ public class InitialHandler extends PacketHandler implements PendingConnection
             disconnect( bungee.getTranslation( "name_invalid" ) );
             return;
         }
+
+        if ( BungeeCord.getInstance().config.isEnforceSecureProfile() )
+        {
+            PlayerPublicKey publicKey = loginRequest.getPublicKey();
+            if ( publicKey == null )
+            {
+                disconnect( bungee.getTranslation( "secure_profile_required" ) );
+                return;
+            }
+
+            if ( Instant.ofEpochMilli( publicKey.getExpiry() ).isBefore( Instant.now() ) )
+            {
+                disconnect( bungee.getTranslation( "secure_profile_expired" ) );
+                return;
+            }
+
+            if ( !EncryptionUtil.check( publicKey ) )
+            {
+                disconnect( bungee.getTranslation( "secure_profile_invalid" ) );
+                return;
+            }
+        }
+
         this.loginRequest = loginRequest;
 
         int limit = BungeeCord.getInstance().config.getPlayerLimit();
@@ -410,6 +435,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
     public void handle(final EncryptionResponse encryptResponse) throws Exception
     {
         Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
+        Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
 
         SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
         BungeeCipher decrypt = EncryptionUtil.getCipher( false, sharedKey );
@@ -524,7 +550,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                             userCon.setCompressionThreshold( BungeeCord.getInstance().config.getCompressionThreshold() );
                             userCon.init();
 
-                            unsafe.sendPacket( new LoginSuccess( getUniqueId(), getName() ) );
+                            unsafe.sendPacket( new LoginSuccess( getUniqueId(), getName(), loginProfile.getProperties() ) );
                             ch.setProtocol( Protocol.GAME );
 
                             ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new UpstreamBridge( bungee, userCon ) );

proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java

@@ -2,6 +2,7 @@ package net.md_5.bungee.connection;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import net.md_5.bungee.protocol.Property;
 
 @Data
 @AllArgsConstructor
@@ -11,14 +12,4 @@ public class LoginResult
     private String id;
     private String name;
     private Property[] properties;
-
-    @Data
-    @AllArgsConstructor
-    public static class Property
-    {
-
-        private String name;
-        private String value;
-        private String signature;
-    }
 }

proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java

@@ -26,6 +26,8 @@ import net.md_5.bungee.netty.PacketHandler;
 import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.ProtocolConstants;
 import net.md_5.bungee.protocol.packet.Chat;
+import net.md_5.bungee.protocol.packet.ClientChat;
+import net.md_5.bungee.protocol.packet.ClientCommand;
 import net.md_5.bungee.protocol.packet.ClientSettings;
 import net.md_5.bungee.protocol.packet.KeepAlive;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
@@ -145,9 +147,33 @@ public class UpstreamBridge extends PacketHandler
     @Override
     public void handle(Chat chat) throws Exception
     {
-        for ( int index = 0, length = chat.getMessage().length(); index < length; index++ )
+        String message = handleChat( chat.getMessage() );
+        if ( message != null )
         {
-            char c = chat.getMessage().charAt( index );
+            chat.setMessage( message );
+            con.getServer().unsafe().sendPacket( chat );
+        }
+
+        throw CancelSendSignal.INSTANCE;
+    }
+
+    @Override
+    public void handle(ClientChat chat) throws Exception
+    {
+        handleChat( chat.getMessage() );
+    }
+
+    @Override
+    public void handle(ClientCommand command) throws Exception
+    {
+        handleChat( "/" + command.getCommand() );
+    }
+
+    private String handleChat(String message)
+    {
+        for ( int index = 0, length = message.length(); index < length; index++ )
+        {
+            char c = message.charAt( index );
             if ( !AllowedCharacters.isChatAllowedCharacter( c ) )
             {
                 con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
@@ -155,16 +181,16 @@ public class UpstreamBridge extends PacketHandler
             }
         }
 
-        ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
+        ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
         if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
         {
-            chat.setMessage( chatEvent.getMessage() );
+            message = chatEvent.getMessage();
-            if ( !chatEvent.isCommand() || !bungee.getPluginManager().dispatchCommand( con, chat.getMessage().substring( 1 ) ) )
+            if ( !chatEvent.isCommand() || !bungee.getPluginManager().dispatchCommand( con, message.substring( 1 ) ) )
             {
-                con.getServer().unsafe().sendPacket( chat );
+                return message;
             }
         }
-        throw CancelSendSignal.INSTANCE;
+        return null;
     }
 
     @Override

proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java

@@ -74,6 +74,8 @@ public abstract class EntityMap
             case ProtocolConstants.MINECRAFT_1_18:
             case ProtocolConstants.MINECRAFT_1_18_2:
                 return EntityMap_1_16_2.INSTANCE_1_18;
+            case ProtocolConstants.MINECRAFT_1_19:
+                return EntityMap_1_16_2.INSTANCE_1_19;
         }
         throw new RuntimeException( "Version " + version + " has no entity map" );
     }

proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java

@@ -17,6 +17,8 @@ class EntityMap_1_16_2 extends EntityMap
     static final EntityMap_1_16_2 INSTANCE_1_16_2 = new EntityMap_1_16_2( 0x04, 0x2D );
     static final EntityMap_1_16_2 INSTANCE_1_17 = new EntityMap_1_16_2( 0x04, 0x2D );
     static final EntityMap_1_16_2 INSTANCE_1_18 = new EntityMap_1_16_2( 0x04, 0x2D );
+    static final EntityMap_1_16_2 INSTANCE_1_19 = new EntityMap_1_16_2( 0x02, 0x2F );
+
     //
     private final int spawnPlayerId;
     private final int spectateId;

proxy/src/main/java/net/md_5/bungee/tab/TabList.java

@@ -5,6 +5,7 @@ import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.UserConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.connection.LoginResult;
+import net.md_5.bungee.protocol.Property;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
 
 @RequiredArgsConstructor
@@ -38,20 +39,15 @@ public abstract class TabList
                 LoginResult loginResult = player.getPendingConnection().getLoginProfile();
                 if ( loginResult != null && loginResult.getProperties() != null )
                 {
-                    String[][] props = new String[ loginResult.getProperties().length ][];
+                    Property[] props = new Property[ loginResult.getProperties().length ];
                     for ( int i = 0; i < props.length; i++ )
                     {
-                        props[i] = new String[]
+                        props[i] = new Property( loginResult.getProperties()[i].getName(), loginResult.getProperties()[i].getValue(), loginResult.getProperties()[i].getSignature() );
-                        {
-                            loginResult.getProperties()[i].getName(),
-                            loginResult.getProperties()[i].getValue(),
-                            loginResult.getProperties()[i].getSignature()
-                        };
                     }
                     item.setProperties( props );
                 } else
                 {
-                    item.setProperties( new String[ 0 ][ 0 ] );
+                    item.setProperties( new Property[ 0 ] );
                 }
                 if ( playerListItem.getAction() == PlayerListItem.Action.ADD_PLAYER || playerListItem.getAction() == PlayerListItem.Action.UPDATE_GAMEMODE )
                 {

proxy/src/main/resources/messages.properties

@@ -22,6 +22,9 @@ total_players=Total players online: {0}
 name_invalid=Username contains invalid characters.
 ping_cannot_connect=\u00a7c[Bungee] Can''t connect to server.
 offline_mode_player=Not authenticated with Minecraft.net
+secure_profile_required=A secure profile is required to join this server.
+secure_profile_expired=Secure profile expired.
+secure_profile_invalid=Secure profile invalid.
 message_needed=\u00a7cYou must supply a message.
 error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
 error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}

query/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-query</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Query</name>

slf4j/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-slf4j</artifactId>
-    <version>1.18-R0.1-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-SLF4J</name>