wip: dedicated paper plugin

build.gradle.kts

@@ -1,23 +1,38 @@
+//import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+//import io.github.patrick.gradle.remapper.RemapTask
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar.Companion.shadowJar
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
     `java-library`
     `maven-publish`
-    signing
-    id("com.gradleup.shadow") version "9.4.0"
-    id("io.github.patrick.remapper") version "1.4.3"
-    id("com.vanniktech.maven.publish") version "0.36.0"
+    `signing`
+    id("com.gradleup.shadow") version "9.0.2"
+    // id("io.github.patrick.remapper") version "1.4.2"
+    id("com.vanniktech.maven.publish") version "0.34.0"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.18"
 }
 
 group = "net.dmulloy2"
 description = "Provides access to the Minecraft protocol"
 
-val mcVersion = "26.2"
+val mcVersion = "1.21.8"
 val isSnapshot = version.toString().endsWith("-SNAPSHOT")
-val isJitPack = System.getenv("JITPACK")?.equals("true", ignoreCase = true) ?: false
 val commitHash = System.getenv("COMMIT_SHA") ?: ""
 val isCI = commitHash.isNotEmpty()
 
+paperweight {
+    reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION
+}
+
+tasks.assemble {
+    dependsOn(tasks.reobfJar)
+}
+
+/*tasks.shadowJar {
+    dependsOn(tasks.assemble)
+}*/
+
 repositories {
     if (!isCI) {
         mavenLocal()
@@ -44,31 +59,31 @@ repositories {
 }
 
 dependencies {
-    implementation("net.bytebuddy:byte-buddy:1.18.2")
-    compileOnly("org.spigotmc:spigot-api:${mcVersion}-R0.1-SNAPSHOT")
-    compileOnly("org.spigotmc:spigot:${mcVersion}-R0.1-SNAPSHOT")//:remapped-mojang")
-    compileOnly("io.netty:netty-all:4.2.8.Final")
-    compileOnly("net.kyori:adventure-text-serializer-gson:4.25.0")
+    implementation("net.bytebuddy:byte-buddy:1.17.5")
+    // compileOnly("org.spigotmc:spigot-api:${mcVersion}-R0.1-SNAPSHOT")
+    // compileOnly("org.spigotmc:spigot:${mcVersion}-R0.1-SNAPSHOT:remapped-mojang")
+    compileOnly("io.netty:netty-all:4.0.23.Final")
+    compileOnly("net.kyori:adventure-text-serializer-gson:4.24.0")
+    compileOnly("net.kyori:adventure-text-serializer-ansi:4.24.0")
     compileOnly("com.googlecode.json-simple:json-simple:1.1.1")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:6.0.1")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:6.0.1")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.1")
-    testImplementation("org.mockito:mockito-core:5.21.0")
-    testImplementation("io.netty:netty-common:4.2.8.Final")
-    testImplementation("io.netty:netty-transport:4.2.8.Final")
-    testImplementation("org.spigotmc:spigot:${mcVersion}-R0.1-SNAPSHOT")//:remapped-mojang")
-    testImplementation("net.kyori:adventure-text-serializer-gson:4.25.0")
-    testImplementation("net.kyori:adventure-text-serializer-plain:4.25.0")
+    paperweight.paperDevBundle("1.21.8-R0.1-SNAPSHOT")
+
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.0")
+    testImplementation("org.mockito:mockito-core:5.6.0")
+    testImplementation("io.netty:netty-common:4.1.97.Final")
+    testImplementation("io.netty:netty-transport:4.1.97.Final")
+    // testImplementation("org.spigotmc:spigot:${mcVersion}-R0.1-SNAPSHOT:remapped-mojang")
+    testImplementation("net.kyori:adventure-text-serializer-gson:4.24.0")
+    testImplementation("net.kyori:adventure-text-serializer-plain:4.24.0")
+    testImplementation("net.kyori:adventure-text-serializer-ansi:4.24.0")
 }
 
 java {
-    // sourceCompatibility = JavaVersion.VERSION_25
-    // targetCompatibility = JavaVersion.VERSION_25
-
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(25))
-    }
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 tasks {
@@ -93,27 +108,19 @@ tasks {
         }
         relocate("net.bytebuddy", "com.comphenix.net.bytebuddy")
 
-        manifest {
+        /*manifest {
             attributes(
                 "paperweight-mappings-namespace" to "mojang"
             )
-        }
+        }*/
 
-        archiveFileName = "ProtocolLib.jar"
+        // archiveFileName = "ProtocolLib.jar"
     }
 
-    /*remap {
-        dependsOn("shadowJar")
-
-        inputTask.set(getByName<ShadowJar>("shadowJar"))
-        version.set(mcVersion)
-        action.set(RemapTask.Action.MOJANG_TO_SPIGOT)
+    reobfJar {
+        outputJar = layout.buildDirectory.file("libs/ProtocolLib.jar")
     }
 
-    assemble {
-        dependsOn("remap")
-    }*/
-
     javadoc {
         options.encoding = "UTF-8"
     }
@@ -125,9 +132,7 @@ tasks {
 
 mavenPublishing {
     publishToMavenCentral()
-    if (!isSnapshot && !isJitPack) {
-        signAllPublications()
-    }
+    signAllPublications()
 
     coordinates("$group", project.name, "$version")
 

gradle.properties

@@ -1,4 +1,4 @@
-version=5.5.0-SNAPSHOT
+version=5.4.1-SNAPSHOT
 mavenCentralUsername=
 mavenCentralPassword=
 signing.keyId=

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# 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.
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,6 +112,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +170,7 @@ fi
 # 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" )
 
@@ -203,14 +203,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+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
 
@@ -59,21 +57,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+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%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%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

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

@@ -0,0 +1,38 @@
+package com.comphenix.protocol;
+
+import com.comphenix.protocol.injector.PacketFilterManager;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.server.PluginDisableEvent;
+
+class BukkitListener implements Listener {
+    private final PacketFilterManager manager;
+
+    BukkitListener(PacketFilterManager manager) {
+        this.manager = manager;
+    }
+
+//    @EventHandler(priority = EventPriority.LOWEST)
+//    public void handleLogin(PlayerLoginEvent event) {
+//        networkManagerInjector.getInjector(event.getPlayer()).inject();
+//    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void handleJoin(PlayerJoinEvent event) {
+        manager.injectPlayer(event.getPlayer());
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void handleQuit(PlayerQuitEvent event) {
+        manager.removePlayer(event.getPlayer());
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void handlePluginUnload(PluginDisableEvent event) {
+        manager.removePacketListeners(event.getPlugin());
+    }
+}

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

@@ -21,21 +21,19 @@ import java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.Deque;
 
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
 
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 /**
  * Base class for all our commands.
  * 
  * @author Kristian
  */
-abstract class CommandBase implements CommandExecutor {
+abstract class CommandBase {
     public static final ReportType REPORT_COMMAND_ERROR = new ReportType("Cannot execute command %s.");
     public static final ReportType REPORT_UNEXPECTED_COMMAND = new ReportType("Incorrect command assigned to %s.");
     
@@ -58,15 +56,8 @@ abstract class CommandBase implements CommandExecutor {
         this.minimumArgumentCount = minimumArgumentCount;
     }
 
-    @Override
-    public final boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean onCommand(CommandSender sender, String[] args) {
         try {
-            // Make sure we're dealing with the correct command
-            if (!command.getName().equalsIgnoreCase(name)) {
-                reporter.reportWarning(this, Report.newBuilder(REPORT_UNEXPECTED_COMMAND).messageParam(this));
-                return false;
-            }
-
             if (permission != null && !sender.hasPermission(permission)) {
                 sender.sendMessage(ChatColor.RED + "You haven't got permission to run this command.");
                 return true;
@@ -81,7 +72,7 @@ abstract class CommandBase implements CommandExecutor {
             }
         } catch (Throwable ex) {
             reporter.reportDetailed(this,
-                    Report.newBuilder(REPORT_COMMAND_ERROR).error(ex).messageParam(name).callerParam(sender, label, args)
+                    Report.newBuilder(REPORT_COMMAND_ERROR).error(ex).messageParam(name).callerParam(sender, name, args)
             );
             return true;
         }

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

@@ -0,0 +1,22 @@
+package com.comphenix.protocol;
+
+import com.comphenix.protocol.injector.PacketFilterManager;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerLoginEvent;
+
+class LegacyLoginListener implements Listener {
+    private final PacketFilterManager manager;
+
+    LegacyLoginListener(PacketFilterManager manager) {
+        this.manager = manager;
+    }
+
+    @SuppressWarnings("deprecation")
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void handleLogin(PlayerLoginEvent event) {
+        manager.injectPlayer(event.getPlayer());
+    }
+}

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

@@ -16,22 +16,6 @@
  */
 package com.comphenix.protocol;
 
-import com.comphenix.protocol.PacketType.Protocol;
-import com.comphenix.protocol.PacketType.Sender;
-import com.comphenix.protocol.events.ListeningWhitelist;
-import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.events.PacketListener;
-import com.comphenix.protocol.injector.netty.WirePacket;
-import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.MethodAccessor;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -48,11 +32,28 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
+import com.comphenix.protocol.PacketType.Protocol;
+import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.events.ListeningWhitelist;
+import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.events.PacketListener;
+import com.comphenix.protocol.injector.PacketFilterManager;
+import com.comphenix.protocol.injector.netty.WirePacket;
+import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.MethodAccessor;
+import com.comphenix.protocol.utility.MinecraftReflection;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+
 /**
  * Logs packets to a given stream
  * @author dmulloy2
  */
-public class PacketLogging implements CommandExecutor, PacketListener {
+public class PacketLogging extends CommandBase implements PacketListener {
     public static final String NAME = "packetlog";
 
     private static MethodAccessor HEX_DUMP;
@@ -69,93 +70,94 @@ public class PacketLogging implements CommandExecutor, PacketListener {
     private final ProtocolManager manager;
     private final Plugin plugin;
 
-    PacketLogging(Plugin plugin, ProtocolManager manager) {
+    PacketLogging(ErrorReporter reporter, Plugin plugin, PacketFilterManager manager) {
+        super(reporter, CommandBase.PERMISSION_ADMIN, NAME, 2);
         this.plugin = plugin;
         this.manager = manager;
     }
 
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean handleCommand(CommandSender sender, String[] args) {
         PacketType type = null;
 
         try {
-            if (args.length > 2) {
-                Protocol protocol;
+            if (args.length <= 2) {
+                sender.sendMessage(ChatColor.RED + "Invalid syntax: /packetlog <protocol> <sender> <packet> [location]");
+                return true;
+            }
 
-                try {
-                    protocol = Protocol.valueOf(args[0].toUpperCase());
-                } catch (IllegalArgumentException ex) {
-                    sender.sendMessage(ChatColor.RED + "Unknown protocol " + args[0]);
-                    return true;
-                }
+            Protocol protocol;
 
-                Sender pSender;
+            try {
+                protocol = Protocol.valueOf(args[0].toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                sender.sendMessage(ChatColor.RED + "Unknown protocol " + args[0]);
+                return true;
+            }
 
-                try {
-                    pSender = Sender.valueOf(args[1].toUpperCase());
-                } catch (IllegalArgumentException ex) {
-                    sender.sendMessage(ChatColor.RED + "Unknown sender: " + args[1]);
-                    return true;
-                }
+            Sender pSender;
 
-                try {
-                    try { // Try IDs first
-                        int id = Integer.parseInt(args[2]);
-                        type = PacketType.findCurrent(protocol, pSender, id);
-                    } catch (NumberFormatException ex) { // Check packet names
-                        String name = args[2];
-                        for (PacketType packet : PacketType.values()) {
-                            if (packet.getProtocol() == protocol && packet.getSender() == pSender) {
-                                if (packet.name().equalsIgnoreCase(name)) {
+            try {
+                pSender = Sender.valueOf(args[1].toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                sender.sendMessage(ChatColor.RED + "Unknown sender: " + args[1]);
+                return true;
+            }
+
+            try {
+                try { // Try IDs first
+                    int id = Integer.parseInt(args[2]);
+                    type = PacketType.findCurrent(protocol, pSender, id);
+                } catch (NumberFormatException ex) { // Check packet names
+                    String name = args[2];
+                    for (PacketType packet : PacketType.values()) {
+                        if (packet.getProtocol() == protocol && packet.getSender() == pSender) {
+                            if (packet.name().equalsIgnoreCase(name)) {
+                                type = packet;
+                                break;
+                            }
+                            for (String className : packet.getClassNames()) {
+                                if (className.equalsIgnoreCase(name)) {
                                     type = packet;
                                     break;
                                 }
-                                for (String className : packet.getClassNames()) {
-                                    if (className.equalsIgnoreCase(name)) {
-                                        type = packet;
-                                        break;
-                                    }
-                                }
                             }
                         }
                     }
-                } catch (IllegalArgumentException ex) { // RIP
-                    type = null;
                 }
+            } catch (IllegalArgumentException ex) { // RIP
+                type = null;
+            }
 
-                if (type == null) {
-                    sender.sendMessage(ChatColor.RED + "Unknown packet: " + args[2]);
-                    return true;
-                }
-
-                if (args.length > 3) {
-                    if (args[3].equalsIgnoreCase("console")) {
-                        this.location = LogLocation.CONSOLE;
-                    } else {
-                        this.location = LogLocation.FILE;
-                    }
-                }
-
-                if (pSender == Sender.CLIENT) {
-                    if (receivingTypes.contains(type)) {
-                        receivingTypes.remove(type);
-                    } else {
-                        receivingTypes.add(type);
-                    }
-                } else {
-                    if (sendingTypes.contains(type)) {
-                        sendingTypes.remove(type);
-                    } else {
-                        sendingTypes.add(type);
-                    }
-                }
-
-                startLogging();
-                sender.sendMessage(ChatColor.GREEN + "Now logging " + type.getPacketClass().getSimpleName());
+            if (type == null) {
+                sender.sendMessage(ChatColor.RED + "Unknown packet: " + args[2]);
                 return true;
             }
 
-            sender.sendMessage(ChatColor.RED + "Invalid syntax: /packetlog <protocol> <sender> <packet> [location]");
+            if (args.length > 3) {
+                if (args[3].equalsIgnoreCase("console")) {
+                    this.location = LogLocation.CONSOLE;
+                } else {
+                    this.location = LogLocation.FILE;
+                }
+            }
+
+            if (pSender == Sender.CLIENT) {
+                if (receivingTypes.contains(type)) {
+                    receivingTypes.remove(type);
+                } else {
+                    receivingTypes.add(type);
+                }
+            } else {
+                if (sendingTypes.contains(type)) {
+                    sendingTypes.remove(type);
+                } else {
+                    sendingTypes.add(type);
+                }
+            }
+
+            startLogging();
+            sender.sendMessage(ChatColor.GREEN + "Now logging " + type.getPacketClass().getSimpleName());
             return true;
         } catch (Throwable ex) {
             sender.sendMessage(ChatColor.RED + "Failed to parse command: " + ex);

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

@@ -14,7 +14,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.function.BiConsumer;
 
-import org.apache.commons.lang.WordUtils;
+import com.comphenix.protocol.utility.WordUtils;
 import org.bukkit.Bukkit;
 
 import com.comphenix.protocol.PacketTypeLookup.ClassLookup;
@@ -133,121 +133,114 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
             public static final PacketType CUSTOM_CHAT_COMPLETIONS =      new PacketType(PROTOCOL, SENDER, 0x17, "CustomChatCompletions");
             public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x18, "CustomPayload", "SPacketCustomPayload");
             public static final PacketType DAMAGE_EVENT =                 new PacketType(PROTOCOL, SENDER, 0x19, "DamageEvent", "ClientboundDamageEventPacket");
-            public static final PacketType DEBUG_BLOCK_VALUE =            new PacketType(PROTOCOL, SENDER, 0x1A, "DebugBlockValue");
-            public static final PacketType DEBUG_CHUNK_VALUE =            new PacketType(PROTOCOL, SENDER, 0x1B, "DebugChunkValue");
-            public static final PacketType DEBUG_ENTITY_VALUE =           new PacketType(PROTOCOL, SENDER, 0x1C, "DebugEntityValue");
-            public static final PacketType DEBUG_EVENT =                  new PacketType(PROTOCOL, SENDER, 0x1D, "DebugEvent");
-            public static final PacketType DEBUG_SAMPLE =                 new PacketType(PROTOCOL, SENDER, 0x1E, "DebugSample");
-            public static final PacketType DELETE_CHAT_MESSAGE =          new PacketType(PROTOCOL, SENDER, 0x1F, "DeleteChat");
-            public static final PacketType KICK_DISCONNECT =              new PacketType(PROTOCOL, SENDER, 0x20, "Disconnect", "KickDisconnect", "SPacketDisconnect");
-            public static final PacketType DISGUISED_CHAT =               new PacketType(PROTOCOL, SENDER, 0x21, "DisguisedChat");
-            public static final PacketType ENTITY_STATUS =                new PacketType(PROTOCOL, SENDER, 0x22, "EntityEvent", "EntityStatus", "SPacketEntityStatus");
-            public static final PacketType ENTITY_POSITION_SYNC =         new PacketType(PROTOCOL, SENDER, 0x23, "EntityPositionSync");
-            public static final PacketType EXPLOSION =                    new PacketType(PROTOCOL, SENDER, 0x24, "Explode", "Explosion", "SPacketExplosion");
-            public static final PacketType UNLOAD_CHUNK =                 new PacketType(PROTOCOL, SENDER, 0x25, "ForgetLevelChunk", "UnloadChunk", "SPacketUnloadChunk");
-            public static final PacketType GAME_STATE_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x26, "GameEvent", "GameStateChange", "SPacketChangeGameState");
-            public static final PacketType GAME_RULE_VALUES =             new PacketType(PROTOCOL, SENDER, 0x27, "GameRuleValues");
-            public static final PacketType GAME_TEST_HIGHLIGHT_POS =      new PacketType(PROTOCOL, SENDER, 0x28, "GameTestHighlightPos");
-            public static final PacketType OPEN_WINDOW_HORSE =            new PacketType(PROTOCOL, SENDER, 0x29, "MountScreenOpen", "HorseScreenOpen", "OpenWindowHorse");
-            public static final PacketType HURT_ANIMATION =               new PacketType(PROTOCOL, SENDER, 0x2A, "HurtAnimation", "ClientboundHurtAnimationPacket");
-            public static final PacketType INITIALIZE_BORDER =            new PacketType(PROTOCOL, SENDER, 0x2B, "InitializeBorder");
-            public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x2C, "KeepAlive", "SPacketKeepAlive");
-            public static final PacketType MAP_CHUNK =                    new PacketType(PROTOCOL, SENDER, 0x2D, "LevelChunkWithLight", "MapChunk", "SPacketChunkData");
-            public static final PacketType WORLD_EVENT =                  new PacketType(PROTOCOL, SENDER, 0x2E, "LevelEvent", "WorldEvent", "SPacketEffect");
-            public static final PacketType WORLD_PARTICLES =              new PacketType(PROTOCOL, SENDER, 0x2F, "LevelParticles", "WorldParticles", "SPacketParticles");
-            public static final PacketType LIGHT_UPDATE =                 new PacketType(PROTOCOL, SENDER, 0x30, "LightUpdate");
-            public static final PacketType LOGIN =                        new PacketType(PROTOCOL, SENDER, 0x31, "Login", "SPacketJoinGame");
-            public static final PacketType LOW_DISK_SPACE_WARNING =       new PacketType(PROTOCOL, SENDER, 0x32, "LowDiskSpaceWarning");
-            public static final PacketType MAP =                          new PacketType(PROTOCOL, SENDER, 0x33, "MapItemData", "Map", "SPacketMaps");
-            public static final PacketType OPEN_WINDOW_MERCHANT =         new PacketType(PROTOCOL, SENDER, 0x34, "MerchantOffers", "OpenWindowMerchant");
-            public static final PacketType REL_ENTITY_MOVE =              new PacketType(PROTOCOL, SENDER, 0x35, "net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Pos", "Entity$RelEntityMove", "Entity$PacketPlayOutRelEntityMove");
-            public static final PacketType REL_ENTITY_MOVE_LOOK =         new PacketType(PROTOCOL, SENDER, 0x36, "net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$PosRot", "Entity$RelEntityMoveLook", "Entity$PacketPlayOutRelEntityMoveLook");
-            public static final PacketType MOVE_MINECART =                new PacketType(PROTOCOL, SENDER, 0x37, "MoveMinecart");
-            public static final PacketType ENTITY_LOOK =                  new PacketType(PROTOCOL, SENDER, 0x38, "net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Rot", "Entity$EntityLook", "Entity$PacketPlayOutEntityLook");
-            public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x39, "MoveVehicle", "VehicleMove", "SPacketMoveVehicle");
-            public static final PacketType OPEN_BOOK =                    new PacketType(PROTOCOL, SENDER, 0x3A, "OpenBook");
-            public static final PacketType OPEN_WINDOW =                  new PacketType(PROTOCOL, SENDER, 0x3B, "OpenScreen", "OpenWindow", "SPacketOpenWindow");
-            public static final PacketType OPEN_SIGN_EDITOR =             new PacketType(PROTOCOL, SENDER, 0x3C, "OpenSignEditor", "SPacketSignEditorOpen");
-            public static final PacketType PING =                         new PacketType(PROTOCOL, SENDER, 0x3D, "Ping");
-            public static final PacketType PONG_RESPONSE =                new PacketType(PROTOCOL, SENDER, 0x3E, "PongResponse");
-            public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x3F, "PlaceGhostRecipe", "AutoRecipe", "SPacketPlaceGhostRecipe");
-            public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x40, "PlayerAbilities", "Abilities", "SPacketPlayerAbilities");
-            public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x41, "PlayerChat", "Chat", "SPacketChat");
-            public static final PacketType PLAYER_COMBAT_END =            new PacketType(PROTOCOL, SENDER, 0x42, "PlayerCombatEnd");
-            public static final PacketType PLAYER_COMBAT_ENTER =          new PacketType(PROTOCOL, SENDER, 0x43, "PlayerCombatEnter");
-            public static final PacketType PLAYER_COMBAT_KILL =           new PacketType(PROTOCOL, SENDER, 0x44, "PlayerCombatKill");
-            public static final PacketType PLAYER_INFO_REMOVE =           new PacketType(PROTOCOL, SENDER, 0x45, "PlayerInfoRemove");
-            public static final PacketType PLAYER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x46, "PlayerInfoUpdate", "PlayerInfo");
-            public static final PacketType LOOK_AT =                      new PacketType(PROTOCOL, SENDER, 0x47, "PlayerLookAt", "LookAt", "SPacketPlayerPosLook");
-            public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x48, "PlayerPosition", "Position");
-            public static final PacketType PLAYER_ROTATION =              new PacketType(PROTOCOL, SENDER, 0x49, "PlayerRotation");
-            public static final PacketType RECIPE_BOOK_ADD =              new PacketType(PROTOCOL, SENDER, 0x4A, "RecipeBookAdd");
-            public static final PacketType RECIPE_BOOK_REMOVE =           new PacketType(PROTOCOL, SENDER, 0x4B, "RecipeBookRemove");
-            public static final PacketType RECIPE_BOOK_SETTINGS =         new PacketType(PROTOCOL, SENDER, 0x4C, "RecipeBookSettings");
-            public static final PacketType ENTITY_DESTROY =               new PacketType(PROTOCOL, SENDER, 0x4D, "RemoveEntities", "EntityDestroy", "SPacketDestroyEntities");
-            public static final PacketType REMOVE_ENTITY_EFFECT =         new PacketType(PROTOCOL, SENDER, 0x4E, "RemoveMobEffect", "RemoveEntityEffect", "SPacketRemoveEntityEffect");
-            public static final PacketType RESET_SCORE =                  new PacketType(PROTOCOL, SENDER, 0x4F, "ResetScore", "ResetScorePacket");
-            public static final PacketType REMOVE_RESOURCE_PACK =         new PacketType(PROTOCOL, SENDER, 0x50, "ResourcePackPop", "ResourcePackPopPacket");
-            public static final PacketType ADD_RESOURCE_PACK =            new PacketType(PROTOCOL, SENDER, 0x51, "ResourcePackPush", "ResourcePackPushPacket");
-            public static final PacketType RESPAWN =                      new PacketType(PROTOCOL, SENDER, 0x52, "Respawn", "SPacketRespawn");
-            public static final PacketType ENTITY_HEAD_ROTATION =         new PacketType(PROTOCOL, SENDER, 0x53, "RotateHead", "EntityHeadRotation", "SPacketEntityHeadLook");
-            public static final PacketType MULTI_BLOCK_CHANGE =           new PacketType(PROTOCOL, SENDER, 0x54, "SectionBlocksUpdate", "MultiBlockChange", "SPacketMultiBlockChange");
-            public static final PacketType SELECT_ADVANCEMENT_TAB =       new PacketType(PROTOCOL, SENDER, 0x55, "SelectAdvancementsTab", "SelectAdvancementTab", "SPacketSelectAdvancementsTab");
-            public static final PacketType SERVER_DATA =                  new PacketType(PROTOCOL, SENDER, 0x56, "ServerData");
-            public static final PacketType SET_ACTION_BAR_TEXT =          new PacketType(PROTOCOL, SENDER, 0x57, "SetActionBarText");
-            public static final PacketType SET_BORDER_CENTER =            new PacketType(PROTOCOL, SENDER, 0x58, "SetBorderCenter");
-            public static final PacketType SET_BORDER_LERP_SIZE =         new PacketType(PROTOCOL, SENDER, 0x59, "SetBorderLerpSize");
-            public static final PacketType SET_BORDER_SIZE =              new PacketType(PROTOCOL, SENDER, 0x5A, "SetBorderSize");
-            public static final PacketType SET_BORDER_WARNING_DELAY =     new PacketType(PROTOCOL, SENDER, 0x5B, "SetBorderWarningDelay");
-            public static final PacketType SET_BORDER_WARNING_DISTANCE =  new PacketType(PROTOCOL, SENDER, 0x5C, "SetBorderWarningDistance");
-            public static final PacketType CAMERA =                       new PacketType(PROTOCOL, SENDER, 0x5D, "SetCamera", "Camera", "SPacketCamera");
-            public static final PacketType VIEW_CENTRE =                  new PacketType(PROTOCOL, SENDER, 0x5E, "SetChunkCacheCenter", "ViewCentre");
-            public static final PacketType VIEW_DISTANCE =                new PacketType(PROTOCOL, SENDER, 0x5F, "SetChunkCacheRadius", "ViewDistance");
-            public static final PacketType SET_CURSOR_ITEM =              new PacketType(PROTOCOL, SENDER, 0x60, "SetCursorItem");
-            public static final PacketType SPAWN_POSITION =               new PacketType(PROTOCOL, SENDER, 0x61, "SetDefaultSpawnPosition", "SpawnPosition", "SPacketSpawnPosition");
-            public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x62, "SetDisplayObjective", "ScoreboardDisplayObjective", "SPacketDisplayObjective");
-            public static final PacketType ENTITY_METADATA =              new PacketType(PROTOCOL, SENDER, 0x63, "SetEntityData", "EntityMetadata", "SPacketEntityMetadata");
-            public static final PacketType ATTACH_ENTITY =                new PacketType(PROTOCOL, SENDER, 0x64, "SetEntityLink", "AttachEntity", "SPacketEntityAttach");
-            public static final PacketType ENTITY_VELOCITY =              new PacketType(PROTOCOL, SENDER, 0x65, "SetEntityMotion", "EntityVelocity", "SPacketEntityVelocity");
-            public static final PacketType ENTITY_EQUIPMENT =             new PacketType(PROTOCOL, SENDER, 0x66, "SetEquipment", "EntityEquipment", "SPacketEntityEquipment");
-            public static final PacketType EXPERIENCE =                   new PacketType(PROTOCOL, SENDER, 0x67, "SetExperience", "Experience", "SPacketSetExperience");
-            public static final PacketType UPDATE_HEALTH =                new PacketType(PROTOCOL, SENDER, 0x68, "SetHealth", "UpdateHealth", "SPacketUpdateHealth");
-            public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x69, "SetHeldSlot", "SetCarriedItem", "HeldItemSlot", "SPacketHeldItemChange");
-            public static final PacketType SCOREBOARD_OBJECTIVE =         new PacketType(PROTOCOL, SENDER, 0x6A, "SetObjective", "ScoreboardObjective", "SPacketScoreboardObjective");
-            public static final PacketType MOUNT =                        new PacketType(PROTOCOL, SENDER, 0x6B, "SetPassengers", "Mount", "SPacketSetPassengers");
-            public static final PacketType SET_PLAYER_INVENTORY =         new PacketType(PROTOCOL, SENDER, 0x6C, "SetPlayerInventory");
-            public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x6D, "SetPlayerTeam", "ScoreboardTeam", "SPacketTeams");
-            public static final PacketType SCOREBOARD_SCORE =             new PacketType(PROTOCOL, SENDER, 0x6E, "SetScore", "ScoreboardScore", "SPacketUpdateScore");
-            public static final PacketType UPDATE_SIMULATION_DISTANCE =   new PacketType(PROTOCOL, SENDER, 0x6F, "SetSimulationDistance");
-            public static final PacketType SET_SUBTITLE_TEXT =            new PacketType(PROTOCOL, SENDER, 0x70, "SetSubtitleText");
-            public static final PacketType UPDATE_TIME =                  new PacketType(PROTOCOL, SENDER, 0x71, "SetTime", "UpdateTime", "SPacketTimeUpdate");
-            public static final PacketType SET_TITLE_TEXT =               new PacketType(PROTOCOL, SENDER, 0x72, "SetTitleText");
-            public static final PacketType SET_TITLES_ANIMATION =         new PacketType(PROTOCOL, SENDER, 0x73, "SetTitlesAnimation");
-            public static final PacketType ENTITY_SOUND =                 new PacketType(PROTOCOL, SENDER, 0x74, "SoundEntity", "EntitySound", "SPacketSoundEffect");
-            public static final PacketType NAMED_SOUND_EFFECT =           new PacketType(PROTOCOL, SENDER, 0x75, "Sound", "NamedSoundEffect");
-            public static final PacketType START_CONFIGURATION =          new PacketType(PROTOCOL, SENDER, 0x76, "StartConfiguration");
-            public static final PacketType STOP_SOUND =                   new PacketType(PROTOCOL, SENDER, 0x77, "StopSound");
-            public static final PacketType STORE_COOKIE =                 new PacketType(PROTOCOL, SENDER, 0x78, "StoreCookie");
-            public static final PacketType SYSTEM_CHAT =                  new PacketType(PROTOCOL, SENDER, 0x79, "SystemChat");
-            public static final PacketType PLAYER_LIST_HEADER_FOOTER =    new PacketType(PROTOCOL, SENDER, 0x7A, "TabList", "PlayerListHeaderFooter", "SPacketPlayerListHeaderFooter");
-            public static final PacketType NBT_QUERY =                    new PacketType(PROTOCOL, SENDER, 0x7B, "TagQuery", "NBTQuery");
-            public static final PacketType COLLECT =                      new PacketType(PROTOCOL, SENDER, 0x7C, "TakeItemEntity", "Collect", "SPacketCollectItem");
-            public static final PacketType ENTITY_TELEPORT =              new PacketType(PROTOCOL, SENDER, 0x7D, "TeleportEntity", "EntityTeleport", "SPacketEntityTeleport");
-            public static final PacketType TEST_INSTANCE_BLOCK_STATUS =   new PacketType(PROTOCOL, SENDER, 0x7E, "ClientboundTestInstanceBlockStatus");
-            public static final PacketType TICKING_STATE =                new PacketType(PROTOCOL, SENDER, 0x7F, "TickingState", "TickingStatePacket");
-            public static final PacketType TICKING_STEP_STATE =           new PacketType(PROTOCOL, SENDER, 0x80, "TickingStep", "TickingStepPacket");
-            public static final PacketType TRANSFER =                     new PacketType(PROTOCOL, SENDER, 0x81, "Transfer");
-            public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x82, "UpdateAdvancements", "Advancements", "SPacketAdvancementInfo");
-            public static final PacketType UPDATE_ATTRIBUTES =            new PacketType(PROTOCOL, SENDER, 0x83, "UpdateAttributes", "SPacketEntityProperties");
-            public static final PacketType ENTITY_EFFECT =                new PacketType(PROTOCOL, SENDER, 0x84, "UpdateMobEffect", "EntityEffect", "SPacketEntityEffect");
-            public static final PacketType RECIPE_UPDATE =                new PacketType(PROTOCOL, SENDER, 0x85, "UpdateRecipes", "RecipeUpdate");
-            public static final PacketType TAGS =                         new PacketType(PROTOCOL, SENDER, 0x86, "UpdateTags", "Tags");
-            public static final PacketType PROJECTILE_POWER =             new PacketType(PROTOCOL, SENDER, 0x87, "ProjectilePower");
-            public static final PacketType REPORT_DETAILS =               new PacketType(PROTOCOL, SENDER, 0x88, "CustomReportDetails");
-            public static final PacketType SERVER_LINKS =                 new PacketType(PROTOCOL, SENDER, 0x89, "ServerLinks");
-            public static final PacketType TRACKED_WAYPOINT =             new PacketType(PROTOCOL, SENDER, 0x8A, "TrackedWaypoint");
-            public static final PacketType CLEAR_DIALOG =                 new PacketType(PROTOCOL, SENDER, 0x8B, "ClearDialog");
-            public static final PacketType SHOW_DIALOG =                  new PacketType(PROTOCOL, SENDER, 0x8C, "ShowDialog");
+            public static final PacketType DEBUG_SAMPLE =                 new PacketType(PROTOCOL, SENDER, 0x1A, "DebugSample");
+            public static final PacketType DELETE_CHAT_MESSAGE =          new PacketType(PROTOCOL, SENDER, 0x1B, "DeleteChat");
+            public static final PacketType KICK_DISCONNECT =              new PacketType(PROTOCOL, SENDER, 0x1C, "Disconnect", "KickDisconnect", "SPacketDisconnect");
+            public static final PacketType DISGUISED_CHAT =               new PacketType(PROTOCOL, SENDER, 0x1D, "DisguisedChat");
+            public static final PacketType ENTITY_STATUS =                new PacketType(PROTOCOL, SENDER, 0x1E, "EntityEvent", "EntityStatus", "SPacketEntityStatus");
+            public static final PacketType ENTITY_POSITION_SYNC =         new PacketType(PROTOCOL, SENDER, 0x1F, "EntityPositionSync");
+            public static final PacketType EXPLOSION =                    new PacketType(PROTOCOL, SENDER, 0x20, "Explode", "Explosion", "SPacketExplosion");
+            public static final PacketType UNLOAD_CHUNK =                 new PacketType(PROTOCOL, SENDER, 0x21, "ForgetLevelChunk", "UnloadChunk", "SPacketUnloadChunk");
+            public static final PacketType GAME_STATE_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x22, "GameEvent", "GameStateChange", "SPacketChangeGameState");
+            public static final PacketType OPEN_WINDOW_HORSE =            new PacketType(PROTOCOL, SENDER, 0x23, "HorseScreenOpen", "OpenWindowHorse");
+            public static final PacketType HURT_ANIMATION =               new PacketType(PROTOCOL, SENDER, 0x24, "HurtAnimation", "ClientboundHurtAnimationPacket");
+            public static final PacketType INITIALIZE_BORDER =            new PacketType(PROTOCOL, SENDER, 0x25, "InitializeBorder");
+            public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x26, "KeepAlive", "SPacketKeepAlive");
+            public static final PacketType MAP_CHUNK =                    new PacketType(PROTOCOL, SENDER, 0x27, "LevelChunkWithLight", "MapChunk", "SPacketChunkData");
+            public static final PacketType WORLD_EVENT =                  new PacketType(PROTOCOL, SENDER, 0x28, "LevelEvent", "WorldEvent", "SPacketEffect");
+            public static final PacketType WORLD_PARTICLES =              new PacketType(PROTOCOL, SENDER, 0x29, "LevelParticles", "WorldParticles", "SPacketParticles");
+            public static final PacketType LIGHT_UPDATE =                 new PacketType(PROTOCOL, SENDER, 0x2A, "LightUpdate");
+            public static final PacketType LOGIN =                        new PacketType(PROTOCOL, SENDER, 0x2B, "Login", "SPacketJoinGame");
+            public static final PacketType MAP =                          new PacketType(PROTOCOL, SENDER, 0x2C, "MapItemData", "Map", "SPacketMaps");
+            public static final PacketType OPEN_WINDOW_MERCHANT =         new PacketType(PROTOCOL, SENDER, 0x2D, "MerchantOffers", "OpenWindowMerchant");
+            public static final PacketType REL_ENTITY_MOVE =              new PacketType(PROTOCOL, SENDER, 0x2E, "net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Pos", "Entity$RelEntityMove", "Entity$PacketPlayOutRelEntityMove");
+            public static final PacketType REL_ENTITY_MOVE_LOOK =         new PacketType(PROTOCOL, SENDER, 0x2F, "net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$PosRot", "Entity$RelEntityMoveLook", "Entity$PacketPlayOutRelEntityMoveLook");
+            public static final PacketType MOVE_MINECART =                new PacketType(PROTOCOL, SENDER, 0x30, "MoveMinecart");
+            public static final PacketType ENTITY_LOOK =                  new PacketType(PROTOCOL, SENDER, 0x31, "net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Rot", "Entity$EntityLook", "Entity$PacketPlayOutEntityLook");
+            public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x32, "MoveVehicle", "VehicleMove", "SPacketMoveVehicle");
+            public static final PacketType OPEN_BOOK =                    new PacketType(PROTOCOL, SENDER, 0x33, "OpenBook");
+            public static final PacketType OPEN_WINDOW =                  new PacketType(PROTOCOL, SENDER, 0x34, "OpenScreen", "OpenWindow", "SPacketOpenWindow");
+            public static final PacketType OPEN_SIGN_EDITOR =             new PacketType(PROTOCOL, SENDER, 0x35, "OpenSignEditor", "SPacketSignEditorOpen");
+            public static final PacketType PING =                         new PacketType(PROTOCOL, SENDER, 0x36, "Ping");
+            public static final PacketType PONG_RESPONSE =                new PacketType(PROTOCOL, SENDER, 0x37, "PongResponse");
+            public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x38, "PlaceGhostRecipe", "AutoRecipe", "SPacketPlaceGhostRecipe");
+            public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x39, "PlayerAbilities", "Abilities", "SPacketPlayerAbilities");
+            public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x3A, "PlayerChat", "Chat", "SPacketChat");
+            public static final PacketType PLAYER_COMBAT_END =            new PacketType(PROTOCOL, SENDER, 0x3B, "PlayerCombatEnd");
+            public static final PacketType PLAYER_COMBAT_ENTER =          new PacketType(PROTOCOL, SENDER, 0x3C, "PlayerCombatEnter");
+            public static final PacketType PLAYER_COMBAT_KILL =           new PacketType(PROTOCOL, SENDER, 0x3D, "PlayerCombatKill");
+            public static final PacketType PLAYER_INFO_REMOVE =           new PacketType(PROTOCOL, SENDER, 0x3E, "PlayerInfoRemove");
+            public static final PacketType PLAYER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x3F, "PlayerInfoUpdate", "PlayerInfo");
+            public static final PacketType LOOK_AT =                      new PacketType(PROTOCOL, SENDER, 0x40, "PlayerLookAt", "LookAt", "SPacketPlayerPosLook");
+            public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x41, "PlayerPosition", "Position");
+            public static final PacketType PLAYER_ROTATION =              new PacketType(PROTOCOL, SENDER, 0x42, "PlayerRotation");
+            public static final PacketType RECIPE_BOOK_ADD =              new PacketType(PROTOCOL, SENDER, 0x43, "RecipeBookAdd");
+            public static final PacketType RECIPE_BOOK_REMOVE =           new PacketType(PROTOCOL, SENDER, 0x44, "RecipeBookRemove");
+            public static final PacketType RECIPE_BOOK_SETTINGS =         new PacketType(PROTOCOL, SENDER, 0x45, "RecipeBookSettings");
+            public static final PacketType ENTITY_DESTROY =               new PacketType(PROTOCOL, SENDER, 0x46, "RemoveEntities", "EntityDestroy", "SPacketDestroyEntities");
+            public static final PacketType REMOVE_ENTITY_EFFECT =         new PacketType(PROTOCOL, SENDER, 0x47, "RemoveMobEffect", "RemoveEntityEffect", "SPacketRemoveEntityEffect");
+            public static final PacketType RESET_SCORE =                  new PacketType(PROTOCOL, SENDER, 0x48, "ResetScore", "ResetScorePacket");
+            public static final PacketType REMOVE_RESOURCE_PACK =         new PacketType(PROTOCOL, SENDER, 0x49, "ResourcePackPop", "ResourcePackPopPacket");
+            public static final PacketType ADD_RESOURCE_PACK =            new PacketType(PROTOCOL, SENDER, 0x4A, "ResourcePackPush", "ResourcePackPushPacket");
+            public static final PacketType RESPAWN =                      new PacketType(PROTOCOL, SENDER, 0x4B, "Respawn", "SPacketRespawn");
+            public static final PacketType ENTITY_HEAD_ROTATION =         new PacketType(PROTOCOL, SENDER, 0x4C, "RotateHead", "EntityHeadRotation", "SPacketEntityHeadLook");
+            public static final PacketType MULTI_BLOCK_CHANGE =           new PacketType(PROTOCOL, SENDER, 0x4D, "SectionBlocksUpdate", "MultiBlockChange", "SPacketMultiBlockChange");
+            public static final PacketType SELECT_ADVANCEMENT_TAB =       new PacketType(PROTOCOL, SENDER, 0x4E, "SelectAdvancementsTab", "SelectAdvancementTab", "SPacketSelectAdvancementsTab");
+            public static final PacketType SERVER_DATA =                  new PacketType(PROTOCOL, SENDER, 0x4F, "ServerData");
+            public static final PacketType SET_ACTION_BAR_TEXT =          new PacketType(PROTOCOL, SENDER, 0x50, "SetActionBarText");
+            public static final PacketType SET_BORDER_CENTER =            new PacketType(PROTOCOL, SENDER, 0x51, "SetBorderCenter");
+            public static final PacketType SET_BORDER_LERP_SIZE =         new PacketType(PROTOCOL, SENDER, 0x52, "SetBorderLerpSize");
+            public static final PacketType SET_BORDER_SIZE =              new PacketType(PROTOCOL, SENDER, 0x53, "SetBorderSize");
+            public static final PacketType SET_BORDER_WARNING_DELAY =     new PacketType(PROTOCOL, SENDER, 0x54, "SetBorderWarningDelay");
+            public static final PacketType SET_BORDER_WARNING_DISTANCE =  new PacketType(PROTOCOL, SENDER, 0x55, "SetBorderWarningDistance");
+            public static final PacketType CAMERA =                       new PacketType(PROTOCOL, SENDER, 0x56, "SetCamera", "Camera", "SPacketCamera");
+            public static final PacketType VIEW_CENTRE =                  new PacketType(PROTOCOL, SENDER, 0x57, "SetChunkCacheCenter", "ViewCentre");
+            public static final PacketType VIEW_DISTANCE =                new PacketType(PROTOCOL, SENDER, 0x58, "SetChunkCacheRadius", "ViewDistance");
+            public static final PacketType SET_CURSOR_ITEM =              new PacketType(PROTOCOL, SENDER, 0x59, "SetCursorItem");
+            public static final PacketType SPAWN_POSITION =               new PacketType(PROTOCOL, SENDER, 0x5A, "SetDefaultSpawnPosition", "SpawnPosition", "SPacketSpawnPosition");
+            public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x5B, "SetDisplayObjective", "ScoreboardDisplayObjective", "SPacketDisplayObjective");
+            public static final PacketType ENTITY_METADATA =              new PacketType(PROTOCOL, SENDER, 0x5C, "SetEntityData", "EntityMetadata", "SPacketEntityMetadata");
+            public static final PacketType ATTACH_ENTITY =                new PacketType(PROTOCOL, SENDER, 0x5D, "SetEntityLink", "AttachEntity", "SPacketEntityAttach");
+            public static final PacketType ENTITY_VELOCITY =              new PacketType(PROTOCOL, SENDER, 0x5E, "SetEntityMotion", "EntityVelocity", "SPacketEntityVelocity");
+            public static final PacketType ENTITY_EQUIPMENT =             new PacketType(PROTOCOL, SENDER, 0x5F, "SetEquipment", "EntityEquipment", "SPacketEntityEquipment");
+            public static final PacketType EXPERIENCE =                   new PacketType(PROTOCOL, SENDER, 0x60, "SetExperience", "Experience", "SPacketSetExperience");
+            public static final PacketType UPDATE_HEALTH =                new PacketType(PROTOCOL, SENDER, 0x61, "SetHealth", "UpdateHealth", "SPacketUpdateHealth");
+            public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x62, "SetHeldSlot", "SetCarriedItem", "HeldItemSlot", "SPacketHeldItemChange");
+            public static final PacketType SCOREBOARD_OBJECTIVE =         new PacketType(PROTOCOL, SENDER, 0x63, "SetObjective", "ScoreboardObjective", "SPacketScoreboardObjective");
+            public static final PacketType MOUNT =                        new PacketType(PROTOCOL, SENDER, 0x64, "SetPassengers", "Mount", "SPacketSetPassengers");
+            public static final PacketType SET_PLAYER_INVENTORY =         new PacketType(PROTOCOL, SENDER, 0x65, "SetPlayerInventory");
+            public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x66, "SetPlayerTeam", "ScoreboardTeam", "SPacketTeams");
+            public static final PacketType SCOREBOARD_SCORE =             new PacketType(PROTOCOL, SENDER, 0x67, "SetScore", "ScoreboardScore", "SPacketUpdateScore");
+            public static final PacketType UPDATE_SIMULATION_DISTANCE =   new PacketType(PROTOCOL, SENDER, 0x68, "SetSimulationDistance");
+            public static final PacketType SET_SUBTITLE_TEXT =            new PacketType(PROTOCOL, SENDER, 0x69, "SetSubtitleText");
+            public static final PacketType UPDATE_TIME =                  new PacketType(PROTOCOL, SENDER, 0x6A, "SetTime", "UpdateTime", "SPacketTimeUpdate");
+            public static final PacketType SET_TITLE_TEXT =               new PacketType(PROTOCOL, SENDER, 0x6B, "SetTitleText");
+            public static final PacketType SET_TITLES_ANIMATION =         new PacketType(PROTOCOL, SENDER, 0x6C, "SetTitlesAnimation");
+            public static final PacketType ENTITY_SOUND =                 new PacketType(PROTOCOL, SENDER, 0x6D, "SoundEntity", "EntitySound", "SPacketSoundEffect");
+            public static final PacketType NAMED_SOUND_EFFECT =           new PacketType(PROTOCOL, SENDER, 0x6E, "Sound", "NamedSoundEffect");
+            public static final PacketType START_CONFIGURATION =          new PacketType(PROTOCOL, SENDER, 0x6F, "StartConfiguration");
+            public static final PacketType STOP_SOUND =                   new PacketType(PROTOCOL, SENDER, 0x70, "StopSound");
+            public static final PacketType STORE_COOKIE =                 new PacketType(PROTOCOL, SENDER, 0x71, "StoreCookie");
+            public static final PacketType SYSTEM_CHAT =                  new PacketType(PROTOCOL, SENDER, 0x72, "SystemChat");
+            public static final PacketType PLAYER_LIST_HEADER_FOOTER =    new PacketType(PROTOCOL, SENDER, 0x73, "TabList", "PlayerListHeaderFooter", "SPacketPlayerListHeaderFooter");
+            public static final PacketType NBT_QUERY =                    new PacketType(PROTOCOL, SENDER, 0x74, "TagQuery", "NBTQuery");
+            public static final PacketType COLLECT =                      new PacketType(PROTOCOL, SENDER, 0x75, "TakeItemEntity", "Collect", "SPacketCollectItem");
+            public static final PacketType ENTITY_TELEPORT =              new PacketType(PROTOCOL, SENDER, 0x76, "TeleportEntity", "EntityTeleport", "SPacketEntityTeleport");
+            public static final PacketType TEST_INSTANCE_BLOCK_STATUS =   new PacketType(PROTOCOL, SENDER, 0x77, "ClientboundTestInstanceBlockStatus");
+            public static final PacketType TICKING_STATE =                new PacketType(PROTOCOL, SENDER, 0x78, "TickingState", "TickingStatePacket");
+            public static final PacketType TICKING_STEP_STATE =           new PacketType(PROTOCOL, SENDER, 0x79, "TickingStep", "TickingStepPacket");
+            public static final PacketType TRANSFER =                     new PacketType(PROTOCOL, SENDER, 0x7A, "Transfer");
+            public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x7B, "UpdateAdvancements", "Advancements", "SPacketAdvancementInfo");
+            public static final PacketType UPDATE_ATTRIBUTES =            new PacketType(PROTOCOL, SENDER, 0x7C, "UpdateAttributes", "SPacketEntityProperties");
+            public static final PacketType ENTITY_EFFECT =                new PacketType(PROTOCOL, SENDER, 0x7D, "UpdateMobEffect", "EntityEffect", "SPacketEntityEffect");
+            public static final PacketType RECIPE_UPDATE =                new PacketType(PROTOCOL, SENDER, 0x7E, "UpdateRecipes", "RecipeUpdate");
+            public static final PacketType TAGS =                         new PacketType(PROTOCOL, SENDER, 0x7F, "UpdateTags", "Tags");
+            public static final PacketType PROJECTILE_POWER =             new PacketType(PROTOCOL, SENDER, 0x80, "ProjectilePower");
+            public static final PacketType REPORT_DETAILS =               new PacketType(PROTOCOL, SENDER, 0x81, "CustomReportDetails");
+            public static final PacketType SERVER_LINKS =                 new PacketType(PROTOCOL, SENDER, 0x82, "ServerLinks");
+            public static final PacketType TRACKED_WAYPOINT =             new PacketType(PROTOCOL, SENDER, 0x83, "TrackedWaypoint");
+            public static final PacketType CLEAR_DIALOG =                 new PacketType(PROTOCOL, SENDER, 0x84, "ClearDialog");
+            public static final PacketType SHOW_DIALOG =                  new PacketType(PROTOCOL, SENDER, 0x85, "ShowDialog");
 
             /**
              * @deprecated Removed in 1.9
@@ -423,6 +416,7 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
              */
             @Deprecated
             public static final PacketType SPAWN_ENTITY_EXPERIENCE_ORB =  new PacketType(PROTOCOL, SENDER, 232, "AddExperienceOrb", "SpawnEntityExperienceOrb", "SPacketSpawnExperienceOrb");
+            
 
             private static final Server INSTANCE = new Server();
 
@@ -445,74 +439,71 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
             private static final Sender SENDER = Sender.CLIENT;
 
             public static final PacketType TELEPORT_ACCEPT =              new PacketType(PROTOCOL, SENDER, 0x00, "AcceptTeleportation", "TeleportAccept", "CPacketConfirmTeleport");
-            public static final PacketType ATTACK =                       new PacketType(PROTOCOL, SENDER, 0x01, "Attack");
-            public static final PacketType TILE_NBT_QUERY =               new PacketType(PROTOCOL, SENDER, 0x02, "BlockEntityTagQuery", "TileNBTQuery");
-            public static final PacketType SELECT_BUNDLE_ITEM =           new PacketType(PROTOCOL, SENDER, 0x03, "SelectBundleItem");
-            public static final PacketType DIFFICULTY_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x04, "ChangeDifficulty", "DifficultyChange");
-            public static final PacketType CHANGE_GAME_MODE =             new PacketType(PROTOCOL, SENDER, 0x05, "ChangeGameMode");
-            public static final PacketType CHAT_ACK =                     new PacketType(PROTOCOL, SENDER, 0x06, "ChatAck");
-            public static final PacketType CHAT_COMMAND =                 new PacketType(PROTOCOL, SENDER, 0x07, "ChatCommand");
-            public static final PacketType CHAT_COMMAND_SIGNED =          new PacketType(PROTOCOL, SENDER, 0x08, "ChatCommandSigned");
-            public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x09, "Chat", "CPacketChatMessage");
-            public static final PacketType CHAT_SESSION_UPDATE =          new PacketType(PROTOCOL, SENDER, 0x0A, "ChatSessionUpdate");
-            public static final PacketType CHUNK_BATCH_RECEIVED =         new PacketType(PROTOCOL, SENDER, 0x0B, "ChunkBatchReceived");
-            public static final PacketType CLIENT_COMMAND =               new PacketType(PROTOCOL, SENDER, 0x0C, "ClientCommand", "CPacketClientStatus");
-            public static final PacketType CLIENT_TICK_END =              new PacketType(PROTOCOL, SENDER, 0x0D, "ClientTickEnd");
-            public static final PacketType SETTINGS =                     new PacketType(PROTOCOL, SENDER, 0x0E, "ClientInformation", "Settings", "CPacketClientSettings");
-            public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x0F, "CommandSuggestion", "TabComplete", "CPacketTabComplete");
-            public static final PacketType CONFIGURATION_ACK =            new PacketType(PROTOCOL, SENDER, 0x10, "ConfigurationAcknowledged");
-            public static final PacketType ENCHANT_ITEM =                 new PacketType(PROTOCOL, SENDER, 0x11, "ContainerButtonClick", "EnchantItem", "CPacketEnchantItem");
-            public static final PacketType WINDOW_CLICK =                 new PacketType(PROTOCOL, SENDER, 0x12, "ContainerClick", "WindowClick", "CPacketClickWindow");
-            public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x13, "ContainerClose", "CloseWindow", "CPacketCloseWindow");
-            public static final PacketType CONTAINER_SLOT_STATE_CHANGED = new PacketType(PROTOCOL, SENDER, 0x14, "ContainerSlotStateChanged", "ContainerSlotStateChangedPacket");
-            public static final PacketType COOKIE_RESPONSE =              new PacketType(PROTOCOL, SENDER, 0x15, "CookieResponse");
-            public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x16, "CustomPayload", "CPacketCustomPayload");
-            public static final PacketType DEBUG_SUBSCRIPTION_REQUEST =   new PacketType(PROTOCOL, SENDER, 0x17, "DebugSubscriptionRequest");
-            public static final PacketType B_EDIT =                       new PacketType(PROTOCOL, SENDER, 0x18, "EditBook", "BEdit");
-            public static final PacketType ENTITY_NBT_QUERY =             new PacketType(PROTOCOL, SENDER, 0x19, "EntityTagQuery", "EntityNBTQuery");
-            public static final PacketType USE_ENTITY =                   new PacketType(PROTOCOL, SENDER, 0x1A, "Interact", "UseEntity", "CPacketUseEntity");
-            public static final PacketType JIGSAW_GENERATE =              new PacketType(PROTOCOL, SENDER, 0x1B, "JigsawGenerate");
-            public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x1C, "KeepAlive", "CPacketKeepAlive");
-            public static final PacketType DIFFICULTY_LOCK =              new PacketType(PROTOCOL, SENDER, 0x1D, "LockDifficulty", "DifficultyLock");
-            public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x1E, "net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos", "Flying$Position", "Flying$PacketPlayInPosition", "CPacketPlayer$Position");
-            public static final PacketType POSITION_LOOK =                new PacketType(PROTOCOL, SENDER, 0x1F, "net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot", "Flying$PositionLook", "Flying$PacketPlayInPositionLook", "CPacketPlayer$PositionRotation");
-            public static final PacketType LOOK =                         new PacketType(PROTOCOL, SENDER, 0x20, "net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot", "Flying$Look", "Flying$PacketPlayInLook", "CPacketPlayer$Rotation");
-            public static final PacketType GROUND =                       new PacketType(PROTOCOL, SENDER, 0x21, "net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$StatusOnly", "Flying$d");
-            public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x22, "MoveVehicle", "VehicleMove", "CPacketVehicleMove");
-            public static final PacketType BOAT_MOVE =                    new PacketType(PROTOCOL, SENDER, 0x23, "PaddleBoat", "BoatMove", "CPacketSteerBoat");
-            public static final PacketType PICK_ITEM_FROM_BLOCK =         new PacketType(PROTOCOL, SENDER, 0x24, "PickItemFromBlock");
-            public static final PacketType PICK_ITEM =                    new PacketType(PROTOCOL, SENDER, 0x25, "PickItemFromEntity", "PickItem");
-            public static final PacketType PING_REQUEST =                 new PacketType(PROTOCOL, SENDER, 0x26, "PingRequest");
-            public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x27, "PlaceRecipe", "AutoRecipe", "CPacketPlaceRecipe");
-            public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x28, "PlayerAbilities", "Abilities", "CPacketPlayerAbilities");
-            public static final PacketType BLOCK_DIG =                    new PacketType(PROTOCOL, SENDER, 0x29, "PlayerAction", "BlockDig", "CPacketPlayerDigging");
-            public static final PacketType ENTITY_ACTION =                new PacketType(PROTOCOL, SENDER, 0x2A, "PlayerCommand", "EntityAction", "CPacketEntityAction");
-            public static final PacketType STEER_VEHICLE =                new PacketType(PROTOCOL, SENDER, 0x2B, "PlayerInput", "SteerVehicle", "CPacketInput");
-            public static final PacketType PLAYER_LOADED =                new PacketType(PROTOCOL, SENDER, 0x2C, "PlayerLoaded");
-            public static final PacketType PONG =                         new PacketType(PROTOCOL, SENDER, 0x2D, "Pong");
-            public static final PacketType RECIPE_SETTINGS =              new PacketType(PROTOCOL, SENDER, 0x2E, "RecipeBookChangeSettings", "RecipeSettings");
-            public static final PacketType RECIPE_DISPLAYED =             new PacketType(PROTOCOL, SENDER, 0x2F, "RecipeBookSeenRecipe", "RecipeDisplayed", "CPacketRecipeInfo");
-            public static final PacketType ITEM_NAME =                    new PacketType(PROTOCOL, SENDER, 0x30, "RenameItem", "ItemName");
-            public static final PacketType RESOURCE_PACK_STATUS =         new PacketType(PROTOCOL, SENDER, 0x31, "ResourcePack", "ResourcePackStatus", "CPacketResourcePackStatus");
-            public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x32, "SeenAdvancements", "Advancements", "CPacketSeenAdvancements");
-            public static final PacketType TR_SEL =                       new PacketType(PROTOCOL, SENDER, 0x33, "SelectTrade", "TrSel");
-            public static final PacketType BEACON =                       new PacketType(PROTOCOL, SENDER, 0x34, "SetBeacon", "Beacon");
-            public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x35, "SetCarriedItem", "HeldItemSlot", "CPacketHeldItemChange");
-            public static final PacketType SET_COMMAND_BLOCK =            new PacketType(PROTOCOL, SENDER, 0x36, "SetCommandBlock");
-            public static final PacketType SET_COMMAND_MINECART =         new PacketType(PROTOCOL, SENDER, 0x37, "SetCommandMinecart");
-            public static final PacketType SET_CREATIVE_SLOT =            new PacketType(PROTOCOL, SENDER, 0x38, "SetCreativeModeSlot", "SetCreativeSlot", "CPacketCreativeInventoryAction");
-            public static final PacketType SET_GAME_RULE =                new PacketType(PROTOCOL, SENDER, 0x39, "SetGameRule");
-            public static final PacketType SET_JIGSAW =                   new PacketType(PROTOCOL, SENDER, 0x3A, "SetJigsawBlock", "SetJigsaw");
-            public static final PacketType STRUCT =                       new PacketType(PROTOCOL, SENDER, 0x3B, "SetStructureBlock", "Struct");
-            public static final PacketType SET_TEST_BLOCK =               new PacketType(PROTOCOL, SENDER, 0x3C, "SetTestBlock");
-            public static final PacketType UPDATE_SIGN =                  new PacketType(PROTOCOL, SENDER, 0x3D, "SignUpdate", "UpdateSign", "CPacketUpdateSign");
-            public static final PacketType SPECTATE_ENTITY =              new PacketType(PROTOCOL, SENDER, 0x3E, "SpectatorAction", "SpectateEntity");
-            public static final PacketType ARM_ANIMATION =                new PacketType(PROTOCOL, SENDER, 0x3F, "Swing", "ArmAnimation", "CPacketAnimation");
-            public static final PacketType SPECTATE =                     new PacketType(PROTOCOL, SENDER, 0x40, "TeleportToEntity", "Spectate", "CPacketSpectate");
-            public static final PacketType TEST_INSTANCE_BLOCK_ACTION =   new PacketType(PROTOCOL, SENDER, 0x41, "TestInstanceBlockAction");
-            public static final PacketType USE_ITEM_ON =                  new PacketType(PROTOCOL, SENDER, 0x42, "UseItemOn", "BlockPlace", "CPacketPlayerTryUseItemOnBlock");
-            public static final PacketType USE_ITEM =                     new PacketType(PROTOCOL, SENDER, 0x43, "UseItem", "CPacketPlayerTryUseItem");
-            public static final PacketType CUSTOM_CLICK_ACTION =          new PacketType(PROTOCOL, SENDER, 0x44, "CustomClickAction");
+            public static final PacketType TILE_NBT_QUERY =               new PacketType(PROTOCOL, SENDER, 0x01, "BlockEntityTagQuery", "TileNBTQuery");
+            public static final PacketType SELECT_BUNDLE_ITEM =           new PacketType(PROTOCOL, SENDER, 0x02, "SelectBundleItem");
+            public static final PacketType DIFFICULTY_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x03, "ChangeDifficulty", "DifficultyChange");
+            public static final PacketType CHANGE_GAME_MODE =             new PacketType(PROTOCOL, SENDER, 0x04, "ChangeGameMode");
+            public static final PacketType CHAT_ACK =                     new PacketType(PROTOCOL, SENDER, 0x05, "ChatAck");
+            public static final PacketType CHAT_COMMAND =                 new PacketType(PROTOCOL, SENDER, 0x06, "ChatCommand");
+            public static final PacketType CHAT_COMMAND_SIGNED =          new PacketType(PROTOCOL, SENDER, 0x07, "ChatCommandSigned");
+            public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x08, "Chat", "CPacketChatMessage");
+            public static final PacketType CHAT_SESSION_UPDATE =          new PacketType(PROTOCOL, SENDER, 0x09, "ChatSessionUpdate");
+            public static final PacketType CHUNK_BATCH_RECEIVED =         new PacketType(PROTOCOL, SENDER, 0x0A, "ChunkBatchReceived");
+            public static final PacketType CLIENT_COMMAND =               new PacketType(PROTOCOL, SENDER, 0x0B, "ClientCommand", "CPacketClientStatus");
+            public static final PacketType CLIENT_TICK_END =              new PacketType(PROTOCOL, SENDER, 0x0C, "ClientTickEnd");
+            public static final PacketType SETTINGS =                     new PacketType(PROTOCOL, SENDER, 0x0D, "ClientInformation", "Settings", "CPacketClientSettings");
+            public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x0E, "CommandSuggestion", "TabComplete", "CPacketTabComplete");
+            public static final PacketType CONFIGURATION_ACK =            new PacketType(PROTOCOL, SENDER, 0x0F, "ConfigurationAcknowledged");
+            public static final PacketType ENCHANT_ITEM =                 new PacketType(PROTOCOL, SENDER, 0x10, "ContainerButtonClick", "EnchantItem", "CPacketEnchantItem");
+            public static final PacketType WINDOW_CLICK =                 new PacketType(PROTOCOL, SENDER, 0x11, "ContainerClick", "WindowClick", "CPacketClickWindow");
+            public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x12, "ContainerClose", "CloseWindow", "CPacketCloseWindow");
+            public static final PacketType CONTAINER_SLOT_STATE_CHANGED = new PacketType(PROTOCOL, SENDER, 0x13, "ContainerSlotStateChanged", "ContainerSlotStateChangedPacket");
+            public static final PacketType COOKIE_RESPONSE =              new PacketType(PROTOCOL, SENDER, 0x14, "CookieResponse");
+            public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x15, "CustomPayload", "CPacketCustomPayload");
+            public static final PacketType DEBUG_SAMPLE_SUBSCRIPTION =    new PacketType(PROTOCOL, SENDER, 0x16, "DebugSampleSubscription");
+            public static final PacketType B_EDIT =                       new PacketType(PROTOCOL, SENDER, 0x17, "EditBook", "BEdit");
+            public static final PacketType ENTITY_NBT_QUERY =             new PacketType(PROTOCOL, SENDER, 0x18, "EntityTagQuery", "EntityNBTQuery");
+            public static final PacketType USE_ENTITY =                   new PacketType(PROTOCOL, SENDER, 0x19, "Interact", "UseEntity", "CPacketUseEntity");
+            public static final PacketType JIGSAW_GENERATE =              new PacketType(PROTOCOL, SENDER, 0x1A, "JigsawGenerate");
+            public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x1B, "KeepAlive", "CPacketKeepAlive");
+            public static final PacketType DIFFICULTY_LOCK =              new PacketType(PROTOCOL, SENDER, 0x1C, "LockDifficulty", "DifficultyLock");
+            public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x1D, "net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos", "Flying$Position", "Flying$PacketPlayInPosition", "CPacketPlayer$Position");
+            public static final PacketType POSITION_LOOK =                new PacketType(PROTOCOL, SENDER, 0x1E, "net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot", "Flying$PositionLook", "Flying$PacketPlayInPositionLook", "CPacketPlayer$PositionRotation");
+            public static final PacketType LOOK =                         new PacketType(PROTOCOL, SENDER, 0x1F, "net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot", "Flying$Look", "Flying$PacketPlayInLook", "CPacketPlayer$Rotation");
+            public static final PacketType GROUND =                       new PacketType(PROTOCOL, SENDER, 0x20, "net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$StatusOnly", "Flying$d");
+            public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x21, "MoveVehicle", "VehicleMove", "CPacketVehicleMove");
+            public static final PacketType BOAT_MOVE =                    new PacketType(PROTOCOL, SENDER, 0x22, "PaddleBoat", "BoatMove", "CPacketSteerBoat");
+            public static final PacketType PICK_ITEM_FROM_BLOCK =         new PacketType(PROTOCOL, SENDER, 0x23, "PickItemFromBlock");
+            public static final PacketType PICK_ITEM =                    new PacketType(PROTOCOL, SENDER, 0x24, "PickItemFromEntity", "PickItem");
+            public static final PacketType PING_REQUEST =                 new PacketType(PROTOCOL, SENDER, 0x25, "PingRequest");
+            public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x26, "PlaceRecipe", "AutoRecipe", "CPacketPlaceRecipe");
+            public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x27, "PlayerAbilities", "Abilities", "CPacketPlayerAbilities");
+            public static final PacketType BLOCK_DIG =                    new PacketType(PROTOCOL, SENDER, 0x28, "PlayerAction", "BlockDig", "CPacketPlayerDigging");
+            public static final PacketType ENTITY_ACTION =                new PacketType(PROTOCOL, SENDER, 0x29, "PlayerCommand", "EntityAction", "CPacketEntityAction");
+            public static final PacketType STEER_VEHICLE =                new PacketType(PROTOCOL, SENDER, 0x2A, "PlayerInput", "SteerVehicle", "CPacketInput");
+            public static final PacketType PLAYER_LOADED =                new PacketType(PROTOCOL, SENDER, 0x2B, "PlayerLoaded");
+            public static final PacketType PONG =                         new PacketType(PROTOCOL, SENDER, 0x2C, "Pong");
+            public static final PacketType RECIPE_SETTINGS =              new PacketType(PROTOCOL, SENDER, 0x2D, "RecipeBookChangeSettings", "RecipeSettings");
+            public static final PacketType RECIPE_DISPLAYED =             new PacketType(PROTOCOL, SENDER, 0x2E, "RecipeBookSeenRecipe", "RecipeDisplayed", "CPacketRecipeInfo");
+            public static final PacketType ITEM_NAME =                    new PacketType(PROTOCOL, SENDER, 0x2F, "RenameItem", "ItemName");
+            public static final PacketType RESOURCE_PACK_STATUS =         new PacketType(PROTOCOL, SENDER, 0x30, "ResourcePack", "ResourcePackStatus", "CPacketResourcePackStatus");
+            public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x31, "SeenAdvancements", "Advancements", "CPacketSeenAdvancements");
+            public static final PacketType TR_SEL =                       new PacketType(PROTOCOL, SENDER, 0x32, "SelectTrade", "TrSel");
+            public static final PacketType BEACON =                       new PacketType(PROTOCOL, SENDER, 0x33, "SetBeacon", "Beacon");
+            public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x34, "SetCarriedItem", "HeldItemSlot", "CPacketHeldItemChange");
+            public static final PacketType SET_COMMAND_BLOCK =            new PacketType(PROTOCOL, SENDER, 0x35, "SetCommandBlock");
+            public static final PacketType SET_COMMAND_MINECART =         new PacketType(PROTOCOL, SENDER, 0x36, "SetCommandMinecart");
+            public static final PacketType SET_CREATIVE_SLOT =            new PacketType(PROTOCOL, SENDER, 0x37, "SetCreativeModeSlot", "SetCreativeSlot", "CPacketCreativeInventoryAction");
+            public static final PacketType SET_JIGSAW =                   new PacketType(PROTOCOL, SENDER, 0x38, "SetJigsawBlock", "SetJigsaw");
+            public static final PacketType STRUCT =                       new PacketType(PROTOCOL, SENDER, 0x39, "SetStructureBlock", "Struct");
+            public static final PacketType SET_TEST_BLOCK =               new PacketType(PROTOCOL, SENDER, 0x3A, "SetTestBlock");
+            public static final PacketType UPDATE_SIGN =                  new PacketType(PROTOCOL, SENDER, 0x3B, "SignUpdate", "UpdateSign", "CPacketUpdateSign");
+            public static final PacketType ARM_ANIMATION =                new PacketType(PROTOCOL, SENDER, 0x3C, "Swing", "ArmAnimation", "CPacketAnimation");
+            public static final PacketType SPECTATE =                     new PacketType(PROTOCOL, SENDER, 0x3D, "TeleportToEntity", "Spectate", "CPacketSpectate");
+            public static final PacketType TEST_INSTANCE_BLOCK_ACTION =   new PacketType(PROTOCOL, SENDER, 0x3E, "TestInstanceBlockAction");
+            public static final PacketType USE_ITEM_ON =                  new PacketType(PROTOCOL, SENDER, 0x3F, "UseItemOn", "BlockPlace", "CPacketPlayerTryUseItemOnBlock");
+            public static final PacketType USE_ITEM =                     new PacketType(PROTOCOL, SENDER, 0x40, "UseItem", "CPacketPlayerTryUseItem");
+            public static final PacketType CUSTOM_CLICK_ACTION =          new PacketType(PROTOCOL, SENDER, 0x41, "CustomClickAction");
 
             /**
              * @deprecated Removed in 1.17
@@ -532,12 +523,6 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
             @Deprecated
             public static final PacketType CHAT_PREVIEW =                 new PacketType(PROTOCOL, SENDER, 253, "ChatPreview");
 
-            /**
-             * deprecated Removed in 1.21.9
-             */
-            @Deprecated
-            public static final PacketType DEBUG_SAMPLE_SUBSCRIPTION =    new PacketType(PROTOCOL, SENDER, 0x16, "DebugSampleSubscription");
-
             /**
              * @deprecated Renamed to USE_ITEM_ON
              */
@@ -728,7 +713,6 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
             public static final PacketType SERVER_LINKS =                 new PacketType(PROTOCOL, SENDER, 0x10, "ServerLinks");
             public static final PacketType CLEAR_DIALOG =                 new PacketType(PROTOCOL, SENDER, 0x11, "ClearDialog");
             public static final PacketType SHOW_DIALOG =                  new PacketType(PROTOCOL, SENDER, 0x12, "ShowDialog");
-            public static final PacketType CODE_OF_CONDUCT =              new PacketType(PROTOCOL, SENDER, 0x13, "CodeOfConduct");
 
             /**
              * @deprecated Removed in 1.20.4: replaced with new packets for removing and sending resource packs
@@ -761,7 +745,6 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
             public static final PacketType RESOURCE_PACK_ACK =            new PacketType(PROTOCOL, SENDER, 0x06, "ResourcePack");
             public static final PacketType SELECT_KNOWN_PACKS =           new PacketType(PROTOCOL, SENDER, 0x07, "ServerboundSelectKnownPacks");
             public static final PacketType CUSTOM_CLICK_ACTION =          new PacketType(PROTOCOL, SENDER, 0x08, "CustomClickAction");
-            public static final PacketType ACCEPT_CODE_OF_CONDUCT =       new PacketType(PROTOCOL, SENDER, 0x09, "AcceptCodeOfConduct");
 
             private static final Client INSTANCE = new Client();
 

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

@@ -0,0 +1,57 @@
+package com.comphenix.protocol;
+
+import java.lang.reflect.Field;
+import java.util.logging.Level;
+
+import com.comphenix.protocol.injector.PacketFilterManager;
+import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.FieldAccessor;
+import com.comphenix.protocol.utility.MinecraftReflection;
+
+import io.netty.channel.Channel;
+import io.papermc.paper.connection.PlayerConnection;
+import io.papermc.paper.connection.ReadablePlayerCookieConnectionImpl;
+import io.papermc.paper.event.connection.PlayerConnectionValidateLoginEvent;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+class PaperLoginListener implements Listener {
+    private final PacketFilterManager manager;
+
+    PaperLoginListener(PacketFilterManager manager) {
+        this.manager = manager;
+    }
+
+    private static FieldAccessor networkManagerField;
+    private static FieldAccessor channelField;
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onPlayerConnectionValidateLogin(PlayerConnectionValidateLoginEvent event) {
+        try {
+            PlayerConnection connection = event.getConnection();
+            ProtocolLogger.log("onPlayerConnectionValidateLogin: " + connection.getAddress());
+
+            if (networkManagerField == null) {
+                FuzzyReflection fuzzy = FuzzyReflection.fromClass(ReadablePlayerCookieConnectionImpl.class, true);
+                Field field = fuzzy.getFieldByType("networkManager", MinecraftReflection.getNetworkManagerClass());
+                networkManagerField = Accessors.getFieldAccessor(field);
+            }
+
+            Object networkManager = networkManagerField.get(connection);
+
+            if (channelField == null) {
+                FuzzyReflection fuzzy = FuzzyReflection.fromObject(networkManager, true);
+                Field field = fuzzy.getFieldByType("channel", Channel.class);
+                channelField = Accessors.getFieldAccessor(field);
+            }
+
+            Channel channel = (Channel) channelField.get(networkManager);
+            manager.injectChannel(channel);
+            ProtocolLogger.log("Successfully injected channel " + channel);
+        } catch (Throwable ex) {
+            ProtocolLogger.log(Level.SEVERE, "Failed to inject channel", ex);
+        }
+    }
+}

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

@@ -15,26 +15,6 @@
  */
 package com.comphenix.protocol;
 
-import com.comphenix.protocol.async.AsyncFilterManager;
-import com.comphenix.protocol.error.BasicErrorReporter;
-import com.comphenix.protocol.error.DelegatedErrorReporter;
-import com.comphenix.protocol.error.DetailedErrorReporter;
-import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.error.Report;
-import com.comphenix.protocol.error.ReportType;
-import com.comphenix.protocol.injector.InternalManager;
-import com.comphenix.protocol.injector.PacketFilterManager;
-import com.comphenix.protocol.metrics.Statistics;
-import com.comphenix.protocol.scheduler.DefaultScheduler;
-import com.comphenix.protocol.scheduler.FoliaScheduler;
-import com.comphenix.protocol.scheduler.ProtocolScheduler;
-import com.comphenix.protocol.scheduler.Task;
-import com.comphenix.protocol.updater.Updater;
-import com.comphenix.protocol.updater.Updater.UpdateType;
-import com.comphenix.protocol.utility.*;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,9 +27,29 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
+import com.comphenix.protocol.async.AsyncFilterManager;
+import com.comphenix.protocol.error.BasicErrorReporter;
+import com.comphenix.protocol.error.DelegatedErrorReporter;
+import com.comphenix.protocol.error.DetailedErrorReporter;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
+import com.comphenix.protocol.injector.PacketFilterManager;
+import com.comphenix.protocol.metrics.Statistics;
+import com.comphenix.protocol.scheduler.DefaultScheduler;
+import com.comphenix.protocol.scheduler.FoliaScheduler;
+import com.comphenix.protocol.scheduler.ProtocolScheduler;
+import com.comphenix.protocol.scheduler.Task;
+import com.comphenix.protocol.updater.Updater;
+import com.comphenix.protocol.updater.Updater.UpdateType;
+import com.comphenix.protocol.utility.ByteBuddyFactory;
+import com.comphenix.protocol.utility.ChatExtensions;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.utility.Util;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
 import org.bukkit.Server;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -58,7 +58,7 @@ import org.bukkit.plugin.java.JavaPlugin;
  *
  * @author Kristian
  */
-public class ProtocolLib extends JavaPlugin {
+public abstract class ProtocolLib extends JavaPlugin {
     // Every possible error or warning report type
     public static final ReportType REPORT_CANNOT_DELETE_CONFIG = new ReportType(
             "Cannot delete old ProtocolLib configuration.");
@@ -91,8 +91,8 @@ public class ProtocolLib extends JavaPlugin {
     // these fields are only existing once, we can make them static
     private static Logger logger;
     private static ProtocolConfig config;
-    private static InternalManager protocolManager;
-    private static ErrorReporter reporter = new BasicErrorReporter();
+    protected static PacketFilterManager protocolManager;
+    protected static ErrorReporter reporter = new BasicErrorReporter();
 
     private Statistics statistics;
 
@@ -210,7 +210,7 @@ public class ProtocolLib extends JavaPlugin {
                         this.commandPacket = new CommandPacket(reporter, this, logger, this.commandFilter, protocolManager);
                         break;
                     case LOGGING:
-                        this.packetLogging = new PacketLogging(this, protocolManager);
+                        this.packetLogging = new PacketLogging(reporter, this, protocolManager);
                         break;
                 }
             } catch (OutOfMemoryError e) {
@@ -336,7 +336,11 @@ public class ProtocolLib extends JavaPlugin {
             this.registerCommand(PacketLogging.NAME, this.packetLogging);
 
             // Player login and logout events
-            protocolManager.registerEvents(manager, this);
+            protocolManager.inject();
+
+            manager.registerEvents(new BukkitListener(protocolManager), this);
+
+            registerLoginListener();
 
             // Worker that ensures that async packets are eventually sent
             // It also performs the update check.
@@ -364,6 +368,8 @@ public class ProtocolLib extends JavaPlugin {
         }
     }
 
+    abstract void registerLoginListener();
+
     // Used to check Minecraft version
     private MinecraftVersion verifyMinecraftVersion() {
         MinecraftVersion minimum = new MinecraftVersion(ProtocolLibrary.MINIMUM_MINECRAFT_VERSION);
@@ -437,26 +443,7 @@ public class ProtocolLib extends JavaPlugin {
         }
     }
 
-    private void registerCommand(String name, CommandExecutor executor) {
-        try {
-            // Ignore these - they must have printed an error already
-            if (executor == null) {
-                return;
-            }
-
-            PluginCommand command = this.getCommand(name);
-
-            // Try to load the command
-            if (command != null) {
-                command.setExecutor(executor);
-            } else {
-                throw new RuntimeException("plugin.yml might be corrupt.");
-            }
-        } catch (RuntimeException e) {
-            reporter.reportWarning(this,
-                    Report.newBuilder(REPORT_CANNOT_REGISTER_COMMAND).messageParam(name, e.getMessage()).error(e));
-        }
-    }
+    abstract void registerCommand(String name, CommandBase command);
 
     /**
      * Disable the current plugin.

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

@@ -0,0 +1,19 @@
+package com.comphenix.protocol;
+
+public final class ProtocolLibPaper extends ProtocolLib {
+
+    @Override
+    void registerLoginListener() {
+        try {
+            Class.forName("io.papermc.paper.event.connection.PlayerConnectionValidateLoginEvent");
+            getServer().getPluginManager().registerEvents(new com.comphenix.protocol.PaperLoginListener(protocolManager), this);
+        } catch (ClassNotFoundException ignored) {
+            getServer().getPluginManager().registerEvents(new LegacyLoginListener(protocolManager), this);
+        }
+    }
+
+    @Override
+    public void registerCommand(String name, CommandBase command) {
+        registerCommand(name, (stack, args) -> command.onCommand(stack.getSender(), args));
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.comphenix.protocol;
+
+import com.comphenix.protocol.error.Report;
+
+import org.bukkit.command.PluginCommand;
+
+public final class ProtocolLibSpigot extends ProtocolLib {
+    @Override
+    void registerLoginListener() {
+        getServer().getPluginManager().registerEvents(new LegacyLoginListener(protocolManager), this);
+    }
+
+    @Override
+    void registerCommand(String name, CommandBase command) {
+        try {
+            PluginCommand pluginCmd = this.getCommand(name);
+
+            // Try to load the command
+            if (pluginCmd != null) {
+                pluginCmd.setExecutor((sender, _c, _l, args) ->
+                    command.onCommand(sender, args));
+            } else {
+                throw new RuntimeException("plugin.yml might be corrupt.");
+            }
+        } catch (RuntimeException e) {
+            reporter.reportWarning(this,
+                Report.newBuilder(REPORT_CANNOT_REGISTER_COMMAND).messageParam(name, e.getMessage()).error(e));
+        }
+    }
+}

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

@@ -18,7 +18,7 @@ import com.comphenix.protocol.error.BasicErrorReporter;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.scheduler.ProtocolScheduler;
 
-import org.apache.commons.lang.Validate;
+import com.comphenix.protocol.utility.Validate;
 import org.bukkit.plugin.Plugin;
 
 /**
@@ -35,12 +35,12 @@ public class ProtocolLibrary {
     /**
      * The maximum version ProtocolLib has been tested with.
      */
-    public static final String MAXIMUM_MINECRAFT_VERSION = "26.2";
+    public static final String MAXIMUM_MINECRAFT_VERSION = "1.21.8";
 
     /**
-     * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (26.2) was released.
+     * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.21.8) was released.
      */
-    public static final String MINECRAFT_LAST_RELEASE_DATE = "2026-06-16";
+    public static final String MINECRAFT_LAST_RELEASE_DATE = "2025-07-17";
 
     private static Plugin plugin;
     private static ProtocolConfig config;
@@ -48,8 +48,8 @@ public class ProtocolLibrary {
     private static ProtocolScheduler scheduler;
     private static ErrorReporter reporter = new BasicErrorReporter();
 
-    private static boolean updatesDisabled;
-    private static boolean initialized;
+    private static boolean updatesDisabled = false;
+    private static boolean initialized = false;
 
     protected static void init(Plugin plugin, ProtocolConfig config, ProtocolManager manager,
                                ProtocolScheduler scheduler, ErrorReporter reporter) {

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

@@ -27,7 +27,6 @@ import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.collection.InboundPacketListenerSet;
 import com.comphenix.protocol.injector.collection.OutboundPacketListenerSet;
-import com.comphenix.protocol.injector.netty.Injector;
 import com.comphenix.protocol.scheduler.ProtocolScheduler;
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
@@ -275,7 +274,7 @@ public class AsyncFilterManager implements AsynchronousManager {
      * @return TRUE if we are, FALSE otherwise.
      */
     private boolean onMainThread() {
-        return Thread.currentThread() == mainThread;
+        return Thread.currentThread().getId() == mainThread.getId();
     }
     
     @Override
@@ -348,8 +347,8 @@ public class AsyncFilterManager implements AsynchronousManager {
      * Construct a asynchronous marker with all the default values.
      * @return Asynchronous marker.
      */
-    public AsyncMarker createAsyncMarker(Injector injector) {
-        return createAsyncMarker(injector, AsyncMarker.DEFAULT_TIMEOUT_DELTA);
+    public AsyncMarker createAsyncMarker() {
+        return createAsyncMarker(AsyncMarker.DEFAULT_TIMEOUT_DELTA);
     }
     
     /**
@@ -357,13 +356,13 @@ public class AsyncFilterManager implements AsynchronousManager {
      * @param timeoutDelta - how long (in ms) until the packet expire.
      * @return An async marker.
      */
-    public AsyncMarker createAsyncMarker(Injector injector, long timeoutDelta) {
-        return createAsyncMarker(injector, timeoutDelta, currentSendingIndex.incrementAndGet());
+    public AsyncMarker createAsyncMarker(long timeoutDelta) {
+        return createAsyncMarker(timeoutDelta, currentSendingIndex.incrementAndGet());
     }
     
     // Helper method
-    private AsyncMarker createAsyncMarker(Injector injector, long timeoutDelta, long sendingIndex) {
-        return new AsyncMarker(injector, sendingIndex, System.currentTimeMillis(), timeoutDelta);
+    private AsyncMarker createAsyncMarker(long timeoutDelta, long sendingIndex) {
+        return new AsyncMarker(manager, sendingIndex, System.currentTimeMillis(), timeoutDelta);
     }
     
     @Override

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

@@ -538,7 +538,7 @@ public class AsyncListenerHandler {
      */
     private void listenerLoop(int workerID) {
         // Danger, danger!
-        if (Thread.currentThread() == mainThread)
+        if (Thread.currentThread().getId() == mainThread.getId())
             throw new IllegalStateException("Do not call this method from the main thread.");
         if (cancelled)
             throw new IllegalStateException("Listener has been cancelled. Create a new listener instead.");

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

@@ -23,18 +23,14 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 
 import com.comphenix.protocol.PacketStream;
 import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolLogger;
 import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.injector.netty.Injector;
 import com.comphenix.protocol.reflect.FieldAccessException;
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.utility.MinecraftReflection;
@@ -68,7 +64,7 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
     /**
      * The packet stream responsible for transmitting the packet when it's done processing.
      */
-    private final Injector injector;
+    private transient PacketStream packetStream;
 
     /**
      * Current list of async packet listeners.
@@ -90,7 +86,7 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
     private volatile boolean processed;
 
     // Whether or not the packet has been sent
-    private final AtomicBoolean transmitted = new AtomicBoolean(false);
+    private volatile boolean transmitted;
 
     // Whether or not the asynchronous processing itself should be cancelled
     private volatile boolean asyncCancelled;
@@ -113,8 +109,11 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
      * Create a container for asyncronous packets.
      * @param initialTime - the current time in milliseconds since 01.01.1970 00:00.
      */
-    AsyncMarker(Injector injector, long sendingIndex, long initialTime, long timeoutDelta) {
-        this.injector = Objects.requireNonNull(injector, "injector is nul");
+    AsyncMarker(PacketStream packetStream, long sendingIndex, long initialTime, long timeoutDelta) {
+        if (packetStream == null)
+            throw new IllegalArgumentException("packetStream cannot be NULL");
+
+        this.packetStream = packetStream;
 
         // Timeout
         this.initialTime = initialTime;
@@ -181,18 +180,16 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
      * Retrieve the packet stream responsible for transmitting this packet.
      * @return The packet stream.
      */
-    @Deprecated
     public PacketStream getPacketStream() {
-        return ProtocolLibrary.getProtocolManager();
+        return packetStream;
     }
 
     /**
      * Sets the output packet stream responsible for transmitting this packet.
      * @param packetStream - new output packet stream.
      */
-    @Deprecated
     public void setPacketStream(PacketStream packetStream) {
-        // NOOP
+        this.packetStream = packetStream;
     }
 
     /**
@@ -288,7 +285,7 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
      * @return TRUE if it has been sent before, FALSE otherwise.
      */
     public boolean isTransmitted() {
-        return transmitted.get();
+        return transmitted;
     }
 
     /**
@@ -386,18 +383,13 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
      * @throws IOException If the packet couldn't be sent.
      */
     void sendPacket(PacketEvent event) throws IOException {
-        if (!this.transmitted.compareAndSet(false, true)) {
-            return;
-        }
-
-        Object handle = event.getPacket().getHandle();
-
         if (event.isServerPacket()) {
-            NetworkMarker marker = NetworkMarker.getNetworkMarker(event);
-            this.injector.sendClientboundPacket(handle, marker, false);
+            packetStream.sendServerPacket(event.getPlayer(), event.getPacket(), NetworkMarker.getNetworkMarker(event), false);
         } else {
-            this.injector.readServerboundPacket(handle);
+            packetStream.receiveClientPacket(event.getPlayer(), event.getPacket(), NetworkMarker.getNetworkMarker(event),
+                    false);
         }
+        transmitted = true;
     }
 
     /**

src/main/java/com/comphenix/protocol/error/DetailedErrorReporter.java

@@ -30,20 +30,17 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
-
 import com.comphenix.protocol.ProtocolConfig;
 import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.ProtocolLogger;
 import com.comphenix.protocol.collections.ExpireHashMap;
 import com.comphenix.protocol.error.Report.ReportBuilder;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.reflect.PrettyPrinter;
+
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Primitives;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
 
 /**
  * Internal class used to handle exceptions.
@@ -472,7 +469,7 @@ public class DetailedErrorReporter implements ErrorReporter {
         } if (isSimpleType(value) || value instanceof Class<?>) {
             return value.toString();
         } else {
-            try {
+            /*try {
                 if (!apacheCommonsMissing)
                     return ToStringBuilder.reflectionToString(value, ToStringStyle.MULTI_LINE_STYLE, false, null);
             } catch (LinkageError ex) {
@@ -483,7 +480,7 @@ public class DetailedErrorReporter implements ErrorReporter {
             } catch (Throwable ex) {
                 // Don't use the error logger to log errors in error logging (that could lead to infinite loops)
                 ProtocolLogger.log(Level.WARNING, "Cannot convert to a String with Apache: " + ex.getMessage());
-            }
+            }*/
             
             // Use our custom object printer instead
             try {

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

@@ -10,22 +10,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-
 import javax.annotation.Nonnull;
 
-import org.apache.commons.lang.Validate;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.World;
-import org.bukkit.WorldType;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.MerchantRecipe;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.NotNull;
-
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.reflect.EquivalentConverter;
 import com.comphenix.protocol.reflect.StructureModifier;
@@ -55,7 +41,6 @@ import com.comphenix.protocol.wrappers.WrappedLevelChunkData;
 import com.comphenix.protocol.wrappers.WrappedMessageSignature;
 import com.comphenix.protocol.wrappers.WrappedNumberFormat;
 import com.comphenix.protocol.wrappers.WrappedParticle;
-import com.comphenix.protocol.wrappers.WrappedPositionMoveRotation;
 import com.comphenix.protocol.wrappers.WrappedProfilePublicKey;
 import com.comphenix.protocol.wrappers.WrappedProfilePublicKey.WrappedProfileKeyData;
 import com.comphenix.protocol.wrappers.WrappedRegistrable;
@@ -69,7 +54,20 @@ import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 import com.comphenix.protocol.wrappers.nbt.NbtBase;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
+
 import com.google.common.base.Preconditions;
+import com.comphenix.protocol.utility.Validate;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.MerchantRecipe;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class AbstractStructure {
     protected transient Object handle;
@@ -1298,20 +1296,6 @@ public abstract class AbstractStructure {
         ));
     }
 
-    /**
-     * Retrieve a read/write structure for {@link WrappedPositionMoveRotation} (available since Minecraft 1.21.2).
-     * <p>
-     * This is used in packets such as {@code ENTITY_TELEPORT} and {@code ENTITY_POSITION_SYNC}.
-     *
-     * @return A modifier for PositionMoveRotation fields.
-     */
-    public StructureModifier<WrappedPositionMoveRotation> getPositionMoveRotation() {
-        return structureModifier.withType(
-                MinecraftReflection.getPositionMoveRotationClass(),
-                WrappedPositionMoveRotation.getConverter()
-        );
-    }
-
     /**
      * Represents an equivalent converter for ItemStack arrays.
      * @author Kristian

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

@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 
-import org.apache.commons.lang.Validate;
+import com.comphenix.protocol.utility.Validate;
 
 /**
  * Stores and retrieves metadata for applicable packet objects.

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

@@ -36,6 +36,7 @@ import com.comphenix.protocol.reflect.accessors.MethodAccessor;
 import com.comphenix.protocol.utility.ByteBuddyFactory;
 import com.comphenix.protocol.utility.Util;
 
+import io.papermc.paper.persistence.PersistentDataContainerView;
 import net.bytebuddy.description.ByteCodeElement;
 import net.bytebuddy.description.modifier.Visibility;
 import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
@@ -60,7 +61,6 @@ import org.bukkit.World;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.profile.PlayerProfile;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -157,11 +157,28 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
         return null;
     }
 
+    /**
+     * @param b
+     * @return
+     */
+    @Override
+    public @org.jspecify.annotations.Nullable Location getRespawnLocation(boolean b) {
+        return null;
+    }
+
     @Override
     public Location getLocation() {
         return null;
     }
 
+    /**
+     * @return
+     */
+    @Override
+    public PersistentDataContainerView getPersistentDataContainer() {
+        return null;
+    }
+
     // TODO do we need to implement this?
 
     public void incrementStatistic(Statistic statistic) throws IllegalArgumentException {
@@ -241,8 +258,11 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
         return uuid;
     }
 
+    /**
+     * @return
+     */
     @Override
-    public @NotNull PlayerProfile getPlayerProfile() {
+    public com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile() {
         return null;
     }
 
@@ -288,6 +308,14 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
         return online;
     }
 
+    /**
+     * @return
+     */
+    @Override
+    public boolean isConnected() {
+        return false;
+    }
+
     @Override
     public boolean isWhitelisted() {
         return whitelisted;

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

@@ -39,7 +39,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.lang.Validate;
+import com.comphenix.protocol.utility.Validate;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;

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

@@ -1,8 +1,6 @@
 package com.comphenix.protocol.injector;
 
 import com.comphenix.protocol.ProtocolManager;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
 
 /**
  * Yields access to the internal hook configuration.
@@ -11,14 +9,6 @@ import org.bukkit.plugin.PluginManager;
  */
 public interface InternalManager extends ProtocolManager {
 
-    /**
-     * Register this protocol manager on Bukkit.
-     *
-     * @param manager - Bukkit plugin manager that provides player join/leave events.
-     * @param plugin  - the parent plugin.
-     */
-    void registerEvents(PluginManager manager, final Plugin plugin);
-
     /**
      * Called when ProtocolLib is closing.
      */

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

@@ -1,10 +1,12 @@
 package com.comphenix.protocol.injector;
 
+import javax.annotation.Nonnull;
+
 import com.comphenix.protocol.ProtocolLib;
 import com.comphenix.protocol.async.AsyncFilterManager;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.utility.MinecraftVersion;
-import javax.annotation.Nonnull;
+
 import org.bukkit.Server;
 import org.bukkit.plugin.Plugin;
 
@@ -112,7 +114,7 @@ public class PacketFilterBuilder {
      *
      * @return A new packet filter manager.
      */
-    public InternalManager build() {
+    public PacketFilterManager build() {
         if (this.reporter == null) {
             throw new IllegalArgumentException("reporter cannot be NULL.");
         }

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

@@ -8,21 +8,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Level;
 
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
-
 import com.comphenix.protocol.AsynchronousManager;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
@@ -43,12 +28,19 @@ import com.comphenix.protocol.injector.PluginVerifier.VerificationResult;
 import com.comphenix.protocol.injector.collection.InboundPacketListenerSet;
 import com.comphenix.protocol.injector.collection.OutboundPacketListenerSet;
 import com.comphenix.protocol.injector.collection.PacketListenerSet;
-import com.comphenix.protocol.injector.netty.Injector;
 import com.comphenix.protocol.injector.netty.WirePacket;
 import com.comphenix.protocol.injector.netty.manager.NetworkManagerInjector;
 import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.comphenix.protocol.utility.MinecraftVersion;
+
 import com.google.common.collect.ImmutableSet;
+import io.netty.channel.Channel;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
 public class PacketFilterManager implements ListenerManager, InternalManager {
 
@@ -152,20 +144,29 @@ public class PacketFilterManager implements ListenerManager, InternalManager {
 
     @Override
     public void sendServerPacket(Player receiver, PacketContainer packet, NetworkMarker marker, boolean filters) {
-        if (this.closed) {
-            return;
-        }
-        
-        // A monitor listener should never modify a packet/event so we can simply invoke monitor listeners
-        // independently of our injector pipeline 
-        if (!filters) {
-            this.runMonitorListeners(packet, () -> {
+        if (!this.closed) {
+            // if we skip the packet events later when actually writing into the pipeline we at least notify all
+            // monitor listeners before doing so - they will not be able to change the event tho
+            if (!filters) {
+                // ensure we are on the main thread if any listener requires that
+                if (this.hasMainThreadListener(packet.getType()) && !this.server.isPrimaryThread()) {
+                    NetworkMarker copy = marker; // okay fine
+                    ProtocolLibrary.getScheduler().scheduleSyncDelayedTask(
+                            () -> this.sendServerPacket(receiver, packet, copy, false), 1L);
+                    return;
+                }
+
+                // construct the event and post to all monitor listeners
                 PacketEvent event = PacketEvent.fromServer(this, packet, marker, receiver, false);
                 this.outboundListeners.invoke(event, ListenerPriority.MONITOR);
-            });
-        }
 
-        this.networkManagerInjector.getInjector(receiver).sendClientboundPacket(packet.getHandle(), marker, filters);
+                // update the marker of the event without accidentally constructing it
+                marker = NetworkMarker.getNetworkMarker(event);
+            }
+
+            // process outbound
+            this.networkManagerInjector.getInjector(receiver).sendClientboundPacket(packet.getHandle(), marker, filters);
+        }
     }
 
     @Override
@@ -192,40 +193,34 @@ public class PacketFilterManager implements ListenerManager, InternalManager {
 
     @Override
     public void receiveClientPacket(Player sender, PacketContainer packet, NetworkMarker marker, boolean filters) {
-        if (this.closed) {
-            return;
-        }
-
-        // make sure we are on the main thread if any listener of the packet needs it
-        if (filters && this.requiresMainThread(packet)) {
-            ProtocolLibrary.getScheduler().runTask(
-                    () -> this.receiveClientPacket(sender, packet, marker, filters));
-            return;
-        }
-
-        Object nmsPacket = packet.getHandle();
-
-        if (filters) {
-            PacketEvent event = PacketEvent.fromClient(this, packet, marker, sender, false);
-            this.invokeInboundPacketListeners(event);
-
-            if (event.isCancelled()) {
+        if (!this.closed) {
+            // make sure we are on the main thread if any listener of the packet needs it
+            if (this.hasMainThreadListener(packet.getType()) && !this.server.isPrimaryThread()) {
+                ProtocolLibrary.getScheduler().runTask(
+                        () -> this.receiveClientPacket(sender, packet, marker, filters));
                 return;
             }
 
-            // Prevent possible de-sync if the packet was replaced by a listener.
-            nmsPacket = event.getPacket().getHandle();
-        } else {
-            // A monitor listener should never modify a packet/event so we can simply invoke monitor listeners
-            // independently of our injector pipeline 
-            this.runMonitorListeners(packet, () -> {
+            Object nmsPacket = packet.getHandle();
+            // check to which listeners we need to post the packet
+            if (filters) {
+                // post to all listeners
+            	PacketEvent event = PacketEvent.fromClient(this.networkManagerInjector, packet, null, sender);
+                this.invokeInboundPacketListeners(event);
+                if (event.isCancelled()) {
+                    return;
+                }
+
+                // prevent possible de-sync
+                nmsPacket = event.getPacket().getHandle();
+            } else {
                 PacketEvent event = PacketEvent.fromClient(this, packet, marker, sender, false);
                 this.inboundListeners.invoke(event, ListenerPriority.MONITOR);
-            });
-        }
+            }
 
-        // post to the player inject, reset our cancel state change
-        this.networkManagerInjector.getInjector(sender).readServerboundPacket(nmsPacket);
+            // post to the player inject, reset our cancel state change
+            this.networkManagerInjector.getInjector(sender).readServerboundPacket(nmsPacket);
+        }
     }
 
     @Override
@@ -325,24 +320,30 @@ public class PacketFilterManager implements ListenerManager, InternalManager {
 
     @Override
     public void removePacketListener(PacketListener listener) {
-        if (!this.closed && this.registeredListeners.remove(listener)) {
-            ListeningWhitelist outbound = listener.getSendingWhitelist();
-            ListeningWhitelist inbound = listener.getReceivingWhitelist();
+        if (this.closed || !this.registeredListeners.remove(listener)) {
+            return;
+        }
 
-            // remove outbound listeners (if any)
-            if (outbound != null && outbound.isEnabled()) {
-                this.outboundListeners.removeListener(listener);
-            }
+        ListeningWhitelist outbound = listener.getSendingWhitelist();
+        ListeningWhitelist inbound = listener.getReceivingWhitelist();
 
-            // remove inbound listeners (if any)
-            if (inbound != null && inbound.isEnabled()) {
-                this.inboundListeners.removeListener(listener);
-            }
+        // remove outbound listeners (if any)
+        if (outbound != null && outbound.isEnabled()) {
+            this.outboundListeners.removeListener(listener);
+        }
+
+        // remove inbound listeners (if any)
+        if (inbound != null && inbound.isEnabled()) {
+            this.inboundListeners.removeListener(listener);
         }
     }
 
     @Override
     public void removePacketListeners(Plugin plugin) {
+        if (this.closed || this.plugin.equals(plugin)) {
+            return;
+        }
+
         for (PacketListener listener : this.getPacketListeners()) {
             if (Objects.equals(listener.getPlugin(), plugin)) {
                 this.removePacketListener(listener);
@@ -419,40 +420,26 @@ public class PacketFilterManager implements ListenerManager, InternalManager {
         }
     }
 
-    @Override
-    public void registerEvents(PluginManager manager, Plugin plugin) {
-        if (!this.closed && !this.injected) {
-            // prevent duplicate event registrations / injections
-            this.injected = true;
-            this.networkManagerInjector.inject();
+    public void removePlayer(Player player) {
+        asyncFilterManager.removePlayer(player);
+    }
 
-            // all listeners we need, this is a bit messy, but it makes the job correctly
-            manager.registerEvents(new Listener() {
+    public void injectPlayer(Player player) {
+        networkManagerInjector.getInjector(player).inject();
+    }
 
-                @EventHandler(priority = EventPriority.LOWEST)
-                public void handleLogin(PlayerLoginEvent event) {
-                	networkManagerInjector.getInjector(event.getPlayer()).inject();
-                }
+    public void injectChannel(Channel channel) {
+        networkManagerInjector.getInjector(channel).inject();
+    }
 
-                @EventHandler(priority = EventPriority.LOWEST)
-                public void handleJoin(PlayerJoinEvent event) {
-                	networkManagerInjector.getInjector(event.getPlayer()).inject();
-                }
-
-                @EventHandler(priority = EventPriority.MONITOR)
-                public void handleQuit(PlayerQuitEvent event) {
-                    PacketFilterManager.this.asyncFilterManager.removePlayer(event.getPlayer());
-                }
-
-                @EventHandler(priority = EventPriority.MONITOR)
-                public void handlePluginUnload(PluginDisableEvent event) {
-                    // don't do this for our plugin!
-                    if (event.getPlugin() != PacketFilterManager.this.plugin) {
-                        PacketFilterManager.this.removePacketListeners(event.getPlugin());
-                    }
-                }
-            }, plugin);
+    public void inject() {
+        if (this.closed || this.injected) {
+            return;
         }
+
+        // prevent duplicate event registrations / injections
+        this.injected = true;
+        this.networkManagerInjector.inject();
     }
 
     @Override
@@ -514,25 +501,12 @@ public class PacketFilterManager implements ListenerManager, InternalManager {
             this.postPacketToListeners(this.outboundListeners, event, true);
         }
     }
-    
-    private boolean requiresMainThread(PacketContainer packet) {
-        return this.hasMainThreadListener(packet.getType()) && !this.server.isPrimaryThread();
-    }
-
-    private void runMonitorListeners(PacketContainer packet, Runnable notifyMonitor) {
-        if (this.requiresMainThread(packet)) {
-            ProtocolLibrary.getScheduler().runTask(notifyMonitor);
-        } else {
-            notifyMonitor.run();
-        }
-    }
 
     private void postPacketToListeners(PacketListenerSet listeners, PacketEvent event, boolean outbound) {
         try {
             // append async marker if any async listener for the packet was registered
             if (this.asyncFilterManager.hasAsynchronousListeners(event)) {
-                Injector injector = this.networkManagerInjector.getInjector(event.getPlayer());
-                event.setAsyncMarker(this.asyncFilterManager.createAsyncMarker(injector));
+                event.setAsyncMarker(this.asyncFilterManager.createAsyncMarker());
             }
 
             // post to sync listeners

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

@@ -287,8 +287,8 @@ public class StructureCache {
 
         if (registryByteBuf.isPresent()) {
             ConstructorAccessor accessor = Accessors.getConstructorAccessor(FuzzyReflection.fromClass(serializerBase, true).getConstructor(FuzzyMethodContract.newBuilder()
-                    .parameterExactType(ByteBuf.class)
-                    .parameterExactType(MinecraftReflection.getRegistryAccessClass())
+                    .parameterDerivedOf(ByteBuf.class)
+                    .parameterDerivedOf(MinecraftReflection.getRegistryAccessClass())
                     .build()));
             TRICKED_DATA_SERIALIZER_BASE = (buf) -> accessor.invoke(buf, MinecraftRegistryAccess.get());
         } else {

src/main/java/com/comphenix/protocol/injector/collection/OutboundPacketListenerSet.java

@@ -58,13 +58,11 @@ public class OutboundPacketListenerSet extends PacketListenerSet {
                 }
             }
 
-            if (!event.isReadOnly()) {
-                if (packets.iterator().hasNext()) {
-                    event.getPacket().getPacketBundles().write(0, outPackets);
-                } else {
-                    // cancel entire packet if each individual packet has been cancelled
-                    event.setCancelled(true);
-                }
+            if (packets.iterator().hasNext()) {
+                event.getPacket().getPacketBundles().write(0, outPackets);
+            } else {
+                // cancel entire packet if each individual packet has been cancelled
+                event.setCancelled(true);
             }
         }
     }

src/main/java/com/comphenix/protocol/injector/netty/Injector.java

@@ -2,12 +2,12 @@ package com.comphenix.protocol.injector.netty;
 
 import java.net.SocketAddress;
 
-import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.events.NetworkMarker;
 
+import org.bukkit.entity.Player;
+
 /**
  * Represents an injected client connection.
  *
@@ -74,6 +74,8 @@ public interface Injector {
      */
     void setPlayer(Player player);
 
+    boolean hasValidPlayer();
+
     boolean isConnected();
 
     /**

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

@@ -2,13 +2,14 @@ package com.comphenix.protocol.injector.netty.channel;
 
 import java.net.SocketAddress;
 
-import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.injector.netty.Injector;
 import com.comphenix.protocol.injector.netty.WirePacket;
+import com.comphenix.protocol.injector.temporary.TemporaryPlayer;
+
+import org.bukkit.entity.Player;
 
 final class EmptyInjector implements Injector {
 
@@ -72,6 +73,11 @@ final class EmptyInjector implements Injector {
         this.player = player;
     }
 
+    @Override
+    public boolean hasValidPlayer() {
+       return player != null && !(player instanceof TemporaryPlayer);
+    }
+
     @Override
     public boolean isConnected() {
         return false;

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

@@ -16,12 +16,9 @@ package com.comphenix.protocol.injector.netty.channel;
 
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentMap;
-
 import javax.annotation.Nonnull;
 
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
+import com.comphenix.protocol.ProtocolLogger;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.injector.ListenerManager;
 import com.comphenix.protocol.injector.netty.Injector;
@@ -29,10 +26,12 @@ import com.comphenix.protocol.injector.temporary.TemporaryPlayerFactory;
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.utility.MinecraftFields;
 import com.comphenix.protocol.utility.MinecraftReflection;
-import com.google.common.collect.MapMaker;
 
+import com.google.common.collect.MapMaker;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
 /**
  * Represents an injector factory.
@@ -85,12 +84,8 @@ public class InjectionFactory {
 
         // try to get the injector using the player reference first
         Injector injector = this.playerLookup.get(player);
-        if (injector == null) {
-            injector = this.getTemporaryInjector(player);
-        }
-
-        // check if we found an injector
         if (injector != null && !injector.isClosed()) {
+            ProtocolLogger.log(player.getName() + " has a cached injector. Player valid: " + injector.hasValidPlayer());
             return injector;
         }
 
@@ -110,7 +105,10 @@ public class InjectionFactory {
                 this.playerLookup.remove(injector.getPlayer());
                 this.cacheInjector(player, injector);
                 // re-set the player of the injection
+                ProtocolLogger.log("Reusing existing injector and setting player to " + player.getName());
                 injector.setPlayer(player);
+            } else {
+                ProtocolLogger.log(player.getName() + "'s channel already has an injector. Player valid: " + injector.hasValidPlayer());
             }
         } else {
             // construct a new injector as it seems like we have none yet

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

@@ -11,9 +11,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.ProtocolLibrary;
@@ -44,6 +41,8 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.EventLoop;
 import io.netty.util.AttributeKey;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 public class NettyChannelInjector implements Injector {
 
@@ -243,7 +242,7 @@ public class NettyChannelInjector implements Injector {
             this.uninject();
 
             // remove any outgoing references
-            this.channel.attr(INJECTOR).set(null);
+            this.channel.attr(INJECTOR).remove();
 
             // cleanup
             this.savedMarkers.clear();
@@ -350,9 +349,8 @@ public class NettyChannelInjector implements Injector {
 
         // check if the name of the player is already known to the injector
         if (this.playerName != null) {
-            Player bukkitPlayer = Bukkit.getPlayerExact(this.playerName);
-            if (bukkitPlayer != null) {
-                this.player = bukkitPlayer;
+            this.player = Bukkit.getPlayerExact(this.playerName);
+            if (this.player != null) {
                 this.injectionFactory.cacheInjector(this.player, this);
             }
         }
@@ -372,6 +370,11 @@ public class NettyChannelInjector implements Injector {
         this.injectionFactory.cacheInjector(player.getName(), this);
     }
 
+    @Override
+    public boolean hasValidPlayer() {
+        return this.player != null && !(player instanceof TemporaryPlayer);
+    }
+
     @Override
     public boolean isConnected() {
         return this.channel.isActive();

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

@@ -5,7 +5,6 @@ import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelConfig;
 import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelId;
 import io.netty.channel.ChannelMetadata;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelProgressivePromise;
@@ -34,11 +33,6 @@ final class NettyChannelProxy implements Channel {
         this.injector = injector;
     }
 
-    @Override
-    public ChannelId id() {
-        return this.delegate.id();
-    }
-
     @Override
     public EventLoop eventLoop() {
         return this.eventLoop;
@@ -244,11 +238,6 @@ final class NettyChannelProxy implements Channel {
         return this.delegate.attr(key);
     }
 
-    @Override
-    public <T> boolean hasAttr(AttributeKey<T> attributeKey) {
-        return this.delegate.hasAttr(attributeKey);
-    }
-
     @Override
     public int compareTo(@NotNull Channel o) {
         return this.delegate.compareTo(o);

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

@@ -10,13 +10,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import io.netty.channel.AbstractEventLoop;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.EventLoop;
 import io.netty.channel.EventLoopGroup;
-import io.netty.util.concurrent.AbstractEventExecutor;
 import io.netty.util.concurrent.EventExecutor;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.ProgressivePromise;
@@ -27,7 +25,7 @@ import io.netty.util.concurrent.ScheduledFuture;
  * An abstract event loop implementation which delegates all calls to a given event loop, but proxies all calls which
  * schedule something on the event loop to methods which decide what should happen to the scheduled task.
  */
-final class NettyEventLoopProxy extends AbstractEventLoop {
+final class NettyEventLoopProxy implements EventLoop {
 
     private static final Callable<?> EMPTY_CALLABLE = () -> null;
     private static final Runnable EMPTY_RUNNABLE = () -> {
@@ -238,15 +236,6 @@ final class NettyEventLoopProxy extends AbstractEventLoop {
         }
     }
 
-    // ShreddedPaper uses this method
-    @Override
-    public void lazyExecute(Runnable command) {
-        Runnable proxied = this.proxyRunnable(command);
-        if (proxied != null) {
-            ((AbstractEventExecutor)this.delegate).lazyExecute(proxied);
-        }
-    }
-
     @Override
     public void forEach(Consumer<? super EventExecutor> action) {
         this.delegate.forEach(action);
@@ -262,12 +251,6 @@ final class NettyEventLoopProxy extends AbstractEventLoop {
         return this.delegate.register(channel);
     }
 
-    @Override
-    public ChannelFuture register(ChannelPromise channelPromise) {
-        return this.delegate.register(channelPromise);
-    }
-
-    @Deprecated
     @Override
     public ChannelFuture register(Channel channel, ChannelPromise promise) {
         return this.delegate.register(channel, promise);

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

@@ -7,9 +7,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
 import com.comphenix.protocol.ProtocolLogger;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.injector.ListenerManager;
@@ -23,7 +20,10 @@ import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.Pair;
 
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
 public class NetworkManagerInjector {
 
@@ -57,6 +57,10 @@ public class NetworkManagerInjector {
     	return this.injectionFactory.fromPlayer(player);
     }
 
+    public Injector getInjector(Channel channel) {
+        return injectionFactory.fromChannel(channel);
+    }
+
     @SuppressWarnings("unchecked")
     public void inject() {
         if (this.closed || this.injected) {

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

@@ -412,8 +412,8 @@ public class PacketRegistry {
     private static Class<?> searchForPacket(List<String> classNames) {
         for (String name : classNames) {
             try {
-                Class<?> clazz = resolvePacketClassName(name);
-                if (clazz != null && MinecraftReflection.getPacketClass().isAssignableFrom(clazz)
+                Class<?> clazz = MinecraftReflection.getMinecraftClass(name);
+                if (MinecraftReflection.getPacketClass().isAssignableFrom(clazz)
                         && !Modifier.isAbstract(clazz.getModifiers())) {
                     return clazz;
                 }
@@ -424,22 +424,6 @@ public class PacketRegistry {
         return null;
     }
 
-    /**
-     * Resolve a single packet class name. Fully-qualified names (those already containing their
-     * package, e.g. {@code net.minecraft.network.protocol.game.XPacket}) are loaded directly, since
-     * {@link MinecraftReflection#getMinecraftClass(String)} would otherwise prepend the Minecraft
-     * package and fail to find them. Relative names continue to be resolved against the Minecraft
-     * package.
-     */
-    private static Class<?> resolvePacketClassName(String name) {
-        Optional<Class<?>> direct = MinecraftReflection.getOptionalClass(name);
-        if (direct.isPresent()) {
-            return direct.get();
-        }
-
-        return MinecraftReflection.getMinecraftClass(name);
-    }
-
     /**
      * Retrieves the correct packet class from a given type.
      *

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

@@ -96,11 +96,6 @@ public final class MinecraftProtocolVersion {
         map.put(new MinecraftVersion(1, 21, 2), 768);
         map.put(new MinecraftVersion(1, 21, 6), 771);
         map.put(new MinecraftVersion(1, 21, 8), 772);
-        map.put(new MinecraftVersion(1, 21, 9), 773);
-        map.put(new MinecraftVersion(1, 21, 11), 774);
-
-        map.put(new MinecraftVersion(26, 1, 0), 775);
-        map.put(new MinecraftVersion(26, 2, 0), 776);
         return map;
     }
 

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

@@ -553,10 +553,6 @@ public final class MinecraftReflection {
         return getClass("com.mojang.authlib.GameProfile");
     }
 
-    public static Class<?> getGameProfilePropertyMapClass() {
-        return getClass("com.mojang.authlib.properties.PropertyMap");
-    }
-
     /**
      * Retrieve the entity (NMS) class.
      *
@@ -921,15 +917,15 @@ public final class MinecraftReflection {
     }
 
     public static Class<?> getMinecraftKeyClass() {
-        return getMinecraftClass("resources.MinecraftKey", "resources.Identifier", "resources.ResourceLocation", "MinecraftKey");
+        return getMinecraftClass("resources.MinecraftKey", "resources.ResourceLocation", "MinecraftKey");
     }
 
     public static Class<?> getMobEffectListClass() {
-        return getMinecraftClass("world.effect.MobEffectList", "MobEffectList", "world.effect.MobEffect", "world.effect.MobEffects");
+        return getMinecraftClass("world.effect.MobEffectList", "MobEffectList", "world.effect.MobEffect");
     }
 
     public static Class<?> getSoundEffectClass() {
-        return getNullableNMS("sounds.SoundEffect", "sounds.SoundEvent", "SoundEffect", "sounds.SoundEvents");
+        return getNullableNMS("sounds.SoundEffect", "sounds.SoundEvent", "SoundEffect");
     }
 
     /**
@@ -1118,15 +1114,6 @@ public final class MinecraftReflection {
         return getOptionalNMS("network.chat.numbers.StyledFormat");
     }
 
-    /**
-     * Retrieve the NMS TeamColor class, added in 26.2.
-     *
-     * @return The TeamColor class.
-     */
-    public static Optional<Class<?>> getTeamColorClass() {
-        return getOptionalNMS("world.scores.TeamColor");
-    }
-
     /**
      * Retrieve the Gson class used by Minecraft.
      *
@@ -1489,18 +1476,6 @@ public final class MinecraftReflection {
             .orElseThrow(() -> new RuntimeException("Cannot find class " + className));
     }
 
-    /**
-     * Attempt to load a class by its fully-qualified canonical name, without prepending the
-     * Minecraft package. Unlike {@link #getMinecraftClass(String)}, this can resolve names that
-     * already include their package (e.g. {@code net.minecraft.network.protocol.game.XPacket}).
-     *
-     * @param className - the fully-qualified class name.
-     * @return Optional that may contain the class.
-     */
-    public static Optional<Class<?>> getOptionalClass(String className) {
-        return getClassSource().loadClass(className);
-    }
-
     /**
      * Retrieve the class object of a specific CraftBukkit class.
      *
@@ -1705,7 +1680,7 @@ public final class MinecraftReflection {
     }
 
     public static Class<?> getEntityTypes() {
-        return getMinecraftClass("world.entity.EntityType", "world.entity.EntityTypes", "EntityTypes");
+        return getMinecraftClass("world.entity.EntityTypes", "world.entity.EntityType", "EntityTypes");
     }
 
     public static Class<?> getParticleParam() {
@@ -1925,12 +1900,15 @@ public final class MinecraftReflection {
         return isMojangMapped;
     }
 
-    /**
-     * Retrieves the PositionMoveRotation class (introduced in 1.21.2).
-     *
-     * @return The PositionMoveRotation class.
-     */
-    public static Class<?> getPositionMoveRotationClass() {
-        return getMinecraftClass("world.entity.PositionMoveRotation");
+    public static Optional<Class<?>> getDataComponentMapClass() {
+        return getOptionalNMS("core.component.DataComponentMap");
+    }
+
+    public static Optional<Class<?>> getDataComponentHolderClass() {
+        return getOptionalNMS("core.component.DataComponentHolder");
+    }
+
+    public static Optional<Class<?>> getTypedDataComponentClass() {
+        return getOptionalNMS("core.component.TypedDataComponent");
     }
 }

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

@@ -36,31 +36,6 @@ import org.bukkit.Server;
  * @author Kristian
  */
 public final class MinecraftVersion implements Comparable<MinecraftVersion>, Serializable {
-    /**
-     * Version 26.2 - chaos cubed
-     */
-    public static final MinecraftVersion v26_2 = new MinecraftVersion("26.2");
-
-    /**
-     * Version 26.1 - tiny takeover
-     */
-    public static final MinecraftVersion v26_1 = new MinecraftVersion("26.1");
-
-    /**
-     * Version 1.21.11 - mounts of mayhem
-     */
-    public static final MinecraftVersion v1_21_11 = new MinecraftVersion("1.21.11");
-
-    /**
-     * Version 1.21.10 - hotfix for 1.21.9
-     */
-    public static final MinecraftVersion v1_21_10 = new MinecraftVersion("1.21.10");
-
-    /**
-     * Version 1.21.9 - the copper age drop
-     */
-    public static final MinecraftVersion v1_21_9 = new MinecraftVersion("1.21.9");
-
     /**
      * Version 1.21.6 - chase the skies
      */
@@ -194,7 +169,7 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion>, Ser
     /**
      * The latest release version of minecraft.
      */
-    public static final MinecraftVersion LATEST = v26_2;
+    public static final MinecraftVersion LATEST = v1_21_6;
 
     // used when serializing
     private static final long serialVersionUID = -8695133558996459770L;

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

@@ -0,0 +1,17 @@
+package com.comphenix.protocol.utility;
+
+public final class Validate {
+    private Validate() {}
+
+    public static void notNull(Object obj, String err) {
+        if (obj == null) {
+            throw new IllegalArgumentException(err);
+        }
+    }
+
+    public static void isTrue(boolean bool, String err) {
+        if (!bool) {
+            throw new IllegalArgumentException(err);
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.comphenix.protocol.utility;
+
+public final class WordUtils {
+    private WordUtils() {}
+
+    public static String capitalize(String str) {
+        if (str == null || str.isEmpty()) {
+            return str;
+        }
+        return str.substring(0, 1).toUpperCase() + str.substring(1).toLowerCase();
+    }
+}

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

@@ -2,14 +2,12 @@ package com.comphenix.protocol.utility;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
-import io.netty.util.ByteProcessor;
-
+import io.netty.buffer.ByteBufProcessor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.channels.FileChannel;
 import java.nio.channels.GatheringByteChannel;
 import java.nio.channels.ScatteringByteChannel;
 import java.nio.charset.Charset;
@@ -56,16 +54,6 @@ public class ZeroBuffer extends ByteBuf {
         return false;
     }
 
-    @Override
-    public boolean isReadOnly() {
-        return false;
-    }
-
-    @Override
-    public ByteBuf asReadOnly() {
-        return null;
-    }
-
     @Override
     public int readerIndex() {
         return 0;
@@ -191,71 +179,36 @@ public class ZeroBuffer extends ByteBuf {
         return 0;
     }
 
-    @Override
-    public short getShortLE(int i) {
-        return 0;
-    }
-
     @Override
     public int getUnsignedShort(int i) {
         return 0;
     }
 
-    @Override
-    public int getUnsignedShortLE(int i) {
-        return 0;
-    }
-
     @Override
     public int getMedium(int i) {
         return 0;
     }
 
-    @Override
-    public int getMediumLE(int i) {
-        return 0;
-    }
-
     @Override
     public int getUnsignedMedium(int i) {
         return 0;
     }
 
-    @Override
-    public int getUnsignedMediumLE(int i) {
-        return 0;
-    }
-
     @Override
     public int getInt(int i) {
         return 0;
     }
 
-    @Override
-    public int getIntLE(int i) {
-        return 0;
-    }
-
     @Override
     public long getUnsignedInt(int i) {
         return 0;
     }
 
-    @Override
-    public long getUnsignedIntLE(int i) {
-        return 0;
-    }
-
     @Override
     public long getLong(int i) {
         return 0;
     }
 
-    @Override
-    public long getLongLE(int i) {
-        return 0;
-    }
-
     @Override
     public char getChar(int i) {
         return 0;
@@ -311,16 +264,6 @@ public class ZeroBuffer extends ByteBuf {
         return 0;
     }
 
-    @Override
-    public int getBytes(int i, FileChannel fileChannel, long l, int i1) throws IOException {
-        return 0;
-    }
-
-    @Override
-    public CharSequence getCharSequence(int i, int i1, Charset charset) {
-        return "";
-    }
-
     @Override
     public ByteBuf setBoolean(int i, boolean b) {
         return null;
@@ -336,41 +279,21 @@ public class ZeroBuffer extends ByteBuf {
         return null;
     }
 
-    @Override
-    public ByteBuf setShortLE(int i, int i1) {
-        return null;
-    }
-
     @Override
     public ByteBuf setMedium(int i, int i1) {
         return null;
     }
 
-    @Override
-    public ByteBuf setMediumLE(int i, int i1) {
-        return null;
-    }
-
     @Override
     public ByteBuf setInt(int i, int i1) {
         return null;
     }
 
-    @Override
-    public ByteBuf setIntLE(int i, int i1) {
-        return null;
-    }
-
     @Override
     public ByteBuf setLong(int i, long l) {
         return null;
     }
 
-    @Override
-    public ByteBuf setLongLE(int i, long l) {
-        return null;
-    }
-
     @Override
     public ByteBuf setChar(int i, int i1) {
         return null;
@@ -426,21 +349,11 @@ public class ZeroBuffer extends ByteBuf {
         return 0;
     }
 
-    @Override
-    public int setBytes(int i, FileChannel fileChannel, long l, int i1) {
-        return 0;
-    }
-
     @Override
     public ByteBuf setZero(int i, int i1) {
         return null;
     }
 
-    @Override
-    public int setCharSequence(int i, CharSequence charSequence, Charset charset) {
-        return 0;
-    }
-
     @Override
     public boolean readBoolean() {
         return false;
@@ -461,71 +374,36 @@ public class ZeroBuffer extends ByteBuf {
         return 0;
     }
 
-    @Override
-    public short readShortLE() {
-        return 0;
-    }
-
     @Override
     public int readUnsignedShort() {
         return 0;
     }
 
-    @Override
-    public int readUnsignedShortLE() {
-        return 0;
-    }
-
     @Override
     public int readMedium() {
         return 0;
     }
 
-    @Override
-    public int readMediumLE() {
-        return 0;
-    }
-
     @Override
     public int readUnsignedMedium() {
         return 0;
     }
 
-    @Override
-    public int readUnsignedMediumLE() {
-        return 0;
-    }
-
     @Override
     public int readInt() {
         return 0;
     }
 
-    @Override
-    public int readIntLE() {
-        return 0;
-    }
-
     @Override
     public long readUnsignedInt() {
         return 0;
     }
 
-    @Override
-    public long readUnsignedIntLE() {
-        return 0;
-    }
-
     @Override
     public long readLong() {
         return 0;
     }
 
-    @Override
-    public long readLongLE() {
-        return 0;
-    }
-
     @Override
     public char readChar() {
         return 0;
@@ -551,11 +429,6 @@ public class ZeroBuffer extends ByteBuf {
         return null;
     }
 
-    @Override
-    public ByteBuf readRetainedSlice(int i) {
-        return null;
-    }
-
     @Override
     public ByteBuf readBytes(ByteBuf byteBuf) {
         return null;
@@ -596,16 +469,6 @@ public class ZeroBuffer extends ByteBuf {
         return 0;
     }
 
-    @Override
-    public CharSequence readCharSequence(int i, Charset charset) {
-        return "";
-    }
-
-    @Override
-    public int readBytes(FileChannel fileChannel, long l, int i) {
-        return 0;
-    }
-
     @Override
     public ByteBuf skipBytes(int i) {
         return null;
@@ -626,41 +489,21 @@ public class ZeroBuffer extends ByteBuf {
         return null;
     }
 
-    @Override
-    public ByteBuf writeShortLE(int i) {
-        return null;
-    }
-
     @Override
     public ByteBuf writeMedium(int i) {
         return null;
     }
 
-    @Override
-    public ByteBuf writeMediumLE(int i) {
-        return null;
-    }
-
     @Override
     public ByteBuf writeInt(int i) {
         return null;
     }
 
-    @Override
-    public ByteBuf writeIntLE(int i) {
-        return null;
-    }
-
     @Override
     public ByteBuf writeLong(long l) {
         return null;
     }
 
-    @Override
-    public ByteBuf writeLongLE(long l) {
-        return null;
-    }
-
     @Override
     public ByteBuf writeChar(int i) {
         return null;
@@ -716,21 +559,11 @@ public class ZeroBuffer extends ByteBuf {
         return 0;
     }
 
-    @Override
-    public int writeBytes(FileChannel fileChannel, long l, int i) {
-        return 0;
-    }
-
     @Override
     public ByteBuf writeZero(int i) {
         return null;
     }
 
-    @Override
-    public int writeCharSequence(CharSequence charSequence, Charset charset) {
-        return 0;
-    }
-
     @Override
     public int indexOf(int i, int i1, byte b) {
         return 0;
@@ -752,22 +585,22 @@ public class ZeroBuffer extends ByteBuf {
     }
 
     @Override
-    public int forEachByte(ByteProcessor byteProcessor) {
+    public int forEachByte(ByteBufProcessor byteBufProcessor) {
         return 0;
     }
 
     @Override
-    public int forEachByte(int i, int i1, ByteProcessor byteProcessor) {
+    public int forEachByte(int i, int i1, ByteBufProcessor byteBufProcessor) {
         return 0;
     }
 
     @Override
-    public int forEachByteDesc(ByteProcessor byteProcessor) {
+    public int forEachByteDesc(ByteBufProcessor byteBufProcessor) {
         return 0;
     }
 
     @Override
-    public int forEachByteDesc(int i, int i1, ByteProcessor byteProcessor) {
+    public int forEachByteDesc(int i, int i1, ByteBufProcessor byteBufProcessor) {
         return 0;
     }
 
@@ -786,31 +619,16 @@ public class ZeroBuffer extends ByteBuf {
         return null;
     }
 
-    @Override
-    public ByteBuf retainedSlice() {
-        return null;
-    }
-
     @Override
     public ByteBuf slice(int i, int i1) {
         return null;
     }
 
-    @Override
-    public ByteBuf retainedSlice(int i, int i1) {
-        return null;
-    }
-
     @Override
     public ByteBuf duplicate() {
         return null;
     }
 
-    @Override
-    public ByteBuf retainedDuplicate() {
-        return null;
-    }
-
     @Override
     public int nioBufferCount() {
         return 0;
@@ -920,14 +738,4 @@ public class ZeroBuffer extends ByteBuf {
     public ByteBuf retain() {
         return null;
     }
-
-    @Override
-    public ByteBuf touch() {
-        return null;
-    }
-
-    @Override
-    public ByteBuf touch(Object o) {
-        return null;
-    }
 }

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

@@ -70,7 +70,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
 import org.bukkit.Sound;
 import org.bukkit.World;
 import org.bukkit.WorldType;
@@ -874,13 +873,6 @@ public class BukkitConverters {
         return ignoreNull(new EquivalentConverter<EntityType>() {
             @Override
             public Object getGeneric(EntityType specific) {
-                if (MinecraftVersion.v26_2.atOrAbove()) {
-                    // EntityType.byString was removed in 26.2, resolve through the registry instead
-                    WrappedRegistry registry = WrappedRegistry.getRegistry(MinecraftReflection.getEntityTypes());
-                    NamespacedKey key = specific.getKey();
-                    return registry.get(new MinecraftKey(key.getNamespace(), key.getKey()));
-                }
-
                 if (entityTypeFromName == null) {
                     Class<?> entityTypesClass = MinecraftReflection.getEntityTypes();
                     entityTypeFromName = Accessors.getMethodAccessor(

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

@@ -11,7 +11,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.lang.Validate;
+import com.comphenix.protocol.utility.Validate;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 
@@ -36,12 +36,6 @@ public abstract class EnumWrappers {
     public enum ClientCommand {
         PERFORM_RESPAWN,
         REQUEST_STATS,
-        REQUEST_GAMERULE_VALUES,
-
-        /**
-         * @deprecated Removed in 26.1
-         */
-        @Deprecated
         OPEN_INVENTORY_ACHIEVEMENT
     }
 
@@ -186,8 +180,7 @@ public abstract class EnumWrappers {
         DROP_ALL_ITEMS,
         DROP_ITEM,
         RELEASE_USE_ITEM,
-        SWAP_HELD_ITEMS("SWAP_ITEM_WITH_OFFHAND"),
-        STAB;
+        SWAP_HELD_ITEMS("SWAP_ITEM_WITH_OFFHAND");
 
         final String[] aliases;
         PlayerDigType(String... aliases) {
@@ -812,7 +805,7 @@ public abstract class EnumWrappers {
             }
 
             try {
-                SOUND_CATEGORY_CLASS = MinecraftReflection.getMinecraftClass("sounds.SoundCategory", "sounds.SoundSource");
+                SOUND_CATEGORY_CLASS = MinecraftReflection.getMinecraftClass("sounds.SoundCategory");
             } catch (Exception ex) {
                 SOUND_CATEGORY_CLASS = getEnum(PacketType.Play.Server.NAMED_SOUND_EFFECT.getPacketClass(), 0);
             }
@@ -828,17 +821,13 @@ public abstract class EnumWrappers {
             if (MinecraftVersion.CAVES_CLIFFS_1.atOrAbove()) {
                 HAND_CLASS = MinecraftReflection.getMinecraftClass("world.EnumHand", "world.InteractionHand");
 
-                if (MinecraftVersion.v26_1.atOrAbove()) {
-                    // TODO
-                } else {
-                    FuzzyReflection fuzzy = FuzzyReflection.fromClass(MinecraftReflection.getEnumEntityUseActionClass(), true);
-                    Method getType = fuzzy.getMethod(FuzzyMethodContract.newBuilder()
-                            .parameterCount(0)
-                            .returnTypeMatches(FuzzyMatchers.except(Void.class))
-                            .build());
+                FuzzyReflection fuzzy = FuzzyReflection.fromClass(MinecraftReflection.getEnumEntityUseActionClass(), true);
+                Method getType = fuzzy.getMethod(FuzzyMethodContract.newBuilder()
+                    .parameterCount(0)
+                    .returnTypeMatches(FuzzyMatchers.except(Void.class))
+                    .build());
 
-                    ENTITY_USE_ACTION_CLASS = getType.getReturnType();
-                }
+                ENTITY_USE_ACTION_CLASS = getType.getReturnType();
             } else {
                 HAND_CLASS = getEnum(PacketType.Play.Client.USE_ENTITY.getPacketClass(), 1);
                 ENTITY_USE_ACTION_CLASS = getEnum(PacketType.Play.Client.USE_ENTITY.getPacketClass(), 0);

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

@@ -37,7 +37,7 @@ import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
 import com.comphenix.protocol.wrappers.collection.ConvertedMap;
 
-import org.apache.commons.lang.Validate;
+import com.comphenix.protocol.utility.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 

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

@@ -53,7 +53,14 @@ public class MinecraftKey {
      * @param key The key
      */
     public MinecraftKey(String key) {
-        this("minecraft", key);
+        if (key.contains(":")) {
+            String[] split = key.split(":", 2);
+            this.prefix = split[0];
+            this.key = split[1];
+        } else {
+            this.prefix = "minecraft";
+            this.key = key;
+        }
     }
 
     /**

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

@@ -1,29 +0,0 @@
-package com.comphenix.protocol.wrappers;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.Multimap;
-import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.properties.PropertyMap;
-
-/**
- * Mutable version of PropertyMap
- * Credit to PaperMC: https://github.com/PaperMC/Paper/blob/main/paper-server/src/main/java/io/papermc/paper/profile/MutablePropertyMap.java
- */
-public class MutablePropertyMap extends PropertyMap {
-    private final Multimap<String, Property> properties = HashMultimap.create();
-
-    public MutablePropertyMap() {
-        super(ImmutableMultimap.of());
-    }
-
-    public MutablePropertyMap(final Multimap<String, Property> properties) {
-        this();
-        this.putAll(properties);
-    }
-
-    @Override
-    protected Multimap<String, Property> delegate() {
-        return this.properties;
-    }
-}

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

@@ -0,0 +1,45 @@
+package com.comphenix.protocol.wrappers;
+
+import com.comphenix.protocol.utility.MinecraftReflection;
+
+public class ResourceKey {
+    private static final AutoWrapper<ResourceKey> AUTO_WRAPPER = AutoWrapper.wrap(ResourceKey.class, MinecraftReflection.getResourceKey())
+        .field(0, MinecraftKey.getConverter())
+        .field(1, MinecraftKey.getConverter());
+
+    MinecraftKey registryName;
+    MinecraftKey location;
+
+    ResourceKey() {
+
+    }
+
+    public ResourceKey(MinecraftKey registryName, MinecraftKey location) {
+        this.registryName = registryName;
+        this.location = location;
+    }
+
+    public MinecraftKey getRegistryName() {
+        return registryName;
+    }
+
+    public MinecraftKey getLocation() {
+        return location;
+    }
+
+    public void setRegistryName(MinecraftKey registryName) {
+        this.registryName = registryName;
+    }
+
+    public void setLocation(MinecraftKey location) {
+        this.location = location;
+    }
+
+    public static ResourceKey fromGeneric(Object generic) {
+        return AUTO_WRAPPER.wrap(generic);
+    }
+
+    public Object toGeneric() {
+        return AUTO_WRAPPER.unwrap(this);
+    }
+}

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

@@ -0,0 +1,181 @@
+package com.comphenix.protocol.wrappers;
+
+import java.lang.reflect.RecordComponent;
+import java.util.Optional;
+
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
+import com.comphenix.protocol.reflect.accessors.MethodAccessor;
+import com.comphenix.protocol.reflect.cloning.AggregateCloner;
+import com.comphenix.protocol.utility.MinecraftReflection;
+
+/**
+ * Represents a single data component in Minecraft, which is a key-value pair
+ * used to store metadata about game objects such as items, mobs, and block entities.
+ * <p>
+ * This class provides methods to create, access, and manipulate data components,
+ * as well as to convert them to and from their underlying NMS handles.
+ *
+ * @see WrappedDataComponentHolder
+ */
+public final class WrappedDataComponent {
+    private static final Optional<Class<?>> HANDLE_TYPE = MinecraftReflection.getTypedDataComponentClass();
+
+    private static MethodAccessor TYPE_ACCESSOR;
+    private static MethodAccessor VALUE_ACCESSOR;
+    private static ConstructorAccessor CTOR_ACCESSOR;
+
+    private final Object keyHandle;
+    private final String key;
+
+    private Object value;
+
+    static {
+        initialize();
+    }
+
+    private static void initialize() {
+        if (HANDLE_TYPE.isEmpty()) {
+            return;
+        }
+
+        Class<?> clazz = HANDLE_TYPE.get();
+        RecordComponent typeComponent = clazz.getRecordComponents()[0];
+        TYPE_ACCESSOR = Accessors.getMethodAccessor(typeComponent.getAccessor());
+
+        RecordComponent valueComponent = clazz.getRecordComponents()[1];
+        VALUE_ACCESSOR = Accessors.getMethodAccessor(valueComponent.getAccessor());
+
+        CTOR_ACCESSOR = Accessors.getConstructorAccessor(clazz, typeComponent.getType(), valueComponent.getType());
+    }
+
+    WrappedDataComponent(Object keyHandle, String key, Object value) {
+        this.keyHandle = keyHandle;
+        this.key = key;
+        this.value = value;
+    }
+
+    /**
+     * @return the key of this data component, e.g. "minecraft:custom_data".
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * Updates the in-memory value of this data component.
+     * <br>
+     * <b>NOTE:</b> this does <b>NOT</b> update the underlying handle
+     * @param value new NMS value
+     */
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    /**
+     * @return the current in-memory value of this data component
+     * @param <T> desired return type
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T getValue() {
+        return (T) value;
+    }
+
+    /**
+     * Creates a new WrappedDataComponent from an existing NMS handle.
+     * @param handle NMS handle
+     * @return new WrappedDataComponent instance
+     */
+    public static WrappedDataComponent fromHandle(Object handle) {
+        if (TYPE_ACCESSOR == null || VALUE_ACCESSOR == null) {
+            throw new IllegalStateException("Unable to access TypedDataComponent");
+        }
+
+        Object typeHandle = TYPE_ACCESSOR.invoke(handle);
+        Object value = VALUE_ACCESSOR.invoke(handle);
+
+        WrappedRegistry componentTypeRegistry = WrappedRegistry.getDataComponentTypeRegistry();
+        String key = componentTypeRegistry.getKey(typeHandle).getFullKey();
+
+        return new WrappedDataComponent(typeHandle, key, value);
+    }
+
+    /**
+     * Creates a new NMS handle for this data component using the current value.
+     * @return new NMS handle
+     */
+    public Object getHandle() {
+        if (CTOR_ACCESSOR == null) {
+            throw new IllegalStateException("Unable to access TypedDataComponent constructor");
+        }
+
+        return CTOR_ACCESSOR.invoke(keyHandle, value);
+    }
+
+    /**
+     * Creates a new WrappedDataComponent with the specified key and no value.
+     * @param key the key of the data component, e.g. "minecraft:custom_data".
+     * @return new WrappedDataComponent instance
+     */
+    public static WrappedDataComponent create(String key) {
+        return create(key, null);
+    }
+
+    /**
+     * Creates a new WrappedDataComponent with the specified key and value.
+     * @param key the key of the data component, e.g. "minecraft:custom_data".
+     * @param value the NMS value of the data component, e.g. an ItemStack or Integer.
+     * @return new WrappedDataComponent instance
+     */
+    public static WrappedDataComponent create(String key, Object value) {
+        WrappedRegistry componentTypeRegistry = WrappedRegistry.getDataComponentTypeRegistry();
+        Object keyHandle = componentTypeRegistry.get(key);
+
+        if (keyHandle == null) {
+            throw new IllegalArgumentException("Invalid key: " + key);
+        }
+
+        return new WrappedDataComponent(keyHandle, key, value);
+    }
+
+    /**
+     * Creates a shallow clone of this WrappedDataComponent, which means it copies the key and value references,
+     * but does not clone the value itself. This should cover most cases where the value is immutable
+     * (e.g. strings, numbers, enums).
+     * @return a new WrappedDataComponent instance with the same key and value references
+     */
+    public WrappedDataComponent shallowClone() {
+        return new WrappedDataComponent(keyHandle, key, value);
+    }
+
+    /**
+     * Creates a deep clone of this WrappedDataComponent, which means it clones the value as well.
+     * This is useful when the value is mutable (e.g. books, NBT data) and you want to ensure that
+     * changes to the cloned component do not affect the original component.
+     * @return a new WrappedDataComponent instance with a cloned value
+     */
+    public WrappedDataComponent deepClone() {
+        Object clonedValue = AggregateCloner.DEFAULT.clone(value);
+        return new WrappedDataComponent(keyHandle, key, clonedValue);
+    }
+
+    @Override
+    public String toString() {
+        return "WrappedDataComponent[" + key + "=>" + value + "]";
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof WrappedDataComponent other)) return false;
+
+        return key.equals(other.key) && value.equals(other.value);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = key.hashCode();
+        result = 31 * result + (value != null ? value.hashCode() : 0);
+        return result;
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.comphenix.protocol.wrappers;
+
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+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.bukkit.inventory.ItemStack;
+
+/**
+ * Provides access to a DataComponentHolder, which is an object that can hold
+ * various (meta)data components
+ */
+public final class WrappedDataComponentHolder extends AbstractWrapper {
+    private static MethodAccessor GET_COMPONENTS;
+    private static MethodAccessor GET_COMPONENT;
+
+    private static Optional<Class<?>> DATA_COMPONENT_MAP_CLASS = MinecraftReflection.getDataComponentMapClass();
+    private static Optional<Class<?>> DATA_COMPONENT_HOLDER_CLASS = MinecraftReflection.getDataComponentHolderClass();
+
+    static {
+        initialize();
+    }
+
+    private static void initialize() {
+        if (DATA_COMPONENT_MAP_CLASS.isEmpty() || DATA_COMPONENT_HOLDER_CLASS.isEmpty()) {
+            return;
+        }
+
+        Class<?> mapClass = DATA_COMPONENT_MAP_CLASS.get();
+        Class<?> holderClass = DATA_COMPONENT_HOLDER_CLASS.get();
+        FuzzyReflection fuzzy = FuzzyReflection.fromClass(holderClass, true);
+        GET_COMPONENTS = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract.newBuilder()
+            .parameterCount(0)
+            .returnTypeExact(mapClass)
+            .build()));
+        GET_COMPONENT = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract.newBuilder()
+            .parameterCount(1)
+            //.requireModifier(Modifier.PUBLIC)
+            .banModifier(Modifier.STATIC)
+            .parameterExactType(MinecraftReflection.getMinecraftClass("core.component.DataComponentType"))
+            .build()));
+    }
+
+    public WrappedDataComponentHolder(Object handle) {
+        super(DATA_COMPONENT_HOLDER_CLASS.orElseThrow(() -> new IllegalStateException("DataComponentHolder class is not available in this version")));
+        setHandle(handle);
+    }
+
+    public Map<String, WrappedDataComponent> getAllComponents() {
+        Iterable<?> components = (Iterable<?>) GET_COMPONENTS.invoke(handle);
+        Map<String, WrappedDataComponent> wrapped = new HashMap<>();
+        for (Object componentHandle : components) {
+            WrappedDataComponent component = WrappedDataComponent.fromHandle(componentHandle);
+            wrapped.put(component.getKey(), component);
+        }
+
+        return wrapped;
+    }
+
+    public WrappedDataComponent getComponent(String key) {
+        Object keyHandle = WrappedRegistry.getDataComponentTypeRegistry().get(key);
+        Object valueHandle = GET_COMPONENT.invoke(handle, keyHandle);
+        return new WrappedDataComponent(keyHandle, key, valueHandle);
+    }
+
+    public static WrappedDataComponentHolder fromItemStack(ItemStack itemStack) {
+        Object nmsStack = MinecraftReflection.getMinecraftItemStack(itemStack);
+        return new WrappedDataComponentHolder(nmsStack);
+    }
+}

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

@@ -36,12 +36,12 @@ import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
 import com.comphenix.protocol.reflect.accessors.MethodAccessor;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.utility.Validate;
 import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
 import com.comphenix.protocol.wrappers.EnumWrappers.EntityPose;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 
 import com.google.common.collect.ImmutableBiMap;
-import org.apache.commons.lang.Validate;
 import org.bukkit.entity.Entity;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

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

@@ -35,30 +35,18 @@ public class WrappedGameProfile extends AbstractWrapper {
             GAME_PROFILE, String.class, String.class);
     private static final ConstructorAccessor CREATE_UUID_STRING = Accessors.getConstructorAccessorOrNull(
             GAME_PROFILE, UUID.class, String.class);
-    private static final ConstructorAccessor CREATE_UUID_STRING_PROPERTIES = Accessors.getConstructorAccessorOrNull(
-            GAME_PROFILE, UUID.class, String.class, MinecraftReflection.getGameProfilePropertyMapClass());
 
     private static final FieldAccessor GET_UUID_STRING = Accessors.getFieldAccessorOrNull(
             GAME_PROFILE, "id", String.class);
 
-    private static MethodAccessor GET_ID;
-    private static MethodAccessor GET_NAME;
-    private static MethodAccessor GET_PROPERTIES;
-    private static MethodAccessor IS_COMPLETE;
-
-    static {
-        GET_ID = Accessors.getMethodAccessorOrNull(GAME_PROFILE, "getId");
-        if (GET_ID == null) {
-            GET_ID = Accessors.getMethodAccessorOrNull(GAME_PROFILE, "id");
-            GET_NAME = Accessors.getMethodAccessorOrNull(GAME_PROFILE, "name");
-            GET_PROPERTIES = Accessors.getMethodAccessorOrNull(GAME_PROFILE, "properties");
-            IS_COMPLETE = Accessors.getMethodAccessorOrNull(GAME_PROFILE, "complete");
-        } else {
-            GET_NAME = Accessors.getMethodAccessorOrNull(GAME_PROFILE, "getName");
-            GET_PROPERTIES = Accessors.getMethodAccessorOrNull(GAME_PROFILE, "getProperties");
-            IS_COMPLETE = Accessors.getMethodAccessorOrNull(GAME_PROFILE, "isComplete");
-        }
-    }
+    private static final MethodAccessor GET_ID = Accessors.getMethodAccessorOrNull(
+            GAME_PROFILE, "getId");
+    private static final MethodAccessor GET_NAME = Accessors.getMethodAccessorOrNull(
+            GAME_PROFILE, "getName");
+    private static final MethodAccessor GET_PROPERTIES = Accessors.getMethodAccessorOrNull(
+            GAME_PROFILE, "getProperties");
+    private static final MethodAccessor IS_COMPLETE = Accessors.getMethodAccessorOrNull(
+            GAME_PROFILE, "isComplete");
 
     // Fetching game profile
     private static FieldAccessor PLAYER_PROFILE;
@@ -129,51 +117,6 @@ public class WrappedGameProfile extends AbstractWrapper {
         this(parseUUID(id), name);
     }
 
-    private static Object createHandle(UUID uuid, String name, Multimap<String, WrappedSignedProperty> properties) {
-        if (CREATE_STRING_STRING != null) {
-            return CREATE_STRING_STRING.invoke(uuid != null ? uuid.toString() : null, name);
-        }
-
-        if (CREATE_UUID_STRING == null) {
-            throw new IllegalArgumentException("Unsupported GameProfile constructor.");
-        }
-
-        if (!MinecraftVersion.CONFIG_PHASE_PROTOCOL_UPDATE.atOrAbove()) {
-            return CREATE_UUID_STRING.invoke(uuid, name);
-        }
-
-        // 1.20.2+ requires all fields to have a value: null uuid -> UUID(0,0), null name -> empty name
-        // it's not allowed to pass null for both, so we need to pre-check that
-        if (uuid == null && (name == null || name.isEmpty())) {
-            throw new IllegalArgumentException("Name and ID cannot both be blank");
-        }
-
-        // 1.21.9+ made PropertyMap's underlying map immutable, so we need to override it with a mutable map
-        if (MinecraftVersion.v1_21_9.atOrAbove()) {
-            return CREATE_UUID_STRING_PROPERTIES.invoke(uuid == null ? MinecraftGenerator.SYS_UUID : uuid, name == null ? "" : name,
-                    convertPropertyMap(properties));
-        }
-
-        return CREATE_UUID_STRING.invoke(uuid == null ? MinecraftGenerator.SYS_UUID : uuid, name == null ? "" : name);
-    }
-
-    private static Object convertPropertyMap(Multimap<String, WrappedSignedProperty> properties) {
-        com.comphenix.protocol.wrappers.MutablePropertyMap map =
-                new com.comphenix.protocol.wrappers.MutablePropertyMap();
-
-        if (properties == null || properties.isEmpty()) {
-            return map;
-        }
-
-        for (String key : properties.keySet()) {
-            for (WrappedSignedProperty property : properties.get(key)) {
-                map.put(key, (com.mojang.authlib.properties.Property) property.getHandle());
-            }
-        }
-
-        return map;
-    }
-
     /**
      * Construct a new game profile with the given properties.
      * <p>
@@ -184,12 +127,24 @@ public class WrappedGameProfile extends AbstractWrapper {
      */
     public WrappedGameProfile(UUID uuid, String name) {
         super(GAME_PROFILE);
-        setHandle(createHandle(uuid, name, null));
-    }
 
-    public WrappedGameProfile(UUID uuid, String name, Multimap<String, WrappedSignedProperty> properties) {
-        super(GAME_PROFILE);
-        setHandle(createHandle(uuid, name, properties));
+        if (CREATE_STRING_STRING != null) {
+            setHandle(CREATE_STRING_STRING.invoke(uuid != null ? uuid.toString() : null, name));
+        } else if (CREATE_UUID_STRING != null) {
+            if (MinecraftVersion.CONFIG_PHASE_PROTOCOL_UPDATE.atOrAbove()) {
+                // 1.20.2+ requires all fields to have a value: null uuid -> UUID(0,0), null name -> empty name
+                // it's not allowed to pass null for both, so we need to pre-check that
+                if (uuid == null && (name == null || name.isEmpty())) {
+                    throw new IllegalArgumentException("Name and ID cannot both be blank");
+                }
+
+                setHandle(CREATE_UUID_STRING.invoke(uuid == null ? MinecraftGenerator.SYS_UUID : uuid, name == null ? "" : name));
+            } else {
+                setHandle(CREATE_UUID_STRING.invoke(uuid, name));
+            }
+        } else {
+            throw new IllegalArgumentException("Unsupported GameProfile constructor.");
+        }
     }
 
     /**
@@ -202,12 +157,7 @@ public class WrappedGameProfile extends AbstractWrapper {
         if (handle == null)
             return null;
 
-        WrappedGameProfile delegate = new WrappedGameProfile(handle);
-        if (MinecraftVersion.v1_21_9.atOrAbove()) {
-            return new WrappedGameProfile(delegate.getUUID(), delegate.getName(), delegate.getProperties());
-        } else {
-            return delegate;
-        }
+        return new WrappedGameProfile(handle);
     }
 
     /**
@@ -319,15 +269,7 @@ public class WrappedGameProfile extends AbstractWrapper {
 
         if (result == null) {
             Multimap properties = (Multimap) GET_PROPERTIES.invoke(handle);
-
-            Multimap inner;
-            if (MinecraftVersion.v1_21_9.atOrAbove()) {
-                inner = properties;
-            } else {
-                inner = GuavaWrappers.getBukkitMultimap(properties);
-            }
-
-            result = new ConvertedMultimap<String, Object, WrappedSignedProperty>(inner) {
+            result = new ConvertedMultimap<String, Object, WrappedSignedProperty>(GuavaWrappers.getBukkitMultimap(properties)) {
                 @Override
                 protected Object toInner(WrappedSignedProperty outer) {
                     return outer.handle;

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

@@ -1,183 +0,0 @@
-package com.comphenix.protocol.wrappers;
-
-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.MinecraftReflection;
-
-import org.bukkit.util.Vector;
-
-/**
- * Wrapper around the NMS {@code PositionMoveRotation} record, introduced in Minecraft 1.21.2.
- * <p>
- * This type is used in packets such as {@code ENTITY_TELEPORT} and {@code ENTITY_POSITION_SYNC}
- * to represent combined position, movement delta and rotation.
- * <p>
- * Example usage:
- * <pre>{@code
- * WrappedPositionMoveRotation posRot = WrappedPositionMoveRotation.create(
- *         new Vector(x, y, z),   // position
- *         new Vector(0, 0, 0),   // deltaMovement
- *         yaw,                   // yRot
- *         pitch                  // xRot
- * );
- * packet.getPositionMoveRotation().write(0, posRot);
- * }</pre>
- */
-public class WrappedPositionMoveRotation extends AbstractWrapper {
-
-    private static Class<?> NMS_CLASS;
-    private static ConstructorAccessor CONSTRUCTOR;
-    private static StructureModifier<Object> BASE_MODIFIER;
-
-    private final StructureModifier<Object> modifier;
-
-    private WrappedPositionMoveRotation(Object handle) {
-        super(getNmsClass());
-        setHandle(handle);
-        this.modifier = getBaseModifier().withTarget(handle);
-    }
-
-    private static Class<?> getNmsClass() {
-        if (NMS_CLASS == null) {
-            NMS_CLASS = MinecraftReflection.getPositionMoveRotationClass();
-        }
-        return NMS_CLASS;
-    }
-
-    private static StructureModifier<Object> getBaseModifier() {
-        if (BASE_MODIFIER == null) {
-            BASE_MODIFIER = new StructureModifier<>(getNmsClass());
-        }
-        return BASE_MODIFIER;
-    }
-
-    private static ConstructorAccessor getConstructor() {
-        if (CONSTRUCTOR == null) {
-            CONSTRUCTOR = Accessors.getConstructorAccessor(
-                    getNmsClass(),
-                    MinecraftReflection.getVec3DClass(),
-                    MinecraftReflection.getVec3DClass(),
-                    float.class,
-                    float.class
-            );
-        }
-        return CONSTRUCTOR;
-    }
-
-    /**
-     * Creates a new {@code WrappedPositionMoveRotation} from the given NMS handle.
-     *
-     * @param handle - the NMS {@code PositionMoveRotation} instance.
-     * @return the wrapper.
-     */
-    public static WrappedPositionMoveRotation fromHandle(Object handle) {
-        return new WrappedPositionMoveRotation(handle);
-    }
-
-    /**
-     * Creates a new {@code WrappedPositionMoveRotation} with the given values.
-     *
-     * @param position      - the absolute position.
-     * @param deltaMovement - the movement delta (velocity).
-     * @param yRot          - the yaw rotation.
-     * @param xRot          - the pitch rotation.
-     * @return a new wrapper instance.
-     */
-    public static WrappedPositionMoveRotation create(Vector position, Vector deltaMovement, float yRot, float xRot) {
-        EquivalentConverter<Vector> conv = BukkitConverters.getVectorConverter();
-        Object handle = getConstructor().invoke(
-                conv.getGeneric(position),
-                conv.getGeneric(deltaMovement),
-                yRot,
-                xRot
-        );
-        return new WrappedPositionMoveRotation(handle);
-    }
-
-    /**
-     * Retrieves the absolute position component.
-     *
-     * @return the position as a Bukkit {@link Vector}.
-     */
-    public Vector getPosition() {
-        return modifier.withType(MinecraftReflection.getVec3DClass(), BukkitConverters.getVectorConverter()).read(0);
-    }
-
-    /**
-     * Sets the absolute position component.
-     *
-     * @param position - the new position.
-     */
-    public void setPosition(Vector position) {
-        modifier.withType(MinecraftReflection.getVec3DClass(), BukkitConverters.getVectorConverter()).write(0, position);
-    }
-
-    /**
-     * Retrieves the movement delta (velocity) component.
-     *
-     * @return the delta movement as a Bukkit {@link Vector}.
-     */
-    public Vector getDeltaMovement() {
-        return modifier.withType(MinecraftReflection.getVec3DClass(), BukkitConverters.getVectorConverter()).read(1);
-    }
-
-    /**
-     * Sets the movement delta (velocity) component.
-     *
-     * @param deltaMovement - the new delta movement.
-     */
-    public void setDeltaMovement(Vector deltaMovement) {
-        modifier.withType(MinecraftReflection.getVec3DClass(), BukkitConverters.getVectorConverter()).write(1, deltaMovement);
-    }
-
-    /**
-     * Retrieves the yaw rotation (y-axis rotation).
-     *
-     * @return the yaw as a float.
-     */
-    public float getYRot() {
-        StructureModifier<Float> floats = modifier.withType(float.class);
-        return floats.read(0);
-    }
-
-    /**
-     * Sets the yaw rotation (y-axis rotation).
-     *
-     * @param yRot - the new yaw value.
-     */
-    public void setYRot(float yRot) {
-        modifier.withType(float.class).write(0, yRot);
-    }
-
-    /**
-     * Retrieves the pitch rotation (x-axis rotation).
-     *
-     * @return the pitch as a float.
-     */
-    public float getXRot() {
-        StructureModifier<Float> floats = modifier.withType(float.class);
-        return floats.read(1);
-    }
-
-    /**
-     * Sets the pitch rotation (x-axis rotation).
-     *
-     * @param xRot - the new pitch value.
-     */
-    public void setXRot(float xRot) {
-        modifier.withType(float.class).write(1, xRot);
-    }
-
-    /**
-     * Returns an {@link EquivalentConverter} that converts between {@code WrappedPositionMoveRotation}
-     * and the underlying NMS handle.
-     *
-     * @return the converter.
-     */
-    public static EquivalentConverter<WrappedPositionMoveRotation> getConverter() {
-        return Converters.handle(AbstractWrapper::getHandle,
-                WrappedPositionMoveRotation::fromHandle, WrappedPositionMoveRotation.class);
-    }
-}

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

@@ -1,14 +1,5 @@
 package com.comphenix.protocol.wrappers;
 
-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.FuzzyMatchers;
-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;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
@@ -19,21 +10,79 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+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.FuzzyMatchers;
+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;
+
 public class WrappedRegistry {
     // map of NMS class to registry instance
-    private static final Map<Class<?>, WrappedRegistry> REGISTRY;
+    private static final Map<Class<?>, WrappedRegistry> BY_CLASS;
+    private static final Map<String, WrappedRegistry> BY_KEY;
 
-    private static final MethodAccessor GET;
-    private static final MethodAccessor GET_ID;
-    private static final MethodAccessor GET_KEY;
+    private static final MethodAccessor GET_BY_KEY;
+    private static final MethodAccessor GET_ITEM_ID;
+    private static final MethodAccessor GET_ITEM_KEY;
+    private static final MethodAccessor GET_REGISTRY_KEY;
 
     private static final MethodAccessor GET_HOLDER;
 
     static {
-        Map<Class<?>, WrappedRegistry> regMap = new HashMap<>();
+        Class<?> iRegistry = MinecraftReflection.getIRegistry();
+        FuzzyReflection fuzzy = FuzzyReflection.fromClass(iRegistry, false);
+
+        GET_BY_KEY = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract
+            .newBuilder()
+            .parameterCount(1)
+            .returnTypeMatches(FuzzyMatchers.and(FuzzyMatchers.assignable(Object.class), FuzzyMatchers.except(Optional.class)))
+            .requireModifier(Modifier.ABSTRACT)
+            .parameterExactType(MinecraftReflection.getMinecraftKeyClass())
+            .build()));
+        GET_ITEM_ID = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract
+            .newBuilder()
+            .parameterCount(1)
+            .returnTypeExact(int.class)
+            .requireModifier(Modifier.ABSTRACT)
+            .parameterDerivedOf(Object.class)
+            .build()));
+        GET_ITEM_KEY = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract
+            .newBuilder()
+            .parameterCount(1)
+            .returnTypeExact(MinecraftReflection.getMinecraftKeyClass())
+            .build()));
+        GET_REGISTRY_KEY = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract
+            .newBuilder()
+            .parameterCount(0)
+            .returnTypeExact(MinecraftReflection.getResourceKey())
+            .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;
+
+        Map<Class<?>, WrappedRegistry> byClass = new HashMap<>();
+        Map<String, WrappedRegistry> byKey = new HashMap<>();
 
         // get the possible registry fields
-        Class<?> iRegistry = MinecraftReflection.getIRegistry();
+
         Class<?> builtInRegistries = MinecraftReflection.getBuiltInRegistries();
         Set<Field> registries = FuzzyReflection.combineArrays(
                 iRegistry == null ? null : iRegistry.getFields(),
@@ -43,95 +92,75 @@ public class WrappedRegistry {
             for (Field field : registries) {
                 try {
                     // make sure it's actually a registry
-                    if (iRegistry.isAssignableFrom(field.getType())) {
-                        Type genType = field.getGenericType();
-                        if (genType instanceof ParameterizedType) {
-                            ParameterizedType par = (ParameterizedType) genType;
-                            Type paramType = par.getActualTypeArguments()[0];
-                            if (paramType instanceof Class) {
-                                // for example Registry<Item>
-                                regMap.put((Class<?>) paramType, new WrappedRegistry(field.get(null)));
-                            } else if (paramType instanceof ParameterizedType) {
-                                // for example Registry<EntityType<?>>
-                                par = (ParameterizedType) paramType;
-                                paramType = par.getActualTypeArguments()[0];
-                                if (paramType instanceof WildcardType) {
-                                    // some registry types are even more nested, but we don't want them
-                                    // for example Registry<Codec<ChunkGenerator>>, Registry<Codec<WorldChunkManager>>
-                                    WildcardType wildcard = (WildcardType) paramType;
-                                    if (wildcard.getUpperBounds().length != 1 || wildcard.getLowerBounds().length > 0) {
-                                        continue;
-                                    }
+                    if (!iRegistry.isAssignableFrom(field.getType())) {
+                        continue;
+                    }
 
-                                    // we only want types with an undefined upper bound (aka. ?)
-                                    if (wildcard.getUpperBounds()[0] != Object.class) {
-                                        continue;
-                                    }
-                                }
+                    Type genType = field.getGenericType();
+                    if (!(genType instanceof ParameterizedType par)) {
+                        continue;
+                    }
 
-                                paramType = par.getRawType();
-                                if (paramType instanceof Class<?>) {
-                                    // there might be duplicate registries, like the codec registries
-                                    // we don't want them to be registered here
-                                    regMap.put((Class<?>) paramType, new WrappedRegistry(field.get(null)));
-                                }
+                    Class<?> registryClass = null;
+
+                    Type paramType = par.getActualTypeArguments()[0];
+                    if (paramType instanceof Class<?> paramClass) {
+                        // for example Registry<Item>
+                        registryClass = paramClass;
+                    } else if (paramType instanceof ParameterizedType) {
+                        // for example Registry<EntityType<?>>
+                        par = (ParameterizedType) paramType;
+                        paramType = par.getActualTypeArguments()[0];
+                        if (paramType instanceof WildcardType wildcard) {
+                            // some registry types are even more nested, but we don't want them
+                            // for example Registry<Codec<ChunkGenerator>>, Registry<Codec<WorldChunkManager>>
+                            if (wildcard.getUpperBounds().length != 1 || wildcard.getLowerBounds().length > 0) {
+                                continue;
+                            }
+
+                            // we only want types with an undefined upper bound (aka. ?)
+                            if (wildcard.getUpperBounds()[0] != Object.class) {
+                                continue;
                             }
                         }
+
+                        paramType = par.getRawType();
+                        if (paramType instanceof Class<?> paramClass) {
+                            // there might be duplicate registries, like the codec registries
+                            // we don't want them to be registered here
+                            registryClass = paramClass;
+                        }
                     }
+
+                    Object handle = field.get(null);
+                    ResourceKey key = ResourceKey.fromGeneric(GET_REGISTRY_KEY.invoke(handle));
+                    WrappedRegistry wrapped = new WrappedRegistry(handle, key);
+
+                    if (registryClass != null) {
+                        byClass.put(registryClass, wrapped);
+                    }
+
+                    String registryName = key.getLocation().getFullKey();
+                    byKey.put(registryName, wrapped);
                 } catch (ReflectiveOperationException ignored) {
                 }
             }
         }
 
-        REGISTRY = ImmutableMap.copyOf(regMap);
-
-        FuzzyReflection fuzzy = FuzzyReflection.fromClass(iRegistry, false);
-        GET = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract
-                .newBuilder()
-                .parameterCount(1)
-                .returnTypeMatches(FuzzyMatchers.and(FuzzyMatchers.assignable(Object.class), FuzzyMatchers.except(Optional.class)))
-                .requireModifier(Modifier.ABSTRACT)
-                .parameterExactType(MinecraftReflection.getMinecraftKeyClass())
-                .build()));
-        GET_ID = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract
-                .newBuilder()
-                .parameterCount(1)
-                .returnTypeExact(int.class)
-                .requireModifier(Modifier.ABSTRACT)
-                .parameterDerivedOf(Object.class)
-                .build()));
-        GET_KEY = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract
-                .newBuilder()
-                .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;
+        BY_CLASS = ImmutableMap.copyOf(byClass);
+        BY_KEY = ImmutableMap.copyOf(byKey);
     }
 
     private final Object handle;
+    private final ResourceKey key;
 
-    private WrappedRegistry(Object handle) {
+    private WrappedRegistry(Object handle, ResourceKey key) {
         this.handle = handle;
+        this.key = key;
     }
 
     public Object get(MinecraftKey key) {
-        return GET.invoke(handle, MinecraftKey.getConverter().getGeneric(key));
+        return GET_BY_KEY.invoke(handle, MinecraftKey.getConverter().getGeneric(key));
     }
 
     public Object get(String key) {
@@ -139,7 +168,11 @@ public class WrappedRegistry {
     }
 
     public MinecraftKey getKey(Object generic) {
-        return MinecraftKey.getConverter().getSpecific(GET_KEY.invoke(handle, generic));
+        return MinecraftKey.getConverter().getSpecific(GET_ITEM_KEY.invoke(handle, generic));
+    }
+
+    public ResourceKey getKey() {
+        return key;
     }
 
     public int getId(MinecraftKey key) {
@@ -151,7 +184,7 @@ public class WrappedRegistry {
     }
 
     public int getId(Object entry) {
-        return (int) GET_ID.invoke(this.handle, entry);
+        return (int) GET_ITEM_ID.invoke(this.handle, entry);
     }
 
     public Object getHolder(Object generic) {
@@ -170,7 +203,15 @@ public class WrappedRegistry {
         return getRegistry(MinecraftReflection.getSoundEffectClass());
     }
 
+    public static WrappedRegistry getDataComponentTypeRegistry() {
+        return getByKey("minecraft:data_component_type");
+    }
+
     public static WrappedRegistry getRegistry(Class<?> type) {
-        return REGISTRY.get(type);
+        return BY_CLASS.get(type);
+    }
+
+    public static WrappedRegistry getByKey(String key) {
+        return BY_KEY.get(key);
     }
 }

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

@@ -3,8 +3,6 @@ package com.comphenix.protocol.wrappers;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Optional;
-
 import com.comphenix.protocol.injector.StructureCache;
 import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.utility.MinecraftReflection;
@@ -92,26 +90,12 @@ public class WrappedTeamParameters extends AbstractWrapper {
 
     @NotNull
     public EnumWrappers.ChatFormatting getColor() {
-        if (MinecraftVersion.v26_2.atOrAbove()) {
-            Optional<?> optional = modifier.<Optional<?>>withType(Optional.class).read(0);
-            Object teamColor = optional != null ? optional.orElse(null) : null;
-            if (teamColor == null) {
-                return EnumWrappers.ChatFormatting.RESET;
-            }
-
-            return EnumWrappers.ChatFormatting.valueOf(((Enum<?>) teamColor).name());
-        }
-
         return modifier
                 .withType(EnumWrappers.getChatFormattingClass(), EnumWrappers.getChatFormattingConverter())
                 .read(0);
     }
 
     public int getOptions() {
-        if (MinecraftVersion.v26_2.atOrAbove()) {
-            return (byte) modifier.withType(byte.class).read(0);
-        }
-
         return (int) modifier.withType(int.class).read(0);
     }
 
@@ -226,27 +210,9 @@ public class WrappedTeamParameters extends AbstractWrapper {
                 wrapped.modifier.withType(String.class).writeSafely(1, collisionRule.toString());
             }
 
-            if (MinecraftVersion.v26_2.atOrAbove()) {
-                wrapped.modifier.withType(Optional.class).write(0, Optional.ofNullable(toNmsTeamColor(color)));
-                wrapped.modifier.withType(byte.class).write(0, (byte) options);
-            } else {
-                wrapped.modifier.withType(EnumWrappers.getChatFormattingClass()).write(0, EnumWrappers.getChatFormattingConverter().getGeneric(color));
-                wrapped.modifier.withType(int.class).write(0, options);
-            }
+            wrapped.modifier.withType(EnumWrappers.getChatFormattingClass()).write(0, EnumWrappers.getChatFormattingConverter().getGeneric(color));
+            wrapped.modifier.withType(int.class).write(0, options);
             return wrapped;
         }
-
-        @SuppressWarnings({"unchecked", "rawtypes"})
-        private static Object toNmsTeamColor(EnumWrappers.ChatFormatting color) {
-            Class<?> teamColorClass = MinecraftReflection.getTeamColorClass()
-                    .orElseThrow(() -> new IllegalStateException("TeamColor class doesn't exist on this server version"));
-
-            try {
-                return Enum.valueOf((Class) teamColorClass, color.name());
-            } catch (IllegalArgumentException ex) {
-                // formatting-only values (e.g. RESET) don't map to a team color
-                return null;
-            }
-        }
     }
 }

src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtTextSerializer.java

@@ -5,7 +5,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Base64;
+
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 
 import com.comphenix.protocol.wrappers.nbt.NbtBase;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
@@ -22,7 +23,7 @@ public class NbtTextSerializer {
      * A default instance of this serializer.
      */
     public static final NbtTextSerializer DEFAULT = new NbtTextSerializer();
-
+    
     private NbtBinarySerializer binarySerializer;
     
     public NbtTextSerializer() {
@@ -58,7 +59,7 @@ public class NbtTextSerializer {
          binarySerializer.serialize(value, dataOutput);
          
          // Serialize that array
-         return Base64.getEncoder().encodeToString(outputStream.toByteArray());
+         return Base64Coder.encodeLines(outputStream.toByteArray());
     }
     
     /**
@@ -69,7 +70,7 @@ public class NbtTextSerializer {
      * @throws IOException If we are unable to parse the input.
      */
     public <TType> NbtWrapper<TType> deserialize(String input) throws IOException {
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64.getDecoder().decode(input));
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(input));
         
         return binarySerializer.deserialize(new DataInputStream(inputStream));
     }

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

@@ -7,8 +7,6 @@ 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.reflect.instances.DefaultInstances;
-import com.comphenix.protocol.reflect.instances.MinecraftGenerator;
 import com.comphenix.protocol.utility.MinecraftProtocolVersion;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
@@ -25,7 +23,6 @@ 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 Class<?> NAME_AND_ID_CLASS;
 
     private static Class<?> GSON_CLASS;
     private static MethodAccessor GSON_TO_JSON;
@@ -65,31 +62,7 @@ public final class ServerPingRecord implements ServerPingImpl {
                 SAMPLE_WRAPPER = AutoWrapper.wrap(PlayerSample.class, PLAYER_SAMPLE_CLASS);
                 FAVICON_WRAPPER = AutoWrapper.wrap(Favicon.class, MinecraftReflection.getMinecraftClass("network.protocol.status.ServerPing$a", "network.protocol.status.ServerStatus$Favicon"));
 
-                if (MinecraftVersion.v1_21_10.atOrAbove()) {
-                    NAME_AND_ID_CLASS = MinecraftReflection.getMinecraftClass("server.players.NameAndId");
-                    NAME_AND_ID_WRAPPER = AutoWrapper.wrap(NameAndId.class, NAME_AND_ID_CLASS);
-
-                    PROFILE_LIST_CONVERTER = BukkitConverters.getListConverter(new EquivalentConverter<>() {
-                        @Override
-                        public Object getGeneric(WrappedGameProfile specific) {
-                            NameAndId wrapper = new NameAndId(specific.getUUID(), specific.getName());
-                            return NAME_AND_ID_WRAPPER.getGeneric(wrapper);
-                        }
-
-                        @Override
-                        public WrappedGameProfile getSpecific(Object generic) {
-                            NameAndId wrapper = NAME_AND_ID_WRAPPER.getSpecific(generic);
-                            return new WrappedGameProfile(wrapper.id, wrapper.name);
-                        }
-
-                        @Override
-                        public Class<WrappedGameProfile> getSpecificType() {
-                            return WrappedGameProfile.class;
-                        }
-                    });
-                } else {
-                    PROFILE_LIST_CONVERTER = BukkitConverters.getListConverter(BukkitConverters.getWrappedGameProfileConverter());
-                }
+                PROFILE_LIST_CONVERTER = BukkitConverters.getListConverter(BukkitConverters.getWrappedGameProfileConverter());
 
                 DEFAULT_DESCRIPTION = WrappedChatComponent.fromLegacyText("A Minecraft Server");
 
@@ -151,24 +124,11 @@ public final class ServerPingRecord implements ServerPingImpl {
         }
     }
 
-    public static final class NameAndId {
-        public UUID id;
-        public String name;
-
-        public NameAndId(UUID id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-
-        public NameAndId() {
-            this(MinecraftGenerator.SYS_UUID, "");
-        }
-    }
-
     private static AutoWrapper<PlayerSample> SAMPLE_WRAPPER;
+
     private static AutoWrapper<ServerData> DATA_WRAPPER;
+
     private static AutoWrapper<Favicon> FAVICON_WRAPPER;
-    private static AutoWrapper<NameAndId> NAME_AND_ID_WRAPPER;
 
     private WrappedChatComponent description;
     private PlayerSample playerSample;

src/main/resources/paper-plugin.yml

@@ -0,0 +1,6 @@
+name: ProtocolLib
+version: ${version}
+main: com.comphenix.protocol.ProtocolLibPaper
+api-version: '1.21.8'
+website: https://github.com/dmulloy2/ProtocolLib
+load: STARTUP

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ version: ${version}
 description: Provides read/write access to the Minecraft protocol.
 authors: [dmulloy2, comphenix]
 
-main: com.comphenix.protocol.ProtocolLib
+main: com.comphenix.protocol.ProtocolLibSpigot
 load: STARTUP
 database: false
 api-version: "1.13"

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

@@ -3,7 +3,6 @@ package com.comphenix.protocol;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -21,7 +20,7 @@ import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.RegistryDataLoader;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.Bootstrap;
 import net.minecraft.server.RegistryLayer;
 import net.minecraft.server.ReloadableServerResources;
@@ -33,8 +32,6 @@ import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.server.packs.repository.ServerPacksSource;
 import net.minecraft.server.packs.resources.MultiPackResourceManager;
 import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.server.permissions.LevelBasedPermissionSet;
-import net.minecraft.server.permissions.PermissionSet;
 import net.minecraft.tags.TagKey;
 import net.minecraft.tags.TagLoader;
 import net.minecraft.world.entity.EntityType;
@@ -49,18 +46,18 @@ import org.bukkit.Keyed;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.CraftLootTable;
-import org.bukkit.craftbukkit.CraftRegistry;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.craftbukkit.inventory.CraftItemFactory;
-import org.bukkit.craftbukkit.tag.CraftBlockTag;
-import org.bukkit.craftbukkit.tag.CraftEntityTag;
-import org.bukkit.craftbukkit.tag.CraftFluidTag;
-import org.bukkit.craftbukkit.tag.CraftItemTag;
-import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-import org.bukkit.craftbukkit.util.Versioning;
+import org.bukkit.craftbukkit.v1_21_R5.CraftLootTable;
+import org.bukkit.craftbukkit.v1_21_R5.CraftRegistry;
+import org.bukkit.craftbukkit.v1_21_R5.CraftServer;
+import org.bukkit.craftbukkit.v1_21_R5.CraftWorld;
+import org.bukkit.craftbukkit.v1_21_R5.inventory.CraftItemFactory;
+import org.bukkit.craftbukkit.v1_21_R5.tag.CraftBlockTag;
+import org.bukkit.craftbukkit.v1_21_R5.tag.CraftEntityTag;
+import org.bukkit.craftbukkit.v1_21_R5.tag.CraftFluidTag;
+import org.bukkit.craftbukkit.v1_21_R5.tag.CraftItemTag;
+import org.bukkit.craftbukkit.v1_21_R5.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_21_R5.util.CraftNamespacedKey;
+import org.bukkit.craftbukkit.v1_21_R5.util.Versioning;
 import org.jetbrains.annotations.NotNull;
 import org.spigotmc.SpigotWorldConfig;
 
@@ -79,15 +76,6 @@ public class BukkitInitialization {
     private boolean initialized;
     private boolean packaged;
 
-    private static ServerLevel mockServerLevel;
-
-    /**
-     * @return the mocked NMS server level set up during initialization, usable as a Level for constructing test entities
-     */
-    public static ServerLevel getMockServerLevel() {
-        return mockServerLevel;
-    }
-
     private BukkitInitialization() {
         System.out.println("Created new BukkitInitialization on " + Thread.currentThread().getName());
     }
@@ -139,15 +127,7 @@ public class BukkitInitialization {
             List<net.minecraft.core.Registry.PendingTags<?>> tags = TagLoader.loadTagsForExistingRegistries(resourceManager, layeredAccess1.getLayer(RegistryLayer.STATIC));
             RegistryAccess.Frozen access1 = layeredAccess1.getAccessForLoading(RegistryLayer.WORLDGEN);
             List<HolderLookup.RegistryLookup<?>> list1 = TagLoader.buildUpdatedLookups(access1, tags);
-
-            RegistryAccess.Frozen access2;
-
-            try {
-                access2 = RegistryDataLoader.load(resourceManager, list1, RegistryDataLoader.WORLDGEN_REGISTRIES, Executors.newSingleThreadExecutor()).get();
-            } catch (Exception ex) {
-                throw new RuntimeException(ex);
-            }
-            
+            RegistryAccess.Frozen access2 = RegistryDataLoader.load(resourceManager, list1, RegistryDataLoader.WORLDGEN_REGISTRIES);
             LayeredRegistryAccess<RegistryLayer> layeredAccess2 = layeredAccess1.replaceFrom(RegistryLayer.WORLDGEN, access2);
             RegistryAccess.Frozen registryCustom = layeredAccess2.compositeAccess().freeze();
 
@@ -157,11 +137,11 @@ public class BukkitInitialization {
                 tags,
                 FeatureFlags.REGISTRY.allFlags() /* REGISTRY.allFlags() */,
                 Commands.CommandSelection.DEDICATED /* DEDICATED */,
-                LevelBasedPermissionSet.ALL,
+                0,
                 MoreExecutors.directExecutor(),
                 MoreExecutors.directExecutor()
             ).join();
-            dataPackResources.updateComponentsAndStaticRegistryTags();
+            dataPackResources.updateStaticRegistryTags();
 
             /* try {
                 IRegistry.class.getName();
@@ -206,7 +186,7 @@ public class BukkitInitialization {
             when(mockedServer.getTag(any(), any(), any())).then(mock -> {
                 String registry = mock.getArgument(0);
                 Class<?> clazz = mock.getArgument(2);
-                Identifier key = CraftNamespacedKey.toMinecraft(mock.getArgument(1));
+                ResourceLocation key = CraftNamespacedKey.toMinecraft(mock.getArgument(1));
 
                 switch (registry) {
                     case org.bukkit.Tag.REGISTRY_BLOCKS -> {
@@ -255,7 +235,6 @@ public class BukkitInitialization {
 
             CraftWorld world = mock(CraftWorld.class);
             when(world.getHandle()).thenReturn(nmsWorld);
-            mockServerLevel = nmsWorld;
 
             List<World> worlds = Collections.singletonList(world);
             when(mockedServer.getWorlds()).thenReturn(worlds);

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

@@ -41,7 +41,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 
-import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
 import org.apache.commons.lang.SerializationUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -104,15 +105,15 @@ import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket.AttributeSnapshot;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier.Operation;
-import net.minecraft.world.entity.animal.feline.CatVariant;
-import net.minecraft.world.entity.animal.feline.CatVariants;
+import net.minecraft.world.entity.animal.CatVariant;
+import net.minecraft.world.entity.animal.CatVariants;
 import net.minecraft.world.entity.animal.frog.FrogVariant;
 import net.minecraft.world.entity.animal.frog.FrogVariants;
 
@@ -522,14 +523,15 @@ public class PacketContainerTest {
 
         // Initialize some test data
         List<AttributeModifier> modifiers = Lists.newArrayList(
-                new AttributeModifier(Identifier.parse("protocollib:test"),10, Operation.ADD_VALUE));
+                new AttributeModifier(ResourceLocation.parse("protocollib:test"),10,
+                        Operation.ADD_VALUE));
 
         // Obtain an AttributeSnapshot instance. This is complicated by the fact that AttributeSnapshots
         // are inner classes (which is ultimately pointless because AttributeSnapshots don't access any
         // members of the packet itself)
         ClientboundUpdateAttributesPacket packet = (ClientboundUpdateAttributesPacket) attribute.getHandle();
 		net.minecraft.core.Registry<Attribute> registry = BuiltInRegistries.ATTRIBUTE;
-        Attribute base = registry.getValue(Identifier.parse("max_health"));
+        Attribute base = registry.getValue(ResourceLocation.parse("max_health"));
         AttributeSnapshot snapshot = new AttributeSnapshot(registry.wrapAsHolder(base), 20.0D, modifiers);
         attribute.getSpecificModifier(List.class).write(0, Lists.newArrayList(snapshot));
 
@@ -753,8 +755,7 @@ public class PacketContainerTest {
         assertEquals(2, (int) packet.getGameStateIDs().read(0));
     }
 
-    // @Test
-    // TODO: needs to be fixed for 26.1
+    @Test
     public void testUseEntity() {
         PacketContainer packet = new PacketContainer(PacketType.Play.Client.USE_ENTITY);
 

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

@@ -6,8 +6,8 @@ import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Field;
 
-import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_21_R5.CraftWorld;
+import org.bukkit.craftbukkit.v1_21_R5.entity.CraftEntity;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 

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

@@ -15,7 +15,7 @@ import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_21_R5.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

@@ -2,9 +2,10 @@ package com.comphenix.protocol.utility;
 
 public class MinecraftReflectionTestUtil {
 
-    public static final String RELEASE_TARGET = "26.1";
+    public static final String RELEASE_TARGET = "1.21.6";
+    public static final String PACKAGE_VERSION = "v1_21_R5";
     public static final String NMS = "net.minecraft";
-    public static final String OBC = "org.bukkit.craftbukkit";
+    public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION;
 
     public static void init() {
         MinecraftReflection.setMinecraftPackage(NMS, OBC);

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

@@ -48,7 +48,7 @@ class MinecraftVersionTest {
 
     @Test
     void testCurrent() {
-        assertEquals(MinecraftVersion.LATEST, MinecraftVersion.getCurrentVersion());
+        assertEquals(MinecraftVersion.v1_21_6, MinecraftVersion.getCurrentVersion());
     }
 
     @Test

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

@@ -9,9 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Optional;
 
-import com.comphenix.protocol.reflect.EquivalentConverter;
-import net.minecraft.world.item.ItemStackTemplate;
-import net.minecraft.world.item.Items;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.junit.jupiter.api.BeforeAll;
@@ -25,7 +22,7 @@ import net.minecraft.advancements.DisplayInfo;
 import net.minecraft.core.ClientAsset;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.contents.PlainTextContents;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 
 public class AutoWrapperTest {
 
@@ -40,7 +37,7 @@ public class AutoWrapperTest {
         display.title = WrappedChatComponent.fromText("Test123");
         display.description = WrappedChatComponent.fromText("Test567");
         display.item = new ItemStack(Material.GOLD_INGOT);
-        display.background = Optional.of(new ClientAsset.ResourceTexture(Identifier.fromNamespaceAndPath("minecraft", "test")));
+        display.background = Optional.of(new ClientAsset(ResourceLocation.fromNamespaceAndPath("minecraft", "test")));
         display.frameType = WrappedFrameType.CHALLENGE;
         display.announceChat = false;
         display.showToast = true;
@@ -58,7 +55,7 @@ public class AutoWrapperTest {
         validateRawText(nms.getTitle(), "Test123");
         validateRawText(nms.getDescription(), "Test567");
         assertSame(AdvancementType.CHALLENGE, nms.getType());
-        assertSame(getItemStackTemplateConverter().getSpecific(nms.getIcon()).getType(), Material.GOLD_INGOT);
+        assertSame(MinecraftReflection.getBukkitItemStack(nms.getIcon()).getType(), Material.GOLD_INGOT);
         assertEquals(5f, nms.getX(), 0f);
         assertEquals(67f, nms.getY(), 0f);
     }
@@ -66,10 +63,10 @@ public class AutoWrapperTest {
     @Test
     public void testFromNms() {
         DisplayInfo display = new DisplayInfo(
-              new ItemStackTemplate(Items.ENDER_EYE),
+              (net.minecraft.world.item.ItemStack)MinecraftReflection.getMinecraftItemStack(new ItemStack(Material.ENDER_EYE)),
               Component.literal("Test123"),
               Component.literal("Test567"),
-			  Optional.of(new ClientAsset.ResourceTexture(Identifier.fromNamespaceAndPath("minecraft", "test"))),
+			  Optional.of(new ClientAsset(ResourceLocation.fromNamespaceAndPath("minecraft", "test"))),
               AdvancementType.CHALLENGE,
               true,
               false,
@@ -97,7 +94,7 @@ public class AutoWrapperTest {
                 .wrap(WrappedAdvancementDisplay.class, "advancements.AdvancementDisplay", "advancements.DisplayInfo")
                 .field(0, BukkitConverters.getWrappedChatComponentConverter())
                 .field(1, BukkitConverters.getWrappedChatComponentConverter())
-                .field(2, getItemStackTemplateConverter())
+                .field(2, BukkitConverters.getItemStackConverter())
                 .field(3, Converters.optional(Converters.passthrough(ClientAsset.class)))
                 .field(4, EnumWrappers.getGenericConverter(
                     getMinecraftClass("advancements.AdvancementType", "advancements.AdvancementFrameType", "advancements.FrameType"),
@@ -116,28 +113,6 @@ public class AutoWrapperTest {
         GOAL
     }
 
-    private static EquivalentConverter<ItemStack> getItemStackTemplateConverter() {
-        return Converters.ignoreNull(new EquivalentConverter<ItemStack>() {
-
-            @Override
-            public Object getGeneric(ItemStack specific) {
-                var nmsItemStack = (net.minecraft.world.item.ItemStack) MinecraftReflection.getMinecraftItemStack(specific);
-                return ItemStackTemplate.fromNonEmptyStack(nmsItemStack);
-            }
-
-            @Override
-            public ItemStack getSpecific(Object generic) {
-                var nmsItemStack = ((ItemStackTemplate) generic).create();
-                return MinecraftReflection.getBukkitItemStack(nmsItemStack);
-            }
-
-            @Override
-            public Class<ItemStack> getSpecificType() {
-                return ItemStack.class;
-            }
-        });
-    }
-
     public static final class WrappedAdvancementDisplay {
 
         public WrappedChatComponent title;

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

@@ -26,7 +26,7 @@ public class ChunkCoordIntPairTest {
                 (net.minecraft.world.level.ChunkPos) ChunkCoordIntPair.getConverter().
                         getGeneric(specific);
 
-        assertEquals(1, roundtrip.x());
-        assertEquals(2, roundtrip.z());
+        assertEquals(1, roundtrip.x);
+        assertEquals(2, roundtrip.z);
     }
 }

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

@@ -16,8 +16,7 @@ import static org.junit.jupiter.api.Assertions.*;
 public class EnumWrappersTest {
 
     private static final Set<String> KNOWN_INVALID = Sets.newHashSet(
-            "Particle", "WorldBorderAction", "CombatEventType", "TitleAction", "ChatType", "TitleAction",
-            "ScoreboardAction", "EntityUseAction"
+            "Particle", "WorldBorderAction", "CombatEventType", "TitleAction", "ChatType", "TitleAction", "ScoreboardAction"
     );
 
     @BeforeAll

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

@@ -13,7 +13,7 @@ import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket.AttributeSnapshot;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import org.junit.jupiter.api.BeforeAll;
@@ -96,7 +96,7 @@ public class WrappedAttributeTest {
 
         Registry<Attribute> registry = BuiltInRegistries.ATTRIBUTE;
         String attributeKey = attribute.getAttributeKey();
-        Identifier key = Identifier.parse(attributeKey);
+        ResourceLocation key = ResourceLocation.parse(attributeKey);
         Attribute base = registry.getValue(key);
         Holder<Attribute> holder = registry.wrapAsHolder(base);
         return new AttributeSnapshot(holder, attribute.getBaseValue(), modifiers);
@@ -104,7 +104,7 @@ public class WrappedAttributeTest {
 
     private AttributeModifier getModifierCopy(WrappedAttributeModifier modifier) {
         AttributeModifier.Operation operation = AttributeModifier.Operation.values()[modifier.getOperation().getId()];
-        return new AttributeModifier((Identifier) com.comphenix.protocol.wrappers.MinecraftKey.getConverter().getGeneric(modifier.getKey()),
+        return new AttributeModifier((ResourceLocation) com.comphenix.protocol.wrappers.MinecraftKey.getConverter().getGeneric(modifier.getKey()),
             modifier.getAmount(), operation);
     }
 }

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

@@ -20,9 +20,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.type.GlassPane;
-import org.bukkit.craftbukkit.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.block.impl.CraftStainedGlassPane;
-import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.v1_21_R5.block.impl.CraftStainedGlassPane;
+import org.bukkit.craftbukkit.v1_21_R5.util.CraftMagicNumbers;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 

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

@@ -3,6 +3,7 @@ package com.comphenix.protocol.wrappers;
 import com.comphenix.protocol.BukkitInitialization;
 
 import com.google.gson.JsonElement;
+import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -24,13 +25,15 @@ public class WrappedComponentStyleTest {
         net.minecraft.network.chat.Style style = net.minecraft.network.chat.Style.EMPTY.withColor(ChatFormatting.RED).withBold(true);
         WrappedComponentStyle wrapped = new WrappedComponentStyle(style);
         JsonElement json = wrapped.getJson();
-        assertEquals("{\"color\":\"red\",\"bold\":true}", json.toString());
+        assertEquals("{\"bold\":true,\"color\":\"red\"}", json.toString());
         assertEquals(style, WrappedComponentStyle.fromJson(json).getHandle());
     }
 
     @Test
     public void testStyleAdventureConversion() {
-        Style adventureStyle = Style.style(NamedTextColor.GREEN, TextDecoration.BOLD);
+        Style adventureStyle = Style.style(NamedTextColor.GREEN, TextDecoration.BOLD)
+            .clickEvent(ClickEvent.changePage(10));
+
         WrappedComponentStyle wrapped = AdventureComponentConverter.fromStyle(adventureStyle);
         assertEquals(adventureStyle, AdventureComponentConverter.fromWrapper(wrapped));
     }

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

@@ -0,0 +1,26 @@
+package com.comphenix.protocol.wrappers;
+
+import java.util.Map;
+
+import com.comphenix.protocol.BukkitInitialization;
+
+import org.bukkit.Material;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+public class WrappedDataComponentHolderTest {
+
+    @BeforeAll
+    public static void beforeAll() {
+        BukkitInitialization.initializeAll();
+    }
+
+    @Test
+    public void testFromItemStack() {
+        WrappedDataComponentHolder holder = WrappedDataComponentHolder.fromItemStack(new org.bukkit.inventory.ItemStack(Material.DIAMOND_SWORD));
+        Map<String, WrappedDataComponent> components = holder.getAllComponents();
+        assertFalse(components.isEmpty(), "Components should not be empty");
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.comphenix.protocol.wrappers;
+
+import java.util.Map;
+
+import com.comphenix.protocol.BukkitInitialization;
+
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class WrappedDataComponentTest {
+
+    @BeforeAll
+    public static void beforeAll() {
+        BukkitInitialization.initializeAll();
+    }
+
+    @Test
+    public void testShallowClone() {
+        WrappedDataComponentHolder holder = new WrappedDataComponentHolder(new ItemStack(Items.DIAMOND_AXE));
+        Map<String, WrappedDataComponent> components = holder.getAllComponents();
+        assertFalse(components.isEmpty(), "Components should not be empty");
+
+        for (WrappedDataComponent component : components.values()) {
+            WrappedDataComponent clone = component.shallowClone();
+            assertNotSame(component, clone, "Clone should not be the same instance");
+            assertEquals(component, clone, "Clone should be equal to the original component");
+            assertTrue(component.getValue().equals(clone.getValue()), "Clone value should match original");
+        }
+    }
+
+    @Test
+    public void testDeepCloneWithPrimitive() {
+        WrappedDataComponent component = WrappedDataComponent.create("minecraft:damage", 10);
+        WrappedDataComponent clone = component.deepClone();
+        assertNotSame(component, clone, "Clone should not be the same instance");
+        assertEquals(component, clone, "Clone should be equal to the original component");
+        assertEquals(10, (int)clone.getValue(), "Clone value should match original");
+    }
+
+    @Test
+    public void testDeepCloneWithEnum() {
+        WrappedDataComponent component = WrappedDataComponent.create("minecraft:item_model", Items.DIAMOND_SHOVEL);
+        WrappedDataComponent clone = component.deepClone();
+        assertNotSame(component, clone, "Clone should not be the same instance");
+        assertEquals(component, clone, "Clone should be equal to the original component");
+        assertEquals(Items.DIAMOND_SHOVEL, clone.getValue(), "Clone value should match original");
+    }
+}

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

@@ -25,10 +25,10 @@ import com.comphenix.protocol.wrappers.nbt.NbtBase;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
 
-import net.minecraft.world.entity.projectile.throwableitemprojectile.ThrownEgg;
+import net.minecraft.world.entity.projectile.ThrownEgg;
 import org.bukkit.Material;
 import org.bukkit.Particle;
-import org.bukkit.craftbukkit.entity.CraftEgg;
+import org.bukkit.craftbukkit.v1_21_R5.entity.CraftEgg;
 import org.bukkit.entity.Entity;
 import org.bukkit.inventory.ItemStack;
 import org.junit.jupiter.api.BeforeAll;
@@ -46,7 +46,7 @@ public class WrappedDataWatcherTest {
     public static void prepare() {
         BukkitInitialization.initializeAll();
 
-        ThrownEgg nmsEgg = new ThrownEgg(BukkitInitialization.getMockServerLevel(), 0, 0, 0, net.minecraft.world.item.ItemStack.EMPTY);
+        ThrownEgg nmsEgg = new ThrownEgg(null, 0, 0, 0, net.minecraft.world.item.ItemStack.EMPTY);
         mockEntity = new CraftEgg(null, nmsEgg);
     }
 
@@ -201,8 +201,7 @@ public class WrappedDataWatcherTest {
         assertEquals(Particle.CAMPFIRE_COSY_SMOKE, ((WrappedParticle) wdvs.get(5).getValue()).getParticle());
     }
 
-    // @Test
-    // TODO: CompoundTag has been removed as a data watcher type (replaced with data components)
+    @Test
     public void testNBT() {
         WrappedDataWatcher watcher = new WrappedDataWatcher();
 

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

@@ -5,7 +5,6 @@ import java.util.UUID;
 
 import com.comphenix.protocol.BukkitInitialization;
 
-import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Multimap;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
@@ -28,8 +27,8 @@ public class WrappedGameProfileTest {
                 "ProtocolLib");
         WrappedGameProfile wrapper = WrappedGameProfile.fromHandle(profile);
 
-        assertEquals(profile.id(), wrapper.getUUID());
-        assertEquals(profile.name(), wrapper.getName());
+        assertEquals(profile.getId(), wrapper.getUUID());
+        assertEquals(profile.getName(), wrapper.getName());
     }
 
     @Test
@@ -49,18 +48,18 @@ public class WrappedGameProfileTest {
 
     @Test
     void testGetProperties() {
+        GameProfile profile = new GameProfile(UUID.nameUUIDFromBytes("ProtocolLib".getBytes(StandardCharsets.UTF_8)),
+                "ProtocolLib");
+
         String name = "test";
         String value = "test";
         String signature = null;
 
-        Multimap<String, Property> properties = ImmutableListMultimap.of(name, new Property(name, value));
-
-        GameProfile profile = new GameProfile(UUID.nameUUIDFromBytes("ProtocolLib".getBytes(StandardCharsets.UTF_8)),
-                "ProtocolLib", new PropertyMap(properties));
+        profile.getProperties().put(name, new Property(name, value, signature));
 
         WrappedGameProfile wrapper = WrappedGameProfile.fromHandle(profile);
-        Multimap<String, WrappedSignedProperty> wrappedProperties = wrapper.getProperties();
-        WrappedSignedProperty property = wrappedProperties.get(name).iterator().next();
+        Multimap<String, WrappedSignedProperty> properties = wrapper.getProperties();
+        WrappedSignedProperty property = properties.get(name).iterator().next();
 
         assertEquals(property.getName(), name);
         assertEquals(property.getValue(), value);
@@ -78,7 +77,7 @@ public class WrappedGameProfileTest {
         wrapper.getProperties().put(name, new WrappedSignedProperty(name, value, signature));
 
         GameProfile profile = (GameProfile) wrapper.getHandle();
-        PropertyMap properties = profile.properties();
+        PropertyMap properties = profile.getProperties();
         Property property = properties.get(name).iterator().next();
 
         assertEquals(property.name(), name);

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

@@ -37,8 +37,7 @@ public class WrappedParticleTest {
         assertEquals(before.getData(), after.getData());
     }
 
-    // @Test
-    // TODO: changed to ItemStackTemplate
+    @Test
     public void testItemStacks() {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.WORLD_PARTICLES);
         WrappedParticle before = WrappedParticle.create(Particle.ITEM, new ItemStack(Material.FLINT_AND_STEEL));

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

@@ -1,120 +0,0 @@
-package com.comphenix.protocol.wrappers;
-
-import com.comphenix.protocol.BukkitInitialization;
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.events.PacketContainer;
-
-import net.minecraft.world.entity.PositionMoveRotation;
-import net.minecraft.world.phys.Vec3;
-import org.bukkit.util.Vector;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class WrappedPositionMoveRotationTest {
-
-    @BeforeAll
-    public static void beforeClass() {
-        BukkitInitialization.initializeAll();
-    }
-
-    @Test
-    public void testCreateAndRead() {
-        Vector position = new Vector(1.5, 64.0, -3.5);
-        Vector delta = new Vector(0.1, -0.05, 0.2);
-        float yRot = 45.0f;
-        float xRot = -10.0f;
-
-        WrappedPositionMoveRotation created = WrappedPositionMoveRotation.create(position, delta, yRot, xRot);
-
-        assertEquals(position.getX(), created.getPosition().getX(), 1e-6);
-        assertEquals(position.getY(), created.getPosition().getY(), 1e-6);
-        assertEquals(position.getZ(), created.getPosition().getZ(), 1e-6);
-
-        assertEquals(delta.getX(), created.getDeltaMovement().getX(), 1e-6);
-        assertEquals(delta.getY(), created.getDeltaMovement().getY(), 1e-6);
-        assertEquals(delta.getZ(), created.getDeltaMovement().getZ(), 1e-6);
-
-        assertEquals(yRot, created.getYRot(), 1e-6f);
-        assertEquals(xRot, created.getXRot(), 1e-6f);
-    }
-
-    @Test
-    public void testEntityPositionSyncPacket() {
-        PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_POSITION_SYNC);
-
-        Vector position = new Vector(10.0, 70.0, -5.0);
-        Vector delta = new Vector(0.0, 0.0, 0.0);
-        float yRot = 90.0f;
-        float xRot = 0.0f;
-
-        packet.getPositionMoveRotation().write(0,
-                WrappedPositionMoveRotation.create(position, delta, yRot, xRot));
-
-        WrappedPositionMoveRotation result = packet.getPositionMoveRotation().read(0);
-
-        assertNotNull(result);
-
-        assertEquals(position.getX(), result.getPosition().getX(), 1e-6);
-        assertEquals(position.getY(), result.getPosition().getY(), 1e-6);
-        assertEquals(position.getZ(), result.getPosition().getZ(), 1e-6);
-
-        assertEquals(delta.getX(), result.getDeltaMovement().getX(), 1e-6);
-        assertEquals(delta.getY(), result.getDeltaMovement().getY(), 1e-6);
-        assertEquals(delta.getZ(), result.getDeltaMovement().getZ(), 1e-6);
-
-        assertEquals(yRot, result.getYRot(), 1e-6f);
-        assertEquals(xRot, result.getXRot(), 1e-6f);
-    }
-
-    @Test
-    public void testEntityTeleportPacket() {
-        PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_TELEPORT);
-
-        Vector position = new Vector(-100.5, 200.0, 300.75);
-        Vector delta = new Vector(0.0, 0.0, 0.0);
-        float yRot = 180.0f;
-        float xRot = 30.0f;
-
-        packet.getPositionMoveRotation().write(0,
-                WrappedPositionMoveRotation.create(position, delta, yRot, xRot));
-
-        WrappedPositionMoveRotation result = packet.getPositionMoveRotation().read(0);
-
-        assertNotNull(result);
-
-        assertEquals(position.getX(), result.getPosition().getX(), 1e-6);
-        assertEquals(position.getY(), result.getPosition().getY(), 1e-6);
-        assertEquals(position.getZ(), result.getPosition().getZ(), 1e-6);
-
-        assertEquals(delta.getX(), result.getDeltaMovement().getX(), 1e-6);
-        assertEquals(delta.getY(), result.getDeltaMovement().getY(), 1e-6);
-        assertEquals(delta.getZ(), result.getDeltaMovement().getZ(), 1e-6);
-
-        assertEquals(yRot, result.getYRot(), 1e-6f);
-        assertEquals(xRot, result.getXRot(), 1e-6f);
-    }
-
-    @Test
-    public void testFromHandle() {
-        PositionMoveRotation nmsHandle = new PositionMoveRotation(
-                new Vec3(5.0, 65.0, 5.0),
-                new Vec3(0.0, -0.1, 0.0),
-                270.0f,
-                -45.0f);
-
-        WrappedPositionMoveRotation wrapper = WrappedPositionMoveRotation.fromHandle(nmsHandle);
-
-        assertEquals(5.0,   wrapper.getPosition().getX(), 1e-6);
-        assertEquals(65.0,  wrapper.getPosition().getY(), 1e-6);
-        assertEquals(5.0,   wrapper.getPosition().getZ(), 1e-6);
-
-        assertEquals(0.0,  wrapper.getDeltaMovement().getX(), 1e-6);
-        assertEquals(-0.1, wrapper.getDeltaMovement().getY(), 1e-6);
-        assertEquals(0.0,  wrapper.getDeltaMovement().getZ(), 1e-6);
-
-        assertEquals(270.0f, wrapper.getYRot(), 1e-6f);
-        assertEquals(-45.0f, wrapper.getXRot(), 1e-6f);
-    }
-}

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

@@ -1,10 +1,7 @@
 package com.comphenix.protocol.wrappers;
 
 import java.io.IOException;
-import java.util.Base64;
-import java.util.List;
 import java.util.Optional;
-import java.util.UUID;
 
 import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.PacketType;
@@ -14,13 +11,10 @@ import com.comphenix.protocol.wrappers.WrappedServerPing.CompressedImage;
 
 import com.google.common.io.Resources;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
-import net.minecraft.network.protocol.status.ServerStatus;
-import net.minecraft.server.players.NameAndId;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -79,29 +73,10 @@ public class WrappedServerPingTest {
 
         assertArrayEquals(original, roundTrip.getFavicon().getData());
 
-        CompressedImage copy = CompressedImage.fromBase64Png(Base64.getEncoder().encodeToString(tux.getData()));
+        CompressedImage copy = CompressedImage.fromBase64Png(Base64Coder.encodeLines(tux.getData()));
         assertArrayEquals(copy.getData(), roundTrip.getFavicon().getData());
     }
 
-    @Test
-    public void testGetPlayers() {
-        ClientboundStatusResponsePacket packet = new ClientboundStatusResponsePacket(new ServerStatus(
-                Component.literal("A Minecraft Server"),
-                Optional.of(new ServerStatus.Players(2, 2, List.of(
-                        new NameAndId(UUID.randomUUID(), "Player1"),
-                        new NameAndId(UUID.randomUUID(), "Player2")
-                ))),
-                Optional.empty(),
-                Optional.empty(),
-                false
-        ));
-
-        PacketContainer container = PacketContainer.fromPacket(packet);
-
-        WrappedServerPing wrappedServerStatus = container.getServerPings().read(0);
-        assertEquals(2, wrappedServerStatus.getPlayers().size());
-    }
-
     @Test
     public void testDefaultData() {
         PacketContainer packet = new PacketContainer(PacketType.Status.Server.SERVER_INFO);

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

@@ -10,8 +10,8 @@ import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.network.protocol.game.ClientboundOpenBookPacket;
 import net.minecraft.world.InteractionHand;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.CraftRegistry;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_21_R5.CraftRegistry;
+import org.bukkit.craftbukkit.v1_21_R5.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

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

@@ -5,16 +5,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import java.util.Optional;
-
 import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.wrappers.EnumWrappers.TeamCollisionRule;
 import com.comphenix.protocol.wrappers.EnumWrappers.TeamVisibility;
 
+import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket;
 import net.minecraft.world.scores.Team;
-import net.minecraft.world.scores.TeamColor;
 
 public class WrappedTeamParametersTest {
     @BeforeAll
@@ -49,12 +47,12 @@ public class WrappedTeamParametersTest {
         assertEquals(1, wrapped.getOptions());
 
         ClientboundSetPlayerTeamPacket.Parameters handle = (ClientboundSetPlayerTeamPacket.Parameters) wrapped.getHandle();
-        assertEquals(handle.displayName(), displayName);
-        assertEquals(handle.playerPrefix(), prefix);
-        assertEquals(handle.playerSuffix(), suffix);
-        assertEquals(handle.nameTagVisibility(), Team.Visibility.ALWAYS);
-        assertEquals(handle.collisionRule(), Team.CollisionRule.NEVER);
-        assertEquals(handle.color(), Optional.of(TeamColor.RED));
-        assertEquals(handle.options(), 1);
+        assertEquals(handle.getDisplayName(), displayName);
+        assertEquals(handle.getPlayerPrefix(), prefix);
+        assertEquals(handle.getPlayerSuffix(), suffix);
+        assertEquals(handle.getNametagVisibility(), Team.Visibility.ALWAYS);
+        assertEquals(handle.getCollisionRule(), Team.CollisionRule.NEVER);
+        assertEquals(handle.getColor(), ChatFormatting.RED);
+        assertEquals(handle.getOptions(), 1);
     }
 }