update readme

Addresses #2289

.github/workflows/build.yml

@@ -15,14 +15,14 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
-          cache: 'maven'
+          java-version: '19'
+          cache: 'gradle'
 
-      - name: Run maven build lifecycle
-        run: mvn --batch-mode clean test package
+      - name: Run gradle build lifecycle
+        run: ./gradlew build shadowJar --no-daemon
 
       - name: Upload plugin file
         uses: actions/upload-artifact@v2
         with:
           name: ProtocolLib
-          path: target/ProtocolLib.jar
+          path: build/libs/ProtocolLib.jar

.github/workflows/codeql-analysis.yml

@@ -26,16 +26,16 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
-          cache: 'maven'
+          java-version: '19'
+          cache: 'gradle'
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
           languages: 'java'
 
-      - name: Run maven build lifecycle
-        run: mvn --batch-mode clean test package
+      - name: Run gradle build lifecycle
+        run: ./gradlew build -x test --no-daemon
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

Readme.md

@@ -20,8 +20,10 @@ Currently maintained by dmulloy2 on behalf of [Spigot](https://www.spigotmc.org/
 
 ### Compilation
 
-ProtocolLib is built with [Maven](https://maven.apache.org/). If you have it installed, just run
-`mvn package` in the root project folder.
+ProtocolLib is built with [Gradle](https://gradle.org/). If you have it installed, just run
+`./gradlew build` in the root project folder. Other gradle targets you may be interested in 
+include `clean`, `test`, and `shadowJar`. `shadowJar` will create a jar with all dependencies
+(ByteBuddy) included.
 
 ### A new API
 
@@ -53,7 +55,7 @@ You can also add ProtocolLib as a Maven dependency:
   <dependency>
     <groupId>com.comphenix.protocol</groupId>
     <artifactId>ProtocolLib</artifactId>
-    <version>4.7.0</version>
+    <version>5.0.0-SNAPSHOT</version>
     <scope>provided</scope>
   </dependency>
 </dependencies>
@@ -67,7 +69,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly group: "com.comphenix.protocol", name: "ProtocolLib", version: "4.7.0";
+    compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT'
 }
 ```
 

build.gradle

@@ -0,0 +1,112 @@
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+}
+
+group = 'com.comphenix.protocol'
+version = '5.0.0-SNAPSHOT'
+description = 'Provides access to the Minecraft protocol'
+
+def isSnapshot = version.endsWith('-SNAPSHOT')
+
+repositories {
+    // mavenLocal() // can speed up build, but may fail in CI
+    mavenCentral()
+
+    maven {
+        url 'https://repo.dmulloy2.net/repository/public/'
+    }
+
+    maven {
+        url 'https://hub.spigotmc.org/nexus/content/groups/public/'
+    }
+
+    maven {
+        url 'https://libraries.minecraft.net/'
+        metadataSources {
+            mavenPom()
+            artifact()
+            ignoreGradleMetadataRedirection()
+        }
+    }
+}
+
+dependencies {
+    implementation 'net.bytebuddy:byte-buddy:1.14.3'
+    compileOnly 'org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT'
+    compileOnly 'io.netty:netty-all:4.0.23.Final'
+    compileOnly 'net.kyori:adventure-text-serializer-gson:4.13.0'
+    compileOnly 'com.googlecode.json-simple:json-simple:1.1.1'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
+    testImplementation 'org.mockito:mockito-core:4.11.0'
+    testImplementation 'org.mockito:mockito-inline:4.11.0'
+    testImplementation 'io.netty:netty-common:4.1.77.Final'
+    testImplementation 'io.netty:netty-transport:4.1.77.Final'
+    testImplementation 'org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    withJavadocJar()
+    withSourcesJar()
+}
+
+shadowJar {
+    dependencies {
+        include(dependency('net.bytebuddy:byte-buddy:.*'))
+    }
+    relocate 'net.bytebuddy', 'com.comphenix.net.bytebuddy'
+    archiveFileName = 'ProtocolLib.jar'
+}
+
+test {
+    useJUnitPlatform()
+}
+
+processResources {
+    def includeBuild = isSnapshot && System.getenv('BUILD_NUMBER')
+    def fullVersion = includeBuild
+        ? version + '-' + System.getenv('BUILD_NUMBER')
+        : version
+
+    eachFile { expand(['version': fullVersion]) }
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+
+            afterEvaluate {
+                artifactId = 'ProtocolLib'
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            url isSnapshot
+                ? 'https://repo.dmulloy2.net/repository/snapshots/'
+                : 'https://repo.dmulloy2.net/repository/releases/'
+
+            credentials {
+                username project.nexusUsername
+                password project.nexusPassword
+            }
+        }
+    }
+}
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+tasks.withType(Javadoc) {
+    options.encoding = 'UTF-8'
+}

gradle.properties

@@ -0,0 +1,2 @@
+nexusUsername=""
+nexusPassword=""

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,244 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

pom.xml

@@ -16,10 +16,10 @@
 		<project.build.number></project.build.number>
 		<project.fullVersion>${project.version}</project.fullVersion>
 
-		<junit.version>5.9.0</junit.version>
-		<mockito.version>4.6.1</mockito.version>
+		<junit.version>5.9.2</junit.version>
+		<mockito.version>4.11.0</mockito.version>
 		<netty.version>4.1.77.Final</netty.version>
-		<spigot.version>1.19.3-R0.1-SNAPSHOT</spigot.version>
+		<spigot.version>1.19.4-R0.1-SNAPSHOT</spigot.version>
 	</properties>
 
 	<build>
@@ -40,7 +40,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.4.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -73,7 +73,7 @@
 
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.11.0</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -83,7 +83,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.2</version>
+				<version>3.3.0</version>
 				<configuration>
 					<archive>
 						<manifestEntries>
@@ -100,7 +100,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M7</version>
+				<version>3.0.0</version>
 				<dependencies>
 					<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
 					<dependency>
@@ -125,7 +125,7 @@
 
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.5.0</version>
 				<configuration>
 					<failOnError>false</failOnError>
 					<encoding>ISO-8859-1</encoding>
@@ -329,14 +329,14 @@
 		<dependency>
 			<groupId>net.kyori</groupId>
 			<artifactId>adventure-text-serializer-gson</artifactId>
-			<version>4.11.0</version>
+			<version>4.13.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy -->
 		<dependency>
 			<groupId>net.bytebuddy</groupId>
 			<artifactId>byte-buddy</artifactId>
-			<version>1.12.12</version>
+			<version>1.14.3</version>
 		</dependency>
 
 		<!-- Testing dependencies -->

settings.gradle

@@ -0,0 +1,5 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+rootProject.name = 'ProtocolLib'

src/main/java/com/comphenix/protocol/CommandPacket.java

@@ -446,7 +446,7 @@ class CommandPacket extends CommandBase {
 	{
 		final String text = arguments.remove().toLowerCase();
 
-		switch (arguments.remove().toLowerCase()) {
+		switch (text) {
 			case "add":
 				return SubCommand.ADD;
 			case "remove":

src/main/java/com/comphenix/protocol/PacketType.java

@@ -41,19 +41,19 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 	 * @author Kristian
 	 */
 	public static class Handshake {
-		private static final Protocol PROTOCOL = Protocol.HANDSHAKING;
+		static final Protocol PROTOCOL = Protocol.HANDSHAKING;
 
 		/**
 		 * Incoming packets.
 		 * @author Kristian
 		 */
 		public static class Client extends PacketTypeEnum {
-			private final static Sender SENDER = Sender.CLIENT;
+			private static final Sender SENDER = Sender.CLIENT;
 
 			@ForceAsync
 			public static final PacketType SET_PROTOCOL =                 new PacketType(PROTOCOL, SENDER, 0x00, "SetProtocol", "C00Handshake");
 
-			private final static Client INSTANCE = new Client();
+			private static final Client INSTANCE = new Client();
 
 			// Prevent accidental construction
 			private Client() { super(); }
@@ -71,8 +71,8 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		 * @author Kristian
 		 */
 		public static class Server extends PacketTypeEnum {
-			private final static Sender SENDER = Sender.CLIENT;
-			private final static Server INSTANCE = new Server();
+			private static final Sender SENDER = Sender.CLIENT;
+			private static final Server INSTANCE = new Server();
 			private Server() { super(); }
 
 			public static Server getInstance() {
@@ -93,122 +93,126 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 	 * @author Kristian
 	 */
 	public static class Play {
-		private static final Protocol PROTOCOL = Protocol.PLAY;
+		static final Protocol PROTOCOL = Protocol.PLAY;
 
 		/**
 		 * Outgoing packets.
 		 * @author Kristian
 		 */
 		public static class Server extends PacketTypeEnum {
-			private final static Sender SENDER = Sender.SERVER;
+			private static final Sender SENDER = Sender.SERVER;
 
-			public static final PacketType SPAWN_ENTITY =                 new PacketType(PROTOCOL, SENDER, 0x00, "SpawnEntity", "SPacketSpawnObject");
-			public static final PacketType SPAWN_ENTITY_EXPERIENCE_ORB =  new PacketType(PROTOCOL, SENDER, 0x01, "SpawnEntityExperienceOrb", "SPacketSpawnExperienceOrb");
-			public static final PacketType NAMED_ENTITY_SPAWN =           new PacketType(PROTOCOL, SENDER, 0x02, "NamedEntitySpawn", "SPacketSpawnPlayer");
-			public static final PacketType ANIMATION =                    new PacketType(PROTOCOL, SENDER, 0x03, "Animation", "SPacketAnimation");
-			public static final PacketType STATISTIC =                    new PacketType(PROTOCOL, SENDER, 0x04, "Statistic", "SPacketStatistics");
-			public static final PacketType BLOCK_CHANGED_ACK =            new PacketType(PROTOCOL, SENDER, 0x05, "BlockChangedAck");
-			public static final PacketType BLOCK_BREAK_ANIMATION =        new PacketType(PROTOCOL, SENDER, 0x06, "BlockBreakAnimation", "SPacketBlockBreakAnim");
-			public static final PacketType TILE_ENTITY_DATA =             new PacketType(PROTOCOL, SENDER, 0x07, "TileEntityData", "SPacketUpdateTileEntity");
-			public static final PacketType BLOCK_ACTION =                 new PacketType(PROTOCOL, SENDER, 0x08, "BlockAction", "SPacketBlockAction");
-			public static final PacketType BLOCK_CHANGE =                 new PacketType(PROTOCOL, SENDER, 0x09, "BlockChange", "SPacketBlockChange");
-			public static final PacketType BOSS =                         new PacketType(PROTOCOL, SENDER, 0x0A, "Boss", "SPacketUpdateBossInfo");
-			public static final PacketType SERVER_DIFFICULTY =            new PacketType(PROTOCOL, SENDER, 0x0B, "ServerDifficulty", "SPacketServerDifficulty");
-			public static final PacketType CLEAR_TITLES =                 new PacketType(PROTOCOL, SENDER, 0x0C, "ClearTitles");
-			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x0D, "TabComplete", "SPacketTabComplete");
-			public static final PacketType COMMANDS =                     new PacketType(PROTOCOL, SENDER, 0x0E, "Commands");
-			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x0F, "CloseWindow", "SPacketCloseWindow");
-			public static final PacketType WINDOW_ITEMS =                 new PacketType(PROTOCOL, SENDER, 0x10, "WindowItems", "SPacketWindowItems");
-			public static final PacketType WINDOW_DATA =                  new PacketType(PROTOCOL, SENDER, 0x11, "WindowData", "SPacketWindowProperty");
-			public static final PacketType SET_SLOT =                     new PacketType(PROTOCOL, SENDER, 0x12, "SetSlot", "SPacketSetSlot");
-			public static final PacketType SET_COOLDOWN =                 new PacketType(PROTOCOL, SENDER, 0x13, "SetCooldown", "SPacketCooldown");
-			public static final PacketType CUSTOM_CHAT_COMPLETIONS =      new PacketType(PROTOCOL, SENDER, 0x14, "CustomChatCompletions");
-			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x15, "CustomPayload", "SPacketCustomPayload");
-			public static final PacketType DELETE_CHAT_MESSAGE =          new PacketType(PROTOCOL, SENDER, 0x16, "DeleteChat");
-			public static final PacketType KICK_DISCONNECT =              new PacketType(PROTOCOL, SENDER, 0x17, "KickDisconnect", "SPacketDisconnect");
-			public static final PacketType DISGUISED_CHAT =               new PacketType(PROTOCOL, SENDER, 0x18, "DisguisedChat");
-			public static final PacketType ENTITY_STATUS =                new PacketType(PROTOCOL, SENDER, 0x19, "EntityStatus", "SPacketEntityStatus");
-			public static final PacketType EXPLOSION =                    new PacketType(PROTOCOL, SENDER, 0x1A, "Explosion", "SPacketExplosion");
-			public static final PacketType UNLOAD_CHUNK =                 new PacketType(PROTOCOL, SENDER, 0x1B, "UnloadChunk", "SPacketUnloadChunk");
-			public static final PacketType GAME_STATE_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x1C, "GameStateChange", "SPacketChangeGameState");
-			public static final PacketType OPEN_WINDOW_HORSE =            new PacketType(PROTOCOL, SENDER, 0x1D, "OpenWindowHorse");
-			public static final PacketType INITIALIZE_BORDER =            new PacketType(PROTOCOL, SENDER, 0x1E, "InitializeBorder");
-			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x1F, "KeepAlive", "SPacketKeepAlive");
-			public static final PacketType MAP_CHUNK =                    new PacketType(PROTOCOL, SENDER, 0x20, "LevelChunkWithLight", "MapChunk", "SPacketChunkData");
-			public static final PacketType WORLD_EVENT =                  new PacketType(PROTOCOL, SENDER, 0x21, "WorldEvent", "SPacketEffect");
-			public static final PacketType WORLD_PARTICLES =              new PacketType(PROTOCOL, SENDER, 0x22, "WorldParticles", "SPacketParticles");
-			public static final PacketType LIGHT_UPDATE =                 new PacketType(PROTOCOL, SENDER, 0x23, "LightUpdate");
-			public static final PacketType LOGIN =                        new PacketType(PROTOCOL, SENDER, 0x24, "Login", "SPacketJoinGame");
-			public static final PacketType MAP =                          new PacketType(PROTOCOL, SENDER, 0x25, "Map", "SPacketMaps");
-			public static final PacketType OPEN_WINDOW_MERCHANT =         new PacketType(PROTOCOL, SENDER, 0x26, "OpenWindowMerchant");
-			public static final PacketType REL_ENTITY_MOVE =              new PacketType(PROTOCOL, SENDER, 0x27, "Entity$RelEntityMove", "Entity$PacketPlayOutRelEntityMove");
-			public static final PacketType REL_ENTITY_MOVE_LOOK =         new PacketType(PROTOCOL, SENDER, 0x28, "Entity$RelEntityMoveLook", "Entity$PacketPlayOutRelEntityMoveLook");
-			public static final PacketType ENTITY_LOOK =                  new PacketType(PROTOCOL, SENDER, 0x29, "Entity$EntityLook", "Entity$PacketPlayOutEntityLook");
-			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x2A, "VehicleMove", "SPacketMoveVehicle");
-			public static final PacketType OPEN_BOOK =                    new PacketType(PROTOCOL, SENDER, 0x2B, "OpenBook");
-			public static final PacketType OPEN_WINDOW =                  new PacketType(PROTOCOL, SENDER, 0x2C, "OpenWindow", "SPacketOpenWindow");
-			public static final PacketType OPEN_SIGN_EDITOR =             new PacketType(PROTOCOL, SENDER, 0x2D, "OpenSignEditor", "SPacketSignEditorOpen");
-			public static final PacketType PING =                         new PacketType(PROTOCOL, SENDER, 0x2E, "Ping");
-			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x2F, "AutoRecipe", "SPacketPlaceGhostRecipe");
-			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x30, "Abilities", "SPacketPlayerAbilities");
-			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x31, "PlayerChat", "Chat", "SPacketChat");
-			public static final PacketType PLAYER_COMBAT_END =            new PacketType(PROTOCOL, SENDER, 0x32, "PlayerCombatEnd");
-			public static final PacketType PLAYER_COMBAT_ENTER =          new PacketType(PROTOCOL, SENDER, 0x33, "PlayerCombatEnter");
-			public static final PacketType PLAYER_COMBAT_KILL =           new PacketType(PROTOCOL, SENDER, 0x34, "PlayerCombatKill");
-			public static final PacketType PLAYER_INFO_REMOVE =           new PacketType(PROTOCOL, SENDER, 0x35, "PlayerInfoRemove");
-			public static final PacketType PLAYER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x36, "PlayerInfoUpdate", "PlayerInfo");
-			public static final PacketType LOOK_AT =                      new PacketType(PROTOCOL, SENDER, 0x37, "LookAt", "SPacketPlayerPosLook");
-			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x38, "Position");
-			public static final PacketType RECIPES =                      new PacketType(PROTOCOL, SENDER, 0x39, "Recipes", "SPacketRecipeBook");
-			public static final PacketType ENTITY_DESTROY =               new PacketType(PROTOCOL, SENDER, 0x3A, "EntityDestroy", "SPacketDestroyEntities");
-			public static final PacketType REMOVE_ENTITY_EFFECT =         new PacketType(PROTOCOL, SENDER, 0x3B, "RemoveEntityEffect", "SPacketRemoveEntityEffect");
-			public static final PacketType RESOURCE_PACK_SEND =           new PacketType(PROTOCOL, SENDER, 0x3C, "ResourcePackSend", "SPacketResourcePackSend");
-			public static final PacketType RESPAWN =                      new PacketType(PROTOCOL, SENDER, 0x3D, "Respawn", "SPacketRespawn");
-			public static final PacketType ENTITY_HEAD_ROTATION =         new PacketType(PROTOCOL, SENDER, 0x3E, "EntityHeadRotation", "SPacketEntityHeadLook");
-			public static final PacketType MULTI_BLOCK_CHANGE =           new PacketType(PROTOCOL, SENDER, 0x3F, "MultiBlockChange", "SPacketMultiBlockChange");
-			public static final PacketType SELECT_ADVANCEMENT_TAB =       new PacketType(PROTOCOL, SENDER, 0x40, "SelectAdvancementTab", "SPacketSelectAdvancementsTab");
-			public static final PacketType SERVER_DATA =                  new PacketType(PROTOCOL, SENDER, 0x41, "ServerData");
-			public static final PacketType SET_ACTION_BAR_TEXT =          new PacketType(PROTOCOL, SENDER, 0x42, "SetActionBarText");
-			public static final PacketType SET_BORDER_CENTER =            new PacketType(PROTOCOL, SENDER, 0x43, "SetBorderCenter");
-			public static final PacketType SET_BORDER_LERP_SIZE =         new PacketType(PROTOCOL, SENDER, 0x44, "SetBorderLerpSize");
-			public static final PacketType SET_BORDER_SIZE =              new PacketType(PROTOCOL, SENDER, 0x45, "SetBorderSize");
-			public static final PacketType SET_BORDER_WARNING_DELAY =     new PacketType(PROTOCOL, SENDER, 0x46, "SetBorderWarningDelay");
-			public static final PacketType SET_BORDER_WARNING_DISTANCE =  new PacketType(PROTOCOL, SENDER, 0x47, "SetBorderWarningDistance");
-			public static final PacketType CAMERA =                       new PacketType(PROTOCOL, SENDER, 0x48, "Camera", "SPacketCamera");
-			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x49, "HeldItemSlot", "SPacketHeldItemChange");
-			public static final PacketType VIEW_CENTRE =                  new PacketType(PROTOCOL, SENDER, 0x4A, "ViewCentre");
-			public static final PacketType VIEW_DISTANCE =                new PacketType(PROTOCOL, SENDER, 0x4B, "ViewDistance");
-			public static final PacketType SPAWN_POSITION =               new PacketType(PROTOCOL, SENDER, 0x4C, "SpawnPosition", "SPacketSpawnPosition");
-			public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x4D, "ScoreboardDisplayObjective", "SPacketDisplayObjective");
-			public static final PacketType ENTITY_METADATA =              new PacketType(PROTOCOL, SENDER, 0x4E, "EntityMetadata", "SPacketEntityMetadata");
-			public static final PacketType ATTACH_ENTITY =                new PacketType(PROTOCOL, SENDER, 0x4F, "AttachEntity", "SPacketEntityAttach");
-			public static final PacketType ENTITY_VELOCITY =              new PacketType(PROTOCOL, SENDER, 0x50, "EntityVelocity", "SPacketEntityVelocity");
-			public static final PacketType ENTITY_EQUIPMENT =             new PacketType(PROTOCOL, SENDER, 0x51, "EntityEquipment", "SPacketEntityEquipment");
-			public static final PacketType EXPERIENCE =                   new PacketType(PROTOCOL, SENDER, 0x52, "Experience", "SPacketSetExperience");
-			public static final PacketType UPDATE_HEALTH =                new PacketType(PROTOCOL, SENDER, 0x53, "UpdateHealth", "SPacketUpdateHealth");
-			public static final PacketType SCOREBOARD_OBJECTIVE =         new PacketType(PROTOCOL, SENDER, 0x54, "ScoreboardObjective", "SPacketScoreboardObjective");
-			public static final PacketType MOUNT =                        new PacketType(PROTOCOL, SENDER, 0x55, "Mount", "SPacketSetPassengers");
-			public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x56, "ScoreboardTeam", "SPacketTeams");
-			public static final PacketType SCOREBOARD_SCORE =             new PacketType(PROTOCOL, SENDER, 0x57, "ScoreboardScore", "SPacketUpdateScore");
-			public static final PacketType UPDATE_SIMULATION_DISTANCE =   new PacketType(PROTOCOL, SENDER, 0x58, "SetSimulationDistance");
-			public static final PacketType SET_SUBTITLE_TEXT =            new PacketType(PROTOCOL, SENDER, 0x59, "SetSubtitleText");
-			public static final PacketType UPDATE_TIME =                  new PacketType(PROTOCOL, SENDER, 0x5A, "UpdateTime", "SPacketTimeUpdate");
-			public static final PacketType SET_TITLE_TEXT =               new PacketType(PROTOCOL, SENDER, 0x5B, "SetTitleText");
-			public static final PacketType SET_TITLES_ANIMATION =         new PacketType(PROTOCOL, SENDER, 0x5C, "SetTitlesAnimation");
-			public static final PacketType ENTITY_SOUND =                 new PacketType(PROTOCOL, SENDER, 0x5D, "EntitySound", "SPacketSoundEffect");
-			public static final PacketType NAMED_SOUND_EFFECT =           new PacketType(PROTOCOL, SENDER, 0x5E, "NamedSoundEffect");
-			public static final PacketType STOP_SOUND =                   new PacketType(PROTOCOL, SENDER, 0x5F, "StopSound");
-			public static final PacketType SYSTEM_CHAT =                  new PacketType(PROTOCOL, SENDER, 0x60, "SystemChat");
-			public static final PacketType PLAYER_LIST_HEADER_FOOTER =    new PacketType(PROTOCOL, SENDER, 0x61, "PlayerListHeaderFooter", "SPacketPlayerListHeaderFooter");
-			public static final PacketType NBT_QUERY =                    new PacketType(PROTOCOL, SENDER, 0x62, "NBTQuery");
-			public static final PacketType COLLECT =                      new PacketType(PROTOCOL, SENDER, 0x63, "Collect", "SPacketCollectItem");
-			public static final PacketType ENTITY_TELEPORT =              new PacketType(PROTOCOL, SENDER, 0x64, "EntityTeleport", "SPacketEntityTeleport");
-			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x65, "Advancements", "SPacketAdvancementInfo");
-			public static final PacketType UPDATE_ATTRIBUTES =            new PacketType(PROTOCOL, SENDER, 0x66, "UpdateAttributes", "SPacketEntityProperties");
-			public static final PacketType UPDATE_ENABLED_FEATURES =      new PacketType(PROTOCOL, SENDER, 0x67, "UpdateEnabledFeatures");
-			public static final PacketType ENTITY_EFFECT =                new PacketType(PROTOCOL, SENDER, 0x68, "EntityEffect", "SPacketEntityEffect");
-			public static final PacketType RECIPE_UPDATE =                new PacketType(PROTOCOL, SENDER, 0x69, "RecipeUpdate");
-			public static final PacketType TAGS =                         new PacketType(PROTOCOL, SENDER, 0x6A, "Tags");
+			public static final PacketType BUNDLE =                       new PacketType(PROTOCOL, SENDER, 0x00, "Delimiter", "BundleDelimiterPacket");
+			public static final PacketType SPAWN_ENTITY =                 new PacketType(PROTOCOL, SENDER, 0x01, "SpawnEntity", "SPacketSpawnObject");
+			public static final PacketType SPAWN_ENTITY_EXPERIENCE_ORB =  new PacketType(PROTOCOL, SENDER, 0x02, "SpawnEntityExperienceOrb", "SPacketSpawnExperienceOrb");
+			public static final PacketType NAMED_ENTITY_SPAWN =           new PacketType(PROTOCOL, SENDER, 0x03, "NamedEntitySpawn", "SPacketSpawnPlayer");
+			public static final PacketType ANIMATION =                    new PacketType(PROTOCOL, SENDER, 0x04, "Animation", "SPacketAnimation");
+			public static final PacketType STATISTIC =                    new PacketType(PROTOCOL, SENDER, 0x05, "Statistic", "SPacketStatistics");
+			public static final PacketType BLOCK_CHANGED_ACK =            new PacketType(PROTOCOL, SENDER, 0x06, "BlockChangedAck");
+			public static final PacketType BLOCK_BREAK_ANIMATION =        new PacketType(PROTOCOL, SENDER, 0x07, "BlockBreakAnimation", "SPacketBlockBreakAnim");
+			public static final PacketType TILE_ENTITY_DATA =             new PacketType(PROTOCOL, SENDER, 0x08, "TileEntityData", "SPacketUpdateTileEntity");
+			public static final PacketType BLOCK_ACTION =                 new PacketType(PROTOCOL, SENDER, 0x09, "BlockAction", "SPacketBlockAction");
+			public static final PacketType BLOCK_CHANGE =                 new PacketType(PROTOCOL, SENDER, 0x0A, "BlockChange", "SPacketBlockChange");
+			public static final PacketType BOSS =                         new PacketType(PROTOCOL, SENDER, 0x0B, "Boss", "SPacketUpdateBossInfo");
+			public static final PacketType SERVER_DIFFICULTY =            new PacketType(PROTOCOL, SENDER, 0x0C, "ServerDifficulty", "SPacketServerDifficulty");
+			public static final PacketType CHUNKS_BIOMES =                new PacketType(PROTOCOL, SENDER, 0x0D, "ChunksBiomes", "ClientboundChunksBiomesPacket");
+			public static final PacketType CLEAR_TITLES =                 new PacketType(PROTOCOL, SENDER, 0x0E, "ClearTitles");
+			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x0F, "TabComplete", "SPacketTabComplete");
+			public static final PacketType COMMANDS =                     new PacketType(PROTOCOL, SENDER, 0x10, "Commands");
+			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x11, "CloseWindow", "SPacketCloseWindow");
+			public static final PacketType WINDOW_ITEMS =                 new PacketType(PROTOCOL, SENDER, 0x12, "WindowItems", "SPacketWindowItems");
+			public static final PacketType WINDOW_DATA =                  new PacketType(PROTOCOL, SENDER, 0x13, "WindowData", "SPacketWindowProperty");
+			public static final PacketType SET_SLOT =                     new PacketType(PROTOCOL, SENDER, 0x14, "SetSlot", "SPacketSetSlot");
+			public static final PacketType SET_COOLDOWN =                 new PacketType(PROTOCOL, SENDER, 0x15, "SetCooldown", "SPacketCooldown");
+			public static final PacketType CUSTOM_CHAT_COMPLETIONS =      new PacketType(PROTOCOL, SENDER, 0x16, "CustomChatCompletions");
+			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x17, "CustomPayload", "SPacketCustomPayload");
+			public static final PacketType DAMAGE_EVENT =                 new PacketType(PROTOCOL, SENDER, 0x18, "DamageEvent", "ClientboundDamageEventPacket");
+			public static final PacketType DELETE_CHAT_MESSAGE =          new PacketType(PROTOCOL, SENDER, 0x19, "DeleteChat");
+			public static final PacketType KICK_DISCONNECT =              new PacketType(PROTOCOL, SENDER, 0x1A, "KickDisconnect", "SPacketDisconnect");
+			public static final PacketType DISGUISED_CHAT =               new PacketType(PROTOCOL, SENDER, 0x1B, "DisguisedChat");
+			public static final PacketType ENTITY_STATUS =                new PacketType(PROTOCOL, SENDER, 0x1C, "EntityStatus", "SPacketEntityStatus");
+			public static final PacketType EXPLOSION =                    new PacketType(PROTOCOL, SENDER, 0x1D, "Explosion", "SPacketExplosion");
+			public static final PacketType UNLOAD_CHUNK =                 new PacketType(PROTOCOL, SENDER, 0x1E, "UnloadChunk", "SPacketUnloadChunk");
+			public static final PacketType GAME_STATE_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x1F, "GameStateChange", "SPacketChangeGameState");
+			public static final PacketType OPEN_WINDOW_HORSE =            new PacketType(PROTOCOL, SENDER, 0x20, "OpenWindowHorse");
+			public static final PacketType HURT_ANIMATION =               new PacketType(PROTOCOL, SENDER, 0x21, "HurtAnimation", "ClientboundHurtAnimationPacket");
+			public static final PacketType INITIALIZE_BORDER =            new PacketType(PROTOCOL, SENDER, 0x22, "InitializeBorder");
+			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x23, "KeepAlive", "SPacketKeepAlive");
+			public static final PacketType MAP_CHUNK =                    new PacketType(PROTOCOL, SENDER, 0x24, "LevelChunkWithLight", "MapChunk", "SPacketChunkData");
+			public static final PacketType WORLD_EVENT =                  new PacketType(PROTOCOL, SENDER, 0x25, "WorldEvent", "SPacketEffect");
+			public static final PacketType WORLD_PARTICLES =              new PacketType(PROTOCOL, SENDER, 0x26, "WorldParticles", "SPacketParticles");
+			public static final PacketType LIGHT_UPDATE =                 new PacketType(PROTOCOL, SENDER, 0x27, "LightUpdate");
+			public static final PacketType LOGIN =                        new PacketType(PROTOCOL, SENDER, 0x28, "Login", "SPacketJoinGame");
+			public static final PacketType MAP =                          new PacketType(PROTOCOL, SENDER, 0x29, "Map", "SPacketMaps");
+			public static final PacketType OPEN_WINDOW_MERCHANT =         new PacketType(PROTOCOL, SENDER, 0x2A, "OpenWindowMerchant");
+			public static final PacketType REL_ENTITY_MOVE =              new PacketType(PROTOCOL, SENDER, 0x2B, "Entity$RelEntityMove", "Entity$PacketPlayOutRelEntityMove");
+			public static final PacketType REL_ENTITY_MOVE_LOOK =         new PacketType(PROTOCOL, SENDER, 0x2C, "Entity$RelEntityMoveLook", "Entity$PacketPlayOutRelEntityMoveLook");
+			public static final PacketType ENTITY_LOOK =                  new PacketType(PROTOCOL, SENDER, 0x2D, "Entity$EntityLook", "Entity$PacketPlayOutEntityLook");
+			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x2E, "VehicleMove", "SPacketMoveVehicle");
+			public static final PacketType OPEN_BOOK =                    new PacketType(PROTOCOL, SENDER, 0x2F, "OpenBook");
+			public static final PacketType OPEN_WINDOW =                  new PacketType(PROTOCOL, SENDER, 0x30, "OpenWindow", "SPacketOpenWindow");
+			public static final PacketType OPEN_SIGN_EDITOR =             new PacketType(PROTOCOL, SENDER, 0x31, "OpenSignEditor", "SPacketSignEditorOpen");
+			public static final PacketType PING =                         new PacketType(PROTOCOL, SENDER, 0x32, "Ping");
+			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x33, "AutoRecipe", "SPacketPlaceGhostRecipe");
+			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x34, "Abilities", "SPacketPlayerAbilities");
+			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x35, "PlayerChat", "Chat", "SPacketChat");
+			public static final PacketType PLAYER_COMBAT_END =            new PacketType(PROTOCOL, SENDER, 0x36, "PlayerCombatEnd");
+			public static final PacketType PLAYER_COMBAT_ENTER =          new PacketType(PROTOCOL, SENDER, 0x37, "PlayerCombatEnter");
+			public static final PacketType PLAYER_COMBAT_KILL =           new PacketType(PROTOCOL, SENDER, 0x38, "PlayerCombatKill");
+			public static final PacketType PLAYER_INFO_REMOVE =           new PacketType(PROTOCOL, SENDER, 0x39, "PlayerInfoRemove");
+			public static final PacketType PLAYER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x3A, "PlayerInfoUpdate", "PlayerInfo");
+			public static final PacketType LOOK_AT =                      new PacketType(PROTOCOL, SENDER, 0x3B, "LookAt", "SPacketPlayerPosLook");
+			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x3C, "Position");
+			public static final PacketType RECIPES =                      new PacketType(PROTOCOL, SENDER, 0x3D, "Recipes", "SPacketRecipeBook");
+			public static final PacketType ENTITY_DESTROY =               new PacketType(PROTOCOL, SENDER, 0x3E, "EntityDestroy", "SPacketDestroyEntities");
+			public static final PacketType REMOVE_ENTITY_EFFECT =         new PacketType(PROTOCOL, SENDER, 0x3F, "RemoveEntityEffect", "SPacketRemoveEntityEffect");
+			public static final PacketType RESOURCE_PACK_SEND =           new PacketType(PROTOCOL, SENDER, 0x40, "ResourcePackSend", "SPacketResourcePackSend");
+			public static final PacketType RESPAWN =                      new PacketType(PROTOCOL, SENDER, 0x41, "Respawn", "SPacketRespawn");
+			public static final PacketType ENTITY_HEAD_ROTATION =         new PacketType(PROTOCOL, SENDER, 0x42, "EntityHeadRotation", "SPacketEntityHeadLook");
+			public static final PacketType MULTI_BLOCK_CHANGE =           new PacketType(PROTOCOL, SENDER, 0x43, "MultiBlockChange", "SPacketMultiBlockChange");
+			public static final PacketType SELECT_ADVANCEMENT_TAB =       new PacketType(PROTOCOL, SENDER, 0x44, "SelectAdvancementTab", "SPacketSelectAdvancementsTab");
+			public static final PacketType SERVER_DATA =                  new PacketType(PROTOCOL, SENDER, 0x45, "ServerData");
+			public static final PacketType SET_ACTION_BAR_TEXT =          new PacketType(PROTOCOL, SENDER, 0x46, "SetActionBarText");
+			public static final PacketType SET_BORDER_CENTER =            new PacketType(PROTOCOL, SENDER, 0x47, "SetBorderCenter");
+			public static final PacketType SET_BORDER_LERP_SIZE =         new PacketType(PROTOCOL, SENDER, 0x48, "SetBorderLerpSize");
+			public static final PacketType SET_BORDER_SIZE =              new PacketType(PROTOCOL, SENDER, 0x49, "SetBorderSize");
+			public static final PacketType SET_BORDER_WARNING_DELAY =     new PacketType(PROTOCOL, SENDER, 0x4A, "SetBorderWarningDelay");
+			public static final PacketType SET_BORDER_WARNING_DISTANCE =  new PacketType(PROTOCOL, SENDER, 0x4B, "SetBorderWarningDistance");
+			public static final PacketType CAMERA =                       new PacketType(PROTOCOL, SENDER, 0x4C, "Camera", "SPacketCamera");
+			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x4D, "HeldItemSlot", "SPacketHeldItemChange");
+			public static final PacketType VIEW_CENTRE =                  new PacketType(PROTOCOL, SENDER, 0x4E, "ViewCentre");
+			public static final PacketType VIEW_DISTANCE =                new PacketType(PROTOCOL, SENDER, 0x4F, "ViewDistance");
+			public static final PacketType SPAWN_POSITION =               new PacketType(PROTOCOL, SENDER, 0x50, "SpawnPosition", "SPacketSpawnPosition");
+			public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x51, "ScoreboardDisplayObjective", "SPacketDisplayObjective");
+			public static final PacketType ENTITY_METADATA =              new PacketType(PROTOCOL, SENDER, 0x52, "EntityMetadata", "SPacketEntityMetadata");
+			public static final PacketType ATTACH_ENTITY =                new PacketType(PROTOCOL, SENDER, 0x53, "AttachEntity", "SPacketEntityAttach");
+			public static final PacketType ENTITY_VELOCITY =              new PacketType(PROTOCOL, SENDER, 0x54, "EntityVelocity", "SPacketEntityVelocity");
+			public static final PacketType ENTITY_EQUIPMENT =             new PacketType(PROTOCOL, SENDER, 0x55, "EntityEquipment", "SPacketEntityEquipment");
+			public static final PacketType EXPERIENCE =                   new PacketType(PROTOCOL, SENDER, 0x56, "Experience", "SPacketSetExperience");
+			public static final PacketType UPDATE_HEALTH =                new PacketType(PROTOCOL, SENDER, 0x57, "UpdateHealth", "SPacketUpdateHealth");
+			public static final PacketType SCOREBOARD_OBJECTIVE =         new PacketType(PROTOCOL, SENDER, 0x58, "ScoreboardObjective", "SPacketScoreboardObjective");
+			public static final PacketType MOUNT =                        new PacketType(PROTOCOL, SENDER, 0x59, "Mount", "SPacketSetPassengers");
+			public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x5A, "ScoreboardTeam", "SPacketTeams");
+			public static final PacketType SCOREBOARD_SCORE =             new PacketType(PROTOCOL, SENDER, 0x5B, "ScoreboardScore", "SPacketUpdateScore");
+			public static final PacketType UPDATE_SIMULATION_DISTANCE =   new PacketType(PROTOCOL, SENDER, 0x5C, "SetSimulationDistance");
+			public static final PacketType SET_SUBTITLE_TEXT =            new PacketType(PROTOCOL, SENDER, 0x5D, "SetSubtitleText");
+			public static final PacketType UPDATE_TIME =                  new PacketType(PROTOCOL, SENDER, 0x5E, "UpdateTime", "SPacketTimeUpdate");
+			public static final PacketType SET_TITLE_TEXT =               new PacketType(PROTOCOL, SENDER, 0x5F, "SetTitleText");
+			public static final PacketType SET_TITLES_ANIMATION =         new PacketType(PROTOCOL, SENDER, 0x60, "SetTitlesAnimation");
+			public static final PacketType ENTITY_SOUND =                 new PacketType(PROTOCOL, SENDER, 0x61, "EntitySound", "SPacketSoundEffect");
+			public static final PacketType NAMED_SOUND_EFFECT =           new PacketType(PROTOCOL, SENDER, 0x62, "NamedSoundEffect");
+			public static final PacketType STOP_SOUND =                   new PacketType(PROTOCOL, SENDER, 0x63, "StopSound");
+			public static final PacketType SYSTEM_CHAT =                  new PacketType(PROTOCOL, SENDER, 0x64, "SystemChat");
+			public static final PacketType PLAYER_LIST_HEADER_FOOTER =    new PacketType(PROTOCOL, SENDER, 0x65, "PlayerListHeaderFooter", "SPacketPlayerListHeaderFooter");
+			public static final PacketType NBT_QUERY =                    new PacketType(PROTOCOL, SENDER, 0x66, "NBTQuery");
+			public static final PacketType COLLECT =                      new PacketType(PROTOCOL, SENDER, 0x67, "Collect", "SPacketCollectItem");
+			public static final PacketType ENTITY_TELEPORT =              new PacketType(PROTOCOL, SENDER, 0x68, "EntityTeleport", "SPacketEntityTeleport");
+			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x69, "Advancements", "SPacketAdvancementInfo");
+			public static final PacketType UPDATE_ATTRIBUTES =            new PacketType(PROTOCOL, SENDER, 0x6A, "UpdateAttributes", "SPacketEntityProperties");
+			public static final PacketType UPDATE_ENABLED_FEATURES =      new PacketType(PROTOCOL, SENDER, 0x6B, "UpdateEnabledFeatures");
+			public static final PacketType ENTITY_EFFECT =                new PacketType(PROTOCOL, SENDER, 0x6C, "EntityEffect", "SPacketEntityEffect");
+			public static final PacketType RECIPE_UPDATE =                new PacketType(PROTOCOL, SENDER, 0x6D, "RecipeUpdate");
+			public static final PacketType TAGS =                         new PacketType(PROTOCOL, SENDER, 0x6E, "Tags");
 
 			// ---- Removed in 1.9
 
@@ -363,7 +367,7 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 			@Deprecated
 			public static final PacketType CUSTOM_SOUND_EFFECT =          new PacketType(PROTOCOL, SENDER, 0x16, "CustomSoundEffect", "SPacketCustomSound");
 
-			private final static Server INSTANCE = new Server();
+			private static final Server INSTANCE = new Server();
 
 			// Prevent accidental construction
 			private Server() { super(); }
@@ -381,7 +385,7 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		 * @author Kristian
 		 */
 		public static class Client extends PacketTypeEnum {
-			private final static Sender SENDER = Sender.CLIENT;
+			private static final Sender SENDER = Sender.CLIENT;
 
 			public static final PacketType TELEPORT_ACCEPT =              new PacketType(PROTOCOL, SENDER, 0x00, "TeleportAccept", "CPacketConfirmTeleport");
 			public static final PacketType TILE_NBT_QUERY =               new PacketType(PROTOCOL, SENDER, 0x01, "TileNBTQuery");
@@ -389,33 +393,33 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 			public static final PacketType CHAT_ACK =                     new PacketType(PROTOCOL, SENDER, 0x03, "ChatAck");
 			public static final PacketType CHAT_COMMAND =                 new PacketType(PROTOCOL, SENDER, 0x04, "ChatCommand");
 			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x05, "Chat", "CPacketChatMessage");
-			public static final PacketType CLIENT_COMMAND =               new PacketType(PROTOCOL, SENDER, 0x06, "ClientCommand", "CPacketClientStatus");
-			public static final PacketType SETTINGS =                     new PacketType(PROTOCOL, SENDER, 0x07, "Settings", "CPacketClientSettings");
-			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x08, "TabComplete", "CPacketTabComplete");
-			public static final PacketType ENCHANT_ITEM =                 new PacketType(PROTOCOL, SENDER, 0x09, "EnchantItem", "CPacketEnchantItem");
-			public static final PacketType WINDOW_CLICK =                 new PacketType(PROTOCOL, SENDER, 0x0A, "WindowClick", "CPacketClickWindow");
-			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x0B, "CloseWindow", "CPacketCloseWindow");
-			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x0C, "CustomPayload", "CPacketCustomPayload");
-			public static final PacketType B_EDIT =                       new PacketType(PROTOCOL, SENDER, 0x0D, "BEdit");
-			public static final PacketType ENTITY_NBT_QUERY =             new PacketType(PROTOCOL, SENDER, 0x0E, "EntityNBTQuery");
-			public static final PacketType USE_ENTITY =                   new PacketType(PROTOCOL, SENDER, 0x0F, "UseEntity", "CPacketUseEntity");
-			public static final PacketType JIGSAW_GENERATE =              new PacketType(PROTOCOL, SENDER, 0x10, "JigsawGenerate");
-			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x11, "KeepAlive", "CPacketKeepAlive");
-			public static final PacketType DIFFICULTY_LOCK =              new PacketType(PROTOCOL, SENDER, 0x12, "DifficultyLock");
-			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x13, "Flying$PacketPlayInPosition", "Flying$Position", "CPacketPlayer$Position");
-			public static final PacketType POSITION_LOOK =                new PacketType(PROTOCOL, SENDER, 0x14, "Flying$PacketPlayInPositionLook", "Flying$PositionLook", "CPacketPlayer$PositionRotation");
-			public static final PacketType LOOK =                         new PacketType(PROTOCOL, SENDER, 0x15, "Flying$PacketPlayInLook", "Flying$Look", "CPacketPlayer$Rotation");
-			public static final PacketType GROUND =                       new PacketType(PROTOCOL, SENDER, 0x16, "Flying$d");
-			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x17, "VehicleMove", "CPacketVehicleMove");
-			public static final PacketType BOAT_MOVE =                    new PacketType(PROTOCOL, SENDER, 0x18, "BoatMove", "CPacketSteerBoat");
-			public static final PacketType PICK_ITEM =                    new PacketType(PROTOCOL, SENDER, 0x19, "PickItem");
-			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x1A, "AutoRecipe", "CPacketPlaceRecipe");
-			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x1B, "Abilities", "CPacketPlayerAbilities");
-			public static final PacketType BLOCK_DIG =                    new PacketType(PROTOCOL, SENDER, 0x1C, "BlockDig", "CPacketPlayerDigging");
-			public static final PacketType ENTITY_ACTION =                new PacketType(PROTOCOL, SENDER, 0x1D, "EntityAction", "CPacketEntityAction");
-			public static final PacketType STEER_VEHICLE =                new PacketType(PROTOCOL, SENDER, 0x1E, "SteerVehicle", "CPacketInput");
-			public static final PacketType PONG =                         new PacketType(PROTOCOL, SENDER, 0x1F, "Pong");
-			public static final PacketType CHAT_SESSION_UPDATE =          new PacketType(PROTOCOL, SENDER, 0x20, "ChatSessionUpdate");
+			public static final PacketType CHAT_SESSION_UPDATE =          new PacketType(PROTOCOL, SENDER, 0x06, "ChatSessionUpdate");
+			public static final PacketType CLIENT_COMMAND =               new PacketType(PROTOCOL, SENDER, 0x07, "ClientCommand", "CPacketClientStatus");
+			public static final PacketType SETTINGS =                     new PacketType(PROTOCOL, SENDER, 0x08, "Settings", "CPacketClientSettings");
+			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x09, "TabComplete", "CPacketTabComplete");
+			public static final PacketType ENCHANT_ITEM =                 new PacketType(PROTOCOL, SENDER, 0x0A, "EnchantItem", "CPacketEnchantItem");
+			public static final PacketType WINDOW_CLICK =                 new PacketType(PROTOCOL, SENDER, 0x0B, "WindowClick", "CPacketClickWindow");
+			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x0C, "CloseWindow", "CPacketCloseWindow");
+			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x0D, "CustomPayload", "CPacketCustomPayload");
+			public static final PacketType B_EDIT =                       new PacketType(PROTOCOL, SENDER, 0x0E, "BEdit");
+			public static final PacketType ENTITY_NBT_QUERY =             new PacketType(PROTOCOL, SENDER, 0x0F, "EntityNBTQuery");
+			public static final PacketType USE_ENTITY =                   new PacketType(PROTOCOL, SENDER, 0x10, "UseEntity", "CPacketUseEntity");
+			public static final PacketType JIGSAW_GENERATE =              new PacketType(PROTOCOL, SENDER, 0x11, "JigsawGenerate");
+			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x12, "KeepAlive", "CPacketKeepAlive");
+			public static final PacketType DIFFICULTY_LOCK =              new PacketType(PROTOCOL, SENDER, 0x13, "DifficultyLock");
+			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x14, "Flying$Position", "Flying$PacketPlayInPosition", "CPacketPlayer$Position");
+			public static final PacketType POSITION_LOOK =                new PacketType(PROTOCOL, SENDER, 0x15, "Flying$PositionLook", "Flying$PacketPlayInPositionLook", "CPacketPlayer$PositionRotation");
+			public static final PacketType LOOK =                         new PacketType(PROTOCOL, SENDER, 0x16, "Flying$Look", "Flying$PacketPlayInLook", "CPacketPlayer$Rotation");
+			public static final PacketType GROUND =                       new PacketType(PROTOCOL, SENDER, 0x17, "Flying$d");
+			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x18, "VehicleMove", "CPacketVehicleMove");
+			public static final PacketType BOAT_MOVE =                    new PacketType(PROTOCOL, SENDER, 0x19, "BoatMove", "CPacketSteerBoat");
+			public static final PacketType PICK_ITEM =                    new PacketType(PROTOCOL, SENDER, 0x1A, "PickItem");
+			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x1B, "AutoRecipe", "CPacketPlaceRecipe");
+			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x1C, "Abilities", "CPacketPlayerAbilities");
+			public static final PacketType BLOCK_DIG =                    new PacketType(PROTOCOL, SENDER, 0x1D, "BlockDig", "CPacketPlayerDigging");
+			public static final PacketType ENTITY_ACTION =                new PacketType(PROTOCOL, SENDER, 0x1E, "EntityAction", "CPacketEntityAction");
+			public static final PacketType STEER_VEHICLE =                new PacketType(PROTOCOL, SENDER, 0x1F, "SteerVehicle", "CPacketInput");
+			public static final PacketType PONG =                         new PacketType(PROTOCOL, SENDER, 0x20, "Pong");
 			public static final PacketType RECIPE_SETTINGS =              new PacketType(PROTOCOL, SENDER, 0x21, "RecipeSettings");
 			public static final PacketType RECIPE_DISPLAYED =             new PacketType(PROTOCOL, SENDER, 0x22, "RecipeDisplayed", "CPacketRecipeInfo");
 			public static final PacketType ITEM_NAME =                    new PacketType(PROTOCOL, SENDER, 0x23, "ItemName");
@@ -453,7 +457,7 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 			@Deprecated
 			public static final PacketType CHAT_PREVIEW =                 new PacketType(PROTOCOL, SENDER, 0x06, "ChatPreview");
 
-			private final static Client INSTANCE = new Client();
+			private static final Client INSTANCE = new Client();
 
 			// Prevent accidental construction
 			private Client() { super(); }
@@ -476,14 +480,14 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 	 * @author Kristian
 	 */
 	public static class Status {
-		private static final Protocol PROTOCOL = Protocol.STATUS;
+		static final Protocol PROTOCOL = Protocol.STATUS;
 
 		/**
 		 * Outgoing packets.
 		 * @author Kristian
 		 */
 		public static class Server extends PacketTypeEnum {
-			private final static Sender SENDER = Sender.SERVER;
+			private static final Sender SENDER = Sender.SERVER;
 
 			@ForceAsync
 			public static final PacketType SERVER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x00, "ServerInfo", "SPacketServerInfo");
@@ -497,7 +501,7 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 			@ForceAsync
 			public static final PacketType OUT_SERVER_INFO =              SERVER_INFO.clone();
 
-			private final static Server INSTANCE = new Server();
+			private static final Server INSTANCE = new Server();
 
 			// Prevent accidental construction
 			private Server() { super(); }
@@ -515,13 +519,13 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		 * @author Kristian
 		 */
 		public static class Client extends PacketTypeEnum {
-			private final static Sender SENDER = Sender.CLIENT;
+			private static final Sender SENDER = Sender.CLIENT;
 
 			public static final PacketType START =                        new PacketType(PROTOCOL, SENDER, 0x00, "Start", "CPacketServerQuery");
 			@ForceAsync
 			public static final PacketType PING =                         new PacketType(PROTOCOL, SENDER, 0x01, "Ping", "CPacketPing");
 
-			private final static Client INSTANCE = new Client();
+			private static final Client INSTANCE = new Client();
 
 			// Prevent accidental construction
 			private Client() { super(); }
@@ -544,22 +548,23 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 	 * @author Kristian
 	 */
 	public static class Login {
-		private static final Protocol PROTOCOL = Protocol.LOGIN;
+		static final Protocol PROTOCOL = Protocol.LOGIN;
 
 		/**
 		 * Outgoing packets.
 		 * @author Kristian
 		 */
 		public static class Server extends PacketTypeEnum {
-			private final static Sender SENDER = Sender.SERVER;
+			private static final Sender SENDER = Sender.SERVER;
 
+			@ForceAsync
 			public static final PacketType DISCONNECT =                   new PacketType(PROTOCOL, SENDER, 0x00, "Disconnect", "SPacketDisconnect");
 			public static final PacketType ENCRYPTION_BEGIN =             new PacketType(PROTOCOL, SENDER, 0x01, "EncryptionBegin", "SPacketEncryptionRequest");
 			public static final PacketType SUCCESS =                      new PacketType(PROTOCOL, SENDER, 0x02, "Success", "SPacketLoginSuccess");
 			public static final PacketType SET_COMPRESSION =              new PacketType(PROTOCOL, SENDER, 0x03, "SetCompression", "SPacketEnableCompression");
 			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x04, "CustomPayload", "SPacketCustomPayload");
 
-			private final static Server INSTANCE = new Server();
+			private static final Server INSTANCE = new Server();
 
 			// Prevent accidental construction
 			private Server() { super(); }
@@ -577,13 +582,13 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		 * @author Kristian
 		 */
 		public static class Client extends PacketTypeEnum {
-			private final static Sender SENDER = Sender.CLIENT;
+			private static final Sender SENDER = Sender.CLIENT;
 
 			public static final PacketType START =                        new PacketType(PROTOCOL, SENDER, 0x00, "Start", "CPacketLoginStart");
 			public static final PacketType ENCRYPTION_BEGIN =             new PacketType(PROTOCOL, SENDER, 0x01, "EncryptionBegin", "CPacketEncryptionResponse");
 			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x02, "CustomPayload", "CPacketCustomPayload");
 
-			private final static Client INSTANCE = new Client();
+			private static final Client INSTANCE = new Client();
 
 			// Prevent accidental construction
 			private Client() { super(); }

src/main/java/com/comphenix/protocol/async/AsyncMarker.java

@@ -414,7 +414,7 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 				} else if (methods.size() == 1) {
 					// We're in 1.2.5
 					alwaysSync = true;
-				} else if (MinecraftVersion.getCurrentVersion().isAtLeast(MinecraftVersion.BOUNTIFUL_UPDATE)) {
+				} else if (MinecraftVersion.BOUNTIFUL_UPDATE.atOrAbove()) {
 					// The centralized async marker was removed in 1.8
 					// Incoming chat packets can be async
 					if (event.getPacketType() == PacketType.Play.Client.CHAT) {

src/main/java/com/comphenix/protocol/events/AbstractStructure.java

@@ -761,11 +761,31 @@ public abstract class AbstractStructure {
                 EnumWrappers.getSoundCategoryConverter());
     }
 
+    /**
+     * Retrieve a read/write structure for a Holder<T> in 1.19.3.
+     * @param genericType NMS type of T
+     * @param converter Converter from genericType to T
+     * @return A modifier for Holder fields
+     * @param <T> Bukkit type
+     */
+    public <T> StructureModifier<T> getHolders(Class<?> genericType,
+                                               EquivalentConverter<T> converter) {
+        return structureModifier.withParamType(
+                MinecraftReflection.getHolderClass(),
+                Converters.holder(converter, WrappedRegistry.getRegistry(genericType)),
+                genericType
+        );
+    }
+
     /**
      * Retrieve a read/write structure for the SoundEffect enum in 1.9.
      * @return A modifier for SoundEffect enum fields.
      */
     public StructureModifier<Sound> getSoundEffects() {
+        if (MinecraftVersion.FEATURE_PREVIEW_UPDATE.atOrAbove()) {
+            return getHolders(MinecraftReflection.getSoundEffectClass(), BukkitConverters.getSoundConverter());
+        }
+
         // Convert to and from Bukkit
         return structureModifier.withType(
                 MinecraftReflection.getSoundEffectClass(),
@@ -926,6 +946,12 @@ public abstract class AbstractStructure {
         );
     }
 
+    public StructureModifier<List<UUID>> getUUIDLists() {
+        return structureModifier.withType(
+                List.class,
+                BukkitConverters.getListConverter(Converters.passthrough(UUID.class)));
+    }
+
     /**
      * Retrieve a read/write structure for Instants in (mostly for use in 1.19+)
      * @return The Structure Modifier
@@ -1095,6 +1121,12 @@ public abstract class AbstractStructure {
         return structureModifier.withType(Optional.class, Converters.optional(converter));
     }
 
+    public StructureModifier<Iterable<PacketContainer>> getPacketBundles() {
+        return structureModifier.withType(Iterable.class, Converters.iterable(
+            BukkitConverters.getPacketContainerConverter(), ArrayList::new, ArrayList::new
+        ));
+    }
+
     /**
      * Represents an equivalent converter for ItemStack arrays.
      * @author Kristian

src/main/java/com/comphenix/protocol/events/InternalStructure.java

@@ -8,7 +8,7 @@ import com.comphenix.protocol.wrappers.Converters;
 
 public class InternalStructure extends AbstractStructure {
 
-    protected InternalStructure(Object handle, StructureModifier<Object> structureModifier) {
+    public InternalStructure(Object handle, StructureModifier<Object> structureModifier) {
         super(handle, structureModifier);
     }
 

src/main/java/com/comphenix/protocol/events/PacketEvent.java

@@ -40,6 +40,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import javax.annotation.Nullable;
+
 /**
  * Represents a packet sending or receiving event. Changes to the packet will be reflected in the final version to be
  * sent or received. It is also possible to cancel an event.
@@ -70,6 +72,9 @@ public class PacketEvent extends EventObject implements Cancellable {
 	private boolean readOnly;
 	private boolean filtered;
 
+	@Nullable
+	private PacketEvent bundle;
+
 	/**
 	 * Use the static constructors to create instances of this event.
 	 *
@@ -81,27 +86,28 @@ public class PacketEvent extends EventObject implements Cancellable {
 	}
 
 	private PacketEvent(Object source, PacketContainer packet, Player player, boolean serverPacket) {
-		this(source, packet, null, player, serverPacket, true);
+		this(source, packet, null, player, serverPacket, true, null);
 	}
 
 	private PacketEvent(Object source, PacketContainer packet, NetworkMarker marker, Player player, boolean serverPacket,
-			boolean filtered) {
+			boolean filtered, @Nullable PacketEvent bundleEvent) {
 		super(source);
 		this.packet = packet;
 		this.playerReference = new WeakReference<>(player);
 		this.networkMarker = marker;
 		this.serverPacket = serverPacket;
 		this.filtered = filtered;
+		this.bundle = bundleEvent;
 	}
 
-	private PacketEvent(PacketEvent origial, AsyncMarker asyncMarker) {
-		super(origial.source);
-		this.packet = origial.packet;
-		this.playerReference = origial.getPlayerReference();
-		this.cancel = origial.cancel;
-		this.serverPacket = origial.serverPacket;
-		this.filtered = origial.filtered;
-		this.networkMarker = origial.networkMarker;
+	private PacketEvent(PacketEvent original, AsyncMarker asyncMarker) {
+		super(original.source);
+		this.packet = original.packet;
+		this.playerReference = original.getPlayerReference();
+		this.cancel = original.cancel;
+		this.serverPacket = original.serverPacket;
+		this.filtered = original.filtered;
+		this.networkMarker = original.networkMarker;
 		this.asyncMarker = asyncMarker;
 		this.asynchronous = true;
 	}
@@ -128,7 +134,7 @@ public class PacketEvent extends EventObject implements Cancellable {
 	 * @return The event.
 	 */
 	public static PacketEvent fromClient(Object source, PacketContainer packet, NetworkMarker marker, Player client) {
-		return new PacketEvent(source, packet, marker, client, false, true);
+		return new PacketEvent(source, packet, marker, client, false, true, null);
 	}
 
 	/**
@@ -145,7 +151,7 @@ public class PacketEvent extends EventObject implements Cancellable {
 	 */
 	public static PacketEvent fromClient(Object source, PacketContainer packet, NetworkMarker marker, Player client,
 			boolean filtered) {
-		return new PacketEvent(source, packet, marker, client, false, filtered);
+		return new PacketEvent(source, packet, marker, client, false, filtered, null);
 	}
 
 	/**
@@ -170,7 +176,7 @@ public class PacketEvent extends EventObject implements Cancellable {
 	 * @return The event.
 	 */
 	public static PacketEvent fromServer(Object source, PacketContainer packet, NetworkMarker marker, Player recipient) {
-		return new PacketEvent(source, packet, marker, recipient, true, true);
+		return new PacketEvent(source, packet, marker, recipient, true, true, null);
 	}
 
 	/**
@@ -187,7 +193,25 @@ public class PacketEvent extends EventObject implements Cancellable {
 	 */
 	public static PacketEvent fromServer(Object source, PacketContainer packet, NetworkMarker marker, Player recipient,
 			boolean filtered) {
-		return new PacketEvent(source, packet, marker, recipient, true, filtered);
+		return fromServer(source, packet, marker, recipient, filtered, null);
+	}
+
+	/**
+	 * Creates an event representing a server packet transmission.
+	 * <p>
+	 * If <i>filtered</i> is FALSE, then this event is only processed by packet monitors.
+	 *
+	 * @param source    - the event source.
+	 * @param packet    - the packet.
+	 * @param marker    - the network marker.
+	 * @param recipient - the client that will receieve the packet.
+	 * @param filtered  - whether this packet event is processed by every packet listener.
+	 * @param bundle    - The corresponding packet event of the bundle if this packet is part of a bundle. Otherwise, null.
+	 * @return The event.
+	 */
+	public static PacketEvent fromServer(Object source, PacketContainer packet, NetworkMarker marker, Player recipient,
+			boolean filtered, @Nullable PacketEvent bundle) {
+		return new PacketEvent(source, packet, marker, recipient, true, filtered, bundle);
 	}
 
 	/**
@@ -517,6 +541,15 @@ public class PacketEvent extends EventObject implements Cancellable {
 		}
 	}
 
+	/**
+	 * Returns the packet event corresponding to the bundle if this packet is sent as a part of a bundle, t. Otherwise, null.
+	 * @return Corresponding packet event or null.
+	 */
+	@Nullable
+	public PacketEvent getBundle() {
+		return bundle;
+	}
+
 	@Override
 	public String toString() {
 		return "PacketEvent[player=" + getPlayer() + ", packet=" + packet + "]";

src/main/java/com/comphenix/protocol/events/PacketOutputHandler.java

@@ -28,7 +28,7 @@ public interface PacketOutputHandler {
 	 * Note that the buffer is initially filled with the output from the default write method.
 	 * <p>
 	 * In Minecraft 1.6.4, the header is always excluded, whereas it MUST be included in Minecraft 1.7.2. Call 
-	 * {@link NetworkMarker#requireOutputHeader()} to determine this.
+	 * NetworkMarker#requireOutputHeader() to determine this.
 	 * @param event - the packet that will be outputted.
 	 * @param buffer - the data that is currently scheduled to be outputted.
 	 * @return The modified byte array to write. NULL is not permitted.

src/main/java/com/comphenix/protocol/injector/EntityUtilities.java

@@ -178,7 +178,9 @@ class EntityUtilities {
 		Validate.notNull(entity, "entity cannot be null");
 
 		Object trackerEntry = this.getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
-		Validate.notNull(trackerEntry, "Could not find entity trackers for " + entity);
+		if (trackerEntry == null) { //entity.toString() is too expensive to be called every time
+			throw new IllegalArgumentException("Could not find entity trackers for " + entity);
+		}
 
 		if (this.trackedPlayersField == null) {
 			this.trackedPlayersField = Accessors.getFieldAccessor(

src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java

@@ -306,6 +306,10 @@ public class PacketFilterManager implements ListenerInvoker, InternalManager {
 			ListeningWhitelist outbound = listener.getSendingWhitelist();
 			ListeningWhitelist inbound = listener.getReceivingWhitelist();
 
+			// Remove packets from the lists if they are not supposed to be in those lists
+			inbound.getTypes().removeIf(type -> !type.isClient());
+			outbound.getTypes().removeIf(type -> !type.isServer());
+
 			// verify plugin if needed
 			if (this.shouldVerifyPlugin(outbound, inbound)) {
 				this.printPluginWarnings(listener.getPlugin());

src/main/java/com/comphenix/protocol/injector/SortedPacketListenerList.java

@@ -17,17 +17,25 @@
 
 package com.comphenix.protocol.injector;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
+import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.concurrency.AbstractConcurrentListenerMultimap;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
+import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.timing.TimedListenerManager;
 import com.comphenix.protocol.timing.TimedListenerManager.ListenerType;
 import com.comphenix.protocol.timing.TimedTracker;
 
+import javax.annotation.Nullable;
+
 /**
  * Registry of synchronous packet listeners.
  * 
@@ -108,14 +116,12 @@ public final class SortedPacketListenerList extends AbstractConcurrentListenerMu
 	 * @param event - the related packet event.
 	 * @param element - the listener to invoke.
 	 */
-	private final void invokeReceivingListener(ErrorReporter reporter, PacketEvent event, PrioritizedListener<PacketListener> element) {
+	private void invokeReceivingListener(ErrorReporter reporter, PacketEvent event, PrioritizedListener<PacketListener> element) {
 		try {
 			event.setReadOnly(element.getPriority() == ListenerPriority.MONITOR);
 			element.getListener().onPacketReceiving(event);
 			
-		} catch (OutOfMemoryError e) {
-			throw e;
-		} catch (ThreadDeath e) {
+		} catch (OutOfMemoryError | ThreadDeath e) {
 			throw e;
 		} catch (Throwable e) {
 			// Minecraft doesn't want your Exception.
@@ -130,73 +136,78 @@ public final class SortedPacketListenerList extends AbstractConcurrentListenerMu
 	 * @param event - the packet event to invoke.
 	 */
 	public void invokePacketSending(ErrorReporter reporter, PacketEvent event) {
-		Collection<PrioritizedListener<PacketListener>> list = getListener(event.getPacketType());
-		
-		if (list == null)
-			return;
-		
-		if (timedManager.isTiming()) {
-			for (PrioritizedListener<PacketListener> element : list) {
-				TimedTracker tracker = timedManager.getTracker(element.getListener(), ListenerType.SYNC_SERVER_SIDE);
-				long token = tracker.beginTracking();
-				
-				// Measure and record the execution time
-				invokeSendingListener(reporter, event, element);
-				tracker.endTracking(token, event.getPacketType());
-			}
-		} else {
-			for (PrioritizedListener<PacketListener> element : list) {
-				invokeSendingListener(reporter, event, element);
-			}
-		}
+		invokePacketSending(reporter, event, null);
 	}
 	
 	/**
 	 * Invokes the given packet event for every registered listener of the given priority.
 	 * @param reporter - the error reporter that will be used to inform about listener exceptions.
 	 * @param event - the packet event to invoke.
-	 * @param priorityFilter - the required priority for a listener to be invoked.
+	 * @param priorityFilter - the priority for a listener to be invoked. If null is provided, every registered listener will be invoked
 	 */
-	public void invokePacketSending(ErrorReporter reporter, PacketEvent event, ListenerPriority priorityFilter) {
+	public void invokePacketSending(ErrorReporter reporter, PacketEvent event, @Nullable ListenerPriority priorityFilter) {
+		invokeUnpackedPacketSending(reporter, event, priorityFilter);
+		if (event.getPacketType() == PacketType.Play.Server.BUNDLE && !event.isCancelled()) {
+			// unpack the bundle and invoke for each packet in the bundle
+			Iterable<PacketContainer> packets = event.getPacket().getPacketBundles().read(0);
+			List<PacketContainer> outPackets = new ArrayList<>();
+			for (PacketContainer subPacket : packets) {
+				PacketEvent subPacketEvent = PacketEvent.fromServer(this, subPacket, event.getNetworkMarker(), event.getPlayer());
+				invokeUnpackedPacketSending(reporter, subPacketEvent, priorityFilter);
+
+				if (!subPacketEvent.isCancelled()) {
+					// if the packet event has been cancelled, the packet will be removed from the bundle
+					outPackets.add(subPacketEvent.getPacket());
+				}
+			}
+
+			if (packets.iterator().hasNext()) {
+				event.getPacket().getPacketBundles().write(0, outPackets);
+			} else {
+				// cancel entire packet if each individual packet has been cancelled
+				event.setCancelled(true);
+			}
+		}
+	}
+
+	private void invokeUnpackedPacketSending(ErrorReporter reporter, PacketEvent event, @org.jetbrains.annotations.Nullable ListenerPriority priorityFilter) {
 		Collection<PrioritizedListener<PacketListener>> list = getListener(event.getPacketType());
-		
+
 		if (list == null)
 			return;
-		
+
 		if (timedManager.isTiming()) {
 			for (PrioritizedListener<PacketListener> element : list) {
-				if (element.getPriority() == priorityFilter) {
-				TimedTracker tracker = timedManager.getTracker(element.getListener(), ListenerType.SYNC_SERVER_SIDE);
-				long token = tracker.beginTracking();
-				
-				// Measure and record the execution time
-				invokeSendingListener(reporter, event, element);
-				tracker.endTracking(token, event.getPacketType());
+				if (priorityFilter == null || element.getPriority() == priorityFilter) {
+					TimedTracker tracker = timedManager.getTracker(element.getListener(), ListenerType.SYNC_SERVER_SIDE);
+					long token = tracker.beginTracking();
+
+					// Measure and record the execution time
+					invokeSendingListener(reporter, event, element);
+					tracker.endTracking(token, event.getPacketType());
 				}
 			}
 		} else {
 			for (PrioritizedListener<PacketListener> element : list) {
-				if (element.getPriority() == priorityFilter) {
+				if (priorityFilter == null || element.getPriority() == priorityFilter) {
 					invokeSendingListener(reporter, event, element);
 				}
 			}
 		}
 	}
-	
+
 	/**
 	 * Invoke a particular sending listener.
 	 * @param reporter - the error reporter.
 	 * @param event - the related packet event.
 	 * @param element - the listener to invoke.
 	 */
-	private final void invokeSendingListener(ErrorReporter reporter, PacketEvent event, PrioritizedListener<PacketListener> element) {
+	private void invokeSendingListener(ErrorReporter reporter, PacketEvent event, PrioritizedListener<PacketListener> element) {
 		try {
 			event.setReadOnly(element.getPriority() == ListenerPriority.MONITOR);
 			element.getListener().onPacketSending(event);
 			
-		} catch (OutOfMemoryError e) {
-			throw e;
-		} catch (ThreadDeath e) {
+		} catch (OutOfMemoryError | ThreadDeath e) {
 			throw e;
 		} catch (Throwable e) {
 			// Minecraft doesn't want your Exception.

src/main/java/com/comphenix/protocol/injector/StructureCache.java

@@ -54,7 +54,9 @@ public class StructureCache {
 	private static final Map<PacketType, StructureModifier<Object>> STRUCTURE_MODIFIER_CACHE = new ConcurrentHashMap<>();
 
 	// packet data serializer which always returns an empty nbt tag compound
+	private static final Object TRICK_INIT_LOCK = new Object();
 	private static boolean TRICK_TRIED = false;
+
 	private static ConstructorAccessor TRICKED_DATA_SERIALIZER_BASE;
 	private static ConstructorAccessor TRICKED_DATA_SERIALIZER_JSON;
 
@@ -135,6 +137,12 @@ public class StructureCache {
 
 		return STRUCTURE_MODIFIER_CACHE.computeIfAbsent(packetType, type -> {
 			Class<?> packetClass = PacketRegistry.getPacketClassFromType(type);
+
+			// We need to map the Bundle Delimiter to the synthetic bundle packet which contains a list of all packets in a bundle
+			if (MinecraftReflection.isBundleDelimiter(packetClass)) {
+				packetClass = MinecraftReflection.getPackedBundlePacketClass().get();
+			}
+
 			return new StructureModifier<>(packetClass, MinecraftReflection.getPacketClass(), true);
 		});
 	}
@@ -158,45 +166,50 @@ public class StructureCache {
 			return TRICKED_DATA_SERIALIZER_BASE != null;
 		}
 
-		// prevent double init
-		TRICK_TRIED = true;
+		synchronized (TRICK_INIT_LOCK) {
+			if (TRICK_TRIED) {
+				return TRICKED_DATA_SERIALIZER_BASE != null;
+			}
 
-		try {
-			// create an empty instance of a nbt tag compound / text compound that we can re-use when needed
-			Object textCompound = WrappedChatComponent.fromText("").getHandle();
-			Object compound = Accessors.getConstructorAccessor(MinecraftReflection.getNBTCompoundClass()).invoke();
-			// base builder which intercepts a few methods
-			DynamicType.Builder<?> baseBuilder = ByteBuddyFactory.getInstance()
-					.createSubclass(MinecraftReflection.getPacketDataSerializerClass())
-					.name(MinecraftMethods.class.getPackage().getName() + ".ProtocolLibTricksNmsDataSerializerBase")
-					.method(ElementMatchers.returns(MinecraftReflection.getNBTCompoundClass())
-							.and(ElementMatchers.takesArguments(MinecraftReflection.getNBTReadLimiterClass())))
-					.intercept(FixedValue.value(compound))
-					.method(ElementMatchers.returns(MinecraftReflection.getIChatBaseComponentClass()))
-					.intercept(FixedValue.value(textCompound))
-					.method(ElementMatchers.returns(PublicKey.class).and(ElementMatchers.takesNoArguments()))
-					.intercept(FixedValue.nullValue());
-			Class<?> serializerBase = baseBuilder.make()
-					.load(ByteBuddyFactory.getInstance().getClassLoader(), Default.INJECTION)
-					.getLoaded();
-			TRICKED_DATA_SERIALIZER_BASE = Accessors.getConstructorAccessor(serializerBase, ByteBuf.class);
+			try {
+				// create an empty instance of a nbt tag compound / text compound that we can re-use when needed
+				Object textCompound = WrappedChatComponent.fromText("").getHandle();
+				Object compound = Accessors.getConstructorAccessor(MinecraftReflection.getNBTCompoundClass()).invoke();
+				// base builder which intercepts a few methods
+				DynamicType.Builder<?> baseBuilder = ByteBuddyFactory.getInstance()
+						.createSubclass(MinecraftReflection.getPacketDataSerializerClass())
+						.name(MinecraftMethods.class.getPackage().getName() + ".ProtocolLibTricksNmsDataSerializerBase")
+						.method(ElementMatchers.returns(MinecraftReflection.getNBTCompoundClass())
+								.and(ElementMatchers.takesArguments(MinecraftReflection.getNBTReadLimiterClass())))
+						.intercept(FixedValue.value(compound))
+						.method(ElementMatchers.returns(MinecraftReflection.getIChatBaseComponentClass()))
+						.intercept(FixedValue.value(textCompound))
+						.method(ElementMatchers.returns(PublicKey.class).and(ElementMatchers.takesNoArguments()))
+						.intercept(FixedValue.nullValue());
+				Class<?> serializerBase = baseBuilder.make()
+						.load(ByteBuddyFactory.getInstance().getClassLoader(), Default.INJECTION)
+						.getLoaded();
+				TRICKED_DATA_SERIALIZER_BASE = Accessors.getConstructorAccessor(serializerBase, ByteBuf.class);
 
-			// extended builder which intercepts the read string method as well
-			Class<?> withStringIntercept = baseBuilder
-					.name(MinecraftMethods.class.getPackage().getName() + ".ProtocolLibTricksNmsDataSerializerJson")
-					.method(ElementMatchers.returns(String.class).and(ElementMatchers.takesArguments(int.class)))
-					.intercept(FixedValue.value("{}"))
-					.make()
-					.load(ByteBuddyFactory.getInstance().getClassLoader(), Default.INJECTION)
-					.getLoaded();
-			TRICKED_DATA_SERIALIZER_JSON = Accessors.getConstructorAccessor(withStringIntercept, ByteBuf.class);
+				// extended builder which intercepts the read string method as well
+				Class<?> withStringIntercept = baseBuilder
+						.name(MinecraftMethods.class.getPackage().getName() + ".ProtocolLibTricksNmsDataSerializerJson")
+						.method(ElementMatchers.returns(String.class).and(ElementMatchers.takesArguments(int.class)))
+						.intercept(FixedValue.value("{}"))
+						.make()
+						.load(ByteBuddyFactory.getInstance().getClassLoader(), Default.INJECTION)
+						.getLoaded();
+				TRICKED_DATA_SERIALIZER_JSON = Accessors.getConstructorAccessor(withStringIntercept, ByteBuf.class);
 
-			// worked
-			return true;
-		} catch (Exception ignored) {
+				// worked
+				return true;
+			} catch (Exception ignored) {
+			} finally {
+				TRICK_TRIED = true;
+			}
+
+			// didn't work
+			return false;
 		}
-
-		// didn't work
-		return false;
 	}
 }

src/main/java/com/comphenix/protocol/injector/netty/channel/NettyChannelInjector.java

@@ -27,12 +27,7 @@ import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
-import com.comphenix.protocol.utility.ByteBuddyGenerated;
-import com.comphenix.protocol.utility.MinecraftFields;
-import com.comphenix.protocol.utility.MinecraftMethods;
-import com.comphenix.protocol.utility.MinecraftProtocolVersion;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.utility.*;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
@@ -101,7 +96,7 @@ public class NettyChannelInjector implements Injector {
 
 	// packet marking
 	private final Map<Object, NetworkMarker> savedMarkers = new WeakHashMap<>(16, 0.9f);
-	private final Set<Object> skippedPackets = Collections.synchronizedSet(new HashSet<>());
+	private final Set<Object> skippedPackets = ConcurrentHashMap.newKeySet();
 	protected final ThreadLocal<Boolean> processedPackets = ThreadLocal.withInitial(() -> Boolean.FALSE);
 
 	// status of this injector
@@ -553,7 +548,7 @@ public class NettyChannelInjector implements Injector {
 		}
 
 		// no listener and no marker - no magic :)
-		if (!this.channelListener.hasListener(packet.getClass()) && marker == null) {
+		if (!this.channelListener.hasListener(packet.getClass()) && marker == null && !MinecraftReflection.isBundlePacket(packet.getClass())) {
 			return action;
 		}
 

src/main/java/com/comphenix/protocol/injector/netty/manager/NetworkManagerInjector.java

@@ -28,6 +28,7 @@ import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.Util;
 import com.comphenix.protocol.wrappers.Pair;
 import io.netty.channel.ChannelFuture;
 import org.bukkit.Server;
@@ -90,7 +91,7 @@ public class NetworkManagerInjector implements ChannelListener {
 	public PacketEvent onPacketSending(Injector injector, Object packet, NetworkMarker marker) {
 		// check if we need to intercept the packet
 		Class<?> packetClass = packet.getClass();
-		if (this.outboundListeners.contains(packetClass) || marker != null) {
+		if (marker != null || MinecraftReflection.isBundlePacket(packetClass) || outboundListeners.contains(packetClass)) {
 			// wrap packet and construct the event
 			PacketContainer container = new PacketContainer(PacketRegistry.getPacketType(packetClass), packet);
 			PacketEvent packetEvent = PacketEvent.fromServer(this, container, marker, injector.getPlayer());
@@ -108,7 +109,7 @@ public class NetworkManagerInjector implements ChannelListener {
 	public PacketEvent onPacketReceiving(Injector injector, Object packet, NetworkMarker marker) {
 		// check if we need to intercept the packet
 		Class<?> packetClass = packet.getClass();
-		if (this.inboundListeners.contains(packetClass) || marker != null) {
+		if (marker != null || inboundListeners.contains(packetClass)) {
 			// wrap the packet and construct the event
 			PacketContainer container = new PacketContainer(PacketRegistry.getPacketType(packetClass), packet);
 			PacketEvent packetEvent = PacketEvent.fromClient(this, container, marker, injector.getPlayer());

src/main/java/com/comphenix/protocol/injector/packet/PacketRegistry.java

@@ -30,6 +30,7 @@ import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.utility.Util;
 
 /**
  * Static packet registry in Minecraft.
@@ -45,12 +46,12 @@ public class PacketRegistry {
 	 */
 	protected static class Register {
 		// The main lookup table
-		private final Map<PacketType, Optional<Class<?>>> typeToClass = new ConcurrentHashMap<>();
-		private final Map<Class<?>, PacketType> classToType = new ConcurrentHashMap<>();
+		final Map<PacketType, Optional<Class<?>>> typeToClass = new ConcurrentHashMap<>();
+		final Map<Class<?>, PacketType> classToType = new ConcurrentHashMap<>();
 
-		private volatile Set<PacketType> serverPackets = new HashSet<>();
-		private volatile Set<PacketType> clientPackets = new HashSet<>();
-		private final List<MapContainer> containers = new ArrayList<>();
+		volatile Set<PacketType> serverPackets = new HashSet<>();
+		volatile Set<PacketType> clientPackets = new HashSet<>();
+		final List<MapContainer> containers = new ArrayList<>();
 
 		public Register() {}
 
@@ -251,10 +252,17 @@ public class PacketRegistry {
 
 	protected static void associatePackets(Register register, Map<Integer, Class<?>> lookup, PacketType.Protocol protocol, Sender sender) {
 		for (Map.Entry<Integer, Class<?>> entry : lookup.entrySet()) {
-			PacketType type = PacketType.fromCurrent(protocol, sender, entry.getKey(), entry.getValue());
+			int packetId = entry.getKey();
+			Class<?> packetClass = entry.getValue();
+
+			if (MinecraftReflection.isBundleDelimiter(packetClass)) {
+				continue;
+			}
+
+			PacketType type = PacketType.fromCurrent(protocol, sender, packetId, packetClass);
 
 			try {
-				register.registerPacket(type, entry.getValue(), sender);
+				register.registerPacket(type, packetClass, sender);
 			} catch (Exception ex) {
 				ProtocolLogger.debug("Encountered an exception associating packet " + type, ex);
 			}
@@ -270,18 +278,28 @@ public class PacketRegistry {
 		}
 	}
 
+	private static final Object registryLock = new Object();
+
 	/**
 	 * Initializes the packet registry.
 	 */
 	private static void initialize() {
-		if (!INITIALIZED) {
-			INITIALIZED = true;
+		if (INITIALIZED) {
+			return;
+		}
+
+		synchronized (registryLock) {
+			if (INITIALIZED) {
+				return;
+			}
 
 			if (MinecraftVersion.BEE_UPDATE.atOrAbove()) {
 				REGISTER = createNewRegister();
 			} else {
 				REGISTER = createOldRegister();
 			}
+
+			INITIALIZED = true;
 		}
 	}
 
@@ -383,6 +401,11 @@ public class PacketRegistry {
 	 */
 	public static PacketType getPacketType(Class<?> packet) {
 		initialize();
+
+		if (MinecraftReflection.isBundlePacket(packet)) {
+			return PacketType.Play.Server.BUNDLE;
+		}
+		
 		return REGISTER.classToType.get(packet);
 	}
 	

src/main/java/com/comphenix/protocol/reflect/StructureModifier.java

@@ -23,6 +23,11 @@ import com.comphenix.protocol.reflect.instances.BannedGenerator;
 import com.comphenix.protocol.reflect.instances.DefaultInstances;
 import com.comphenix.protocol.reflect.instances.InstanceProvider;
 import com.comphenix.protocol.utility.MinecraftReflection;
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Table;
+
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
@@ -151,12 +156,34 @@ public class StructureModifier<T> {
 		return requireDefaults;
 	}
 
+	// Used to filter out irrelevant fields
+	private static final ThreadLocal<Table<Class<?>, Class<?>, Reference<List<FieldAccessor>>>>
+		fieldCacheLocal = ThreadLocal.withInitial(HashBasedTable::create);
+	private static final Class<?> NULL_CACHE_CLASS_REPLACEMENT = Void.class;
+
 	// Used to filter out irrelevant fields
 	private static List<FieldAccessor> getFields(Class<?> type, Class<?> superclassExclude) {
-		return FuzzyReflection.fromClass(type, true).getDeclaredFields(superclassExclude).stream()
-				.filter(field -> !Modifier.isStatic(field.getModifiers()))
-				.map(Accessors::getFieldAccessor)
-				.collect(Collectors.toList());
+		if (type == null) {
+			throw new IllegalArgumentException("Type cannot be NULL.");
+		}
+		Table<Class<?>, Class<?>, Reference<List<FieldAccessor>>> fieldCache = fieldCacheLocal.get();
+		Class<?> superclassKey = superclassExclude == null ? NULL_CACHE_CLASS_REPLACEMENT : superclassExclude;
+		Reference<List<FieldAccessor>> cacheEntryReference = fieldCache.get(type, superclassKey);
+		if (cacheEntryReference != null) {
+			List<FieldAccessor> cacheEntry = cacheEntryReference.get();
+			if (cacheEntry != null) {
+				return cacheEntry;
+			}
+		}
+		List<FieldAccessor> accessors = FuzzyReflection.fromClass(type, true)
+			.getDeclaredFields(superclassExclude)
+			.stream()
+			.filter(field -> !Modifier.isStatic(field.getModifiers()))
+			.map(Accessors::getFieldAccessor)
+			.collect(Collectors.toList());
+		fieldCache.put(type, superclassKey, new SoftReference<>(accessors));
+		fieldCache.cellSet().removeIf(entry -> entry.getValue().get() == null);
+		return accessors;
 	}
 
 	/**

src/main/java/com/comphenix/protocol/reflect/accessors/DefaultFieldAccessor.java

@@ -4,6 +4,8 @@ import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
+import com.google.common.base.Preconditions;
+
 final class DefaultFieldAccessor implements FieldAccessor {
 
 	private final Field field;
@@ -13,9 +15,9 @@ final class DefaultFieldAccessor implements FieldAccessor {
 	private final MethodHandle getter;
 
 	public DefaultFieldAccessor(Field field, MethodHandle setter, MethodHandle getter, boolean staticField) {
-		this.field = field;
-		this.setter = setter;
-		this.getter = getter;
+		this.field = Preconditions.checkNotNull(field, "field");
+		this.setter = Preconditions.checkNotNull(setter, "setter");
+		this.getter = Preconditions.checkNotNull(getter, "getter");
 		this.staticField = staticField;
 	}
 

src/main/java/com/comphenix/protocol/reflect/accessors/MethodHandleHelper.java

@@ -11,6 +11,8 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.logging.Level;
 
+import com.google.common.base.Preconditions;
+
 final class MethodHandleHelper {
 
 	private static final Lookup LOOKUP;
@@ -51,29 +53,35 @@ final class MethodHandleHelper {
 	}
 
 	public static MethodAccessor getMethodAccessor(Method method) {
+		Preconditions.checkNotNull(method, "method");
+
 		try {
 			MethodHandle unreflected = LOOKUP.unreflect(method);
 			boolean staticMethod = Modifier.isStatic(method.getModifiers());
 
 			MethodHandle generified = convertToGeneric(unreflected, staticMethod, false);
 			return new DefaultMethodAccessor(method, generified, staticMethod);
-		} catch (IllegalAccessException exception) {
-			throw new IllegalStateException("Unable to access method " + method);
+		} catch (IllegalAccessException ex) {
+			throw new IllegalStateException("Unable to access method " + method, ex);
 		}
 	}
 
 	public static ConstructorAccessor getConstructorAccessor(Constructor<?> constructor) {
+		Preconditions.checkNotNull(constructor, "constructor");
+
 		try {
 			MethodHandle unreflected = LOOKUP.unreflectConstructor(constructor);
 			MethodHandle generified = convertToGeneric(unreflected, false, true);
 
 			return new DefaultConstrutorAccessor(constructor, generified);
-		} catch (IllegalAccessException exception) {
-			throw new IllegalStateException("Unable to access constructor " + constructor);
+		} catch (IllegalAccessException ex) {
+			throw new IllegalStateException("Unable to access constructor " + constructor, ex);
 		}
 	}
 
 	public static FieldAccessor getFieldAccessor(Field field) {
+		Preconditions.checkNotNull(field, "field");
+
 		try {
 			boolean staticField = Modifier.isStatic(field.getModifiers());
 
@@ -97,10 +105,18 @@ final class MethodHandleHelper {
 				setter = setter.asType(VIRTUAL_FIELD_SETTER);
 			}
 
+			if (getter == null) {
+				throw new IllegalStateException("Unable to access field " + field + ". Could not find getter");
+			}
+
+			if (setter == null) {
+				throw new IllegalStateException("Unable to access field " + field + ". Could not find setter");
+			}
+
 			return new DefaultFieldAccessor(field, setter, getter, staticField);
-		} catch (IllegalAccessException | NoSuchFieldException exception) {
+		} catch (IllegalAccessException | NoSuchFieldException ex) {
 			// NoSuchFieldException can never happen, the field always exists
-			throw new IllegalStateException("Unable to access field " + field);
+			throw new IllegalStateException("Unable to access field " + field, ex);
 		}
 	}
 

src/main/java/com/comphenix/protocol/utility/CachedPackage.java

@@ -36,7 +36,7 @@ final class CachedPackage {
 	 * @param packageName - the name of the current package.
 	 * @param source      - the class source.
 	 */
-	public CachedPackage(String packageName, ClassSource source) {
+	CachedPackage(String packageName, ClassSource source) {
 		this.source = source;
 		this.packageName = packageName;
 		this.cache = new ConcurrentHashMap<>();
@@ -71,6 +71,10 @@ final class CachedPackage {
 		}
 	}
 
+	private Optional<Class<?>> resolveClass(String className) {
+		return source.loadClass(combine(packageName, className));
+	}
+
 	/**
 	 * Retrieve the class object of a specific class in the current package.
 	 *
@@ -78,13 +82,21 @@ final class CachedPackage {
 	 * @return Class object.
 	 * @throws RuntimeException If we are unable to find the given class.
 	 */
-	public Optional<Class<?>> getPackageClass(final String className) {
-		return this.cache.computeIfAbsent(className, x -> {
-			try {
-				return Optional.ofNullable(this.source.loadClass(combine(this.packageName, className)));
-			} catch (ClassNotFoundException ex) {
-				return Optional.empty();
+	public Optional<Class<?>> getPackageClass(String className, String... aliases) {
+		return cache.computeIfAbsent(className, x -> {
+			Optional<Class<?>> clazz = resolveClass(className);
+			if (clazz.isPresent()) {
+				return clazz;
 			}
+
+			for (String alias : aliases) {
+				clazz = resolveClass(alias);
+				if (clazz.isPresent()) {
+					return clazz;
+				}
+			}
+
+			return Optional.empty();
 		});
 	}
 }

src/main/java/com/comphenix/protocol/utility/ClassSource.java

@@ -2,6 +2,8 @@ package com.comphenix.protocol.utility;
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 /**
  * Represents an abstract class loader that can only retrieve classes by their canonical name.
@@ -37,27 +39,25 @@ public interface ClassSource {
 	 * @return The corresponding class source.
 	 */
 	static ClassSource fromClassLoader(final ClassLoader loader) {
-		return loader::loadClass;
+		return canonicalName -> {
+			try {
+				return Optional.of(loader.loadClass(canonicalName));
+			} catch (ClassNotFoundException ignored) {
+				return Optional.empty();
+			}
+		};
 	}
 
 	/**
 	 * Construct a class source from a mapping of canonical names and the corresponding classes. If the map is null, it
 	 * will be interpreted as an empty map. If the map does not contain a Class with the specified name, or that string
-	 * maps to NULL explicitly, a {@link ClassNotFoundException} will be thrown.
+	 * maps to NULL explicitly, an empty optional will be returned
 	 *
 	 * @param map - map of class names and classes.
 	 * @return The class source.
 	 */
 	static ClassSource fromMap(final Map<String, Class<?>> map) {
-		return canonicalName -> {
-			Class<?> loaded = map == null ? null : map.get(canonicalName);
-			if (loaded == null) {
-				// Throw the appropriate exception if we can't load the class
-				throw new ClassNotFoundException("The specified class could not be found by this ClassLoader.");
-			}
-
-			return loaded;
-		};
+		return canonicalName -> Optional.ofNullable(map.get(canonicalName));
 	}
 
 	/**
@@ -94,14 +94,8 @@ public interface ClassSource {
 	 * @param other - the other class source.
 	 * @return A new class source.
 	 */
-	default ClassSource retry(final ClassSource other) {
-		return canonicalName -> {
-			try {
-				return ClassSource.this.loadClass(canonicalName);
-			} catch (ClassNotFoundException e) {
-				return other.loadClass(canonicalName);
-			}
-		};
+	default ClassSource retry(ClassSource other) {
+		return canonicalName -> Optionals.or(loadClass(canonicalName), () -> other.loadClass(canonicalName));
 	}
 
 	/**
@@ -115,12 +109,9 @@ public interface ClassSource {
 	}
 
 	/**
-	 * Retrieve a class by name.
-	 *
-	 * @param canonicalName - the full canonical name of the class.
-	 * @return The corresponding class. If the class is not found, NULL should <b>not</b> be returned, instead a {@code
-	 * ClassNotFoundException} exception should be thrown.
-	 * @throws ClassNotFoundException If the class could not be found.
+	 * Retrieve a class by its canonical name
+	 * @param canonicalName The class's canonical name, i.e. java.lang.Object
+	 * @return Optional that may contain a Class
 	 */
-	Class<?> loadClass(String canonicalName) throws ClassNotFoundException;
+	Optional<Class<?>> loadClass(String canonicalName);
 }

src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java

@@ -85,6 +85,7 @@ public final class MinecraftProtocolVersion {
 		map.put(new MinecraftVersion(1, 19, 1), 760);
 		map.put(new MinecraftVersion(1, 19, 2), 760);
 		map.put(new MinecraftVersion(1, 19, 3), 761);
+		map.put(new MinecraftVersion(1, 19, 4), 762);
 
 		return map;
 	}

src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java

@@ -25,6 +25,7 @@ import java.lang.reflect.ParameterizedType;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -628,6 +629,22 @@ public final class MinecraftReflection {
 		return getMinecraftClass("network.chat.IChatBaseComponent", "network.chat.IChatbaseComponent", "network.chat.Component", "IChatBaseComponent");
 	}
 
+	public static Optional<Class<?>> getPackedBundlePacketClass() {
+		return getOptionalNMS("network.protocol.game.ClientboundBundlePacket", "ClientboundBundlePacket");
+	}
+
+	public static boolean isBundlePacket(Class<?> packetClass) {
+		return Optionals.Equals(getPackedBundlePacketClass(), packetClass);
+	}
+
+	public static boolean isBundleDelimiter(Class<?> packetClass) {
+		return Optionals.Equals(getBundleDelimiterClass(), packetClass);
+	}
+
+	public static Optional<Class<?>> getBundleDelimiterClass() {
+		return getOptionalNMS("network.protocol.BundleDelimiterPacket","BundleDelimiterPacket");
+	}
+
 	public static Class<?> getIChatBaseComponentArrayClass() {
 		return getArrayClass(getIChatBaseComponentClass());
 	}
@@ -1325,11 +1342,8 @@ public final class MinecraftReflection {
 	 * @return The class.
 	 */
 	private static Class<?> getClass(String className) {
-		try {
-			return getClassSource().loadClass(className);
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException("Cannot find class " + className, e);
-		}
+		return getClassSource().loadClass(className)
+			.orElseThrow(() -> new RuntimeException("Cannot find class " + className));
 	}
 
 	/**
@@ -1364,12 +1378,34 @@ public final class MinecraftReflection {
 				.orElseThrow(() -> new RuntimeException("Failed to find NMS class: " + className));
 	}
 
-	public static Class<?> getNullableNMS(String className, String... aliases) {
-		try {
-			return getMinecraftClass(className, aliases);
-		} catch (RuntimeException ex) {
-			return null;
+	/**
+	 * Optionally retrieve the class object of a NMS (net.minecraft.server) class.
+	 * If the class does not exist, the optional will be empty
+	 *
+	 * @param className NMS class name
+	 * @param aliases Potential aliases
+	 * @return Optional that may contain the class
+	 */
+	private static Optional<Class<?>> getOptionalNMS(String className, String... aliases) {
+		if (minecraftPackage == null) {
+			minecraftPackage = new CachedPackage(getMinecraftPackage(), getClassSource());
 		}
+
+		return minecraftPackage.getPackageClass(className, aliases);
+	}
+
+	/**
+	 * Retrieves a nullable NMS (net.minecraft.server) class. We will attempt to
+	 * look up the class and its aliases, but will return null if none is found.
+	 *
+	 * @deprecated - Use getOptionalNMS where possible
+	 * @param className NMS class name
+	 * @param aliases Potential aliases
+	 * @return The class, or null if not found
+	 */
+	@Deprecated
+	public static Class<?> getNullableNMS(String className, String... aliases) {
+		return getOptionalNMS(className, aliases).orElse(null);
 	}
 
 	/**
@@ -1406,29 +1442,8 @@ public final class MinecraftReflection {
 	 * @throws RuntimeException If we are unable to find any of the given classes.
 	 */
 	public static Class<?> getMinecraftClass(String className, String... aliases) {
-		if (minecraftPackage == null) {
-			minecraftPackage = new CachedPackage(getMinecraftPackage(), getClassSource());
-		}
-
-		return minecraftPackage.getPackageClass(className).orElseGet(() -> {
-			Class<?> resolved = null;
-			for (String alias : aliases) {
-				// try to resolve the class and stop searching if we found it
-				resolved = minecraftPackage.getPackageClass(alias).orElse(null);
-				if (resolved != null) {
-					break;
-				}
-			}
-
-			// if we resolved the class cache it and return the result
-			if (resolved != null) {
-				minecraftPackage.setPackageClass(className, resolved);
-				return resolved;
-			}
-
-			// unable to find the class
-			throw new RuntimeException(String.format("Unable to find %s (%s)", className, String.join(", ", aliases)));
-		});
+		return getOptionalNMS(className, aliases)
+			.orElseThrow(() -> new RuntimeException(String.format("Unable to find %s (%s)", className, String.join(", ", aliases))));
 	}
 
 	/**
@@ -1669,4 +1684,8 @@ public final class MinecraftReflection {
 			return infoClass;
 		}
 	}
+
+    public static Class<?> getHolderClass() {
+		return getMinecraftClass("core.Holder");
+    }
 }

src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java

@@ -37,6 +37,11 @@ import org.bukkit.Server;
  */
 public final class MinecraftVersion implements Comparable<MinecraftVersion>, Serializable {
 
+	/**
+	 * Version 1.19.4 - the rest of the feature preview
+	 */
+	public static final MinecraftVersion FEATURE_PREVIEW_2 = new MinecraftVersion("1.19.4");
+
 	/**
 	 * Version 1.19.3 - introducing feature preview
 	 */
@@ -53,6 +58,10 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion>, Ser
 	 * Version 1.17 - caves and cliffs part 1
 	 */
 	public static final MinecraftVersion CAVES_CLIFFS_1 = new MinecraftVersion("1.17");
+	/**
+	 * Version 1.16.4
+	 */
+	public static final MinecraftVersion NETHER_UPDATE_4 = new MinecraftVersion("1.16.4");
 	/**
 	 * Version 1.16.2 - breaking change to the nether update
 	 */
@@ -117,7 +126,7 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion>, Ser
 	/**
 	 * The latest release version of minecraft.
 	 */
-	public static final MinecraftVersion LATEST = FEATURE_PREVIEW_UPDATE;
+	public static final MinecraftVersion LATEST = FEATURE_PREVIEW_2;
 
 	// used when serializing
 	private static final long serialVersionUID = -8695133558996459770L;
@@ -268,7 +277,7 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion>, Ser
 		currentVersion = version;
 	}
 
-	public static boolean atOrAbove(MinecraftVersion version) {
+	private static boolean atOrAbove(MinecraftVersion version) {
 		return getCurrentVersion().isAtLeast(version);
 	}
 
@@ -349,7 +358,7 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion>, Ser
 	 */
 	public boolean atOrAbove() {
 		if (this.atCurrentOrAbove == null) {
-			this.atCurrentOrAbove = MinecraftVersion.atOrAbove(this);
+			this.atCurrentOrAbove = atOrAbove(this);
 		}
 
 		return this.atCurrentOrAbove;

src/main/java/com/comphenix/protocol/utility/Optionals.java

@@ -0,0 +1,45 @@
+package com.comphenix.protocol.utility;
+
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Utility methods for operating with Optionals
+ */
+public final class Optionals {
+
+	/**
+	 * Chains two optionals together by returning the secondary
+	 * optional if the primary does not contain a value
+	 * @param primary Primary optional
+	 * @param secondary Supplier of secondary optional
+	 * @return The resulting optional
+	 * @param <T> Type
+	 */
+	public static <T> Optional<T> or(Optional<T> primary, Supplier<Optional<T>> secondary) {
+		return primary.isPresent() ? primary : secondary.get();
+	}
+
+	/**
+	 * Evaluates the provided predicate against the optional only if it is present
+	 * @param optional Optional
+	 * @param predicate Test to run against potential value
+	 * @return True if the optional is present and the predicate passes
+	 * @param <T> Type
+	 */
+	public static <T> boolean TestIfPresent(Optional<T> optional, Predicate<T> predicate) {
+		return optional.isPresent() && predicate.test(optional.get());
+	}
+
+	/**
+	 * Check if the optional has a value and its value equals the provided value
+	 * @param optional Optional
+	 * @param contents Contents to test for
+	 * @return True if the optional has a value and that value equals the parameter
+	 * @param <T> Type
+	 */
+	public static <T> boolean Equals(Optional<T> optional, Class<?> contents) {
+		return optional.isPresent() && contents.equals(optional.get());
+	}
+}

src/main/java/com/comphenix/protocol/utility/Util.java

@@ -22,6 +22,7 @@ package com.comphenix.protocol.utility;
 public final class Util {
 
 	private static final boolean SPIGOT = classExists("org.spigotmc.SpigotConfig");
+	private static Class<?> cachedBundleClass;
 
 	public static boolean classExists(String className) {
 		try {

src/main/java/com/comphenix/protocol/wrappers/AdventureComponentConverter.java

@@ -40,7 +40,7 @@ public class AdventureComponentConverter {
 
  	/**
 	 * Converts a {@link Component} into a ProtocolLib wrapper
-	 * @param components Component
+	 * @param component Component
 	 * @return ProtocolLib wrapper
 	 */
   	public static WrappedChatComponent fromComponent(Component component) {

src/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java

@@ -20,6 +20,7 @@ import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.google.common.base.Defaults;
+import com.google.common.base.Preconditions;
 
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -88,6 +89,8 @@ public class AutoWrapper<T> implements EquivalentConverter<T> {
 	}
 
 	public T wrap(Object nmsObject) {
+		Preconditions.checkNotNull(nmsObject);
+
 		T instance;
 
 		try {
@@ -114,6 +117,8 @@ public class AutoWrapper<T> implements EquivalentConverter<T> {
 	}
 
 	public Object unwrap(Object wrapper) {
+		Preconditions.checkNotNull(wrapper);
+
 		// ensures that all accessors are present
 		computeFieldAccessors();
 		computeNmsConstructorAccess();
@@ -139,14 +144,14 @@ public class AutoWrapper<T> implements EquivalentConverter<T> {
 			nmsAccessors = Arrays
 					.stream(nmsClass.getDeclaredFields())
 					.filter(field -> !Modifier.isStatic(field.getModifiers()))
-					.map(field -> Accessors.getFieldAccessor(field))
+					.map(Accessors::getFieldAccessor)
 					.toArray(FieldAccessor[]::new);
 		}
 
 		if (wrapperAccessors == null) {
 			wrapperAccessors = Arrays
 					.stream(wrapperClass.getDeclaredFields())
-					.map(field -> Accessors.getFieldAccessor(field))
+					.map(Accessors::getFieldAccessor)
 					.toArray(FieldAccessor[]::new);
 		}
 	}

src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java

@@ -16,6 +16,7 @@
  */
 package com.comphenix.protocol.wrappers;
 
+import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.Either.Left;
 import com.comphenix.protocol.wrappers.Either.Right;
 import com.comphenix.protocol.wrappers.WrappedProfilePublicKey.WrappedProfileKeyData;
@@ -618,6 +619,10 @@ public class BukkitConverters {
 		return ignoreNull(handle(WrappedLevelChunkData.LightData::getHandle, WrappedLevelChunkData.LightData::new, WrappedLevelChunkData.LightData.class));
 	}
 
+	public static EquivalentConverter<PacketContainer> getPacketContainerConverter() {
+		return handle(PacketContainer::getHandle, PacketContainer::fromPacket, PacketContainer.class);
+	}
+
 	/**
 	 * Retrieve a converter for watchable objects and the respective wrapper.
 	 * @return A watchable object converter.
@@ -1078,19 +1083,19 @@ public class BukkitConverters {
 		});
 	}
 
-	private static MethodAccessor getSound = null;
-	private static MethodAccessor getSoundEffect = null;
-	private static FieldAccessor soundKey = null;
+	static MethodAccessor getSound = null;
+	static MethodAccessor getSoundEffect = null;
+	static FieldAccessor soundKey = null;
 
-	private static MethodAccessor getSoundEffectByKey = null;
-	private static MethodAccessor getSoundEffectBySound = null;
-	private static MethodAccessor getSoundByEffect = null;
+	static MethodAccessor getSoundEffectByKey = null;
+	static MethodAccessor getSoundEffectBySound = null;
+	static MethodAccessor getSoundByEffect = null;
 
-	private static Map<String, Sound> soundIndex = null;
+	static Map<String, Sound> soundIndex = null;
 
 	public static EquivalentConverter<Sound> getSoundConverter() {
 		// Try to create sound converter for new versions greater 1.16.4
-		try {
+		if (MinecraftVersion.NETHER_UPDATE_4.atOrAbove()) {
 			if (getSoundEffectByKey == null || getSoundEffectBySound == null || getSoundByEffect == null) {
 				Class<?> craftSound = MinecraftReflection.getCraftSoundClass();
 				FuzzyReflection fuzzy = FuzzyReflection.fromClass(craftSound, true);
@@ -1098,19 +1103,19 @@ public class BukkitConverters {
 				getSoundEffectByKey = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters(
 						"getSoundEffect",
 						MinecraftReflection.getSoundEffectClass(),
-						new Class<?>[]{String.class}
+						String.class
 				));
 
 				getSoundEffectBySound = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters(
 						"getSoundEffect",
 						MinecraftReflection.getSoundEffectClass(),
-						new Class<?>[]{Sound.class}
+						Sound.class
 				));
 
 				getSoundByEffect = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters(
 						"getBukkit",
 						Sound.class,
-						new Class<?>[]{MinecraftReflection.getSoundEffectClass()}
+						MinecraftReflection.getSoundEffectClass()
 				));
 			}
 
@@ -1128,10 +1133,17 @@ public class BukkitConverters {
 
 				@Override
 				public Sound getSpecific(Object generic) {
-					return (Sound) getSoundByEffect.invoke(null, generic);
+					try {
+						return (Sound) getSoundByEffect.invoke(null, generic);
+					} catch (IllegalStateException ex) {
+						if (ex.getCause() instanceof NullPointerException) {
+							// "null" sounds cause NPEs inside getSoundByEffect
+							return null;
+						}
+						throw ex;
+					}
 				}
 			});
-		} catch (Exception e) {
 		}
 
 		// Fall back to sound converter from legacy versions before 1.16.4
@@ -1139,9 +1151,9 @@ public class BukkitConverters {
 			Class<?> craftSound = MinecraftReflection.getCraftSoundClass();
 			FuzzyReflection fuzzy = FuzzyReflection.fromClass(craftSound, true);
 			getSound = Accessors.getMethodAccessor(
-					fuzzy.getMethodByReturnTypeAndParameters("getSound", String.class, new Class<?>[]{Sound.class}));
+					fuzzy.getMethodByReturnTypeAndParameters("getSound", String.class, Sound.class));
 			getSoundEffect = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters("getSoundEffect",
-					MinecraftReflection.getSoundEffectClass(), new Class<?>[]{String.class}));
+					MinecraftReflection.getSoundEffectClass(), String.class));
 		}
 
 		return ignoreNull(new EquivalentConverter<Sound>() {

src/main/java/com/comphenix/protocol/wrappers/Converters.java

@@ -15,12 +15,24 @@
 package com.comphenix.protocol.wrappers;
 
 import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.MethodAccessor;
+import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.utility.MinecraftReflection;
+import org.checkerframework.checker.units.qual.C;
 
 /**
  * Utility class for converters
@@ -217,4 +229,104 @@ public class Converters {
 			}
 		});
 	}
+
+	public static <T> EquivalentConverter<Iterable<T>> iterable(
+			final EquivalentConverter<T> elementConverter,
+			final Supplier<List<T>> specificCollectionFactory,
+			final Supplier<List<?>> genericCollectionFactory
+	) {
+		return ignoreNull(new EquivalentConverter<Iterable<T>>() {
+
+			@Override
+			public Object getGeneric(Iterable<T> specific) {
+				// generics are very cool, thank you java
+				List<Object> targetCollection = (List<Object>) genericCollectionFactory.get();
+				for (T element : specific) {
+					Object generic = elementConverter.getGeneric(element);
+					if (generic != null) {
+						targetCollection.add(generic);
+					}
+				}
+
+				return targetCollection;
+			}
+
+			@Override
+			public Iterable<T> getSpecific(Object generic) {
+				if (generic instanceof Iterable<?>) {
+					Iterable<Object> sourceCollection = (Iterable<Object>) generic;
+					List<T> targetCollection = specificCollectionFactory.get();
+					// copy over all elements into a new collection
+					for (Object element : sourceCollection) {
+						T specific = elementConverter.getSpecific(element);
+						if (specific != null) {
+							targetCollection.add(specific);
+						}
+					}
+
+					return targetCollection;
+				}
+				// not valid
+				return null;
+			}
+
+			@Override
+			public Class<Iterable<T>> getSpecificType() {
+				return (Class) Iterable.class;
+			}
+		});
+	}
+
+	private static MethodAccessor holderGetValue;
+
+	public static <T> EquivalentConverter<T> holder(final EquivalentConverter<T> converter,
+													final WrappedRegistry registry) {
+		return new EquivalentConverter<T>() {
+			@Override
+			public Object getGeneric(T specific) {
+				Object generic = converter.getGeneric(specific);
+				return registry.getHolder(generic);
+			}
+
+			@Override
+			public T getSpecific(Object generic) {
+				if (holderGetValue == null) {
+					Class<?> holderClass = MinecraftReflection.getHolderClass();
+					FuzzyReflection fuzzy = FuzzyReflection.fromClass(holderClass, false);
+					holderGetValue = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract
+							.newBuilder()
+							.parameterCount(0)
+							.banModifier(Modifier.STATIC)
+							.returnTypeExact(Object.class)
+							.build()));
+				}
+
+				Object value = holderGetValue.invoke(generic);
+				return converter.getSpecific(value);
+			}
+
+			@Override
+			public Class<T> getSpecificType() {
+				return converter.getSpecificType();
+			}
+		};
+	}
+
+	public static <T> List<T> toList(Iterable<? extends T> iterable) {
+		if (iterable instanceof List) {
+			return (List<T>) iterable;
+		}
+
+		List<T> result = new ArrayList<>();
+		if (iterable instanceof Collection) {
+			Collection<T> coll = (Collection<T>) iterable;
+			result.addAll(coll);
+		} else {
+			for (T elem : iterable) {
+				result.add(elem);
+			}
+		}
+
+		return result;
+	}
 }

src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java

@@ -65,6 +65,7 @@ public abstract class EnumWrappers {
 		/**
 		 * @deprecated Replaced by NOT_SET
 		 */
+		@Deprecated
 		NONE;
 
 		/**
@@ -377,9 +378,9 @@ public abstract class EnumWrappers {
 	
 	/**
 	 * Wrapped EntityPose enum for use in Entity Metadata Packet.<br>
-	 * 
-	 * @apiNote Remember to use {@link #toNms()} when adding to a {@link WrappedDataWatcher}. <br>
-	 *          Serializer is obtained using Registry.get(EnumWrappers.getEntityPoseClass())
+	 * Remember to use {@link #toNms()} when adding to a {@link WrappedDataWatcher}. <br>
+	 * Serializer is obtained using Registry.get(EnumWrappers.getEntityPoseClass())
+	 *
 	 * @since 1.13
 	 * @author Lewys Davies (Lew_)
 	 */

src/main/java/com/comphenix/protocol/wrappers/TroveWrapper.java

@@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
@@ -142,17 +143,11 @@ public class TroveWrapper {
 	private static Object getDecorated(@Nonnull Object trove) {
 		if (trove == null)
 			throw new IllegalArgumentException("trove instance cannot be non-null.");
-		
+
 		AbstractFuzzyMatcher<Class<?>> match = FuzzyMatchers.matchSuper(trove.getClass());
-		Class<?> decorators = null;
-		
-		try {
-			// Attempt to get decorator class
-			decorators = getClassSource(trove.getClass()).loadClass("TDecorators");
-		} catch (ClassNotFoundException e) {
-			throw new IllegalStateException(e.getMessage(), e);
-		}
-		
+		Class<?> decorators = getClassSource(trove.getClass()).loadClass("TDecorator")
+			.orElseThrow(() -> new IllegalStateException("TDecorators class not found"));
+
 		// Find an appropriate wrapper method in TDecorators
 		for (Method method : decorators.getMethods()) {
 			Class<?>[] types = method.getParameterTypes();

src/main/java/com/comphenix/protocol/wrappers/WrappedAttribute.java

@@ -168,6 +168,7 @@ public class WrappedAttribute extends AbstractWrapper {
 	 * @deprecated Removed in 1.17
 	 */
 	@Nullable
+	@Deprecated
 	public PacketContainer getParentPacket() {
 		if (MinecraftVersion.CAVES_CLIFFS_1.atOrAbove()) {
 			return null;

src/main/java/com/comphenix/protocol/wrappers/WrappedAttributeModifier.java

@@ -22,7 +22,7 @@ import com.google.common.base.Preconditions;
  * @author Kristian
  */
 public class WrappedAttributeModifier extends AbstractWrapper {
-	private static final boolean OPERATION_ENUM = MinecraftVersion.atOrAbove(MinecraftVersion.VILLAGE_UPDATE);
+	private static final boolean OPERATION_ENUM = MinecraftVersion.VILLAGE_UPDATE.atOrAbove();
 	private static final Class<?> OPERATION_CLASS;
 	private static final EquivalentConverter<Operation> OPERATION_CONVERTER;
 

src/main/java/com/comphenix/protocol/wrappers/WrappedDataValue.java

@@ -12,7 +12,7 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
  */
 public class WrappedDataValue extends AbstractWrapper {
 
-	private static final Class<?> HANDLE_TYPE = MinecraftReflection.getMinecraftClass("network.syncher.DataWatcher$b");
+	private static final Class<?> HANDLE_TYPE = MinecraftReflection.getNullableNMS("network.syncher.DataWatcher$b", "network.syncher.SynchedEntityData$DataValue");
 
 	private static ConstructorAccessor constructor;
 

src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java

@@ -941,8 +941,8 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 
 		/**
 		 * Gets the first serializer associated with a given class and optional state.
-		 * 
-		 * <p><b>Note</b>: If the serializer is optional, values <i>must<i> be
+		 * <br/>
+		 * <b>Note</b>: If the serializer is optional, values <i>must</i> be
 		 * wrapped in an {@link Optional}
 		 *
 		 * @param clazz Class to find serializer for

src/main/java/com/comphenix/protocol/wrappers/WrappedIntHashMap.java

@@ -16,6 +16,7 @@ import com.google.common.base.Preconditions;
  * @author Kristian
  * @deprecated IntHashMap no longer exists
  */
+@Deprecated
 public class WrappedIntHashMap extends AbstractWrapper {
 	private static Method PUT_METHOD;
 	private static Method GET_METHOD;

src/main/java/com/comphenix/protocol/wrappers/WrappedRegistry.java

@@ -5,6 +5,7 @@ import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.MethodAccessor;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.MinecraftVersion;
 import com.google.common.collect.ImmutableMap;
 
 import java.lang.reflect.Field;
@@ -24,6 +25,8 @@ public class WrappedRegistry {
     private static final MethodAccessor GET_ID;
     private static final MethodAccessor GET_KEY;
 
+	private static final MethodAccessor GET_HOLDER;
+
 	static {
 		Map<Class<?>, WrappedRegistry> regMap = new HashMap<>();
 
@@ -100,6 +103,23 @@ public class WrappedRegistry {
 				.parameterCount(1)
 				.returnTypeExact(MinecraftReflection.getMinecraftKeyClass())
 				.build()));
+
+		MethodAccessor getHolder = null;
+
+		if (MinecraftVersion.FEATURE_PREVIEW_UPDATE.atOrAbove()) {
+			try {
+				getHolder = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract
+						.newBuilder()
+						.parameterCount(1)
+						.banModifier(Modifier.STATIC)
+						.returnTypeExact(MinecraftReflection.getHolderClass())
+						.requireModifier(Modifier.PUBLIC)
+						.build()));
+			} catch (IllegalArgumentException ignored) {
+			}
+		}
+
+		GET_HOLDER = getHolder;
     }
 
     private final Object handle;
@@ -132,6 +152,10 @@ public class WrappedRegistry {
 		return (int) GET_ID.invoke(this.handle, entry);
 	}
 
+	public Object getHolder(Object generic) {
+		return GET_HOLDER.invoke(handle, generic);
+	}
+
     public static WrappedRegistry getAttributeRegistry() {
         return getRegistry(MinecraftReflection.getAttributeBase());
     }
@@ -140,6 +164,10 @@ public class WrappedRegistry {
         return getRegistry(MinecraftReflection.getDimensionManager());
     }
 
+	public static WrappedRegistry getSoundRegistry() {
+		return getRegistry(MinecraftReflection.getSoundEffectClass());
+	}
+
 	public static WrappedRegistry getRegistry(Class<?> type) {
 		return REGISTRY.get(type);
 	}

src/main/java/com/comphenix/protocol/wrappers/WrappedServerPing.java

@@ -4,22 +4,21 @@ import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.injector.BukkitUnwrapper;
 import com.comphenix.protocol.reflect.EquivalentConverter;
 import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.reflect.accessors.MethodAccessor;
-import com.comphenix.protocol.utility.MinecraftProtocolVersion;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
-import com.comphenix.protocol.utility.Util;
+import com.comphenix.protocol.wrappers.ping.LegacyServerPing;
+import com.comphenix.protocol.wrappers.ping.ServerPingImpl;
+import com.comphenix.protocol.wrappers.ping.ServerPingRecord;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.base64.Base64;
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
 import javax.imageio.ImageIO;
@@ -37,52 +36,14 @@ import java.util.List;
  * Represents a server ping packet data.
  * @author Kristian
  */
-public class WrappedServerPing extends AbstractWrapper implements ClonableWrapper {
-	private static Class<?> GAME_PROFILE = MinecraftReflection.getGameProfileClass();
-	private static Class<?> GAME_PROFILE_ARRAY = MinecraftReflection.getArrayClass(GAME_PROFILE);
-
-	// Server ping fields
-	private static Class<?> SERVER_PING = MinecraftReflection.getServerPingClass();
-	private static ConstructorAccessor SERVER_PING_CONSTRUCTOR = Accessors.getConstructorAccessor(SERVER_PING);
-	private static FieldAccessor DESCRIPTION = Accessors.getFieldAccessor(SERVER_PING, MinecraftReflection.getIChatBaseComponentClass(), true);
-	private static FieldAccessor PLAYERS = Accessors.getFieldAccessor(SERVER_PING, MinecraftReflection.getServerPingPlayerSampleClass(), true);
-	private static FieldAccessor VERSION = Accessors.getFieldAccessor(SERVER_PING, MinecraftReflection.getServerPingServerDataClass(), true);
-	private static FieldAccessor FAVICON = Accessors.getFieldAccessor(SERVER_PING, String.class, true);
-	private static FieldAccessor[] BOOLEAN_ACCESSORS = Accessors.getFieldAccessorArray(SERVER_PING, boolean.class, true);
-
-	// For converting to the underlying array
-	private static EquivalentConverter<Iterable<? extends WrappedGameProfile>> PROFILE_CONVERT =
-		BukkitConverters.getArrayConverter(GAME_PROFILE, BukkitConverters.getWrappedGameProfileConverter());
-
-	// Server ping player sample fields
-	private static Class<?> PLAYERS_CLASS = MinecraftReflection.getServerPingPlayerSampleClass();
-	private static ConstructorAccessor PLAYERS_CONSTRUCTOR = Accessors.getConstructorAccessor(PLAYERS_CLASS, int.class, int.class);
-	private static FieldAccessor[] PLAYERS_INTS = Accessors.getFieldAccessorArray(PLAYERS_CLASS, int.class, true);
-	private static FieldAccessor PLAYERS_PROFILES = Accessors.getFieldAccessor(PLAYERS_CLASS, GAME_PROFILE_ARRAY, true);
-	private static FieldAccessor PLAYERS_MAXIMUM = PLAYERS_INTS[0];
-	private static FieldAccessor PLAYERS_ONLINE = PLAYERS_INTS[1];
-
-	// Server ping serialization
-	private static Class<?> GSON_CLASS = MinecraftReflection.getMinecraftGsonClass();
-	private static MethodAccessor GSON_TO_JSON = Accessors.getMethodAccessor(GSON_CLASS, "toJson", Object.class);
-	private static MethodAccessor GSON_FROM_JSON = Accessors.getMethodAccessor(GSON_CLASS, "fromJson", String.class, Class.class);
-	private static FieldAccessor PING_GSON = Accessors.getMemorizing(Accessors.getFieldAccessor(
-		PacketType.Status.Server.SERVER_INFO.getPacketClass(), GSON_CLASS, true
-	));
-
-	// Server data fields
-	private static Class<?> VERSION_CLASS = MinecraftReflection.getServerPingServerDataClass();
-	private static ConstructorAccessor VERSION_CONSTRUCTOR = Accessors.getConstructorAccessor(VERSION_CLASS, String.class, int.class);
-	private static FieldAccessor VERSION_NAME = Accessors.getFieldAccessor(VERSION_CLASS, String.class, true);
-	private static FieldAccessor VERSION_PROTOCOL = Accessors.getFieldAccessor(VERSION_CLASS, int.class, true);
+public class WrappedServerPing implements ClonableWrapper {
+	private static final Class<?> GAME_PROFILE = MinecraftReflection.getGameProfileClass();
 
 	// Get profile from player
-	private static FieldAccessor ENTITY_HUMAN_PROFILE = Accessors.getFieldAccessor(
-			MinecraftReflection.getEntityPlayerClass().getSuperclass(), GAME_PROFILE, true);
+	private static final FieldAccessor ENTITY_HUMAN_PROFILE = Accessors.getFieldAccessor(
+		MinecraftReflection.getEntityPlayerClass().getSuperclass(), GAME_PROFILE, true);
 
-	// Inner class
-	private Object players; // may be NULL
-	private Object version;
+	private final ServerPingImpl impl;
 
 	/**
 	 * Construct a new server ping initialized with a zero player count, and zero maximum.
@@ -90,34 +51,41 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * Note that the version string is set to 1.9.4.
 	 */
 	public WrappedServerPing() {
-		super(MinecraftReflection.getServerPingClass());
-		setHandle(SERVER_PING_CONSTRUCTOR.invoke());
-		resetPlayers();
-		resetVersion();
+		this.impl = newImpl();
 	}
 
 	private WrappedServerPing(Object handle) {
-		super(MinecraftReflection.getServerPingClass());
-		setHandle(handle);
-		this.players = PLAYERS.get(handle);
-		this.version = VERSION.get(handle);
+		this.impl = newImpl(handle);
+	}
+
+	private static ServerPingImpl newImpl() {
+		if (MinecraftVersion.FEATURE_PREVIEW_2.atOrAbove()) {
+			return new ServerPingRecord();
+		}
+
+		return new LegacyServerPing();
+	}
+
+	private static ServerPingImpl newImpl(Object handle) {
+		if (MinecraftVersion.FEATURE_PREVIEW_2.atOrAbove()) {
+			return new ServerPingRecord(handle);
+		}
+
+		return new LegacyServerPing(handle);
 	}
 
 	/**
 	 * Set the player count and player maximum to the default values.
 	 */
-	protected void resetPlayers() {
-		players = PLAYERS_CONSTRUCTOR.invoke(0, 0);
-		PLAYERS.set(handle, players);
+	private void resetPlayers() {
+		impl.resetPlayers();
 	}
 
 	/**
 	 * Reset the version string to the default state.
 	 */
-	protected void resetVersion() {
-		MinecraftVersion minecraftVersion = MinecraftVersion.getCurrentVersion();
-		version = VERSION_CONSTRUCTOR.invoke(minecraftVersion.toString(), MinecraftProtocolVersion.getCurrentVersion());
-		VERSION.set(handle, version);
+	private void resetVersion() {
+		impl.resetVersion();
 	}
 
 	/**
@@ -135,15 +103,16 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @return The wrapped server ping.
 	 */
 	public static WrappedServerPing fromJson(String json) {
-		return fromHandle(GSON_FROM_JSON.invoke(PING_GSON.get(null), json, SERVER_PING));
+		// return fromHandle(GSON_FROM_JSON.invoke(PING_GSON.get(null), json, SERVER_PING));
+		return null;
 	}
 
 	/**
 	 * Retrieve the message of the day.
-	 * @return The messge of the day.
+	 * @return The message of the day.
 	 */
 	public WrappedChatComponent getMotD() {
-		return WrappedChatComponent.fromHandle(DESCRIPTION.get(handle));
+		return impl.getMotD();
 	}
 
 	/**
@@ -151,7 +120,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @param description - message of the day.
 	 */
 	public void setMotD(WrappedChatComponent description) {
-		DESCRIPTION.set(handle, description.getHandle());
+		impl.setMotD(description);
 	}
 
 	/**
@@ -167,7 +136,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @return The favicon, or NULL if no favicon will be displayed.
 	 */
 	public CompressedImage getFavicon() {
-		String favicon = (String) FAVICON.get(handle);
+		String favicon = impl.getFavicon();
 		return (favicon != null) ? CompressedImage.fromEncodedText(favicon) : null;
 	}
 
@@ -176,7 +145,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @param image - the new compressed image or NULL if no favicon should be displayed.
 	 */
 	public void setFavicon(CompressedImage image) {
-		FAVICON.set(handle, (image != null) ? image.toEncodedText() : null);
+		impl.setFavicon((image != null) ? image.toEncodedText() : null);
 	}
 
 	/**
@@ -187,7 +156,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 */
 	@Deprecated
 	public boolean isChatPreviewEnabled() {
-		return (Boolean) BOOLEAN_ACCESSORS[0].get(handle);
+		return impl.isChatPreviewEnabled();
 	}
 
 	/**
@@ -198,7 +167,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 */
 	@Deprecated
 	public void setChatPreviewEnabled(boolean chatPreviewEnabled) {
-		BOOLEAN_ACCESSORS[0].set(handle, chatPreviewEnabled);
+		impl.setChatPreviewEnabled(chatPreviewEnabled);
 	}
 
 	/**
@@ -207,8 +176,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @since 1.19.1
 	 */
 	public boolean isEnforceSecureChat() {
-		int index = MinecraftVersion.FEATURE_PREVIEW_UPDATE.atOrAbove() ? 0 : 1;
-		return (Boolean) BOOLEAN_ACCESSORS[index].get(handle);
+		return impl.isEnforceSecureChat();
 	}
 
 	/**
@@ -217,8 +185,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @since 1.19.1
 	 */
 	public void setEnforceSecureChat(boolean enforceSecureChat) {
-		int index = MinecraftVersion.FEATURE_PREVIEW_UPDATE.atOrAbove() ? 0 : 1;
-		BOOLEAN_ACCESSORS[index].set(handle, enforceSecureChat);
+		impl.setEnforceSecureChat(enforceSecureChat);
 	}
 
 	/**
@@ -228,9 +195,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @see #setPlayersOnline(int)
 	 */
 	public int getPlayersOnline() {
-		if (players == null)
-			throw new IllegalStateException("The player count has been hidden.");
-		return (Integer) PLAYERS_ONLINE.get(players);
+		return impl.getPlayersOnline();
 	}
 
 	/**
@@ -241,9 +206,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @param online - online players.
 	 */
 	public void setPlayersOnline(int online) {
-		if (players == null)
-			resetPlayers();
-		PLAYERS_ONLINE.set(players, online);
+		impl.setPlayersOnline(online);
 	}
 
 	/**
@@ -253,9 +216,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @see #setPlayersMaximum(int)
 	 */
 	public int getPlayersMaximum() {
-		if (players == null)
-			throw new IllegalStateException("The player maximum has been hidden.");
-		return (Integer) PLAYERS_MAXIMUM.get(players);
+		return impl.getPlayersMaximum();
 	}
 
 	/**
@@ -266,9 +227,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @param maximum - maximum player count.
 	 */
 	public void setPlayersMaximum(int maximum) {
-		if (players == null)
-			resetPlayers();
-		PLAYERS_MAXIMUM.set(players, maximum);
+		impl.setPlayersMaximum(maximum);
 	}
 
 	/**
@@ -279,14 +238,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 */
 	public void setPlayersVisible(boolean visible) {
 		if (isPlayersVisible() != visible) {
-			if (visible) {
-				// Recreate the count and maximum
-				Server server = Bukkit.getServer();
-				setPlayersMaximum(server.getMaxPlayers());
-				setPlayersOnline(Bukkit.getOnlinePlayers().size());
-			} else {
-				PLAYERS.set(handle, players = null);
-			}
+			impl.setPlayersVisible(visible);
 		}
 	}
 
@@ -297,7 +249,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @return TRUE if the player statistics is visible, FALSE otherwise.
 	 */
 	public boolean isPlayersVisible() {
-		return players != null;
+		return impl.arePlayersVisible();
 	}
 
 	/**
@@ -305,12 +257,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @return Logged in players or an empty list if no player names will be displayed.
 	 */
 	public ImmutableList<WrappedGameProfile> getPlayers() {
-		if (players == null)
-			return ImmutableList.of();
-		Object playerProfiles = PLAYERS_PROFILES.get(players);
-		if (playerProfiles == null)
-			return ImmutableList.of();
-		return ImmutableList.copyOf(PROFILE_CONVERT.getSpecific(playerProfiles));
+		return impl.getPlayers();
 	}
 
 	/**
@@ -318,9 +265,9 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @param profile - every logged in player.
 	 */
 	public void setPlayers(Iterable<? extends WrappedGameProfile> profile) {
-		if (players == null)
+		if (!isPlayersVisible())
 			resetPlayers();
-		PLAYERS_PROFILES.set(players, (profile != null) ? PROFILE_CONVERT.getGeneric(profile) : null);
+		impl.setPlayers(profile);
 	}
 
 	/**
@@ -343,7 +290,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @return The version name.
 	 */
 	public String getVersionName() {
-		return (String) VERSION_NAME.get(version);
+		return impl.getVersionName();
 	}
 
 	/**
@@ -351,7 +298,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @param name - the new version name.
 	 */
 	public void setVersionName(String name) {
-		VERSION_NAME.set(version, name);
+		impl.setVersionName(name);
 	}
 
 	/**
@@ -359,7 +306,7 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @return The protocol.
 	 */
 	public int getVersionProtocol() {
-		return (Integer) VERSION_PROTOCOL.get(version);
+		return impl.getVersionProtocol();
 	}
 
 	/**
@@ -367,7 +314,12 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @param protocol - the protocol number.
 	 */
 	public void setVersionProtocol(int protocol) {
-		VERSION_PROTOCOL.set(version, protocol);
+		impl.setVersionProtocol(protocol);
+	}
+
+	@Override
+	public Object getHandle() {
+		return impl.getHandle();
 	}
 
 	/**
@@ -398,7 +350,8 @@ public class WrappedServerPing extends AbstractWrapper implements ClonableWrappe
 	 * @return The JSON representation.
 	 */
 	public String toJson() {
-		return (String) GSON_TO_JSON.invoke(PING_GSON.get(null), handle);
+		return null;
+		// return (String) GSON_TO_JSON.invoke(PING_GSON.get(null), getHandle());
 	}
 
 	@Override

src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMap.java

@@ -136,10 +136,10 @@ public abstract class ConvertedMap<Key, VInner, VOuter> extends AbstractConverte
     /**
      * Returns a string representation of this map.  The string representation
      * consists of a list of key-value mappings in the order returned by the
-     * map's <tt>entrySet</tt> view's iterator, enclosed in braces
-     * (<tt>"{}"</tt>).  Adjacent mappings are separated by the characters
-     * <tt>", "</tt> (comma and space).  Each key-value mapping is rendered as
-     * the key followed by an equals sign (<tt>"="</tt>) followed by the
+     * map's <code>entrySet</code> view's iterator, enclosed in braces
+     * (<code>"{}"</code>).  Adjacent mappings are separated by the characters
+     * <code>", "</code> (comma and space).  Each key-value mapping is rendered as
+     * the key followed by an equals sign (<code>"="</code>) followed by the
      * associated value.  Keys and values are converted to strings as by
      * {@link String#valueOf(Object)}.
      *

src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMultimap.java

@@ -204,10 +204,10 @@ public abstract class ConvertedMultimap<Key, VInner, VOuter> extends AbstractCon
     /**
      * Returns a string representation of this map.  The string representation
      * consists of a list of key-value mappings in the order returned by the
-     * map's <tt>entrySet</tt> view's iterator, enclosed in braces
-     * (<tt>"{}"</tt>).  Adjacent mappings are separated by the characters
-     * <tt>", "</tt> (comma and space).  Each key-value mapping is rendered as
-     * the key followed by an equals sign (<tt>"="</tt>) followed by the
+     * map's <code>entrySet</code> view's iterator, enclosed in braces
+     * (<code>"{}"</code>).  Adjacent mappings are separated by the characters
+     * <code>", "</code> (comma and space).  Each key-value mapping is rendered as
+     * the key followed by an equals sign (<code>"="</code>) followed by the
      * associated value.  Keys and values are converted to strings as by
      * {@link String#valueOf(Object)}.
      *

src/main/java/com/comphenix/protocol/wrappers/ping/LegacyServerPing.java

@@ -0,0 +1,397 @@
+package com.comphenix.protocol.wrappers.ping;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.injector.BukkitUnwrapper;
+import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
+import com.comphenix.protocol.reflect.accessors.FieldAccessor;
+import com.comphenix.protocol.reflect.accessors.MethodAccessor;
+import com.comphenix.protocol.utility.MinecraftProtocolVersion;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.wrappers.AbstractWrapper;
+import com.comphenix.protocol.wrappers.BukkitConverters;
+import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import com.comphenix.protocol.wrappers.WrappedServerPing;
+
+import com.google.common.collect.ImmutableList;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents a server ping packet data.
+ * @author Kristian
+ */
+public final class LegacyServerPing extends AbstractWrapper implements ServerPingImpl {
+	private static final Class<?> GAME_PROFILE = MinecraftReflection.getGameProfileClass();
+
+	// For converting to the underlying array
+	private static final EquivalentConverter<Iterable<? extends WrappedGameProfile>> PROFILE_CONVERT =
+		BukkitConverters.getArrayConverter(GAME_PROFILE, BukkitConverters.getWrappedGameProfileConverter());
+
+	// Get profile from player
+	private static final FieldAccessor ENTITY_HUMAN_PROFILE = Accessors.getFieldAccessor(
+		MinecraftReflection.getEntityPlayerClass().getSuperclass(), GAME_PROFILE, true);
+
+	private static final Class<?> GAME_PROFILE_ARRAY = MinecraftReflection.getArrayClass(GAME_PROFILE);
+
+	// Server ping fields
+	private static final Class<?> SERVER_PING = MinecraftReflection.getServerPingClass();
+	private static final ConstructorAccessor SERVER_PING_CONSTRUCTOR = Accessors.getConstructorAccessor(SERVER_PING);
+	private static final FieldAccessor DESCRIPTION = Accessors.getFieldAccessor(SERVER_PING, MinecraftReflection.getIChatBaseComponentClass(), true);
+	private static final FieldAccessor PLAYERS = Accessors.getFieldAccessor(SERVER_PING, MinecraftReflection.getServerPingPlayerSampleClass(), true);
+	private static final FieldAccessor VERSION = Accessors.getFieldAccessor(SERVER_PING, MinecraftReflection.getServerPingServerDataClass(), true);
+	private static final FieldAccessor FAVICON = Accessors.getFieldAccessor(SERVER_PING, String.class, true);
+	private static final FieldAccessor[] BOOLEAN_ACCESSORS = Accessors.getFieldAccessorArray(SERVER_PING, boolean.class, true);
+
+	// Server ping player sample fields
+	private static final Class<?> PLAYERS_CLASS = MinecraftReflection.getServerPingPlayerSampleClass();
+	private static final ConstructorAccessor PLAYERS_CONSTRUCTOR = Accessors.getConstructorAccessor(PLAYERS_CLASS, int.class, int.class);
+	private static final FieldAccessor[] PLAYERS_INTS = Accessors.getFieldAccessorArray(PLAYERS_CLASS, int.class, true);
+	private static final FieldAccessor PLAYERS_PROFILES = Accessors.getFieldAccessor(PLAYERS_CLASS, GAME_PROFILE_ARRAY, true);
+	private static final FieldAccessor PLAYERS_MAXIMUM = PLAYERS_INTS[0];
+	private static final FieldAccessor PLAYERS_ONLINE = PLAYERS_INTS[1];
+
+	// Server ping serialization
+	private static final Class<?> GSON_CLASS = MinecraftReflection.getMinecraftGsonClass();
+	private static final MethodAccessor GSON_TO_JSON = Accessors.getMethodAccessor(GSON_CLASS, "toJson", Object.class);
+	private static final MethodAccessor GSON_FROM_JSON = Accessors.getMethodAccessor(GSON_CLASS, "fromJson", String.class, Class.class);
+	private static final FieldAccessor PING_GSON = Accessors.getMemorizing(Accessors.getFieldAccessor(
+	PacketType.Status.Server.SERVER_INFO.getPacketClass(), GSON_CLASS, true
+	));
+
+	// Server data fields
+	private static final Class<?> VERSION_CLASS = MinecraftReflection.getServerPingServerDataClass();
+	private static final ConstructorAccessor VERSION_CONSTRUCTOR = Accessors.getConstructorAccessor(VERSION_CLASS, String.class, int.class);
+	private static final FieldAccessor VERSION_NAME = Accessors.getFieldAccessor(VERSION_CLASS, String.class, true);
+	private static final FieldAccessor VERSION_PROTOCOL = Accessors.getFieldAccessor(VERSION_CLASS, int.class, true);
+
+
+	// Inner class
+	private Object players; // may be NULL
+	private Object version;
+
+	/**
+	 * Construct a new server ping initialized with a zero player count, and zero maximum.
+	 * <p>
+	 * Note that the version string is set to 1.9.4.
+	 */
+	public LegacyServerPing() {
+		super(MinecraftReflection.getServerPingClass());
+		setHandle(SERVER_PING_CONSTRUCTOR.invoke());
+		resetPlayers();
+		resetVersion();
+	}
+
+	public LegacyServerPing(Object handle) {
+		super(MinecraftReflection.getServerPingClass());
+		setHandle(handle);
+		this.players = PLAYERS.get(handle);
+		this.version = VERSION.get(handle);
+	}
+
+	/**
+	 * Set the player count and player maximum to the default values.
+	 */
+	public void resetPlayers() {
+		players = PLAYERS_CONSTRUCTOR.invoke(0, 0);
+		PLAYERS.set(handle, players);
+	}
+
+	/**
+	 * Reset the version string to the default state.
+	 */
+	public void resetVersion() {
+		MinecraftVersion minecraftVersion = MinecraftVersion.getCurrentVersion();
+		version = VERSION_CONSTRUCTOR.invoke(minecraftVersion.toString(), MinecraftProtocolVersion.getCurrentVersion());
+		VERSION.set(handle, version);
+	}
+
+	/**
+	 * Construct a wrapped server ping from a native NMS object.
+	 * @param handle - the native object.
+	 * @return The wrapped server ping object.
+	 */
+	public static LegacyServerPing fromHandle(Object handle) {
+		return new LegacyServerPing(handle);
+	}
+
+	/**
+	 * Construct a wrapper server ping from an encoded JSON string.
+	 * @param json - the JSON string.
+	 * @return The wrapped server ping.
+	 */
+	public static LegacyServerPing fromJson(String json) {
+		return fromHandle(GSON_FROM_JSON.invoke(PING_GSON.get(null), json, SERVER_PING));
+	}
+
+	/**
+	 * Retrieve the message of the day.
+	 * @return The message of the day.
+	 */
+	@Override
+	public WrappedChatComponent getMotD() {
+		return WrappedChatComponent.fromHandle(DESCRIPTION.get(handle));
+	}
+
+	/**
+	 * Set the message of the day.
+	 * @param description - message of the day.
+	 */
+	@Override
+	public void setMotD(WrappedChatComponent description) {
+		DESCRIPTION.set(handle, description != null ? description.getHandle() : null);
+	}
+
+	/**
+	 * Retrieve the compressed PNG file that is being displayed as a favicon.
+	 * @return The favicon, or NULL if no favicon will be displayed.
+	 */
+	@Override
+	public String getFavicon() {
+		return (String) FAVICON.get(handle);
+	}
+
+	/**
+	 * Set the compressed PNG file that is being displayed.
+	 * @param image - the new compressed image or NULL if no favicon should be displayed.
+	 */
+	@Override
+	public void setFavicon(String image) {
+		FAVICON.set(handle, image);
+	}
+
+	/**
+	 * Retrieve whether chat preview is enabled on the server.
+	 * @return whether chat preview is enabled on the server.
+	 * @since 1.19
+	 * @deprecated Removed in 1.19.3
+	 */
+	@Deprecated
+	public boolean isChatPreviewEnabled() {
+		return (Boolean) BOOLEAN_ACCESSORS[0].get(handle);
+	}
+
+	/**
+	 * Sets whether chat preview is enabled on the server.
+	 * @param chatPreviewEnabled true if enabled, false otherwise.
+	 * @since 1.19
+	 * @deprecated Removed in 1.19.3
+	 */
+	@Deprecated
+	public void setChatPreviewEnabled(boolean chatPreviewEnabled) {
+		BOOLEAN_ACCESSORS[0].set(handle, chatPreviewEnabled);
+	}
+
+	/**
+	 * Sets whether the server enforces secure chat.
+	 * @return whether the server enforces secure chat.
+	 * @since 1.19.1
+	 */
+	@Override
+	public boolean isEnforceSecureChat() {
+		int index = MinecraftVersion.FEATURE_PREVIEW_UPDATE.atOrAbove() ? 0 : 1;
+		return (Boolean) BOOLEAN_ACCESSORS[index].get(handle);
+	}
+
+	/**
+	 * Sets whether the server enforces secure chat.
+	 * @param enforceSecureChat true if enabled, false otherwise.
+	 * @since 1.19.1
+	 */
+	@Override
+	public void setEnforceSecureChat(boolean enforceSecureChat) {
+		int index = MinecraftVersion.FEATURE_PREVIEW_UPDATE.atOrAbove() ? 0 : 1;
+		BOOLEAN_ACCESSORS[index].set(handle, enforceSecureChat);
+	}
+
+	/**
+	 * Retrieve the displayed number of online players.
+	 * @return The displayed number.
+	 * @throws IllegalStateException If the player count has been hidden via {@link #setPlayersVisible(boolean)}.
+	 * @see #setPlayersOnline(int)
+	 */
+	@Override
+	public int getPlayersOnline() {
+		if (players == null)
+			throw new IllegalStateException("The player count has been hidden.");
+		return (Integer) PLAYERS_ONLINE.get(players);
+	}
+
+	/**
+	 * Set the displayed number of online players.
+	 * <p>
+	 * As of 1.7.2, this is completely unrestricted, and can be both positive and
+	 * negative, as well as higher than the player maximum.
+	 * @param online - online players.
+	 */
+	@Override
+	public void setPlayersOnline(int online) {
+		if (players == null)
+			resetPlayers();
+		PLAYERS_ONLINE.set(players, online);
+	}
+
+	/**
+	 * Retrieve the displayed maximum number of players.
+	 * @return The maximum number.
+	 * @throws IllegalStateException If the player maximum has been hidden via {@link #setPlayersVisible(boolean)}.
+	 * @see #setPlayersMaximum(int)
+	 */
+	@Override
+	public int getPlayersMaximum() {
+		if (players == null)
+			throw new IllegalStateException("The player maximum has been hidden.");
+		return (Integer) PLAYERS_MAXIMUM.get(players);
+	}
+
+	/**
+	 * Set the displayed maximum number of players.
+	 * <p>
+	 * The 1.7.2 accepts any value as a player maximum, positive or negative. It even permits a player maximum that
+	 * is less than the player count.
+	 * @param maximum - maximum player count.
+	 */
+	@Override
+	public void setPlayersMaximum(int maximum) {
+		if (players == null)
+			resetPlayers();
+		PLAYERS_MAXIMUM.set(players, maximum);
+	}
+
+	/**
+	 * Set whether or not the player count and player maximum is visible.
+	 * <p>
+	 * Note that this may set the current player count and maximum to their respective real values.
+	 * @param visible - TRUE if it should be visible, FALSE otherwise.
+	 */
+	@Override
+	public void setPlayersVisible(boolean visible) {
+		if (arePlayersVisible() != visible) {
+			if (visible) {
+				// Recreate the count and maximum
+				Server server = Bukkit.getServer();
+				setPlayersMaximum(server.getMaxPlayers());
+				setPlayersOnline(Bukkit.getOnlinePlayers().size());
+			} else {
+				PLAYERS.set(handle, players = null);
+			}
+		}
+	}
+
+	/**
+	 * Determine if the player count and maximum is visible.
+	 * <p>
+	 * If not, the client will display ??? in the same location.
+	 * @return TRUE if the player statistics is visible, FALSE otherwise.
+	 */
+	@Override
+	public boolean arePlayersVisible() {
+		return players != null;
+	}
+
+	/**
+	 * Retrieve a copy of all the logged in players.
+	 * @return Logged in players or an empty list if no player names will be displayed.
+	 */
+	@Override
+	public ImmutableList<WrappedGameProfile> getPlayers() {
+		if (players == null)
+			return ImmutableList.of();
+		Object playerProfiles = PLAYERS_PROFILES.get(players);
+		if (playerProfiles == null)
+			return ImmutableList.of();
+		return ImmutableList.copyOf(PROFILE_CONVERT.getSpecific(playerProfiles));
+	}
+
+	/**
+	 * Set the displayed list of logged in players.
+	 * @param playerSample - every logged in player.
+	 */
+	@Override
+	public void setPlayers(Iterable<? extends WrappedGameProfile> playerSample) {
+		if (players == null)
+			resetPlayers();
+
+		PLAYERS_PROFILES.set(players, PROFILE_CONVERT.getGeneric(playerSample));
+	}
+
+	/**
+	 * Retrieve the version name of the current server.
+	 * @return The version name.
+	 */
+	@Override
+	public String getVersionName() {
+		return (String) VERSION_NAME.get(version);
+	}
+
+	/**
+	 * Set the version name of the current server.
+	 * @param name - the new version name.
+	 */
+	@Override
+	public void setVersionName(String name) {
+		VERSION_NAME.set(version, name);
+	}
+
+	/**
+	 * Retrieve the protocol number.
+	 * @return The protocol.
+	 */
+	@Override
+	public int getVersionProtocol() {
+		return (Integer) VERSION_PROTOCOL.get(version);
+	}
+
+	/**
+	 * Set the version protocol
+	 * @param protocol - the protocol number.
+	 */
+	@Override
+	public void setVersionProtocol(int protocol) {
+		VERSION_PROTOCOL.set(version, protocol);
+	}
+
+	/**
+	 * Retrieve a deep copy of the current wrapper object.
+	 * @return The current object.
+	 */
+	public LegacyServerPing deepClone() {
+		LegacyServerPing copy = new LegacyServerPing();
+		WrappedChatComponent motd = getMotD();
+
+		copy.setPlayers(getPlayers());
+		copy.setFavicon(getFavicon());
+		copy.setMotD(motd != null ? motd : null);
+		copy.setVersionName(getVersionName());
+		copy.setVersionProtocol(getVersionProtocol());
+
+		if (arePlayersVisible()) {
+			copy.setPlayersMaximum(getPlayersMaximum());
+			copy.setPlayersOnline(getPlayersOnline());
+		} else {
+			copy.setPlayersVisible(false);
+		}
+		return copy;
+	}
+
+	/**
+	 * Retrieve the underlying JSON representation of this server ping.
+	 * @return The JSON representation.
+	 */
+	public String toJson() {
+		return (String) GSON_TO_JSON.invoke(PING_GSON.get(null), handle);
+	}
+
+	@Override
+	public String toString() {
+		return "WrappedServerPing< " + toJson() + ">";
+	}
+}

src/main/java/com/comphenix/protocol/wrappers/ping/ServerPingImpl.java

@@ -0,0 +1,43 @@
+package com.comphenix.protocol.wrappers.ping;
+
+import java.util.Optional;
+
+import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import com.comphenix.protocol.wrappers.WrappedGameProfile;
+
+import com.google.common.collect.ImmutableList;
+
+public interface ServerPingImpl extends Cloneable {
+	WrappedChatComponent getMotD();
+	void setMotD(WrappedChatComponent description);
+	int getPlayersMaximum();
+	void setPlayersMaximum(int maxPlayers);
+	int getPlayersOnline();
+	void setPlayersOnline(int onlineCount);
+	ImmutableList<WrappedGameProfile> getPlayers();
+	void setPlayers(Iterable<? extends WrappedGameProfile> playerSample);
+	String getVersionName();
+	void setVersionName(String versionName);
+	int getVersionProtocol();
+	void setVersionProtocol(int protocolVersion);
+	String getFavicon();
+	void setFavicon(String favicon);
+	boolean isEnforceSecureChat();
+	void setEnforceSecureChat(boolean safeChat);
+
+	void resetPlayers();
+	void resetVersion();
+
+	default boolean isChatPreviewEnabled() {
+		return false;
+	}
+
+	default void setChatPreviewEnabled(boolean enabled) {
+
+	}
+
+	boolean arePlayersVisible();
+	void setPlayersVisible(boolean visible);
+
+	Object getHandle();
+}

src/main/java/com/comphenix/protocol/wrappers/ping/ServerPingRecord.java

@@ -0,0 +1,300 @@
+package com.comphenix.protocol.wrappers.ping;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.Semaphore;
+
+import com.comphenix.protocol.events.InternalStructure;
+import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
+import com.comphenix.protocol.utility.MinecraftProtocolVersion;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.wrappers.*;
+
+import com.google.common.collect.ImmutableList;
+import org.bukkit.Bukkit;
+
+public final class ServerPingRecord implements ServerPingImpl {
+	private static Class<?> SERVER_PING;
+	private static Class<?> PLAYER_SAMPLE_CLASS;
+	private static Class<?> SERVER_DATA_CLASS;
+
+	private static WrappedChatComponent DEFAULT_DESCRIPTION;
+
+	private static ConstructorAccessor PING_CTOR;
+
+	private static EquivalentConverter<List<WrappedGameProfile>> PROFILE_LIST_CONVERTER;
+
+	private static boolean initialized = false;
+	private static final Object lock = new Object();
+
+	private static void initialize() {
+		if (initialized) {
+			return;
+		}
+
+		synchronized (lock) {
+			// may have been initialized while waiting for the lock
+			if (initialized) {
+				return;
+			}
+
+			try {
+				SERVER_PING = MinecraftReflection.getServerPingClass();
+				PLAYER_SAMPLE_CLASS = MinecraftReflection.getServerPingPlayerSampleClass();
+				SERVER_DATA_CLASS = MinecraftReflection.getServerPingServerDataClass();
+
+				PING_CTOR = Accessors.getConstructorAccessor(SERVER_PING.getConstructors()[0]);
+
+				DATA_WRAPPER = AutoWrapper.wrap(ServerData.class, SERVER_DATA_CLASS);
+				SAMPLE_WRAPPER = AutoWrapper.wrap(PlayerSample.class, PLAYER_SAMPLE_CLASS);
+				FAVICON_WRAPPER = AutoWrapper.wrap(Favicon.class, MinecraftReflection.getMinecraftClass("network.protocol.status.ServerPing$a"));
+
+				PROFILE_LIST_CONVERTER = BukkitConverters.getListConverter(BukkitConverters.getWrappedGameProfileConverter());
+
+				DEFAULT_DESCRIPTION = WrappedChatComponent.fromLegacyText("A Minecraft Server");
+			} catch (Exception ex) {
+				throw new RuntimeException("Failed to initialize Server Ping", ex);
+			} finally {
+				initialized = true;
+			}
+		}
+	}
+
+	public static final class PlayerSample {
+		public int max;
+		public int online;
+		public Object sample;
+
+		public PlayerSample(int max, int online, Object sample) {
+			this.max = max;
+			this.online = online;
+			this.sample = sample;
+		}
+
+		public PlayerSample() {
+			this(0, 0, null);
+		}
+	}
+
+	public static final class ServerData {
+		public String name;
+		public int protocol;
+
+		public ServerData(String name, int protocol) {
+			this.name = name;
+			this.protocol = protocol;
+		}
+
+		public ServerData() {
+			this("", 0);
+		}
+	}
+
+	static final byte[] EMPTY_FAVICON = new byte[0];
+
+	public static final class Favicon {
+		public byte[] iconBytes;
+
+		public Favicon(byte[] iconBytes) {
+			this.iconBytes = iconBytes;
+		}
+
+		public Favicon() {
+			this(EMPTY_FAVICON);
+		}
+	}
+
+	private static AutoWrapper<PlayerSample> SAMPLE_WRAPPER;
+
+	private static AutoWrapper<ServerData> DATA_WRAPPER;
+
+	private static AutoWrapper<Favicon> FAVICON_WRAPPER;
+
+	private WrappedChatComponent description;
+	private PlayerSample playerSample;
+	private ServerData serverData;
+	private Favicon favicon;
+	private boolean enforceSafeChat;
+	private boolean playersVisible = true;
+
+	private static ServerData defaultData() {
+		String name = MinecraftVersion.getCurrentVersion().toString();
+		int protocol = MinecraftProtocolVersion.getCurrentVersion();
+
+		return new ServerData(name, protocol);
+	}
+
+	private static PlayerSample defaultSample() {
+		int max = Bukkit.getMaxPlayers();
+		int online = Bukkit.getOnlinePlayers().size();
+
+		return new PlayerSample(max, online, null);
+	}
+
+	private static Favicon defaultFavicon() {
+		return new Favicon();
+	}
+
+	public ServerPingRecord(Object handle) {
+		initialize();
+
+		StructureModifier<Object> modifier = new StructureModifier<>(handle.getClass()).withTarget(handle);
+		InternalStructure structure = new InternalStructure(handle, modifier);
+
+		this.description = structure.getChatComponents().readSafely(0);
+
+		StructureModifier<Optional<Object>> optionals = structure.getOptionals(Converters.passthrough(Object.class));
+
+		Optional<Object> sampleHandle = optionals.readSafely(0);
+		this.playerSample = sampleHandle.isPresent() ? SAMPLE_WRAPPER.wrap(sampleHandle.get()) : defaultSample();
+
+		Optional<Object> dataHandle = optionals.readSafely(1);
+		this.serverData = dataHandle.isPresent() ? DATA_WRAPPER.wrap(dataHandle.get()) : defaultData();
+
+		Optional<Object> faviconHandle = optionals.readSafely(2);
+		this.favicon = faviconHandle.isPresent() ? FAVICON_WRAPPER.wrap(faviconHandle.get()) : defaultFavicon();
+
+		this.enforceSafeChat = structure.getBooleans().readSafely(0);
+	}
+
+	public ServerPingRecord() {
+		initialize();
+
+		this.description = DEFAULT_DESCRIPTION;
+		this.playerSample = defaultSample();
+		this.serverData = defaultData();
+		this.favicon = defaultFavicon();
+	}
+
+	@Override
+	public WrappedChatComponent getMotD() {
+		return description;
+	}
+
+	@Override
+	public void setMotD(WrappedChatComponent description) {
+		this.description = description;
+	}
+
+	@Override
+	public int getPlayersMaximum() {
+		return playerSample.max;
+	}
+
+	@Override
+	public void setPlayersMaximum(int maxPlayers) {
+		playerSample.max = maxPlayers;
+	}
+
+	@Override
+	public int getPlayersOnline() {
+		return playerSample.online;
+	}
+
+	@Override
+	public void setPlayersOnline(int onlineCount) {
+		playerSample.online = onlineCount;
+	}
+
+	@Override
+	public ImmutableList<WrappedGameProfile> getPlayers() {
+		if (playerSample.sample == null) {
+			return ImmutableList.of();
+		}
+
+		List<WrappedGameProfile> list = PROFILE_LIST_CONVERTER.getSpecific(playerSample.sample);
+		if (list == null) {
+			return ImmutableList.of();
+		}
+
+		return ImmutableList.copyOf(list);
+	}
+
+	@Override
+	public void setPlayers(Iterable<? extends WrappedGameProfile> playerSample) {
+		if (playerSample == null) {
+			this.playerSample.sample = null;
+			return;
+		}
+
+		List<WrappedGameProfile> list = Converters.toList(playerSample);
+		this.playerSample.sample = PROFILE_LIST_CONVERTER.getGeneric(list);
+	}
+
+	@Override
+	public String getVersionName() {
+		return serverData.name;
+	}
+
+	@Override
+	public void setVersionName(String versionName) {
+		serverData.name = versionName;
+	}
+
+	@Override
+	public int getVersionProtocol() {
+		return serverData.protocol;
+	}
+
+	@Override
+	public void setVersionProtocol(int protocolVersion) {
+		serverData.protocol = protocolVersion;
+	}
+
+	@Override
+	public String getFavicon() {
+		return new String(favicon.iconBytes, StandardCharsets.UTF_8);
+	}
+
+	@Override
+	public void setFavicon(String favicon) {
+		this.favicon.iconBytes = favicon.getBytes(StandardCharsets.UTF_8);
+	}
+
+	@Override
+	public boolean isEnforceSecureChat() {
+		return enforceSafeChat;
+	}
+
+	@Override
+	public void setEnforceSecureChat(boolean safeChat) {
+		this.enforceSafeChat = safeChat;
+	}
+
+	@Override
+	public void resetPlayers() {
+		this.playerSample = defaultSample();
+	}
+
+	@Override
+	public void resetVersion() {
+		this.serverData = defaultData();
+	}
+
+	@Override
+	public boolean arePlayersVisible() {
+		return playersVisible;
+	}
+
+	@Override
+	public void setPlayersVisible(boolean visible) {
+		this.playersVisible = visible;
+	}
+
+	@Override
+	public Object getHandle() {
+		WrappedChatComponent wrappedDescription = description != null ? description : DEFAULT_DESCRIPTION;
+		Object descHandle = wrappedDescription.getHandle();
+
+		Optional<Object> playersHandle = Optional.ofNullable(playerSample != null ? SAMPLE_WRAPPER.unwrap(playerSample) : null);
+		Optional<Object> versionHandle = Optional.ofNullable(serverData != null ? DATA_WRAPPER.unwrap(serverData) : null);
+		Optional<Object> favHandle = Optional.ofNullable(favicon != null ? FAVICON_WRAPPER.unwrap(favicon) : null);
+
+		return PING_CTOR.invoke(descHandle, playersHandle, versionHandle, favHandle, enforceSafeChat);
+	}
+}

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: ProtocolLib
-version: ${project.fullVersion}
+version: ${version}
 description: Provides read/write access to the Minecraft protocol.
 authors: [dmulloy2, comphenix]
 

src/test/java/com/comphenix/protocol/BukkitInitialization.java

@@ -14,10 +14,10 @@ import org.apache.logging.log4j.LogManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_19_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_19_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemFactory;
-import org.bukkit.craftbukkit.v1_19_R2.util.Versioning;
+import org.bukkit.craftbukkit.v1_19_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemFactory;
+import org.bukkit.craftbukkit.v1_19_R3.util.Versioning;
 import org.spigotmc.SpigotWorldConfig;
 
 import static org.mockito.Mockito.mock;
@@ -41,17 +41,24 @@ public class BukkitInitialization {
 	/**
 	 * Statically initializes the mock server for unit testing
 	 */
-	public static synchronized void initializeAll() {
+	public static void initializeAll() {
 		instance.initialize();
 	}
 
+	private static final Object initLock = new Object();
+
 	/**
-	 * Initialize Bukkit and ProtocolLib such that we can perfrom unit testing
+	 * Initialize Bukkit and ProtocolLib such that we can perform unit testing
 	 */
 	private void initialize() {
-		if (!this.initialized) {
-			// Denote that we're done
-			this.initialized = true;
+		if (initialized) {
+			return;
+		}
+
+		synchronized (initLock) {
+			if (initialized) {
+				return;
+			}
 
 			try {
 				LogManager.getLogger();
@@ -104,6 +111,8 @@ public class BukkitInitialization {
 
 			// Inject this fake server
 			Bukkit.setServer(mockedServer);
+
+			initialized = true;
 		}
 	}
 

src/test/java/com/comphenix/protocol/PacketTypeTest.java

@@ -49,9 +49,9 @@ public class PacketTypeTest {
 		BukkitInitialization.initializeAll();
 
 		// I'm well aware this is jank, but it does in fact work correctly and give the desired result
-		PacketType.onDynamicCreate = className -> {
+		/*PacketType.onDynamicCreate = className -> {
 			throw new RuntimeException("Dynamically generated packet " + className);
-		};
+		};*/
 	}
 
 	@AfterAll
@@ -61,7 +61,9 @@ public class PacketTypeTest {
 	}
 
 	@SuppressWarnings("unchecked")
-	public static void main(String[] args) throws Exception {
+	// @Test
+	// public static void main(String[] args) throws Exception {
+	public void generateNewPackets() throws Exception {
 		MinecraftReflectionTestUtil.init();
 
 		Set<Class<?>> allTypes = new HashSet<>();
@@ -71,7 +73,7 @@ public class PacketTypeTest {
 		for (EnumProtocol protocol : protocols) {
 			System.out.println(WordUtils.capitalize(protocol.name().toLowerCase()));
 
-			Field field = EnumProtocol.class.getDeclaredField("j");
+			Field field = EnumProtocol.class.getDeclaredField("k");
 			field.setAccessible(true);
 
 			Map<EnumProtocolDirection, Object> map = (Map<EnumProtocolDirection, Object>) field.get(protocol);
@@ -173,18 +175,35 @@ public class PacketTypeTest {
 
 		className = classNames.get(classNames.size() - 1);
 
-		// Format it like SET_PROTOCOL
-		StringBuilder fieldName = new StringBuilder();
-		char[] chars = className.toCharArray();
-		for (int i = 0; i < chars.length; i++) {
-			char c = chars[i];
-			if (i != 0 && Character.isUpperCase(c)) {
-				fieldName.append("_");
+		PacketType existing = null;
+		try {
+			existing = PacketType.fromClass(clazz);
+			if (existing.isDynamic()) {
+				existing = null;
 			}
-			fieldName.append(Character.toUpperCase(c));
+		} catch (Exception ignored) {
+			// doesn't exist
 		}
 
-		builder.append(fieldName.toString().replace("N_B_T", "NBT"));
+		String fieldName;
+		if (existing == null) {
+			// Format it like SET_PROTOCOL
+			StringBuilder fieldNameBuilder = new StringBuilder();
+			char[] chars = className.toCharArray();
+			for (int i = 0; i < chars.length; i++) {
+				char c = chars[i];
+				if (i != 0 && Character.isUpperCase(c)) {
+					fieldNameBuilder.append("_");
+				}
+				fieldNameBuilder.append(Character.toUpperCase(c));
+			}
+
+			fieldName = fieldNameBuilder.toString().replace("N_B_T", "NBT");
+		} else {
+			fieldName = existing.name();
+		}
+
+		builder.append(fieldName);
 		builder.append(" = ");
 
 		// Add spacing
@@ -248,11 +267,6 @@ public class PacketTypeTest {
 		return builder.toString();
 	}
 
-	@BeforeAll
-	public static void initializeReflection() {
-		BukkitInitialization.initializeAll();
-	}
-
 	@Test
 	public void testFindCurrent() {
 		assertEquals(PacketType.Play.Client.STEER_VEHICLE,
@@ -278,42 +292,54 @@ public class PacketTypeTest {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void ensureTypesAreCorrect() throws Exception {
-		boolean fail = false;
+		PacketType.onDynamicCreate = className -> {
+			throw new RuntimeException("Dynamically generated packet " + className);
+		};
 
-		EnumProtocol[] protocols = EnumProtocol.values();
-		for (EnumProtocol protocol : protocols) {
-			Field field = EnumProtocol.class.getDeclaredField("j");
-			field.setAccessible(true);
+		try {
+			boolean fail = false;
 
-			Map<EnumProtocolDirection, Object> map = (Map<EnumProtocolDirection, Object>) field.get(protocol);
-			for (Entry<EnumProtocolDirection, Object> entry : map.entrySet()) {
-				Field mapField = entry.getValue().getClass().getDeclaredField("b");
-				mapField.setAccessible(true);
+			EnumProtocol[] protocols = EnumProtocol.values();
+			for (EnumProtocol protocol : protocols) {
+				Field field = EnumProtocol.class.getDeclaredField("k");
+				field.setAccessible(true);
 
-				Map<Class<?>, Integer> reverseMap = (Map<Class<?>, Integer>) mapField.get(entry.getValue());
+				Map<EnumProtocolDirection, Object> map = (Map<EnumProtocolDirection, Object>) field.get(protocol);
+				for (Entry<EnumProtocolDirection, Object> entry : map.entrySet()) {
+					Field mapField = entry.getValue().getClass().getDeclaredField("b");
+					mapField.setAccessible(true);
 
-				Map<Integer, Class<?>> treeMap = new TreeMap<>();
-				for (Entry<Class<?>, Integer> entry1 : reverseMap.entrySet()) {
-					treeMap.put(entry1.getValue(), entry1.getKey());
-				}
+					Map<Class<?>, Integer> reverseMap = (Map<Class<?>, Integer>) mapField.get(entry.getValue());
 
-				for (Entry<Integer, Class<?>> entry1 : treeMap.entrySet()) {
-					try {
-						PacketType type = PacketType.fromClass(entry1.getValue());
-						if (type.getCurrentId() != entry1.getKey()) {
-							throw new IllegalStateException(
-									"Packet ID for " + type + " is incorrect. Expected " + entry1.getKey() + ", but got "
-											+ type.getCurrentId());
+					Map<Integer, Class<?>> treeMap = new TreeMap<>();
+					for (Entry<Class<?>, Integer> entry1 : reverseMap.entrySet()) {
+						treeMap.put(entry1.getValue(), entry1.getKey());
+					}
+
+					for (Entry<Integer, Class<?>> entry1 : treeMap.entrySet()) {
+						try {
+							PacketType type = PacketType.fromClass(entry1.getValue());
+							if (type.getCurrentId() != entry1.getKey()) {
+								throw new IllegalStateException(
+										"Packet ID for " + type + " is incorrect. Expected " + entry1.getKey() + ", but got "
+												+ type.getCurrentId());
+							}
+						} catch (Throwable ex) {
+							if (ex.getMessage().contains("BundleDelimiterPacket")) {
+								continue;
+							}
+
+							ex.printStackTrace();
+							fail = true;
 						}
-					} catch (Throwable ex) {
-						ex.printStackTrace();
-						fail = true;
 					}
 				}
 			}
-		}
 
-		assertFalse(fail, "Packet type(s) were incorrect!");
+			assertFalse(fail, "Packet type(s) were incorrect!");
+		} finally {
+			PacketType.onDynamicCreate = __ -> { };
+		}
 	}
 
 	@Test

src/test/java/com/comphenix/protocol/events/PacketContainerTest.java

@@ -568,9 +568,10 @@ public class PacketContainerTest {
 	}
 
 	@Test
-	@Disabled("effect is now wrapped in a holder") // todo
 	public void testSoundEffects() {
 		PacketContainer container = new PacketContainer(PacketType.Play.Server.NAMED_SOUND_EFFECT);
+		container.getSoundEffects().optionRead(0);
+
 		container.getSoundEffects().write(0, Sound.ENTITY_CAT_HISS);
 
 		assertEquals(container.getSoundEffects().read(0), Sound.ENTITY_CAT_HISS);
@@ -828,7 +829,8 @@ public class PacketContainerTest {
 		// Try constructing all the packets
 		for (PacketType type : PacketType.values()) {
 			// TODO: try to support chat - for now chat contains to many sub classes to properly clone it
-			if (type.isDeprecated() || !type.isSupported() || type.name().contains("CUSTOM_PAYLOAD") || type.name().contains("CHAT")) {
+			if (type.isDeprecated() || !type.isSupported() || type.name().contains("CUSTOM_PAYLOAD") || type.name().contains("CHAT")
+				|| type.name().contains("BUNDLE")) {
 				continue;
 			}
 

src/test/java/com/comphenix/protocol/injector/EntityUtilitiesTest.java

@@ -12,8 +12,8 @@ import net.minecraft.server.level.PlayerChunkMap;
 import net.minecraft.server.level.PlayerChunkMap.EntityTracker;
 import net.minecraft.server.level.WorldServer;
 import net.minecraft.world.entity.Entity;
-import org.bukkit.craftbukkit.v1_19_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 

src/test/java/com/comphenix/protocol/utility/CachedPackageTest.java

@@ -0,0 +1,37 @@
+package com.comphenix.protocol.utility;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class CachedPackageTest {
+	private CachedPackage pack;
+
+	@BeforeEach
+	public void prepare() {
+		ClassSource source = ClassSource.fromClassLoader();
+		this.pack = new CachedPackage("java.lang", source);
+	}
+
+	@Test
+	public void testGetPackageClass() {
+		Optional<Class<?>> result = pack.getPackageClass("Object");
+		assertTrue(result.isPresent());
+		assertEquals(result.get(), Object.class);
+	}
+
+	@Test
+	public void testUsingAliases() {
+		Optional<Class<?>> result = pack.getPackageClass("NOT_A_CLASS", "Object");
+		assertTrue(result.isPresent());
+		assertEquals(result.get(), Object.class);
+
+		result = pack.getPackageClass("NOT_A_CLASS", "STILL_NOT_A_CLASS", "Object");
+		assertTrue(result.isPresent());
+		assertEquals(result.get(), Object.class);
+	}
+}

src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java

@@ -13,7 +13,7 @@ import net.minecraft.world.level.ChunkCoordIntPair;
 import net.minecraft.world.level.block.state.IBlockData;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Entity;
 import org.bukkit.inventory.ItemStack;
 import org.junit.jupiter.api.AfterAll;

src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTestUtil.java

@@ -3,7 +3,7 @@ package com.comphenix.protocol.utility;
 public class MinecraftReflectionTestUtil {
 
 	public static final String RELEASE_TARGET = "1.19.3";
-	public static final String PACKAGE_VERSION = "v1_19_R2";
+	public static final String PACKAGE_VERSION = "v1_19_R3";
 	public static final String NMS = "net.minecraft";
 	public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION;
 

src/test/java/com/comphenix/protocol/wrappers/AutoWrapperTest.java

@@ -8,6 +8,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
 import com.comphenix.protocol.BukkitInitialization;
+import com.comphenix.protocol.utility.MinecraftReflection;
+
 import net.minecraft.advancements.AdvancementDisplay;
 import net.minecraft.advancements.AdvancementFrameType;
 import net.minecraft.network.chat.IChatBaseComponent;
@@ -20,100 +22,100 @@ import org.junit.jupiter.api.Test;
 
 public class AutoWrapperTest {
 
-  @BeforeAll
-  public static void initializeBukkit() {
-    BukkitInitialization.initializeAll();
-  }
+	@BeforeAll
+	public static void initializeBukkit() {
+		BukkitInitialization.initializeAll();
+	}
 
-  @Test
-  public void testToNms() {
-    WrappedAdvancementDisplay display = new WrappedAdvancementDisplay();
-    display.title = WrappedChatComponent.fromText("Test123");
-    display.description = WrappedChatComponent.fromText("Test567");
-    display.item = new ItemStack(Material.GOLD_INGOT);
-    display.background = new MinecraftKey("test");
-    display.frameType = WrappedFrameType.CHALLENGE;
-    display.announceChat = false;
-    display.showToast = true;
-    display.hidden = true;
-    display.x = 5f;
-    display.y = 67f;
+	@Test
+	public void testToNms() {
+		WrappedAdvancementDisplay display = new WrappedAdvancementDisplay();
+		display.title = WrappedChatComponent.fromText("Test123");
+		display.description = WrappedChatComponent.fromText("Test567");
+		display.item = new ItemStack(Material.GOLD_INGOT);
+		display.background = new MinecraftKey("test");
+		display.frameType = WrappedFrameType.CHALLENGE;
+		display.announceChat = false;
+		display.showToast = true;
+		display.hidden = true;
+		display.x = 5f;
+		display.y = 67f;
 
-    AdvancementDisplay nms = (AdvancementDisplay) displayWrapper().unwrap(display);
+		AdvancementDisplay nms = (AdvancementDisplay) displayWrapper().unwrap(display);
 
-    assertTrue(nms.h());
-    assertTrue(nms.j());
-    assertFalse(nms.i());
-    assertEquals("test", nms.d().a());
-    validateRawText(nms.a(), "Test123");
-    validateRawText(nms.b(), "Test567");
-    assertSame(AdvancementFrameType.b, nms.e());
-    assertSame(Items.nv, nms.c().c());
-    assertEquals(5f, nms.f(), 0f);
-    assertEquals(67f, nms.g(), 0f);
-  }
+		assertTrue(nms.h());
+		assertTrue(nms.j());
+		assertFalse(nms.i());
+		assertEquals("test", nms.d().a());
+		validateRawText(nms.a(), "Test123");
+		validateRawText(nms.b(), "Test567");
+		assertSame(AdvancementFrameType.b, nms.e());
+		assertSame(MinecraftReflection.getBukkitItemStack(nms.c()).getType(), Material.GOLD_INGOT);
+		assertEquals(5f, nms.f(), 0f);
+		assertEquals(67f, nms.g(), 0f);
+	}
 
-  @Test
-  public void testFromNms() {
-    AdvancementDisplay display = new AdvancementDisplay(
-        new net.minecraft.world.item.ItemStack(Items.rc),
-        IChatBaseComponent.b("Test123"),
-        IChatBaseComponent.b("Test567"),
-        new net.minecraft.resources.MinecraftKey("minecraft", "test"),
-        AdvancementFrameType.b,
-        true,
-        false,
-        true
-    );
-    display.a(5f, 67f);
+	@Test
+	public void testFromNms() {
+		AdvancementDisplay display = new AdvancementDisplay(
+              (net.minecraft.world.item.ItemStack)MinecraftReflection.getMinecraftItemStack(new ItemStack(Material.ENDER_EYE)),
+              IChatBaseComponent.b("Test123"),
+              IChatBaseComponent.b("Test567"),
+              new net.minecraft.resources.MinecraftKey("minecraft", "test"),
+              AdvancementFrameType.b,
+              true,
+              false,
+              true
+		);
+		display.a(5f, 67f);
 
-    WrappedAdvancementDisplay wrapped = displayWrapper().wrap(display);
+		WrappedAdvancementDisplay wrapped = displayWrapper().wrap(display);
 
-    assertTrue(wrapped.showToast);
-    assertTrue(wrapped.hidden);
-    assertFalse(wrapped.announceChat);
-    assertEquals("test", wrapped.background.getKey());
-    assertEquals("{\"text\":\"Test123\"}", wrapped.title.getJson());
-    assertEquals("{\"text\":\"Test567\"}", wrapped.description.getJson());
-    assertSame(WrappedFrameType.CHALLENGE, wrapped.frameType);
-    assertSame(Material.ENDER_EYE, wrapped.item.getType());
-    assertEquals(5f, wrapped.x, 0f);
-    assertEquals(67f, wrapped.y, 0f);
-  }
+		assertTrue(wrapped.showToast);
+		assertTrue(wrapped.hidden);
+		assertFalse(wrapped.announceChat);
+		assertEquals("test", wrapped.background.getKey());
+		assertEquals("{\"text\":\"Test123\"}", wrapped.title.getJson());
+		assertEquals("{\"text\":\"Test567\"}", wrapped.description.getJson());
+		assertSame(WrappedFrameType.CHALLENGE, wrapped.frameType);
+		assertSame(Material.ENDER_EYE, wrapped.item.getType());
+		assertEquals(5f, wrapped.x, 0f);
+		assertEquals(67f, wrapped.y, 0f);
+	}
 
-  private AutoWrapper<WrappedAdvancementDisplay> displayWrapper() {
-    return AutoWrapper
-        .wrap(WrappedAdvancementDisplay.class, "advancements.AdvancementDisplay", "advancements.DisplayInfo")
-        .field(0, BukkitConverters.getWrappedChatComponentConverter())
-        .field(1, BukkitConverters.getWrappedChatComponentConverter())
-        .field(2, BukkitConverters.getItemStackConverter())
-        .field(3, MinecraftKey.getConverter())
-        .field(4, EnumWrappers.getGenericConverter(getMinecraftClass("advancements.AdvancementFrameType", "advancements.FrameType"),
-            WrappedFrameType.class));
-  }
+	private AutoWrapper<WrappedAdvancementDisplay> displayWrapper() {
+		return AutoWrapper
+				.wrap(WrappedAdvancementDisplay.class, "advancements.AdvancementDisplay", "advancements.DisplayInfo")
+				.field(0, BukkitConverters.getWrappedChatComponentConverter())
+				.field(1, BukkitConverters.getWrappedChatComponentConverter())
+				.field(2, BukkitConverters.getItemStackConverter())
+				.field(3, MinecraftKey.getConverter())
+				.field(4, EnumWrappers.getGenericConverter(getMinecraftClass("advancements.AdvancementFrameType", "advancements.FrameType"),
+						WrappedFrameType.class));
+	}
 
-  private void validateRawText(IChatBaseComponent component, String expected) {
-    LiteralContents content = assertInstanceOf(LiteralContents.class, component.b());
-    assertEquals(expected, content.a());
-  }
+	private void validateRawText(IChatBaseComponent component, String expected) {
+		LiteralContents content = assertInstanceOf(LiteralContents.class, component.b());
+		assertEquals(expected, content.a());
+	}
 
-  public enum WrappedFrameType {
-    TASK,
-    CHALLENGE,
-    GOAL
-  }
+	public enum WrappedFrameType {
+		TASK,
+		CHALLENGE,
+		GOAL
+	}
 
-  public static final class WrappedAdvancementDisplay {
+	public static final class WrappedAdvancementDisplay {
 
-    public WrappedChatComponent title;
-    public WrappedChatComponent description;
-    public ItemStack item;
-    public MinecraftKey background;
-    public WrappedFrameType frameType;
-    public boolean showToast;
-    public boolean announceChat;
-    public boolean hidden;
-    public float x;
-    public float y;
-  }
+		public WrappedChatComponent title;
+		public WrappedChatComponent description;
+		public ItemStack item;
+		public MinecraftKey background;
+		public WrappedFrameType frameType;
+		public boolean showToast;
+		public boolean announceChat;
+		public boolean hidden;
+		public float x;
+		public float y;
+	}
 }

src/test/java/com/comphenix/protocol/wrappers/BukkitConvertersTest.java

@@ -4,9 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.comphenix.protocol.BukkitInitialization;
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.reflect.EquivalentConverter;
 import com.comphenix.protocol.wrappers.Either.Left;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -55,4 +59,17 @@ public class BukkitConvertersTest {
         assertEquals(wrapped.left(), nmsEither.left());
         assertEquals(wrapped.right(), nmsEither.right());
     }
+
+	@Test
+	public void testPacketContainerConverter() {
+		for (PacketType type : PacketType.values()) {
+			if(!type.isSupported()) {
+				continue;
+			}
+			PacketContainer container = new PacketContainer(type);
+			Object generic = BukkitConverters.getPacketContainerConverter().getGeneric(container);
+			Object specific = BukkitConverters.getPacketContainerConverter().getSpecific(generic);
+			assertTrue(EqualsBuilder.reflectionEquals(container, specific)); // PacketContainer does not properly implement equals(.)
+		}
+	}
 }

src/test/java/com/comphenix/protocol/wrappers/ConverterTest.java

@@ -0,0 +1,27 @@
+package com.comphenix.protocol.wrappers;
+
+import com.comphenix.protocol.reflect.EquivalentConverter;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Lukas Alt
+ * @since 26.03.2023
+ */
+public class ConverterTest {
+    @Test
+    public void testIterableConverter() {
+        EquivalentConverter<Iterable<String>> converter = Converters.iterable(Converters.passthrough(String.class), ArrayList::new, ArrayList::new);
+        List<String> l = Arrays.asList("a", "b", "c");
+        Object generic = converter.getGeneric(l);
+        Object specific = converter.getSpecific(generic);
+        assertEquals(l, specific);
+    }
+}

src/test/java/com/comphenix/protocol/wrappers/WrappedBlockDataTest.java

@@ -19,9 +19,9 @@ import net.minecraft.world.level.block.state.IBlockData;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.type.GlassPane;
-import org.bukkit.craftbukkit.v1_19_R2.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.v1_19_R2.block.impl.CraftStainedGlassPane;
-import org.bukkit.craftbukkit.v1_19_R2.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_19_R3.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.v1_19_R3.block.impl.CraftStainedGlassPane;
+import org.bukkit.craftbukkit.v1_19_R3.util.CraftMagicNumbers;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -56,7 +56,7 @@ public class WrappedBlockDataTest {
 
 	@Test
 	public void testDataCreation() {
-		IBlockData nmsData = CraftMagicNumbers.getBlock(Material.CYAN_STAINED_GLASS_PANE).n();
+		IBlockData nmsData = CraftMagicNumbers.getBlock(Material.CYAN_STAINED_GLASS_PANE).o();
 		GlassPane data = (GlassPane) CraftBlockData.fromData(nmsData);
 		data.setFace(BlockFace.EAST, true);
 

src/test/java/com/comphenix/protocol/wrappers/WrappedDataWatcherTest.java

@@ -21,8 +21,8 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
 import net.minecraft.world.entity.projectile.EntityEgg;
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEgg;
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEgg;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 

src/test/java/com/comphenix/protocol/wrappers/WrappedLevelChunkDataTest.java

@@ -25,7 +25,7 @@ import net.minecraft.world.level.chunk.ILightAccess;
 import net.minecraft.world.level.lighting.LightEngine;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -58,7 +58,7 @@ public class WrappedLevelChunkDataTest {
         when(nmsWorld.v_()).thenReturn(256);
         when(nmsWorld.ai()).thenReturn(16); // LevelHeightAccessor is mocked and therefore always returns 0, there are further methods like this which might cause errors in the future
 
-        when(nmsWorld.m_()).thenReturn(engine);
+        when(nmsWorld.l_()).thenReturn(engine);
     }
 
     private final WorldServer nmsWorld;
@@ -69,7 +69,7 @@ public class WrappedLevelChunkDataTest {
         this.nmsWorld = ((CraftWorld) Bukkit.getWorlds().get(0)).getHandle();
         this.chunk = new Chunk(nmsWorld, new ChunkCoordIntPair(5, 5));
 
-        IBlockData bellData = BuiltInRegistries.f.a(new MinecraftKey("bell")).n();
+        IBlockData bellData = BuiltInRegistries.f.a(new MinecraftKey("bell")).o();
 
         chunk.b(0).a(0, 0, 0, bellData);
         chunk.a(new TileEntityBell(BlockPosition.b, bellData));
@@ -77,7 +77,7 @@ public class WrappedLevelChunkDataTest {
 
     @Test
     public void testChunkData() {
-        ClientboundLevelChunkWithLightPacket packet = new ClientboundLevelChunkWithLightPacket(chunk, nmsWorld.m_(), null, null, false);
+        ClientboundLevelChunkWithLightPacket packet = new ClientboundLevelChunkWithLightPacket(chunk, nmsWorld.l_(), null, null, false);
         PacketContainer container = PacketContainer.fromPacket(packet);
         Object rawInstance = container.getSpecificModifier(MinecraftReflection.getLevelChunkPacketDataClass()).read(0);
         Object virtualInstance = BukkitConverters.getWrappedChunkDataConverter().getGeneric(container.getLevelChunkData().read(0));
@@ -117,7 +117,7 @@ public class WrappedLevelChunkDataTest {
 
     @Test
     public void testLightData() {
-        ClientboundLevelChunkWithLightPacket packet = new ClientboundLevelChunkWithLightPacket(chunk, nmsWorld.m_(), null, null, false);
+        ClientboundLevelChunkWithLightPacket packet = new ClientboundLevelChunkWithLightPacket(chunk, nmsWorld.l_(), null, null, false);
         PacketContainer container = PacketContainer.fromPacket(packet);
 
         randomizeBitSets(container.getSpecificModifier(MinecraftReflection.getLightUpdatePacketDataClass()).read(0));

src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java

@@ -1,17 +1,20 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import java.io.IOException;
+import java.util.Optional;
 
 import com.comphenix.protocol.BukkitInitialization;
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.utility.MinecraftProtocolVersion;
 import com.comphenix.protocol.wrappers.WrappedServerPing.CompressedImage;
 import com.google.common.io.Resources;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class WrappedServerPingTest {
 
 	@BeforeAll
@@ -20,32 +23,68 @@ public class WrappedServerPingTest {
 	}
 
 	@Test
-	public void test() {
-		try {
-			CompressedImage tux = CompressedImage.fromPng(Resources.getResource("tux.png").openStream());
-			byte[] original = tux.getDataCopy();
+	public void fullTest() throws IOException  {
+		PacketContainer packet = new PacketContainer(PacketType.Status.Server.SERVER_INFO);
+		Optional<WrappedServerPing> optionalPing = packet.getServerPings().optionRead(0);
+		assertTrue(optionalPing.isPresent());
 
-			WrappedServerPing serverPing = new WrappedServerPing();
-			serverPing.setMotD("Hello, this is a test.");
-			serverPing.setPlayersOnline(5);
-			serverPing.setPlayersMaximum(10);
-			serverPing.setVersionName("Minecraft 123");
-			serverPing.setVersionProtocol(4);
-			serverPing.setFavicon(tux);
-			serverPing.setEnforceSecureChat(true);
+		WrappedServerPing serverPing = optionalPing.get();
+		assertNotNull(serverPing.getMotD());
+		assertNotNull(serverPing.getFavicon());
+		assertNotNull(serverPing.getPlayers());
+		assertNotNull(serverPing.getVersionName());
 
-			assertEquals(5, serverPing.getPlayersOnline());
-			assertEquals(10, serverPing.getPlayersMaximum());
-			assertEquals("Minecraft 123", serverPing.getVersionName());
-			assertEquals(4, serverPing.getVersionProtocol());
-			assertTrue(serverPing.isEnforceSecureChat());
+		CompressedImage tux = CompressedImage.fromPng(Resources.getResource("tux.png").openStream());
+		byte[] original = tux.getDataCopy();
 
-			assertArrayEquals(original, serverPing.getFavicon().getData());
+		serverPing.setMotD("Hello, this is a test.");
+		serverPing.setPlayersOnline(5);
+		serverPing.setPlayersMaximum(10);
+		serverPing.setVersionName("Minecraft 123");
+		serverPing.setVersionProtocol(4);
+		serverPing.setFavicon(tux);
+		serverPing.setEnforceSecureChat(true);
 
-			CompressedImage copy = CompressedImage.fromBase64Png(Base64Coder.encodeLines(tux.getData()));
-			assertArrayEquals(copy.getData(), serverPing.getFavicon().getData());
-		} catch (Throwable ex) {
-			fail("Encountered an exception testing ServerPing", ex);
-		}
+		packet.getServerPings().write(0, serverPing);
+
+		WrappedServerPing roundTrip = packet.getServerPings().read(0);
+
+		assertEquals(5, roundTrip.getPlayersOnline());
+		assertEquals(10, roundTrip.getPlayersMaximum());
+		assertEquals("Minecraft 123", roundTrip.getVersionName());
+		assertEquals(4, roundTrip.getVersionProtocol());
+		assertTrue(roundTrip.isEnforceSecureChat());
+
+		assertArrayEquals(original, roundTrip.getFavicon().getData());
+
+		CompressedImage copy = CompressedImage.fromBase64Png(Base64Coder.encodeLines(tux.getData()));
+		assertArrayEquals(copy.getData(), roundTrip.getFavicon().getData());
+	}
+
+	@Test
+	public void testDefaultData() {
+		PacketContainer packet = new PacketContainer(PacketType.Status.Server.SERVER_INFO);
+		packet.getServerPings().write(0, new WrappedServerPing());
+
+		WrappedServerPing serverPing = packet.getServerPings().read(0);
+		assertEquals(serverPing.getMotD(), WrappedChatComponent.fromLegacyText("A Minecraft Server"));
+		assertEquals(serverPing.getVersionProtocol(), MinecraftProtocolVersion.getCurrentVersion());
+	}
+
+	@Test
+	public void testSetPartialData() {
+		PacketContainer packet = new PacketContainer(PacketType.Status.Server.SERVER_INFO);
+
+		WrappedServerPing serverPing = new WrappedServerPing();
+		serverPing.setPlayersOnline(69);
+		serverPing.setPlayersMaximum(420);
+
+		packet.getServerPings().write(0, serverPing);
+
+		WrappedServerPing roundTrip = packet.getServerPings().read(0);
+		assertEquals(roundTrip.getMotD(), WrappedChatComponent.fromLegacyText("A Minecraft Server"));
+		assertEquals(roundTrip.getVersionProtocol(), MinecraftProtocolVersion.getCurrentVersion());
+		assertEquals(roundTrip.getPlayersOnline(), 69);
+		assertEquals(roundTrip.getPlayersMaximum(), 420);
 	}
 }