new event TabCompleteRequestEvent and deprecate TabCompleteEvent

Players with permission bungeecord.multiple_connect can have multiple connections with the same Minecraft account.
The UUID and player name is altered to avoid collision with other player:
UUID : xxxxxxxx-xxxx-VIxx-xxxx-xxxxxxxxxxxx
- The UUID version (V above) is now the provided version + 8 (for online player, it is 4, so it becomes C).
- The I digit will follow the index of the duplicated player : first duplicated player is 1, second one is 2.
- The name of the player will be the real player name, followed by the character "." (dot) followed by the duplication index.

Bedrock accounts connected using the Floodgate plugin will not be able to connect multiple times due to the risk of xUID collision.

.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/workflows/maven.yml

@@ -4,18 +4,20 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
+      fail-fast: false
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17]
 
     name: Java ${{ matrix.java }}
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+    - 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-2022 SpigotMC Pty. Ltd.

api/pom.xml

@@ -4,15 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.md-5</groupId>
+        <groupId>fr.pandacube.bungeecord</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.md-5</groupId>
     <artifactId>bungeecord-api</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-API</name>
@@ -20,25 +19,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>fr.pandacube.bungeecord</groupId>
             <artifactId>bungeecord-chat</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>fr.pandacube.bungeecord</groupId>
             <artifactId>bungeecord-config</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>fr.pandacube.bungeecord</groupId>
             <artifactId>bungeecord-event</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>fr.pandacube.bungeecord</groupId>
             <artifactId>bungeecord-protocol</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
@@ -49,10 +48,31 @@
             <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>1.33</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)

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/connection/ProxiedPlayer.java

@@ -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/TabCompleteEvent.java

@@ -9,7 +9,9 @@ import net.md_5.bungee.api.plugin.Cancellable;
 
 /**
  * Event called when a player uses tab completion.
+ * @deprecated please use {@link TabCompleteRequestEvent} to support 1.13+ suggestions.
  */
+@Deprecated
 @Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)

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

@@ -0,0 +1,85 @@
+package net.md_5.bungee.api.event;
+
+import com.google.common.base.Preconditions;
+import com.mojang.brigadier.context.StringRange;
+import com.mojang.brigadier.suggestion.Suggestions;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import net.md_5.bungee.api.connection.Connection;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Cancellable;
+import net.md_5.bungee.protocol.ProtocolConstants;
+
+/**
+ * Event called when a player uses tab completion.
+ */
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class TabCompleteRequestEvent extends TargetedEvent implements Cancellable
+{
+
+    /**
+     * Cancelled state.
+     */
+    private boolean cancelled;
+    /**
+     * The message the player has already entered.
+     */
+    private final String cursor;
+    /**
+     * Range corresponding to the last word of {@link #getCursor()}.
+     * If you want your suggestions to be compatible with 1.12 and older
+     * clients, you need to {@link #setSuggestions(Suggestions)} with
+     * a range equals to this one.
+     * For 1.13 and newer clients, any other range that cover any part of
+     * {@link #getCursor()} is fine.<br>
+     * To check if the client supports custom ranges, use
+     * {@link #supportsCustomRange()}.
+     */
+    private final StringRange legacyCompatibleRange;
+    /**
+     * The suggestions that will be sent to the client. If this list is empty,
+     * the request will be forwarded to the server.
+     */
+    private Suggestions suggestions;
+
+    public TabCompleteRequestEvent(Connection sender, Connection receiver, String cursor, StringRange legacyCompatibleRange, Suggestions suggestions)
+    {
+        super( sender, receiver );
+        this.cursor = cursor;
+        this.legacyCompatibleRange = legacyCompatibleRange;
+        this.suggestions = suggestions;
+    }
+
+    /**
+     * Sets the suggestions that will be sent to the client.
+     * If this list is empty, the request will be forwarded to the server.
+     * @param suggestions the new Suggestions. Cannot be null.
+     * @throws IllegalArgumentException if the client is on 1.12 or lower and
+     * {@code suggestions.getRange()} is not equals to {@link #legacyCompatibleRange}.
+     */
+    public void setSuggestions(Suggestions suggestions)
+    {
+        Preconditions.checkNotNull( suggestions );
+        Preconditions.checkArgument( supportsCustomRange() || legacyCompatibleRange.equals( suggestions.getRange() ),
+                "Clients on 1.12 or lower versions don't support the provided range for tab-completion: " + suggestions.getRange()
+                + ". Please use TabCompleteRequestEvent.getLegacyCompatibleRange() for legacy clients." );
+        this.suggestions = suggestions;
+    }
+
+    /**
+     * Convenient method to tell if the client supports custom range for
+     * suggestions.
+     * If the client is on 1.13 or above, this methods returns true, and any
+     * range can be used for {@link #setSuggestions(Suggestions)}. Otherwise,
+     * it returns false and the defined range must be equals to
+     * {@link #legacyCompatibleRange}.
+     * @return true if the client is on 1.13 or newer version, false otherwise.
+     */
+    public boolean supportsCustomRange()
+    {
+        return ( (ProxiedPlayer) getSender() ).getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13;
+    }
+}

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;
@@ -49,6 +51,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();
@@ -67,6 +71,17 @@ public final class PluginManager
         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 +324,7 @@ public final class PluginManager
                 status = false;
             }
 
+            dependencyGraph.putEdge( plugin.getName(), dependName );
             if ( !status )
             {
                 break;
@@ -320,10 +336,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 +348,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 +476,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;
+    }
 }

bootstrap/pom.xml

@@ -4,15 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.md-5</groupId>
+        <groupId>fr.pandacube.bungeecord</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.md-5</groupId>
     <artifactId>bungeecord-bootstrap</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Bootstrap</name>
@@ -21,14 +20,12 @@
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <maven.javadoc.skip>true</maven.javadoc.skip>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
         <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>fr.pandacube.bungeecord</groupId>
             <artifactId>bungeecord-proxy</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
@@ -79,4 +76,25 @@
             </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>
+    </profiles>
 </project>

chat/pom.xml

@@ -4,15 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.md-5</groupId>
+        <groupId>fr.pandacube.bungeecord</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.md-5</groupId>
     <artifactId>bungeecord-chat</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Chat</name>
@@ -22,7 +21,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.0</version>
+            <version>2.10</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 );
         }

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/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" ) )
@@ -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/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();
-        object.addProperty( "text", src.getText() );
-        if ( src.hasFormatting() || ( extra != null && !extra.isEmpty() ) )
-        {
         serialize( object, src, context );
-        }
+        object.addProperty( "text", src.getText() );
         return object;
     }
 }

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

@@ -41,7 +41,7 @@ public class ComponentsTest
         {
             textComponent
         } );
-        json = "{\"text\":\"Test\",\"hoverEvent\":{\"action\":\"show_item\",\"value\":[{\"text\":\"{id:\\\"minecraft:netherrack\\\",Count:47b}\"}]}}";
+        json = "{\"hoverEvent\":{\"action\":\"show_item\",\"value\":[{\"text\":\"{id:\\\"minecraft:netherrack\\\",Count:47b}\"}]},\"text\":\"Test\"}";
         testDissembleReassemble( json );
         //////////
         String hoverVal = "{\"text\":\"{id:\\\"minecraft:dirt\\\",Count:1b}\"}";
@@ -572,7 +572,37 @@ public class ComponentsTest
         Assert.assertArrayEquals( hexColored, reColored );
     }
 
-    private String fromAndToLegacyText(String legacyText)
+    /**
+     * In legacy chat, colors and reset both reset all formatting.
+     * Make sure it works in combination with ComponentBuilder.
+     */
+    @Test
+    public void testLegacyResetInBuilder()
+    {
+        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\":\"\"}";
+        Assert.assertEquals( expected, ComponentSerializer.toString( a ) );
+
+        builder.append( a );
+
+        String test1 = ComponentSerializer.toString( builder.create() );
+        Assert.assertEquals( expected, test1 );
+
+        BaseComponent[] b = TextComponent.fromLegacyText( "§rrrrr" );
+        builder.append( b );
+
+        String test2 = ComponentSerializer.toString( builder.create() );
+        Assert.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 ) );
     }

checkstyle.xml

@@ -33,6 +33,7 @@
 
         <!-- 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"/>
@@ -54,11 +55,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 +85,6 @@
         <module name="Indentation"/>
         <module name="UpperEll"/>
     </module>
+
+    <module name="SuppressWarningsFilter"/>
 </module>

config/pom.xml

@@ -4,15 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.md-5</groupId>
+        <groupId>fr.pandacube.bungeecord</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.md-5</groupId>
     <artifactId>bungeecord-config</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Config</name>
@@ -22,14 +21,14 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.0</version>
+            <version>2.10</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.26</version>
+            <version>1.33</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

event/pom.xml

@@ -4,15 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.md-5</groupId>
+        <groupId>fr.pandacube.bungeecord</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.md-5</groupId>
     <artifactId>bungeecord-event</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.19-R0.1-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/SubclassTest.java

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

log/pom.xml

@@ -4,15 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.md-5</groupId>
+        <groupId>fr.pandacube.bungeecord</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.md-5</groupId>
     <artifactId>bungeecord-log</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Log</name>
@@ -26,7 +25,7 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>fr.pandacube.bungeecord</groupId>
             <artifactId>bungeecord-chat</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>

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

@@ -1,20 +0,0 @@
-
-<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.16-R0.4-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>
-    <packaging>jar</packaging>
-
-    <name>cmd_alert</name>
-    <description>Provides the alert and alertraw commands</description>
-</project>

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

@@ -1,46 +0,0 @@
-package net.md_5.bungee.module.cmd.alert;
-
-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.plugin.Command;
-
-public class CommandAlert extends Command
-{
-
-    public CommandAlert()
-    {
-        super( "alert", "bungeecord.command.alert" );
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args)
-    {
-        if ( args.length == 0 )
-        {
-            sender.sendMessage( ProxyServer.getInstance().getTranslation( "message_needed" ) );
-        } else
-        {
-            StringBuilder builder = new StringBuilder();
-            if ( args[0].startsWith( "&h" ) )
-            {
-                // Remove &h
-                args[0] = args[0].substring( 2, args[0].length() );
-            } else
-            {
-                builder.append( ProxyServer.getInstance().getTranslation( "alert" ) );
-            }
-
-            for ( String s : args )
-            {
-                builder.append( ChatColor.translateAlternateColorCodes( '&', s ) );
-                builder.append( " " );
-            }
-
-            String message = builder.substring( 0, builder.length() - 1 );
-
-            ProxyServer.getInstance().broadcast( TextComponent.fromLegacyText( message ) );
-        }
-    }
-}

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

@@ -1,56 +0,0 @@
-package net.md_5.bungee.module.cmd.alert;
-
-import com.google.common.base.Joiner;
-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.ComponentBuilder;
-import net.md_5.bungee.api.chat.HoverEvent;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.plugin.Command;
-import net.md_5.bungee.chat.ComponentSerializer;
-
-public class CommandAlertRaw extends Command
-{
-
-    public CommandAlertRaw()
-    {
-        super( "alertraw", "bungeecord.command.alert" );
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args)
-    {
-        if ( args.length == 0 )
-        {
-            sender.sendMessage( ProxyServer.getInstance().getTranslation( "message_needed" ) );
-        } else
-        {
-            String message = Joiner.on( ' ' ).join( args );
-
-            try
-            {
-                ProxyServer.getInstance().broadcast( ComponentSerializer.parse( message ) );
-            } catch ( Exception e )
-            {
-                Throwable error = e;
-                while ( error.getCause() != null )
-                {
-                    error = error.getCause();
-                }
-                if ( sender instanceof ProxiedPlayer )
-                {
-                    sender.sendMessage( new ComponentBuilder( ProxyServer.getInstance().getTranslation( "error_occurred_player" ) )
-                            .event( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder( error.getMessage() )
-                                    .color( ChatColor.RED )
-                                    .create() ) )
-                            .create()
-                    );
-                } else
-                {
-                    sender.sendMessage( ProxyServer.getInstance().getTranslation( "error_occurred_console", error.getMessage() ) );
-                }
-            }
-        }
-    }
-}

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

@@ -1,14 +0,0 @@
-package net.md_5.bungee.module.cmd.alert;
-
-import net.md_5.bungee.api.plugin.Plugin;
-
-public class PluginAlert extends Plugin
-{
-
-    @Override
-    public void onEnable()
-    {
-        getProxy().getPluginManager().registerCommand( this, new CommandAlert() );
-        getProxy().getPluginManager().registerCommand( this, new CommandAlertRaw() );
-    }
-}

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

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

module/cmd-find/nb-configuration.xml

@@ -1,31 +0,0 @@
-<?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-find/pom.xml

@@ -1,20 +0,0 @@
-
-<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.16-R0.4-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>
-    <packaging>jar</packaging>
-
-    <name>cmd_find</name>
-    <description>Provides the find command</description>
-</project>

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

@@ -1,34 +0,0 @@
-package net.md_5.bungee.module.cmd.find;
-
-import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.command.PlayerCommand;
-
-public class CommandFind extends PlayerCommand
-{
-
-    public CommandFind()
-    {
-        super( "find", "bungeecord.command.find" );
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args)
-    {
-        if ( args.length != 1 )
-        {
-            sender.sendMessage( ProxyServer.getInstance().getTranslation( "username_needed" ) );
-        } else
-        {
-            ProxiedPlayer player = ProxyServer.getInstance().getPlayer( args[0] );
-            if ( player == null || player.getServer() == null )
-            {
-                sender.sendMessage( ProxyServer.getInstance().getTranslation( "user_not_online" ) );
-            } else
-            {
-                sender.sendMessage( ProxyServer.getInstance().getTranslation( "user_online_at", player.getName(), player.getServer().getInfo().getName() ) );
-            }
-        }
-    }
-}

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

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

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

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

module/cmd-list/nb-configuration.xml

@@ -1,31 +0,0 @@
-<?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-list/pom.xml

@@ -1,20 +0,0 @@
-
-<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.16-R0.4-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>
-    <packaging>jar</packaging>
-
-    <name>cmd_list</name>
-    <description>Provides the glist command</description>
-</project>

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

@@ -1,47 +0,0 @@
-package net.md_5.bungee.module.cmd.list;
-
-import java.util.ArrayList;
-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;
-
-/**
- * Command to list all players connected to the proxy.
- */
-public class CommandList extends Command
-{
-
-    public CommandList()
-    {
-        super( "glist", "bungeecord.command.list" );
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args)
-    {
-        for ( ServerInfo server : ProxyServer.getInstance().getServers().values() )
-        {
-            if ( !server.canAccess( sender ) )
-            {
-                continue;
-            }
-
-            List<String> players = new ArrayList<>();
-            for ( ProxiedPlayer player : server.getPlayers() )
-            {
-                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( "total_players", ProxyServer.getInstance().getOnlineCount() ) );
-    }
-}

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

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

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

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

module/cmd-send/nb-configuration.xml

@@ -1,31 +0,0 @@
-<?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-send/pom.xml

@@ -1,20 +0,0 @@
-
-<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.16-R0.4-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>
-    <packaging>jar</packaging>
-
-    <name>cmd_send</name>
-    <description>Provides the gsend command</description>
-</project>

module/cmd-send/src/main/java/net/md_5/bungee/module/cmd/send/CommandSend.java

@@ -1,200 +0,0 @@
-package net.md_5.bungee.module.cmd.send;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import net.md_5.bungee.api.Callback;
-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.ServerConnectRequest;
-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.api.event.ServerConnectEvent;
-import net.md_5.bungee.api.plugin.Command;
-import net.md_5.bungee.api.plugin.TabExecutor;
-
-public class CommandSend extends Command implements TabExecutor
-{
-
-    protected static class SendCallback
-    {
-
-        private final Map<ServerConnectRequest.Result, List<String>> results = new HashMap<>();
-        private final CommandSender sender;
-        private int count = 0;
-
-        public SendCallback(CommandSender sender)
-        {
-            this.sender = sender;
-            for ( ServerConnectRequest.Result result : ServerConnectRequest.Result.values() )
-            {
-                results.put( result, new ArrayList<String>() );
-            }
-        }
-
-        public void lastEntryDone()
-        {
-            sender.sendMessage( ChatColor.GREEN.toString() + ChatColor.BOLD + "Send Results:" );
-            for ( Map.Entry<ServerConnectRequest.Result, List<String>> entry : results.entrySet() )
-            {
-                ComponentBuilder builder = new ComponentBuilder( "" );
-                if ( !entry.getValue().isEmpty() )
-                {
-                    builder.event( new HoverEvent( HoverEvent.Action.SHOW_TEXT,
-                            new ComponentBuilder( Joiner.on( ", " ).join( entry.getValue() ) ).color( ChatColor.YELLOW ).create() ) );
-                }
-                builder.append( entry.getKey().name() + ": " ).color( ChatColor.GREEN );
-                builder.append( "" + entry.getValue().size() ).bold( true );
-                sender.sendMessage( builder.create() );
-            }
-        }
-
-        public static class Entry implements Callback<ServerConnectRequest.Result>
-        {
-
-            private final SendCallback callback;
-            private final ProxiedPlayer player;
-            private final ServerInfo target;
-
-            public Entry(SendCallback callback, ProxiedPlayer player, ServerInfo target)
-            {
-                this.callback = callback;
-                this.player = player;
-                this.target = target;
-                this.callback.count++;
-            }
-
-            @Override
-            public void done(ServerConnectRequest.Result result, Throwable error)
-            {
-                callback.results.get( result ).add( player.getName() );
-                if ( result == ServerConnectRequest.Result.SUCCESS )
-                {
-                    player.sendMessage( ProxyServer.getInstance().getTranslation( "you_got_summoned", target.getName(), callback.sender.getName() ) );
-                }
-
-                if ( --callback.count == 0 )
-                {
-                    callback.lastEntryDone();
-                }
-            }
-        }
-    }
-
-    public CommandSend()
-    {
-        super( "send", "bungeecord.command.send" );
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args)
-    {
-        if ( args.length != 2 )
-        {
-            sender.sendMessage( ProxyServer.getInstance().getTranslation( "send_cmd_usage" ) );
-            return;
-        }
-        ServerInfo server = ProxyServer.getInstance().getServerInfo( args[1] );
-        if ( server == null )
-        {
-            sender.sendMessage( ProxyServer.getInstance().getTranslation( "no_server" ) );
-            return;
-        }
-
-        List<ProxiedPlayer> targets;
-        if ( args[0].equalsIgnoreCase( "all" ) )
-        {
-            targets = new ArrayList<>( ProxyServer.getInstance().getPlayers() );
-        } else if ( args[0].equalsIgnoreCase( "current" ) )
-        {
-            if ( !( sender instanceof ProxiedPlayer ) )
-            {
-                sender.sendMessage( ProxyServer.getInstance().getTranslation( "player_only" ) );
-                return;
-            }
-            ProxiedPlayer player = (ProxiedPlayer) sender;
-            targets = new ArrayList<>( player.getServer().getInfo().getPlayers() );
-        } else
-        {
-            // If we use a server name, send the entire server. This takes priority over players.
-            ServerInfo serverTarget = ProxyServer.getInstance().getServerInfo( args[0] );
-            if ( serverTarget != null )
-            {
-                targets = new ArrayList<>( serverTarget.getPlayers() );
-            } else
-            {
-                ProxiedPlayer player = ProxyServer.getInstance().getPlayer( args[0] );
-                if ( player == null )
-                {
-                    sender.sendMessage( ProxyServer.getInstance().getTranslation( "user_not_online" ) );
-                    return;
-                }
-                targets = Collections.singletonList( player );
-            }
-        }
-
-        final SendCallback callback = new SendCallback( sender );
-        for ( ProxiedPlayer player : targets )
-        {
-            ServerConnectRequest request = ServerConnectRequest.builder()
-                    .target( server )
-                    .reason( ServerConnectEvent.Reason.COMMAND )
-                    .callback( new SendCallback.Entry( callback, player, server ) )
-                    .build();
-            player.connect( request );
-        }
-
-        sender.sendMessage( ChatColor.DARK_GREEN + "Attempting to send " + targets.size() + " players to " + server.getName() );
-    }
-
-    @Override
-    public Iterable<String> onTabComplete(CommandSender sender, String[] args)
-    {
-        if ( args.length > 2 || args.length == 0 )
-        {
-            return ImmutableSet.of();
-        }
-
-        Set<String> matches = new HashSet<>();
-        if ( args.length == 1 )
-        {
-            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() );
-                }
-            }
-            if ( "all".startsWith( search ) )
-            {
-                matches.add( "all" );
-            }
-            if ( "current".startsWith( search ) )
-            {
-                matches.add( "current" );
-            }
-        } else
-        {
-            String search = args[1].toLowerCase( Locale.ROOT );
-            for ( String server : ProxyServer.getInstance().getServers().keySet() )
-            {
-                if ( server.toLowerCase( Locale.ROOT ).startsWith( search ) )
-                {
-                    matches.add( server );
-                }
-            }
-        }
-        return matches;
-    }
-}

module/cmd-send/src/main/java/net/md_5/bungee/module/cmd/send/PluginSend.java

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

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

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

module/cmd-server/nb-configuration.xml

@@ -1,31 +0,0 @@
-<?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-server/pom.xml

@@ -1,20 +0,0 @@
-
-<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.16-R0.4-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>
-    <packaging>jar</packaging>
-
-    <name>cmd_server</name>
-    <description>Provides the server command</description>
-</project>

module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java

@@ -1,104 +0,0 @@
-package net.md_5.bungee.module.cmd.server;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Map;
-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.chat.TextComponent;
-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 net.md_5.bungee.api.plugin.Command;
-import net.md_5.bungee.api.plugin.TabExecutor;
-
-/**
- * Command to list and switch a player between available servers.
- */
-public class CommandServer extends Command implements TabExecutor
-{
-
-    public CommandServer()
-    {
-        super( "server", "bungeecord.command.server" );
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args)
-    {
-        Map<String, ServerInfo> servers = ProxyServer.getInstance().getServers();
-        if ( args.length == 0 )
-        {
-            if ( sender instanceof ProxiedPlayer )
-            {
-                sender.sendMessage( ProxyServer.getInstance().getTranslation( "current_server", ( (ProxiedPlayer) sender ).getServer().getInfo().getName() ) );
-            }
-
-            ComponentBuilder serverList = new ComponentBuilder().appendLegacy( ProxyServer.getInstance().getTranslation( "server_list" ) );
-            boolean first = true;
-            for ( ServerInfo server : servers.values() )
-            {
-                if ( server.canAccess( sender ) )
-                {
-                    TextComponent serverTextComponent = new TextComponent( first ? server.getName() : ", " + server.getName() );
-                    int count = server.getPlayers().size();
-                    serverTextComponent.setHoverEvent( new HoverEvent(
-                            HoverEvent.Action.SHOW_TEXT,
-                            new ComponentBuilder( count + ( count == 1 ? " player" : " players" ) + "\n" ).appendLegacy( ProxyServer.getInstance().getTranslation( "click_to_connect" ) ).create() )
-                    );
-                    serverTextComponent.setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, "/server " + server.getName() ) );
-                    serverList.append( serverTextComponent );
-                    first = false;
-                }
-            }
-            sender.sendMessage( serverList.create() );
-        } else
-        {
-            if ( !( sender instanceof ProxiedPlayer ) )
-            {
-                return;
-            }
-            ProxiedPlayer player = (ProxiedPlayer) sender;
-
-            ServerInfo server = servers.get( args[0] );
-            if ( server == null )
-            {
-                player.sendMessage( ProxyServer.getInstance().getTranslation( "no_server" ) );
-            } else if ( !server.canAccess( player ) )
-            {
-                player.sendMessage( ProxyServer.getInstance().getTranslation( "no_server_permission" ) );
-            } else
-            {
-                player.connect( server, ServerConnectEvent.Reason.COMMAND );
-            }
-        }
-    }
-
-    @Override
-    public Iterable<String> onTabComplete(final CommandSender sender, final String[] args)
-    {
-        return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServers().values(), new Predicate<ServerInfo>()
-        {
-            private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
-
-            @Override
-            public boolean apply(ServerInfo input)
-            {
-                return input.getName().toLowerCase( Locale.ROOT ).startsWith( lower ) && input.canAccess( sender );
-            }
-        } ), new Function<ServerInfo, String>()
-        {
-            @Override
-            public String apply(ServerInfo input)
-            {
-                return input.getName();
-            }
-        } );
-    }
-}

module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/PluginServer.java

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

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

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

module/pom.xml

@@ -1,54 +0,0 @@
-
-<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-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <groupId>net.md-5</groupId>
-    <artifactId>bungeecord-module</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>BungeeCord Modules</name>
-    <description>Parent project for all BungeeCord modules.</description>
-
-    <modules>
-        <module>cmd-alert</module>
-        <module>cmd-find</module>
-        <module>cmd-list</module>
-        <module>cmd-send</module>
-        <module>cmd-server</module>
-        <module>reconnect-yaml</module>
-    </modules>
-
-    <properties>
-        <module.author>SpigotMC</module.author>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.name}</finalName>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
-</project>

module/reconnect-yaml/nb-configuration.xml

@@ -1,31 +0,0 @@
-<?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/reconnect-yaml/pom.xml

@@ -1,20 +0,0 @@
-
-<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.16-R0.4-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>
-    <packaging>jar</packaging>
-
-    <name>reconnect_yaml</name>
-    <description>Provides reconnect location functionality in locations.yml</description>
-</project>

module/reconnect-yaml/src/main/java/net/md_5/bungee/module/reconnect/yaml/PluginYaml.java

@@ -1,22 +0,0 @@
-package net.md_5.bungee.module.reconnect.yaml;
-
-import net.md_5.bungee.api.config.ListenerInfo;
-import net.md_5.bungee.api.plugin.Plugin;
-
-public class PluginYaml extends Plugin
-{
-
-    @Override
-    public void onEnable()
-    {
-        // TODO: Abstract this for other reconnect modules
-        for ( ListenerInfo info : getProxy().getConfig().getListeners() )
-        {
-            if ( !info.isForceDefault() && getProxy().getReconnectHandler() == null )
-            {
-                getProxy().setReconnectHandler( new YamlReconnectHandler() );
-                break;
-            }
-        }
-    }
-}

module/reconnect-yaml/src/main/java/net/md_5/bungee/module/reconnect/yaml/YamlReconnectHandler.java

@@ -1,115 +0,0 @@
-package net.md_5.bungee.module.reconnect.yaml;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.logging.Level;
-import net.md_5.bungee.api.AbstractReconnectHandler;
-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.util.CaseInsensitiveMap;
-import org.yaml.snakeyaml.Yaml;
-
-public class YamlReconnectHandler extends AbstractReconnectHandler
-{
-
-    private final Yaml yaml = new Yaml();
-    private final File file = new File( "locations.yml" );
-    private final ReadWriteLock lock = new ReentrantReadWriteLock();
-    /*========================================================================*/
-    private CaseInsensitiveMap<String> data;
-
-    @SuppressWarnings("unchecked")
-    public YamlReconnectHandler()
-    {
-        try
-        {
-            file.createNewFile();
-            try ( FileReader rd = new FileReader( file ) )
-            {
-                Map map = yaml.loadAs( rd, Map.class );
-                if ( map != null )
-                {
-                    data = new CaseInsensitiveMap<>( map );
-                }
-            }
-        } catch ( Exception ex )
-        {
-            file.renameTo( new File( "locations.yml.old" ) );
-            ProxyServer.getInstance().getLogger().log( Level.WARNING, "Could not load reconnect locations, resetting them" );
-        }
-
-        if ( data == null )
-        {
-            data = new CaseInsensitiveMap<>();
-        }
-    }
-
-    @Override
-    protected ServerInfo getStoredServer(ProxiedPlayer player)
-    {
-        ServerInfo server = null;
-        lock.readLock().lock();
-        try
-        {
-            server = ProxyServer.getInstance().getServerInfo( data.get( key( player ) ) );
-        } finally
-        {
-            lock.readLock().unlock();
-        }
-        return server;
-    }
-
-    @Override
-    public void setServer(ProxiedPlayer player)
-    {
-        lock.writeLock().lock();
-        try
-        {
-            data.put( key( player ), ( player.getReconnectServer() != null ) ? player.getReconnectServer().getName() : player.getServer().getInfo().getName() );
-        } finally
-        {
-            lock.writeLock().unlock();
-        }
-    }
-
-    private String key(ProxiedPlayer player)
-    {
-        InetSocketAddress host = player.getPendingConnection().getVirtualHost();
-        return player.getName() + ";" + host.getHostString() + ":" + host.getPort();
-    }
-
-    @Override
-    public void save()
-    {
-        Map<String, String> copy = new HashMap<>();
-        lock.readLock().lock();
-        try
-        {
-            copy.putAll( data );
-        } finally
-        {
-            lock.readLock().unlock();
-        }
-
-        try ( FileWriter wr = new FileWriter( file ) )
-        {
-            yaml.dump( copy, wr );
-        } catch ( IOException ex )
-        {
-            ProxyServer.getInstance().getLogger().log( Level.WARNING, "Could not save reconnect locations", ex );
-        }
-    }
-
-    @Override
-    public void close()
-    {
-    }
-}

module/reconnect-yaml/src/main/resources/plugin.yml

@@ -1,5 +0,0 @@
-name: ${project.name}
-main: net.md_5.bungee.module.reconnect.yaml.PluginYaml
-version: ${describe}
-description: ${project.description}
-author: ${module.author}

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

@@ -4,15 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.md-5</groupId>
+        <groupId>fr.pandacube.bungeecord</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.md-5</groupId>
     <artifactId>bungeecord-native</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Native</name>

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()
+    {
+        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

@@ -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

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

@@ -15,7 +15,7 @@ import org.junit.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

pom.xml

@@ -3,9 +3,9 @@
          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>
 
-    <groupId>net.md-5</groupId>
+    <groupId>fr.pandacube.bungeecord</groupId>
     <artifactId>bungeecord-parent</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord-Parent</name>
@@ -37,10 +37,10 @@
         <module>config</module>
         <module>event</module>
         <module>log</module>
-        <module>module</module>
         <module>protocol</module>
         <module>proxy</module>
         <module>query</module>
+        <module>slf4j</module>
         <module>native</module>
     </modules>
 
@@ -71,7 +71,8 @@
 
     <properties>
         <build.number>unknown</build.number>
-        <netty.version>4.1.53.Final</netty.version>
+        <lombok.version>1.18.22</lombok.version>
+        <netty.version>4.1.85.Final</netty.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -81,13 +82,13 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>21.0</version>
+            <version>31.1-jre</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -99,7 +100,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -111,7 +112,7 @@
                 <artifactId>scriptus</artifactId>
                 <version>0.4.1</version>
                 <configuration>
-                    <format>git:${project.name}:${project.version}:%s:${build.number}</format>
+                    <format>git:${project.name}-Pandacube:${project.version}:%s:${build.number}</format>
                 </configuration>
                 <executions>
                     <execution>
@@ -122,10 +123,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.2</version>
                 <executions>
                     <execution>
                         <phase>process-classes</phase>
@@ -143,14 +149,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.20</version>
                 <executions>
                     <execution>
                         <phase>process-classes</phase>
@@ -171,6 +177,53 @@
     </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>
@@ -191,7 +244,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,6 +258,13 @@
                             <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>

protocol/pom.xml

@@ -4,15 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.md-5</groupId>
+        <groupId>fr.pandacube.bungeecord</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.16-R0.4-SNAPSHOT</version>
+        <version>1.19-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.md-5</groupId>
     <artifactId>bungeecord-protocol</artifactId>
-    <version>1.16-R0.4-SNAPSHOT</version>
+    <version>1.19-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Protocol</name>
@@ -41,7 +40,7 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>fr.pandacube.bungeecord</groupId>
             <artifactId>bungeecord-chat</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>

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

@@ -2,6 +2,9 @@ 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;
@@ -22,18 +25,24 @@ 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.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 +84,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 +116,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 +156,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 +219,8 @@ public abstract class AbstractPacketHandler
     public void handle(GameState gameState) throws Exception
     {
     }
+
+    public void handle(ServerData serverData) 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,6 +9,9 @@ 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;
@@ -21,35 +24,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)
     {
-            throw new OverflowPacketException( String.format( "Cannot send string longer than Short.MAX_VALUE (got %s characters)", s.length() ) );
+        if ( s.length() > maxLength )
+        {
+            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)
     {
-        int len = readVarInt( buf );
-        if ( len > Short.MAX_VALUE )
-        {
-            throw new OverflowPacketException( String.format( "Cannot receive string longer than Short.MAX_VALUE (got %s characters)", len ) );
+        return readString( buf, Short.MAX_VALUE );
     }
 
-        byte[] b = new byte[ len ];
-        buf.readBytes( b );
+    public static String readString(ByteBuf buf, int maxLen)
+    {
+        int len = readVarInt( buf );
+        if ( len > maxLen * 3 )
+        {
+            throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
+        }
 
-        return new String( b, Charsets.UTF_8 );
+        String s = buf.toString( buf.readerIndex(), len, Charsets.UTF_8 );
+        buf.readerIndex( buf.readerIndex() + len );
+
+        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 +96,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,6 +226,73 @@ public abstract class DefinedPacket
         return new UUID( input.readLong(), input.readLong() );
     }
 
+    public static void writeProperties(Property[] properties, ByteBuf buf)
+    {
+        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)
     {
         Tag tag = NamedTag.read( new DataInputStream( new ByteBufInputStream( input ) ) );
@@ -221,6 +311,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" );

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

@@ -41,7 +41,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/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,11 +6,14 @@ 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;
@@ -28,18 +31,24 @@ 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.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 +61,7 @@ public enum Protocol
         {
             TO_SERVER.registerPacket(
                     Handshake.class,
+                    Handshake::new,
                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
             );
         }
@@ -63,33 +73,46 @@ 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 )
             );
             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 )
             );
-            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 +121,24 @@ 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 )
             );
             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 )
             );
             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 +146,159 @@ 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 )
             );
             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 )
             );
             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 )
             );
             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 )
             );
             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 )
             );
             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 )
             );
             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 )
             );
             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 )
+            );
+            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 )
+            );
+            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 )
+            );
+            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 )
+            );
+            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 )
             );
             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 +307,153 @@ 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 )
             );
             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 )
             );
             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 )
             );
             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 )
             );
             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 )
+            );
+            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 )
+            );
+            TO_CLIENT.registerPacket(
+                    PlayerListItemRemove.class,
+                    PlayerListItemRemove::new,
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x35 )
+            );
+            TO_CLIENT.registerPacket(
+                    PlayerListItemUpdate.class,
+                    PlayerListItemUpdate::new,
+                    map( ProtocolConstants.MINECRAFT_1_19_3, 0x36 )
             );
 
             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 )
             );
-            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 )
             );
             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 )
             );
             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 )
             );
         }
     },
@@ -291,19 +464,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,35 +492,43 @@ 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 )
             );
         }
@@ -394,7 +579,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
@@ -448,27 +634,17 @@ 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
-            {
-                return ( constructor == null ) ? null : constructor.newInstance();
-            } catch ( ReflectiveOperationException ex )
-            {
-                throw new BadPacketException( "Could not construct packet with id " + id, ex );
-            }
+            Supplier<? extends DefinedPacket> constructor = protocolData.packetConstructors[id];
+            return ( constructor == null ) ? null : constructor.get();
         }
 
-        private void registerPacket(Class<? extends DefinedPacket> packetClass, ProtocolMapping... mappings)
+        private void registerPacket(Class<? extends DefinedPacket> packetClass, Supplier<? extends DefinedPacket> constructor, ProtocolMapping... mappings)
         {
-            try
-            {
-                Constructor<? extends DefinedPacket> constructor = packetClass.getDeclaredConstructor();
-
             int mappingIndex = 0;
             ProtocolMapping mapping = mappings[mappingIndex];
             for ( int protocol : ProtocolConstants.SUPPORTED_VERSION_IDS )
@@ -483,6 +659,7 @@ public enum Protocol
                 {
                     // 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 );
@@ -492,14 +669,15 @@ public enum Protocol
                     }
                 }
 
+                if ( mapping.packetID < 0 )
+                {
+                    break;
+                }
+
                 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 );
-            }
         }
 
         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,7 +34,19 @@ 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(
+    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 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",
@@ -42,9 +55,12 @@ public class ProtocolConstants
                 "1.13.x",
                 "1.14.x",
                 "1.15.x",
-            "1.16.x"
+                "1.16.x",
+                "1.17.x",
+                "1.18.x",
+                "1.19.x"
         );
-    public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
+        ImmutableList.Builder<Integer> supportedVersionIds = ImmutableList.<Integer>builder().add(
                 ProtocolConstants.MINECRAFT_1_8,
                 ProtocolConstants.MINECRAFT_1_9,
                 ProtocolConstants.MINECRAFT_1_9_1,
@@ -71,9 +87,26 @@ public class ProtocolConstants
                 ProtocolConstants.MINECRAFT_1_16_1,
                 ProtocolConstants.MINECRAFT_1_16_2,
                 ProtocolConstants.MINECRAFT_1_16_3,
-            ProtocolConstants.MINECRAFT_1_16_4
+                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
         );
 
+        if ( SNAPSHOT_SUPPORT )
+        {
+            // supportedVersions.add( "1.19.x" );
+            // supportedVersionIds.add( ProtocolConstants.MINECRAFT_1_19 );
+        }
+
+        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/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 );
+        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

@@ -58,7 +58,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 ];
@@ -81,9 +81,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 )
                     {
@@ -310,8 +308,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 Map<Class<?>, ProperArgumentSerializer<?>> PROPER_PROVIDERS = new HashMap<>();
-        private static final Map<String, ProtocolConversionProvider> CONVERSION_PROVIDERS = new HashMap<>();
         //
         private static final ArgumentSerializer<Void> VOID = new ArgumentSerializer<Void>()
         {
@@ -339,6 +338,12 @@ public class Commands extends DefinedPacket
             {
             }
 
+            @Override
+            protected int getIntKey()
+            {
+                return 0;
+            }
+
             @Override
             protected String getKey()
             {
@@ -388,6 +393,12 @@ public class Commands extends DefinedPacket
                 }
             }
 
+            @Override
+            protected int getIntKey()
+            {
+                return 1;
+            }
+
             @Override
             protected String getKey()
             {
@@ -423,6 +434,12 @@ public class Commands extends DefinedPacket
                 }
             }
 
+            @Override
+            protected int getIntKey()
+            {
+                return 2;
+            }
+
             @Override
             protected String getKey()
             {
@@ -458,6 +475,12 @@ public class Commands extends DefinedPacket
                 }
             }
 
+            @Override
+            protected int getIntKey()
+            {
+                return 3;
+            }
+
             @Override
             protected String getKey()
             {
@@ -493,6 +516,12 @@ public class Commands extends DefinedPacket
                 }
             }
 
+            @Override
+            protected int getIntKey()
+            {
+                return 4;
+            }
+
             @Override
             protected String getKey()
             {
@@ -524,141 +553,214 @@ 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", BOOLEAN );
+            register( "brigadier:bool", BOOLEAN );
             PROPER_PROVIDERS.put( BoolArgumentType.class, BOOLEAN );
 
-            PROVIDERS.put( "brigadier:float", FLOAT );
+            register( "brigadier:float", FLOAT );
             PROPER_PROVIDERS.put( FloatArgumentType.class, FLOAT );
 
-            PROVIDERS.put( "brigadier:double", DOUBLE );
+            register( "brigadier:double", DOUBLE );
             PROPER_PROVIDERS.put( DoubleArgumentType.class, DOUBLE );
 
-            PROVIDERS.put( "brigadier:integer", INTEGER );
+            register( "brigadier:integer", INTEGER );
             PROPER_PROVIDERS.put( IntegerArgumentType.class, INTEGER );
 
-            PROVIDERS.put( "brigadier:long", LONG ); // 1.14+
+            register( "brigadier:long", LONG ); // 1.14+
             PROPER_PROVIDERS.put( LongArgumentType.class, LONG );
-            CONVERSION_PROVIDERS.put( "brigadier:long", ( originalType, protocolVersion ) ->
-            {
-                if ( protocolVersion < ProtocolConstants.MINECRAFT_1_14 )
-                {
-                    LongArgumentType type = (LongArgumentType) originalType;
-                    int min = (int) Math.max( Integer.MIN_VALUE, Math.min( Integer.MAX_VALUE, type.getMinimum() ) );
-                    int max = (int) Math.max( Integer.MIN_VALUE, Math.min( Integer.MAX_VALUE, type.getMaximum() ) );
-                    return IntegerArgumentType.integer( min, max );
-                }
-                return originalType;
-            } );
 
-            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 );
+            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:template_mirror", VOID ); // 1.19
+            register( "minecraft:template_rotation", VOID ); // 1.19
+            register( "minecraft:uuid", VOID ); // 1.16
 
-            PROVIDERS.put( "minecraft:nbt_compound_tag", VOID ); // 1.14+, replaces minecraft:nbt
-            CONVERSION_PROVIDERS.put( "minecraft:nbt_compound_tag", ( originalType, protocolVersion ) ->
+            register( "minecraft:gamemode", VOID ); // 1.19.3
+            register( "minecraft:resource_or_tag_key", RAW_STRING ); // 1.19.3
+            register( "minecraft:resource_key", RAW_STRING ); // 1.19.3
+
+            register( "minecraft:nbt", VOID ); // 1.13 // removed
+            IDS_1_19 = new ArgumentSerializer[]
             {
-                if ( protocolVersion < ProtocolConstants.MINECRAFT_1_14 )
+                get( "brigadier:bool" ),
+                get( "brigadier:float" ),
+                get( "brigadier:double" ),
+                get( "brigadier:integer" ),
+                get( "brigadier:long" ),
+                get( "brigadier:string" ),
+                get( "minecraft:entity" ),
+                get( "minecraft:game_profile" ),
+                get( "minecraft:block_pos" ),
+                get( "minecraft:column_pos" ),
+                get( "minecraft:vec3" ),
+                get( "minecraft:vec2" ),
+                get( "minecraft:block_state" ),
+                get( "minecraft:block_predicate" ),
+                get( "minecraft:item_stack" ),
+                get( "minecraft:item_predicate" ),
+                get( "minecraft:color" ),
+                get( "minecraft:component" ),
+                get( "minecraft:message" ),
+                get( "minecraft:nbt_compound_tag" ),
+                get( "minecraft:nbt_tag" ),
+                get( "minecraft:nbt_path" ),
+                get( "minecraft:objective" ),
+                get( "minecraft:objective_criteria" ),
+                get( "minecraft:operation" ),
+                get( "minecraft:particle" ),
+                get( "minecraft:angle" ),
+                get( "minecraft:rotation" ),
+                get( "minecraft:scoreboard_slot" ),
+                get( "minecraft:score_holder" ),
+                get( "minecraft:swizzle" ),
+                get( "minecraft:team" ),
+                get( "minecraft:item_slot" ),
+                get( "minecraft:resource_location" ),
+                get( "minecraft:mob_effect" ),
+                get( "minecraft:function" ),
+                get( "minecraft:entity_anchor" ),
+                get( "minecraft:int_range" ),
+                get( "minecraft:float_range" ),
+                get( "minecraft:item_enchantment" ),
+                get( "minecraft:entity_summon" ),
+                get( "minecraft:dimension" ),
+                get( "minecraft:time" ),
+                get( "minecraft:resource_or_tag" ),
+                get( "minecraft:resource" ),
+                get( "minecraft:template_mirror" ),
+                get( "minecraft:template_rotation" ),
+                get( "minecraft:uuid" )
+            };
+
+            IDS_1_19_3 = new ArgumentSerializer[]
             {
-                    return minecraftNBT();
+                get( "brigadier:bool" ),
+                get( "brigadier:float" ),
+                get( "brigadier:double" ),
+                get( "brigadier:integer" ),
+                get( "brigadier:long" ),
+                get( "brigadier:string" ),
+                get( "minecraft:entity" ),
+                get( "minecraft:game_profile" ),
+                get( "minecraft:block_pos" ),
+                get( "minecraft:column_pos" ),
+                get( "minecraft:vec3" ),
+                get( "minecraft:vec2" ),
+                get( "minecraft:block_state" ),
+                get( "minecraft:block_predicate" ),
+                get( "minecraft:item_stack" ),
+                get( "minecraft:item_predicate" ),
+                get( "minecraft:color" ),
+                get( "minecraft:component" ),
+                get( "minecraft:message" ),
+                get( "minecraft:nbt_compound_tag" ),
+                get( "minecraft:nbt_tag" ),
+                get( "minecraft:nbt_path" ),
+                get( "minecraft:objective" ),
+                get( "minecraft:objective_criteria" ),
+                get( "minecraft:operation" ),
+                get( "minecraft:particle" ),
+                get( "minecraft:angle" ),
+                get( "minecraft:rotation" ),
+                get( "minecraft:scoreboard_slot" ),
+                get( "minecraft:score_holder" ),
+                get( "minecraft:swizzle" ),
+                get( "minecraft:team" ),
+                get( "minecraft:item_slot" ),
+                get( "minecraft:resource_location" ),
+                get( "minecraft:function" ),
+                get( "minecraft:entity_anchor" ),
+                get( "minecraft:int_range" ),
+                get( "minecraft:float_range" ),
+                get( "minecraft:dimension" ),
+                get( "minecraft:gamemode" ),
+                get( "minecraft:time" ),
+                get( "minecraft:resource_or_tag" ),
+                get( "minecraft:resource_or_tag_key" ),
+                get( "minecraft:resource" ),
+                get( "minecraft:resource_key" ),
+                get( "minecraft:template_mirror" ),
+                get( "minecraft:template_rotation" ),
+                get( "minecraft:uuid" )
+            };
         }
-                return originalType;
-            } );
 
-            PROVIDERS.put( "minecraft:nbt_tag", VOID ); // 1.14+
-            CONVERSION_PROVIDERS.put( "minecraft:nbt_tag", ( originalType, protocolVersion ) ->
+        private static void register(String name, ArgumentSerializer serializer)
         {
-                if ( protocolVersion < ProtocolConstants.MINECRAFT_1_14 )
-                {
-                    return minecraftNBT();
+            PROVIDERS.put( name, serializer );
         }
-                return originalType;
-            } );
 
-            PROVIDERS.put( "minecraft:nbt", VOID ); // 1.13
-            CONVERSION_PROVIDERS.put( "minecraft:nbt", ( originalType, protocolVersion ) ->
+        private static ArgumentSerializer get(String name)
         {
-                if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_14 )
-                {
-                    return minecraftNBTCompoundTag();
-                }
-                return originalType;
-            } );
-
-            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+
-            CONVERSION_PROVIDERS.put( "minecraft:time", ( originalType, protocolVersion ) ->
-            {
-                if ( protocolVersion < ProtocolConstants.MINECRAFT_1_14 )
-                {
-                    return StringArgumentType.word();
-                }
-                return originalType;
-            } );
-
-            PROVIDERS.put( "minecraft:uuid", VOID ); // 1.16+
-            CONVERSION_PROVIDERS.put( "minecraft:uuid", ( originalType, protocolVersion ) ->
-            {
-                if ( protocolVersion < ProtocolConstants.MINECRAFT_1_16 )
-                {
-                    return StringArgumentType.word();
-                }
-                return originalType;
-            } );
-
-            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+
-            CONVERSION_PROVIDERS.put( "minecraft:angle", ( originalType, protocolVersion ) ->
-            {
-                if ( protocolVersion < ProtocolConstants.MINECRAFT_1_16_2 )
-                {
-                    return FloatArgumentType.floatArg();
-                }
-                return originalType;
-            } );
+            return PROVIDERS.get( name );
         }
 
         /**
@@ -1031,6 +1133,26 @@ public class Commands extends DefinedPacket
             return minecraftArgumentType( "minecraft:angle", null );
         }
 
+        /**
+         * Returns the Minecraft ArgumentType {@code minecraft:resource}.
+         * @param rawString the raw string for the argument
+         * @return an ArgumentType instance
+         */
+        public static ArgumentType<?> minecraftResource(String rawString)
+        {
+            return minecraftArgumentType( "minecraft:resource", rawString );
+        }
+
+        /**
+         * Returns the Minecraft ArgumentType {@code minecraft:resource_or_tag}.
+         * @param rawString the raw string for the argument
+         * @return an ArgumentType instance
+         */
+        public static ArgumentType<?> minecraftResourceOrTag(String rawString)
+        {
+            return minecraftArgumentType( "minecraft:resource_or_tag", rawString );
+        }
+
         private static ArgumentType<?> minecraftArgumentType(String key, Object rawValue)
         {
             ArgumentSerializer reader = PROVIDERS.get( key );
@@ -1039,9 +1161,28 @@ public class Commands extends DefinedPacket
             return new DummyType( key, reader, rawValue );
         }
 
-        private static ArgumentType<?> read(String key, ByteBuf buf)
+        private static ArgumentType<?> read(ByteBuf buf, int protocolVersion)
         {
-            ArgumentSerializer reader = PROVIDERS.get( key );
+            Object key;
+            ArgumentSerializer reader;
+
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+            {
+                key = readVarInt( buf );
+
+                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 );
@@ -1050,56 +1191,38 @@ public class Commands extends DefinedPacket
 
         private static void write(ArgumentType<?> arg, ByteBuf buf, int protocolVersion)
         {
-            arg = convertToVersion( arg, protocolVersion );
-
             ProperArgumentSerializer proper = PROPER_PROVIDERS.get( arg.getClass() );
             if ( proper != null )
+            {
+                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 );
-                dummy.serializer.write( buf, dummy.value );
-            }
-        }
-
-        // Convert the provided argument type to a new one compatible with the provided protocol version
-        private static ArgumentType<?> convertToVersion(ArgumentType<?> arg, int protocolVersion)
+                if ( dummy.key instanceof Integer )
                 {
-            ProperArgumentSerializer proper = PROPER_PROVIDERS.get( arg.getClass() );
-            String key;
-            if ( proper != null )
-            {
-                key = proper.getKey();
+                    writeVarInt( (Integer) dummy.key, buf );
                 } else
                 {
-                Preconditions.checkArgument( arg instanceof DummyType, "Non dummy arg " + arg.getClass() );
-                key = ( (DummyType) arg ).key;
+                    writeString( (String) dummy.key, buf );
                 }
-
-            ProtocolConversionProvider converter = CONVERSION_PROVIDERS.get( key );
-
-            if ( converter != null )
-            {
-                return converter.convert( arg, protocolVersion );
+                dummy.serializer.write( buf, dummy.value );
             }
-            return arg;
-        }
-
-        private interface ProtocolConversionProvider
-        {
-            public ArgumentType<?> convert(ArgumentType<?> originalType, int protocolVersion);
         }
 
         @Data
         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;
 
@@ -1121,6 +1244,8 @@ public class Commands extends DefinedPacket
         private abstract static class ProperArgumentSerializer<T> extends ArgumentSerializer<T>
         {
 
+            protected abstract int getIntKey();
+
             protected abstract String getKey();
         }
     }
@@ -1128,39 +1253,17 @@ public class Commands extends DefinedPacket
     @Data
     public static class SuggestionRegistry
     {
-        /**
-         * Tells the client to ask suggestions to the server.
-         */
+
         public static final SuggestionProvider ASK_SERVER = new DummyProvider( "minecraft:ask_server" );
-
-        /**
-         * Tells the client to suggest all the available recipes. The suggestions are stored client side.
-         */
-        public static final SuggestionProvider ALL_RECIPES = new DummyProvider( "minecraft:all_recipes" );
-
-        /**
-         * Tells the client to suggest all the available sounds. The suggestions are stored client side.
-         */
-        public static final SuggestionProvider AVAILABLE_SOUNDS = new DummyProvider( "minecraft:available_sounds" );
-
-        /**
-         * Tells the client to suggest all the available biomes. The suggestions are stored client side.
-         */
-        public static final SuggestionProvider AVAILABLE_BIOMES = new DummyProvider( "minecraft:available_biomes" );
-
-        /**
-         * Tells the client to suggest all the available entities. The suggestions are stored client side.
-         */
-        public static final SuggestionProvider SUMMONABLE_ENTITIES = new DummyProvider( "minecraft:summonable_entities" );
         private static final Map<String, SuggestionProvider<DummyProvider>> PROVIDERS = new HashMap<>();
 
         static
         {
             PROVIDERS.put( "minecraft:ask_server", ASK_SERVER );
-            PROVIDERS.put( "minecraft:all_recipes", ALL_RECIPES );
-            PROVIDERS.put( "minecraft:available_sounds", AVAILABLE_SOUNDS );
-            PROVIDERS.put( "minecraft:available_biomes", AVAILABLE_BIOMES );
-            PROVIDERS.put( "minecraft:summonable_entities", SUMMONABLE_ENTITIES );
+            registerDummy( "minecraft:all_recipes" );
+            registerDummy( "minecraft:available_sounds" );
+            registerDummy( "minecraft:available_biomes" );
+            registerDummy( "minecraft:summonable_entities" );
         }
 
         private static void registerDummy(String name)

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 );
+        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 );
+        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;
+    }
 }

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

@@ -24,7 +24,7 @@ public class Handshake extends DefinedPacket
     public void read(ByteBuf buf)
     {
         protocolVersion = readVarInt( buf );
-        host = readString( buf );
+        host = readString( buf, 255 );
         port = buf.readUnsignedShort();
         requestedProtocol = readVarInt( buf );
     }

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

@@ -1,6 +1,5 @@
 package net.md_5.bungee.protocol.packet;
 
-import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import java.util.HashSet;
 import java.util.Set;
@@ -10,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.Location;
 import net.md_5.bungee.protocol.ProtocolConstants;
 import se.llbit.nbt.Tag;
 
@@ -33,10 +33,12 @@ public class Login extends DefinedPacket
     private int maxPlayers;
     private String levelType;
     private int viewDistance;
+    private int simulationDistance;
     private boolean reducedDebugInfo;
     private boolean normalRespawn;
     private boolean debug;
     private boolean flat;
+    private Location deathLocation;
 
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
@@ -53,8 +55,6 @@ public class Login extends DefinedPacket
 
             worldNames = new HashSet<>();
             int worldCount = readVarInt( buf );
-            Preconditions.checkArgument( worldCount < 128, "Too many worlds %s", worldCount );
-
             for ( int i = 0; i < worldCount; i++ )
             {
                 worldNames.add( readString( buf ) );
@@ -65,7 +65,7 @@ public class Login extends DefinedPacket
 
         if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
         {
-            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 )
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 && protocolVersion < ProtocolConstants.MINECRAFT_1_19 )
             {
                 dimension = readTag( buf );
             } else
@@ -103,6 +103,10 @@ public class Login extends DefinedPacket
         {
             viewDistance = readVarInt( buf );
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_18 )
+        {
+            simulationDistance = readVarInt( buf );
+        }
         if ( protocolVersion >= 29 )
         {
             reducedDebugInfo = buf.readBoolean();
@@ -116,6 +120,13 @@ public class Login extends DefinedPacket
             debug = buf.readBoolean();
             flat = buf.readBoolean();
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            if ( buf.readBoolean() )
+            {
+                deathLocation = new Location( readString( buf ), buf.readLong() );
+            }
+        }
     }
 
     @Override
@@ -142,7 +153,7 @@ public class Login extends DefinedPacket
 
         if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
         {
-            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 )
+            if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16_2 && protocolVersion < ProtocolConstants.MINECRAFT_1_19 )
             {
                 writeTag( (Tag) dimension, buf );
             } else
@@ -180,6 +191,10 @@ public class Login extends DefinedPacket
         {
             writeVarInt( viewDistance, buf );
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_18 )
+        {
+            writeVarInt( simulationDistance, buf );
+        }
         if ( protocolVersion >= 29 )
         {
             buf.writeBoolean( reducedDebugInfo );
@@ -193,6 +208,18 @@ public class Login extends DefinedPacket
             buf.writeBoolean( debug );
             buf.writeBoolean( flat );
         }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 )
+        {
+            if ( deathLocation != null )
+            {
+                buf.writeBoolean( true );
+                writeString( deathLocation.getDimension(), buf );
+                buf.writeLong( deathLocation.getPos() );
+            } else
+            {
+                buf.writeBoolean( false );
+            }
+        }
     }
 
     @Override

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

@@ -1,16 +1,15 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package net.md_5.bungee.protocol.packet;
 
 import io.netty.buffer.ByteBuf;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.PlayerPublicKey;
+import net.md_5.bungee.protocol.ProtocolConstants;
 
 @Data
 @NoArgsConstructor
@@ -20,17 +19,45 @@ public class LoginRequest extends DefinedPacket
 {
 
     private String data;
+    private PlayerPublicKey publicKey;
+    private UUID uuid;
 
     @Override
-    public void read(ByteBuf buf)
+    public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
-        data = readString( buf );
+        data = readString( buf, 16 );
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 && protocolVersion < ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            publicKey = readPublicKey( buf );
+        }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_1 )
+        {
+            if ( buf.readBoolean() )
+            {
+                uuid = readUUID( buf );
+            }
+        }
     }
 
     @Override
-    public void write(ByteBuf buf)
+    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
         writeString( data, buf );
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 && protocolVersion < ProtocolConstants.MINECRAFT_1_19_3 )
+        {
+            writePublicKey( publicKey, buf );
+        }
+        if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_1 )
+        {
+            if ( uuid != null )
+            {
+                buf.writeBoolean( true );
+                writeUUID( uuid, buf );
+            } else
+            {
+                buf.writeBoolean( false );
+            }
+        }
     }
 
     @Override

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

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