Add (hopefully temporary) queue for plugin messages to server

This reverts commit f486a251f3.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,63 @@
+name: Bug inside BungeeCord
+description: Create a bug report about a problem inside BungeeCord.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        #### Report a bug inside bungeecord
+        Issues happening with forks of BungeeCord should **not** be reported here.
+  - type: input
+    id: bungee-version
+    attributes:
+      label: Bungeecord version
+      description: The output of the /bungee command (or just the bungee build number) (execute in bungeecord console for easy text copy)
+      placeholder: e.g. git:BungeeCord-Bootstrap:1.xx-SNAPSHOT:xxxxxxx:xxxx
+    validations:
+      required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: Server version
+      description: The output of the /version command (execute in server console for easy text copy)
+      placeholder: "e.g. git-Spigot-xxxxxxx-xxxxxxx (MC: 1.x.x)"
+  - type: input
+    id: client-version
+    attributes:
+      label: Client version
+      description: Minecraft Client Version
+      placeholder: e.g. 1.18.2
+  - type: textarea
+    id: bungee-plugins
+    attributes:
+      label: Bungeecord plugins
+      description: Please list all BungeeCord plugins you are using.
+    validations:
+      required: true
+  - type: textarea
+    id: the-bug
+    attributes:
+      label: The bug
+      description: Please describe the bug. Include **details** you find neccessary. If you just have a question, please ask it in [SpigotMC Forums](https://www.spigotmc.org) and not here.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Log output (links)
+      description: Please put your log output inbetween three backticks (```` ``` ````). Upload your log files to [gist.github.com](https://gist.github.com) and put them in here.
+      placeholder: |
+        ```
+        log output
+        ```
+  - type: checkboxes
+    id: checkboxes
+    attributes:
+      label: Checking
+      options:
+        - label: I am using BungeeCord and **not a fork**. Issues with forks should not be reported here.
+          required: true
+        - label: I think this is **not** an issue with a bungeecord plugin.
+          required: true
+        - label: I have not read these checkboxes and therefore I just ticked them all.
+        - label: This is not a question or plugin creation help request.
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Configuration help
+    url: https://www.spigotmc.org/forums/bungeecord-help.70/create-thread
+    about: Help for configuring bungeecord will only be answered in spigotmc.org forums.
+  - name: I have a problem with a bungee plugin
+    url: https://www.spigotmc.org/forums/bungeecord-plugin-help.71/create-thread
+    about: Help about plugins can be recieved in spigotmc.org forums.
+  - name: Questions and discussions
+    url: https://www.spigotmc.org/forums/bungeecord-discussion.21/create-thread
+    about: spigotmc.org forums are the best place to ask your questions regarding bungeecord.
+  - name: Plugin creation help
+    url: https://www.spigotmc.org/forums/bungeecord-plugin-development.23/create-thread
+    about: Plugin creation help for bungee plugins can be recieved in spigotmc.org forums.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,36 @@
+name: Feature request
+description: Suggest a feature which bungeecord should include.
+body:
+  - type: textarea
+    id: the-feature
+    attributes:
+      label: Feature description
+      description: Please describe your feature or improvement. Please include **details**.
+    validations:
+      required: true
+  - type: textarea
+    id: goal
+    attributes:
+      label: Goal of the feature
+      description: What is the goal of your feature?
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Unfitting alternatives
+      description: What alternatives have you considered and why are they not sufficient for your use case?
+    validations:
+      required: true
+  - type: checkboxes
+    id: checkboxes
+    attributes:
+      label: Checking
+      options:
+        - label: This is not a question or plugin creation help request.
+          required: true
+        - label: This is a **feature or improvement request**.
+          required: true
+        - label: I have not read these checkboxes and therefore I just ticked them all.
+        - label: I did not use this form to report a bug.
+          required: true

.github/dependabot.yml

@@ -0,0 +1,28 @@
+version: 2
+
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 50
+    ignore:
+        # Synchronised with Minecraft
+      - dependency-name: "com.google.code.gson:gson"
+        # 9.x has performance issues (see, eg, checkstyle/checkstyle#10934) and 10.x is incompatible
+      - dependency-name: "com.puppycrawl.tools:checkstyle"
+        # Newer versions have issues, see #1909 and #2050
+      - dependency-name: "jline:jline"
+        # Later versions of these Maven dependencies are incompatible and require careful management - see SPIGOT-7400
+      - dependency-name: "org.apache.maven.resolver:maven-resolver-connector-basic"
+      - dependency-name: "org.apache.maven.resolver:maven-resolver-transport-http"
+      - dependency-name: "org.apache.maven:maven-resolver-provider"
+        # Used with maven-resolver dependencies; 2.0 update breaks other providers
+      - dependency-name: "org.slf4j:slf4j-api"
+        update-types: ["version-update:semver-major"]
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 50

.github/workflows/maven.yml

@@ -4,18 +4,20 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
+      fail-fast: false
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17, 21]
 
     name: Java ${{ matrix.java }}
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v3
       with:
+        distribution: zulu
         java-version: ${{ matrix.java }}
     - run: java -version && mvn --version
     - run: mvn --activate-profiles dist --no-transfer-progress package

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "native/mbedtls"]
+	path = native/mbedtls
+	url = https://github.com/ARMmbed/mbedtls.git
+[submodule "native/zlib"]
+	path = native/zlib
+	url = https://github.com/cloudflare/zlib.git

README.md

@@ -23,4 +23,4 @@ Binaries
 --------
 Precompiled binaries are available for end users on [Jenkins](https://www.spigotmc.org/go/bungeecord-dl).
 
-(c) 2012-2020 SpigotMC Pty. Ltd.
+(c) 2012-2023 SpigotMC Pty. Ltd.

api/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.20-R0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-api</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-API</name>
@@ -46,13 +46,33 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-unix-common</artifactId>
-            <version>${netty.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-resolver-provider</artifactId>
+            <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.3</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.3</version>
+            <!-- not part of the API proper -->
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.26</version>
+            <version>2.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

api/src/main/java/net/md_5/bungee/Util.java

@@ -7,6 +7,7 @@ import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Locale;
 import java.util.UUID;
 
 /**
@@ -68,6 +69,17 @@ public class Util
         return String.format( "0x%02X", i );
     }
 
+    /**
+     * Formats an char as a unicode value.
+     *
+     * @param c the character to format
+     * @return the unicode representation of the character
+     */
+    public static String unicode(char c)
+    {
+        return "\\u" + String.format( "%04x", (int) c ).toUpperCase( Locale.ROOT );
+    }
+
     /**
      * Constructs a pretty one line version of a {@link Throwable}. Useful for
      * debugging.
@@ -76,11 +88,24 @@ public class Util
      * @return a string representing information about the {@link Throwable}
      */
     public static String exception(Throwable t)
+    {
+        return exception( t, true );
+    }
+
+    /**
+     * Constructs a pretty one line version of a {@link Throwable}. Useful for
+     * debugging.
+     *
+     * @param t the {@link Throwable} to format.
+     * @param includeLineNumbers whether to include line numbers
+     * @return a string representing information about the {@link Throwable}
+     */
+    public static String exception(Throwable t, boolean includeLineNumbers)
     {
         // TODO: We should use clear manually written exceptions
         StackTraceElement[] trace = t.getStackTrace();
         return t.getClass().getSimpleName() + " : " + t.getMessage()
-                + ( ( trace.length > 0 ) ? " @ " + t.getStackTrace()[0].getClassName() + ":" + t.getStackTrace()[0].getLineNumber() : "" );
+                + ( ( includeLineNumbers && trace.length > 0 ) ? " @ " + t.getStackTrace()[0].getClassName() + ":" + t.getStackTrace()[0].getLineNumber() : "" );
     }
 
     public static String csv(Iterable<?> objects)
@@ -88,6 +113,16 @@ public class Util
         return format( objects, ", " );
     }
 
+    /**
+     * Returns a string of objects, each separated by a separator.
+     *
+     * @param objects the objects to join
+     * @param separators the separator
+     * @return joined string
+     * @see String#join(java.lang.CharSequence, java.lang.Iterable)
+     * @deprecated use {@link String} join methods
+     */
+    @Deprecated
     public static String format(Iterable<?> objects, String separators)
     {
         return Joiner.on( separators ).join( objects );

api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java

@@ -28,18 +28,13 @@ public abstract class AbstractReconnectHandler implements ReconnectHandler
 
     public static ServerInfo getForcedHost(PendingConnection con)
     {
-        if ( con.getVirtualHost() == null )
-        {
-            return null;
-        }
-
-        String forced = con.getListener().getForcedHosts().get( con.getVirtualHost().getHostString() );
+        String forced = ( con.getVirtualHost() == null ) ? null : con.getListener().getForcedHosts().get( con.getVirtualHost().getHostString() );
 
         if ( forced == null && con.getListener().isForceDefault() )
         {
             forced = con.getListener().getDefaultServer();
         }
-        return ProxyServer.getInstance().getServerInfo( forced );
+        return ( forced == null ) ? null : ProxyServer.getInstance().getServerInfo( forced );
     }
 
     protected abstract ServerInfo getStoredServer(ProxiedPlayer player);

api/src/main/java/net/md_5/bungee/api/Favicon.java

@@ -1,9 +1,10 @@
 package net.md_5.bungee.api;
 
+import com.google.common.base.Preconditions;
 import com.google.common.io.BaseEncoding;
 import com.google.gson.TypeAdapter;
-import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
@@ -26,13 +27,26 @@ public class Favicon
         @Override
         public void write(JsonWriter out, Favicon value) throws IOException
         {
-            TypeAdapters.STRING.write( out, value == null ? null : value.getEncoded() );
+            if ( value == null )
+            {
+                out.nullValue();
+            } else
+            {
+                out.value( value.getEncoded() );
+            }
         }
 
         @Override
         public Favicon read(JsonReader in) throws IOException
         {
-            String enc = TypeAdapters.STRING.read( in );
+            JsonToken peek = in.peek();
+            if ( peek == JsonToken.NULL )
+            {
+                in.nextNull();
+                return null;
+            }
+
+            String enc = in.nextString();
             return enc == null ? null : create( enc );
         }
     };
@@ -59,6 +73,7 @@ public class Favicon
      */
     public static Favicon create(BufferedImage image)
     {
+        Preconditions.checkArgument( image != null, "image is null" );
         // check size
         if ( image.getWidth() != 64 || image.getHeight() != 64 )
         {

api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java

@@ -15,7 +15,7 @@ import net.md_5.bungee.api.event.ServerConnectEvent;
 import net.md_5.bungee.api.score.Scoreboard;
 
 /**
- * Represents a player who's connection is being connected to somewhere else,
+ * Represents a player whose connection is being connected to somewhere else,
  * whether it be a remote or embedded server.
  */
 public interface ProxiedPlayer extends Connection, CommandSender
@@ -57,8 +57,7 @@ public interface ProxiedPlayer extends Connection, CommandSender
     String getDisplayName();
 
     /**
-     * Sets this players display name to be used as their nametag and tab list
-     * name.
+     * Sets this player's display name to be used by proxy commands and plugins.
      *
      * @param name the name to set
      */

api/src/main/java/net/md_5/bungee/api/event/ProxyPingEvent.java

@@ -8,7 +8,7 @@ import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.connection.PendingConnection;
 
 /**
- * Called when the proxy is pinged with packet 0xFE from the server list.
+ * Called when the proxy is queried for status from the server list.
  */
 @Data
 @ToString(callSuper = false)

api/src/main/java/net/md_5/bungee/api/event/ServerDisconnectEvent.java

@@ -9,6 +9,13 @@ import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Event;
 
+/**
+ * Called when the player is disconnected from a server, for example during
+ * server switching.
+ *
+ * If the player is kicked from a server, {@link ServerKickEvent} will be called
+ * instead.
+ */
 @Data
 @AllArgsConstructor
 @ToString(callSuper = false)

api/src/main/java/net/md_5/bungee/api/plugin/LibraryLoader.java

@@ -0,0 +1,123 @@
+package net.md_5.bungee.api.plugin;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.impl.DefaultServiceLocator;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.repository.RepositoryPolicy;
+import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.aether.resolution.DependencyRequest;
+import org.eclipse.aether.resolution.DependencyResolutionException;
+import org.eclipse.aether.resolution.DependencyResult;
+import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
+import org.eclipse.aether.spi.connector.transport.TransporterFactory;
+import org.eclipse.aether.transfer.AbstractTransferListener;
+import org.eclipse.aether.transfer.TransferCancelledException;
+import org.eclipse.aether.transfer.TransferEvent;
+import org.eclipse.aether.transport.http.HttpTransporterFactory;
+
+class LibraryLoader
+{
+
+    private final Logger logger;
+    private final RepositorySystem repository;
+    private final DefaultRepositorySystemSession session;
+    private final List<RemoteRepository> repositories;
+
+    public LibraryLoader(Logger logger)
+    {
+        this.logger = logger;
+
+        DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator();
+        locator.addService( RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class );
+        locator.addService( TransporterFactory.class, HttpTransporterFactory.class );
+
+        this.repository = locator.getService( RepositorySystem.class );
+        this.session = MavenRepositorySystemUtils.newSession();
+
+        session.setChecksumPolicy( RepositoryPolicy.CHECKSUM_POLICY_FAIL );
+        session.setLocalRepositoryManager( repository.newLocalRepositoryManager( session, new LocalRepository( "libraries" ) ) );
+        session.setTransferListener( new AbstractTransferListener()
+        {
+            @Override
+            public void transferStarted(TransferEvent event) throws TransferCancelledException
+            {
+                logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
+            }
+        } );
+        session.setReadOnly();
+
+        this.repositories = repository.newResolutionRepositories( session, Arrays.asList( new RemoteRepository.Builder( "central", "default", "https://repo.maven.apache.org/maven2" ).build() ) );
+    }
+
+    public ClassLoader createLoader(PluginDescription desc)
+    {
+        if ( desc.getLibraries().isEmpty() )
+        {
+            return null;
+        }
+        logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
+        {
+            desc.getName(), desc.getLibraries().size()
+        } );
+
+        List<Dependency> dependencies = new ArrayList<>();
+        for ( String library : desc.getLibraries() )
+        {
+            Artifact artifact = new DefaultArtifact( library );
+            Dependency dependency = new Dependency( artifact, null );
+
+            dependencies.add( dependency );
+        }
+
+        DependencyResult result;
+        try
+        {
+            result = repository.resolveDependencies( session, new DependencyRequest( new CollectRequest( (Dependency) null, dependencies, repositories ), null ) );
+        } catch ( DependencyResolutionException ex )
+        {
+            throw new RuntimeException( "Error resolving libraries", ex );
+        }
+
+        List<URL> jarFiles = new ArrayList<>();
+        for ( ArtifactResult artifact : result.getArtifactResults() )
+        {
+            File file = artifact.getArtifact().getFile();
+
+            URL url;
+            try
+            {
+                url = file.toURI().toURL();
+            } catch ( MalformedURLException ex )
+            {
+                throw new AssertionError( ex );
+            }
+
+            jarFiles.add( url );
+            logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[]
+            {
+                desc.getName(), file
+            } );
+        }
+
+        URLClassLoader loader = new URLClassLoader( jarFiles.toArray( new URL[ 0 ] ) );
+
+        return loader;
+    }
+}

api/src/main/java/net/md_5/bungee/api/plugin/PluginClassloader.java

@@ -1,12 +1,23 @@
 package net.md_5.bungee.api.plugin;
 
 import com.google.common.base.Preconditions;
+import com.google.common.io.ByteStreams;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.security.CodeSigner;
+import java.security.CodeSource;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import lombok.ToString;
 import net.md_5.bungee.api.ProxyServer;
 
+@ToString(of = "desc")
 final class PluginClassloader extends URLClassLoader
 {
 
@@ -14,6 +25,10 @@ final class PluginClassloader extends URLClassLoader
     //
     private final ProxyServer proxy;
     private final PluginDescription desc;
+    private final JarFile jar;
+    private final Manifest manifest;
+    private final URL url;
+    private final ClassLoader libraryLoader;
     //
     private Plugin plugin;
 
@@ -22,11 +37,18 @@ final class PluginClassloader extends URLClassLoader
         ClassLoader.registerAsParallelCapable();
     }
 
-    public PluginClassloader(ProxyServer proxy, PluginDescription desc, URL[] urls)
+    public PluginClassloader(ProxyServer proxy, PluginDescription desc, File file, ClassLoader libraryLoader) throws IOException
     {
-        super( urls );
+        super( new URL[]
+        {
+            file.toURI().toURL()
+        } );
         this.proxy = proxy;
         this.desc = desc;
+        this.jar = new JarFile( file );
+        this.manifest = jar.getManifest();
+        this.url = file.toURI().toURL();
+        this.libraryLoader = libraryLoader;
 
         allLoaders.add( this );
     }
@@ -34,17 +56,34 @@ final class PluginClassloader extends URLClassLoader
     @Override
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException
     {
-        return loadClass0( name, resolve, true );
+        return loadClass0( name, resolve, true, true );
     }
 
-    private Class<?> loadClass0(String name, boolean resolve, boolean checkOther) throws ClassNotFoundException
+    private Class<?> loadClass0(String name, boolean resolve, boolean checkOther, boolean checkLibraries) throws ClassNotFoundException
     {
         try
         {
-            return super.loadClass( name, resolve );
+            Class<?> result = super.loadClass( name, resolve );
+
+            // SPIGOT-6749: Library classes will appear in the above, but we don't want to return them to other plugins
+            if ( checkOther || result.getClassLoader() == this )
+            {
+                return result;
+            }
         } catch ( ClassNotFoundException ex )
         {
         }
+
+        if ( checkLibraries && libraryLoader != null )
+        {
+            try
+            {
+                return libraryLoader.loadClass( name );
+            } catch ( ClassNotFoundException ex )
+            {
+            }
+        }
+
         if ( checkOther )
         {
             for ( PluginClassloader loader : allLoaders )
@@ -53,16 +92,81 @@ final class PluginClassloader extends URLClassLoader
                 {
                     try
                     {
-                        return loader.loadClass0( name, resolve, false );
+                        return loader.loadClass0( name, resolve, false, proxy.getPluginManager().isTransitiveDepend( desc, loader.desc ) );
                     } catch ( ClassNotFoundException ex )
                     {
                     }
                 }
             }
         }
+
         throw new ClassNotFoundException( name );
     }
 
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException
+    {
+        String path = name.replace( '.', '/' ).concat( ".class" );
+        JarEntry entry = jar.getJarEntry( path );
+
+        if ( entry != null )
+        {
+            byte[] classBytes;
+
+            try ( InputStream is = jar.getInputStream( entry ) )
+            {
+                classBytes = ByteStreams.toByteArray( is );
+            } catch ( IOException ex )
+            {
+                throw new ClassNotFoundException( name, ex );
+            }
+
+            int dot = name.lastIndexOf( '.' );
+            if ( dot != -1 )
+            {
+                String pkgName = name.substring( 0, dot );
+                if ( getPackage( pkgName ) == null )
+                {
+                    try
+                    {
+                        if ( manifest != null )
+                        {
+                            definePackage( pkgName, manifest, url );
+                        } else
+                        {
+                            definePackage( pkgName, null, null, null, null, null, null, null );
+                        }
+                    } catch ( IllegalArgumentException ex )
+                    {
+                        if ( getPackage( pkgName ) == null )
+                        {
+                            throw new IllegalStateException( "Cannot find package " + pkgName );
+                        }
+                    }
+                }
+            }
+
+            CodeSigner[] signers = entry.getCodeSigners();
+            CodeSource source = new CodeSource( url, signers );
+
+            return defineClass( name, classBytes, 0, classBytes.length, source );
+        }
+
+        return super.findClass( name );
+    }
+
+    @Override
+    public void close() throws IOException
+    {
+        try
+        {
+            super.close();
+        } finally
+        {
+            jar.close();
+        }
+    }
+
     void init(Plugin plugin)
     {
         Preconditions.checkArgument( plugin != null, "plugin" );

api/src/main/java/net/md_5/bungee/api/plugin/PluginDescription.java

@@ -2,6 +2,8 @@ package net.md_5.bungee.api.plugin;
 
 import java.io.File;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -48,4 +50,8 @@ public class PluginDescription
      * Optional description.
      */
     private String description = null;
+    /**
+     * Optional libraries.
+     */
+    private List<String> libraries = new LinkedList<>();
 }

api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java

@@ -4,10 +4,12 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.eventbus.Subscribe;
+import com.google.common.graph.GraphBuilder;
+import com.google.common.graph.Graphs;
+import com.google.common.graph.MutableGraph;
 import java.io.File;
 import java.io.InputStream;
 import java.lang.reflect.Method;
-import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,6 +33,7 @@ import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.event.EventBus;
 import net.md_5.bungee.event.EventHandler;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.introspector.PropertyUtils;
@@ -49,6 +52,8 @@ public final class PluginManager
     private final Yaml yaml;
     private final EventBus eventBus;
     private final Map<String, Plugin> plugins = new LinkedHashMap<>();
+    private final MutableGraph<String> dependencyGraph = GraphBuilder.directed().build();
+    private final LibraryLoader libraryLoader;
     private final Map<String, Command> commandMap = new HashMap<>();
     private Map<String, PluginDescription> toLoad = new HashMap<>();
     private final Multimap<Plugin, Command> commandsByPlugin = ArrayListMultimap.create();
@@ -60,13 +65,24 @@ public final class PluginManager
         this.proxy = proxy;
 
         // Ignore unknown entries in the plugin descriptions
-        Constructor yamlConstructor = new Constructor();
+        Constructor yamlConstructor = new Constructor( new LoaderOptions() );
         PropertyUtils propertyUtils = yamlConstructor.getPropertyUtils();
         propertyUtils.setSkipMissingProperties( true );
         yamlConstructor.setPropertyUtils( propertyUtils );
         yaml = new Yaml( yamlConstructor );
 
         eventBus = new EventBus( proxy.getLogger() );
+
+        LibraryLoader libraryLoader = null;
+        try
+        {
+            libraryLoader = new LibraryLoader( proxy.getLogger() );
+        } catch ( NoClassDefFoundError ex )
+        {
+            // Provided depends were not added back
+            proxy.getLogger().warning( "Could not initialize LibraryLoader (missing dependencies?)" );
+        }
+        this.libraryLoader = libraryLoader;
     }
 
     /**
@@ -309,6 +325,7 @@ public final class PluginManager
                 status = false;
             }
 
+            dependencyGraph.putEdge( plugin.getName(), dependName );
             if ( !status )
             {
                 break;
@@ -320,10 +337,7 @@ public final class PluginManager
         {
             try
             {
-                URLClassLoader loader = new PluginClassloader( proxy, plugin, new URL[]
-                {
-                    plugin.getFile().toURI().toURL()
-                } );
+                URLClassLoader loader = new PluginClassloader( proxy, plugin, plugin.getFile(), ( libraryLoader != null ) ? libraryLoader.createLoader( plugin ) : null );
                 Class<?> main = loader.loadClass( plugin.getMain() );
                 Plugin clazz = (Plugin) main.getDeclaredConstructor().newInstance();
 
@@ -335,7 +349,7 @@ public final class PluginManager
                 } );
             } catch ( Throwable t )
             {
-                proxy.getLogger().log( Level.WARNING, "Error enabling plugin " + plugin.getName(), t );
+                proxy.getLogger().log( Level.WARNING, "Error loading plugin " + plugin.getName(), t );
             }
         }
 
@@ -463,4 +477,19 @@ public final class PluginManager
     {
         return Collections.unmodifiableCollection( commandMap.entrySet() );
     }
+
+    boolean isTransitiveDepend(PluginDescription plugin, PluginDescription depend)
+    {
+        Preconditions.checkArgument( plugin != null, "plugin" );
+        Preconditions.checkArgument( depend != null, "depend" );
+
+        if ( dependencyGraph.nodes().contains( plugin.getName() ) )
+        {
+            if ( Graphs.reachableNodes( dependencyGraph, plugin.getName() ).contains( depend.getName() ) )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
 }

api/src/test/java/net/md_5/bungee/api/ServerConnectRequestTest.java

@@ -1,12 +1,13 @@
 package net.md_5.bungee.api;
 
+import static org.junit.jupiter.api.Assertions.*;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.Collection;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ServerConnectEvent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ServerConnectRequestTest
 {
@@ -78,15 +79,15 @@ public class ServerConnectRequestTest
         }
     };
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testNullTarget()
     {
-        ServerConnectRequest.builder().target( null ).reason( ServerConnectEvent.Reason.JOIN_PROXY ).build();
+        assertThrows( NullPointerException.class, () -> ServerConnectRequest.builder().target( null ).reason( ServerConnectEvent.Reason.JOIN_PROXY ).build() );
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testNullReason()
     {
-        ServerConnectRequest.builder().target( DUMMY_INFO ).reason( null ).build();
+        assertThrows( NullPointerException.class, () -> ServerConnectRequest.builder().target( DUMMY_INFO ).reason( null ).build() );
     }
 }

api/src/test/java/net/md_5/bungee/util/AddressParseTest.java

@@ -1,63 +1,38 @@
 package net.md_5.bungee.util;
 
+import static org.junit.jupiter.api.Assertions.*;
 import io.netty.channel.unix.DomainSocketAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.Util;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 @RequiredArgsConstructor
-@RunWith(Parameterized.class)
 public class AddressParseTest
 {
 
-    @Parameters
-    public static Collection<Object[]> data()
+    public static Stream<Arguments> data()
     {
-        return Arrays.asList( new Object[][]
-        {
-            {
-                "127.0.0.1", "127.0.0.1", Util.DEFAULT_PORT
-            },
-            {
-                "127.0.0.1:1337", "127.0.0.1", 1337
-            },
-            {
-                "[::1]", "0:0:0:0:0:0:0:1", Util.DEFAULT_PORT
-            },
-            {
-                "[0:0:0:0::1]", "0:0:0:0:0:0:0:1", Util.DEFAULT_PORT
-            },
-            {
-                "[0:0:0:0:0:0:0:1]", "0:0:0:0:0:0:0:1", Util.DEFAULT_PORT
-            },
-            {
-                "[::1]:1337", "0:0:0:0:0:0:0:1", 1337
-            },
-            {
-                "[0:0:0:0::1]:1337", "0:0:0:0:0:0:0:1", 1337
-            },
-            {
-                "[0:0:0:0:0:0:0:1]:1337", "0:0:0:0:0:0:0:1", 1337
-            },
-            {
-                "unix:///var/run/bungee.sock", "/var/run/bungee.sock", -1
-            }
-        } );
+        return Stream.of(
+                Arguments.of( "127.0.0.1", "127.0.0.1", Util.DEFAULT_PORT ),
+                Arguments.of( "127.0.0.1:1337", "127.0.0.1", 1337 ),
+                Arguments.of( "[::1]", "0:0:0:0:0:0:0:1", Util.DEFAULT_PORT ),
+                Arguments.of( "[0:0:0:0::1]", "0:0:0:0:0:0:0:1", Util.DEFAULT_PORT ),
+                Arguments.of( "[0:0:0:0:0:0:0:1]", "0:0:0:0:0:0:0:1", Util.DEFAULT_PORT ),
+                Arguments.of( "[::1]:1337", "0:0:0:0:0:0:0:1", 1337 ),
+                Arguments.of( "[0:0:0:0::1]:1337", "0:0:0:0:0:0:0:1", 1337 ),
+                Arguments.of( "[0:0:0:0:0:0:0:1]:1337", "0:0:0:0:0:0:0:1", 1337 ),
+                Arguments.of( "unix:///var/run/bungee.sock", "/var/run/bungee.sock", -1 )
+        );
     }
-    private final String line;
-    private final String host;
-    private final int port;
 
-    @Test
-    public void test()
+    @ParameterizedTest
+    @MethodSource("data")
+    public void test(String line, String host, int port)
     {
         SocketAddress parsed = Util.getAddr( line );
 
@@ -65,14 +40,14 @@ public class AddressParseTest
         {
             InetSocketAddress tcp = (InetSocketAddress) parsed;
 
-            Assert.assertEquals( host, tcp.getHostString() );
-            Assert.assertEquals( port, tcp.getPort() );
+            assertEquals( host, tcp.getHostString() );
+            assertEquals( port, tcp.getPort() );
         } else if ( parsed instanceof DomainSocketAddress )
         {
             DomainSocketAddress unix = (DomainSocketAddress) parsed;
 
-            Assert.assertEquals( host, unix.path() );
-            Assert.assertEquals( -1, port );
+            assertEquals( host, unix.path() );
+            assertEquals( -1, port );
         } else
         {
             throw new AssertionError( "Unknown socket " + parsed );

api/src/test/java/net/md_5/bungee/util/CaseInsensitiveTest.java

@@ -1,7 +1,7 @@
 package net.md_5.bungee.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CaseInsensitiveTest
 {
@@ -13,12 +13,12 @@ public class CaseInsensitiveTest
         CaseInsensitiveMap<Object> map = new CaseInsensitiveMap<>();
 
         map.put( "FOO", obj );
-        Assert.assertTrue( map.contains( "foo" ) ); // Assert that contains is case insensitive
-        Assert.assertTrue( map.entrySet().iterator().next().getKey().equals( "FOO" ) ); // Assert that case is preserved
+        assertTrue( map.contains( "foo" ) ); // Assert that contains is case insensitive
+        assertTrue( map.entrySet().iterator().next().getKey().equals( "FOO" ) ); // Assert that case is preserved
 
         // Assert that remove is case insensitive
         map.remove( "FoO" );
-        Assert.assertFalse( map.contains( "foo" ) );
+        assertFalse( map.contains( "foo" ) );
     }
 
     @Test
@@ -27,8 +27,8 @@ public class CaseInsensitiveTest
         CaseInsensitiveSet set = new CaseInsensitiveSet();
 
         set.add( "FOO" );
-        Assert.assertTrue( set.contains( "foo" ) ); // Assert that contains is case insensitive
+        assertTrue( set.contains( "foo" ) ); // Assert that contains is case insensitive
         set.remove( "FoO" );
-        Assert.assertFalse( set.contains( "foo" ) ); // Assert that remove is case insensitive
+        assertFalse( set.contains( "foo" ) ); // Assert that remove is case insensitive
     }
 }

api/src/test/java/net/md_5/bungee/util/UUIDTest.java

@@ -1,9 +1,9 @@
 package net.md_5.bungee.util;
 
+import static org.junit.jupiter.api.Assertions.*;
 import java.util.UUID;
 import net.md_5.bungee.Util;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class UUIDTest
 {
@@ -13,7 +13,7 @@ public class UUIDTest
     {
         UUID uuid = UUID.fromString( "af74a02d-19cb-445b-b07f-6866a861f783" );
         UUID uuid1 = Util.getUUID( "af74a02d19cb445bb07f6866a861f783" );
-        Assert.assertEquals( uuid, uuid1 );
+        assertEquals( uuid, uuid1 );
     }
 
     @Test
@@ -23,7 +23,7 @@ public class UUIDTest
         {
             UUID expected = UUID.randomUUID();
             UUID actual = Util.getUUID( expected.toString().replace( "-", "" ) );
-            Assert.assertEquals( "Could not parse UUID " + expected, expected, actual );
+            assertEquals( expected, actual, "Could not parse UUID " + expected );
         }
     }
 }

bootstrap/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.20-R0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-bootstrap</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Bootstrap</name>
@@ -41,7 +41,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -55,7 +55,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -79,4 +79,34 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>jdk-9-release</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>6</maven.compiler.release>
+            </properties>
+        </profile>
+        <profile>
+            <id>jdk-12-release</id>
+            <activation>
+                <jdk>[12,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>7</maven.compiler.release>
+            </properties>
+        </profile>
+        <profile>
+            <id>jdk-20-release</id>
+            <activation>
+                <jdk>[20,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
+    </profiles>
 </project>

chat/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.20-R0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-chat</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Chat</name>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.0</version>
+            <version>2.10.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

chat/src/main/java/net/md_5/bungee/api/ChatColor.java

@@ -300,7 +300,7 @@ public final class ChatColor
     @Deprecated
     public static ChatColor[] values()
     {
-        return BY_CHAR.values().toArray( new ChatColor[ BY_CHAR.values().size() ] );
+        return BY_CHAR.values().toArray( new ChatColor[ 0 ] );
     }
 
     /**

chat/src/main/java/net/md_5/bungee/api/chat/BaseComponent.java

@@ -78,6 +78,12 @@ public abstract class BaseComponent
     @Getter
     private HoverEvent hoverEvent;
 
+    /**
+     * Whether this component rejects previous formatting
+     */
+    @Getter
+    private transient boolean reset;
+
     /**
      * Default constructor.
      *

chat/src/main/java/net/md_5/bungee/api/chat/ComponentBuilder.java

@@ -57,7 +57,7 @@ public final class ComponentBuilder
      */
     public ComponentBuilder(ComponentBuilder original)
     {
-        this( original.parts.toArray( new BaseComponent[ original.parts.size() ] ) );
+        this( original.parts.toArray( new BaseComponent[ 0 ] ) );
     }
 
     /**
@@ -161,7 +161,7 @@ public final class ComponentBuilder
             previous = dummy;
             dummy = null;
         }
-        if ( previous != null )
+        if ( previous != null && !component.isReset() )
         {
             component.copyFormatting( previous, retention, false );
         }
@@ -454,9 +454,32 @@ public final class ComponentBuilder
         return this;
     }
 
+    /**
+     * Returns the component built by this builder. If this builder is
+     * empty, an empty text component will be returned.
+     *
+     * @return the component
+     */
+    public BaseComponent build()
+    {
+        TextComponent base = new TextComponent();
+        if ( !parts.isEmpty() )
+        {
+            List<BaseComponent> cloned = new ArrayList<>( parts );
+            cloned.replaceAll( BaseComponent::duplicate );
+            base.setExtra( cloned );
+        }
+        return base;
+    }
+
     /**
      * Returns the components needed to display the message created by this
      * builder.git
+     * <p>
+     * <strong>NOTE:</strong> {@link #build()} is preferred as it will
+     * consolidate all components into a single BaseComponent with extra
+     * contents as opposed to an array of components which is non-standard
+     * and may result in unexpected behavior.
      *
      * @return the created components
      */

chat/src/main/java/net/md_5/bungee/api/chat/TextComponent.java

@@ -44,7 +44,7 @@ public final class TextComponent extends BaseComponent
      */
     public static BaseComponent[] fromLegacyText(String message, ChatColor defaultColor)
     {
-        ArrayList<BaseComponent> components = new ArrayList<BaseComponent>();
+        ArrayList<BaseComponent> components = new ArrayList<>();
         StringBuilder builder = new StringBuilder();
         TextComponent component = new TextComponent();
         Matcher matcher = url.matcher( message );
@@ -111,15 +111,15 @@ public final class TextComponent extends BaseComponent
                 } else if ( format == ChatColor.MAGIC )
                 {
                     component.setObfuscated( true );
-                } else if ( format == ChatColor.RESET )
-                {
-                    format = defaultColor;
-                    component = new TextComponent();
-                    component.setColor( format );
                 } else
                 {
+                    if ( format == ChatColor.RESET )
+                    {
+                        format = defaultColor;
+                    }
                     component = new TextComponent();
                     component.setColor( format );
+                    component.setReset( true );
                 }
                 continue;
             }
@@ -157,7 +157,7 @@ public final class TextComponent extends BaseComponent
         component.setText( builder.toString() );
         components.add( component );
 
-        return components.toArray( new BaseComponent[ components.size() ] );
+        return components.toArray( new BaseComponent[ 0 ] );
     }
 
     /**
@@ -230,6 +230,6 @@ public final class TextComponent extends BaseComponent
     @Override
     public String toString()
     {
-        return String.format( "TextComponent{text=%s, %s}", text, super.toString() );
+        return "TextComponent{text=" + text + ", " + super.toString() + '}';
     }
 }

chat/src/main/java/net/md_5/bungee/api/chat/TranslatableComponent.java

@@ -30,6 +30,10 @@ public final class TranslatableComponent extends BaseComponent
      * The components to substitute into the translation
      */
     private List<BaseComponent> with;
+    /**
+     * The fallback, if the translation is not found
+     */
+    private String fallback;
 
     /**
      * Creates a translatable component from the original to clone it.
@@ -153,6 +157,11 @@ public final class TranslatableComponent extends BaseComponent
     {
         String trans = TranslationRegistry.INSTANCE.translate( translate );
 
+        if ( trans.equals( translate ) && fallback != null )
+        {
+            trans = fallback;
+        }
+
         Matcher matcher = format.matcher( trans );
         int position = 0;
         int i = 0;

chat/src/main/java/net/md_5/bungee/api/chat/hover/content/Text.java

@@ -23,6 +23,12 @@ public class Text extends Content
         this.value = value;
     }
 
+    public Text(BaseComponent value)
+    {
+        // For legacy serialization reasons, this has to be an array of components
+        this( new BaseComponent[]{value} );
+    }
+
     public Text(String value)
     {
         this.value = value;

chat/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java

@@ -22,14 +22,6 @@ public class BaseComponentSerializer
 
     protected void deserialize(JsonObject object, BaseComponent component, JsonDeserializationContext context)
     {
-        if ( object.has( "color" ) )
-        {
-            component.setColor( ChatColor.of( object.get( "color" ).getAsString() ) );
-        }
-        if ( object.has( "font" ) )
-        {
-            component.setFont( object.get( "font" ).getAsString() );
-        }
         if ( object.has( "bold" ) )
         {
             component.setBold( object.get( "bold" ).getAsBoolean() );
@@ -50,14 +42,14 @@ public class BaseComponentSerializer
         {
             component.setObfuscated( object.get( "obfuscated" ).getAsBoolean() );
         }
+        if ( object.has( "color" ) )
+        {
+            component.setColor( ChatColor.of( object.get( "color" ).getAsString() ) );
+        }
         if ( object.has( "insertion" ) )
         {
             component.setInsertion( object.get( "insertion" ).getAsString() );
         }
-        if ( object.has( "extra" ) )
-        {
-            component.setExtra( Arrays.asList( context.<BaseComponent[]>deserialize( object.get( "extra" ), BaseComponent[].class ) ) );
-        }
 
         //Events
         if ( object.has( "clickEvent" ) )
@@ -93,7 +85,7 @@ public class BaseComponentSerializer
                     {
                         components = new BaseComponent[]
                         {
-                                context.deserialize( contents, BaseComponent.class )
+                            context.deserialize( contents, BaseComponent.class )
                         };
                     }
                     hoverEvent = new HoverEvent( action, components );
@@ -121,6 +113,15 @@ public class BaseComponentSerializer
                 component.setHoverEvent( hoverEvent );
             }
         }
+
+        if ( object.has( "font" ) )
+        {
+            component.setFont( object.get( "font" ).getAsString() );
+        }
+        if ( object.has( "extra" ) )
+        {
+            component.setExtra( Arrays.asList( context.<BaseComponent[]>deserialize( object.get( "extra" ), BaseComponent[].class ) ) );
+        }
     }
 
     protected void serialize(JsonObject object, BaseComponent component, JsonSerializationContext context)
@@ -135,14 +136,6 @@ public class BaseComponentSerializer
         {
             Preconditions.checkArgument( !ComponentSerializer.serializedComponents.get().contains( component ), "Component loop" );
             ComponentSerializer.serializedComponents.get().add( component );
-            if ( component.getColorRaw() != null )
-            {
-                object.addProperty( "color", component.getColorRaw().getName() );
-            }
-            if ( component.getFontRaw() != null )
-            {
-                object.addProperty( "font", component.getFontRaw() );
-            }
             if ( component.isBoldRaw() != null )
             {
                 object.addProperty( "bold", component.isBoldRaw() );
@@ -163,16 +156,15 @@ public class BaseComponentSerializer
             {
                 object.addProperty( "obfuscated", component.isObfuscatedRaw() );
             }
+            if ( component.getColorRaw() != null )
+            {
+                object.addProperty( "color", component.getColorRaw().getName() );
+            }
             if ( component.getInsertion() != null )
             {
                 object.addProperty( "insertion", component.getInsertion() );
             }
 
-            if ( component.getExtra() != null )
-            {
-                object.add( "extra", context.serialize( component.getExtra() ) );
-            }
-
             //Events
             if ( component.getClickEvent() != null )
             {
@@ -195,6 +187,15 @@ public class BaseComponentSerializer
                 }
                 object.add( "hoverEvent", hoverEvent );
             }
+
+            if ( component.getFontRaw() != null )
+            {
+                object.addProperty( "font", component.getFontRaw() );
+            }
+            if ( component.getExtra() != null )
+            {
+                object.add( "extra", context.serialize( component.getExtra() ) );
+            }
         } finally
         {
             ComponentSerializer.serializedComponents.get().remove( component );

chat/src/main/java/net/md_5/bungee/chat/ComponentSerializer.java

@@ -27,7 +27,6 @@ import net.md_5.bungee.api.chat.hover.content.TextSerializer;
 public class ComponentSerializer implements JsonDeserializer<BaseComponent>
 {
 
-    private static final JsonParser JSON_PARSER = new JsonParser();
     private static final Gson gson = new GsonBuilder().
             registerTypeAdapter( BaseComponent.class, new ComponentSerializer() ).
             registerTypeAdapter( TextComponent.class, new TextComponentSerializer() ).
@@ -43,9 +42,25 @@ public class ComponentSerializer implements JsonDeserializer<BaseComponent>
 
     public static final ThreadLocal<Set<BaseComponent>> serializedComponents = new ThreadLocal<Set<BaseComponent>>();
 
+    /**
+     * Parse a JSON-compliant String as an array of base components. The input
+     * can be one of either an array of components, or a single component object.
+     * If the input is an array, each component will be parsed individually and
+     * returned in the order that they were parsed. If the input is a single
+     * component object, a single-valued array with the component will be returned.
+     * <p>
+     * <strong>NOTE:</strong> {@link #deserialize(String)} is preferred as it will
+     * parse only one component as opposed to an array of components which is non-
+     * standard behavior. This method is still appropriate for parsing multiple
+     * components at once, although such use case is rarely (if at all) exhibited
+     * in vanilla Minecraft.
+     *
+     * @param json the component json to parse
+     * @return an array of all parsed components
+     */
     public static BaseComponent[] parse(String json)
     {
-        JsonElement jsonElement = JSON_PARSER.parse( json );
+        JsonElement jsonElement = JsonParser.parseString( json );
 
         if ( jsonElement.isJsonArray() )
         {
@@ -59,6 +74,26 @@ public class ComponentSerializer implements JsonDeserializer<BaseComponent>
         }
     }
 
+    /**
+     * Deserialize a JSON-compliant String as a single component. The input is
+     * expected to be a JSON object that represents only one component.
+     *
+     * @param json the component json to parse
+     * @return the deserialized component
+     * @throws IllegalArgumentException if anything other than a JSON object is
+     * passed as input
+     */
+    public static BaseComponent deserialize(String json)
+    {
+        JsonElement jsonElement = JsonParser.parseString( json );
+        if ( !jsonElement.isJsonObject() )
+        {
+            throw new IllegalArgumentException( "Malformatted JSON. Expected object, got array for input \"" + json + "\"." );
+        }
+
+        return gson.fromJson( jsonElement, BaseComponent.class );
+    }
+
     public static String toString(Object object)
     {
         return gson.toJson( object );

chat/src/main/java/net/md_5/bungee/chat/TextComponentSerializer.java

@@ -8,8 +8,6 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
-import java.util.List;
-import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.TextComponent;
 
 public class TextComponentSerializer extends BaseComponentSerializer implements JsonSerializer<TextComponent>, JsonDeserializer<TextComponent>
@@ -32,13 +30,9 @@ public class TextComponentSerializer extends BaseComponentSerializer implements
     @Override
     public JsonElement serialize(TextComponent src, Type typeOfSrc, JsonSerializationContext context)
     {
-        List<BaseComponent> extra = src.getExtra();
         JsonObject object = new JsonObject();
+        serialize( object, src, context );
         object.addProperty( "text", src.getText() );
-        if ( src.hasFormatting() || ( extra != null && !extra.isEmpty() ) )
-        {
-            serialize( object, src, context );
-        }
         return object;
     }
 }

chat/src/main/java/net/md_5/bungee/chat/TranslatableComponentSerializer.java

@@ -28,7 +28,11 @@ public class TranslatableComponentSerializer extends BaseComponentSerializer imp
         component.setTranslate( object.get( "translate" ).getAsString() );
         if ( object.has( "with" ) )
         {
-            component.setWith( Arrays.asList( context.<BaseComponent[]>deserialize( object.get( "with" ), BaseComponent[].class ) ) );
+            component.setWith( Arrays.asList( context.deserialize( object.get( "with" ), BaseComponent[].class ) ) );
+        }
+        if ( object.has( "fallback" ) )
+        {
+            component.setFallback( object.get( "fallback" ).getAsString() );
         }
         return component;
     }
@@ -43,6 +47,10 @@ public class TranslatableComponentSerializer extends BaseComponentSerializer imp
         {
             object.add( "with", context.serialize( src.getWith() ) );
         }
+        if ( src.getFallback() != null )
+        {
+            object.addProperty( "fallback", src.getFallback() );
+        }
         return object;
     }
 }

chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java

@@ -1,12 +1,17 @@
 package net.md_5.bungee.api.chat;
 
+import static org.junit.jupiter.api.Assertions.*;
 import java.awt.Color;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.ObjIntConsumer;
+import java.util.function.Supplier;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.hover.content.Item;
 import net.md_5.bungee.api.chat.hover.content.Text;
 import net.md_5.bungee.chat.ComponentSerializer;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ComponentsTest
 {
@@ -15,13 +20,27 @@ public class ComponentsTest
     {
         String json = ComponentSerializer.toString( components );
         BaseComponent[] parsed = ComponentSerializer.parse( json );
-        Assert.assertEquals( TextComponent.toLegacyText( parsed ), TextComponent.toLegacyText( components ) );
+        assertEquals( TextComponent.toLegacyText( parsed ), TextComponent.toLegacyText( components ) );
     }
 
-    public static void testDissembleReassemble(String json)
+    public static void testDissembleReassemble(BaseComponent component)
     {
+        String json = ComponentSerializer.toString( component );
         BaseComponent[] parsed = ComponentSerializer.parse( json );
-        Assert.assertEquals( json, ComponentSerializer.toString( parsed ) );
+        assertEquals( TextComponent.toLegacyText( parsed ), TextComponent.toLegacyText( component ) );
+    }
+
+    public static void testAssembleDissemble(String json, boolean modern)
+    {
+        if ( modern )
+        {
+            BaseComponent deserialized = ComponentSerializer.deserialize( json );
+            assertEquals( json, ComponentSerializer.toString( deserialized ) );
+        } else
+        {
+            BaseComponent[] parsed = ComponentSerializer.parse( json );
+            assertEquals( json, ComponentSerializer.toString( parsed ) );
+        }
     }
 
     @Test
@@ -41,14 +60,16 @@ public class ComponentsTest
         {
             textComponent
         } );
-        json = "{\"text\":\"Test\",\"hoverEvent\":{\"action\":\"show_item\",\"value\":[{\"text\":\"{id:\\\"minecraft:netherrack\\\",Count:47b}\"}]}}";
-        testDissembleReassemble( json );
+        testDissembleReassemble( textComponent );
+        json = "{\"hoverEvent\":{\"action\":\"show_item\",\"value\":[{\"text\":\"{id:\\\"minecraft:netherrack\\\",Count:47b}\"}]},\"text\":\"Test\"}";
+        testAssembleDissemble( json, false );
+        testAssembleDissemble( json, true );
         //////////
         String hoverVal = "{\"text\":\"{id:\\\"minecraft:dirt\\\",Count:1b}\"}";
         json = "{\"extra\":[{\"text\":\"[\"},{\"extra\":[{\"translate\":\"block.minecraft.dirt\"}],\"text\":\"\"},{\"text\":\"]\"}],\"hoverEvent\":{\"action\":\"show_item\",\"value\":[" + hoverVal + "]},\"text\":\"\"}";
         components = ComponentSerializer.parse( json );
         Text contentText = ( (Text) components[0].getHoverEvent().getContents().get( 0 ) );
-        Assert.assertEquals( hoverVal, ComponentSerializer.toString( (BaseComponent[]) contentText.getValue() ) );
+        assertEquals( hoverVal, ComponentSerializer.toString( (BaseComponent[]) contentText.getValue() ) );
         testDissembleReassemble( components );
         //////////
         TextComponent component1 = new TextComponent( "HoverableText" );
@@ -59,25 +80,44 @@ public class ComponentsTest
         json = ComponentSerializer.toString( component1 );
         components = ComponentSerializer.parse( json );
         Item parsedContentItem = ( (Item) components[0].getHoverEvent().getContents().get( 0 ) );
-        Assert.assertEquals( contentItem, parsedContentItem );
-        Assert.assertEquals( contentItem.getCount(), parsedContentItem.getCount() );
-        Assert.assertEquals( contentItem.getId(), parsedContentItem.getId() );
-        Assert.assertEquals( nbt, parsedContentItem.getTag().getNbt() );
+        assertEquals( contentItem, parsedContentItem );
+        assertEquals( contentItem.getCount(), parsedContentItem.getCount() );
+        assertEquals( contentItem.getId(), parsedContentItem.getId() );
+        assertEquals( nbt, parsedContentItem.getTag().getNbt() );
     }
 
     @Test
-    public void testEmptyComponentBuilder()
+    public void testEmptyComponentBuilderCreate()
+    {
+        this.testEmptyComponentBuilder(
+                ComponentBuilder::create,
+                (components) -> assertEquals( components.length, 0 ),
+                (components, size) -> assertEquals( size, components.length )
+        );
+    }
+
+    @Test
+    public void testEmptyComponentBuilderBuild()
+    {
+        this.testEmptyComponentBuilder(
+                ComponentBuilder::build,
+                (component) -> assertNull( component.getExtra() ),
+                (component, size) -> assertEquals( component.getExtra().size(), size )
+        );
+    }
+
+    private <T> void testEmptyComponentBuilder(Function<ComponentBuilder, T> componentBuilder, Consumer<T> emptyAssertion, ObjIntConsumer<T> sizedAssertion)
     {
         ComponentBuilder builder = new ComponentBuilder();
 
-        BaseComponent[] parts = builder.create();
-        Assert.assertEquals( parts.length, 0 );
+        T component = componentBuilder.apply( builder );
+        emptyAssertion.accept( component );
 
         for ( int i = 0; i < 3; i++ )
         {
             builder.append( "part:" + i );
-            parts = builder.create();
-            Assert.assertEquals( parts.length, i + 1 );
+            component = componentBuilder.apply( builder );
+            sizedAssertion.accept( component, i + 1 );
         }
     }
 
@@ -85,23 +125,23 @@ public class ComponentsTest
     public void testDummyRetaining()
     {
         ComponentBuilder builder = new ComponentBuilder();
-        Assert.assertNotNull( builder.getCurrentComponent() );
+        assertNotNull( builder.getCurrentComponent() );
         builder.color( ChatColor.GREEN );
         builder.append( "test ", ComponentBuilder.FormatRetention.ALL );
-        Assert.assertEquals( builder.getCurrentComponent().getColor(), ChatColor.GREEN );
+        assertEquals( builder.getCurrentComponent().getColor(), ChatColor.GREEN );
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void testComponentGettingExceptions()
     {
         ComponentBuilder builder = new ComponentBuilder();
-        builder.getComponent( -1 );
-        builder.getComponent( 0 );
-        builder.getComponent( 1 );
+        assertThrows( IndexOutOfBoundsException.class, () -> builder.getComponent( -1 ) );
+        assertThrows( IndexOutOfBoundsException.class, () -> builder.getComponent( 0 ) );
+        assertThrows( IndexOutOfBoundsException.class, () -> builder.getComponent( 1 ) );
         BaseComponent component = new TextComponent( "Hello" );
         builder.append( component );
-        Assert.assertEquals( builder.getComponent( 0 ), component );
-        builder.getComponent( 1 );
+        assertEquals( builder.getComponent( 0 ), component );
+        assertThrows( IndexOutOfBoundsException.class, () -> builder.getComponent( 1 ) );
     }
 
     @Test
@@ -110,33 +150,33 @@ public class ComponentsTest
         ComponentBuilder builder = new ComponentBuilder();
         TextComponent apple = new TextComponent( "apple" );
         builder.append( apple );
-        Assert.assertEquals( builder.getCurrentComponent(), apple );
-        Assert.assertEquals( builder.getComponent( 0 ), apple );
+        assertEquals( builder.getCurrentComponent(), apple );
+        assertEquals( builder.getComponent( 0 ), apple );
 
         TextComponent mango = new TextComponent( "mango" );
         TextComponent orange = new TextComponent( "orange" );
         builder.append( mango );
         builder.append( orange );
         builder.removeComponent( 1 ); // Removing mango
-        Assert.assertEquals( builder.getComponent( 0 ), apple );
-        Assert.assertEquals( builder.getComponent( 1 ), orange );
+        assertEquals( builder.getComponent( 0 ), apple );
+        assertEquals( builder.getComponent( 1 ), orange );
     }
 
     @Test
     public void testToLegacyFromLegacy()
     {
         String text = "§a§lHello §f§kworld§7!";
-        Assert.assertEquals( text, TextComponent.toLegacyText( TextComponent.fromLegacyText( text ) ) );
+        assertEquals( text, TextComponent.toLegacyText( TextComponent.fromLegacyText( text ) ) );
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void testComponentBuilderCursorInvalidPos()
     {
         ComponentBuilder builder = new ComponentBuilder();
         builder.append( new TextComponent( "Apple, " ) );
         builder.append( new TextComponent( "Orange, " ) );
-        builder.setCursor( -1 );
-        builder.setCursor( 2 );
+        assertThrows( IndexOutOfBoundsException.class, () -> builder.setCursor( -1 ) );
+        assertThrows( IndexOutOfBoundsException.class, () -> builder.setCursor( 2 ) );
     }
 
     @Test
@@ -144,24 +184,24 @@ public class ComponentsTest
     {
         TextComponent t1, t2, t3;
         ComponentBuilder builder = new ComponentBuilder();
-        Assert.assertEquals( builder.getCursor(), -1 );
+        assertEquals( builder.getCursor(), -1 );
         builder.append( t1 = new TextComponent( "Apple, " ) );
-        Assert.assertEquals( builder.getCursor(), 0 );
+        assertEquals( builder.getCursor(), 0 );
         builder.append( t2 = new TextComponent( "Orange, " ) );
         builder.append( t3 = new TextComponent( "Mango, " ) );
-        Assert.assertEquals( builder.getCursor(), 2 );
+        assertEquals( builder.getCursor(), 2 );
 
         builder.setCursor( 0 );
-        Assert.assertEquals( builder.getCurrentComponent(), t1 );
+        assertEquals( builder.getCurrentComponent(), t1 );
 
         // Test that appending new components updates the position to the new list size
         // after having previously set it to 0 (first component)
         builder.append( new TextComponent( "and Grapefruit" ) );
-        Assert.assertEquals( builder.getCursor(), 3 );
+        assertEquals( builder.getCursor(), 3 );
 
         builder.setCursor( 0 );
         builder.resetCursor();
-        Assert.assertEquals( builder.getCursor(), 3 );
+        assertEquals( builder.getCursor(), 3 );
     }
 
     @Test
@@ -170,7 +210,7 @@ public class ComponentsTest
         String text = "§a§lHello §r§kworld§7!";
         BaseComponent[] components = TextComponent.fromLegacyText( text );
         BaseComponent[] builderComponents = new ComponentBuilder().append( components ).create();
-        Assert.assertArrayEquals( components, builderComponents );
+        assertArrayEquals( components, builderComponents );
     }
 
     /*
@@ -192,7 +232,7 @@ public class ComponentsTest
         component.setHoverEvent( event );
         String serialised = ComponentSerializer.toString( component );
         BaseComponent[] deserialised = ComponentSerializer.parse( serialised );
-        Assert.assertEquals( TextComponent.toLegacyText( deserialised ), TextComponent.toLegacyText( component ) );
+        assertEquals( TextComponent.toLegacyText( deserialised ), TextComponent.toLegacyText( component ) );
     }
      */
 
@@ -207,13 +247,13 @@ public class ComponentsTest
         );
         TextComponent component = new TextComponent( "test" );
         component.setHoverEvent( hoverEvent );
-        Assert.assertEquals( component.getHoverEvent().getContents().size(), 1 );
-        Assert.assertTrue( component.getHoverEvent().getContents().get( 0 ) instanceof Text );
-        Assert.assertEquals( ( (Text) component.getHoverEvent().getContents().get( 0 ) ).getValue(), advancement );
+        assertEquals( component.getHoverEvent().getContents().size(), 1 );
+        assertTrue( component.getHoverEvent().getContents().get( 0 ) instanceof Text );
+        assertEquals( ( (Text) component.getHoverEvent().getContents().get( 0 ) ).getValue(), advancement );
     }
 
     @Test
-    public void testHoverEventContents()
+    public void testHoverEventContentsCreate()
     {
         // First do the text using the newer contents system
         HoverEvent hoverEvent = new HoverEvent(
@@ -222,21 +262,53 @@ public class ComponentsTest
                 new Text( new ComponentBuilder( "Second" ).create() )
         );
 
-        TextComponent component = new TextComponent( "Sample text" );
-        component.setHoverEvent( hoverEvent );
-        Assert.assertEquals( hoverEvent.getContents().size(), 2 );
-        Assert.assertFalse( hoverEvent.isLegacy() );
-        String serialized = ComponentSerializer.toString( component );
-        BaseComponent[] deserialized = ComponentSerializer.parse( serialized );
-        Assert.assertEquals( component.getHoverEvent(), deserialized[0].getHoverEvent() );
+        this.testHoverEventContents(
+                hoverEvent,
+                ComponentSerializer::parse,
+                (components) -> components[0].getHoverEvent(),
+                ComponentsTest::testDissembleReassemble // BaseComponent
+        );
 
         // check the test still works with the value method
         hoverEvent = new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder( "Sample text" ).create() );
-        Assert.assertEquals( hoverEvent.getContents().size(), 1 );
-        Assert.assertTrue( hoverEvent.isLegacy() );
-        serialized = ComponentSerializer.toString( component );
-        deserialized = ComponentSerializer.parse( serialized );
-        Assert.assertEquals( component.getHoverEvent(), deserialized[0].getHoverEvent() );
+        TextComponent component = new TextComponent( "Sample text" );
+        component.setHoverEvent( hoverEvent );
+
+        assertEquals( hoverEvent.getContents().size(), 1 );
+        assertTrue( hoverEvent.isLegacy() );
+        String serialized = ComponentSerializer.toString( component );
+        BaseComponent[] deserialized = ComponentSerializer.parse( serialized );
+        assertEquals( component.getHoverEvent(), deserialized[0].getHoverEvent() );
+    }
+
+    @Test
+    public void testHoverEventContentsBuild()
+    {
+        // First do the text using the newer contents system
+        HoverEvent hoverEvent = new HoverEvent(
+                HoverEvent.Action.SHOW_TEXT,
+                new Text( new ComponentBuilder( "First" ).build() ),
+                new Text( new ComponentBuilder( "Second" ).build() )
+        );
+
+        this.testHoverEventContents(
+                hoverEvent,
+                ComponentSerializer::deserialize,
+                BaseComponent::getHoverEvent,
+                ComponentsTest::testDissembleReassemble // BaseComponent
+        );
+    }
+
+    private <T> void testHoverEventContents(HoverEvent hoverEvent, Function<String, T> deserializer, Function<T, HoverEvent> hoverEventGetter, Consumer<T> dissembleReassembleTest)
+    {
+        TextComponent component = new TextComponent( "Sample text" );
+        component.setHoverEvent( hoverEvent );
+        assertEquals( hoverEvent.getContents().size(), 2 );
+        assertFalse( hoverEvent.isLegacy() );
+
+        String serialized = ComponentSerializer.toString( component );
+        T deserialized = deserializer.apply( serialized );
+        assertEquals( component.getHoverEvent(), hoverEventGetter.apply( deserialized ) );
 
         // Test single content:
         String json = "{\"italic\":true,\"color\":\"gray\",\"translate\":\"chat.type.admin\",\"with\":[{\"text\":\"@\"}"
@@ -248,37 +320,76 @@ public class ComponentsTest
                 + "\"/tell Name \"},\"hoverEvent\":{\"action\":\"show_entity\",\"contents\":"
                 + "{\"type\":\"minecraft:player\",\"id\":\"00000000-0000-0000-0000-00000000000000\",\"name\":"
                 + "{\"text\":\"Name\"}}},\"text\":\"Name\"}]}]}";
-        testDissembleReassemble( ComponentSerializer.parse( json ) );
+        dissembleReassembleTest.accept( deserializer.apply( json ) );
     }
 
     @Test
-    public void testFormatRetentionCopyFormatting()
+    public void testFormatRetentionCopyFormattingCreate()
+    {
+        this.testFormatRetentionCopyFormatting( () -> new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder( "Test" ).create() ) );
+    }
+
+    @Test
+    public void testFormatRetentionCopyFormattingBuild()
+    {
+        this.testFormatRetentionCopyFormatting( () -> new HoverEvent( HoverEvent.Action.SHOW_TEXT, new Text( new ComponentBuilder( "Test" ).build() ) ) );
+    }
+
+    private void testFormatRetentionCopyFormatting(Supplier<HoverEvent> hoverEventSupplier)
     {
         TextComponent first = new TextComponent( "Hello" );
         first.setBold( true );
         first.setColor( ChatColor.RED );
         first.setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, "test" ) );
-        first.setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder( "Test" ).create() ) );
+        first.setHoverEvent( hoverEventSupplier.get() );
 
         TextComponent second = new TextComponent( " world" );
         second.copyFormatting( first, ComponentBuilder.FormatRetention.ALL, true );
-        Assert.assertEquals( first.isBold(), second.isBold() );
-        Assert.assertEquals( first.getColor(), second.getColor() );
-        Assert.assertEquals( first.getClickEvent(), second.getClickEvent() );
-        Assert.assertEquals( first.getHoverEvent(), second.getHoverEvent() );
+        assertEquals( first.isBold(), second.isBold() );
+        assertEquals( first.getColor(), second.getColor() );
+        assertEquals( first.getClickEvent(), second.getClickEvent() );
+        assertEquals( first.getHoverEvent(), second.getHoverEvent() );
     }
 
     @Test
-    public void testBuilderClone()
+    public void testBuilderCloneCreate()
+    {
+        this.testBuilderClone( (builder) -> TextComponent.toLegacyText( builder.create() ) );
+    }
+
+    @Test
+    public void testBuilderCloneBuild()
+    {
+        this.testBuilderClone( (builder) -> TextComponent.toLegacyText( builder.build() ) );
+    }
+
+    private void testBuilderClone(Function<ComponentBuilder, String> legacyTextFunction)
     {
         ComponentBuilder builder = new ComponentBuilder( "Hello " ).color( ChatColor.RED ).append( "world" ).color( ChatColor.DARK_RED );
         ComponentBuilder cloned = new ComponentBuilder( builder );
 
-        Assert.assertEquals( TextComponent.toLegacyText( builder.create() ), TextComponent.toLegacyText( cloned.create() ) );
+        assertEquals( legacyTextFunction.apply( builder ), legacyTextFunction.apply( cloned ) );
     }
 
     @Test
-    public void testBuilderAppendMixedComponents()
+    public void testBuilderAppendCreateMixedComponents()
+    {
+        this.testBuilderAppendMixedComponents(
+                ComponentBuilder::create,
+                (components, index) -> components[index]
+        );
+    }
+
+    @Test
+    public void testBuilderAppendBuildMixedComponents()
+    {
+        this.testBuilderAppendMixedComponents(
+                ComponentBuilder::build,
+                (component, index) -> component.getExtra().get( index )
+        );
+    }
+
+    private <T> void testBuilderAppendMixedComponents(Function<ComponentBuilder, T> componentBuilder, BiFunction<T, Integer, BaseComponent> extraGetter)
     {
         ComponentBuilder builder = new ComponentBuilder( "Hello " );
         TextComponent textComponent = new TextComponent( "world " );
@@ -291,11 +402,11 @@ public class ComponentsTest
         } );
         ScoreComponent scoreComponent = new ScoreComponent( "myscore", "myobjective" );
         builder.append( scoreComponent ); // non array based BaseComponent append
-        BaseComponent[] components = builder.create();
-        Assert.assertEquals( "Hello ", components[0].toPlainText() );
-        Assert.assertEquals( textComponent.toPlainText(), components[1].toPlainText() );
-        Assert.assertEquals( translatableComponent.toPlainText(), components[2].toPlainText() );
-        Assert.assertEquals( scoreComponent.toPlainText(), components[3].toPlainText() );
+        T component = componentBuilder.apply( builder );
+        assertEquals( "Hello ", extraGetter.apply( component, 0 ).toPlainText() );
+        assertEquals( textComponent.toPlainText(), extraGetter.apply( component, 1 ).toPlainText() );
+        assertEquals( translatableComponent.toPlainText(), extraGetter.apply( component, 2 ).toPlainText() );
+        assertEquals( scoreComponent.toPlainText(), extraGetter.apply( component, 3 ).toPlainText() );
     }
 
     @Test
@@ -305,36 +416,84 @@ public class ComponentsTest
         String text = ComponentSerializer.toString( component );
         BaseComponent[] reparsed = ComponentSerializer.parse( text );
 
-        Assert.assertArrayEquals( component, reparsed );
+        assertArrayEquals( component, reparsed );
     }
 
     @Test
-    public void testBuilderAppend()
+    public void testBuilderAppendCreate()
+    {
+        this.testBuilderAppend(
+                () -> new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder( "Hello world" ).create() ),
+                ComponentBuilder::create,
+                (components, index) -> components[index],
+                BaseComponent::toPlainText,
+                ChatColor.YELLOW + "Hello " + ChatColor.GREEN + "world!",
+                BaseComponent::toLegacyText
+        );
+    }
+
+    @Test
+    public void testBuilderAppendBuild()
+    {
+        this.testBuilderAppend(
+                () -> new HoverEvent( HoverEvent.Action.SHOW_TEXT, new Text( new ComponentBuilder( "Hello world" ).build() ) ),
+                ComponentBuilder::build,
+                (component, index) -> component.getExtra().get( index ),
+                (component) -> BaseComponent.toPlainText( component ),
+                // An extra format code is appended to the beginning because there is an empty TextComponent at the start of every component
+                ChatColor.WHITE.toString() + ChatColor.YELLOW + "Hello " + ChatColor.GREEN + "world!",
+                (component) -> BaseComponent.toLegacyText( component )
+        );
+    }
+
+    private <T> void testBuilderAppend(Supplier<HoverEvent> hoverEventSupplier, Function<ComponentBuilder, T> componentBuilder, BiFunction<T, Integer, BaseComponent> extraGetter, Function<T, String> toPlainTextFunction, String expectedLegacyText, Function<T, String> toLegacyTextFunction)
     {
         ClickEvent clickEvent = new ClickEvent( ClickEvent.Action.RUN_COMMAND, "/help " );
-        HoverEvent hoverEvent = new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder( "Hello world" ).create() );
+        HoverEvent hoverEvent = hoverEventSupplier.get();
 
         ComponentBuilder builder = new ComponentBuilder( "Hello " ).color( ChatColor.YELLOW );
-        builder.append( new ComponentBuilder( "world!" ).color( ChatColor.GREEN ).event( hoverEvent ).event( clickEvent ).create() );
+        builder.append( new ComponentBuilder( "world!" ).color( ChatColor.GREEN ).event( hoverEvent ).event( clickEvent ).create() ); // Intentionally using create() to append multiple individual components
 
-        BaseComponent[] components = builder.create();
+        T component = componentBuilder.apply( builder );
 
-        Assert.assertEquals( components[1].getHoverEvent(), hoverEvent );
-        Assert.assertEquals( components[1].getClickEvent(), clickEvent );
-        Assert.assertEquals( "Hello world!", BaseComponent.toPlainText( components ) );
-        Assert.assertEquals( ChatColor.YELLOW + "Hello " + ChatColor.GREEN + "world!", BaseComponent.toLegacyText( components ) );
+        assertEquals( extraGetter.apply( component, 1 ).getHoverEvent(), hoverEvent );
+        assertEquals( extraGetter.apply( component, 1 ).getClickEvent(), clickEvent );
+        assertEquals( "Hello world!", toPlainTextFunction.apply( component ) );
+        assertEquals( expectedLegacyText, toLegacyTextFunction.apply( component ) );
     }
 
     @Test
-    public void testBuilderAppendLegacy()
+    public void testBuilderAppendLegacyCreate()
+    {
+        this.testBuilderAppendLegacy(
+                ComponentBuilder::create,
+                BaseComponent::toPlainText,
+                ChatColor.YELLOW + "Hello " + ChatColor.GREEN + "world!",
+                BaseComponent::toLegacyText
+        );
+    }
+
+    @Test
+    public void testBuilderAppendLegacyBuild()
+    {
+        this.testBuilderAppendLegacy(
+                ComponentBuilder::build,
+                (component) -> BaseComponent.toPlainText( component ),
+                // An extra format code is appended to the beginning because there is an empty TextComponent at the start of every component
+                ChatColor.WHITE.toString() + ChatColor.YELLOW + "Hello " + ChatColor.GREEN + "world!",
+                (component) -> BaseComponent.toLegacyText( component )
+        );
+    }
+
+    private <T> void testBuilderAppendLegacy(Function<ComponentBuilder, T> componentBuilder, Function<T, String> toPlainTextFunction, String expectedLegacyString, Function<T, String> toLegacyTextFunction)
     {
         ComponentBuilder builder = new ComponentBuilder( "Hello " ).color( ChatColor.YELLOW );
         builder.appendLegacy( "§aworld!" );
 
-        BaseComponent[] components = builder.create();
+        T component = componentBuilder.apply( builder );
 
-        Assert.assertEquals( "Hello world!", BaseComponent.toPlainText( components ) );
-        Assert.assertEquals( ChatColor.YELLOW + "Hello " + ChatColor.GREEN + "world!", BaseComponent.toLegacyText( components ) );
+        assertEquals( "Hello world!", toPlainTextFunction.apply( component ) );
+        assertEquals( expectedLegacyString, toLegacyTextFunction.apply( component ) );
     }
 
     @Test
@@ -343,8 +502,8 @@ public class ComponentsTest
         TextComponent textComponent = new TextComponent( "Hello world" );
         textComponent.setColor( ChatColor.RED );
 
-        Assert.assertEquals( "Hello world", textComponent.toPlainText() );
-        Assert.assertEquals( ChatColor.RED + "Hello world", textComponent.toLegacyText() );
+        assertEquals( "Hello world", textComponent.toPlainText() );
+        assertEquals( ChatColor.RED + "Hello world", textComponent.toLegacyText() );
     }
 
     @Test
@@ -352,25 +511,25 @@ public class ComponentsTest
     {
         BaseComponent[] test1 = TextComponent.fromLegacyText( ChatColor.AQUA + "Aqua " + ChatColor.RED + ChatColor.BOLD + "RedBold" );
 
-        Assert.assertEquals( "Aqua RedBold", BaseComponent.toPlainText( test1 ) );
-        Assert.assertEquals( ChatColor.AQUA + "Aqua " + ChatColor.RED + ChatColor.BOLD + "RedBold", BaseComponent.toLegacyText( test1 ) );
+        assertEquals( "Aqua RedBold", BaseComponent.toPlainText( test1 ) );
+        assertEquals( ChatColor.AQUA + "Aqua " + ChatColor.RED + ChatColor.BOLD + "RedBold", BaseComponent.toLegacyText( test1 ) );
 
         BaseComponent[] test2 = TextComponent.fromLegacyText( "Text http://spigotmc.org " + ChatColor.GREEN + "google.com/test" );
 
-        Assert.assertEquals( "Text http://spigotmc.org google.com/test", BaseComponent.toPlainText( test2 ) );
+        assertEquals( "Text http://spigotmc.org google.com/test", BaseComponent.toPlainText( test2 ) );
         //The extra ChatColor instances are sometimes inserted when not needed but it doesn't change the result
-        Assert.assertEquals( ChatColor.WHITE + "Text " + ChatColor.WHITE + "http://spigotmc.org" + ChatColor.WHITE
+        assertEquals( ChatColor.WHITE + "Text " + ChatColor.WHITE + "http://spigotmc.org" + ChatColor.WHITE
                 + " " + ChatColor.GREEN + "google.com/test" + ChatColor.GREEN, BaseComponent.toLegacyText( test2 ) );
 
         ClickEvent url1 = test2[1].getClickEvent();
-        Assert.assertNotNull( url1 );
-        Assert.assertTrue( url1.getAction() == ClickEvent.Action.OPEN_URL );
-        Assert.assertEquals( "http://spigotmc.org", url1.getValue() );
+        assertNotNull( url1 );
+        assertTrue( url1.getAction() == ClickEvent.Action.OPEN_URL );
+        assertEquals( "http://spigotmc.org", url1.getValue() );
 
         ClickEvent url2 = test2[3].getClickEvent();
-        Assert.assertNotNull( url2 );
-        Assert.assertTrue( url2.getAction() == ClickEvent.Action.OPEN_URL );
-        Assert.assertEquals( "http://google.com/test", url2.getValue() );
+        assertNotNull( url2 );
+        assertTrue( url2.getAction() == ClickEvent.Action.OPEN_URL );
+        assertEquals( "http://google.com/test", url2.getValue() );
     }
 
     @Test
@@ -382,83 +541,140 @@ public class ComponentsTest
                 item, "5",
                 "thinkofdeath" );
 
-        Assert.assertEquals( "Given Golden Sword * 5 to thinkofdeath", translatableComponent.toPlainText() );
-        Assert.assertEquals( ChatColor.WHITE + "Given " + ChatColor.AQUA + "Golden Sword" + ChatColor.WHITE
+        assertEquals( "Given Golden Sword * 5 to thinkofdeath", translatableComponent.toPlainText() );
+        assertEquals( ChatColor.WHITE + "Given " + ChatColor.AQUA + "Golden Sword" + ChatColor.WHITE
                 + " * " + ChatColor.WHITE + "5" + ChatColor.WHITE + " to " + ChatColor.WHITE + "thinkofdeath",
                 translatableComponent.toLegacyText() );
 
         TranslatableComponent positional = new TranslatableComponent( "book.pageIndicator", "5", "50" );
 
-        Assert.assertEquals( "Page 5 of 50", positional.toPlainText() );
-        Assert.assertEquals( ChatColor.WHITE + "Page " + ChatColor.WHITE + "5" + ChatColor.WHITE + " of " + ChatColor.WHITE + "50", positional.toLegacyText() );
+        assertEquals( "Page 5 of 50", positional.toPlainText() );
+        assertEquals( ChatColor.WHITE + "Page " + ChatColor.WHITE + "5" + ChatColor.WHITE + " of " + ChatColor.WHITE + "50", positional.toLegacyText() );
 
         TranslatableComponent one_four_two = new TranslatableComponent( "filled_map.buried_treasure" );
-        Assert.assertEquals( "Buried Treasure Map", one_four_two.toPlainText() );
+        assertEquals( "Buried Treasure Map", one_four_two.toPlainText() );
     }
 
     @Test
-    public void testBuilder()
+    public void testBuilderCreate()
     {
-        BaseComponent[] components = new ComponentBuilder( "Hello " ).color( ChatColor.RED ).
+        this.testBuilder(
+                ComponentBuilder::create,
+                BaseComponent::toPlainText,
+                ChatColor.RED + "Hello " + ChatColor.BLUE + ChatColor.BOLD
+                    + "World" + ChatColor.YELLOW + ChatColor.BOLD + "!",
+                BaseComponent::toLegacyText
+        );
+    }
+
+    @Test
+    public void testBuilderBuild()
+    {
+        this.testBuilder(
+                ComponentBuilder::build,
+                (component) -> BaseComponent.toPlainText( component ),
+                // An extra format code is appended to the beginning because there is an empty TextComponent at the start of every component
+                ChatColor.WHITE.toString() + ChatColor.RED + "Hello " + ChatColor.BLUE + ChatColor.BOLD
+                    + "World" + ChatColor.YELLOW + ChatColor.BOLD + "!",
+                (component) -> BaseComponent.toLegacyText( component )
+        );
+    }
+
+    private <T> void testBuilder(Function<ComponentBuilder, T> componentBuilder, Function<T, String> toPlainTextFunction, String expectedLegacyString, Function<T, String> toLegacyTextFunction)
+    {
+        T component = componentBuilder.apply( new ComponentBuilder( "Hello " ).color( ChatColor.RED ).
                 append( "World" ).bold( true ).color( ChatColor.BLUE ).
-                append( "!" ).color( ChatColor.YELLOW ).create();
+                append( "!" ).color( ChatColor.YELLOW ) );
 
-        Assert.assertEquals( "Hello World!", BaseComponent.toPlainText( components ) );
-        Assert.assertEquals( ChatColor.RED + "Hello " + ChatColor.BLUE + ChatColor.BOLD
-                + "World" + ChatColor.YELLOW + ChatColor.BOLD + "!", BaseComponent.toLegacyText( components ) );
+        assertEquals( "Hello World!", toPlainTextFunction.apply( component ) );
+        assertEquals( expectedLegacyString, toLegacyTextFunction.apply( component ) );
     }
 
     @Test
-    public void testBuilderReset()
+    public void testBuilderCreateReset()
     {
-        BaseComponent[] components = new ComponentBuilder( "Hello " ).color( ChatColor.RED )
-                .append( "World" ).reset().create();
-
-        Assert.assertEquals( components[0].getColor(), ChatColor.RED );
-        Assert.assertEquals( components[1].getColor(), ChatColor.WHITE );
+        this.testBuilderReset(
+                ComponentBuilder::create,
+                (components, index) -> components[index]
+        );
     }
 
     @Test
-    public void testBuilderFormatRetention()
+    public void testBuilderBuildReset()
     {
-        BaseComponent[] noneRetention = new ComponentBuilder( "Hello " ).color( ChatColor.RED )
-                .append( "World", ComponentBuilder.FormatRetention.NONE ).create();
+        this.testBuilderReset(
+                ComponentBuilder::build,
+                (component, index) -> component.getExtra().get( index )
+        );
+    }
 
-        Assert.assertEquals( noneRetention[0].getColor(), ChatColor.RED );
-        Assert.assertEquals( noneRetention[1].getColor(), ChatColor.WHITE );
+    private <T> void testBuilderReset(Function<ComponentBuilder, T> componentBuilder, BiFunction<T, Integer, BaseComponent> extraGetter)
+    {
+        T component = componentBuilder.apply( new ComponentBuilder( "Hello " ).color( ChatColor.RED )
+                .append( "World" ).reset() );
 
-        HoverEvent testEvent = new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder( "test" ).create() );
+        assertEquals( ChatColor.RED, extraGetter.apply( component, 0 ).getColor() );
+        assertEquals( ChatColor.WHITE, extraGetter.apply( component, 1 ).getColor() );
+    }
 
-        BaseComponent[] formattingRetention = new ComponentBuilder( "Hello " ).color( ChatColor.RED )
-                .event( testEvent ).append( "World", ComponentBuilder.FormatRetention.FORMATTING ).create();
+    @Test
+    public void testBuilderCreateFormatRetention()
+    {
+        this.testBuilderFormatRetention(
+                ComponentBuilder::create,
+                (components, index) -> components[index]
+        );
+    }
 
-        Assert.assertEquals( formattingRetention[0].getColor(), ChatColor.RED );
-        Assert.assertEquals( formattingRetention[0].getHoverEvent(), testEvent );
-        Assert.assertEquals( formattingRetention[1].getColor(), ChatColor.RED );
-        Assert.assertNull( formattingRetention[1].getHoverEvent() );
+    @Test
+    public void testBuilderBuildFormatRetention()
+    {
+        this.testBuilderFormatRetention(
+                ComponentBuilder::build,
+                (component, index) -> component.getExtra().get( index )
+        );
+    }
+
+    private <T> void testBuilderFormatRetention(Function<ComponentBuilder, T> componentBuilder, BiFunction<T, Integer, BaseComponent> extraGetter)
+    {
+        T noneRetention = componentBuilder.apply( new ComponentBuilder( "Hello " ).color( ChatColor.RED )
+                .append( "World", ComponentBuilder.FormatRetention.NONE ) );
+
+        assertEquals( ChatColor.RED, extraGetter.apply( noneRetention, 0 ).getColor() );
+        assertEquals( ChatColor.WHITE, extraGetter.apply( noneRetention, 1 ).getColor() );
+
+        HoverEvent testEvent = new HoverEvent( HoverEvent.Action.SHOW_TEXT, new Text( new ComponentBuilder( "test" ).build() ) );
+
+        T formattingRetention = componentBuilder.apply( new ComponentBuilder( "Hello " ).color( ChatColor.RED )
+                .event( testEvent ).append( "World", ComponentBuilder.FormatRetention.FORMATTING ) );
+
+        assertEquals( ChatColor.RED, extraGetter.apply( formattingRetention, 0 ).getColor() );
+        assertEquals( testEvent, extraGetter.apply( formattingRetention, 0 ).getHoverEvent() );
+        assertEquals( ChatColor.RED, extraGetter.apply( formattingRetention, 1 ).getColor() );
+        assertNull( extraGetter.apply( formattingRetention, 1 ).getHoverEvent() );
 
         ClickEvent testClickEvent = new ClickEvent( ClickEvent.Action.OPEN_URL, "http://www.example.com" );
 
-        BaseComponent[] eventRetention = new ComponentBuilder( "Hello " ).color( ChatColor.RED )
-                .event( testEvent ).event( testClickEvent ).append( "World", ComponentBuilder.FormatRetention.EVENTS ).create();
+        T eventRetention = componentBuilder.apply( new ComponentBuilder( "Hello " ).color( ChatColor.RED )
+                .event( testEvent ).event( testClickEvent ).append( "World", ComponentBuilder.FormatRetention.EVENTS ) );
 
-        Assert.assertEquals( eventRetention[0].getColor(), ChatColor.RED );
-        Assert.assertEquals( eventRetention[0].getHoverEvent(), testEvent );
-        Assert.assertEquals( eventRetention[0].getClickEvent(), testClickEvent );
-        Assert.assertEquals( eventRetention[1].getColor(), ChatColor.WHITE );
-        Assert.assertEquals( eventRetention[1].getHoverEvent(), testEvent );
-        Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
+        assertEquals( ChatColor.RED, extraGetter.apply( eventRetention, 0 ).getColor() );
+        assertEquals( testEvent, extraGetter.apply( eventRetention, 0 ).getHoverEvent() );
+        assertEquals( testClickEvent, extraGetter.apply( eventRetention, 0 ).getClickEvent() );
+        assertEquals( ChatColor.WHITE, extraGetter.apply( eventRetention, 1 ).getColor() );
+        assertEquals( testEvent, extraGetter.apply( eventRetention, 1 ).getHoverEvent() );
+        assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testLoopSimple()
     {
         TextComponent component = new TextComponent( "Testing" );
         component.addExtra( component );
-        ComponentSerializer.toString( component );
+        assertThrows( IllegalArgumentException.class, () -> ComponentSerializer.toString( component ) );
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testLoopComplex()
     {
         TextComponent a = new TextComponent( "A" );
@@ -469,7 +685,7 @@ public class ComponentsTest
         a.addExtra( b );
         b.addExtra( c );
         c.addExtra( a );
-        ComponentSerializer.toString( a );
+        assertThrows( IllegalArgumentException.class, () -> ComponentSerializer.toString( a ) );
     }
 
     @Test
@@ -483,7 +699,7 @@ public class ComponentsTest
         ComponentSerializer.toString( a );
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testRepeatedError()
     {
         TextComponent a = new TextComponent( "A" );
@@ -495,7 +711,7 @@ public class ComponentsTest
         a.addExtra( c );
         c.addExtra( a );
         a.addExtra( b );
-        ComponentSerializer.toString( a );
+        assertThrows( IllegalArgumentException.class, () -> ComponentSerializer.toString( a ) );
     }
 
     @Test
@@ -520,7 +736,7 @@ public class ComponentsTest
         String emptyLegacyText = fromAndToLegacyText( "" );
 
         // all invalid color codes and the trailing '§' should be ignored
-        Assert.assertEquals( emptyLegacyText, invalidColorCodesLegacyText );
+        assertEquals( emptyLegacyText, invalidColorCodesLegacyText );
     }
 
     @Test
@@ -529,12 +745,12 @@ public class ComponentsTest
         String text = "§a";
 
         BaseComponent[] converted = TextComponent.fromLegacyText( text );
-        Assert.assertEquals( ChatColor.GREEN, converted[0].getColor() );
+        assertEquals( ChatColor.GREEN, converted[0].getColor() );
 
         String roundtripLegacyText = BaseComponent.toLegacyText( converted );
 
         // color code should not be lost during conversion
-        Assert.assertEquals( text, roundtripLegacyText );
+        assertEquals( text, roundtripLegacyText );
     }
 
     @Test
@@ -546,7 +762,7 @@ public class ComponentsTest
         TextComponent second = new TextComponent( "Hello, " );
         second.addExtra( new TextComponent( "World!" ) );
 
-        Assert.assertEquals( first, second );
+        assertEquals( first, second );
     }
 
     @Test
@@ -558,7 +774,7 @@ public class ComponentsTest
         TextComponent second = new TextComponent( "Hello, " );
         second.addExtra( new TextComponent( "World!" ) );
 
-        Assert.assertNotEquals( first, second );
+        assertNotEquals( first, second );
     }
 
     @Test
@@ -569,10 +785,57 @@ public class ComponentsTest
 
         BaseComponent[] reColored = TextComponent.fromLegacyText( legacy );
 
-        Assert.assertArrayEquals( hexColored, reColored );
+        assertArrayEquals( hexColored, reColored );
     }
 
-    private String fromAndToLegacyText(String legacyText)
+    @Test
+    public void testLegacyResetInBuilderCreate()
+    {
+        this.testLegacyResetInBuilder(
+                ComponentBuilder::create,
+                ComponentSerializer::toString
+        );
+    }
+
+    @Test
+    public void testLegacyResetInBuilderBuild()
+    {
+        this.testLegacyResetInBuilder(
+                ComponentBuilder::build,
+                ComponentSerializer::toString
+        );
+    }
+
+    /*
+     * In legacy chat, colors and reset both reset all formatting.
+     * Make sure it works in combination with ComponentBuilder.
+     */
+    private <T> void testLegacyResetInBuilder(Function<ComponentBuilder, T> componentBuilder, Function<T, String> componentSerializer)
+    {
+        ComponentBuilder builder = new ComponentBuilder();
+        BaseComponent[] a = TextComponent.fromLegacyText( "§4§n44444§rdd§6§l6666" );
+
+        String expected = "{\"extra\":[{\"underlined\":true,\"color\":\"dark_red\",\"text\":\"44444\"},{\"color\":"
+                + "\"white\",\"text\":\"dd\"},{\"bold\":true,\"color\":\"gold\",\"text\":\"6666\"}],\"text\":\"\"}";
+        assertEquals( expected, ComponentSerializer.toString( a ) );
+
+        builder.append( a );
+
+        String test1 = componentSerializer.apply( componentBuilder.apply( builder ) );
+        assertEquals( expected, test1 );
+
+        BaseComponent[] b = TextComponent.fromLegacyText( "§rrrrr" );
+        builder.append( b );
+
+        String test2 = componentSerializer.apply( componentBuilder.apply( builder ) );
+        assertEquals(
+                "{\"extra\":[{\"underlined\":true,\"color\":\"dark_red\",\"text\":\"44444\"},"
+                        + "{\"color\":\"white\",\"text\":\"dd\"},{\"bold\":true,\"color\":\"gold\",\"text\":\"6666\"},"
+                        + "{\"color\":\"white\",\"text\":\"rrrr\"}],\"text\":\"\"}",
+                test2 );
+    }
+
+    private static String fromAndToLegacyText(String legacyText)
     {
         return BaseComponent.toLegacyText( TextComponent.fromLegacyText( legacyText ) );
     }

chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java

@@ -1,8 +1,8 @@
 package net.md_5.bungee.api.chat;
 
+import static org.junit.jupiter.api.Assertions.*;
 import net.md_5.bungee.chat.ComponentSerializer;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TranslatableComponentTest
 {
@@ -11,8 +11,8 @@ public class TranslatableComponentTest
     public void testMissingPlaceholdersAdded()
     {
         TranslatableComponent testComponent = new TranslatableComponent( "Test string with %s placeholders: %s", 2, "aoeu" );
-        Assert.assertEquals( "Test string with 2 placeholders: aoeu", testComponent.toPlainText() );
-        Assert.assertEquals( "§fTest string with §f2§f placeholders: §faoeu", testComponent.toLegacyText() );
+        assertEquals( "Test string with 2 placeholders: aoeu", testComponent.toPlainText() );
+        assertEquals( "§fTest string with §f2§f placeholders: §faoeu", testComponent.toLegacyText() );
     }
 
     @Test
@@ -22,7 +22,7 @@ public class TranslatableComponentTest
         String jsonString = ComponentSerializer.toString( testComponent );
         BaseComponent[] baseComponents = ComponentSerializer.parse( jsonString );
 
-        Assert.assertEquals( "Test string with a placeholder", TextComponent.toPlainText( baseComponents ) );
-        Assert.assertEquals( "§fTest string with §fa§f placeholder", TextComponent.toLegacyText( baseComponents ) );
+        assertEquals( "Test string with a placeholder", TextComponent.toPlainText( baseComponents ) );
+        assertEquals( "§fTest string with §fa§f placeholder", TextComponent.toLegacyText( baseComponents ) );
     }
 }

checkstyle.xml

@@ -33,9 +33,9 @@
 
         <!-- See http://checkstyle.sourceforge.net/config_filters.html -->
         <module name="SuppressionCommentFilter"/>
+        <module name="SuppressWarningsHolder"/>
 
         <!-- See http://checkstyle.sourceforge.net/config_imports.html -->
-        <module name="AvoidStarImport"/>
         <module name="ImportOrder">
             <property name="option" value="above"/>
             <property name="ordered" value="true"/>
@@ -54,11 +54,11 @@
         <module name="OperatorWrap"/>
         <module name="ParenPad">
             <property name="option" value="nospace"/>
-            <property name="tokens" value="ANNOTATION, CTOR_DEF, METHOD_DEF"/>
+            <property name="tokens" value="ANNOTATION, CTOR_DEF, METHOD_DEF, LAMBDA"/>
         </module>
         <module name="ParenPad">
             <property name="option" value="space"/>
-            <property name="tokens" value="ANNOTATION_FIELD_DEF, CTOR_CALL, DOT, ENUM_CONSTANT_DEF, EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA"/>
+            <property name="tokens" value="ANNOTATION_FIELD_DEF, CTOR_CALL, DOT, ENUM_CONSTANT_DEF, EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, RECORD_DEF"/>
         </module>
         <module name="SingleSpaceSeparator"/>
         <module name="TypecastParenPad"/>
@@ -84,4 +84,6 @@
         <module name="Indentation"/>
         <module name="UpperEll"/>
     </module>
+
+    <module name="SuppressWarningsFilter"/>
 </module>

config/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.20-R0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-config</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Config</name>
@@ -22,14 +22,14 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.0</version>
+            <version>2.10.1</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.26</version>
+            <version>2.2</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java

@@ -14,6 +14,7 @@ import java.util.Map;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.nodes.Node;
@@ -29,7 +30,10 @@ public class YamlConfiguration extends ConfigurationProvider
         @Override
         protected Yaml initialValue()
         {
-            Representer representer = new Representer()
+            DumperOptions options = new DumperOptions();
+            options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
+
+            Representer representer = new Representer( options )
             {
                 {
                     representers.put( Configuration.class, new Represent()
@@ -43,10 +47,7 @@ public class YamlConfiguration extends ConfigurationProvider
                 }
             };
 
-            DumperOptions options = new DumperOptions();
-            options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
-
-            return new Yaml( new Constructor(), representer, options );
+            return new Yaml( new Constructor( new LoaderOptions() ), representer, options );
         }
     };
 

config/src/test/java/net/md_5/bungee/config/CompoundConfigurationTest.java

@@ -1,148 +1,138 @@
 package net.md_5.bungee.config;
 
+import static org.junit.jupiter.api.Assertions.*;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 import lombok.RequiredArgsConstructor;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 @RequiredArgsConstructor
-@RunWith(Parameterized.class)
 public class CompoundConfigurationTest
 {
 
-    @Parameters(name = "{0}")
-    public static Iterable<Object[]> data()
+    public static Stream<Arguments> data()
     {
-        // CHECKSTYLE:OFF
-        return Arrays.asList( new Object[][]
-        {
-            {
-                // provider
-                YamlConfiguration.class,
-                // testDocument
-                ""
-                + "receipt:     Oz-Ware Purchase Invoice\n"
-                + "date:        2012-08-06\n"
-                + "customer:\n"
-                + "    given:   Dorothy\n"
-                + "    family:  Gale\n"
-                + "\n"
-                + "items:\n"
-                + "    - part_no:   A4786\n"
-                + "      descrip:   Water Bucket (Filled)\n"
-                + "      price:     1.47\n"
-                + "      quantity:  4\n"
-                + "\n"
-                + "    - part_no:   E1628\n"
-                + "      descrip:   High Heeled \"Ruby\" Slippers\n"
-                + "      size:      8\n"
-                + "      price:     100.27\n"
-                + "      quantity:  1\n"
-                + "\n"
-                + "bill-to:  &id001\n"
-                + "    street: |\n"
-                + "            123 Tornado Alley\n"
-                + "            Suite 16\n"
-                + "    city:   East Centerville\n"
-                + "    state:  KS\n"
-                + "\n"
-                + "ship-to:  *id001\n"
-                + "\n"
-                + "specialDelivery:  >\n"
-                + "    Follow the Yellow Brick\n"
-                + "    Road to the Emerald City.\n"
-                + "    Pay no attention to the\n"
-                + "    man behind the curtain.",
-                // numberTest
-                ""
-                + "someKey:\n"
-                + "    1: 1\n"
-                + "    2: 2\n"
-                + "    3: 3\n"
-                + "    4: 4",
-                // nullTest
-                ""
-                + "null:\n"
-                + "    null: object\n"
-                + "    object: null\n"
-            },
-            {
-                // provider
-                JsonConfiguration.class,
-                // testDocument
-                ""
-                + "{\n"
-                + "  \"customer\": {\n"
-                + "    \"given\": \"Dorothy\", \n"
-                + "    \"family\": \"Gale\"\n"
-                + "  }, \n"
-                + "  \"ship-to\": {\n"
-                + "    \"city\": \"East Centerville\", \n"
-                + "    \"state\": \"KS\", \n"
-                + "    \"street\": \"123 Tornado Alley\\nSuite 16\\n\"\n"
-                + "  }, \n"
-                + "  \"bill-to\": {\n"
-                + "    \"city\": \"East Centerville\", \n"
-                + "    \"state\": \"KS\", \n"
-                + "    \"street\": \"123 Tornado Alley\\nSuite 16\\n\"\n"
-                + "  }, \n"
-                + "  \"date\": \"2012-08-06\", \n"
-                + "  \"items\": [\n"
-                + "    {\n"
-                + "      \"part_no\": \"A4786\", \n"
-                + "      \"price\": 1.47, \n"
-                + "      \"descrip\": \"Water Bucket (Filled)\", \n"
-                + "      \"quantity\": 4\n"
-                + "    }, \n"
-                + "    {\n"
-                + "      \"part_no\": \"E1628\", \n"
-                + "      \"descrip\": \"High Heeled \\\"Ruby\\\" Slippers\", \n"
-                + "      \"price\": 100.27, \n"
-                + "      \"quantity\": 1, \n"
-                + "      \"size\": 8\n"
-                + "    }\n"
-                + "  ], \n"
-                + "  \"receipt\": \"Oz-Ware Purchase Invoice\", \n"
-                + "  \"specialDelivery\": \"Follow the Yellow Brick Road to the Emerald City. Pay no attention to the man behind the curtain.\"\n"
-                + "}",
-                // numberTest
-                ""
-                + "{\n"
-                + "  \"someKey\": {\n"
-                + "    \"1\": 1, \n"
-                + "    \"2\": 2, \n"
-                + "    \"3\": 3, \n"
-                + "    \"4\": 4\n"
-                + "  }\n"
-                + "}",
-                // nullTest
-                ""
-                + "{\n"
-                + "  \"null\": {\n"
-                + "    \"null\": \"object\", \n"
-                + "    \"object\": null\n"
-                + "  }\n"
-                + "}"
-            }
-        } );
-        // CHECKSTYLE:ON
+        return Stream.of(
+                Arguments.of(
+                        // provider
+                        YamlConfiguration.class,
+                        // testDocument
+                        ""
+                        + "receipt:     Oz-Ware Purchase Invoice\n"
+                        + "date:        2012-08-06\n"
+                        + "customer:\n"
+                        + "    given:   Dorothy\n"
+                        + "    family:  Gale\n"
+                        + "\n"
+                        + "items:\n"
+                        + "    - part_no:   A4786\n"
+                        + "      descrip:   Water Bucket (Filled)\n"
+                        + "      price:     1.47\n"
+                        + "      quantity:  4\n"
+                        + "\n"
+                        + "    - part_no:   E1628\n"
+                        + "      descrip:   High Heeled \"Ruby\" Slippers\n"
+                        + "      size:      8\n"
+                        + "      price:     100.27\n"
+                        + "      quantity:  1\n"
+                        + "\n"
+                        + "bill-to:  &id001\n"
+                        + "    street: |\n"
+                        + "            123 Tornado Alley\n"
+                        + "            Suite 16\n"
+                        + "    city:   East Centerville\n"
+                        + "    state:  KS\n"
+                        + "\n"
+                        + "ship-to:  *id001\n"
+                        + "\n"
+                        + "specialDelivery:  >\n"
+                        + "    Follow the Yellow Brick\n"
+                        + "    Road to the Emerald City.\n"
+                        + "    Pay no attention to the\n"
+                        + "    man behind the curtain.",
+                        // numberTest
+                        ""
+                        + "someKey:\n"
+                        + "    1: 1\n"
+                        + "    2: 2\n"
+                        + "    3: 3\n"
+                        + "    4: 4",
+                        // nullTest
+                        ""
+                        + "null:\n"
+                        + "    null: object\n"
+                        + "    object: null\n"
+                ),
+                Arguments.of(
+                        // provider
+                        JsonConfiguration.class,
+                        // testDocument
+                        ""
+                        + "{\n"
+                        + "  \"customer\": {\n"
+                        + "    \"given\": \"Dorothy\", \n"
+                        + "    \"family\": \"Gale\"\n"
+                        + "  }, \n"
+                        + "  \"ship-to\": {\n"
+                        + "    \"city\": \"East Centerville\", \n"
+                        + "    \"state\": \"KS\", \n"
+                        + "    \"street\": \"123 Tornado Alley\\nSuite 16\\n\"\n"
+                        + "  }, \n"
+                        + "  \"bill-to\": {\n"
+                        + "    \"city\": \"East Centerville\", \n"
+                        + "    \"state\": \"KS\", \n"
+                        + "    \"street\": \"123 Tornado Alley\\nSuite 16\\n\"\n"
+                        + "  }, \n"
+                        + "  \"date\": \"2012-08-06\", \n"
+                        + "  \"items\": [\n"
+                        + "    {\n"
+                        + "      \"part_no\": \"A4786\", \n"
+                        + "      \"price\": 1.47, \n"
+                        + "      \"descrip\": \"Water Bucket (Filled)\", \n"
+                        + "      \"quantity\": 4\n"
+                        + "    }, \n"
+                        + "    {\n"
+                        + "      \"part_no\": \"E1628\", \n"
+                        + "      \"descrip\": \"High Heeled \\\"Ruby\\\" Slippers\", \n"
+                        + "      \"price\": 100.27, \n"
+                        + "      \"quantity\": 1, \n"
+                        + "      \"size\": 8\n"
+                        + "    }\n"
+                        + "  ], \n"
+                        + "  \"receipt\": \"Oz-Ware Purchase Invoice\", \n"
+                        + "  \"specialDelivery\": \"Follow the Yellow Brick Road to the Emerald City. Pay no attention to the man behind the curtain.\"\n"
+                        + "}",
+                        // numberTest
+                        ""
+                        + "{\n"
+                        + "  \"someKey\": {\n"
+                        + "    \"1\": 1, \n"
+                        + "    \"2\": 2, \n"
+                        + "    \"3\": 3, \n"
+                        + "    \"4\": 4\n"
+                        + "  }\n"
+                        + "}",
+                        // nullTest
+                        ""
+                        + "{\n"
+                        + "  \"null\": {\n"
+                        + "    \"null\": \"object\", \n"
+                        + "    \"object\": null\n"
+                        + "  }\n"
+                        + "}"
+                )
+        );
     }
-    //
-    private final Class<? extends ConfigurationProvider> provider;
-    private final String testDocument;
-    private final String numberTest;
-    private final String nullTest;
 
-    @Test
-    public void testConfig() throws Exception
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testConfig(Class<? extends ConfigurationProvider> provider, String testDocument, String numberTest, String nullTest) throws Exception
     {
         Configuration conf = ConfigurationProvider.getProvider( provider ).load( testDocument );
         testSection( conf );
@@ -151,7 +141,7 @@ public class CompoundConfigurationTest
         ConfigurationProvider.getProvider( provider ).save( conf, sw );
 
         // Check nulls were saved, see #1094
-        Assert.assertFalse( "Config contains null", sw.toString().contains( "null" ) );
+        assertFalse( sw.toString().contains( "null" ), "Config contains null" );
 
         conf = ConfigurationProvider.getProvider( provider ).load( new StringReader( sw.toString() ) );
         conf.set( "receipt", "Oz-Ware Purchase Invoice" ); // Add it back
@@ -160,37 +150,38 @@ public class CompoundConfigurationTest
 
     private void testSection(Configuration conf)
     {
-        Assert.assertEquals( "receipt", "Oz-Ware Purchase Invoice", conf.getString( "receipt" ) );
-        // Assert.assertEquals( "date", "2012-08-06", conf.get( "date" ).toString() );
+        assertEquals( "Oz-Ware Purchase Invoice", conf.getString( "receipt" ), "receipt" );
+        // assertEquals( "2012-08-06", conf.get( "date" ).toString(), "date" );
 
         Configuration customer = conf.getSection( "customer" );
-        Assert.assertEquals( "customer.given", "Dorothy", customer.getString( "given" ) );
-        Assert.assertEquals( "customer.given", "Dorothy", conf.getString( "customer.given" ) );
+        assertEquals( "Dorothy", customer.getString( "given" ), "customer.given" );
+        assertEquals( "Dorothy", conf.getString( "customer.given" ), "customer.given" );
 
         List items = conf.getList( "items" );
         Map item = (Map) items.get( 0 );
-        Assert.assertEquals( "items[0].part_no", "A4786", item.get( "part_no" ) );
+        assertEquals( "A4786", item.get( "part_no" ), "items[0].part_no" );
 
         conf.set( "receipt", null );
-        Assert.assertEquals( null, conf.get( "receipt" ) );
-        Assert.assertEquals( "foo", conf.get( "receipt", "foo" ) );
+        assertEquals( null, conf.get( "receipt" ) );
+        assertEquals( "foo", conf.get( "receipt", "foo" ) );
 
         Configuration newSection = conf.getSection( "new.section" );
         newSection.set( "value", "foo" );
-        Assert.assertEquals( "foo", conf.get( "new.section.value" ) );
+        assertEquals( "foo", conf.get( "new.section.value" ) );
 
         conf.set( "other.new.section", "bar" );
-        Assert.assertEquals( "bar", conf.get( "other.new.section" ) );
+        assertEquals( "bar", conf.get( "other.new.section" ) );
 
-        Assert.assertTrue( conf.contains( "customer.given" ) );
-        Assert.assertTrue( customer.contains( "given" ) );
+        assertTrue( conf.contains( "customer.given" ) );
+        assertTrue( customer.contains( "given" ) );
 
-        Assert.assertFalse( conf.contains( "customer.foo" ) );
-        Assert.assertFalse( customer.contains( "foo" ) );
+        assertFalse( conf.contains( "customer.foo" ) );
+        assertFalse( customer.contains( "foo" ) );
     }
 
-    @Test
-    public void testNumberedKeys()
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testNumberedKeys(Class<? extends ConfigurationProvider> provider, String testDocument, String numberTest, String nullTest)
     {
         Configuration conf = ConfigurationProvider.getProvider( provider ).load( numberTest );
 
@@ -201,29 +192,31 @@ public class CompoundConfigurationTest
         }
     }
 
-    @Test
-    public void testNull()
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testNull(Class<? extends ConfigurationProvider> provider, String testDocument, String numberTest, String nullTest)
     {
         Configuration conf = ConfigurationProvider.getProvider( provider ).load( nullTest );
 
-        Assert.assertEquals( "object", conf.get( "null.null" ) );
-        Assert.assertEquals( "object", conf.getSection( "null" ).get( "null" ) );
+        assertEquals( "object", conf.get( "null.null" ) );
+        assertEquals( "object", conf.getSection( "null" ).get( "null" ) );
 
-        Assert.assertEquals( null, conf.get( "null.object" ) );
-        Assert.assertEquals( "", conf.getString( "null.object" ) );
+        assertEquals( null, conf.get( "null.object" ) );
+        assertEquals( "", conf.getString( "null.object" ) );
     }
 
-    @Test
-    public void testMapAddition()
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testMapAddition(Class<? extends ConfigurationProvider> provider, String testDocument, String numberTest, String nullTest)
     {
         Configuration conf = ConfigurationProvider.getProvider( provider ).load( testDocument );
 
         conf.set( "addition", Collections.singletonMap( "foo", "bar" ) );
 
         // Order matters
-        Assert.assertEquals( "bar", conf.getSection( "addition" ).getString( "foo" ) );
-        Assert.assertEquals( "bar", conf.getString( "addition.foo" ) );
+        assertEquals( "bar", conf.getSection( "addition" ).getString( "foo" ) );
+        assertEquals( "bar", conf.getString( "addition.foo" ) );
 
-        Assert.assertTrue( conf.get( "addition" ) instanceof Configuration );
+        assertTrue( conf.get( "addition" ) instanceof Configuration );
     }
 }

config/src/test/java/net/md_5/bungee/config/DefaultConfigurationTest.java

@@ -1,7 +1,7 @@
 package net.md_5.bungee.config;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class DefaultConfigurationTest
 {
@@ -16,8 +16,8 @@ public class DefaultConfigurationTest
 
         Configuration actualConfig = new Configuration( defaultConfig );
 
-        Assert.assertEquals( 10, actualConfig.getInt( "setting" ) );
-        Assert.assertEquals( 11, actualConfig.getInt( "nested.setting" ) );
-        Assert.assertEquals( 12, actualConfig.getInt( "double.nested.setting" ) );
+        assertEquals( 10, actualConfig.getInt( "setting" ) );
+        assertEquals( 11, actualConfig.getInt( "nested.setting" ) );
+        assertEquals( 12, actualConfig.getInt( "double.nested.setting" ) );
     }
 }

event/pom.xml

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

event/src/main/java/net/md_5/bungee/event/EventBus.java

@@ -1,5 +1,6 @@
 package net.md_5.bungee.event;
 
+import com.google.common.collect.ImmutableSet;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
@@ -41,6 +42,8 @@ public class EventBus
         {
             for ( EventHandlerMethod method : handlers )
             {
+                long start = System.nanoTime();
+
                 try
                 {
                     method.invoke( event );
@@ -54,6 +57,15 @@ public class EventBus
                 {
                     logger.log( Level.WARNING, MessageFormat.format( "Error dispatching event {0} to listener {1}", event, method.getListener() ), ex.getCause() );
                 }
+
+                long elapsed = System.nanoTime() - start;
+                if ( elapsed > 50000000 )
+                {
+                    logger.log( Level.WARNING, "Plugin listener {0} took {1}ms to process event {2}!", new Object[]
+                    {
+                        method.getListener().getClass().getName(), elapsed / 1000000, event
+                    } );
+                }
             }
         }
     }
@@ -61,7 +73,8 @@ public class EventBus
     private Map<Class<?>, Map<Byte, Set<Method>>> findHandlers(Object listener)
     {
         Map<Class<?>, Map<Byte, Set<Method>>> handler = new HashMap<>();
-        for ( Method m : listener.getClass().getDeclaredMethods() )
+        Set<Method> methods = ImmutableSet.<Method>builder().add( listener.getClass().getMethods() ).add( listener.getClass().getDeclaredMethods() ).build();
+        for ( final Method m : methods )
         {
             EventHandler annotation = m.getAnnotation( EventHandler.class );
             if ( annotation != null )
@@ -75,18 +88,8 @@ public class EventBus
                     } );
                     continue;
                 }
-                Map<Byte, Set<Method>> prioritiesMap = handler.get( params[0] );
-                if ( prioritiesMap == null )
-                {
-                    prioritiesMap = new HashMap<>();
-                    handler.put( params[0], prioritiesMap );
-                }
-                Set<Method> priority = prioritiesMap.get( annotation.priority() );
-                if ( priority == null )
-                {
-                    priority = new HashSet<>();
-                    prioritiesMap.put( annotation.priority(), priority );
-                }
+                Map<Byte, Set<Method>> prioritiesMap = handler.computeIfAbsent( params[0], k -> new HashMap<>() );
+                Set<Method> priority = prioritiesMap.computeIfAbsent( annotation.priority(), k -> new HashSet<>() );
                 priority.add( m );
             }
         }
@@ -101,22 +104,11 @@ public class EventBus
         {
             for ( Map.Entry<Class<?>, Map<Byte, Set<Method>>> e : handler.entrySet() )
             {
-                Map<Byte, Map<Object, Method[]>> prioritiesMap = byListenerAndPriority.get( e.getKey() );
-                if ( prioritiesMap == null )
-                {
-                    prioritiesMap = new HashMap<>();
-                    byListenerAndPriority.put( e.getKey(), prioritiesMap );
-                }
+                Map<Byte, Map<Object, Method[]>> prioritiesMap = byListenerAndPriority.computeIfAbsent( e.getKey(), k -> new HashMap<>() );
                 for ( Map.Entry<Byte, Set<Method>> entry : e.getValue().entrySet() )
                 {
-                    Map<Object, Method[]> currentPriorityMap = prioritiesMap.get( entry.getKey() );
-                    if ( currentPriorityMap == null )
-                    {
-                        currentPriorityMap = new HashMap<>();
-                        prioritiesMap.put( entry.getKey(), currentPriorityMap );
-                    }
-                    Method[] baked = new Method[ entry.getValue().size() ];
-                    currentPriorityMap.put( listener, entry.getValue().toArray( baked ) );
+                    Map<Object, Method[]> currentPriorityMap = prioritiesMap.computeIfAbsent( entry.getKey(), k -> new HashMap<>() );
+                    currentPriorityMap.put( listener, entry.getValue().toArray( new Method[ 0 ] ) );
                 }
                 bakeHandlers( e.getKey() );
             }
@@ -194,7 +186,7 @@ public class EventBus
                     }
                 }
             } while ( value++ < Byte.MAX_VALUE );
-            byEventBaked.put( eventClass, handlersList.toArray( new EventHandlerMethod[ handlersList.size() ] ) );
+            byEventBaked.put( eventClass, handlersList.toArray( new EventHandlerMethod[ 0 ] ) );
         } else
         {
             byEventBaked.remove( eventClass );

event/src/test/java/net/md_5/bungee/event/EventBusTest.java

@@ -1,8 +1,8 @@
 package net.md_5.bungee.event;
 
+import static org.junit.jupiter.api.Assertions.*;
 import java.util.concurrent.CountDownLatch;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class EventBusTest
 {
@@ -15,14 +15,14 @@ public class EventBusTest
     {
         bus.register( this );
         bus.post( new FirstEvent() );
-        Assert.assertEquals( 0, latch.getCount() );
+        assertEquals( 0, latch.getCount() );
     }
 
     @EventHandler
     public void firstListener(FirstEvent event)
     {
         bus.post( new SecondEvent() );
-        Assert.assertEquals( 1, latch.getCount() );
+        assertEquals( 1, latch.getCount() );
         latch.countDown();
     }
 

event/src/test/java/net/md_5/bungee/event/EventPriorityTest.java

@@ -1,8 +1,8 @@
 package net.md_5.bungee.event;
 
+import static org.junit.jupiter.api.Assertions.*;
 import java.util.concurrent.CountDownLatch;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class EventPriorityTest
 {
@@ -16,41 +16,41 @@ public class EventPriorityTest
         bus.register( this );
         bus.register( new EventPriorityListenerPartner() );
         bus.post( new PriorityTestEvent() );
-        Assert.assertEquals( 0, latch.getCount() );
+        assertEquals( 0, latch.getCount() );
     }
 
     @EventHandler(priority = Byte.MIN_VALUE)
     public void onMinPriority(PriorityTestEvent event)
     {
-        Assert.assertEquals( 7, latch.getCount() );
+        assertEquals( 7, latch.getCount() );
         latch.countDown();
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onLowestPriority(PriorityTestEvent event)
     {
-        Assert.assertEquals( 6, latch.getCount() );
+        assertEquals( 6, latch.getCount() );
         latch.countDown();
     }
 
     @EventHandler
     public void onNormalPriority(PriorityTestEvent event)
     {
-        Assert.assertEquals( 4, latch.getCount() );
+        assertEquals( 4, latch.getCount() );
         latch.countDown();
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onHighestPriority(PriorityTestEvent event)
     {
-        Assert.assertEquals( 2, latch.getCount() );
+        assertEquals( 2, latch.getCount() );
         latch.countDown();
     }
 
     @EventHandler(priority = Byte.MAX_VALUE)
     public void onMaxPriority(PriorityTestEvent event)
     {
-        Assert.assertEquals( 1, latch.getCount() );
+        assertEquals( 1, latch.getCount() );
         latch.countDown();
     }
 
@@ -64,14 +64,14 @@ public class EventPriorityTest
         @EventHandler(priority = EventPriority.HIGH)
         public void onHighPriority(PriorityTestEvent event)
         {
-            Assert.assertEquals( 3, latch.getCount() );
+            assertEquals( 3, latch.getCount() );
             latch.countDown();
         }
 
         @EventHandler(priority = EventPriority.LOW)
         public void onLowPriority(PriorityTestEvent event)
         {
-            Assert.assertEquals( 5, latch.getCount() );
+            assertEquals( 5, latch.getCount() );
             latch.countDown();
         }
     }

event/src/test/java/net/md_5/bungee/event/SubclassTest.java

@@ -0,0 +1,26 @@
+package net.md_5.bungee.event;
+
+import static org.junit.jupiter.api.Assertions.*;
+import java.util.concurrent.CountDownLatch;
+import org.junit.jupiter.api.Test;
+
+public class SubclassTest extends EventBusTest
+{
+
+    private final CountDownLatch latch = new CountDownLatch( 1 );
+
+    @Test
+    @Override
+    public void testNestedEvents()
+    {
+        super.testNestedEvents();
+        assertEquals( 0, latch.getCount() );
+    }
+
+    @EventHandler
+    protected void extraListener(FirstEvent event)
+    {
+        assertEquals( 1, latch.getCount() );
+        latch.countDown();
+    }
+}

event/src/test/java/net/md_5/bungee/event/UnregisteringListenerTest.java

@@ -1,7 +1,7 @@
 package net.md_5.bungee.event;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 public class UnregisteringListenerTest
 {
@@ -19,7 +19,7 @@ public class UnregisteringListenerTest
     @EventHandler
     public void onEvent(TestEvent evt)
     {
-        Assert.fail( "Event listener wasn't unregistered" );
+        fail( "Event listener wasn't unregistered" );
     }
 
     public static class TestEvent

log/pom.xml

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

log/src/main/java/net/md_5/bungee/log/BungeeLogger.java

@@ -13,19 +13,23 @@ public class BungeeLogger extends Logger
 
     private final LogDispatcher dispatcher = new LogDispatcher( this );
 
+    // CHECKSTYLE:OFF
     @SuppressWarnings(
             {
                 "CallToPrintStackTrace", "CallToThreadStartDuringObjectConstruction"
             })
+    // CHECKSTYLE:ON
     @SuppressFBWarnings("SC_START_IN_CTOR")
     public BungeeLogger(String loggerName, String filePattern, ConsoleReader reader)
     {
         super( loggerName, null );
         setLevel( Level.ALL );
+        setUseParentHandlers( false );
 
         try
         {
             FileHandler fileHandler = new FileHandler( filePattern, 1 << 24, 8, true );
+            fileHandler.setLevel( Level.parse( System.getProperty( "net.md_5.bungee.file-log-level", "INFO" ) ) );
             fileHandler.setFormatter( new ConciseFormatter( false ) );
             addHandler( fileHandler );
 

log/src/main/java/net/md_5/bungee/log/LoggingForwardHandler.java

@@ -0,0 +1,29 @@
+package net.md_5.bungee.log;
+
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class LoggingForwardHandler extends Handler
+{
+
+    private final Logger logger;
+
+    @Override
+    public void publish(LogRecord record)
+    {
+        logger.log( record );
+    }
+
+    @Override
+    public void flush()
+    {
+    }
+
+    @Override
+    public void close() throws SecurityException
+    {
+    }
+}

module/cmd-alert/pom.xml

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

module/cmd-alert/src/main/java/net/md_5/bungee/module/cmd/alert/CommandAlert.java

@@ -1,5 +1,6 @@
 package net.md_5.bungee.module.cmd.alert;
 
+import java.util.Locale;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
@@ -23,10 +24,10 @@ public class CommandAlert extends Command
         } else
         {
             StringBuilder builder = new StringBuilder();
-            if ( args[0].startsWith( "&h" ) )
+            if ( args[0].toLowerCase( Locale.ROOT ).startsWith( "&h" ) )
             {
                 // Remove &h
-                args[0] = args[0].substring( 2, args[0].length() );
+                args[0] = args[0].substring( 2 );
             } else
             {
                 builder.append( ProxyServer.getInstance().getTranslation( "alert" ) );

module/cmd-find/pom.xml

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

module/cmd-find/src/main/java/net/md_5/bungee/module/cmd/find/CommandFind.java

@@ -1,7 +1,12 @@
 package net.md_5.bungee.module.cmd.find;
 
+import java.util.Collections;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.ComponentBuilder;
+import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.command.PlayerCommand;
 
@@ -27,8 +32,27 @@ public class CommandFind extends PlayerCommand
                 sender.sendMessage( ProxyServer.getInstance().getTranslation( "user_not_online" ) );
             } else
             {
-                sender.sendMessage( ProxyServer.getInstance().getTranslation( "user_online_at", player.getName(), player.getServer().getInfo().getName() ) );
+                boolean moduleLoaded = ProxyServer.getInstance().getPluginManager().getPlugin( "cmd_server" ) != null;
+                ServerInfo server = player.getServer().getInfo();
+                ComponentBuilder componentBuilder = new ComponentBuilder().appendLegacy( ProxyServer.getInstance().getTranslation( "user_online_at", player.getName(), server.getName() ) );
+
+                if ( moduleLoaded && server.canAccess( sender ) )
+                {
+                    componentBuilder.event( new HoverEvent(
+                            HoverEvent.Action.SHOW_TEXT,
+                            new ComponentBuilder().appendLegacy( ProxyServer.getInstance().getTranslation( "click_to_connect" ) ).create() )
+                    );
+                    componentBuilder.event( new ClickEvent( ClickEvent.Action.RUN_COMMAND, "/server " + server.getName() ) );
+                }
+
+                sender.sendMessage( componentBuilder.create() );
             }
         }
     }
+
+    @Override
+    public Iterable<String> onTabComplete(CommandSender sender, String[] args)
+    {
+        return args.length == 1 ? super.onTabComplete( sender, args ) : Collections.emptyList();
+    }
 }

module/cmd-kick/nb-configuration.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+    This file contains additional configuration written by modules in the NetBeans IDE.
+    The configuration is intended to be shared among all the users of project and
+    therefore it is assumed to be part of version control checkout.
+    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    -->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+        Properties that influence various parts of the IDE, especially code formatting and the like. 
+        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+        That way multiple projects can share the same settings (useful for formatting rules for example).
+        Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        -->
+        <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
+    </properties>
+</project-shared-configuration>

module/cmd-kick/pom.xml

@@ -0,0 +1,20 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>net.md-5</groupId>
+        <artifactId>bungeecord-module</artifactId>
+        <version>1.20-R0.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>net.md-5</groupId>
+    <artifactId>bungeecord-module-cmd-kick</artifactId>
+    <version>1.20-R0.2-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>cmd_kick</name>
+    <description>Provides the gkick command</description>
+</project>

module/cmd-kick/src/main/java/net/md_5/bungee/module/cmd/kick/CommandKick.java

@@ -0,0 +1,72 @@
+package net.md_5.bungee.module.cmd.kick;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableSet;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Command;
+import net.md_5.bungee.api.plugin.TabExecutor;
+
+public class CommandKick extends Command implements TabExecutor
+{
+
+    public CommandKick()
+    {
+        super( "gkick", "bungeecord.command.kick" );
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args)
+    {
+        if ( args.length == 0 )
+        {
+            sender.sendMessage( ProxyServer.getInstance().getTranslation( "username_needed" ) );
+        } else
+        {
+            ProxiedPlayer player = ProxyServer.getInstance().getPlayer( args[0] );
+
+            if ( player == null )
+            {
+                sender.sendMessage( TextComponent.fromLegacyText( ProxyServer.getInstance().getTranslation( "user_not_online" ) ) );
+                return;
+            }
+
+            if ( args.length == 1 )
+            {
+                player.disconnect( TextComponent.fromLegacyText( ProxyServer.getInstance().getTranslation( "kick_message" ) ) );
+            } else
+            {
+                String[] reason = new String[ args.length - 1 ];
+                System.arraycopy( args, 1, reason, 0, reason.length );
+                player.disconnect( TextComponent.fromLegacyText( ChatColor.translateAlternateColorCodes( '&', Joiner.on( ' ' ).join( reason ) ) ) );
+            }
+        }
+    }
+
+    @Override
+    public Iterable<String> onTabComplete(CommandSender sender, String[] args)
+    {
+        if ( args.length == 1 )
+        {
+            Set<String> matches = new HashSet<>();
+            String search = args[0].toLowerCase( Locale.ROOT );
+            for ( ProxiedPlayer player : ProxyServer.getInstance().getPlayers() )
+            {
+                if ( player.getName().toLowerCase( Locale.ROOT ).startsWith( search ) )
+                {
+                    matches.add( player.getName() );
+                }
+            }
+            return matches;
+        } else
+        {
+            return ImmutableSet.of();
+        }
+    }
+}

module/cmd-kick/src/main/java/net/md_5/bungee/module/cmd/kick/PluginKick.java

@@ -0,0 +1,13 @@
+package net.md_5.bungee.module.cmd.kick;
+
+import net.md_5.bungee.api.plugin.Plugin;
+
+public class PluginKick extends Plugin
+{
+
+    @Override
+    public void onEnable()
+    {
+        getProxy().getPluginManager().registerCommand( this, new CommandKick() );
+    }
+}

module/cmd-kick/src/main/resources/plugin.yml

@@ -0,0 +1,5 @@
+name: ${project.name}
+main: net.md_5.bungee.module.cmd.kick.PluginKick
+version: ${describe}
+description: ${project.description}
+author: ${module.author}

module/cmd-list/pom.xml

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

module/cmd-list/src/main/java/net/md_5/bungee/module/cmd/list/CommandList.java

@@ -1,20 +1,21 @@
 package net.md_5.bungee.module.cmd.list;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import net.md_5.bungee.Util;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
+import net.md_5.bungee.api.plugin.TabExecutor;
 
 /**
  * Command to list all players connected to the proxy.
  */
-public class CommandList extends Command
+public class CommandList extends Command implements TabExecutor
 {
 
     public CommandList()
@@ -25,6 +26,8 @@ public class CommandList extends Command
     @Override
     public void execute(CommandSender sender, String[] args)
     {
+        boolean hideEmptyServers = ( args.length == 0 ) || !args[0].equalsIgnoreCase( "all" );
+
         for ( ServerInfo server : ProxyServer.getInstance().getServers().values() )
         {
             if ( !server.canAccess( sender ) )
@@ -32,16 +35,28 @@ public class CommandList extends Command
                 continue;
             }
 
+            Collection<ProxiedPlayer> serverPlayers = server.getPlayers();
+            if ( hideEmptyServers && serverPlayers.isEmpty() )
+            {
+                continue;
+            }
+
             List<String> players = new ArrayList<>();
-            for ( ProxiedPlayer player : server.getPlayers() )
+            for ( ProxiedPlayer player : serverPlayers )
             {
                 players.add( player.getDisplayName() );
             }
             Collections.sort( players, String.CASE_INSENSITIVE_ORDER );
 
-            sender.sendMessage( ProxyServer.getInstance().getTranslation( "command_list", server.getName(), server.getPlayers().size(), Util.format( players, ChatColor.RESET + ", " ) ) );
+            sender.sendMessage( ProxyServer.getInstance().getTranslation( "command_list", server.getName(), players.size(), String.join( ChatColor.RESET + ", ", players ) ) );
         }
 
         sender.sendMessage( ProxyServer.getInstance().getTranslation( "total_players", ProxyServer.getInstance().getOnlineCount() ) );
     }
+
+    @Override
+    public Iterable<String> onTabComplete(CommandSender sender, String[] args)
+    {
+        return ( args.length > 1 ) ? Collections.emptyList() : Collections.singletonList( "all" );
+    }
 }

module/cmd-send/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.20-R0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-send</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-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.16-R0.4-SNAPSHOT</version>
+        <version>1.20-R0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-server</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-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.16-R0.4-SNAPSHOT</version>
+        <version>1.20-R0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord Modules</name>
@@ -21,6 +21,7 @@
     <modules>
         <module>cmd-alert</module>
         <module>cmd-find</module>
+        <module>cmd-kick</module>
         <module>cmd-list</module>
         <module>cmd-send</module>
         <module>cmd-server</module>

module/reconnect-yaml/pom.xml

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

native/compile-native.sh

@@ -1,6 +1,14 @@
 #!/bin/sh
 
-CXX="g++ -shared -fPIC -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/"
+set -eu
 
-$CXX src/main/c/NativeCipherImpl.cpp -o src/main/resources/native-cipher.so -lcrypto
-$CXX src/main/c/NativeCompressImpl.cpp -o src/main/resources/native-compress.so -lz
+echo "Compiling mbedtls"
+(cd mbedtls && make no_test)
+
+echo "Compiling zlib"
+(cd zlib && CFLAGS=-fPIC ./configure --static && make)
+
+CXX="g++ -shared -fPIC -Wl,--wrap=memcpy -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/"
+
+$CXX -Imbedtls/include src/main/c/NativeCipherImpl.cpp -o src/main/resources/native-cipher.so mbedtls/library/libmbedcrypto.a
+$CXX -Izlib src/main/c/NativeCompressImpl.cpp -o src/main/resources/native-compress.so zlib/libz.a

native/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.20-R0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-native</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Native</name>
@@ -22,7 +22,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
-            <version>${netty.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

native/src/main/c/NativeCipherImpl.cpp

@@ -1,12 +1,15 @@
-// Support for CentOS 6
-__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
-
 #include <stdlib.h>
 #include <string.h>
 
 #include <mbedtls/aes.h>
 #include "net_md_5_bungee_jni_cipher_NativeCipherImpl.h"
 
+// Support for CentOS 6
+__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
+extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) {
+    return memcpy(dest, src, n);
+}
+
 typedef unsigned char byte;
 
 struct crypto_context {

native/src/main/c/NativeCompressImpl.cpp

@@ -1,7 +1,15 @@
 #include <stdlib.h>
+#include <string.h>
+
 #include <zlib.h>
 #include "net_md_5_bungee_jni_zlib_NativeCompressImpl.h"
 
+// Support for CentOS 6
+__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
+extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) {
+    return memcpy(dest, src, n);
+}
+
 typedef unsigned char byte;
 
 static jfieldID consumedID;

native/src/main/java/net/md_5/bungee/jni/NativeCode.java

@@ -6,18 +6,19 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.function.Supplier;
 import net.md_5.bungee.jni.cipher.BungeeCipher;
 
 public final class NativeCode<T>
 {
 
     private final String name;
-    private final Class<? extends T> javaImpl;
-    private final Class<? extends T> nativeImpl;
+    private final Supplier<? extends T> javaImpl;
+    private final Supplier<? extends T> nativeImpl;
     //
     private boolean loaded;
 
-    public NativeCode(String name, Class<? extends T> javaImpl, Class<? extends T> nativeImpl)
+    public NativeCode(String name, Supplier<? extends T> javaImpl, Supplier<? extends T> nativeImpl)
     {
         this.name = name;
         this.javaImpl = javaImpl;
@@ -26,13 +27,7 @@ public final class NativeCode<T>
 
     public T newInstance()
     {
-        try
-        {
-            return ( loaded ) ? nativeImpl.getDeclaredConstructor().newInstance() : javaImpl.getDeclaredConstructor().newInstance();
-        } catch ( ReflectiveOperationException ex )
-        {
-            throw new RuntimeException( "Error getting instance", ex );
-        }
+        return ( loaded ) ? nativeImpl.get() : javaImpl.get();
     }
 
     public boolean load()

native/src/main/java/net/md_5/bungee/jni/cipher/JavaCipher.java

@@ -25,9 +25,15 @@ public class JavaCipher implements BungeeCipher
         }
     }
 
-    public JavaCipher() throws GeneralSecurityException
+    public JavaCipher()
     {
-        this.cipher = Cipher.getInstance( "AES/CFB8/NoPadding" );
+        try
+        {
+            this.cipher = Cipher.getInstance( "AES/CFB8/NoPadding" );
+        } catch ( GeneralSecurityException ex )
+        {
+            throw new RuntimeException( ex );
+        }
     }
 
     @Override

native/src/test/java/net/md_5/bungee/NativeCipherTest.java

@@ -1,5 +1,6 @@
 package net.md_5.bungee;
 
+import static org.junit.jupiter.api.Assertions.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.Random;
@@ -9,12 +10,11 @@ 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 org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@TestMethodOrder(MethodOrderer.MethodName.class)
 public class NativeCipherTest
 {
 
@@ -26,7 +26,7 @@ public class NativeCipherTest
     private final SecretKey secret = new SecretKeySpec( new byte[ 16 ], "AES" );
     private static final int BENCHMARK_COUNT = 4096;
     //
-    private static final NativeCode<BungeeCipher> factory = new NativeCode<>( "native-cipher", JavaCipher.class, NativeCipher.class );
+    private static final NativeCode<BungeeCipher> factory = new NativeCode<>( "native-cipher", JavaCipher::new, NativeCipher::new );
 
     @Test
     public void testNative() throws Exception
@@ -34,7 +34,7 @@ public class NativeCipherTest
         if ( NativeCode.isSupported() )
         {
             boolean loaded = factory.load();
-            Assert.assertTrue( "Native cipher failed to load!", loaded );
+            assertTrue( loaded, "Native cipher failed to load!" );
 
             NativeCipher cipher = new NativeCipher();
             System.out.println( "Testing native cipher..." );
@@ -48,7 +48,7 @@ public class NativeCipherTest
         if ( NativeCode.isSupported() )
         {
             boolean loaded = factory.load();
-            Assert.assertTrue( "Native cipher failed to load!", loaded );
+            assertTrue( loaded, "Native cipher failed to load!" );
 
             NativeCipher cipher = new NativeCipher();
 
@@ -98,7 +98,7 @@ public class NativeCipherTest
         // Encrypt
         cipher.init( true, secret );
         cipher.cipher( nativePlain, out );
-        Assert.assertEquals( nativeCiphered, out );
+        assertEquals( nativeCiphered, out );
 
         out.clear();
 
@@ -106,7 +106,7 @@ public class NativeCipherTest
         cipher.init( false, secret );
         cipher.cipher( nativeCiphered, out );
         nativePlain.resetReaderIndex();
-        Assert.assertEquals( nativePlain, out );
+        assertEquals( nativePlain, out );
 
         System.out.println( "This cipher works correctly!" );
     }

native/src/test/java/net/md_5/bungee/NativeZlibTest.java

@@ -1,5 +1,6 @@
 package net.md_5.bungee;
 
+import static org.junit.jupiter.api.Assertions.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.Arrays;
@@ -9,20 +10,19 @@ import net.md_5.bungee.jni.NativeCode;
 import net.md_5.bungee.jni.zlib.BungeeZlib;
 import net.md_5.bungee.jni.zlib.JavaZlib;
 import net.md_5.bungee.jni.zlib.NativeZlib;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class NativeZlibTest
 {
 
-    private final NativeCode<BungeeZlib> factory = new NativeCode<>( "native-compress", JavaZlib.class, NativeZlib.class );
+    private final NativeCode<BungeeZlib> factory = new NativeCode<>( "native-compress", JavaZlib::new, NativeZlib::new );
 
     @Test
     public void doTest() throws DataFormatException
     {
         if ( NativeCode.isSupported() )
         {
-            Assert.assertTrue( "Native code failed to load!", factory.load() );
+            assertTrue( factory.load(), "Native code failed to load!" );
             test( factory.newInstance() );
         }
         test( new JavaZlib() );
@@ -64,6 +64,6 @@ public class NativeZlibTest
         long elapsed = System.currentTimeMillis() - start;
         System.out.println( "Took: " + elapsed + "ms" );
 
-        Assert.assertTrue( "Results do not match", Arrays.equals( dataBuf, check ) );
+        assertTrue( Arrays.equals( dataBuf, check ), "Results do not match" );
     }
 }

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-parent</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord-Parent</name>
@@ -41,6 +41,7 @@
         <module>protocol</module>
         <module>proxy</module>
         <module>query</module>
+        <module>slf4j</module>
         <module>native</module>
     </modules>
 
@@ -71,23 +72,34 @@
 
     <properties>
         <build.number>unknown</build.number>
-        <netty.version>4.1.53.Final</netty.version>
+        <lombok.version>1.18.30</lombok.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>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>4.1.97.Final</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>21.0</version>
+            <version>32.1.2-jre</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -99,17 +111,26 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.6.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>net.md-5</groupId>
                 <artifactId>scriptus</artifactId>
-                <version>0.4.1</version>
+                <version>0.5.0</version>
                 <configuration>
                     <format>git:${project.name}:${project.version}:%s:${build.number}</format>
                 </configuration>
@@ -122,10 +143,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <phase>process-classes</phase>
@@ -143,14 +169,14 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.36.2</version>
+                        <version>8.45.1</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.19</version>
+                <version>1.23</version>
                 <executions>
                     <execution>
                         <phase>process-classes</phase>
@@ -167,10 +193,82 @@
                     </signature>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.4.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce</id>
+                        <configuration>
+                            <rules>
+                                <dependencyConvergence>
+                                    <excludes>
+                                        <!-- org.apache.maven:maven-resolver-provider is inconsistent -->
+                                        <exclude>org.apache.commons:commons-lang3</exclude>
+                                        <!-- org.apache.maven:maven-resolver-transport-http is inconsistent -->
+                                        <exclude>org.apache.httpcomponents:httpcore</exclude>
+                                    </excludes>
+                                </dependencyConvergence>
+                            </rules>
+                        </configuration>
+                        <goals>
+                            <!--<goal>enforce</goal>--> <!-- Disabled until maven-resolver is upgraded again. -->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
     <profiles>
+        <profile>
+            <id>jdk-9-release</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
+        <profile>
+            <id>jdk-9-javadoc</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-javadoc-plugin</artifactId>
+                            <configuration>
+                                <additionalOptions>-html5</additionalOptions>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+        <profile>
+            <id>jdk-15-javadoc</id>
+            <activation>
+                <jdk>[15,)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-javadoc-plugin</artifactId>
+                            <configuration>
+                                <doclint>none</doclint>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
         <profile>
             <id>dist</id>
             <build>
@@ -178,7 +276,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.1</version>
+                        <version>3.3.0</version>
                         <executions>
                             <execution>
                                 <phase>package</phase>
@@ -191,7 +289,7 @@
                     <plugin>
                         <groupId>org.projectlombok</groupId>
                         <artifactId>lombok-maven-plugin</artifactId>
-                        <version>1.18.10.0</version>
+                        <version>1.18.20.0</version>
                         <executions>
                             <execution>
                                 <phase>package</phase>
@@ -205,11 +303,17 @@
                             <outputDirectory>${project.build.directory}/delombok</outputDirectory>
                             <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
                         </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.projectlombok</groupId>
+                                <artifactId>lombok</artifactId>
+                                <version>${lombok.version}</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.2.0</version>
                         <executions>
                             <!-- Execute Javadoc once normally to catch any warnings -->
                             <execution>
@@ -247,7 +351,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>

protocol/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.20-R0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-protocol</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.20-R0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Protocol</name>
@@ -49,7 +49,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
-            <version>${netty.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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

@@ -2,12 +2,16 @@ 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;
 import net.md_5.bungee.protocol.packet.EncryptionRequest;
 import net.md_5.bungee.protocol.packet.EncryptionResponse;
 import net.md_5.bungee.protocol.packet.EntityStatus;
+import net.md_5.bungee.protocol.packet.FinishConfiguration;
 import net.md_5.bungee.protocol.packet.GameState;
 import net.md_5.bungee.protocol.packet.Handshake;
 import net.md_5.bungee.protocol.packet.KeepAlive;
@@ -15,6 +19,7 @@ import net.md_5.bungee.protocol.packet.Kick;
 import net.md_5.bungee.protocol.packet.LegacyHandshake;
 import net.md_5.bungee.protocol.packet.LegacyPing;
 import net.md_5.bungee.protocol.packet.Login;
+import net.md_5.bungee.protocol.packet.LoginAcknowledged;
 import net.md_5.bungee.protocol.packet.LoginPayloadRequest;
 import net.md_5.bungee.protocol.packet.LoginPayloadResponse;
 import net.md_5.bungee.protocol.packet.LoginRequest;
@@ -22,18 +27,25 @@ import net.md_5.bungee.protocol.packet.LoginSuccess;
 import net.md_5.bungee.protocol.packet.PingPacket;
 import net.md_5.bungee.protocol.packet.PlayerListHeaderFooter;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
+import net.md_5.bungee.protocol.packet.PlayerListItemRemove;
+import net.md_5.bungee.protocol.packet.PlayerListItemUpdate;
 import net.md_5.bungee.protocol.packet.PluginMessage;
 import net.md_5.bungee.protocol.packet.Respawn;
 import net.md_5.bungee.protocol.packet.ScoreboardDisplay;
 import net.md_5.bungee.protocol.packet.ScoreboardObjective;
 import net.md_5.bungee.protocol.packet.ScoreboardScore;
+import net.md_5.bungee.protocol.packet.ServerData;
 import net.md_5.bungee.protocol.packet.SetCompression;
+import net.md_5.bungee.protocol.packet.StartConfiguration;
 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;
 import net.md_5.bungee.protocol.packet.Title;
+import net.md_5.bungee.protocol.packet.TitleTimes;
 import net.md_5.bungee.protocol.packet.ViewDistance;
 
 public abstract class AbstractPacketHandler
@@ -75,6 +87,18 @@ public abstract class AbstractPacketHandler
     {
     }
 
+    public void handle(ClientChat chat) throws Exception
+    {
+    }
+
+    public void handle(SystemChat chat) throws Exception
+    {
+    }
+
+    public void handle(ClientCommand command) throws Exception
+    {
+    }
+
     public void handle(Respawn respawn) throws Exception
     {
     }
@@ -95,6 +119,14 @@ public abstract class AbstractPacketHandler
     {
     }
 
+    public void handle(PlayerListItemRemove playerListItem) throws Exception
+    {
+    }
+
+    public void handle(PlayerListItemUpdate playerListItem) throws Exception
+    {
+    }
+
     public void handle(PlayerListHeaderFooter playerListHeaderFooter) throws Exception
     {
     }
@@ -127,6 +159,18 @@ public abstract class AbstractPacketHandler
     {
     }
 
+    public void handle(Subtitle title) throws Exception
+    {
+    }
+
+    public void handle(TitleTimes title) throws Exception
+    {
+    }
+
+    public void handle(ClearTitles title) throws Exception
+    {
+    }
+
     public void handle(PluginMessage pluginMessage) throws Exception
     {
     }
@@ -178,4 +222,20 @@ public abstract class AbstractPacketHandler
     public void handle(GameState gameState) throws Exception
     {
     }
+
+    public void handle(ServerData serverData) throws Exception
+    {
+    }
+
+    public void handle(LoginAcknowledged loginAcknowledged) throws Exception
+    {
+    }
+
+    public void handle(StartConfiguration startConfiguration) throws Exception
+    {
+    }
+
+    public void handle(FinishConfiguration finishConfiguration) throws Exception
+    {
+    }
 }

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

@@ -0,0 +1,82 @@
+package net.md_5.bungee.protocol;
+
+import com.google.common.base.Preconditions;
+import io.netty.buffer.ByteBuf;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class ChatChain extends DefinedPacket
+{
+
+    private List<ChainLink> seen;
+    private List<ChainLink> received;
+
+    @Override
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        seen = readLinks( buf );
+        if ( buf.readBoolean() )
+        {
+            received = readLinks( buf );
+        }
+    }
+
+    private static List<ChainLink> readLinks(ByteBuf buf)
+    {
+        int cnt = readVarInt( buf );
+        Preconditions.checkArgument( cnt <= 5, "Too many entries" );
+        List<ChainLink> chain = new LinkedList<>();
+        for ( int i = 0; i < cnt; i++ )
+        {
+            chain.add( new ChainLink( readUUID( buf ), readArray( buf ) ) );
+        }
+        return chain;
+    }
+
+    @Override
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        writeLinks( seen, buf );
+        if ( received != null )
+        {
+            buf.writeBoolean( true );
+            writeLinks( received, buf );
+        } else
+        {
+            buf.writeBoolean( false );
+        }
+    }
+
+    private static void writeLinks(List<ChainLink> links, ByteBuf buf)
+    {
+        writeVarInt( links.size(), buf );
+        for ( ChainLink link : links )
+        {
+            writeUUID( link.sender, buf );
+            writeArray( link.signature, buf );
+        }
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        throw new UnsupportedOperationException( "Not supported." );
+    }
+
+    @Data
+    public static class ChainLink
+    {
+
+        private final UUID sender;
+        private final byte[] signature;
+    }
+}

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

@@ -9,10 +9,15 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import se.llbit.nbt.ErrorTag;
 import se.llbit.nbt.NamedTag;
+import se.llbit.nbt.SpecificTag;
 import se.llbit.nbt.Tag;
 
 @RequiredArgsConstructor
@@ -21,35 +26,55 @@ public abstract class DefinedPacket
 
     public static void writeString(String s, ByteBuf buf)
     {
-        if ( s.length() > Short.MAX_VALUE )
+        writeString( s, buf, Short.MAX_VALUE );
+    }
+
+    public static void writeString(String s, ByteBuf buf, int maxLength)
+    {
+        if ( s.length() > maxLength )
         {
-            throw new OverflowPacketException( String.format( "Cannot send string longer than Short.MAX_VALUE (got %s characters)", s.length() ) );
+            throw new OverflowPacketException( "Cannot send string longer than " + maxLength + " (got " + s.length() + " characters)" );
         }
 
         byte[] b = s.getBytes( Charsets.UTF_8 );
+        if ( b.length > maxLength * 3 )
+        {
+            throw new OverflowPacketException( "Cannot send string longer than " + ( maxLength * 3 ) + " (got " + b.length + " bytes)" );
+        }
+
         writeVarInt( b.length, buf );
         buf.writeBytes( b );
     }
 
     public static String readString(ByteBuf buf)
+    {
+        return readString( buf, Short.MAX_VALUE );
+    }
+
+    public static String readString(ByteBuf buf, int maxLen)
     {
         int len = readVarInt( buf );
-        if ( len > Short.MAX_VALUE )
+        if ( len > maxLen * 3 )
         {
-            throw new OverflowPacketException( String.format( "Cannot receive string longer than Short.MAX_VALUE (got %s characters)", len ) );
+            throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
         }
 
-        byte[] b = new byte[ len ];
-        buf.readBytes( b );
+        String s = buf.toString( buf.readerIndex(), len, Charsets.UTF_8 );
+        buf.readerIndex( buf.readerIndex() + len );
 
-        return new String( b, Charsets.UTF_8 );
+        if ( s.length() > maxLen )
+        {
+            throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
+        }
+
+        return s;
     }
 
     public static void writeArray(byte[] b, ByteBuf buf)
     {
         if ( b.length > Short.MAX_VALUE )
         {
-            throw new OverflowPacketException( String.format( "Cannot send byte array longer than Short.MAX_VALUE (got %s bytes)", b.length ) );
+            throw new OverflowPacketException( "Cannot send byte array longer than Short.MAX_VALUE (got " + b.length + " bytes)" );
         }
         writeVarInt( b.length, buf );
         buf.writeBytes( b );
@@ -73,7 +98,7 @@ public abstract class DefinedPacket
         int len = readVarInt( buf );
         if ( len > limit )
         {
-            throw new OverflowPacketException( String.format( "Cannot receive byte array longer than %s (got %s bytes)", limit, len ) );
+            throw new OverflowPacketException( "Cannot receive byte array longer than " + limit + " (got " + len + " bytes)" );
         }
         byte[] ret = new byte[ len ];
         buf.readBytes( ret );
@@ -203,14 +228,102 @@ public abstract class DefinedPacket
         return new UUID( input.readLong(), input.readLong() );
     }
 
-    public static Tag readTag(ByteBuf input)
+    public static void writeProperties(Property[] properties, ByteBuf buf)
     {
-        Tag tag = NamedTag.read( new DataInputStream( new ByteBufInputStream( input ) ) );
+        if ( properties == null )
+        {
+            writeVarInt( 0, buf );
+            return;
+        }
+
+        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, 512 ), readArray( buf, 4096 ) );
+        }
+
+        return null;
+    }
+
+    public static Tag readTag(ByteBuf input, int protocolVersion)
+    {
+        DataInputStream in = new DataInputStream( new ByteBufInputStream( input ) );
+        Tag tag;
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_20_2 )
+        {
+            try
+            {
+                byte type = in.readByte();
+                if ( type == 0 )
+                {
+                    return Tag.END;
+                } else
+                {
+                    tag = SpecificTag.read( type, in );
+                }
+            } catch ( IOException ex )
+            {
+                tag = new ErrorTag( "IOException while reading tag type:\n" + ex.getMessage() );
+            }
+        } else
+        {
+            tag = NamedTag.read( in );
+        }
         Preconditions.checkArgument( !tag.isError(), "Error reading tag: %s", tag.error() );
         return tag;
     }
 
-    public static void writeTag(Tag tag, ByteBuf output)
+    public static void writeTag(Tag tag, ByteBuf output, int protocolVersion)
     {
         try
         {
@@ -221,6 +334,53 @@ public abstract class DefinedPacket
         }
     }
 
+    public static <E extends Enum<E>> void writeEnumSet(EnumSet<E> enumset, Class<E> oclass, ByteBuf buf)
+    {
+        E[] enums = oclass.getEnumConstants();
+        BitSet bits = new BitSet( enums.length );
+
+        for ( int i = 0; i < enums.length; ++i )
+        {
+            bits.set( i, enumset.contains( enums[i] ) );
+        }
+
+        writeFixedBitSet( bits, enums.length, buf );
+    }
+
+    public static <E extends Enum<E>> EnumSet<E> readEnumSet(Class<E> oclass, ByteBuf buf)
+    {
+        E[] enums = oclass.getEnumConstants();
+        BitSet bits = readFixedBitSet( enums.length, buf );
+        EnumSet<E> set = EnumSet.noneOf( oclass );
+
+        for ( int i = 0; i < enums.length; ++i )
+        {
+            if ( bits.get( i ) )
+            {
+                set.add( enums[i] );
+            }
+        }
+
+        return set;
+    }
+
+    public static BitSet readFixedBitSet(int i, ByteBuf buf)
+    {
+        byte[] bits = new byte[ ( i + 8 ) >> 3 ];
+        buf.readBytes( bits );
+
+        return BitSet.valueOf( bits );
+    }
+
+    public static void writeFixedBitSet(BitSet bits, int size, ByteBuf buf)
+    {
+        if ( bits.length() > size )
+        {
+            throw new OverflowPacketException( "BitSet too large (expected " + size + " got " + bits.size() + ")" );
+        }
+        buf.writeBytes( Arrays.copyOf( bits.toByteArray(), ( size + 8 ) >> 3 ) );
+    }
+
     public void read(ByteBuf buf)
     {
         throw new UnsupportedOperationException( "Packet must implement read method" );
@@ -241,6 +401,11 @@ public abstract class DefinedPacket
         write( buf );
     }
 
+    public Protocol nextProtocol()
+    {
+        return null;
+    }
+
     public abstract void handle(AbstractPacketHandler handler) throws Exception;
 
     @Override

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/MinecraftDecoder.java

@@ -5,12 +5,14 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import java.util.List;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.Setter;
 
 @AllArgsConstructor
 public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
 {
 
+    @Getter
     @Setter
     private Protocol protocol;
     private final boolean server;
@@ -41,7 +43,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
 
                 if ( in.isReadable() )
                 {
-                    throw new BadPacketException( "Did not read all bytes from packet " + packet.getClass() + " " + packetId + " Protocol " + protocol + " Direction " + prot.getDirection() );
+                    throw new BadPacketException( "Packet " + protocol + ":" + prot.getDirection() + "/" + packetId + " (" + packet.getClass().getSimpleName() + ") larger than expected, extra bytes: " + in.readableBytes() );
                 }
             } else
             {

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

@@ -4,15 +4,18 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.Setter;
 
 @AllArgsConstructor
 public class MinecraftEncoder extends MessageToByteEncoder<DefinedPacket>
 {
 
+    @Getter
     @Setter
     private Protocol protocol;
     private boolean server;
+    @Getter
     @Setter
     private int protocolVersion;
 

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

@@ -6,21 +6,26 @@ import gnu.trove.map.TIntObjectMap;
 import gnu.trove.map.TObjectIntMap;
 import gnu.trove.map.hash.TIntObjectHashMap;
 import gnu.trove.map.hash.TObjectIntHashMap;
-import java.lang.reflect.Constructor;
+import java.util.function.Supplier;
 import lombok.Data;
 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;
 import net.md_5.bungee.protocol.packet.EncryptionResponse;
 import net.md_5.bungee.protocol.packet.EntityStatus;
+import net.md_5.bungee.protocol.packet.FinishConfiguration;
 import net.md_5.bungee.protocol.packet.GameState;
 import net.md_5.bungee.protocol.packet.Handshake;
 import net.md_5.bungee.protocol.packet.KeepAlive;
 import net.md_5.bungee.protocol.packet.Kick;
 import net.md_5.bungee.protocol.packet.Login;
+import net.md_5.bungee.protocol.packet.LoginAcknowledged;
 import net.md_5.bungee.protocol.packet.LoginPayloadRequest;
 import net.md_5.bungee.protocol.packet.LoginPayloadResponse;
 import net.md_5.bungee.protocol.packet.LoginRequest;
@@ -28,18 +33,25 @@ import net.md_5.bungee.protocol.packet.LoginSuccess;
 import net.md_5.bungee.protocol.packet.PingPacket;
 import net.md_5.bungee.protocol.packet.PlayerListHeaderFooter;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
+import net.md_5.bungee.protocol.packet.PlayerListItemRemove;
+import net.md_5.bungee.protocol.packet.PlayerListItemUpdate;
 import net.md_5.bungee.protocol.packet.PluginMessage;
 import net.md_5.bungee.protocol.packet.Respawn;
 import net.md_5.bungee.protocol.packet.ScoreboardDisplay;
 import net.md_5.bungee.protocol.packet.ScoreboardObjective;
 import net.md_5.bungee.protocol.packet.ScoreboardScore;
+import net.md_5.bungee.protocol.packet.ServerData;
 import net.md_5.bungee.protocol.packet.SetCompression;
+import net.md_5.bungee.protocol.packet.StartConfiguration;
 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;
 import net.md_5.bungee.protocol.packet.Title;
+import net.md_5.bungee.protocol.packet.TitleTimes;
 import net.md_5.bungee.protocol.packet.ViewDistance;
 
 public enum Protocol
@@ -52,6 +64,7 @@ public enum Protocol
         {
             TO_SERVER.registerPacket(
                     Handshake.class,
+                    Handshake::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
             );
         }
@@ -63,33 +76,50 @@ public enum Protocol
         {
             TO_CLIENT.registerPacket(
                     KeepAlive.class,
+                    KeepAlive::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x21 ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x20 ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x21 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x20 ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x1F )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x1F ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x21 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x1E ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x20 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x1F ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x23 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x24 )
             );
             TO_CLIENT.registerPacket(
                     Login.class,
+                    Login::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x23 ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x25 ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x26 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x25 ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x24 )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x24 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x26 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x23 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x25 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x24 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x28 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x29 )
             );
-            TO_CLIENT.registerPacket(
-                    Chat.class,
+            TO_CLIENT.registerPacket( 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_16, 0x0E ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x0F ),
+                    map( ProtocolConstants.MINECRAFT_1_19, -1 )
             );
             TO_CLIENT.registerPacket(
                     Respawn.class,
+                    Respawn::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x07 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x34 ),
@@ -98,16 +128,28 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_14, 0x3A ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x3B ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x3A ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x39 )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x39 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x3D ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x3B ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x3E ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x3D ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x41 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x43 )
             );
             TO_CLIENT.registerPacket(
                     BossBar.class,
+                    BossBar::new,
                     map( ProtocolConstants.MINECRAFT_1_9, 0x0C ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x0D ),
-                    map( ProtocolConstants.MINECRAFT_1_16, 0x0C )
+                    map( ProtocolConstants.MINECRAFT_1_16, 0x0C ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x0D ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0A ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x0B ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x0A )
             );
             TO_CLIENT.registerPacket(
                     PlayerListItem.class, // PlayerInfo
+                    PlayerListItem::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x38 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
@@ -115,89 +157,183 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_14, 0x33 ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x34 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x33 ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x32 )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x32 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x36 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x34 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x37 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, -1 )
             );
             TO_CLIENT.registerPacket(
                     TabCompleteResponse.class,
+                    TabCompleteResponse::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x3A ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x0E ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x10 ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x11 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x10 ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x0F )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x0F ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x11 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0E ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x0D ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x0F ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x10 )
             );
             TO_CLIENT.registerPacket(
                     ScoreboardObjective.class,
+                    ScoreboardObjective::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x3B ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x41 ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x42 ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x45 ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x49 ),
-                    map( ProtocolConstants.MINECRAFT_1_15, 0x4A )
+                    map( ProtocolConstants.MINECRAFT_1_15, 0x4A ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x53 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x56 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x54 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x58 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x5A )
             );
             TO_CLIENT.registerPacket(
                     ScoreboardScore.class,
+                    ScoreboardScore::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x3C ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x44 ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x45 ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x48 ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x4C ),
-                    map( ProtocolConstants.MINECRAFT_1_15, 0x4D )
+                    map( ProtocolConstants.MINECRAFT_1_15, 0x4D ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x56 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x59 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x57 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x5B ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x5D )
             );
             TO_CLIENT.registerPacket(
                     ScoreboardDisplay.class,
+                    ScoreboardDisplay::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x3D ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x3A ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x3B ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x3E ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x42 ),
-                    map( ProtocolConstants.MINECRAFT_1_15, 0x43 )
+                    map( ProtocolConstants.MINECRAFT_1_15, 0x43 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x4C ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x4F ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x4D ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x51 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x53 )
             );
             TO_CLIENT.registerPacket(
                     Team.class,
+                    Team::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x3E ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x43 ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x44 ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x47 ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x4B ),
-                    map( ProtocolConstants.MINECRAFT_1_15, 0x4C )
+                    map( ProtocolConstants.MINECRAFT_1_15, 0x4C ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x55 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x58 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x56 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x5A ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x5C )
             );
             TO_CLIENT.registerPacket(
                     PluginMessage.class,
+                    PluginMessage::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x3F ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x19 ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x18 ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x19 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x18 ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x17 )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x17 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x18 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x15 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x16 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x15 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x17 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x18 )
             );
             TO_CLIENT.registerPacket(
                     Kick.class,
+                    Kick::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x40 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x1B ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x1A ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x1B ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x1A ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x19 )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x19 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x1A ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x17 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x19 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x17 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x1A ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x1B )
             );
             TO_CLIENT.registerPacket(
                     Title.class,
+                    Title::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x45 ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x47 ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x4B ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x4F ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x50 ),
-                    map( ProtocolConstants.MINECRAFT_1_16, 0x4F )
+                    map( ProtocolConstants.MINECRAFT_1_16, 0x4F ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x59 ),
+                    map( ProtocolConstants.MINECRAFT_1_18, 0x5A ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x5D ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x5B ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x5F ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x61 )
+            );
+            TO_CLIENT.registerPacket(
+                    ClearTitles.class,
+                    ClearTitles::new,
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x10 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0D ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x0C ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x0E ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x0F )
+            );
+            TO_CLIENT.registerPacket(
+                    Subtitle.class,
+                    Subtitle::new,
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x57 ),
+                    map( ProtocolConstants.MINECRAFT_1_18, 0x58 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x5B ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x59 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x5D ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x5F )
+            );
+            TO_CLIENT.registerPacket(
+                    TitleTimes.class,
+                    TitleTimes::new,
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x5A ),
+                    map( ProtocolConstants.MINECRAFT_1_18, 0x5B ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x5E ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x5C ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x60 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x62 )
+            );
+            TO_CLIENT.registerPacket(
+                    SystemChat.class,
+                    SystemChat::new,
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x5F ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x62 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x60 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x64 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x67 )
             );
             TO_CLIENT.registerPacket(
                     PlayerListHeaderFooter.class,
+                    PlayerListHeaderFooter::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x47 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x48 ),
                     map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
@@ -206,81 +342,187 @@ public enum Protocol
                     map( ProtocolConstants.MINECRAFT_1_13, 0x4E ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x53 ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x54 ),
-                    map( ProtocolConstants.MINECRAFT_1_16, 0x53 )
+                    map( ProtocolConstants.MINECRAFT_1_16, 0x53 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x5E ),
+                    map( ProtocolConstants.MINECRAFT_1_18, 0x5F ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x60 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x63 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x61 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x65 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x68 )
             );
             TO_CLIENT.registerPacket(
                     EntityStatus.class,
+                    EntityStatus::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x1A ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x1C ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x1B ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x1C ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x1B ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x1A )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x1A ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x1B ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x18 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x1A ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x19 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x1C ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x1D )
             );
             TO_CLIENT.registerPacket(
                     Commands.class,
+                    Commands::new,
                     map( ProtocolConstants.MINECRAFT_1_13, 0x11 ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x12 ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x11 ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x10 )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x10 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x12 ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0F ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x0E ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x10 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x11 )
             );
             TO_CLIENT.registerPacket(
                     GameState.class,
+                    GameState::new,
                     map( ProtocolConstants.MINECRAFT_1_15, 0x1F ),
                     map( ProtocolConstants.MINECRAFT_1_16, 0x1E ),
-                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x1D )
+                    map( ProtocolConstants.MINECRAFT_1_16_2, 0x1D ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x1E ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x1B ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x1D ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x1C ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x1F ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x20 )
             );
             TO_CLIENT.registerPacket(
                     ViewDistance.class,
+                    ViewDistance::new,
                     map( ProtocolConstants.MINECRAFT_1_14, 0x41 ),
                     map( ProtocolConstants.MINECRAFT_1_15, 0x42 ),
-                    map( ProtocolConstants.MINECRAFT_1_16, 0x41 )
+                    map( ProtocolConstants.MINECRAFT_1_16, 0x41 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x4A ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x49 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x4C ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x4B ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x4F ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x51 )
+            );
+            TO_CLIENT.registerPacket(
+                    ServerData.class,
+                    ServerData::new,
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x3F ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x42 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x41 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x45 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x47 )
+            );
+            TO_CLIENT.registerPacket(
+                    PlayerListItemRemove.class,
+                    PlayerListItemRemove::new,
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x35 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x39 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x3B )
+            );
+            TO_CLIENT.registerPacket(
+                    PlayerListItemUpdate.class,
+                    PlayerListItemUpdate::new,
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x36 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x3A ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x3C )
+            );
+            TO_CLIENT.registerPacket(
+                    StartConfiguration.class,
+                    StartConfiguration::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x65 )
             );
 
             TO_SERVER.registerPacket(
                     KeepAlive.class,
+                    KeepAlive::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x0B ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
                     map( ProtocolConstants.MINECRAFT_1_14, 0x0F ),
-                    map( ProtocolConstants.MINECRAFT_1_16, 0x10 )
+                    map( ProtocolConstants.MINECRAFT_1_16, 0x10 ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x0F ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x11 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x12 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x11 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x12 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x14 )
             );
-            TO_SERVER.registerPacket(
-                    Chat.class,
+            TO_SERVER.registerPacket( 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 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x04 )
+            );
+            TO_SERVER.registerPacket(
+                    ClientChat.class,
+                    ClientChat::new,
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x04 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 )
             );
             TO_SERVER.registerPacket(
                     TabCompleteRequest.class,
+                    TabCompleteRequest::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x14 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
                     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 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x09 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x08 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x09 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x0A )
             );
             TO_SERVER.registerPacket(
                     ClientSettings.class,
+                    ClientSettings::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x15 ),
                     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 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x08 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x07 ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x08 ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x09 )
             );
             TO_SERVER.registerPacket(
                     PluginMessage.class,
+                    PluginMessage::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x17 ),
                     map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
                     map( ProtocolConstants.MINECRAFT_1_12, 0x0A ),
                     map( ProtocolConstants.MINECRAFT_1_12_1, 0x09 ),
                     map( ProtocolConstants.MINECRAFT_1_13, 0x0A ),
-                    map( ProtocolConstants.MINECRAFT_1_14, 0x0B )
+                    map( ProtocolConstants.MINECRAFT_1_14, 0x0B ),
+                    map( ProtocolConstants.MINECRAFT_1_17, 0x0A ),
+                    map( ProtocolConstants.MINECRAFT_1_19, 0x0C ),
+                    map( ProtocolConstants.MINECRAFT_1_19_1, 0x0D ),
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x0C ),
+                    map( ProtocolConstants.MINECRAFT_1_19_4, 0x0D ),
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x0F )
+            );
+            TO_SERVER.registerPacket(
+                    StartConfiguration.class,
+                    StartConfiguration::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x0B )
             );
         }
     },
@@ -291,19 +533,23 @@ public enum Protocol
         {
             TO_CLIENT.registerPacket(
                     StatusResponse.class,
+                    StatusResponse::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
             );
             TO_CLIENT.registerPacket(
                     PingPacket.class,
+                    PingPacket::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
             );
 
             TO_SERVER.registerPacket(
                     StatusRequest.class,
+                    StatusRequest::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
             );
             TO_SERVER.registerPacket(
                     PingPacket.class,
+                    PingPacket::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
             );
         }
@@ -315,44 +561,105 @@ public enum Protocol
         {
             TO_CLIENT.registerPacket(
                     Kick.class,
+                    Kick::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
             );
             TO_CLIENT.registerPacket(
                     EncryptionRequest.class,
+                    EncryptionRequest::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
             );
             TO_CLIENT.registerPacket(
                     LoginSuccess.class,
+                    LoginSuccess::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x02 )
             );
             TO_CLIENT.registerPacket(
                     SetCompression.class,
+                    SetCompression::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x03 )
             );
             TO_CLIENT.registerPacket(
                     LoginPayloadRequest.class,
+                    LoginPayloadRequest::new,
                     map( ProtocolConstants.MINECRAFT_1_13, 0x04 )
             );
 
             TO_SERVER.registerPacket(
                     LoginRequest.class,
+                    LoginRequest::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
             );
             TO_SERVER.registerPacket(
                     EncryptionResponse.class,
+                    EncryptionResponse::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
             );
             TO_SERVER.registerPacket(
                     LoginPayloadResponse.class,
+                    LoginPayloadResponse::new,
                     map( ProtocolConstants.MINECRAFT_1_13, 0x02 )
             );
+            TO_SERVER.registerPacket(
+                    LoginAcknowledged.class,
+                    LoginAcknowledged::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x03 )
+            );
+        }
+    },
+    // 3
+    CONFIGURATION
+    {
+
+        {
+            TO_CLIENT.registerPacket(
+                    PluginMessage.class,
+                    PluginMessage::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x00 )
+            );
+            TO_CLIENT.registerPacket(
+                    Kick.class,
+                    Kick::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x01 )
+            );
+            TO_CLIENT.registerPacket(
+                    FinishConfiguration.class,
+                    FinishConfiguration::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x02 )
+            );
+            TO_CLIENT.registerPacket(
+                    KeepAlive.class,
+                    KeepAlive::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x03 )
+            );
+
+            TO_SERVER.registerPacket(
+                    ClientSettings.class,
+                    ClientSettings::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x00 )
+            );
+            TO_SERVER.registerPacket(
+                    PluginMessage.class,
+                    PluginMessage::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x01 )
+            );
+            TO_SERVER.registerPacket(
+                    FinishConfiguration.class,
+                    FinishConfiguration::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x02 )
+            );
+            TO_SERVER.registerPacket(
+                    KeepAlive.class,
+                    KeepAlive::new,
+                    map( ProtocolConstants.MINECRAFT_1_20_2, 0x03 )
+            );
         }
     };
     /*========================================================================*/
     public static final int MAX_PACKET_ID = 0xFF;
     /*========================================================================*/
-    final DirectionData TO_SERVER = new DirectionData( this, ProtocolConstants.Direction.TO_SERVER );
-    final DirectionData TO_CLIENT = new DirectionData( this, ProtocolConstants.Direction.TO_CLIENT );
+    public final DirectionData TO_SERVER = new DirectionData( this, ProtocolConstants.Direction.TO_SERVER );
+    public final DirectionData TO_CLIENT = new DirectionData( this, ProtocolConstants.Direction.TO_CLIENT );
 
     public static void main(String[] args)
     {
@@ -394,7 +701,8 @@ public enum Protocol
 
         private final int protocolVersion;
         private final TObjectIntMap<Class<? extends DefinedPacket>> packetMap = new TObjectIntHashMap<>( MAX_PACKET_ID );
-        private final Constructor<? extends DefinedPacket>[] packetConstructors = new Constructor[ MAX_PACKET_ID ];
+        @SuppressWarnings("unchecked")
+        private final Supplier<? extends DefinedPacket>[] packetConstructors = new Supplier[ MAX_PACKET_ID ];
     }
 
     @Data
@@ -411,7 +719,7 @@ public enum Protocol
         return new ProtocolMapping( protocol, id );
     }
 
-    static final class DirectionData
+    public static final class DirectionData
     {
 
         private final TIntObjectMap<ProtocolData> protocols = new TIntObjectHashMap<>();
@@ -448,58 +756,61 @@ public enum Protocol
             {
                 throw new BadPacketException( "Unsupported protocol version " + version );
             }
-            if ( id > MAX_PACKET_ID )
+            if ( id > MAX_PACKET_ID || id < 0 )
             {
-                throw new BadPacketException( "Packet with id " + id + " outside of range " );
+                throw new BadPacketException( "Packet with id " + id + " outside of range" );
             }
 
-            Constructor<? extends DefinedPacket> constructor = protocolData.packetConstructors[id];
-            try
+            Supplier<? extends DefinedPacket> constructor = protocolData.packetConstructors[id];
+            return ( constructor == null ) ? null : constructor.get();
+        }
+
+        private void registerPacket(Class<? extends DefinedPacket> packetClass, Supplier<? extends DefinedPacket> constructor, ProtocolMapping... mappings)
+        {
+            int mappingIndex = 0;
+            ProtocolMapping mapping = mappings[mappingIndex];
+            for ( int protocol : ProtocolConstants.SUPPORTED_VERSION_IDS )
             {
-                return ( constructor == null ) ? null : constructor.newInstance();
-            } catch ( ReflectiveOperationException ex )
-            {
-                throw new BadPacketException( "Could not construct packet with id " + id, ex );
+                if ( protocol < mapping.protocolVersion )
+                {
+                    // This is a new packet, skip it till we reach the next protocol
+                    continue;
+                }
+
+                if ( mapping.protocolVersion < protocol && mappingIndex + 1 < mappings.length )
+                {
+                    // Mapping is non current, but the next one may be ok
+                    ProtocolMapping nextMapping = mappings[mappingIndex + 1];
+
+                    if ( nextMapping.protocolVersion == protocol )
+                    {
+                        Preconditions.checkState( nextMapping.packetID != mapping.packetID, "Duplicate packet mapping (%s, %s)", mapping.protocolVersion, nextMapping.protocolVersion );
+
+                        mapping = nextMapping;
+                        mappingIndex++;
+                    }
+                }
+
+                if ( mapping.packetID < 0 )
+                {
+                    break;
+                }
+
+                ProtocolData data = protocols.get( protocol );
+                data.packetMap.put( packetClass, mapping.packetID );
+                data.packetConstructors[mapping.packetID] = constructor;
             }
         }
 
-        private void registerPacket(Class<? extends DefinedPacket> packetClass, ProtocolMapping... mappings)
+        public boolean hasPacket(Class<? extends DefinedPacket> packet, int version)
         {
-            try
+            ProtocolData protocolData = getProtocolData( version );
+            if ( protocolData == null )
             {
-                Constructor<? extends DefinedPacket> constructor = packetClass.getDeclaredConstructor();
-
-                int mappingIndex = 0;
-                ProtocolMapping mapping = mappings[mappingIndex];
-                for ( int protocol : ProtocolConstants.SUPPORTED_VERSION_IDS )
-                {
-                    if ( protocol < mapping.protocolVersion )
-                    {
-                        // This is a new packet, skip it till we reach the next protocol
-                        continue;
-                    }
-
-                    if ( mapping.protocolVersion < protocol && mappingIndex + 1 < mappings.length )
-                    {
-                        // Mapping is non current, but the next one may be ok
-                        ProtocolMapping nextMapping = mappings[mappingIndex + 1];
-                        if ( nextMapping.protocolVersion == protocol )
-                        {
-                            Preconditions.checkState( nextMapping.packetID != mapping.packetID, "Duplicate packet mapping (%s, %s)", mapping.protocolVersion, nextMapping.protocolVersion );
-
-                            mapping = nextMapping;
-                            mappingIndex++;
-                        }
-                    }
-
-                    ProtocolData data = protocols.get( protocol );
-                    data.packetMap.put( packetClass, mapping.packetID );
-                    data.packetConstructors[mapping.packetID] = constructor;
-                }
-            } catch ( NoSuchMethodException ex )
-            {
-                throw new BadPacketException( "No NoArgsConstructor for packet class " + packetClass );
+                throw new BadPacketException( "Unsupported protocol version" );
             }
+
+            return protocolData.packetMap.containsKey( packet );
         }
 
         final int getId(Class<? extends DefinedPacket> packet, int version)

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

@@ -1,11 +1,12 @@
 package net.md_5.bungee.protocol;
 
-import java.util.Arrays;
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 
 public class ProtocolConstants
 {
 
+    private static final boolean SNAPSHOT_SUPPORT = Boolean.getBoolean( "net.md_5.bungee.protocol.snapshot" );
     public static final int MINECRAFT_1_8 = 47;
     public static final int MINECRAFT_1_9 = 107;
     public static final int MINECRAFT_1_9_1 = 108;
@@ -33,46 +34,85 @@ public class ProtocolConstants
     public static final int MINECRAFT_1_16_2 = 751;
     public static final int MINECRAFT_1_16_3 = 753;
     public static final int MINECRAFT_1_16_4 = 754;
-    public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
-            "1.8.x",
-            "1.9.x",
-            "1.10.x",
-            "1.11.x",
-            "1.12.x",
-            "1.13.x",
-            "1.14.x",
-            "1.15.x",
-            "1.16.x"
-    );
-    public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
-            ProtocolConstants.MINECRAFT_1_8,
-            ProtocolConstants.MINECRAFT_1_9,
-            ProtocolConstants.MINECRAFT_1_9_1,
-            ProtocolConstants.MINECRAFT_1_9_2,
-            ProtocolConstants.MINECRAFT_1_9_4,
-            ProtocolConstants.MINECRAFT_1_10,
-            ProtocolConstants.MINECRAFT_1_11,
-            ProtocolConstants.MINECRAFT_1_11_1,
-            ProtocolConstants.MINECRAFT_1_12,
-            ProtocolConstants.MINECRAFT_1_12_1,
-            ProtocolConstants.MINECRAFT_1_12_2,
-            ProtocolConstants.MINECRAFT_1_13,
-            ProtocolConstants.MINECRAFT_1_13_1,
-            ProtocolConstants.MINECRAFT_1_13_2,
-            ProtocolConstants.MINECRAFT_1_14,
-            ProtocolConstants.MINECRAFT_1_14_1,
-            ProtocolConstants.MINECRAFT_1_14_2,
-            ProtocolConstants.MINECRAFT_1_14_3,
-            ProtocolConstants.MINECRAFT_1_14_4,
-            ProtocolConstants.MINECRAFT_1_15,
-            ProtocolConstants.MINECRAFT_1_15_1,
-            ProtocolConstants.MINECRAFT_1_15_2,
-            ProtocolConstants.MINECRAFT_1_16,
-            ProtocolConstants.MINECRAFT_1_16_1,
-            ProtocolConstants.MINECRAFT_1_16_2,
-            ProtocolConstants.MINECRAFT_1_16_3,
-            ProtocolConstants.MINECRAFT_1_16_4
-    );
+    public static final int MINECRAFT_1_17 = 755;
+    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 int MINECRAFT_1_19_1 = 760;
+    public static final int MINECRAFT_1_19_3 = 761;
+    public static final int MINECRAFT_1_19_4 = 762;
+    public static final int MINECRAFT_1_20 = 763;
+    public static final int MINECRAFT_1_20_2 = 764;
+    public static final List<String> SUPPORTED_VERSIONS;
+    public static final List<Integer> SUPPORTED_VERSION_IDS;
+
+    static
+    {
+        ImmutableList.Builder<String> supportedVersions = ImmutableList.<String>builder().add(
+                "1.8.x",
+                "1.9.x",
+                "1.10.x",
+                "1.11.x",
+                "1.12.x",
+                "1.13.x",
+                "1.14.x",
+                "1.15.x",
+                "1.16.x",
+                "1.17.x",
+                "1.18.x",
+                "1.19.x",
+                "1.20.x"
+        );
+        ImmutableList.Builder<Integer> supportedVersionIds = ImmutableList.<Integer>builder().add(
+                ProtocolConstants.MINECRAFT_1_8,
+                ProtocolConstants.MINECRAFT_1_9,
+                ProtocolConstants.MINECRAFT_1_9_1,
+                ProtocolConstants.MINECRAFT_1_9_2,
+                ProtocolConstants.MINECRAFT_1_9_4,
+                ProtocolConstants.MINECRAFT_1_10,
+                ProtocolConstants.MINECRAFT_1_11,
+                ProtocolConstants.MINECRAFT_1_11_1,
+                ProtocolConstants.MINECRAFT_1_12,
+                ProtocolConstants.MINECRAFT_1_12_1,
+                ProtocolConstants.MINECRAFT_1_12_2,
+                ProtocolConstants.MINECRAFT_1_13,
+                ProtocolConstants.MINECRAFT_1_13_1,
+                ProtocolConstants.MINECRAFT_1_13_2,
+                ProtocolConstants.MINECRAFT_1_14,
+                ProtocolConstants.MINECRAFT_1_14_1,
+                ProtocolConstants.MINECRAFT_1_14_2,
+                ProtocolConstants.MINECRAFT_1_14_3,
+                ProtocolConstants.MINECRAFT_1_14_4,
+                ProtocolConstants.MINECRAFT_1_15,
+                ProtocolConstants.MINECRAFT_1_15_1,
+                ProtocolConstants.MINECRAFT_1_15_2,
+                ProtocolConstants.MINECRAFT_1_16,
+                ProtocolConstants.MINECRAFT_1_16_1,
+                ProtocolConstants.MINECRAFT_1_16_2,
+                ProtocolConstants.MINECRAFT_1_16_3,
+                ProtocolConstants.MINECRAFT_1_16_4,
+                ProtocolConstants.MINECRAFT_1_17,
+                ProtocolConstants.MINECRAFT_1_17_1,
+                ProtocolConstants.MINECRAFT_1_18,
+                ProtocolConstants.MINECRAFT_1_18_2,
+                ProtocolConstants.MINECRAFT_1_19,
+                ProtocolConstants.MINECRAFT_1_19_1,
+                ProtocolConstants.MINECRAFT_1_19_3,
+                ProtocolConstants.MINECRAFT_1_19_4,
+                ProtocolConstants.MINECRAFT_1_20,
+                ProtocolConstants.MINECRAFT_1_20_2
+        );
+
+        if ( SNAPSHOT_SUPPORT )
+        {
+            // supportedVersions.add( "1.20.x" );
+            // supportedVersionIds.add( ProtocolConstants.MINECRAFT_1_20_2 );
+        }
+
+        SUPPORTED_VERSIONS = supportedVersions.build();
+        SUPPORTED_VERSION_IDS = supportedVersionIds.build();
+    }
 
     public enum Direction
     {

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

@@ -0,0 +1,39 @@
+package net.md_5.bungee.protocol;
+
+import io.netty.buffer.ByteBuf;
+import java.util.BitSet;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SeenMessages extends DefinedPacket
+{
+
+    private int offset;
+    private BitSet acknowledged;
+
+    @Override
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        offset = DefinedPacket.readVarInt( buf );
+        acknowledged = DefinedPacket.readFixedBitSet( 20, buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        DefinedPacket.writeVarInt( offset, buf );
+        DefinedPacket.writeFixedBitSet( acknowledged, 20, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        throw new UnsupportedOperationException( "Not supported." );
+    }
+}

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

@@ -53,8 +53,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
                 {
                     if ( in.hasMemoryAddress() )
                     {
-                        out.add( in.slice( in.readerIndex(), length ).retain() );
-                        in.skipBytes( length );
+                        out.add( in.readRetainedSlice( length ) );
                     } else
                     {
                         if ( !DIRECT_WARNING )

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

@@ -0,0 +1,25 @@
+package net.md_5.bungee.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import java.util.List;
+
+/**
+ * Prepend length of the message as a Varint21 using an extra buffer for the length, avoiding copying packet data
+ */
+@ChannelHandler.Sharable
+public class Varint21LengthFieldExtraBufPrepender extends MessageToMessageEncoder<ByteBuf>
+{
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception
+    {
+        int bodyLen = msg.readableBytes();
+        ByteBuf lenBuf = ctx.alloc().ioBuffer( Varint21LengthFieldPrepender.varintSize( bodyLen ) );
+        DefinedPacket.writeVarInt( bodyLen, lenBuf );
+        out.add( lenBuf );
+        out.add( msg.retain() );
+    }
+}

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

@@ -5,6 +5,9 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 
+/**
+ * Prepend length of the message as a Varint21 by writing length and data to a new buffer
+ */
 @ChannelHandler.Sharable
 public class Varint21LengthFieldPrepender extends MessageToByteEncoder<ByteBuf>
 {
@@ -20,7 +23,7 @@ public class Varint21LengthFieldPrepender extends MessageToByteEncoder<ByteBuf>
         out.writeBytes( msg );
     }
 
-    private static int varintSize(int paramInt)
+    static int varintSize(int paramInt)
     {
         if ( ( paramInt & 0xFFFFFF80 ) == 0 )
         {

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

@@ -40,7 +40,7 @@ public class Chat extends DefinedPacket
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
-        message = readString( buf );
+        message = readString( buf, ( direction == ProtocolConstants.Direction.TO_CLIENT ) ? 262144 : ( protocolVersion >= ProtocolConstants.MINECRAFT_1_11 ? 256 : 100 ) );
         if ( direction == ProtocolConstants.Direction.TO_CLIENT )
         {
             position = buf.readByte();
@@ -54,7 +54,7 @@ public class Chat extends DefinedPacket
     @Override
     public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
-        writeString( message, buf );
+        writeString( message, buf, ( direction == ProtocolConstants.Direction.TO_CLIENT ) ? 262144 : ( protocolVersion >= ProtocolConstants.MINECRAFT_1_11 ? 256 : 100 ) );
         if ( direction == ProtocolConstants.Direction.TO_CLIENT )
         {
             buf.writeByte( position );

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

@@ -0,0 +1,38 @@
+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 ClearTitles extends DefinedPacket
+{
+
+    private boolean reset;
+
+    @Override
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        reset = buf.readBoolean();
+    }
+
+    @Override
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        buf.writeBoolean( reset );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

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

@@ -0,0 +1,97 @@
+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.ChatChain;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.SeenMessages;
+
+@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;
+    private ChatChain chain;
+    private SeenMessages seenMessages;
+
+    @Override
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        message = readString( buf, 256 );
+        timestamp = buf.readLong();
+        salt = buf.readLong();
+
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            if ( buf.readBoolean() )
+            {
+                signature = new byte[ 256 ];
+                buf.readBytes( signature );
+            }
+        } else
+        {
+            signature = readArray( buf );
+        }
+        if ( protocolVersion < ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            signedPreview = buf.readBoolean();
+        }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            seenMessages = new SeenMessages();
+            seenMessages.read( buf, direction, protocolVersion );
+        } else if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_1 )
+        {
+            chain = new ChatChain();
+            chain.read( buf, direction, protocolVersion );
+        }
+    }
+
+    @Override
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        writeString( message, buf );
+        buf.writeLong( timestamp );
+        buf.writeLong( salt );
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            buf.writeBoolean( signature != null );
+            if ( signature != null )
+            {
+                buf.writeBytes( signature );
+            }
+        } else
+        {
+            writeArray( signature, buf );
+        }
+        if ( protocolVersion < ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            buf.writeBoolean( signedPreview );
+        }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            seenMessages.write( buf, direction, protocolVersion );
+        } else if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_1 )
+        {
+            chain.write( buf, direction, protocolVersion );
+        }
+    }
+
+    @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,111 @@
+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.ChatChain;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.SeenMessages;
+
+@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;
+    private ChatChain chain;
+    private SeenMessages seenMessages;
+
+    @Override
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
+    {
+        command = readString( buf, 256 );
+        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++ )
+        {
+            String name = readString( buf, 16 );
+            byte[] signature;
+
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 )
+            {
+                signature = new byte[ 256 ];
+                buf.readBytes( signature );
+            } else
+            {
+                signature = readArray( buf );
+            }
+            signatures.put( name, signature );
+        }
+
+        if ( protocolVersion < ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            signedPreview = buf.readBoolean();
+        }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            seenMessages = new SeenMessages();
+            seenMessages.read( buf, direction, protocolVersion );
+        } else if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_1 )
+        {
+            chain = new ChatChain();
+            chain.read( buf, direction, protocolVersion );
+        }
+    }
+
+    @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 );
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 )
+            {
+                buf.writeBytes( entry.getValue() );
+            } else
+            {
+                writeArray( entry.getValue(), buf );
+            }
+        }
+
+        if ( protocolVersion < ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            buf.writeBoolean( signedPreview );
+        }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            seenMessages.write( buf, direction, protocolVersion );
+        } else if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_1 )
+        {
+            chain.write( buf, direction, protocolVersion );
+        }
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

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

@@ -23,11 +23,13 @@ public class ClientSettings extends DefinedPacket
     private byte difficulty;
     private byte skinParts;
     private int mainHand;
+    private boolean disableTextFiltering;
+    private boolean allowServerListing;
 
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
-        locale = readString( buf );
+        locale = readString( buf, 16 );
         viewDistance = buf.readByte();
         chatFlags = protocolVersion >= ProtocolConstants.MINECRAFT_1_9 ? DefinedPacket.readVarInt( buf ) : buf.readUnsignedByte();
         chatColours = buf.readBoolean();
@@ -36,6 +38,14 @@ public class ClientSettings extends DefinedPacket
         {
             mainHand = DefinedPacket.readVarInt( buf );
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_17 )
+        {
+            disableTextFiltering = buf.readBoolean();
+        }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_18 )
+        {
+            allowServerListing = buf.readBoolean();
+        }
     }
 
     @Override
@@ -56,6 +66,14 @@ public class ClientSettings extends DefinedPacket
         {
             DefinedPacket.writeVarInt( mainHand, buf );
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_17 )
+        {
+            buf.writeBoolean( disableTextFiltering );
+        }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_18 )
+        {
+            buf.writeBoolean( allowServerListing );
+        }
     }
 
     @Override

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

@@ -36,6 +36,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 +57,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 +80,7 @@ public class Commands extends DefinedPacket
                     break;
                 case NODE_ARGUMENT:
                     String name = readString( buf );
-                    String parser = readString( buf );
-
-                    argumentBuilder = RequiredArgumentBuilder.argument( name, ArgumentRegistry.read( parser, buf ) );
+                    argumentBuilder = RequiredArgumentBuilder.argument( name, ArgumentRegistry.read( buf, protocolVersion ) );
 
                     if ( ( flags & FLAG_SUGGESTIONS ) != 0 )
                     {
@@ -126,7 +125,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 +209,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 +307,9 @@ public class Commands extends DefinedPacket
     {
 
         private static final Map<String, ArgumentSerializer> PROVIDERS = new HashMap<>();
+        private static final ArgumentSerializer[] IDS_1_19;
+        private static final ArgumentSerializer[] IDS_1_19_3;
+        private static final ArgumentSerializer[] IDS_1_19_4;
         private static final Map<Class<?>, ProperArgumentSerializer<?>> PROPER_PROVIDERS = new HashMap<>();
         //
         private static final ArgumentSerializer<Void> VOID = new ArgumentSerializer<Void>()
@@ -351,7 +353,7 @@ public class Commands extends DefinedPacket
                 buf.writeByte( t );
             }
         };
-        private static final ArgumentSerializer<FloatArgumentType> FLOAT = new ArgumentSerializer<FloatArgumentType>()
+        private static final ArgumentSerializer<FloatArgumentType> FLOAT_RANGE = new ArgumentSerializer<FloatArgumentType>()
         {
             @Override
             protected FloatArgumentType read(ByteBuf buf)
@@ -380,7 +382,7 @@ public class Commands extends DefinedPacket
                 }
             }
         };
-        private static final ArgumentSerializer<DoubleArgumentType> DOUBLE = new ArgumentSerializer<DoubleArgumentType>()
+        private static final ArgumentSerializer<DoubleArgumentType> DOUBLE_RANGE = new ArgumentSerializer<DoubleArgumentType>()
         {
             @Override
             protected DoubleArgumentType read(ByteBuf buf)
@@ -409,7 +411,7 @@ public class Commands extends DefinedPacket
                 }
             }
         };
-        private static final ArgumentSerializer<IntegerArgumentType> INTEGER = new ArgumentSerializer<IntegerArgumentType>()
+        private static final ArgumentSerializer<IntegerArgumentType> INTEGER_RANGE = new ArgumentSerializer<IntegerArgumentType>()
         {
             @Override
             protected IntegerArgumentType read(ByteBuf buf)
@@ -438,7 +440,21 @@ public class Commands extends DefinedPacket
                 }
             }
         };
-        private static final ArgumentSerializer<LongArgumentType> LONG = new ArgumentSerializer<LongArgumentType>()
+        private static final ArgumentSerializer<Integer> INTEGER = new ArgumentSerializer<Integer>()
+        {
+            @Override
+            protected Integer read(ByteBuf buf)
+            {
+                return buf.readInt();
+            }
+
+            @Override
+            protected void write(ByteBuf buf, Integer t)
+            {
+                buf.writeInt( t );
+            }
+        };
+        private static final ArgumentSerializer<LongArgumentType> LONG_RANGE = new ArgumentSerializer<LongArgumentType>()
         {
             @Override
             protected LongArgumentType read(ByteBuf buf)
@@ -492,89 +508,310 @@ public class Commands extends DefinedPacket
                 writeVarInt( t.getType().ordinal(), buf );
             }
 
+            @Override
+            protected int getIntKey()
+            {
+                return 5;
+            }
+
             @Override
             protected String getKey()
             {
                 return "brigadier:string";
             }
         };
+        private static final ArgumentSerializer<String> RAW_STRING = new ArgumentSerializer<String>()
+        {
+            @Override
+            protected String read(ByteBuf buf)
+            {
+                return DefinedPacket.readString( buf );
+            }
+
+            @Override
+            protected void write(ByteBuf buf, String t)
+            {
+                DefinedPacket.writeString( t, buf );
+            }
+        };
 
         static
         {
-            PROVIDERS.put( "brigadier:bool", VOID );
-            PROVIDERS.put( "brigadier:float", FLOAT );
-            PROVIDERS.put( "brigadier:double", DOUBLE );
-            PROVIDERS.put( "brigadier:integer", INTEGER );
-            PROVIDERS.put( "brigadier:long", LONG );
+            register( "brigadier:bool", VOID );
+            register( "brigadier:float", FLOAT_RANGE );
+            register( "brigadier:double", DOUBLE_RANGE );
+            register( "brigadier:integer", INTEGER_RANGE );
+            register( "brigadier:long", LONG_RANGE );
 
-            PROVIDERS.put( "brigadier:string", STRING );
+            register( "brigadier:string", STRING );
             PROPER_PROVIDERS.put( StringArgumentType.class, STRING );
 
-            PROVIDERS.put( "minecraft:entity", BYTE );
-            PROVIDERS.put( "minecraft:game_profile", VOID );
-            PROVIDERS.put( "minecraft:block_pos", VOID );
-            PROVIDERS.put( "minecraft:column_pos", VOID );
-            PROVIDERS.put( "minecraft:vec3", VOID );
-            PROVIDERS.put( "minecraft:vec2", VOID );
-            PROVIDERS.put( "minecraft:block_state", VOID );
-            PROVIDERS.put( "minecraft:block_predicate", VOID );
-            PROVIDERS.put( "minecraft:item_stack", VOID );
-            PROVIDERS.put( "minecraft:item_predicate", VOID );
-            PROVIDERS.put( "minecraft:color", VOID );
-            PROVIDERS.put( "minecraft:component", VOID );
-            PROVIDERS.put( "minecraft:message", VOID );
-            PROVIDERS.put( "minecraft:nbt_compound_tag", VOID ); // 1.14
-            PROVIDERS.put( "minecraft:nbt_tag", VOID ); // 1.14
-            PROVIDERS.put( "minecraft:nbt", VOID ); // 1.13
-            PROVIDERS.put( "minecraft:nbt_path", VOID );
-            PROVIDERS.put( "minecraft:objective", VOID );
-            PROVIDERS.put( "minecraft:objective_criteria", VOID );
-            PROVIDERS.put( "minecraft:operation", VOID );
-            PROVIDERS.put( "minecraft:particle", VOID );
-            PROVIDERS.put( "minecraft:rotation", VOID );
-            PROVIDERS.put( "minecraft:scoreboard_slot", VOID );
-            PROVIDERS.put( "minecraft:score_holder", BYTE );
-            PROVIDERS.put( "minecraft:swizzle", VOID );
-            PROVIDERS.put( "minecraft:team", VOID );
-            PROVIDERS.put( "minecraft:item_slot", VOID );
-            PROVIDERS.put( "minecraft:resource_location", VOID );
-            PROVIDERS.put( "minecraft:mob_effect", VOID );
-            PROVIDERS.put( "minecraft:function", VOID );
-            PROVIDERS.put( "minecraft:entity_anchor", VOID );
-            PROVIDERS.put( "minecraft:int_range", VOID );
-            PROVIDERS.put( "minecraft:float_range", VOID );
-            PROVIDERS.put( "minecraft:item_enchantment", VOID );
-            PROVIDERS.put( "minecraft:entity_summon", VOID );
-            PROVIDERS.put( "minecraft:dimension", VOID );
-            PROVIDERS.put( "minecraft:time", VOID ); // 1.14
-            PROVIDERS.put( "minecraft:uuid", VOID ); // 1.16
-            PROVIDERS.put( "minecraft:test_argument", VOID ); // 1.16, debug
-            PROVIDERS.put( "minecraft:test_class", VOID ); // 1.16, debug
-            PROVIDERS.put( "minecraft:angle", VOID ); // 1.16.2
+            register( "minecraft:entity", BYTE );
+            register( "minecraft:game_profile", VOID );
+            register( "minecraft:block_pos", VOID );
+            register( "minecraft:column_pos", VOID );
+            register( "minecraft:vec3", VOID );
+            register( "minecraft:vec2", VOID );
+            register( "minecraft:block_state", VOID );
+            register( "minecraft:block_predicate", VOID );
+            register( "minecraft:item_stack", VOID );
+            register( "minecraft:item_predicate", VOID );
+            register( "minecraft:color", VOID );
+            register( "minecraft:component", VOID );
+            register( "minecraft:message", VOID );
+            register( "minecraft:nbt_compound_tag", VOID ); // 1.14
+            register( "minecraft:nbt_tag", VOID ); // 1.14
+            register( "minecraft:nbt_path", VOID );
+            register( "minecraft:objective", VOID );
+            register( "minecraft:objective_criteria", VOID );
+            register( "minecraft:operation", VOID );
+            register( "minecraft:particle", VOID );
+            register( "minecraft:angle", VOID ); // 1.16.2
+            register( "minecraft:rotation", VOID );
+            register( "minecraft:scoreboard_slot", VOID );
+            register( "minecraft:score_holder", BYTE );
+            register( "minecraft:swizzle", VOID );
+            register( "minecraft:team", VOID );
+            register( "minecraft:item_slot", VOID );
+            register( "minecraft:resource_location", VOID );
+            register( "minecraft:mob_effect", VOID );
+            register( "minecraft:function", VOID );
+            register( "minecraft:entity_anchor", VOID );
+            register( "minecraft:int_range", VOID );
+            register( "minecraft:float_range", VOID );
+            register( "minecraft:item_enchantment", VOID );
+            register( "minecraft:entity_summon", VOID );
+            register( "minecraft:dimension", VOID );
+            register( "minecraft:time", VOID ); // 1.14
+            register( "minecraft:resource_or_tag", RAW_STRING ); // 1.18.2
+            register( "minecraft:resource", RAW_STRING ); // 1.18.2
+            register( "minecraft:uuid", VOID ); // 1.16
+
+            register( "minecraft:nbt", VOID ); // 1.13 // removed
+            IDS_1_19 = new ArgumentSerializer[]
+            {
+                get( "brigadier:bool", VOID ),
+                get( "brigadier:float", FLOAT_RANGE ),
+                get( "brigadier:double", DOUBLE_RANGE ),
+                get( "brigadier:integer", INTEGER_RANGE ),
+                get( "brigadier:long", LONG_RANGE ),
+                get( "brigadier:string", STRING ),
+                get( "minecraft:entity", BYTE ),
+                get( "minecraft:game_profile", VOID ),
+                get( "minecraft:block_pos", VOID ),
+                get( "minecraft:column_pos", VOID ),
+                get( "minecraft:vec3", VOID ),
+                get( "minecraft:vec2", VOID ),
+                get( "minecraft:block_state", VOID ),
+                get( "minecraft:block_predicate", VOID ),
+                get( "minecraft:item_stack", VOID ),
+                get( "minecraft:item_predicate", VOID ),
+                get( "minecraft:color", VOID ),
+                get( "minecraft:component", VOID ),
+                get( "minecraft:message", VOID ),
+                get( "minecraft:nbt_compound_tag", VOID ),
+                get( "minecraft:nbt_tag", VOID ),
+                get( "minecraft:nbt_path", VOID ),
+                get( "minecraft:objective", VOID ),
+                get( "minecraft:objective_criteria", VOID ),
+                get( "minecraft:operation", VOID ),
+                get( "minecraft:particle", VOID ),
+                get( "minecraft:angle", VOID ),
+                get( "minecraft:rotation", VOID ),
+                get( "minecraft:scoreboard_slot", VOID ),
+                get( "minecraft:score_holder", BYTE ),
+                get( "minecraft:swizzle", VOID ),
+                get( "minecraft:team", VOID ),
+                get( "minecraft:item_slot", VOID ),
+                get( "minecraft:resource_location", VOID ),
+                get( "minecraft:mob_effect", VOID ),
+                get( "minecraft:function", VOID ),
+                get( "minecraft:entity_anchor", VOID ),
+                get( "minecraft:int_range", VOID ),
+                get( "minecraft:float_range", VOID ),
+                get( "minecraft:item_enchantment", VOID ),
+                get( "minecraft:entity_summon", VOID ),
+                get( "minecraft:dimension", VOID ),
+                get( "minecraft:time", VOID ),
+                get( "minecraft:resource_or_tag", RAW_STRING ),
+                get( "minecraft:resource", RAW_STRING ),
+                get( "minecraft:template_mirror", VOID ),
+                get( "minecraft:template_rotation", VOID ),
+                get( "minecraft:uuid", VOID ),
+            };
+
+            IDS_1_19_3 = new ArgumentSerializer[]
+            {
+                get( "brigadier:bool", VOID ),
+                get( "brigadier:float", FLOAT_RANGE ),
+                get( "brigadier:double", DOUBLE_RANGE ),
+                get( "brigadier:integer", INTEGER_RANGE ),
+                get( "brigadier:long", LONG_RANGE ),
+                get( "brigadier:string", STRING ),
+                get( "minecraft:entity", BYTE ),
+                get( "minecraft:game_profile", VOID ),
+                get( "minecraft:block_pos", VOID ),
+                get( "minecraft:column_pos", VOID ),
+                get( "minecraft:vec3", VOID ),
+                get( "minecraft:vec2", VOID ),
+                get( "minecraft:block_state", VOID ),
+                get( "minecraft:block_predicate", VOID ),
+                get( "minecraft:item_stack", VOID ),
+                get( "minecraft:item_predicate", VOID ),
+                get( "minecraft:color", VOID ),
+                get( "minecraft:component", VOID ),
+                get( "minecraft:message", VOID ),
+                get( "minecraft:nbt_compound_tag", VOID ),
+                get( "minecraft:nbt_tag", VOID ),
+                get( "minecraft:nbt_path", VOID ),
+                get( "minecraft:objective", VOID ),
+                get( "minecraft:objective_criteria", VOID ),
+                get( "minecraft:operation", VOID ),
+                get( "minecraft:particle", VOID ),
+                get( "minecraft:angle", VOID ),
+                get( "minecraft:rotation", VOID ),
+                get( "minecraft:scoreboard_slot", VOID ),
+                get( "minecraft:score_holder", BYTE ),
+                get( "minecraft:swizzle", VOID ),
+                get( "minecraft:team", VOID ),
+                get( "minecraft:item_slot", VOID ),
+                get( "minecraft:resource_location", VOID ),
+                get( "minecraft:function", VOID ),
+                get( "minecraft:entity_anchor", VOID ),
+                get( "minecraft:int_range", VOID ),
+                get( "minecraft:float_range", VOID ),
+                get( "minecraft:dimension", VOID ),
+                get( "minecraft:gamemode", VOID ),
+                get( "minecraft:time", VOID ),
+                get( "minecraft:resource_or_tag", RAW_STRING ),
+                get( "minecraft:resource_or_tag_key", RAW_STRING ),
+                get( "minecraft:resource", RAW_STRING ),
+                get( "minecraft:resource_key", RAW_STRING ),
+                get( "minecraft:template_mirror", VOID ),
+                get( "minecraft:template_rotation", VOID ),
+                get( "minecraft:uuid", VOID )
+            };
+
+            IDS_1_19_4 = new ArgumentSerializer[]
+            {
+                get( "brigadier:bool", VOID ),
+                get( "brigadier:float", FLOAT_RANGE ),
+                get( "brigadier:double", DOUBLE_RANGE ),
+                get( "brigadier:integer", INTEGER_RANGE ),
+                get( "brigadier:long", LONG_RANGE ),
+                get( "brigadier:string", STRING ),
+                get( "minecraft:entity", BYTE ),
+                get( "minecraft:game_profile", VOID ),
+                get( "minecraft:block_pos", VOID ),
+                get( "minecraft:column_pos", VOID ),
+                get( "minecraft:vec3", VOID ),
+                get( "minecraft:vec2", VOID ),
+                get( "minecraft:block_state", VOID ),
+                get( "minecraft:block_predicate", VOID ),
+                get( "minecraft:item_stack", VOID ),
+                get( "minecraft:item_predicate", VOID ),
+                get( "minecraft:color", VOID ),
+                get( "minecraft:component", VOID ),
+                get( "minecraft:message", VOID ),
+                get( "minecraft:nbt_compound_tag", VOID ),
+                get( "minecraft:nbt_tag", VOID ),
+                get( "minecraft:nbt_path", VOID ),
+                get( "minecraft:objective", VOID ),
+                get( "minecraft:objective_criteria", VOID ),
+                get( "minecraft:operation", VOID ),
+                get( "minecraft:particle", VOID ),
+                get( "minecraft:angle", VOID ),
+                get( "minecraft:rotation", VOID ),
+                get( "minecraft:scoreboard_slot", VOID ),
+                get( "minecraft:score_holder", BYTE ),
+                get( "minecraft:swizzle", VOID ),
+                get( "minecraft:team", VOID ),
+                get( "minecraft:item_slot", VOID ),
+                get( "minecraft:resource_location", VOID ),
+                get( "minecraft:function", VOID ),
+                get( "minecraft:entity_anchor", VOID ),
+                get( "minecraft:int_range", VOID ),
+                get( "minecraft:float_range", VOID ),
+                get( "minecraft:dimension", VOID ),
+                get( "minecraft:gamemode", VOID ),
+                get( "minecraft:time", INTEGER ),
+                get( "minecraft:resource_or_tag", RAW_STRING ),
+                get( "minecraft:resource_or_tag_key", RAW_STRING ),
+                get( "minecraft:resource", RAW_STRING ),
+                get( "minecraft:resource_key", RAW_STRING ),
+                get( "minecraft:template_mirror", VOID ),
+                get( "minecraft:template_rotation", VOID ),
+                get( "minecraft:uuid", VOID ),
+                get( "minecraft:heightmap", VOID )
+            };
         }
 
-        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 );
+        }
+
+        private static ArgumentSerializer get(String name, ArgumentSerializer serializer)
+        {
+            return serializer;
+        }
+
+        private static ArgumentType<?> read(ByteBuf buf, int protocolVersion)
+        {
+            Object key;
+            ArgumentSerializer reader;
+
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+            {
+                key = readVarInt( buf );
+
+                if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_4 )
+                {
+                    reader = IDS_1_19_4[(Integer) key];
+                } else if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 )
+                {
+                    reader = IDS_1_19_3[(Integer) key];
+                } else
+                {
+                    reader = IDS_1_19[(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 );
             }
         }
@@ -583,7 +820,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;
 
@@ -605,6 +842,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 || protocolVersion >= ProtocolConstants.MINECRAFT_1_19_3 || 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 && protocolVersion <= ProtocolConstants.MINECRAFT_1_19_3 )
+            {
+                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;
+    }
 }