Working on loading API improvements for Spigot.

.github/FUNDING.yml

@@ -1,3 +1,5 @@
 # These are supported funding model platforms
 
-github: [retrooper]
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: retrooper
+custom: ['https://paypal.me/retrooperdev']

.github/workflows/gradle-publish.yml

@@ -8,63 +8,47 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+      packages: write
 
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '8'
           distribution: 'adopt'
-          cache: 'gradle'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
 
       - name: Build with Gradle
-        run: chmod +x gradlew && ./gradlew build
+        run: gradle shadowJar
 
       - name: Upload build artifacts api
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v1
         with:
           name: api-build
           path: api/build/libs
 
       - name: Upload build artifacts spigot
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v1
         with:
           name: spigot-build
           path: spigot/build/libs
 
       - name: Upload build artifacts netty-common
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v1
         with:
           name: netty-common-build
           path: netty-common/build/libs
 
       - name: Upload build artifacts bungeecord
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v1
         with:
           name: bungeecord-build
           path: bungeecord/build/libs
 
       - name: Upload build artifacts velocity
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v1
         with:
           name: velocity-build
-          path: velocity/build/libs
-
-      - name: Upload build artifacts fabric
-        uses: actions/upload-artifact@v4
-        with:
-          name: fabric-build
-          path: fabric/build/libs
-
-      - name: Upload build artifacts sponge
-        uses: actions/upload-artifact@v4
-        with:
-          name: sponge-build
-          path: sponge/build/libs
+          path: velocity/build/libs

.gitignore

@@ -102,7 +102,6 @@ $RECYCLE.BIN/
 
 .gradle
 build/
-bin/
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -119,7 +118,3 @@ run/
 !gradle-wrapper.jar
 /src/main/resources/plugin.yml
 /.idea/
-.vscode/
-.project
-.settings/
-.classpath

README.md

@@ -1,42 +1,37 @@
-<!--suppress HtmlDeprecatedAttribute -->
-<div align="center">
-    <h2><i>packetevents</i></h2>
-    <h3><i>Precision meets performance—a powerful tool for mastering Minecraft packet manipulation with speed and finesse.</i></h3>
-    <a href="https://github.com/retrooper/packetevents/actions"><img src="https://img.shields.io/github/actions/workflow/status/retrooper/packetevents/gradle-publish.yml?style=for-the-badge&logo=github"></a>
-    <a href="https://discord.gg/DVHxPPxHZc"><img src="https://img.shields.io/discord/721686193061888071?color=5562e9&logo=discord&logoColor=white&style=for-the-badge"></a>
-    <img src="https://img.shields.io/github/license/retrooper/packetevents?style=for-the-badge&logo=github">
-    <a href="https://bstats.org/plugin/bukkit/packetevents/11327"><img src="https://img.shields.io/bstats/servers/11327?style=for-the-badge"></a>
-    <a href="https://github.com/retrooper/packetevents/releases"><img src="https://img.shields.io/github/downloads/retrooper/packetevents/total.svg?style=for-the-badge&logo=github"></a>
-</div>
-<h3>Resources</h3>
+# packetevents
 
-- [Read documentation](https://docs.packetevents.com/)
-    - [Getting Started](https://docs.packetevents.com/getting-started)
-    - [JavaDocs](https://javadocs.packetevents.com)
-- [Releases](https://github.com/retrooper/packetevents/releases/)
-    - [GitHub](https://github.com/retrooper/packetevents/releases/)
-    - [Modrinth](https://modrinth.com/plugin/packetevents)
-    - [SpigotMC](https://www.spigotmc.org/resources/packetevents-api.80279/)
-- [Development Builds](https://ci.codemc.io/job/retrooper/job/packetevents)
-- [Statistics](https://bstats.org/plugin/bukkit/packetevents/11327)
+[![](https://jitpack.io/v/retrooper/packetevents.svg)](https://jitpack.io/#retrooper/packetevents)
 
-<h3>Sponsors</h3>
+PacketEvents is a powerful packet library. Our packet wrappers are efficient and easy to use. With our API, you can write code that runs on many platforms including Spigot, BungeeCord, Velocity, and even client-sided Fabric! Switch to PacketEvents today by joining \
+our [Discord Server](https://discord.me/packetevents) for help.
 
-<i>Thanks to the following sponsors for supporting this project:</i>
+### Links
+* [Find release builds on SpigotMC](https://www.spigotmc.org/resources/packetevents-api.80279/)
+* [View documentation on our JavaDocs Page](https://packetevents.github.io/javadocs)
+### Setup
+[Learn more](https://github.com/retrooper/packetevents/wiki/Setup-2.0)
 
-<a href="https://pebblehost.com"><img src="https://pebblehost.com/src/img/logos/main-old.png" width=150><br>
+### Sponsorships
+[![](https://www.ej-technologies.com/images/product_banners/jprofiler_small.png)](https://www.ej-technologies.com/products/jprofiler/overview.html)
 
-<a href="https://www.ej-technologies.com"><img src="https://www.ej-technologies.com/images/product_banners/jprofiler_small.png"><br>
+### Statistics
+PacketEvents optionally collects statistics using [bStats](https://bstats.org/)\
+Check out our [bStats page](https://bstats.org/plugin/bukkit/packetevents/11327)
 
-<a href="https://github.com/radstevee"><img src="https://github.com/radstevee.png" width="50px" alt="radstevee"/></a><br>
+This library is licensed under the GPLv3 (General Public License version 3). Here are a few sources to learn more about the license.\
+[![](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](https://github.com/retrooper/packetevents/blob/2.0/LICENSE)
+### GPL Resources
+* https://www.gnu.org/philosophy/free-sw.html
+* https://www.gnu.org/philosophy/free-sw.html#clarifying
+* https://www.gnu.org/licenses/copyleft.en.html
+* https://www.gnu.org/licenses/quick-guide-gplv3.html
+* https://gpl-violations.org/faq/sourcecode-faq/
 
-<h3>Credits</h3>
-
-<i>Here are some projects that we are heavily inspired by, thus we have integrated</i>\
-<i>small portions of their code into our work.</i>
-
-[Protocol Documentation for the Minecraft Java Edition](https://wiki.vg/Protocol)\
+### Credit to these projects
+[wiki.vg/Protocol](https://wiki.vg/Protocol)\
+[netty](https://github.com/netty/netty)\
+[gson](https://github.com/google/gson)\
+[adventure](https://github.com/KyoriPowered/adventure)\
 [ViaVersion](https://github.com/ViaVersion/ViaVersion)\
 [ProtocolSupport](https://github.com/ProtocolSupport/ProtocolSupport)\
-[adventure](https://github.com/KyoriPowered/adventure)\
 [MCProtocolLib](https://github.com/GeyserMC/MCProtocolLib/)  

api/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    compileOnly(adventureDependencies)
+}

api/build.gradle.kts

@@ -1,159 +0,0 @@
-import com.github.retrooper.compression.strategy.JsonArrayCompressionStrategy
-import com.github.retrooper.compression.strategy.JsonObjectCompressionStrategy
-import com.github.retrooper.compression.strategy.JsonToNbtStrategy
-import com.github.retrooper.excludeAdventure
-
-plugins {
-    packetevents.`shadow-conventions`
-    packetevents.`library-conventions`
-    `mapping-compression`
-    `pe-version`
-}
-
-// papermc repo + disableAutoTargetJvm needed for mockbukkit
-repositories {
-    maven("https://repo.papermc.io/repository/maven-public/")
-}
-
-java {
-    withJavadocJar()
-}
-
-dependencies {
-    compileOnlyApi(libs.bundles.adventure)
-    compileOnlyApi(libs.bundles.adventure.serializers)
-    implementation(libs.adventure.api)
-    api(project(":patch:adventure-text-serializer-gson", "shadow")) {
-        excludeAdventure()
-    }
-    api(libs.adventure.text.serializer.legacy) {
-        excludeAdventure()
-    }
-    compileOnly(libs.gson)
-
-    testImplementation(libs.bundles.adventure)
-    testImplementation(project(":patch:adventure-text-serializer-gson"))
-    testImplementation(libs.adventure.text.serializer.legacy)
-    testImplementation(project(":netty-common"))
-    testImplementation(testlibs.mockbukkit)
-    testImplementation(testlibs.slf4j)
-    testImplementation(testlibs.bundles.junit)
-    testImplementation(libs.netty)
-}
-
-mappingCompression {
-    mappingDirectory = rootDir.resolve("mappings")
-    outDirectory = project.layout.buildDirectory.dir("mappings/generated/assets/mappings")
-
-    with<JsonToNbtStrategy> {
-        compress("block/legacy_block_mappings.json")
-        compress("block/modern_block_mappings.json")
-
-        compress("enchantment/enchantment_type_data.json")
-
-        compress("item/item_base_components.json")
-
-        compress("stats/statistics.json")
-
-        compress("world/biome_data.json")
-    }
-
-    with<JsonArrayCompressionStrategy> {
-        compress("attribute/attribute_mappings.json")
-
-        compress("block/block_entity_type_mappings.json")
-        compress("block/block_type_mappings.json")
-
-        compress("chat/chat_type_mappings.json")
-
-        compress("command/argument_parser_mappings.json")
-
-        compress("damage/damagetype_mappings.json")
-
-        compress("enchantment/effect_component_type.json")
-
-        compress("entity/entity_data_type_mappings.json")
-        compress("entity/painting_mappings.json")
-        compress("entity/wolf_variant_mappings.json")
-
-        compress("item/consume_effect_type_mappings.json")
-        compress("item/item_armor_material_mappings.json")
-        compress("item/item_banner_pattern_mappings.json")
-        compress("item/item_component_mappings.json")
-        compress("item/item_instrument_mappings.json")
-        compress("item/item_jukebox_song_mappings.json")
-        compress("item/item_map_decoration_type_mappings.json")
-        compress("item/item_potion_mappings.json")
-        compress("item/item_trim_material_mappings.json")
-        compress("item/item_trim_pattern_mappings.json")
-        compress("item/recipe_book_category.json")
-        compress("item/recipe_display_types.json")
-        compress("item/recipe_serializer_mappings.json")
-        compress("item/recipe_slot_display_types.json")
-
-        compress("particle/particle_type_mappings.json")
-
-        compress("sound/sound_mappings.json")
-
-        compress("world/biome_mappings.json")
-        compress("world/world_position_source_mappings.json")
-    }
-
-    with<JsonObjectCompressionStrategy> {
-        compress("enchantment/enchantment_type_mappings.json")
-
-        compress("entity/entity_effect_mappings.json")
-        compress("entity/entity_type_mappings.json")
-        compress("entity/legacy_entity_type_mappings.json")
-
-        compress("item/item_type_mappings.json")
-
-        compress("world/dimension_type_mappings.json")
-    }
-}
-
-tasks {
-    assemble {
-        setDependsOn(dependsOn.filterNot { it == "shadowNoAdventure" })
-    }
-
-    javadoc {
-        mustRunAfter(generateVersionsFile)
-    }
-
-    sourcesJar {
-        mustRunAfter(generateVersionsFile)
-    }
-
-    withType<JavaCompile> {
-        dependsOn(generateVersionsFile)
-    }
-
-    processResources {
-        dependsOn(compressMappings)
-        from(project.layout.buildDirectory.dir("mappings/generated").get())
-    }
-
-    generateVersionsFile {
-        packageName = "com.github.retrooper.packetevents.util"
-    }
-
-    test {
-        useJUnitPlatform()
-    }
-
-    shadowJar {
-        exclude {
-            val path = it.path
-            path.startsWith("net/kyori") && !path.startsWith("net/kyori/adventure/text/serializer") && !path.startsWith("net/kyori/option")
-        }
-    }
-}
-
-publishing {
-    publications {
-        named<MavenPublication>("shadow") {
-            artifact(tasks["javadocJar"])
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/PacketEvents.java

@@ -18,15 +18,20 @@
 
 package com.github.retrooper.packetevents;
 
-import org.jetbrains.annotations.ApiStatus;
+import com.github.retrooper.packetevents.injector.ChannelInjector;
+import com.github.retrooper.packetevents.manager.player.PlayerManager;
+import com.github.retrooper.packetevents.manager.protocol.ProtocolManager;
+import com.github.retrooper.packetevents.manager.server.ServerManager;
+import com.github.retrooper.packetevents.netty.NettyManager;
+import com.github.retrooper.packetevents.settings.PacketEventsSettings;
+import com.github.retrooper.packetevents.util.LogManager;
 
 public final class PacketEvents {
     private static PacketEventsAPI<?> API;
 
     //Put these variable names anywhere else, they are really only for the injectors
-    @ApiStatus.Internal
     public static String IDENTIFIER, ENCODER_NAME, DECODER_NAME, CONNECTION_HANDLER_NAME, SERVER_CHANNEL_HANDLER_NAME,
-    TIMEOUT_HANDLER_NAME;
+            TIMEOUT_HANDLER_NAME;
 
     public static PacketEventsAPI<?> getAPI() {
         return API;
@@ -35,4 +40,87 @@ public final class PacketEvents {
     public static void setAPI(PacketEventsAPI<?> api) {
         API = api;
     }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public abstract static class Context<T> {
+        private final Object pluginInstance;
+        private final ProtocolManager protocolManager;
+        private final ServerManager serverManager;
+        private final PlayerManager playerManager;
+        private final NettyManager nettyManager;
+        private final ChannelInjector injector;
+        private final LogManager logManager;
+        protected boolean lateBind = false;
+
+        public Context(Object pluginInstance, ProtocolManager protocolManager, ServerManager serverManager, PlayerManager playerManager,
+                       NettyManager nettyManager, ChannelInjector injector, LogManager logManager) {
+            this.pluginInstance = pluginInstance;
+            this.protocolManager = protocolManager;
+            this.serverManager = serverManager;
+            this.playerManager = playerManager;
+            this.nettyManager = nettyManager;
+            this.injector = injector;
+            this.logManager = logManager;
+        }
+
+        protected abstract PacketEventsAPI<T> build();
+
+        public Object getPluginInstance() {
+            return pluginInstance;
+        }
+
+        public ProtocolManager getProtocolManager() {
+            return protocolManager;
+        }
+
+        public ServerManager getServerManager() {
+            return serverManager;
+        }
+
+        public PlayerManager getPlayerManager() {
+            return playerManager;
+        }
+
+        public NettyManager getNettyManager() {
+            return nettyManager;
+        }
+
+        public ChannelInjector getInjector() {
+            return injector;
+        }
+
+        public LogManager getLogManager() {
+            return logManager;
+        }
+    }
+
+    public static class Builder {
+        private Context<?> context = null;
+        private PacketEventsSettings settings = new PacketEventsSettings();
+        public Builder context(Context<?> context) {
+            this.context = context;
+            return this;
+        }
+
+        public Builder settings(PacketEventsSettings settings) {
+            this.settings = settings;
+            return this;
+        }
+
+        public PacketEventsAPI<?> build() {
+            if (context == null) {
+                throw new IllegalStateException("Failed to build a PacketEvents instance. Please specify a PacketEvents context in the PacketEvents builder to allow PacketEvents to load the correct implementation.");
+            }
+            PacketEventsAPI<?> api = context.build();
+            api.setSettings(settings);
+            //The implementation may have already set the API.
+            if (getAPI() == null) {
+                setAPI(api);
+            }
+            return api;
+        }
+    }
 }

api/src/main/java/com/github/retrooper/packetevents/PacketEventsAPI.java

@@ -27,34 +27,37 @@ import com.github.retrooper.packetevents.netty.NettyManager;
 import com.github.retrooper.packetevents.settings.PacketEventsSettings;
 import com.github.retrooper.packetevents.util.LogManager;
 import com.github.retrooper.packetevents.util.PEVersion;
-//Note: The PEVersions class is generated. Refer to PEVersionTask.kt
-import com.github.retrooper.packetevents.util.PEVersions;
 import com.github.retrooper.packetevents.util.updatechecker.UpdateChecker;
 
 import java.util.logging.Logger;
 
 public abstract class PacketEventsAPI<T> {
-    private final EventManager eventManager = new EventManager();
-    private final PacketEventsSettings settings = new PacketEventsSettings();
-    private final UpdateChecker updateChecker = new UpdateChecker();
-    private final LogManager logManager = new LogManager();
-    private static final Logger LOGGER = Logger.getLogger(PacketEventsAPI.class.getName());
-
+    private static final EventManager EVENT_MANAGER = new EventManager();
+    private static final UpdateChecker UPDATE_CHECKER = new UpdateChecker();
+    private static final LogManager LOG_MANAGER = new LogManager();
+    private final Logger LOGGER = Logger.getLogger(PacketEventsAPI.class.getName());
+    private PacketEventsSettings settings = new PacketEventsSettings();
+    //TODO UPDATE
+    private static final PEVersion VERSION = new PEVersion(2, 0, 0);
+    
     public EventManager getEventManager() {
-        return eventManager;
+        return EVENT_MANAGER;
     }
 
     public PacketEventsSettings getSettings() {
         return settings;
     }
 
+    public void setSettings(PacketEventsSettings settings) {
+        this.settings = settings;
+    }
+
     public UpdateChecker getUpdateChecker() {
-        return updateChecker;
+        return UPDATE_CHECKER;
     }
 
     public PEVersion getVersion() {
-        //Note: The PEVersions class is generated by the auto-version task. Refer to PEVersionTask.kt
-        return PEVersions.CURRENT;
+        return VERSION;
     }
 
     public Logger getLogger() {
@@ -62,7 +65,7 @@ public abstract class PacketEventsAPI<T> {
     }
 
     public LogManager getLogManager() {
-        return logManager;
+        return LOG_MANAGER;
     }
 
     public abstract void load();
@@ -75,8 +78,6 @@ public abstract class PacketEventsAPI<T> {
 
     public abstract void terminate();
 
-    public abstract boolean isTerminated();
-
     public abstract T getPlugin();
 
     public abstract ServerManager getServerManager();

api/src/main/java/com/github/retrooper/packetevents/event/EventManager.java

@@ -19,40 +19,15 @@
 package com.github.retrooper.packetevents.event;
 
 import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.exception.InvalidHandshakeException;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.logging.Level;
 
-/**
- * Class for event managing. Implements both, internal and API methods.
- *
- * @apiNote It is highly recommended to register the event listeners at server start-up,
- * without frequent modifications during runtime, since this class needs to recalculate all of
- * its event listeners during any modifications. In other words, it assumes that reads (events fired)
- * greatly outnumber writes (listeners modifications). If your case requires frequent listener modifications,
- * open a pull request on GitHub and describe your case.
- *
- * @author retrooper
- * @author ShadowOfHeaven (optimization)
- *
- */
-
 public class EventManager {
-
-    //Using a ConcurrentHashMap is faster and more secure here, compared to Collections.synchronizedMap(new EnumMap<>(PacketListenerPriority.class))
-    //This is mainly due to:
-    //1. On each modification Collections.synchronizedMap synchronizes the whole Map object, while ConcurrentHashMap only it's internal, currently modified Node
-    //2. ConcurrentHashMap won't fail in a multi-thread environment, while Collections.synchronizedMap is said to have a lot of potential problems,
-    //being a generalized method for synchronization
-    private final Map<PacketListenerPriority, Set<PacketListenerCommon>> listenersMap = new ConcurrentHashMap<>();
-    //Since reads greatly outnumber writes, create an array for the best possible iteration time
-    //Updated as a whole on writes, no index modifications are allowed
-    private volatile PacketListenerCommon[] listeners = new PacketListenerCommon[0];
-
+    private final Map<Byte, HashSet<PacketListenerCommon>> listenersMap = new ConcurrentHashMap<>();
 
     /**
      * Call the PacketEvent.
@@ -67,43 +42,28 @@ public class EventManager {
         callEvent(event, null);
     }
 
-
-    /**
-     * Call the PacketEvent.
-     * This method processes the event on all the registered dynamic packet event listeners.
-     * The {@link PacketListenerPriority#LOWEST} prioritized listeners will be processing first,
-     * the {@link PacketListenerPriority#MONITOR} will be processing last and can
-     * be the final decider whether the event has been cancelled or not.
-     *
-     * @param event                  {@link PacketEvent}
-     * @param postCallListenerAction The action to be ran after all the listeners have finished processing
-     */
     public void callEvent(PacketEvent event, @Nullable Runnable postCallListenerAction) {
-        for (PacketListenerCommon listener : listeners) {
-            try {
-                event.call(listener);
-            } catch (Exception t) {
-                // ignore handshake exceptions
-                if (t.getClass() != InvalidHandshakeException.class) {
-                    PacketEvents.getAPI().getLogger().log(Level.WARNING, "PacketEvents caught an unhandled exception while calling your listener.", t);
+        for (byte priority = PacketListenerPriority.LOWEST.getId(); priority <= PacketListenerPriority.MONITOR.getId(); priority++) {
+            HashSet<PacketListenerCommon> listeners = listenersMap.get(priority);
+            if (listeners != null) {
+                for (PacketListenerCommon listener : listeners) {
+                    try {
+                        event.call(listener);
+                    } catch (Throwable t) {
+                        PacketEvents.getAPI().getLogger().log(Level.WARNING, "PacketEvents caught an unhandled exception while calling your listener.", t);
+                    }
+                    if (postCallListenerAction != null) {
+                        postCallListenerAction.run();
+                    }
                 }
             }
-            if (postCallListenerAction != null) {
-                postCallListenerAction.run();
-            }
         }
-        // For performance reasons, we don't want to re-encode the packet if it's not needed.
-        if (event instanceof ProtocolPacketEvent && !((ProtocolPacketEvent) event).needsReEncode()) {
-            ((ProtocolPacketEvent) event).setLastUsedWrapper(null);
+        if (event instanceof ProtocolPacketEvent && PacketEvents.getAPI().getSettings().shouldListenersReadOnly()) {
+            ((ProtocolPacketEvent<?>) event).setLastUsedWrapper(null);
         }
+
     }
 
-    /**
-     * Register the dynamic packet event listener.
-     *
-     * @param listener {@link PacketListenerCommon}
-     * @param priority {@link PacketListenerPriority}
-     */
     public PacketListenerCommon registerListener(PacketListener listener, PacketListenerPriority priority) {
         PacketListenerCommon packetListenerAbstract = listener.asAbstract(priority);
         return registerListener(packetListenerAbstract);
@@ -115,8 +75,13 @@ public class EventManager {
      * @param listener {@link PacketListenerCommon}
      */
     public PacketListenerCommon registerListener(PacketListenerCommon listener) {
-        this.registerListenerNoRecalculation(listener);
-        this.recalculateListeners();
+        byte priority = listener.getPriority().getId();
+        HashSet<PacketListenerCommon> listenerSet = listenersMap.get(priority);
+        if (listenerSet == null) {
+            listenerSet = new HashSet<>();
+        }
+        listenerSet.add(listener);
+        listenersMap.put(priority, listenerSet);
         return listener;
     }
 
@@ -127,22 +92,21 @@ public class EventManager {
      */
     public PacketListenerCommon[] registerListeners(PacketListenerCommon... listeners) {
         for (PacketListenerCommon listener : listeners) {
-            this.registerListenerNoRecalculation(listener);
+            registerListener(listener);
         }
-        this.recalculateListeners();
         return listeners;
     }
 
     public void unregisterListener(PacketListenerCommon listener) {
-        if (this.unregisterListenerNoRecalculation(listener)) this.recalculateListeners();
+        HashSet<PacketListenerCommon> listenerSet = listenersMap.get(listener.getPriority().getId());
+        if (listenerSet == null) return;
+        listenerSet.remove(listener);
     }
 
     public void unregisterListeners(PacketListenerCommon... listeners) {
-        boolean modified = false;
         for (PacketListenerCommon listener : listeners) {
-            modified |= this.unregisterListenerNoRecalculation(listener);//OR - at least one of these needs to be true to return true, meaning the boolean will permanently stay true if once set so
+            unregisterListener(listener);
         }
-        if (modified) this.recalculateListeners();
     }
 
 
@@ -150,36 +114,6 @@ public class EventManager {
      * Unregister all dynamic packet event listeners.
      */
     public void unregisterAllListeners() {
-        this.listenersMap.clear();
-        synchronized (this) {//like booky10 said, the synchronization is necessary here
-            this.listeners = new PacketListenerCommon[0];
-        }
-    }
-
-    //Needs to be synchronized in order to avoid race conditions (for example where the 'listeners' variable
-    //is overridden by its non-up-to-date value, simply because it finished a bit later than the most recent update)
-    private void recalculateListeners() {
-        synchronized (this) {
-            List<PacketListenerCommon> list = new ArrayList<>();
-            //adds from LOWEST to MONITOR, so in the correct order
-            for (PacketListenerPriority priority : PacketListenerPriority.values()) {
-                Set<PacketListenerCommon> set = this.listenersMap.get(priority);
-                if (set != null) list.addAll(set);
-            }
-            this.listeners = list.toArray(new PacketListenerCommon[0]);
-        }
-    }
-
-    //Internal registration methods, specifically separated for lesser overhead when registering an array of Listeners
-
-    private void registerListenerNoRecalculation(PacketListenerCommon listener) {
-        Set<PacketListenerCommon> listenerSet = this.listenersMap.computeIfAbsent(listener.getPriority(), p -> new CopyOnWriteArraySet<>());
-        listenerSet.add(listener);
-    }
-
-    //Returns true if the listener was removed, so a modification occurred
-    private boolean unregisterListenerNoRecalculation(PacketListenerCommon listener) {
-        Set<PacketListenerCommon> listenerSet = this.listenersMap.get(listener.getPriority());
-        return listenerSet != null && listenerSet.remove(listener);
+        listenersMap.clear();
     }
 }

api/src/main/java/com/github/retrooper/packetevents/event/PacketListenerPriority.java

@@ -30,7 +30,8 @@ package com.github.retrooper.packetevents.event;
  */
 public enum PacketListenerPriority {
     /**
-     * This listener will be run first and has little say in the outcome of events.
+     * Listener is of very low importance.
+     * This listener will be ran first.
      */
     LOWEST,
 
@@ -40,11 +41,8 @@ public enum PacketListenerPriority {
     LOW,
 
     /**
-     * The normal listener priority.
-     * If possible, always pick this.
-     * It allows other projects to easily overturn your decisions.
-     * Moreover, it is pretty bold to assume that your project should
-     * always have the final say.
+     * Default listener priority.
+     * Listener is neither important nor unimportant and may run normally.
      */
     NORMAL,
 
@@ -54,13 +52,13 @@ public enum PacketListenerPriority {
     HIGH,
 
     /**
-     * Listener is of critical importance. Use this to decide the final state of packets.
+     * Listener is of critical importance and wants to decide the cancellation of an event.
      */
     HIGHEST,
 
     /**
-     * Only use this priority if you want to perform logic based on the outcome of an event.
-     * Please do not modify packets in this stage.
+     * Listener is purely trying to decide the cancellation of an event.
+     * This listener should be ran last.
      */
     MONITOR;
 

api/src/main/java/com/github/retrooper/packetevents/event/PacketReceiveEvent.java

@@ -18,6 +18,7 @@
 
 package com.github.retrooper.packetevents.event;
 
+import com.github.retrooper.packetevents.event.simple.*;
 import com.github.retrooper.packetevents.exception.PacketProcessException;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
@@ -25,7 +26,7 @@ import com.github.retrooper.packetevents.protocol.PacketSide;
 import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
 import com.github.retrooper.packetevents.protocol.player.User;
 
-public class PacketReceiveEvent extends ProtocolPacketEvent {
+public class PacketReceiveEvent extends ProtocolPacketEvent<Object> {
     protected PacketReceiveEvent(Object channel, User user, Object player, Object rawByteBuf,
                                  boolean autoProtocolTranslation) throws PacketProcessException {
         super(PacketSide.CLIENT, channel, user, player, rawByteBuf, autoProtocolTranslation);
@@ -46,13 +47,20 @@ public class PacketReceiveEvent extends ProtocolPacketEvent {
 
     @Override
     public PacketReceiveEvent clone() {
-        try {
-            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
-            return new PacketReceiveEvent(getPacketId(), getPacketType(), getServerVersion(),
-                    getChannel(), getUser(), getPlayer(), clonedBuffer);
-        } catch (PacketProcessException e) {
-            e.printStackTrace();
+        if (this instanceof PacketHandshakeReceiveEvent) {
+            return ((PacketHandshakeReceiveEvent)this).clone();
+        }
+        else if (this instanceof PacketStatusReceiveEvent) {
+            return ((PacketStatusReceiveEvent)this).clone();
+        }
+        else if (this instanceof PacketLoginReceiveEvent) {
+            return ((PacketLoginReceiveEvent)this).clone();
+        }
+        else if (this instanceof PacketPlayReceiveEvent) {
+            return ((PacketPlayReceiveEvent)this).clone();
+        }
+        else {
+            return null;
         }
-        return null;
     }
 }

api/src/main/java/com/github/retrooper/packetevents/event/PacketSendEvent.java

@@ -18,7 +18,9 @@
 
 package com.github.retrooper.packetevents.event;
 
-import com.github.retrooper.packetevents.event.simple.PacketHandshakeSendEvent;
+import com.github.retrooper.packetevents.event.simple.PacketLoginSendEvent;
+import com.github.retrooper.packetevents.event.simple.PacketPlaySendEvent;
+import com.github.retrooper.packetevents.event.simple.PacketStatusSendEvent;
 import com.github.retrooper.packetevents.exception.PacketProcessException;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
@@ -26,12 +28,7 @@ import com.github.retrooper.packetevents.protocol.PacketSide;
 import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
 import com.github.retrooper.packetevents.protocol.player.User;
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class PacketSendEvent extends ProtocolPacketEvent {
-    private List<Runnable> tasksAfterSend = null;
-
+public class PacketSendEvent extends ProtocolPacketEvent<Object> {
     protected PacketSendEvent(Object channel, User user, Object player, Object rawByteBuf,
                               boolean autoProtocolTranslation) throws PacketProcessException {
         super(PacketSide.SERVER, channel, user, player, rawByteBuf, autoProtocolTranslation);
@@ -51,27 +48,19 @@ public class PacketSendEvent extends ProtocolPacketEvent {
         listener.onPacketSend(this);
     }
 
-
-    public List<Runnable> getTasksAfterSend() {
-        if (tasksAfterSend == null) {
-            tasksAfterSend = new ArrayList<>();
-        }
-        return tasksAfterSend;
-    }
-
-    public boolean hasTasksAfterSend() {
-        return tasksAfterSend != null && !tasksAfterSend.isEmpty();
-    }
-
     @Override
     public PacketSendEvent clone() {
-        try {
-            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
-            return new PacketSendEvent(getPacketId(), getPacketType(), getServerVersion(),
-                    getChannel(), getUser(), getPlayer(), clonedBuffer);
-        } catch (PacketProcessException e) {
-            e.printStackTrace();
+        if (this instanceof PacketStatusSendEvent) {
+            return ((PacketStatusSendEvent)this).clone();
+        }
+        else if (this instanceof PacketLoginSendEvent) {
+            return ((PacketLoginSendEvent)this).clone();
+        }
+        else if (this instanceof PacketPlaySendEvent) {
+            return ((PacketPlaySendEvent)this).clone();
+        }
+        else {
+            return null;
         }
-        return null;
     }
 }

api/src/main/java/com/github/retrooper/packetevents/event/PlayerEvent.java

@@ -24,11 +24,11 @@ package com.github.retrooper.packetevents.event;
  * @author retrooper
  * @since 1.6.9
  */
-public interface PlayerEvent {
+public interface PlayerEvent<T> {
     /**
      * Associated player.
      *
      * @return Player.
      */
-    <T> T getPlayer();
+    T getPlayer();
 }

api/src/main/java/com/github/retrooper/packetevents/event/ProtocolPacketEvent.java

@@ -19,7 +19,6 @@
 package com.github.retrooper.packetevents.event;
 
 import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.exception.InvalidDisconnectPacketSend;
 import com.github.retrooper.packetevents.exception.PacketProcessException;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
@@ -36,15 +35,14 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerEvent, CancellableEvent, UserEvent {
+public abstract class ProtocolPacketEvent<T> extends PacketEvent implements PlayerEvent<T>, CancellableEvent, UserEvent {
     private final Object channel;
     private final ConnectionState connectionState;
     private final User user;
-    private final Object player;
+    private final T player;
     private Object byteBuf;
     private final int packetID;
     private final PacketTypeCommon packetType;
@@ -53,10 +51,9 @@ public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerE
     private PacketWrapper<?> lastUsedWrapper;
     private List<Runnable> postTasks = null;
     private boolean cloned;
-    private boolean needsReEncode = PacketEvents.getAPI().getSettings().reEncodeByDefault();
 
     public ProtocolPacketEvent(PacketSide packetSide, Object channel,
-                               User user, Object player, Object byteBuf,
+                               User user, T player, Object byteBuf,
                                boolean autoProtocolTranslation) throws PacketProcessException {
         this.channel = channel;
         this.user = user;
@@ -79,21 +76,16 @@ public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerE
             throw new PacketProcessException("Failed to read the Packet ID of a packet. (Size: " + size + ")");
         }
         ClientVersion version = serverVersion.toClientVersion();
-        ConnectionState state = packetSide == PacketSide.CLIENT ? user.getDecoderState() : user.getEncoderState();
-        this.packetType = PacketType.getById(packetSide, state,
+        this.packetType = PacketType.getById(packetSide, user.getConnectionState(),
                 version, packetID);
         if (this.packetType == null) {
-            // mojang messed up and keeps sending disconnect packets in the wrong protocol state
-            if (PacketType.getById(packetSide, ConnectionState.PLAY, version, packetID) == PacketType.Play.Server.DISCONNECT) {
-                throw new InvalidDisconnectPacketSend();
-            }
-            throw new PacketProcessException("Failed to map the Packet ID " + packetID + " to a PacketType constant. Bound: " + packetSide.getOpposite() + ", Connection state: " + user.getDecoderState() + ", Server version: " + serverVersion.getReleaseName());
+            throw new PacketProcessException("Failed to map the Packet ID " + packetID + " to a PacketType constant. Bound: " + packetSide.getOpposite() + ", Connection state: " + user.getConnectionState() + ", Server version: " + serverVersion.getReleaseName());
         }
-        this.connectionState = state;
+        this.connectionState = user.getConnectionState();
     }
 
     public ProtocolPacketEvent(int packetID, PacketTypeCommon packetType, ServerVersion serverVersion, Object channel,
-                               User user, Object player, Object byteBuf) {
+                               User user, T player, Object byteBuf) {
         this.channel = channel;
         this.user = user;
         this.player = player;
@@ -101,21 +93,10 @@ public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerE
         this.byteBuf = byteBuf;
         this.packetID = packetID;
         this.packetType = packetType;
-
-        this.connectionState = (packetType != null && packetType.getSide() == PacketSide.SERVER)
-                ? user.getEncoderState() : user.getDecoderState();
+        this.connectionState = user.getConnectionState();
         cloned = true;
     }
 
-    public void markForReEncode(boolean needsReEncode) {
-        this.needsReEncode = needsReEncode;
-    }
-
-    public boolean needsReEncode() {
-        return needsReEncode;
-    }
-
-
     public boolean isClone() {
         return cloned;
     }
@@ -124,15 +105,8 @@ public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerE
         return channel;
     }
 
-    public SocketAddress getAddress() {
-        return ChannelHelper.remoteAddress(this.channel);
-    }
-
-    /**
-     * <strong>WARNING:</strong> This doesn't support local addresses or unix sockets.
-     */
     public InetSocketAddress getSocketAddress() {
-        return (InetSocketAddress) this.getAddress();
+        return (InetSocketAddress) ChannelHelper.remoteAddress(channel);
     }
 
     @Override
@@ -141,8 +115,8 @@ public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerE
     }
 
     @Override
-    public <T> T getPlayer() {
-        return (T) player;
+    public T getPlayer() {
+        return player;
     }
 
     public ConnectionState getConnectionState() {
@@ -177,6 +151,7 @@ public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerE
         this.byteBuf = byteBuf;
     }
 
+    @Deprecated
     public int getPacketId() {
         return packetID;
     }
@@ -221,7 +196,7 @@ public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerE
     }
 
     @Override
-    public ProtocolPacketEvent clone() {
+    public ProtocolPacketEvent<?> clone() {
         return this instanceof PacketReceiveEvent ? ((PacketReceiveEvent) this).clone()
                 : ((PacketSendEvent) this).clone();
     }

api/src/main/java/com/github/retrooper/packetevents/event/SimplePacketListenerAbstract.java

@@ -41,11 +41,7 @@ public abstract class SimplePacketListenerAbstract extends PacketListenerCommon
             onPacketStatusReceive((PacketStatusReceiveEvent) event);
         } else if (event instanceof PacketLoginReceiveEvent) {
             onPacketLoginReceive((PacketLoginReceiveEvent) event);
-        }
-        else if (event instanceof PacketConfigReceiveEvent) {
-            onPacketConfigReceive((PacketConfigReceiveEvent) event);
-        }
-        else if (event instanceof PacketPlayReceiveEvent) {
+        } else if (event instanceof PacketPlayReceiveEvent) {
             onPacketPlayReceive((PacketPlayReceiveEvent) event);
         }
     }
@@ -56,11 +52,7 @@ public abstract class SimplePacketListenerAbstract extends PacketListenerCommon
             onPacketStatusSend((PacketStatusSendEvent) event);
         } else if (event instanceof PacketLoginSendEvent) {
             onPacketLoginSend((PacketLoginSendEvent) event);
-        }
-        else if (event instanceof PacketConfigSendEvent) {
-            onPacketConfigSend((PacketConfigSendEvent) event);
-        }
-        else if (event instanceof PacketPlaySendEvent) {
+        } else if (event instanceof PacketPlaySendEvent) {
             onPacketPlaySend((PacketPlaySendEvent) event);
         }
     }
@@ -80,12 +72,6 @@ public abstract class SimplePacketListenerAbstract extends PacketListenerCommon
     public void onPacketLoginSend(PacketLoginSendEvent event) {
     }
 
-    public void onPacketConfigReceive(PacketConfigReceiveEvent event) {
-    }
-
-    public void onPacketConfigSend(PacketConfigSendEvent event) {
-    }
-
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
     }
 

api/src/main/java/com/github/retrooper/packetevents/event/UserLoginEvent.java

@@ -20,7 +20,7 @@ package com.github.retrooper.packetevents.event;
 
 import com.github.retrooper.packetevents.protocol.player.User;
 
-public class UserLoginEvent extends PacketEvent implements CallableEvent, UserEvent, PlayerEvent {
+public class UserLoginEvent extends PacketEvent implements CallableEvent, UserEvent, PlayerEvent<Object> {
     private final User user;
     private final Object player;
 
@@ -35,8 +35,8 @@ public class UserLoginEvent extends PacketEvent implements CallableEvent, UserEv
     }
 
     @Override
-    public <T> T getPlayer() {
-        return (T) player;
+    public Object getPlayer() {
+        return player;
     }
 
     @Override

api/src/main/java/com/github/retrooper/packetevents/event/simple/PacketConfigReceiveEvent.java

@@ -1,59 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2022 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.event.simple;
-
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.exception.PacketProcessException;
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
-import com.github.retrooper.packetevents.protocol.player.User;
-
-public class PacketConfigReceiveEvent extends PacketReceiveEvent {
-
-    public PacketConfigReceiveEvent(Object channel, User user,
-                                    Object player, Object rawByteBuf,
-                                    boolean autoProtocolTranslation) throws PacketProcessException {
-        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
-    }
-
-    protected PacketConfigReceiveEvent(int packetId, PacketTypeCommon packetType,
-                                       ServerVersion serverVersion,
-                                       Object channel,
-                                       User user, Object player, Object byteBuf) throws PacketProcessException {
-        super(packetId, packetType, serverVersion, channel, user, player, byteBuf);
-    }
-
-    @Override
-    public PacketConfigReceiveEvent clone() {
-        try {
-            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
-            return new PacketConfigReceiveEvent(getPacketId(), getPacketType(), getServerVersion(),
-                    getChannel(), getUser(), getPlayer(), clonedBuffer);
-        } catch (PacketProcessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public PacketType.Configuration.Client getPacketType() {
-        return (PacketType.Configuration.Client) super.getPacketType();
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/event/simple/PacketConfigSendEvent.java

@@ -1,59 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2022 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.event.simple;
-
-import com.github.retrooper.packetevents.event.PacketSendEvent;
-import com.github.retrooper.packetevents.exception.PacketProcessException;
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
-import com.github.retrooper.packetevents.protocol.player.User;
-
-public class PacketConfigSendEvent extends PacketSendEvent {
-
-    public PacketConfigSendEvent(Object channel, User user,
-                                 Object player, Object rawByteBuf,
-                                 boolean autoProtocolTranslation) throws PacketProcessException {
-        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
-    }
-
-    protected PacketConfigSendEvent(int packetId, PacketTypeCommon packetType,
-                                    ServerVersion serverVersion,
-                                    Object channel,
-                                    User user, Object player, Object byteBuf) throws PacketProcessException {
-        super(packetId, packetType, serverVersion, channel, user, player, byteBuf);
-    }
-
-    @Override
-    public PacketConfigSendEvent clone() {
-        try {
-            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
-            return new PacketConfigSendEvent(getPacketId(), getPacketType(), getServerVersion(),
-                    getChannel(), getUser(), getPlayer(), clonedBuffer);
-        } catch (PacketProcessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public PacketType.Configuration.Server getPacketType() {
-        return (PacketType.Configuration.Server) super.getPacketType();
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/exception/CancelPacketException.java

@@ -1,5 +0,0 @@
-package com.github.retrooper.packetevents.exception;
-
-public class CancelPacketException extends RuntimeException {
-    public static final CancelPacketException INSTANCE = new CancelPacketException();
-}

api/src/main/java/com/github/retrooper/packetevents/exception/InvalidDisconnectPacketSend.java

@@ -1,4 +0,0 @@
-package com.github.retrooper.packetevents.exception;
-
-public class InvalidDisconnectPacketSend extends RuntimeException {
-}

api/src/main/java/com/github/retrooper/packetevents/exception/InvalidHandshakeException.java

@@ -1,4 +0,0 @@
-package com.github.retrooper.packetevents.exception;
-
-public class InvalidHandshakeException extends RuntimeException {
-}

api/src/main/java/com/github/retrooper/packetevents/exception/PacketProcessException.java

@@ -18,7 +18,7 @@
 
 package com.github.retrooper.packetevents.exception;
 
-public class PacketProcessException extends RuntimeException {
+public class PacketProcessException extends Exception {
     public PacketProcessException(String msg, Throwable cause) {
         super(msg, cause);
     }

api/src/main/java/com/github/retrooper/packetevents/injector/ChannelInjector.java

@@ -18,11 +18,11 @@
 
 package com.github.retrooper.packetevents.injector;
 
-import com.github.retrooper.packetevents.protocol.PacketSide;
+import com.github.retrooper.packetevents.protocol.ConnectionState;
 import com.github.retrooper.packetevents.protocol.player.User;
+import org.jetbrains.annotations.Nullable;
 
 public interface ChannelInjector {
-
     default boolean isServerBound() {
         return true;
     }
@@ -31,13 +31,13 @@ public interface ChannelInjector {
 
     void uninject();
 
+    User getUser(Object channel);
+
+    void changeConnectionState(Object channel, @Nullable ConnectionState connectionState);
+
     void updateUser(Object channel, User user);
 
     void setPlayer(Object channel, Object player);
 
-    boolean isProxy();
-
-    default PacketSide getPacketSide() {
-        return PacketSide.SERVER;
-    }
+    boolean hasPlayer(Object player);
 }

api/src/main/java/com/github/retrooper/packetevents/manager/InternalPacketListener.java

@@ -26,18 +26,19 @@ import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.manager.protocol.ProtocolManager;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.ConnectionState;
+import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
+import com.github.retrooper.packetevents.protocol.nbt.NBTList;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.protocol.player.UserProfile;
-import com.github.retrooper.packetevents.util.LogManager;
-import com.github.retrooper.packetevents.util.mappings.SynchronizedRegistriesHandler;
-import com.github.retrooper.packetevents.wrapper.configuration.server.WrapperConfigServerRegistryData;
 import com.github.retrooper.packetevents.wrapper.handshaking.client.WrapperHandshakingClientHandshake;
 import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerLoginSuccess;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerJoinGame;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerRespawn;
 
+import java.net.InetSocketAddress;
+
 public class InternalPacketListener extends PacketListenerAbstract {
 
     public InternalPacketListener() {
@@ -70,52 +71,44 @@ public class InternalPacketListener extends PacketListenerAbstract {
 
             PacketEvents.getAPI().getLogManager().debug("Mapped player UUID with their channel.");
 
-            // Switch the user's connection state to new state, but the variable event.getConnectionState() remains LOGIN
-            // We switch user state immediately to remain in sync with vanilla, allowing you to encode packets immediately
-            boolean proxy = PacketEvents.getAPI().getInjector().isProxy();
-            if (proxy ? event.getUser().getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_20_2)
-                    : event.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_20_2)) {
-                user.setEncoderState(ConnectionState.CONFIGURATION);
-            } else {
-                user.setConnectionState(ConnectionState.PLAY);
-            }
+            //Update connection state(injectors might do some adjustments when we transition into PLAY state)
+            //This also updates it for the user instance
+            event.getPostTasks().add(() -> {
+                PacketEvents.getAPI().getInjector().changeConnectionState(channel, ConnectionState.PLAY);
+                PacketEvents.getAPI().getLogManager().debug("Transitioned " + profile.getName() + " into the PLAY state!");
+            });
         }
 
-        // The server sends dimension information in configuration phase, since 1.20.2
-        else if (event.getPacketType() == PacketType.Configuration.Server.REGISTRY_DATA) {
-            WrapperConfigServerRegistryData packet = new WrapperConfigServerRegistryData(event);
+        // Join game can be used to update world height, and sets dimension data
 
-            if (packet.getElements() != null) { // 1.20.2 to 1.20.5
-                SynchronizedRegistriesHandler.handleRegistry(user, packet.getServerVersion().toClientVersion(),
-                        packet.getRegistryKey(), packet.getElements());
-            }
-            if (packet.getRegistryData() != null) { // since 1.20.5
-                SynchronizedRegistriesHandler.handleLegacyRegistries(user, packet.getServerVersion()
-                        .toClientVersion(), packet.getRegistryData());
-            }
-        }
-
-        // The server sends registry info in login packet for 1.16 to 1.20.1
         else if (event.getPacketType() == PacketType.Play.Server.JOIN_GAME) {
             WrapperPlayServerJoinGame joinGame = new WrapperPlayServerJoinGame(event);
             user.setEntityId(joinGame.getEntityId());
-
-            if (joinGame.getDimensionCodec() != null) { // 1.16 to 1.20.1
-                SynchronizedRegistriesHandler.handleLegacyRegistries(user, joinGame.getServerVersion().toClientVersion(),
-                        joinGame.getDimensionCodec());
+            if (event.getServerVersion().isOlderThanOrEquals(ServerVersion.V_1_16_5)) {
+                return; // Fixed world height, no tags are sent to the client
             }
 
-            user.setDimensionType(joinGame.getDimensionType());
+            // Store world height
+            NBTList<NBTCompound> list = joinGame.getDimensionCodec().getCompoundTagOrNull("minecraft:dimension_type").getCompoundListTagOrNull("value");
+            user.setWorldNBT(list);
+
+            // Update world height
+            NBTCompound worldNBT = user.getWorldNBT(joinGame.getDimension().getDimensionName()).getCompoundTagOrNull("element");
+            user.setMinWorldHeight(worldNBT.getNumberTagOrNull("min_y").getAsInt());
+            user.setTotalWorldHeight(worldNBT.getNumberTagOrNull("height").getAsInt());
         }
 
         // Respawn is used to switch dimensions
         else if (event.getPacketType() == PacketType.Play.Server.RESPAWN) {
-            WrapperPlayServerRespawn packet = new WrapperPlayServerRespawn(event);
-            user.setDimensionType(packet.getDimensionType());
-        } else if (event.getPacketType() == PacketType.Play.Server.CONFIGURATION_START) {
-            user.setEncoderState(ConnectionState.CONFIGURATION);
-        } else if (event.getPacketType() == PacketType.Configuration.Server.CONFIGURATION_END) {
-            user.setEncoderState(ConnectionState.PLAY);
+            if (event.getServerVersion().isOlderThanOrEquals(ServerVersion.V_1_16_5)) {
+                return; // Fixed world height, no tags are sent to the client
+            }
+
+            WrapperPlayServerRespawn respawn = new WrapperPlayServerRespawn(event);
+
+            NBTCompound worldNBT = user.getWorldNBT(respawn.getDimension().getDimensionName()).getCompoundTagOrNull("element"); // This is 1.17+, it always sends the world name
+            user.setMinWorldHeight(worldNBT.getNumberTagOrNull("min_y").getAsInt());
+            user.setTotalWorldHeight(worldNBT.getNumberTagOrNull("height").getAsInt());
         }
     }
 
@@ -123,24 +116,22 @@ public class InternalPacketListener extends PacketListenerAbstract {
     public void onPacketReceive(PacketReceiveEvent event) {
         User user = event.getUser();
         if (event.getPacketType() == PacketType.Handshaking.Client.HANDSHAKE) {
-            WrapperHandshakingClientHandshake packet = new WrapperHandshakingClientHandshake(event);
-            ClientVersion clientVersion = packet.getClientVersion();
-            ConnectionState state = packet.getNextConnectionState();
-
-            LogManager logger = PacketEvents.getAPI().getLogManager();
-            if (logger.isDebug()) {
-                logger.debug("Processed handshake for " + event.getAddress() + ": "
-                        + state.name() + " / " + packet.getClientVersion().getReleaseName());
+            Object channel = event.getChannel();
+            InetSocketAddress address = event.getSocketAddress();
+            WrapperHandshakingClientHandshake handshake = new WrapperHandshakingClientHandshake(event);
+            ConnectionState nextState = handshake.getNextConnectionState();
+            ClientVersion clientVersion = handshake.getClientVersion();
+            if (clientVersion == ClientVersion.UNKNOWN) {
+                return;
             }
-
+            //Update client version for this event call(and user)
             user.setClientVersion(clientVersion);
-            user.setConnectionState(state);
-        } else if (event.getPacketType() == PacketType.Login.Client.LOGIN_SUCCESS_ACK) {
-            user.setDecoderState(ConnectionState.CONFIGURATION);
-        } else if (event.getPacketType() == PacketType.Play.Client.CONFIGURATION_ACK) {
-            user.setDecoderState(ConnectionState.CONFIGURATION);
-        } else if (event.getPacketType() == PacketType.Configuration.Client.CONFIGURATION_END_ACK) {
-            user.setDecoderState(ConnectionState.PLAY);
+            PacketEvents.getAPI().getLogManager().debug("Processed " + address.getHostString() + ":" + address.getPort() + "'s client version. Client Version: " + clientVersion.getReleaseName());
+            event.getPostTasks().add(() -> {
+                //Transition into the LOGIN OR STATUS connection state
+                PacketEvents.getAPI().getInjector().changeConnectionState(channel, nextState);
+                PacketEvents.getAPI().getLogManager().debug("Transitioned " + address.getHostString() + ":" + address.getPort() + " into the " + nextState + " state!");
+            });
         }
     }
-}
+}

api/src/main/java/com/github/retrooper/packetevents/manager/protocol/ProtocolManager.java

@@ -20,12 +20,12 @@ package com.github.retrooper.packetevents.manager.protocol;
 
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
+import com.github.retrooper.packetevents.protocol.ConnectionState;
 import com.github.retrooper.packetevents.protocol.ProtocolVersion;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.util.PacketTransformationUtil;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Collection;
 import java.util.Map;
@@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public interface ProtocolManager {
     Map<UUID, Object> CHANNELS = new ConcurrentHashMap<>();
-    // Use SocketAddress because ProtocolLib wraps Channels with NettyChannelProxy class
     Map<Object, User> USERS = new ConcurrentHashMap<>();
 
     default Collection<User> getUsers() {
@@ -92,73 +91,67 @@ public interface ProtocolManager {
         }
     }
 
+    //TODO Make it clear that this only updates the connection state in our user.
+    //Sometimes you should use getInjector().changeConnectionState because that can allow the injector to make adjustments.
+    //This is very important, especially on Spigot.
+    //As soon as we switch to the play state on spigot, our injector makes some adjustments.
+    default void changeConnectionState(Object channel, ConnectionState connectionState) {
+        getUser(channel).setConnectionState(connectionState);
+    }
 
     default void setClientVersion(Object channel, ClientVersion version) {
         getUser(channel).setClientVersion(version);
     }
 
-    @ApiStatus.Internal
-    default Object[] transformWrappers(PacketWrapper<?> wrapper, Object channel, boolean outgoing) {
+    default Object[] transformWrappers(PacketWrapper<?> wrapper) {
         //It is possible that our packet transformer util decides to transform one wrapper into multiple packets.
         //(Correcting some mistakes on your end)
         PacketWrapper<?>[] wrappers = PacketTransformationUtil.transform(wrapper);
         Object[] buffers = new Object[wrappers.length];
         for (int i = 0; i < wrappers.length; i++) {
-            PacketWrapper<?> wrappper = wrappers[i];
-            synchronized (wrappper.bufferLock) {
-                wrappper.prepareForSend(channel, outgoing);
-                buffers[i] = wrappper.buffer;
-                // Fix race condition when sending packets to multiple people (due to when the buffer is freed)
-                wrappper.buffer = null;
-            }
+            wrappers[i].prepareForSend();
+            buffers[i] = wrappers[i].buffer;
         }
         return buffers;
     }
 
     default void sendPacket(Object channel, PacketWrapper<?> wrapper) {
-        Object[] transformed = transformWrappers(wrapper, channel, true);
+        Object[] transformed = transformWrappers(wrapper);
         sendPackets(channel, transformed);
     }
 
     default void sendPacketSilently(Object channel, PacketWrapper<?> wrapper) {
-        Object[] transformed = transformWrappers(wrapper, channel, true);
+        Object[] transformed = transformWrappers(wrapper);
         sendPacketsSilently(channel, transformed);
     }
 
     default void writePacket(Object channel, PacketWrapper<?> wrapper) {
-        Object[] transformed = transformWrappers(wrapper, channel, true);
+        Object[] transformed = transformWrappers(wrapper);
         writePackets(channel, transformed);
     }
 
     default void writePacketSilently(Object channel, PacketWrapper<?> wrapper) {
-        Object[] transformed = transformWrappers(wrapper, channel, true);
+        Object[] transformed = transformWrappers(wrapper);
         writePacketsSilently(channel, transformed);
     }
 
     default void receivePacket(Object channel, PacketWrapper<?> wrapper) {
-        Object[] transformed = transformWrappers(wrapper, channel, false);
+        Object[] transformed = transformWrappers(wrapper);
         receivePackets(channel, transformed);
     }
 
     default void receivePacketSilently(Object channel, PacketWrapper<?> wrapper) {
-        Object[] transformed = transformWrappers(wrapper, channel, false);
+        Object[] transformed = transformWrappers(wrapper);
         receivePacketsSilently(channel, transformed);
     }
 
     default User getUser(Object channel) {
-        Object pipeline = ChannelHelper.getPipeline(channel);
-        return USERS.get(pipeline);
-    }
-
-    default User removeUser(Object channel) {
-        Object pipeline = ChannelHelper.getPipeline(channel);
-        return USERS.remove(pipeline);
+        return USERS.get(channel);
     }
 
     default void setUser(Object channel, User user) {
         synchronized (channel) {
-            Object pipeline = ChannelHelper.getPipeline(channel);
-            USERS.put(pipeline, user);
+            USERS.put(channel, user);
         }
         PacketEvents.getAPI().getInjector().updateUser(channel, user);
     }

api/src/main/java/com/github/retrooper/packetevents/manager/server/ServerManager.java

@@ -18,10 +18,6 @@
 
 package com.github.retrooper.packetevents.manager.server;
 
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.protocol.player.User;
-import org.jetbrains.annotations.Nullable;
-
 public interface ServerManager {
     /**
      * Get the server version.
@@ -38,20 +34,4 @@ public interface ServerManager {
     default SystemOS getOS() {
         return SystemOS.getOS();
     }
-
-    /**
-     * Gets a platform-specific network-synchronized-registries cache key.
-     * <p>
-     * This tells packetevents, if a registry should be cached or read again. On
-     * backend servers with global registries, this may be a constant value. On
-     * proxy servers with per-server registries, this may be a value which depends
-     * on the current server the {@link User} is on.
-     *
-     * @param user    the {@link User} for which the registry gets read
-     * @param version the version the packet is for
-     * @return some value or null for no caching at all
-     */
-    default @Nullable Object getRegistryCacheKey(User user, ClientVersion version) {
-        return null; // no caching
-    }
 }

api/src/main/java/com/github/retrooper/packetevents/manager/server/ServerVersion.java

@@ -46,11 +46,7 @@ public enum ServerVersion {
     V_1_17(755), V_1_17_1(756),
     V_1_18(757), V_1_18_1(757), V_1_18_2(758),
     //1.19.1 and 1.19.2 have the same protocol version
-    V_1_19(759), V_1_19_1(760), V_1_19_2(760), V_1_19_3(761), V_1_19_4(762),
-    //1.20 and 1.20.1 have the same protocol version. 1.20.3 and 1.20.4 have the same protocol version. 1.20.5 and 1.20.6 have the same protocol version
-    V_1_20(763), V_1_20_1(763), V_1_20_2(764), V_1_20_3(765), V_1_20_4(765), V_1_20_5(766), V_1_20_6(766),
-    //1.21 and 1.21.1 have the same protocol version. 1.21.2 and 1.21.3 have the same protocol version
-    V_1_21(767), V_1_21_1(767), V_1_21_2(768), V_1_21_3(768),
+    V_1_19(759), V_1_19_1(760), V_1_19_2(760),
     //TODO UPDATE Add server version constant
     ERROR(-1, true);
 

api/src/main/java/com/github/retrooper/packetevents/netty/buffer/ByteBufAllocationOperator.java

@@ -24,11 +24,8 @@ public interface ByteBufAllocationOperator {
     Object copiedBuffer(byte[] bytes);
 
     Object buffer();
-    Object buffer(int initialCapacity);
 
     Object directBuffer();
-    Object directBuffer(int initialCapacity);
 
     Object compositeBuffer();
-    Object compositeBuffer(int maxNumComponents);
 }

api/src/main/java/com/github/retrooper/packetevents/netty/buffer/ByteBufHelper.java

@@ -103,14 +103,6 @@ public class ByteBufHelper {
         PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeShort(buffer, value);
     }
 
-    public static int readMedium(Object buffer) {
-        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readMedium(buffer);
-    }
-
-    public static void writeMedium(Object buffer, int value) {
-        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeMedium(buffer, value);
-    }
-
     public static int readInt(Object buffer) {
         return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readInt(buffer);
     }

api/src/main/java/com/github/retrooper/packetevents/netty/buffer/ByteBufInputStream.java

@@ -18,8 +18,6 @@
 
 package com.github.retrooper.packetevents.netty.buffer;
 
-import com.github.retrooper.packetevents.exception.PacketProcessException;
-
 import java.io.*;
 //TODO give netty credit
 public class ByteBufInputStream extends InputStream implements DataInput {
@@ -42,27 +40,27 @@ public class ByteBufInputStream extends InputStream implements DataInput {
         this(buffer, ByteBufHelper.readableBytes(buffer), releaseOnClose);
     }
 
-    public ByteBufInputStream(Object buffer, int maxLength, boolean releaseOnClose) {
+    public ByteBufInputStream(Object buffer, int length, boolean releaseOnClose) {
         this.lineBuf = new StringBuilder();
         if (buffer == null) {
             throw new NullPointerException("buffer");
-        } else if (maxLength < 0) {
+        } else if (length < 0) {
             if (releaseOnClose) {
                 ByteBufHelper.release(buffer);
             }
 
-            throw new IllegalArgumentException("maxLength: " + maxLength);
-        } else if (ByteBufHelper.readableBytes(buffer) > maxLength) {
+            throw new IllegalArgumentException("length: " + length);
+        } else if (length > ByteBufHelper.readableBytes(buffer)) {
             if (releaseOnClose) {
                 ByteBufHelper.release(buffer);
             }
 
-            throw new IndexOutOfBoundsException("Too many bytes to be read - Found " + ByteBufHelper.readableBytes(buffer) + ", maximum is " + maxLength);
+            throw new IndexOutOfBoundsException("Too many bytes to be read - Needs " + length + ", maximum is " + ByteBufHelper.readableBytes(buffer));
         } else {
             this.releaseOnClose = releaseOnClose;
             this.buffer = buffer;
             this.startIndex = ByteBufHelper.readerIndex(buffer);
-            this.endIndex = this.startIndex + ByteBufHelper.readableBytes(buffer);
+            this.endIndex = this.startIndex + length;
             ByteBufHelper.markReaderIndex(buffer);
         }
     }
@@ -206,8 +204,7 @@ public class ByteBufInputStream extends InputStream implements DataInput {
     }
 
     public String readUTF() throws IOException {
-        String text = DataInputStream.readUTF(this);
-        return text;
+        return DataInputStream.readUTF(this);
     }
 
     public int readUnsignedByte() throws IOException {
@@ -228,14 +225,7 @@ public class ByteBufInputStream extends InputStream implements DataInput {
         if (fieldSize < 0) {
             throw new IndexOutOfBoundsException("fieldSize cannot be a negative number");
         } else if (fieldSize > this.available()) {
-            int value = this.available();
-            String msg = "fieldSize is too long! Length is " + fieldSize + ", but maximum is " + value;
-            if (value == 0) {
-                throw new PacketProcessException(msg);
-            }
-            else {
-                throw new EOFException(msg);
-            }
+            throw new EOFException("fieldSize is too long! Length is " + fieldSize + ", but maximum is " + this.available());
         }
     }
 }

api/src/main/java/com/github/retrooper/packetevents/netty/buffer/ByteBufOperator.java

@@ -35,14 +35,12 @@ public interface ByteBufOperator {
 
     byte readByte(Object buffer);
     short readShort(Object buffer);
-    int readMedium(Object buffer);
     int readInt(Object buffer);
     long readUnsignedInt(Object buffer);
     long readLong(Object buffer);
 
     void writeByte(Object buffer, int value);
     void writeShort(Object buffer, int value);
-    void writeMedium(Object buffer, int value);
     void writeInt(Object buffer, int value);
     void writeLong(Object buffer, long value);
 

api/src/main/java/com/github/retrooper/packetevents/netty/buffer/UnpooledByteBufAllocationHelper.java

@@ -40,16 +40,4 @@ public class UnpooledByteBufAllocationHelper {
     public static Object compositeBuffer() {
         return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().compositeBuffer();
     }
-
-    public static Object buffer(int initialCapacity) {
-        return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().buffer(initialCapacity);
-    }
-
-    public static Object directBuffer(int initialCapacity) {
-        return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().directBuffer(initialCapacity);
-    }
-
-    public static Object compositeBuffer(int maxNumComponents) {
-        return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().compositeBuffer(maxNumComponents);
-    }
 }

api/src/main/java/com/github/retrooper/packetevents/netty/channel/ChannelHelper.java

@@ -81,10 +81,6 @@ public class ChannelHelper {
         return Arrays.toString(pipelineHandlerNames(channel).toArray(new String[0]));
     }
 
-    public static Object getPipeline(Object channel) {
-        return PacketEvents.getAPI().getNettyManager().getChannelOperator().getPipeline(channel);
-    }
-
     public static Object getPipelineHandler(Object channel, String name) {
         return PacketEvents.getAPI().getNettyManager().getChannelOperator().getPipelineHandler(channel, name);
     }
@@ -93,10 +89,6 @@ public class ChannelHelper {
         return PacketEvents.getAPI().getNettyManager().getChannelOperator().getPipelineContext(channel, handlerName);
     }
 
-    public static Object pooledByteBuf(Object channel) {
-        return PacketEvents.getAPI().getNettyManager().getChannelOperator().pooledByteBuf(channel);
-    }
-
     public static void runInEventLoop(Object channel, Runnable runnable) {
         PacketEvents.getAPI().getNettyManager().getChannelOperator().runInEventLoop(channel, runnable);
     }

api/src/main/java/com/github/retrooper/packetevents/netty/channel/ChannelOperator.java

@@ -20,41 +20,26 @@ package com.github.retrooper.packetevents.netty.channel;
 
 import java.net.SocketAddress;
 import java.util.List;
+import java.util.Set;
 
 public interface ChannelOperator {
+    Set<Class<? extends Throwable>> getIgnoredHandlerExceptions();
+
     SocketAddress remoteAddress(Object channel);
-
     SocketAddress localAddress(Object channel);
-
     boolean isOpen(Object channel);
-
     Object close(Object channel);
-
     Object write(Object channel, Object buffer);
-
     Object flush(Object channel);
-
     Object writeAndFlush(Object channel, Object buffer);
-
     Object fireChannelRead(Object channel, Object buffer);
 
     Object writeInContext(Object channel, String ctx, Object buffer);
-
     Object flushInContext(Object channel, String ctx);
-
     Object writeAndFlushInContext(Object channel, String ctx, Object buffer);
-
     Object fireChannelReadInContext(Object channel, String ctx, Object buffer);
-
     List<String> pipelineHandlerNames(Object channel);
-
     Object getPipelineHandler(Object channel, String name);
-
     Object getPipelineContext(Object channel, String name);
-
-    Object getPipeline(Object channel);
-
     void runInEventLoop(Object channel, Runnable runnable);
-
-    Object pooledByteBuf(Object channel);
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/ConnectionState.java

@@ -23,7 +23,7 @@ package com.github.retrooper.packetevents.protocol;
  * @since 1.8
  */
 public enum ConnectionState {
-    HANDSHAKING, STATUS, LOGIN, PLAY, CONFIGURATION;
+    HANDSHAKING, STATUS, LOGIN, PLAY;
 
     public static ConnectionState getById(int id) {
         if (id >= values().length || id < 0) {

api/src/main/java/com/github/retrooper/packetevents/protocol/attribute/Attribute.java

@@ -1,52 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2023 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.attribute;
-
-import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.util.MathUtil;
-
-public interface Attribute extends MappedEntity {
-
-    @Override
-    default ResourceLocation getName() {
-        return this.getName(PacketEvents.getAPI().getServerManager().getVersion().toClientVersion());
-    }
-
-    ResourceLocation getName(ClientVersion version);
-
-    default double sanitizeValue(double value) {
-        return this.sanitizeValue(value, PacketEvents.getAPI().getServerManager().getVersion().toClientVersion());
-    }
-
-    default double sanitizeValue(double value, ClientVersion version) {
-        if (!Double.isNaN(value)) {
-            return MathUtil.clamp(value, this.getMinValue(), this.getMaxValue());
-        }
-        return this.getMinValue();
-    }
-
-    double getDefaultValue();
-
-    double getMinValue();
-
-    double getMaxValue();
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/attribute/AttributeOperation.java

@@ -1,25 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.attribute;
-
-public enum AttributeOperation {
-    ADDITION,
-    MULTIPLY_BASE,
-    MULTIPLY_TOTAL,
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/attribute/Attributes.java

@@ -1,141 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2023 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.attribute;
-
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.util.mappings.VersionedRegistry;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
-
-public final class Attributes {
-
-    private static final VersionedRegistry<Attribute> REGISTRY = new VersionedRegistry<>(
-            "attribute", "attribute/attribute_mappings");
-
-    private Attributes() {
-    }
-
-    private static Attribute define(
-            String key, @Nullable String legacyPrefix,
-            double def, double min, double max
-    ) {
-        return REGISTRY.define(key, data ->
-                new StaticAttribute(data, legacyPrefix, def, min, max));
-    }
-
-    public static VersionedRegistry<Attribute> getRegistry() {
-        return REGISTRY;
-    }
-
-    public static Attribute getByName(String name) {
-        // "remapping" to support < 1.21.2
-        String normedName = ResourceLocation.normString(name);
-        if (normedName.startsWith(ResourceLocation.VANILLA_NAMESPACE + ":generic.")
-                || normedName.startsWith(ResourceLocation.VANILLA_NAMESPACE + ":player.")
-                || normedName.startsWith(ResourceLocation.VANILLA_NAMESPACE + ":zombie.")) {
-            normedName = normedName.substring(name.indexOf('.') + 1);
-        }
-        return REGISTRY.getByName(normedName);
-    }
-
-    public static Attribute getById(ClientVersion version, int id) {
-        return REGISTRY.getById(version, id);
-    }
-
-    public static final Attribute GENERIC_ARMOR = define("armor",
-            "generic", 0d, 0d, 30d);
-    public static final Attribute GENERIC_ARMOR_TOUGHNESS = define("armor_toughness",
-            "generic", 0d, 0d, 20d);
-    public static final Attribute GENERIC_ATTACK_DAMAGE = define("attack_damage",
-            "generic", 2d, 0d, 2048d);
-    public static final Attribute GENERIC_ATTACK_KNOCKBACK = define("attack_knockback",
-            "generic", 0d, 0d, 5d);
-    public static final Attribute GENERIC_ATTACK_SPEED = define("attack_speed",
-            "generic", 4d, 0d, 1024d);
-    public static final Attribute GENERIC_FLYING_SPEED = define("flying_speed",
-            "generic", 0.4d, 0d, 1024d);
-    public static final Attribute GENERIC_FOLLOW_RANGE = define("follow_range",
-            "generic", 32d, 0d, 2048d);
-    @ApiStatus.Obsolete // renamed in 1.20.5
-    public static final Attribute HORSE_JUMP_STRENGTH = define("horse.jump_strength",
-            null, 0.7d, 0d, 2d);
-    public static final Attribute GENERIC_KNOCKBACK_RESISTANCE = define("knockback_resistance",
-            "generic", 0d, 0d, 1d);
-    public static final Attribute GENERIC_LUCK = define("luck",
-            "generic", 0d, -1024d, 1024d);
-    public static final Attribute GENERIC_MAX_HEALTH = define("max_health",
-            "generic", 20d, 1d, 1024d);
-    public static final Attribute GENERIC_MOVEMENT_SPEED = define("movement_speed",
-            "generic", 0.7d, 0d, 1024d);
-    public static final Attribute ZOMBIE_SPAWN_REINFORCEMENTS = define("spawn_reinforcements",
-            "zombie", 0d, 0d, 1d);
-
-    // Added in 1.20.2
-    public static final Attribute GENERIC_MAX_ABSORPTION = define("max_absorption",
-            "generic", 0d, 0d, 2048d);
-
-    // Added in 1.20.5
-    public static final Attribute PLAYER_BLOCK_BREAK_SPEED = define("block_break_speed",
-            "player", 1d, 0d, 1024d);
-    public static final Attribute PLAYER_BLOCK_INTERACTION_RANGE = define("block_interaction_range",
-            "player", 4.5d, 0d, 64d);
-    public static final Attribute PLAYER_ENTITY_INTERACTION_RANGE = define("entity_interaction_range",
-            "player", 3d, 0d, 64d);
-    public static final Attribute GENERIC_FALL_DAMAGE_MULTIPLIER = define("fall_damage_multiplier",
-            "generic", 1d, 0d, 100d);
-    public static final Attribute GENERIC_GRAVITY = define("gravity",
-            "generic", 0.08d, -1d, 1d);
-    public static final Attribute GENERIC_JUMP_STRENGTH = define("jump_strength",
-            "generic", 0.42d, 0d, 32d);
-    public static final Attribute GENERIC_SAFE_FALL_DISTANCE = define("safe_fall_distance",
-            "generic", 3d, 0d, 1024d);
-    public static final Attribute GENERIC_SCALE = define("scale",
-            "generic", 1d, 1d / 16d, 16d);
-    public static final Attribute GENERIC_STEP_HEIGHT = define("step_height",
-            "generic", 0.6d, 0d, 10d);
-
-    // Added in 1.21
-    public static final Attribute GENERIC_BURNING_TIME = define("burning_time",
-            "generic", 0d, 1d, 1024d);
-    public static final Attribute GENERIC_EXPLOSION_KNOCKBACK_RESISTANCE = define("explosion_knockback_resistance",
-            "generic", 0d, 0d, 1d);
-    public static final Attribute PLAYER_MINING_EFFICIENCY = define("mining_efficiency",
-            "player", 0d, 0d, 1024d);
-    public static final Attribute GENERIC_MOVEMENT_EFFICIENCY = define("movement_efficiency",
-            "generic", 0d, 0d, 1d);
-    public static final Attribute GENERIC_OXYGEN_BONUS = define("oxygen_bonus",
-            "generic", 0d, 0d, 1024d);
-    public static final Attribute PLAYER_SNEAKING_SPEED = define("sneaking_speed",
-            "player", 0.3d, 0d, 1d);
-    public static final Attribute PLAYER_SUBMERGED_MINING_SPEED = define("submerged_mining_speed",
-            "player", 0.2d, 0d, 20d);
-    public static final Attribute PLAYER_SWEEPING_DAMAGE_RATIO = define("sweeping_damage_ratio",
-            "player", 0d, 0d, 1d);
-    public static final Attribute GENERIC_WATER_MOVEMENT_EFFICIENCY = define("water_movement_efficiency",
-            "generic", 0d, 0d, 1d);
-
-    // added with 1.21.2
-    public static final Attribute TEMPT_RANGE = define("tempt_range",
-            null, 10d, 0d, 2048d);
-
-    static {
-        REGISTRY.unloadMappings();
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/attribute/StaticAttribute.java

@@ -1,67 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.attribute;
-
-import com.github.retrooper.packetevents.protocol.mapper.AbstractMappedEntity;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
-import org.jetbrains.annotations.Nullable;
-
-public class StaticAttribute extends AbstractMappedEntity implements Attribute {
-
-    private final @Nullable ResourceLocation legacyName;
-    private final double defaultValue;
-    private final double minValue;
-    private final double maxValue;
-
-    StaticAttribute(
-            TypesBuilderData data, String legacyPrefix,
-            double defaultValue, double minValue, double maxValue
-    ) {
-        super(data);
-        this.defaultValue = defaultValue;
-        this.minValue = minValue;
-        this.maxValue = maxValue;
-        this.legacyName = legacyPrefix == null ? null : new ResourceLocation(
-                data.getName().getNamespace(), legacyPrefix + "." + data.getName().getKey());
-    }
-
-    @Override
-    public ResourceLocation getName(ClientVersion version) {
-        assert this.data != null; // not marked as nullable in ctor
-        return version.isNewerThanOrEquals(ClientVersion.V_1_21_2) || this.legacyName == null
-                ? this.data.getName() : this.legacyName;
-    }
-
-    @Override
-    public double getDefaultValue() {
-        return this.defaultValue;
-    }
-
-    @Override
-    public double getMinValue() {
-        return this.minValue;
-    }
-
-    @Override
-    public double getMaxValue() {
-        return this.maxValue;
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/ChatType.java

@@ -18,150 +18,8 @@
 
 package com.github.retrooper.packetevents.protocol.chat;
 
-import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage_v1_19_1;
-import com.github.retrooper.packetevents.protocol.mapper.CopyableEntity;
-import com.github.retrooper.packetevents.protocol.mapper.DeepComparableEntity;
 import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.nbt.NBTString;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.util.Index;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
 
-import java.util.Objects;
+public interface ChatType extends MappedEntity {
 
-import static com.github.retrooper.packetevents.util.adventure.AdventureIndexUtil.indexValueOrThrow;
-
-public interface ChatType extends MappedEntity, CopyableEntity<ChatType>, DeepComparableEntity {
-
-    @UnknownNullability("only nullable for 1.19")
-    ChatTypeDecoration getChatDecoration();
-
-    @ApiStatus.Obsolete(since = "1.19.1")
-    @Nullable ChatTypeDecoration getOverlayDecoration();
-
-    @UnknownNullability("only nullable for 1.19")
-    ChatTypeDecoration getNarrationDecoration();
-
-    @ApiStatus.Obsolete(since = "1.19.1")
-    @Nullable NarrationPriority getNarrationPriority();
-
-    static ChatType readDirect(PacketWrapper<?> wrapper) {
-        ChatTypeDecoration chatDecoration = ChatTypeDecoration.read(wrapper);
-        ChatTypeDecoration narrationDecoration = ChatTypeDecoration.read(wrapper);
-        return new StaticChatType(chatDecoration, narrationDecoration);
-    }
-
-    static void writeDirect(PacketWrapper<?> wrapper, ChatType chatType) {
-        ChatTypeDecoration.write(wrapper, chatType.getChatDecoration());
-        ChatTypeDecoration.write(wrapper, chatType.getNarrationDecoration());
-    }
-
-    static ChatType decode(NBT nbt, ClientVersion version, @Nullable TypesBuilderData data) {
-        // everything is nullable in 1.19, even the chat format!
-        NBTCompound compound = (NBTCompound) nbt;
-        NBTCompound chatTag = compound.getCompoundTagOrNull("chat");
-        NBTCompound narrationTag = compound.getCompoundTagOrNull("narration");
-
-        ChatTypeDecoration overlay = null;
-        NarrationPriority narrationPriority = null;
-        if (version.isOlderThan(ClientVersion.V_1_19_1)) {
-            NBTCompound overlayTag = compound.getCompoundTagOrNull("overlay");
-            if (overlayTag != null) {
-                // why is this nullable? why is this wrapped? There is no reason to wrap this...
-                overlayTag = overlayTag.getCompoundTagOrNull("description");
-                if (overlayTag != null) {
-                    overlay = ChatTypeDecoration.decode(overlayTag, version);
-                }
-            }
-            if (chatTag != null) {
-                chatTag = chatTag.getCompoundTagOrNull("description");
-            }
-            if (narrationTag != null) {
-                // the priority is the ONLY value which isn't nullable!
-                narrationPriority = indexValueOrThrow(NarrationPriority.ID_INDEX,
-                        narrationTag.getStringTagValueOrThrow("priority"));
-                narrationTag = narrationTag.getCompoundTagOrNull("description");
-            }
-        } else {
-            // ensure this isn't null in everything but 1.19
-            Objects.requireNonNull(chatTag, "NBT chat does not exist");
-            Objects.requireNonNull(narrationTag, "NBT narration does not exist");
-        }
-
-        ChatTypeDecoration chat = chatTag == null ? null : ChatTypeDecoration.decode(chatTag, version);
-        ChatTypeDecoration narration = narrationTag == null ? null : ChatTypeDecoration.decode(narrationTag, version);
-        return new StaticChatType(data, chat, overlay, narration, narrationPriority);
-    }
-
-    static NBT encode(ChatType chatType, ClientVersion version) {
-        NBTCompound compound = new NBTCompound();
-        NBT chatTag = chatType.getChatDecoration() == null ? null :
-                ChatTypeDecoration.encode(chatType.getChatDecoration(), version);
-        NBT narrationTag = chatType.getNarrationDecoration() == null ? null :
-                ChatTypeDecoration.encode(chatType.getNarrationDecoration(), version);
-
-        if (version.isOlderThan(ClientVersion.V_1_19_1)) {
-            ChatTypeDecoration overlayDeco = chatType.getOverlayDecoration();
-            if (overlayDeco != null) {
-                NBTCompound overlayCompound = new NBTCompound();
-                overlayCompound.setTag("description",
-                        ChatTypeDecoration.encode(overlayDeco, version));
-                compound.setTag("overlay", overlayCompound);
-            }
-            if (narrationTag != null) {
-                NBTCompound narrationCompound = new NBTCompound();
-                narrationCompound.setTag("description", narrationTag);
-                if (chatType.getNarrationPriority() != null) {
-                    narrationCompound.setTag("priority", new NBTString(chatType.getNarrationPriority().getId()));
-                }
-                narrationTag = narrationCompound;
-            }
-            if (chatTag != null) {
-                NBTCompound chatCompound = new NBTCompound();
-                chatCompound.setTag("description", chatTag);
-                chatTag = chatCompound;
-            }
-        }
-
-        if (chatTag != null) {
-            compound.setTag("chat", chatTag);
-        }
-        if (narrationTag != null) {
-            compound.setTag("narration", narrationTag);
-        }
-        return compound;
-    }
-
-    class Bound extends ChatMessage_v1_19_1.ChatTypeBoundNetwork {
-        public Bound(ChatType type, Component name, @Nullable Component targetName) {
-            super(type, name, targetName);
-        }
-    }
-
-    @ApiStatus.Obsolete(since = "1.19.1")
-    enum NarrationPriority {
-
-        CHAT("chat"),
-        SYSTEM("system");
-
-        public static final Index<String, NarrationPriority> ID_INDEX = Index.create(
-                NarrationPriority.class, NarrationPriority::getId);
-
-        private final String id;
-
-        NarrationPriority(String id) {
-            this.id = id;
-        }
-
-        public String getId() {
-            return this.id;
-        }
-    }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/ChatTypeDecoration.java

@@ -1,195 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.chat;
-
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.nbt.NBTList;
-import com.github.retrooper.packetevents.protocol.nbt.NBTString;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.util.adventure.AdventureSerializer;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentLike;
-import net.kyori.adventure.text.format.Style;
-import net.kyori.adventure.util.Index;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.BiFunction;
-
-import static com.github.retrooper.packetevents.protocol.chat.ChatTypeDecoration.Parameter.CONTENT;
-import static com.github.retrooper.packetevents.protocol.chat.ChatTypeDecoration.Parameter.SENDER;
-import static com.github.retrooper.packetevents.protocol.chat.ChatTypeDecoration.Parameter.TARGET;
-import static com.github.retrooper.packetevents.util.adventure.AdventureIndexUtil.indexValueOrThrow;
-import static java.util.Arrays.asList;
-import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
-import static net.kyori.adventure.text.format.Style.empty;
-import static net.kyori.adventure.text.format.Style.style;
-import static net.kyori.adventure.text.format.TextDecoration.ITALIC;
-
-public class ChatTypeDecoration {
-
-    private final String translationKey;
-    private final List<Parameter> parameters;
-    private final Style style;
-
-    public ChatTypeDecoration(String translationKey, List<Parameter> parameters, Style style) {
-        this.translationKey = translationKey;
-        this.parameters = Collections.unmodifiableList(new ArrayList<>(parameters));
-        this.style = style;
-    }
-
-    public static ChatTypeDecoration read(PacketWrapper<?> wrapper) {
-        String translationKey = wrapper.readString();
-        List<Parameter> parameters = wrapper.readList(ew -> ew.readEnum(Parameter.values()));
-        Style style = wrapper.readStyle();
-        return new ChatTypeDecoration(translationKey, parameters, style);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ChatTypeDecoration decoration) {
-        wrapper.writeString(decoration.translationKey);
-        wrapper.writeList(decoration.parameters, PacketWrapper::writeEnum);
-        wrapper.writeStyle(decoration.style);
-    }
-
-    public static ChatTypeDecoration decode(NBT nbt, ClientVersion version) {
-        NBTCompound compound = (NBTCompound) nbt;
-        String translationKey = compound.getStringTagValueOrThrow("translation_key");
-        NBT paramsTag = compound.getTagOrThrow("parameters");
-        List<Parameter> params;
-        if (paramsTag instanceof NBTList<?>) {
-            params = new ArrayList<>();
-            NBTList<?> paramsTagList = (NBTList<?>) paramsTag;
-            for (NBT paramTag : paramsTagList.getTags()) {
-                String paramId = ((NBTString) paramTag).getValue();
-                params.add(indexValueOrThrow(Parameter.ID_INDEX, paramId));
-            }
-        } else {
-            String paramId = ((NBTString) paramsTag).getValue();
-            params = Collections.singletonList(indexValueOrThrow(Parameter.ID_INDEX, paramId));
-        }
-        NBTCompound styleTag = compound.getCompoundTagOrNull("style");
-        Style style = styleTag == null ? empty() :
-                AdventureSerializer.getNBTSerializer().deserializeStyle(styleTag);
-        return new ChatTypeDecoration(translationKey, params, style);
-    }
-
-    public static NBT encode(ChatTypeDecoration decoration, ClientVersion version) {
-        NBTList<NBTString> paramsTag = NBTList.createStringList();
-        for (Parameter param : decoration.parameters) {
-            paramsTag.addTag(new NBTString(param.getId()));
-        }
-
-        NBTCompound compound = new NBTCompound();
-        compound.setTag("translation_key", new NBTString(decoration.translationKey));
-        compound.setTag("parameters", paramsTag);
-        if (!decoration.style.isEmpty()) {
-            compound.setTag("style", AdventureSerializer.getNBTSerializer()
-                    .serializeStyle(decoration.style));
-        }
-        return compound;
-    }
-
-    public static ChatTypeDecoration withSender(String translationKey) {
-        return new ChatTypeDecoration(translationKey, asList(SENDER, CONTENT), empty());
-    }
-
-    public static ChatTypeDecoration incomingDirectMessage(String translationKey) {
-        return new ChatTypeDecoration(translationKey, asList(SENDER, CONTENT),
-                style(GRAY, ITALIC));
-    }
-
-    public static ChatTypeDecoration outgoingDirectMessage(String translationKey) {
-        return new ChatTypeDecoration(translationKey, asList(TARGET, CONTENT),
-                style(GRAY, ITALIC));
-    }
-
-    public static ChatTypeDecoration teamMessage(String translationKey) {
-        return new ChatTypeDecoration(translationKey, asList(TARGET, SENDER, CONTENT), empty());
-    }
-
-    public Component decorate(Component component, ChatType.Bound chatType) {
-        ComponentLike[] components = new ComponentLike[this.parameters.size()];
-        for (int i = 0; i < components.length; i++) {
-            Parameter parameter = this.parameters.get(i);
-            components[i] = parameter.selector.apply(component, chatType);
-        }
-        return Component.translatable(this.translationKey, null, this.style, components);
-    }
-
-    public String getTranslationKey() {
-        return this.translationKey;
-    }
-
-    public List<Parameter> getParameters() {
-        return this.parameters;
-    }
-
-    public Style getStyle() {
-        return this.style;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ChatTypeDecoration)) return false;
-        ChatTypeDecoration that = (ChatTypeDecoration) obj;
-        if (!this.translationKey.equals(that.translationKey)) return false;
-        if (!this.parameters.equals(that.parameters)) return false;
-        return this.style.equals(that.style);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.translationKey, this.parameters, this.style);
-    }
-
-    public enum Parameter {
-
-        SENDER("sender", (component, type) -> type.getName()),
-        TARGET("target", (component, type) -> type.getTargetName() != null
-                ? type.getTargetName() : Component.empty()),
-        CONTENT("content", (component, type) -> component);
-
-        public static final Index<String, Parameter> ID_INDEX = Index.create(
-                Parameter.class, Parameter::getId);
-
-        private final String id;
-        private final BiFunction<Component, ChatType.Bound, Component> selector;
-
-        Parameter(String id, BiFunction<Component, ChatType.Bound, Component> selector) {
-            this.id = id;
-            this.selector = selector;
-        }
-
-        public String getId() {
-            return this.id;
-        }
-
-        @Deprecated
-        public static @Nullable Parameter valueByName(String id) {
-            return ID_INDEX.value(id);
-        }
-    }
-}
-

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/ChatTypes.java

@@ -19,68 +19,68 @@
 package com.github.retrooper.packetevents.protocol.chat;
 
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.util.mappings.VersionedRegistry;
-import org.jetbrains.annotations.ApiStatus;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.util.TypesBuilder;
+import com.github.retrooper.packetevents.util.TypesBuilderData;
 
-import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import static com.github.retrooper.packetevents.protocol.chat.ChatTypeDecoration.incomingDirectMessage;
-import static com.github.retrooper.packetevents.protocol.chat.ChatTypeDecoration.outgoingDirectMessage;
-import static com.github.retrooper.packetevents.protocol.chat.ChatTypeDecoration.teamMessage;
-import static com.github.retrooper.packetevents.protocol.chat.ChatTypeDecoration.withSender;
+public class ChatTypes {
+    private static final Map<String, ChatType> CHAT_TYPE_MAP = new HashMap<>();
+    //Key - mappings version, value - map with chat type ids and chat types
+    private static final Map<Byte, Map<Integer, ChatType>> CHAT_TYPE_ID_MAP = new HashMap<>();
+    private static final TypesBuilder TYPES_BUILDER = new TypesBuilder("chat/chat_type_mappings",
+            ClientVersion.V_1_18_2,
+            ClientVersion.V_1_19,
+            ClientVersion.V_1_19_1);
 
-public final class ChatTypes {
-
-    private static final VersionedRegistry<ChatType> REGISTRY = new VersionedRegistry<>(
-            "chat_type", "chat/chat_type_mappings");
-
-    private ChatTypes() {
+    static {
+        TYPES_BUILDER.unloadFileMappings();
     }
 
-    @ApiStatus.Internal
     public static ChatType define(String key) {
-        return define(key, withSender("chat.type.text"));
-    }
-
-    @ApiStatus.Internal
-    public static ChatType define(String key, ChatTypeDecoration chatDeco) {
-        return define(key, chatDeco, withSender("chat.type.text.narrate"));
-    }
-
-    @ApiStatus.Internal
-    public static ChatType define(String key, ChatTypeDecoration chatDeco, ChatTypeDecoration narrationDeco) {
-        return REGISTRY.define(key, data ->
-                new StaticChatType(data, chatDeco, narrationDeco));
-    }
-
-    public static VersionedRegistry<ChatType> getRegistry() {
-        return REGISTRY;
+        TypesBuilderData data = TYPES_BUILDER.define(key);
+        ChatType chatType = new ChatType() {
+            private final int[] ids = data.getData();
+
+            @Override
+            public ResourceLocation getName() {
+                return data.getName();
+            }
+
+            @Override
+            public int getId(ClientVersion version) {
+                int index = TYPES_BUILDER.getDataIndex(version);
+                return ids[index];
+            }
+        };
+        CHAT_TYPE_MAP.put(chatType.getName().toString(), chatType);
+        for (ClientVersion version : TYPES_BUILDER.getVersions()) {
+            int index = TYPES_BUILDER.getDataIndex(version);
+            Map<Integer, ChatType> typeIdMap = CHAT_TYPE_ID_MAP.computeIfAbsent((byte) index, k -> new HashMap<>());
+            typeIdMap.put(chatType.getId(version), chatType);
+        }
+        return chatType;
     }
 
+    //with minecraft:key
     public static ChatType getByName(String name) {
-        return REGISTRY.getByName(name);
+        return CHAT_TYPE_MAP.get(name);
     }
 
     public static ChatType getById(ClientVersion version, int id) {
-        return REGISTRY.getById(version, id);
+        int index = TYPES_BUILDER.getDataIndex(version);
+        return CHAT_TYPE_ID_MAP.get((byte) index).get(id);
     }
 
     public static final ChatType CHAT = define("chat");
-    public static final ChatType SAY_COMMAND = define("say_command",
-            withSender("chat.type.announcement"));
-    public static final ChatType MSG_COMMAND_INCOMING = define("msg_command_incoming",
-            incomingDirectMessage("commands.message.display.incoming"));
-    public static final ChatType MSG_COMMAND_OUTGOING = define("msg_command_outgoing",
-            outgoingDirectMessage("commands.message.display.outgoing"));
-    public static final ChatType TEAM_MSG_COMMAND_INCOMING = define("team_msg_command_incoming",
-            teamMessage("chat.type.team.text"));
-    public static final ChatType TEAM_MSG_COMMAND_OUTGOING = define("team_msg_command_outgoing",
-            teamMessage("chat.type.team.sent"));
-    public static final ChatType EMOTE_COMMAND = define("emote_command",
-            withSender("chat.type.emote"),
-            withSender("chat.type.emote"));
-
-    // added by CraftBukkit for a few versions
+    public static final ChatType SAY_COMMAND = define("say_command");
+    public static final ChatType MSG_COMMAND_INCOMING = define("msg_command_incoming");
+    public static final ChatType MSG_COMMAND_OUTGOING = define("msg_command_outgoing");
+    public static final ChatType TEAM_MSG_COMMAND_INCOMING = define("team_msg_command_incoming");
+    public static final ChatType TEAM_MSG_COMMAND_OUTGOING = define("team_msg_command_outgoing");
+    public static final ChatType EMOTE_COMMAND = define("emote_command");
     public static final ChatType RAW = define("raw");
 
     @Deprecated
@@ -91,17 +91,4 @@ public final class ChatTypes {
     public static final ChatType MSG_COMMAND = define("msg_command");
     @Deprecated
     public static final ChatType TEAM_MSG_COMMAND = define("team_msg_command");
-
-    /**
-     * Returns an immutable view of the chat types.
-     *
-     * @return Chat Types
-     */
-    public static Collection<ChatType> values() {
-        return REGISTRY.getEntries();
-    }
-
-    static {
-        REGISTRY.unloadMappings();
-    }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/LastSeenMessages.java

@@ -5,7 +5,6 @@ import org.jetbrains.annotations.Nullable;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.BitSet;
 import java.util.List;
 import java.util.UUID;
 
@@ -33,22 +32,6 @@ public class LastSeenMessages {
         return entries;
     }
 
-    public static class Packed {
-        private List<MessageSignature.Packed> packedMessageSignatures;
-
-        public Packed(List<MessageSignature.Packed> packedMessageSignatures) {
-            this.packedMessageSignatures = packedMessageSignatures;
-        }
-
-        public List<MessageSignature.Packed> getPackedMessageSignatures() {
-            return packedMessageSignatures;
-        }
-
-        public void setPackedMessageSignatures(List<MessageSignature.Packed> packedMessageSignatures) {
-            this.packedMessageSignatures = packedMessageSignatures;
-        }
-    }
-
     public static class Entry {
         private final UUID uuid;
         private final byte[] signature;
@@ -67,11 +50,11 @@ public class LastSeenMessages {
         }
     }
 
-    public static class LegacyUpdate {
+    public static class Update {
         private final LastSeenMessages lastSeenMessages;
         private final @Nullable Entry lastReceived;
 
-        public LegacyUpdate(LastSeenMessages lastSeenMessages, @Nullable Entry lastReceived) {
+        public Update(LastSeenMessages lastSeenMessages, @Nullable Entry lastReceived) {
             this.lastSeenMessages = lastSeenMessages;
             this.lastReceived = lastReceived;
         }
@@ -84,22 +67,4 @@ public class LastSeenMessages {
             return lastReceived;
         }
     }
-
-    public static class Update {
-        private final int offset;
-        private final BitSet acknowledged;
-
-        public Update(int offset, BitSet acknowledged) {
-            this.offset = offset;
-            this.acknowledged = acknowledged;
-        }
-
-        public int getOffset() {
-            return offset;
-        }
-
-        public BitSet getAcknowledged() {
-            return acknowledged;
-        }
-    }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/MessageSignature.java

@@ -1,70 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2023 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.chat;
-
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-
-public class MessageSignature {
-    private byte[] bytes;
-
-    public MessageSignature(byte[] bytes) {
-        this.bytes = bytes;
-    }
-
-    public byte[] getBytes() {
-        return bytes;
-    }
-
-    public void setBytes(byte[] bytes) {
-        this.bytes = bytes;
-    }
-
-    public static class Packed {
-        private int id;
-        private @Nullable MessageSignature fullSignature;
-
-        public Packed(@Nullable MessageSignature fullSignature) {
-            this.id = -1;
-            this.fullSignature = fullSignature;
-        }
-
-        public Packed(int id) {
-            this.id = id;
-            this.fullSignature = null;
-        }
-
-        public int getId() {
-            return id;
-        }
-
-        public void setId(int id) {
-            this.id = id;
-        }
-
-        public Optional<MessageSignature> getFullSignature() {
-            return Optional.ofNullable(fullSignature);
-        }
-
-        public void setFullSignature(@Nullable MessageSignature fullSignature) {
-            this.fullSignature = fullSignature;
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/Node.java

@@ -1,126 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2022 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.chat;
-
-import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.protocol.chat.Parsers.Parser;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Optional;
-
-public class Node {
-
-    private byte flags;
-    private List<Integer> children;
-    private int redirectNodeIndex;
-    private Optional<String> name;
-    private Optional<Parser> parser;
-    private Optional<List<Object>> properties;
-    private Optional<ResourceLocation> suggestionsType;
-
-    public Node(
-            byte flags, List<Integer> children, int redirectNodeIndex, @Nullable String name,
-            @Nullable Integer parserID, @Nullable List<Object> properties, @Nullable ResourceLocation suggestionsType
-    ) {
-        this(flags, children, redirectNodeIndex, name, parserID == null ? null : Parsers.getById(
-                        PacketEvents.getAPI().getServerManager().getVersion().toClientVersion(), parserID),
-                properties, suggestionsType);
-    }
-
-    public Node(
-            byte flags, List<Integer> children, int redirectNodeIndex, @Nullable String name, @Nullable Parser parser,
-            @Nullable List<Object> properties, @Nullable ResourceLocation suggestionsType
-    ) {
-        this.flags = flags;
-        this.children = children;
-        this.redirectNodeIndex = redirectNodeIndex;
-        this.name = Optional.ofNullable(name);
-        this.parser = Optional.ofNullable(parser);
-        this.properties = Optional.ofNullable(properties);
-        this.suggestionsType = Optional.ofNullable(suggestionsType);
-    }
-
-    public byte getFlags() {
-        return flags;
-    }
-
-    public void setFlags(byte flags) {
-        this.flags = flags;
-    }
-
-    public List<Integer> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Integer> children) {
-        this.children = children;
-    }
-
-    public int getRedirectNodeIndex() {
-        return redirectNodeIndex;
-    }
-
-    public void setRedirectNodeIndex(int redirectNodeIndex) {
-        this.redirectNodeIndex = redirectNodeIndex;
-    }
-
-    public Optional<String> getName() {
-        return name;
-    }
-
-    public void setName(Optional<String> name) {
-        this.name = name;
-    }
-
-    public Optional<Parser> getParser() {
-        return this.parser;
-    }
-
-    public void setParser(Optional<Parser> parser) {
-        this.parser = parser;
-    }
-
-    public Optional<Integer> getParserID() {
-        return this.parser.map(parser -> parser.getId(PacketEvents.getAPI()
-                .getServerManager().getVersion().toClientVersion()));
-    }
-
-    public void setParserID(Optional<Integer> parserID) {
-        this.parser = parserID.map(id -> Parsers.getById(PacketEvents.getAPI()
-                .getServerManager().getVersion().toClientVersion(), id));
-    }
-
-    public Optional<List<Object>> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Optional<List<Object>> properties) {
-        this.properties = properties;
-    }
-
-    public Optional<ResourceLocation> getSuggestionsType() {
-        return suggestionsType;
-    }
-
-    public void setSuggestionsType(Optional<ResourceLocation> suggestionsType) {
-        this.suggestionsType = suggestionsType;
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/Parsers.java

@@ -1,280 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.chat;
-
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.util.mappings.MappingHelper;
-import com.github.retrooper.packetevents.util.mappings.TypesBuilder;
-import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-
-public class Parsers {
-
-    private static final List<Parser> ALL_PARSERS = new ArrayList<>(); // support for old methods
-    private static final Map<String, Parser> PARSER_MAP = new HashMap<>();
-    private static final Map<Byte, Map<Integer, Parser>> PARSER_ID_MAP = new HashMap<>();
-    private static final TypesBuilder TYPES_BUILDER = new TypesBuilder("command/argument_parser_mappings");
-
-    public static Parser define(String key) {
-        return define(key, null, null);
-    }
-
-    public static Parser define(String key, @Nullable Reader reader, @Nullable Writer writer) {
-        TypesBuilderData data = TYPES_BUILDER.define(key);
-        Parser parser = new Parser(data, reader, writer);
-
-        ALL_PARSERS.add(parser);
-        MappingHelper.registerMapping(TYPES_BUILDER, PARSER_MAP, PARSER_ID_MAP, parser);
-        return parser;
-    }
-
-    // with key
-    public static Parser getByName(String name) {
-        return PARSER_MAP.get(name);
-    }
-
-    public static Parser getById(ClientVersion version, int id) {
-        int index = TYPES_BUILDER.getDataIndex(version);
-        Map<Integer, Parser> idMap = PARSER_ID_MAP.get((byte) index);
-        return idMap.get(id);
-    }
-
-    public static List<Parser> getParsers() {
-        return Collections.unmodifiableList(ALL_PARSERS);
-    }
-
-    public static final Parser BRIGADIER_BOOL = define("brigadier:bool", null, null);
-    public static final Parser BRIGADIER_FLOAT = define("brigadier:float",
-            packetWrapper -> {
-                byte flags = packetWrapper.readByte();
-                float min = (flags & 0x01) != 0 ? packetWrapper.readFloat() : -Float.MAX_VALUE;
-                float max = (flags & 0x02) != 0 ? packetWrapper.readFloat() : Float.MAX_VALUE;
-                return Arrays.asList(flags, min, max);
-            },
-            (packetWrapper, properties) -> {
-                byte flags = (byte) properties.get(0);
-                packetWrapper.writeByte(flags);
-                if ((flags & 0x01) != 0) packetWrapper.writeFloat((float) properties.get(1));
-                if ((flags & 0x02) != 0) packetWrapper.writeFloat((float) properties.get(2));
-            }
-    );
-    public static final Parser BRIGADIER_DOUBLE = define("brigadier:double",
-            packetWrapper -> {
-                byte flags = packetWrapper.readByte();
-                double min = (flags & 0x01) != 0 ? packetWrapper.readDouble() : -Double.MAX_VALUE;
-                double max = (flags & 0x02) != 0 ? packetWrapper.readDouble() : Double.MAX_VALUE;
-                return Arrays.asList(flags, min, max);
-            },
-            (packetWrapper, properties) -> {
-                byte flags = (byte) properties.get(0);
-                packetWrapper.writeByte(flags);
-                if ((flags & 0x01) != 0) packetWrapper.writeDouble((double) properties.get(1));
-                if ((flags & 0x02) != 0) packetWrapper.writeDouble((double) properties.get(2));
-            }
-    );
-    public static final Parser BRIGADIER_INTEGER = define("brigadier:integer",
-            packetWrapper -> {
-                byte flags = packetWrapper.readByte();
-                int min = (flags & 0x01) != 0 ? packetWrapper.readInt() : Integer.MIN_VALUE;
-                int max = (flags & 0x02) != 0 ? packetWrapper.readInt() : Integer.MAX_VALUE;
-                return Arrays.asList(flags, min, max);
-            },
-            (packetWrapper, properties) -> {
-                byte flags = (byte) properties.get(0);
-                packetWrapper.writeByte(flags);
-                if ((flags & 0x01) != 0) packetWrapper.writeInt((int) properties.get(1));
-                if ((flags & 0x02) != 0) packetWrapper.writeInt((int) properties.get(2));
-            }
-    );
-    public static final Parser BRIGADIER_LONG = define("brigadier:long",
-            packetWrapper -> {
-                byte flags = packetWrapper.readByte();
-                long min = (flags & 0x01) != 0 ? packetWrapper.readLong() : Long.MIN_VALUE;
-                long max = (flags & 0x02) != 0 ? packetWrapper.readLong() : Long.MAX_VALUE;
-                return Arrays.asList(flags, min, max);
-            },
-            (packetWrapper, properties) -> {
-                byte flags = (byte) properties.get(0);
-                packetWrapper.writeByte(flags);
-                if ((flags & 0x01) != 0) packetWrapper.writeLong((long) properties.get(1));
-                if ((flags & 0x02) != 0) packetWrapper.writeLong((long) properties.get(2));
-            }
-    );
-    public static final Parser BRIGADIER_STRING = define("brigadier:string",
-            packetWrapper -> Collections.singletonList(packetWrapper.readVarInt()),
-            (packetWrapper, properties) -> packetWrapper.writeVarInt((Integer) properties.get(0))
-    );
-    public static final Parser ENTITY = define("entity",
-            packetWrapper -> Collections.singletonList(packetWrapper.readByte()),
-            (packetWrapper, properties) -> packetWrapper.writeByte(((Byte) properties.get(0)).intValue())
-    );
-    public static final Parser GAME_PROFILE = define("game_profile", null, null);
-    public static final Parser BLOCK_POS = define("block_pos", null, null);
-    public static final Parser COLUMN_POS = define("column_pos", null, null);
-    public static final Parser VEC3 = define("vec3", null, null);
-    public static final Parser VEC2 = define("vec2", null, null);
-    public static final Parser BLOCK_STATE = define("block_state", null, null);
-    public static final Parser BLOCK_PREDICATE = define("block_predicate", null, null);
-    public static final Parser ITEM_STACK = define("item_stack", null, null);
-    public static final Parser ITEM_PREDICATE = define("item_predicate", null, null);
-    public static final Parser COLOR = define("color", null, null);
-    public static final Parser COMPONENT = define("component", null, null);
-    public static final Parser STYLE = define("style", null, null);
-    public static final Parser MESSAGE = define("message", null, null);
-    public static final Parser NBT_COMPOUND_TAG = define("nbt_compound_tag", null, null);
-    @Deprecated
-    public static final Parser NBT = NBT_COMPOUND_TAG;
-    public static final Parser NBT_TAG = define("nbt_tag", null, null);
-    public static final Parser NBT_PATH = define("nbt_path", null, null);
-    public static final Parser OBJECTIVE = define("objective", null, null);
-    public static final Parser OBJECTIVE_CRITERIA = define("objective_criteria", null, null);
-    public static final Parser OPERATION = define("operation", null, null);
-    public static final Parser PARTICLE = define("particle", null, null);
-    public static final Parser ANGLE = define("angle", null, null);
-    public static final Parser ROTATION = define("rotation", null, null);
-    public static final Parser SCOREBOARD_SLOT = define("scoreboard_slot", null, null);
-    public static final Parser SCORE_HOLDER = define("score_holder",
-            packetWrapper -> Collections.singletonList(packetWrapper.readByte()),
-            (packetWrapper, properties) -> packetWrapper.writeByte(((Byte) properties.get(0)).intValue())
-    );
-    public static final Parser SWIZZLE = define("swizzle", null, null);
-    public static final Parser TEAM = define("team", null, null);
-    public static final Parser ITEM_SLOT = define("item_slot", null, null);
-    public static final Parser ITEM_SLOTS = define("item_slots", null, null);
-    public static final Parser RESOURCE_LOCATION = define("resource_location", null, null);
-    public static final Parser MOB_EFFECT = define("mob_effect", null, null);
-    public static final Parser FUNCTION = define("function", null, null);
-    public static final Parser ENTITY_ANCHOR = define("entity_anchor", null, null);
-    public static final Parser INT_RANGE = define("int_range", null, null);
-    public static final Parser FLOAT_RANGE = define("float_range", null, null);
-    public static final Parser ITEM_ENCHANTMENT = define("item_enchantment", null, null);
-    public static final Parser ENTITY_SUMMON = define("entity_summon", null, null);
-    public static final Parser DIMENSION = define("dimension", null, null);
-    public static final Parser GAMEMODE = define("gamemode", null, null);
-    public static final Parser TIME = define("time",
-            wrapper -> Collections.singletonList(wrapper.getServerVersion()
-                    .isNewerThanOrEquals(ServerVersion.V_1_19_4) ? wrapper.readInt() : 0),
-            (wrapper, properties) -> {
-                if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_19_4)) {
-                    wrapper.writeInt((int) properties.get(0));
-                }
-            }
-    );
-    public static final Parser RESOURCE_OR_TAG = define("resource_or_tag",
-            packetWrapper -> Collections.singletonList(packetWrapper.readIdentifier()),
-            (packetWrapper, properties) -> packetWrapper.writeIdentifier((ResourceLocation) properties.get(0))
-    );
-    public static final Parser RESOURCE_OR_TAG_KEY = define("resource_or_tag_key",
-            packetWrapper -> Collections.singletonList(packetWrapper.readIdentifier()),
-            (packetWrapper, properties) -> packetWrapper.writeIdentifier((ResourceLocation) properties.get(0))
-    );
-    public static final Parser RESOURCE = define("resource",
-            packetWrapper -> Collections.singletonList(packetWrapper.readIdentifier()),
-            (packetWrapper, properties) -> packetWrapper.writeIdentifier((ResourceLocation) properties.get(0))
-    );
-    public static final Parser RESOURCE_KEY = define("resource_key",
-            packetWrapper -> Collections.singletonList(packetWrapper.readIdentifier()),
-            (packetWrapper, properties) -> packetWrapper.writeIdentifier((ResourceLocation) properties.get(0))
-    );
-    public static final Parser TEMPLATE_MIRROR = define("template_mirror", null, null);
-    public static final Parser TEMPLATE_ROTATION = define("template_rotation", null, null);
-    public static final Parser HEIGHTMAP = define("heightmap", null, null);
-    public static final Parser LOOT_TABLE = define("loot_table", null, null);
-    public static final Parser LOOT_PREDICATE = define("loot_predicate", null, null);
-    public static final Parser LOOT_MODIFIER = define("loot_modifier", null, null);
-    public static final Parser UUID = define("uuid", null, null);
-
-    static {
-        TYPES_BUILDER.unloadFileMappings();
-    }
-
-    @FunctionalInterface
-    public interface Reader extends Function<PacketWrapper<?>, List<Object>> {}
-
-    @FunctionalInterface
-    public interface Writer extends BiConsumer<PacketWrapper<?>, List<Object>> {}
-
-    public static final class Parser implements MappedEntity {
-
-        private final TypesBuilderData data;
-        private final Reader reader;
-        private final Writer writer;
-
-        @Deprecated
-        public Parser(String name, @Nullable Function<PacketWrapper<?>, List<Object>> read, @Nullable BiConsumer<PacketWrapper<?>, List<Object>> write) {
-            this(
-                    new TypesBuilderData(new ResourceLocation(name), new int[0]),
-                    read == null ? null : read::apply,
-                    write == null ? null : write::accept
-            );
-        }
-
-        private Parser(TypesBuilderData data, @Nullable Reader reader, Writer writer) {
-            this.data = data;
-            this.reader = reader;
-            this.writer = writer;
-        }
-
-        public Optional<List<Object>> readProperties(PacketWrapper<?> wrapper) {
-            if (this.reader != null) {
-                return Optional.of(this.reader.apply(wrapper));
-            }
-            return Optional.empty();
-        }
-
-        public void writeProperties(PacketWrapper<?> wrapper, List<Object> properties) {
-            if (this.writer != null) {
-                this.writer.accept(wrapper, properties);
-            }
-        }
-
-        @Override
-        public ResourceLocation getName() {
-            return this.data.getName();
-        }
-
-        @Override
-        public int getId(ClientVersion version) {
-            int index = TYPES_BUILDER.getDataIndex(version);
-            return this.data.getData()[index];
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj instanceof Parser) {
-                return this.getName().equals(((Parser) obj).getName());
-            }
-            return false;
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/RemoteChatSession.java

@@ -1,41 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2022 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.chat;
-
-import com.github.retrooper.packetevents.protocol.player.PublicProfileKey;
-
-import java.util.UUID;
-
-public class RemoteChatSession {
-    private final UUID sessionId;
-    private final PublicProfileKey publicProfileKey;
-
-    public RemoteChatSession(UUID sessionId, PublicProfileKey publicProfileKey) {
-        this.sessionId = sessionId;
-        this.publicProfileKey = publicProfileKey;
-    }
-
-    public UUID getSessionId() {
-        return sessionId;
-    }
-
-    public PublicProfileKey getPublicProfileKey() {
-        return publicProfileKey;
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/SignedCommandArgument.java

@@ -1,27 +0,0 @@
-package com.github.retrooper.packetevents.protocol.chat;
-
-public class SignedCommandArgument {
-    private String argument;
-    private MessageSignature signature;
-
-    public SignedCommandArgument(String argument, MessageSignature signature) {
-        this.argument = argument;
-        this.signature = signature;
-    }
-
-    public String getArgument() {
-        return argument;
-    }
-
-    public void setArgument(String argument) {
-        this.argument = argument;
-    }
-
-    public MessageSignature getSignature() {
-        return signature;
-    }
-
-    public void setSignature(MessageSignature signature) {
-        this.signature = signature;
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/StaticChatType.java

@@ -1,120 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.chat;
-
-import com.github.retrooper.packetevents.protocol.mapper.AbstractMappedEntity;
-import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
-
-import java.util.Objects;
-
-public class StaticChatType extends AbstractMappedEntity implements ChatType {
-
-    private final @UnknownNullability("only nullable for 1.19") ChatTypeDecoration chatDecoration;
-    private final @Nullable ChatTypeDecoration overlayDecoration;
-    private final @UnknownNullability("only nullable for 1.19") ChatTypeDecoration narrationDecoration;
-    private final @Nullable NarrationPriority narrationPriority;
-
-    public StaticChatType(
-            ChatTypeDecoration chatDecoration,
-            ChatTypeDecoration narrationDecoration
-    ) {
-        this(null, chatDecoration, null, narrationDecoration, null);
-    }
-
-    public StaticChatType(
-            @Nullable TypesBuilderData data,
-            ChatTypeDecoration chatDecoration,
-            ChatTypeDecoration narrationDecoration
-    ) {
-        this(data, chatDecoration, null, narrationDecoration, null);
-    }
-
-    public StaticChatType(
-            @UnknownNullability("only nullable for 1.19") ChatTypeDecoration chatDecoration,
-            @Nullable ChatTypeDecoration overlayDecoration,
-            @UnknownNullability("only nullable for 1.19") ChatTypeDecoration narrationDecoration,
-            @Nullable NarrationPriority narrationPriority
-    ) {
-        this(null, chatDecoration, overlayDecoration, narrationDecoration, narrationPriority);
-    }
-
-    public StaticChatType(
-            @Nullable TypesBuilderData data,
-            @UnknownNullability("only nullable for 1.19") ChatTypeDecoration chatDecoration,
-            @Nullable ChatTypeDecoration overlayDecoration,
-            @UnknownNullability("only nullable for 1.19") ChatTypeDecoration narrationDecoration,
-            @Nullable NarrationPriority narrationPriority
-    ) {
-        super(data);
-        this.chatDecoration = chatDecoration;
-        this.overlayDecoration = overlayDecoration;
-        this.narrationDecoration = narrationDecoration;
-        this.narrationPriority = narrationPriority;
-    }
-
-    @Override
-    public ChatType copy(@Nullable TypesBuilderData newData) {
-        return new StaticChatType(newData, this.chatDecoration,
-                this.overlayDecoration, this.narrationDecoration, this.narrationPriority);
-    }
-
-    @Override
-    public @UnknownNullability("only nullable for 1.19") ChatTypeDecoration getChatDecoration() {
-        return this.chatDecoration;
-    }
-
-    @Override
-    public @Nullable ChatTypeDecoration getOverlayDecoration() {
-        return this.overlayDecoration;
-    }
-
-    @Override
-    public @UnknownNullability("only nullable for 1.19") ChatTypeDecoration getNarrationDecoration() {
-        return this.narrationDecoration;
-    }
-
-    @Override
-    public @Nullable NarrationPriority getNarrationPriority() {
-        return this.narrationPriority;
-    }
-
-    @Override
-    public boolean deepEquals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof StaticChatType)) return false;
-        if (!super.equals(obj)) return false;
-        StaticChatType that = (StaticChatType) obj;
-        if (!Objects.equals(this.chatDecoration, that.chatDecoration)) return false;
-        if (!Objects.equals(this.overlayDecoration, that.overlayDecoration)) return false;
-        if (!Objects.equals(this.narrationDecoration, that.narrationDecoration)) return false;
-        return this.narrationPriority == that.narrationPriority;
-    }
-
-    @Override
-    public int deepHashCode() {
-        return Objects.hash(super.hashCode(), this.chatDecoration, this.overlayDecoration, this.narrationDecoration, this.narrationPriority);
-    }
-
-    @Override
-    public String toString() {
-        return "StaticChatType{chatDecoration=" + this.chatDecoration + ", overlayDecoration=" + this.overlayDecoration + ", narrationDecoration=" + this.narrationDecoration + ", narrationPriority=" + this.narrationPriority + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19.java

@@ -24,9 +24,10 @@ import org.jetbrains.annotations.Nullable;
 
 import java.time.Instant;
 import java.util.UUID;
-//We'll extend ChatMessage_v1_16 for now, hopefully no breaking changes in the future
-public class ChatMessage_v1_19 extends ChatMessage_v1_16 {
+
+public class ChatMessage_v1_19 extends ChatMessage {
     private @Nullable Component unsignedChatContent;
+    private UUID senderUUID;
     private Component senderDisplayName;
     private @Nullable Component teamName;
     private Instant timestamp;
@@ -36,8 +37,9 @@ public class ChatMessage_v1_19 extends ChatMessage_v1_16 {
     public ChatMessage_v1_19(Component chatContent, @Nullable Component unsignedChatContent, ChatType type,
                              UUID senderUUID, Component senderDisplayName, @Nullable Component teamName, Instant timestamp,
                              long salt, byte[] signature) {
-        super(chatContent, type, senderUUID);
+        super(chatContent, type);
         this.unsignedChatContent = unsignedChatContent;
+        this.senderUUID = senderUUID;
         this.senderDisplayName = senderDisplayName;
         this.teamName = teamName;
         this.timestamp = timestamp;
@@ -49,6 +51,10 @@ public class ChatMessage_v1_19 extends ChatMessage_v1_16 {
         return unsignedChatContent;
     }
 
+    public UUID getSenderUUID() {
+        return senderUUID;
+    }
+
     public Component getSenderDisplayName() {
         return senderDisplayName;
     }
@@ -73,6 +79,10 @@ public class ChatMessage_v1_19 extends ChatMessage_v1_16 {
         this.unsignedChatContent = unsignedChatContent;
     }
 
+    public void setSenderUUID(UUID senderUUID) {
+        this.senderUUID = senderUUID;
+    }
+
     public void setSenderDisplayName(Component senderDisplayName) {
         this.senderDisplayName = senderDisplayName;
     }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19_1.java

@@ -26,11 +26,12 @@ import org.jetbrains.annotations.Nullable;
 
 import java.time.Instant;
 import java.util.UUID;
-//We'll extend ChatMessage_v1_16 for now, hopefully no breaking changes in the future
-public class ChatMessage_v1_19_1 extends ChatMessage_v1_16 {
+
+public class ChatMessage_v1_19_1 extends ChatMessage {
     private String plainContent;
     private @Nullable Component unsignedChatContent;
-    private ChatType.Bound chatFormatting;
+    private UUID senderUUID;
+    private ChatTypeBoundNetwork chatType;
     private byte @Nullable [] previousSignature;
     private byte[] signature;
     private Instant timestamp;
@@ -40,15 +41,16 @@ public class ChatMessage_v1_19_1 extends ChatMessage_v1_16 {
 
     public ChatMessage_v1_19_1(String plainContent, Component decoratedChatContent,
                                @Nullable Component unsignedChatContent,
-                               UUID senderUUID, ChatType.Bound chatFormatting,
+                               UUID senderUUID, ChatTypeBoundNetwork chatType,
                                byte @Nullable [] previousSignature, byte[] signature,
                                Instant timestamp, long salt,
                                LastSeenMessages lastSeenMessages,
                                FilterMask filterMask) {
-        super(decoratedChatContent, chatFormatting.getType(), senderUUID);
+        super(decoratedChatContent, chatType.getType());
         this.plainContent = plainContent;
         this.unsignedChatContent = unsignedChatContent;
-        this.chatFormatting = chatFormatting;
+        this.senderUUID = senderUUID;
+        this.chatType = chatType;
         this.previousSignature = previousSignature;
         this.signature = signature;
         this.timestamp = timestamp;
@@ -77,40 +79,30 @@ public class ChatMessage_v1_19_1 extends ChatMessage_v1_16 {
         this.unsignedChatContent = unsignedChatContent;
     }
 
+    public UUID getSenderUUID() {
+        return senderUUID;
+    }
+
+    public void setSenderUUID(UUID senderUUID) {
+        this.senderUUID = senderUUID;
+    }
+
     @Override
     public ChatType getType() {
-        return chatFormatting.getType();
+        return chatType.getType();
     }
 
     @Override
     public void setType(ChatType type) {
-        chatFormatting.setType(type);
+        chatType.setType(type);
     }
 
-    public ChatType.Bound getChatFormatting() {
-        return chatFormatting;
+    public ChatTypeBoundNetwork getChatType() {
+        return chatType;
     }
 
-    public void setChatFormatting(ChatType.Bound chatFormatting) {
-        this.chatFormatting = chatFormatting;
-    }
-
-    /**
-     * Retrieves the chat formatting. Please refer to {@link ChatMessage_v1_19_1#getChatFormatting}
-     * @return chat formatting which contains the actual chat type.
-     */
-    @Deprecated
-    public ChatType.Bound getChatType() {
-        return chatFormatting;
-    }
-
-    /**
-     * Sets the chat formatting. Please refer to {@link ChatMessage_v1_19_1#setChatFormatting}
-     * @param chatFormatting formatting which contains the actual chat type.
-     */
-    @Deprecated
-    public void setChatType(ChatType.Bound chatFormatting) {
-        this.chatFormatting = chatFormatting;
+    public void setChatType(ChatTypeBoundNetwork type) {
+        this.chatType = type;
     }
 
     public byte @Nullable [] getPreviousSignature() {
@@ -161,10 +153,6 @@ public class ChatMessage_v1_19_1 extends ChatMessage_v1_16 {
         this.filterMask = filterMask;
     }
 
-    /**
-     * Please refer to {@link com.github.retrooper.packetevents.protocol.chat.ChatType.Bound}
-     */
-    @Deprecated
     public static class ChatTypeBoundNetwork {
         private ChatType type;
         private Component name;

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19_3.java

@@ -1,139 +0,0 @@
-package com.github.retrooper.packetevents.protocol.chat.message;
-
-import com.github.retrooper.packetevents.protocol.chat.ChatType;
-import com.github.retrooper.packetevents.protocol.chat.LastSeenMessages;
-import com.github.retrooper.packetevents.protocol.chat.filter.FilterMask;
-import com.github.retrooper.packetevents.util.adventure.AdventureSerializer;
-import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.Nullable;
-
-import java.time.Instant;
-import java.util.Optional;
-import java.util.UUID;
-//We'll extend ChatMessage_v1_16 for now, hopefully no breaking changes in the future
-public class ChatMessage_v1_19_3 extends ChatMessage_v1_16 {
-    int index;
-    byte[] signature;
-    String plainContent;
-    Instant timestamp;
-    long salt;
-    LastSeenMessages.Packed lastSeenMessagesPacked;
-    @Nullable Component unsignedChatContent;
-    FilterMask filterMask;
-    ChatType.Bound chatFormatting;
-
-    public ChatMessage_v1_19_3(UUID senderUUID, int index, byte[] signature, String plainContent, Instant timestamp, long salt, LastSeenMessages.Packed lastSeenMessagesPacked, @Nullable Component unsignedChatContent, FilterMask filterMask, ChatType.Bound chatFormatting) {
-        super(Component.text(plainContent), chatFormatting.getType(), senderUUID);
-        this.index = index;
-        this.signature = signature;
-        this.plainContent = plainContent;
-        this.timestamp = timestamp;
-        this.salt = salt;
-        this.lastSeenMessagesPacked = lastSeenMessagesPacked;
-        this.unsignedChatContent = unsignedChatContent;
-        this.filterMask = filterMask;
-        this.chatFormatting = chatFormatting;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
-    public byte[] getSignature() {
-        return signature;
-    }
-
-    public void setSignature(byte[] signature) {
-        this.signature = signature;
-    }
-
-    @Override
-    public Component getChatContent() {
-        return Component.text(plainContent);
-    }
-
-    @Deprecated
-    @Override
-    public void setChatContent(Component chatContent) {
-        throw new UnsupportedOperationException("PacketEvents is not able to serialize components to plain-text. Please use the #setPlainContent instead to update the content.");
-    }
-
-    public String getPlainContent() {
-        return plainContent;
-    }
-
-    public void setPlainContent(String plainContent) {
-        this.plainContent = plainContent;
-    }
-
-    public Instant getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Instant timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public long getSalt() {
-        return salt;
-    }
-
-    public void setSalt(long salt) {
-        this.salt = salt;
-    }
-
-    public LastSeenMessages.Packed getLastSeenMessagesPacked() {
-        return lastSeenMessagesPacked;
-    }
-
-    public void setLastSeenMessagesPacked(LastSeenMessages.Packed lastSeenMessagesPacked) {
-        this.lastSeenMessagesPacked = lastSeenMessagesPacked;
-    }
-
-    public Optional<Component> getUnsignedChatContent() {
-        return Optional.ofNullable(unsignedChatContent);
-    }
-
-    public void setUnsignedChatContent(@Nullable Component unsignedChatContent) {
-        this.unsignedChatContent = unsignedChatContent;
-    }
-
-    public FilterMask getFilterMask() {
-        return filterMask;
-    }
-
-    public void setFilterMask(FilterMask filterMask) {
-        this.filterMask = filterMask;
-    }
-
-
-    public ChatType.Bound getChatFormatting() {
-        return chatFormatting;
-    }
-
-    public void setChatFormatting(ChatType.Bound chatFormatting) {
-        this.chatFormatting = chatFormatting;
-    }
-
-    /**
-     * Retrieves the chat formatting. Please refer to {@link ChatMessage_v1_19_3#getChatFormatting}
-     * @return chat formatting which contains the actual chat type.
-     */
-    @Deprecated
-    public ChatType.Bound getChatType() {
-        return chatFormatting;
-    }
-
-    /**
-     * Sets the chat formatting. Please refer to {@link ChatMessage_v1_19_3#setChatFormatting}
-     * @param chatFormatting formatting which contains the actual chat type.
-     */
-    @Deprecated
-    public void setChatType(ChatType.Bound chatFormatting) {
-        this.chatFormatting = chatFormatting;
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/reader/impl/ChatMessageProcessorLegacy.java

@@ -31,13 +31,14 @@ public class ChatMessageProcessorLegacy implements ChatMessageProcessor {
     @Override
     public ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper) {
         Component chatContent = wrapper.readComponent();
-        ChatType type = wrapper.readMappedEntity(ChatTypes.getRegistry());
+        int id = wrapper.readByte();
+        ChatType type = ChatTypes.getById(wrapper.getServerVersion().toClientVersion(), id);
         return new ChatMessageLegacy(chatContent, type);
     }
 
     @Override
     public void writeChatMessage(@NotNull PacketWrapper<?> wrapper, @NotNull ChatMessage data) {
         wrapper.writeComponent(data.getChatContent());
-        wrapper.writeMappedEntity(data.getType());
+        wrapper.writeByte(data.getType().getId(wrapper.getServerVersion().toClientVersion()));
     }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/reader/impl/ChatMessageProcessor_v1_16.java

@@ -33,7 +33,8 @@ public class ChatMessageProcessor_v1_16 implements ChatMessageProcessor {
     @Override
     public ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper) {
         Component chatContent = wrapper.readComponent();
-        ChatType type = wrapper.readMappedEntity(ChatTypes.getRegistry());
+        int id = wrapper.readByte();
+        ChatType type = ChatTypes.getById(wrapper.getServerVersion().toClientVersion(), id);
         UUID senderUUID = wrapper.readUUID();
         return new ChatMessage_v1_16(chatContent, type, senderUUID);
     }
@@ -41,7 +42,7 @@ public class ChatMessageProcessor_v1_16 implements ChatMessageProcessor {
     @Override
     public void writeChatMessage(@NotNull PacketWrapper<?> wrapper, @NotNull ChatMessage data) {
         wrapper.writeComponent(data.getChatContent());
-        wrapper.writeMappedEntity(data.getType());
+        wrapper.writeByte(data.getType().getId(wrapper.getServerVersion().toClientVersion()));
         wrapper.writeUUID(((ChatMessage_v1_16) data).getSenderUUID());
     }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/reader/impl/ChatMessageProcessor_v1_19.java

@@ -36,7 +36,8 @@ public class ChatMessageProcessor_v1_19 implements ChatMessageProcessor {
     public ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper) {
         Component chatContent = wrapper.readComponent();
         Component unsignedChatContent = wrapper.readOptional(PacketWrapper::readComponent);
-        ChatType type = wrapper.readMappedEntity(ChatTypes.getRegistry());
+        int id = wrapper.readVarInt();
+        ChatType type = ChatTypes.getById(wrapper.getServerVersion().toClientVersion(), id);
         UUID senderUUID = wrapper.readUUID();
         Component senderDisplayName = wrapper.readComponent();
         @Nullable Component teamName = wrapper.readOptional(PacketWrapper::readComponent);
@@ -52,7 +53,7 @@ public class ChatMessageProcessor_v1_19 implements ChatMessageProcessor {
         ChatMessage_v1_19 newData = (ChatMessage_v1_19) data;
         wrapper.writeComponent(newData.getChatContent());
         wrapper.writeOptional(newData.getUnsignedChatContent(), PacketWrapper::writeComponent);
-        wrapper.writeMappedEntity(newData.getType());
+        wrapper.writeVarInt(newData.getType().getId(wrapper.getServerVersion().toClientVersion()));
         wrapper.writeUUID(newData.getSenderUUID());
         wrapper.writeComponent(newData.getSenderDisplayName());
         wrapper.writeOptional(newData.getTeamName(), PacketWrapper::writeComponent);

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/reader/impl/ChatMessageProcessor_v1_19_1.java

@@ -40,9 +40,7 @@ public class ChatMessageProcessor_v1_19_1 implements ChatMessageProcessor {
         byte[] signature = wrapper.readByteArray();
         String plainContent = wrapper.readString(256);
         Component chatContent = wrapper.readOptional(PacketWrapper::readComponent);
-        if (chatContent == null && plainContent.isEmpty()) {
-            chatContent = Component.empty();
-        } else if (chatContent == null) {
+        if (chatContent == null) {
             chatContent = Component.text(plainContent);
         }
         Instant timestamp = wrapper.readTimestamp();
@@ -50,8 +48,14 @@ public class ChatMessageProcessor_v1_19_1 implements ChatMessageProcessor {
         LastSeenMessages lastSeenMessages = wrapper.readLastSeenMessages();
         Component unsignedChatContent = wrapper.readOptional(PacketWrapper::readComponent);
         FilterMask filterMask = wrapper.readFilterMask();
-        ChatType.Bound chatFormatting = wrapper.readChatTypeBoundNetwork();
-        return new ChatMessage_v1_19_1(plainContent, chatContent, unsignedChatContent, senderUUID, chatFormatting,
+
+        int id = wrapper.readVarInt();
+        ChatType type = ChatTypes.getById(wrapper.getServerVersion().toClientVersion(), id);
+        Component name = wrapper.readComponent();
+        Component targetName = wrapper.readOptional(PacketWrapper::readComponent);
+        ChatMessage_v1_19_1.ChatTypeBoundNetwork chatType = new ChatMessage_v1_19_1.ChatTypeBoundNetwork(type, name, targetName);
+
+        return new ChatMessage_v1_19_1(plainContent, chatContent, unsignedChatContent, senderUUID, chatType,
                 previousSignature, signature, timestamp, salt, lastSeenMessages, filterMask);
     }
 
@@ -68,6 +72,8 @@ public class ChatMessageProcessor_v1_19_1 implements ChatMessageProcessor {
         wrapper.writeLastSeenMessages(newData.getLastSeenMessages());
         wrapper.writeOptional(newData.getUnsignedChatContent(), PacketWrapper::writeComponent);
         wrapper.writeFilterMask(newData.getFilterMask());
-        wrapper.writeChatTypeBoundNetwork(newData.getChatFormatting());
+        wrapper.writeVarInt(newData.getChatType().getType().getId(wrapper.getServerVersion().toClientVersion()));
+        wrapper.writeComponent(newData.getChatType().getName());
+        wrapper.writeOptional(newData.getChatType().getTargetName(), PacketWrapper::writeComponent);
     }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/reader/impl/ChatMessageProcessor_v1_19_3.java

@@ -1,48 +0,0 @@
-package com.github.retrooper.packetevents.protocol.chat.message.reader.impl;
-
-import com.github.retrooper.packetevents.protocol.chat.ChatType;
-import com.github.retrooper.packetevents.protocol.chat.LastSeenMessages;
-import com.github.retrooper.packetevents.protocol.chat.filter.FilterMask;
-import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage;
-import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage_v1_19_1;
-import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage_v1_19_3;
-import com.github.retrooper.packetevents.protocol.chat.message.reader.ChatMessageProcessor;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
-
-import java.time.Instant;
-import java.util.UUID;
-
-public class ChatMessageProcessor_v1_19_3 implements ChatMessageProcessor {
-    @Override
-    public ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper) {
-        UUID senderUUID = wrapper.readUUID();
-        int index = wrapper.readVarInt();
-        byte[] signature = wrapper.readOptional((w) -> w.readBytes(256));
-        String plainContent = wrapper.readString(256);
-        Instant timestamp = wrapper.readTimestamp();
-        long salt = wrapper.readLong();
-        LastSeenMessages.Packed lastSeenMessagesPacked = wrapper.readLastSeenMessagesPacked();
-        Component unsignedChatContent = wrapper.readOptional(PacketWrapper::readComponent);
-        FilterMask filterMask = wrapper.readFilterMask();
-        ChatType.Bound chatType = wrapper.readChatTypeBoundNetwork();
-
-        return new ChatMessage_v1_19_3(senderUUID, index, signature, plainContent, timestamp, salt, lastSeenMessagesPacked, unsignedChatContent, filterMask, chatType);
-    }
-
-    @Override
-    public void writeChatMessage(@NotNull PacketWrapper<?> wrapper, @NotNull ChatMessage data) {
-        ChatMessage_v1_19_3 newData = (ChatMessage_v1_19_3) data;
-        wrapper.writeUUID(newData.getSenderUUID());
-        wrapper.writeVarInt(newData.getIndex());
-        wrapper.writeOptional(newData.getSignature(), PacketWrapper::writeBytes);
-        wrapper.writeString(newData.getPlainContent());
-        wrapper.writeTimestamp(newData.getTimestamp());
-        wrapper.writeLong(newData.getSalt());
-        wrapper.writeLastSeenMessagesPacked(newData.getLastSeenMessagesPacked());
-        wrapper.writeOptional(newData.getUnsignedChatContent().orElse(null), PacketWrapper::writeComponent);
-        wrapper.writeFilterMask(newData.getFilterMask());
-        wrapper.writeChatTypeBoundNetwork(newData.getChatFormatting());
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/color/AlphaColor.java

@@ -1,146 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.color;
-
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.nbt.NBTFloat;
-import com.github.retrooper.packetevents.protocol.nbt.NBTInt;
-import com.github.retrooper.packetevents.protocol.nbt.NBTList;
-import com.github.retrooper.packetevents.protocol.nbt.NBTNumber;
-import com.github.retrooper.packetevents.protocol.nbt.NBTType;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.util.MathUtil;
-import org.jetbrains.annotations.Range;
-
-public final class AlphaColor extends Color {
-
-    public static final AlphaColor WHITE = new AlphaColor(0xFFFFFFFF);
-
-    private final int alpha;
-
-    public AlphaColor(
-            @Range(from = 0L, to = 255L) int red,
-            @Range(from = 0L, to = 255L) int green,
-            @Range(from = 0L, to = 255L) int blue
-    ) {
-        this(255, red, green, blue);
-    }
-
-    public AlphaColor(
-            @Range(from = 0L, to = 255L) int alpha,
-            @Range(from = 0L, to = 255L) int red,
-            @Range(from = 0L, to = 255L) int green,
-            @Range(from = 0L, to = 255L) int blue
-    ) {
-        super(red, green, blue);
-        this.alpha = alpha;
-    }
-
-    public AlphaColor(
-            @Range(from = 0L, to = 1L) float red,
-            @Range(from = 0L, to = 1L) float green,
-            @Range(from = 0L, to = 1L) float blue
-    ) {
-        this(1f, red, green, blue);
-    }
-
-    public AlphaColor(
-            @Range(from = 0L, to = 1L) float alpha,
-            @Range(from = 0L, to = 1L) float red,
-            @Range(from = 0L, to = 1L) float green,
-            @Range(from = 0L, to = 1L) float blue
-    ) {
-        super(red, green, blue);
-        this.alpha = MathUtil.floor(alpha * 255f);
-    }
-
-    public AlphaColor(int rgb) {
-        this((rgb >> 24) & BIT_MASK,
-                (rgb >> 16) & BIT_MASK,
-                (rgb >> 8) & BIT_MASK,
-                rgb & BIT_MASK);
-    }
-
-    public static AlphaColor decode(NBT nbt, ClientVersion version) {
-        if (nbt instanceof NBTNumber) {
-            return new AlphaColor(((NBTNumber) nbt).getAsInt());
-        }
-        NBTList<?> list = (NBTList<?>) nbt;
-        float red = ((NBTNumber) list.getTag(0)).getAsFloat();
-        float green = ((NBTNumber) list.getTag(1)).getAsFloat();
-        float blue = ((NBTNumber) list.getTag(2)).getAsFloat();
-        float alpha = ((NBTNumber) list.getTag(3)).getAsFloat();
-        return new AlphaColor(alpha, red, green, blue);
-    }
-
-    public static NBT encode(AlphaColor color, ClientVersion version) {
-        if (version.isNewerThanOrEquals(ClientVersion.V_1_21_2)) {
-            return new NBTInt(color.asRGB());
-        }
-        NBTList<NBTFloat> list = new NBTList<>(NBTType.FLOAT, 4);
-        list.addTag(new NBTFloat(color.red));
-        list.addTag(new NBTFloat(color.green));
-        list.addTag(new NBTFloat(color.blue));
-        list.addTag(new NBTFloat(color.alpha));
-        return list;
-    }
-
-    public AlphaColor withAlpha(@Range(from = 0L, to = 255L) int alpha) {
-        return new AlphaColor(alpha, this.red, this.green, this.blue);
-    }
-
-    @Override
-    public AlphaColor withRed(@Range(from = 0L, to = 255L) int red) {
-        return new AlphaColor(this.alpha, red, this.green, this.blue);
-    }
-
-    @Override
-    public AlphaColor withGreen(@Range(from = 0L, to = 255L) int green) {
-        return new AlphaColor(this.alpha, this.red, green, this.blue);
-    }
-
-    @Override
-    public AlphaColor withBlue(@Range(from = 0L, to = 255L) int blue) {
-        return new AlphaColor(this.alpha, this.red, this.green, blue);
-    }
-
-    @Override
-    public int asRGB() {
-        return (this.alpha << 24) | (this.red << 16) | (this.green << 8) | this.blue;
-    }
-
-    public @Range(from = 0L, to = 255L) int alpha() {
-        return this.alpha;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 255L) int red() {
-        return this.red;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 255L) int green() {
-        return this.green;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 255L) int blue() {
-        return this.blue;
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/color/Color.java

@@ -1,111 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.color;
-
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.nbt.NBTFloat;
-import com.github.retrooper.packetevents.protocol.nbt.NBTInt;
-import com.github.retrooper.packetevents.protocol.nbt.NBTList;
-import com.github.retrooper.packetevents.protocol.nbt.NBTNumber;
-import com.github.retrooper.packetevents.protocol.nbt.NBTType;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.util.MathUtil;
-import net.kyori.adventure.util.RGBLike;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Range;
-
-public class Color implements RGBLike {
-
-    protected static final int BIT_MASK = 0xFF;
-
-    protected final int red, green, blue;
-
-    public Color(@Range(from = 0L, to = 255L) int red, @Range(from = 0L, to = 255L) int green, @Range(from = 0L, to = 255L) int blue) {
-        this.red = red;
-        this.green = green;
-        this.blue = blue;
-    }
-
-    public Color(
-            @Range(from = 0L, to = 1L) float red,
-            @Range(from = 0L, to = 1L) float green,
-            @Range(from = 0L, to = 1L) float blue
-    ) {
-        this(MathUtil.floor(red * 255f),
-                MathUtil.floor(green * 255f),
-                MathUtil.floor(blue * 255f));
-    }
-
-    public Color(int rgb) {
-        this((rgb >> 16) & BIT_MASK, (rgb >> 8) & BIT_MASK, rgb & BIT_MASK);
-    }
-
-    public static Color decode(NBT nbt, ClientVersion version) {
-        if (nbt instanceof NBTNumber) {
-            return new Color(((NBTNumber) nbt).getAsInt());
-        }
-        NBTList<?> list = (NBTList<?>) nbt;
-        float red = ((NBTNumber) list.getTag(0)).getAsFloat();
-        float green = ((NBTNumber) list.getTag(1)).getAsFloat();
-        float blue = ((NBTNumber) list.getTag(2)).getAsFloat();
-        return new Color(red, green, blue);
-    }
-
-    public static NBT encode(Color color, ClientVersion version) {
-        if (version.isNewerThanOrEquals(ClientVersion.V_1_21_2)) {
-            return new NBTInt(color.asRGB());
-        }
-        NBTList<NBTFloat> list = new NBTList<>(NBTType.FLOAT, 3);
-        list.addTag(new NBTFloat(color.red));
-        list.addTag(new NBTFloat(color.green));
-        list.addTag(new NBTFloat(color.blue));
-        return list;
-    }
-
-    public @NotNull Color withRed(@Range(from = 0L, to = 255L) int red) {
-        return new Color(red, green, blue);
-    }
-
-    public @NotNull Color withGreen(@Range(from = 0L, to = 255L) int green) {
-        return new Color(red, green, blue);
-    }
-
-    public @NotNull Color withBlue(@Range(from = 0L, to = 255L) int blue) {
-        return new Color(red, green, blue);
-    }
-
-    public int asRGB() {
-        return (this.red << 16) | (this.green << 8) | this.blue;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 255L) int red() {
-        return red;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 255L) int green() {
-        return green;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 255L) int blue() {
-        return blue;
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/color/DyeColor.java

@@ -1,103 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.color;
-
-import net.kyori.adventure.util.RGBLike;
-import org.jetbrains.annotations.NotNull;
-
-public enum DyeColor implements RGBLike {
-    WHITE(new Color(0xf9fffe), new Color(0xffffff), new Color(0xf0f0f0), 8),
-
-    ORANGE(new Color(0xf9801d), new Color(0xff681f), new Color(0xeb8844), 15),
-
-    MAGENTA(new Color(0xc74ebd), new Color(0xff00ff), new Color(0xc354cd), 16),
-
-    LIGHT_BLUE(new Color(0x3ab3da), new Color(0x9ac0cd), new Color(0x6689d3), 17),
-
-    YELLOW(new Color(0xfed83d), new Color(0xffff00), new Color(0xdecf2a), 18),
-
-    LIME(new Color(0x80c71f), new Color(0xbfff00), new Color(0x41cd34), 19),
-
-    PINK(new Color(0xf38baa), new Color(0xff69b4), new Color(0xd88198), 20),
-
-    GRAY(new Color(0x474f52), new Color(0x808080), new Color(0x434343), 21),
-
-    LIGHT_GRAY(new Color(0x9d9d97), new Color(0xd3d3d3), new Color(0xababab), 22),
-
-    CYAN(new Color(0x169c9c), new Color(0xffff), new Color(0x287697), 23),
-
-    PURPLE(new Color(0x8932b8), new Color(0xa020f0), new Color(0x7b2fbe), 24),
-
-    BLUE(new Color(0x3c44aa), new Color(0xff), new Color(0x253192), 25),
-
-    BROWN(new Color(0x835432), new Color(0x8b4513), new Color(0x51301a), 26),
-
-    GREEN(new Color(0x5e7c16), new Color(0xff00), new Color(0x3b511a), 27),
-
-    RED(new Color(0xb02e26), new Color(0xff0000), new Color(0xb3312c), 28),
-
-    BLACK(new Color(0x1d1d21), new Color(0x0), new Color(0x1e1b1b), 29);
-
-    private final Color textureDiffuseColor;
-
-    private final Color textColor;
-
-    private final Color fireworkColor;
-
-    private final int mapColorId;
-
-    DyeColor(@NotNull Color textureDiffuseColor, @NotNull Color textColor,
-             @NotNull Color fireworkColor, int mapColorId) {
-        this.textureDiffuseColor = textureDiffuseColor;
-        this.textColor = textColor;
-        this.fireworkColor = fireworkColor;
-        this.mapColorId = mapColorId;
-    }
-
-    public @NotNull Color color() {
-        return this.textureDiffuseColor;
-    }
-
-    public @NotNull Color textColor() {
-        return this.textColor;
-    }
-
-    public @NotNull Color fireworkColor() {
-        return this.fireworkColor;
-    }
-
-    @Override
-    public int red() {
-        return this.textureDiffuseColor.red();
-    }
-
-    @Override
-    public int green() {
-        return this.textureDiffuseColor.green();
-    }
-
-    @Override
-    public int blue() {
-        return this.textureDiffuseColor.blue();
-    }
-
-    public int mapColorId() {
-        return this.mapColorId;
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/ComponentPredicate.java

@@ -1,110 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component;
-
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Predicate;
-
-public class ComponentPredicate implements Predicate<IComponentMap> {
-
-    private List<ComponentValue<?>> requiredComponents;
-
-    public ComponentPredicate(List<ComponentValue<?>> requiredComponents) {
-        this.requiredComponents = requiredComponents;
-    }
-
-    public static ComponentPredicate read(PacketWrapper<?> wrapper) {
-        List<ComponentValue<?>> components = wrapper.readList(ComponentValue::read);
-        return new ComponentPredicate(components);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ComponentPredicate predicate) {
-        wrapper.writeList(predicate.requiredComponents, ComponentValue::write);
-    }
-
-    public static ComponentPredicate emptyPredicate() {
-        return new ComponentPredicate(new ArrayList<>());
-    }
-
-    @SuppressWarnings("unchecked")
-    public static ComponentPredicate fromPatches(PatchableComponentMap components) {
-        Map<ComponentType<?>, Optional<?>> patches = components.getPatches();
-        List<ComponentValue<?>> values = new ArrayList<>(patches.size());
-        for (Map.Entry<ComponentType<?>, Optional<?>> patch : patches.entrySet()) {
-            if (patch.getValue().isPresent()) {
-                values.add(new ComponentValue<>(
-                        (ComponentType<Object>) patch.getKey(),
-                        patch.getValue().get()
-                ));
-            }
-        }
-        return new ComponentPredicate(values);
-    }
-
-    public PatchableComponentMap asPatches(StaticComponentMap base) {
-        PatchableComponentMap patched = new PatchableComponentMap(base);
-        for (ComponentValue<?> component : this.requiredComponents) {
-            patched.set(component);
-        }
-        return patched;
-    }
-
-    @Override
-    public boolean test(IComponentMap components) {
-        for (ComponentValue<?> component : this.requiredComponents) {
-            Optional<?> value = components.getOptional(component.getType());
-            if (!value.isPresent() || !component.getValue().equals(value.get())) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public List<ComponentValue<?>> getRequiredComponents() {
-        return this.requiredComponents;
-    }
-
-    public void setRequiredComponents(List<ComponentValue<?>> requiredComponents) {
-        this.requiredComponents = requiredComponents;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ComponentPredicate)) return false;
-        ComponentPredicate that = (ComponentPredicate) obj;
-        return this.requiredComponents.equals(that.requiredComponents);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.requiredComponents);
-    }
-
-    @Override
-    public String toString() {
-        return "ComponentPredicate{requiredComponents=" + this.requiredComponents + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/ComponentType.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component;
-
-import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-public interface ComponentType<T> extends MappedEntity {
-
-    T read(PacketWrapper<?> wrapper);
-
-    void write(PacketWrapper<?> wrapper, T content);
-
-    T decode(NBT nbt, ClientVersion version);
-
-    NBT encode(T value, ClientVersion version);
-
-    interface Decoder<T> {
-
-        T decode(NBT nbt, ClientVersion version);
-    }
-
-    interface Encoder<T> {
-
-        NBT encode(T value, ClientVersion version);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/ComponentTypes.java

@@ -1,273 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component;
-
-import com.github.retrooper.packetevents.protocol.color.DyeColor;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ArmorTrim;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.BannerLayers;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.BundleContents;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ChargedProjectiles;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.CustomData;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.DebugStickState;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.FireworkExplosion;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.FoodProperties;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemAdventurePredicate;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemAttributeModifiers;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBees;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBlockStateProperties;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemConsumable;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemContainerContents;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemContainerLoot;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemDamageResistant;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemDeathProtection;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemDyeColor;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemEnchantable;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemEnchantments;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemEquippable;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemFireworks;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemJukeboxPlayable;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemLock;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemLore;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemMapDecorations;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemMapPostProcessingState;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemModel;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemPotionContents;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemProfile;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemRarity;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemRecipes;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemRepairable;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemTool;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemTooltipStyle;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemUseCooldown;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemUseRemainder;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.LodestoneTracker;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.PotDecorations;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.SuspiciousStewEffects;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.WritableBookContent;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.WrittenBookContent;
-import com.github.retrooper.packetevents.protocol.item.instrument.Instrument;
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.util.Dummy;
-import com.github.retrooper.packetevents.util.mappings.VersionedRegistry;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper.Reader;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper.Writer;
-import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
-
-/**
- * Contains all item data component types.
- *
- * @see EnchantEffectComponentTypes
- */
-public final class ComponentTypes {
-
-    private static final VersionedRegistry<ComponentType<?>> REGISTRY = new VersionedRegistry<>(
-            "data_component_type", "item/item_component_mappings");
-
-    private ComponentTypes() {
-    }
-
-    @ApiStatus.Internal
-    public static <T> ComponentType<T> define(String key) {
-        return define(key, null, null);
-    }
-
-    @ApiStatus.Internal
-    public static <T> ComponentType<T> define(String key, @Nullable Reader<T> reader, @Nullable Writer<T> writer) {
-        return REGISTRY.define(key, data -> new StaticComponentType<>(data, reader, writer));
-    }
-
-    public static VersionedRegistry<ComponentType<?>> getRegistry() {
-        return REGISTRY;
-    }
-
-    public static ComponentType<?> getByName(String name) {
-        return REGISTRY.getByName(name);
-    }
-
-    public static ComponentType<?> getById(ClientVersion version, int id) {
-        return REGISTRY.getById(version, id);
-    }
-
-    public static final ComponentType<NBTCompound> CUSTOM_DATA = define("custom_data",
-            // mojang wraps their "persistent" codec as a stream codec just here,
-            // so packetevents has to handle nbt strings
-            CustomData::read, CustomData::write);
-    public static final ComponentType<Integer> MAX_STACK_SIZE = define("max_stack_size",
-            PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
-    public static final ComponentType<Integer> MAX_DAMAGE = define("max_damage",
-            PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
-    public static final ComponentType<Integer> DAMAGE = define("damage",
-            PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
-    public static final ComponentType<Boolean> UNBREAKABLE = define("unbreakable",
-            PacketWrapper::readBoolean, PacketWrapper::writeBoolean);
-    public static final ComponentType<Component> CUSTOM_NAME = define("custom_name",
-            PacketWrapper::readComponent, PacketWrapper::writeComponent);
-    public static final ComponentType<Component> ITEM_NAME = define("item_name",
-            PacketWrapper::readComponent, PacketWrapper::writeComponent);
-    public static final ComponentType<ItemLore> LORE = define("lore",
-            ItemLore::read, ItemLore::write);
-    public static final ComponentType<ItemRarity> RARITY = define("rarity",
-            wrapper -> wrapper.readEnum(ItemRarity.values()), PacketWrapper::writeEnum);
-    public static final ComponentType<ItemEnchantments> ENCHANTMENTS = define("enchantments",
-            ItemEnchantments::read, ItemEnchantments::write);
-    public static final ComponentType<ItemAdventurePredicate> CAN_PLACE_ON = define("can_place_on",
-            ItemAdventurePredicate::read, ItemAdventurePredicate::write);
-    public static final ComponentType<ItemAdventurePredicate> CAN_BREAK = define("can_break",
-            ItemAdventurePredicate::read, ItemAdventurePredicate::write);
-    public static final ComponentType<ItemAttributeModifiers> ATTRIBUTE_MODIFIERS = define("attribute_modifiers",
-            ItemAttributeModifiers::read, ItemAttributeModifiers::write);
-    public static final ComponentType<Integer> CUSTOM_MODEL_DATA = define("custom_model_data",
-            PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
-    public static final ComponentType<Dummy> HIDE_ADDITIONAL_TOOLTIP = define("hide_additional_tooltip",
-            Dummy::dummyRead, Dummy::dummyWrite);
-    public static final ComponentType<Dummy> HIDE_TOOLTIP = define("hide_tooltip",
-            Dummy::dummyRead, Dummy::dummyWrite);
-    public static final ComponentType<Integer> REPAIR_COST = define("repair_cost",
-            PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
-    public static final ComponentType<Dummy> CREATIVE_SLOT_LOCK = define("creative_slot_lock",
-            Dummy::dummyRead, Dummy::dummyWrite);
-    public static final ComponentType<Boolean> ENCHANTMENT_GLINT_OVERRIDE = define("enchantment_glint_override",
-            PacketWrapper::readBoolean, PacketWrapper::writeBoolean);
-    public static final ComponentType<Dummy> INTANGIBLE_PROJECTILE = define("intangible_projectile",
-            Dummy::dummyReadNbt, Dummy::dummyWriteNbt);
-    public static final ComponentType<FoodProperties> FOOD = define("food",
-            FoodProperties::read, FoodProperties::write);
-    /**
-     * Has been migrated to #DAMAGE_RESISTANT with 1.21.2.
-     */
-    @ApiStatus.Obsolete
-    public static final ComponentType<Dummy> FIRE_RESISTANT = define("fire_resistant",
-            Dummy::dummyRead, Dummy::dummyWrite);
-    public static final ComponentType<ItemTool> TOOL = define("tool",
-            ItemTool::read, ItemTool::write);
-    public static final ComponentType<ItemEnchantments> STORED_ENCHANTMENTS = define("stored_enchantments",
-            ItemEnchantments::read, ItemEnchantments::write);
-    public static final ComponentType<ItemDyeColor> DYED_COLOR = define("dyed_color",
-            ItemDyeColor::read, ItemDyeColor::write);
-    public static final ComponentType<Integer> MAP_COLOR = define("map_color",
-            PacketWrapper::readInt, PacketWrapper::writeInt);
-    public static final ComponentType<Integer> MAP_ID = define("map_id",
-            PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
-    public static final ComponentType<ItemMapDecorations> MAP_DECORATIONS = define("map_decorations",
-            ItemMapDecorations::read, ItemMapDecorations::write);
-    public static final ComponentType<ItemMapPostProcessingState> MAP_POST_PROCESSING = define("map_post_processing",
-            wrapper -> wrapper.readEnum(ItemMapPostProcessingState.values()), PacketWrapper::writeEnum);
-    public static final ComponentType<ChargedProjectiles> CHARGED_PROJECTILES = define("charged_projectiles",
-            ChargedProjectiles::read, ChargedProjectiles::write);
-    public static final ComponentType<BundleContents> BUNDLE_CONTENTS = define("bundle_contents",
-            BundleContents::read, BundleContents::write);
-    public static final ComponentType<ItemPotionContents> POTION_CONTENTS = define("potion_contents",
-            ItemPotionContents::read, ItemPotionContents::write);
-    public static final ComponentType<SuspiciousStewEffects> SUSPICIOUS_STEW_EFFECTS = define("suspicious_stew_effects",
-            SuspiciousStewEffects::read, SuspiciousStewEffects::write);
-    public static final ComponentType<WritableBookContent> WRITABLE_BOOK_CONTENT = define("writable_book_content",
-            WritableBookContent::read, WritableBookContent::write);
-    public static final ComponentType<WrittenBookContent> WRITTEN_BOOK_CONTENT = define("written_book_content",
-            WrittenBookContent::read, WrittenBookContent::write);
-    public static final ComponentType<ArmorTrim> TRIM = define("trim",
-            ArmorTrim::read, ArmorTrim::write);
-    public static final ComponentType<DebugStickState> DEBUG_STICK_STATE = define("debug_stick_state",
-            DebugStickState::read, DebugStickState::write);
-    public static final ComponentType<NBTCompound> ENTITY_DATA = define("entity_data",
-            PacketWrapper::readNBT, PacketWrapper::writeNBT);
-    public static final ComponentType<NBTCompound> BUCKET_ENTITY_DATA = define("bucket_entity_data",
-            PacketWrapper::readNBT, PacketWrapper::writeNBT);
-    public static final ComponentType<NBTCompound> BLOCK_ENTITY_DATA = define("block_entity_data",
-            PacketWrapper::readNBT, PacketWrapper::writeNBT);
-    public static final ComponentType<Instrument> INSTRUMENT = define("instrument",
-            Instrument::read, Instrument::write);
-    public static final ComponentType<Integer> OMINOUS_BOTTLE_AMPLIFIER = define("ominous_bottle_amplifier",
-            PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
-    public static final ComponentType<ItemRecipes> RECIPES = define("recipes",
-            ItemRecipes::read, ItemRecipes::write);
-    public static final ComponentType<LodestoneTracker> LODESTONE_TRACKER = define("lodestone_tracker",
-            LodestoneTracker::read, LodestoneTracker::write);
-    public static final ComponentType<FireworkExplosion> FIREWORK_EXPLOSION = define("firework_explosion",
-            FireworkExplosion::read, FireworkExplosion::write);
-    public static final ComponentType<ItemFireworks> FIREWORKS = define("fireworks",
-            ItemFireworks::read, ItemFireworks::write);
-    public static final ComponentType<ItemProfile> PROFILE = define("profile",
-            ItemProfile::read, ItemProfile::write);
-    public static final ComponentType<ResourceLocation> NOTE_BLOCK_SOUND = define("note_block_sound",
-            PacketWrapper::readIdentifier, PacketWrapper::writeIdentifier);
-    public static final ComponentType<BannerLayers> BANNER_PATTERNS = define("banner_patterns",
-            BannerLayers::read, BannerLayers::write);
-    public static final ComponentType<DyeColor> BASE_COLOR = define("base_color",
-            wrapper -> wrapper.readEnum(DyeColor.values()), PacketWrapper::writeEnum);
-    public static final ComponentType<PotDecorations> POT_DECORATIONS = define("pot_decorations",
-            PotDecorations::read, PotDecorations::write);
-    public static final ComponentType<ItemContainerContents> CONTAINER = define("container",
-            ItemContainerContents::read, ItemContainerContents::write);
-    public static final ComponentType<ItemBlockStateProperties> BLOCK_STATE = define("block_state",
-            ItemBlockStateProperties::read, ItemBlockStateProperties::write);
-    public static final ComponentType<ItemBees> BEES = define("bees",
-            ItemBees::read, ItemBees::write);
-    public static final ComponentType<ItemLock> LOCK = define("lock",
-            ItemLock::read, ItemLock::write);
-    public static final ComponentType<ItemContainerLoot> CONTAINER_LOOT = define("container_loot",
-            ItemContainerLoot::read, ItemContainerLoot::write);
-
-    // added in 1.21
-    public static final ComponentType<ItemJukeboxPlayable> JUKEBOX_PLAYABLE = define("jukebox_playable",
-            ItemJukeboxPlayable::read, ItemJukeboxPlayable::write);
-
-    // added in 1.21.2
-    public static final ComponentType<ItemConsumable> CONSUMABLE = define("consumable",
-            ItemConsumable::read, ItemConsumable::write);
-    public static final ComponentType<ItemUseRemainder> USE_REMAINDER = define("use_remainder",
-            ItemUseRemainder::read, ItemUseRemainder::write);
-    public static final ComponentType<ItemUseCooldown> USE_COOLDOWN = define("use_cooldown",
-            ItemUseCooldown::read, ItemUseCooldown::write);
-    public static final ComponentType<ItemEnchantable> ENCHANTABLE = define("enchantable",
-            ItemEnchantable::read, ItemEnchantable::write);
-    public static final ComponentType<ItemRepairable> REPAIRABLE = define("repairable",
-            ItemRepairable::read, ItemRepairable::write);
-    public static final ComponentType<ItemModel> ITEM_MODEL = define("item_model",
-            ItemModel::read, ItemModel::write);
-    public static final ComponentType<ItemDamageResistant> DAMAGE_RESISTANT = define("damage_resistant",
-            ItemDamageResistant::read, ItemDamageResistant::write);
-    public static final ComponentType<ItemEquippable> EQUIPPABLE = define("equippable",
-            ItemEquippable::read, ItemEquippable::write);
-    public static final ComponentType<Dummy> GLIDER = define("glider",
-            Dummy::dummyRead, Dummy::dummyWrite);
-    public static final ComponentType<ItemDeathProtection> DEATH_PROTECTION = define("death_protection",
-            ItemDeathProtection::read, ItemDeathProtection::write);
-    public static final ComponentType<ItemTooltipStyle> TOOLTIP_STYLE = define("tooltip_style",
-            ItemTooltipStyle::read, ItemTooltipStyle::write);
-
-    /**
-     * Returns an immutable view of the component types.
-     *
-     * @return Component Types
-     */
-    public static Collection<ComponentType<?>> values() {
-        return REGISTRY.getEntries();
-    }
-
-    static {
-        REGISTRY.unloadMappings();
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/ComponentValue.java

@@ -1,76 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component;
-
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.Objects;
-
-public final class ComponentValue<T> {
-
-    private final ComponentType<T> type;
-    private final T value;
-
-    public ComponentValue(ComponentType<T> type, T value) {
-        this.type = type;
-        this.value = value;
-    }
-
-    public static ComponentValue<?> read(PacketWrapper<?> wrapper) {
-        ComponentType<?> type = wrapper.readMappedEntity(ComponentTypes::getById);
-        return read0(wrapper, type);
-    }
-
-    private static <T> ComponentValue<T> read0(PacketWrapper<?> wrapper, ComponentType<T> type) {
-        // additional method required here for proper handling because of how generics work
-        return new ComponentValue<>(type, type.read(wrapper));
-    }
-
-    public static <T> void write(PacketWrapper<?> wrapper, ComponentValue<T> value) {
-        wrapper.writeMappedEntity(value.type);
-        value.type.write(wrapper, value.value);
-    }
-
-    public ComponentType<T> getType() {
-        return this.type;
-    }
-
-    public T getValue() {
-        return this.value;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ComponentValue)) return false;
-        ComponentValue<?> that = (ComponentValue<?>) obj;
-        if (!this.type.equals(that.type)) return false;
-        return this.value.equals(that.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.type, this.value);
-    }
-
-    @Override
-    public String toString() {
-        return "ComponentValue{type=" + this.type + ", value=" + this.value + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/EnchantEffectComponentTypes.java

@@ -1,120 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component;
-
-import com.github.retrooper.packetevents.protocol.component.ComponentType.Decoder;
-import com.github.retrooper.packetevents.protocol.component.ComponentType.Encoder;
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.util.mappings.VersionedRegistry;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Contains all enchantment effect component types.
- *
- * @see ComponentTypes
- */
-public final class EnchantEffectComponentTypes {
-
-    private static final VersionedRegistry<ComponentType<?>> REGISTRY = new VersionedRegistry<>(
-            "enchantment_effect_component_type", "enchantment/effect_component_type");
-
-    private EnchantEffectComponentTypes() {
-    }
-
-    @ApiStatus.Internal
-    public static <T> ComponentType<T> define(String key) {
-        return define(key, null, null);
-    }
-
-    @ApiStatus.Internal
-    public static <T> ComponentType<T> define(String key, @Nullable Decoder<T> reader, @Nullable Encoder<T> writer) {
-        return REGISTRY.define(key, data -> new StaticComponentType<>(data, reader, writer));
-    }
-
-    public static VersionedRegistry<ComponentType<?>> getRegistry() {
-        return REGISTRY;
-    }
-
-    // just pass everything through for now
-    public static ComponentType<NBT> DAMAGE_PROTECTION = define("damage_protection",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> DAMAGE_IMMUNITY = define("damage_immunity",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> DAMAGE = define("damage",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> SMASH_DAMAGE_PER_FALLEN_BLOCK = define("smash_damage_per_fallen_block",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> KNOCKBACK = define("knockback",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> ARMOR_EFFECTIVENESS = define("armor_effectiveness",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> POST_ATTACK = define("post_attack",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> HIT_BLOCK = define("hit_block",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> ITEM_DAMAGE = define("item_damage",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> ATTRIBUTES = define("attributes",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> EQUIPMENT_DROPS = define("equipment_drops",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> LOCATION_CHANGED = define("location_changed",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> TICK = define("tick",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> AMMO_USE = define("ammo_use",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> PROJECTILE_PIERCING = define("projectile_piercing",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> PROJECTILE_SPAWNED = define("projectile_spawned",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> PROJECTILE_SPREAD = define("projectile_spread",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> PROJECTILE_COUNT = define("projectile_count",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> TRIDENT_RETURN_ACCELERATION = define("trident_return_acceleration",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> FISHING_TIME_REDUCTION = define("fishing_time_reduction",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> FISHING_LUCK_BONUS = define("fishing_luck_bonus",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> BLOCK_EXPERIENCE = define("block_experience",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> MOB_EXPERIENCE = define("mob_experience",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> REPAIR_WITH_XP = define("repair_with_xp",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> CROSSBOW_CHARGE_TIME = define("crossbow_charge_time",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> CROSSBOW_CHARGING_SOUNDS = define("crossbow_charging_sounds",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> TRIDENT_SOUND = define("trident_sound",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> PREVENT_EQUIPMENT_DROP = define("prevent_equipment_drop",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> PREVENT_ARMOR_CHANGE = define("prevent_armor_change",
-            (nbt, version) -> nbt, (val, version) -> val);
-    public static ComponentType<NBT> TRIDENT_SPIN_ATTACK_STRENGTH = define("trident_spin_attack_strength",
-            (nbt, version) -> nbt, (val, version) -> val);
-
-    static {
-        REGISTRY.unloadMappings();
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/IComponentMap.java

@@ -1,89 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component;
-
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.util.mappings.IRegistry;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Map;
-import java.util.Optional;
-
-public interface IComponentMap {
-
-    @SuppressWarnings("unchecked") // safe in this case
-    static StaticComponentMap decode(NBT nbt, ClientVersion version, IRegistry<? extends ComponentType<?>> registry) {
-        NBTCompound compound = (NBTCompound) nbt;
-        StaticComponentMap.Builder components = StaticComponentMap.builder();
-        for (Map.Entry<String, NBT> entry : compound.getTags().entrySet()) {
-            ComponentType<?> type = registry.getByName(entry.getKey());
-            if (type == null) {
-                throw new IllegalStateException("Unknown component type named " + entry.getKey() + " encountered");
-            }
-            Object value = type.decode(entry.getValue(), version);
-            components.set((ComponentType<? super Object>) type, value);
-        }
-        return components.build();
-    }
-
-    @SuppressWarnings("unchecked") // safe in this case
-    static NBT encode(StaticComponentMap components, ClientVersion version) {
-        NBTCompound compound = new NBTCompound();
-        for (Map.Entry<ComponentType<?>, ?> entry : components.getDelegate().entrySet()) {
-            String key = entry.getKey().getName().toString();
-            NBT value = ((ComponentType<? super Object>) entry.getKey()).encode(entry.getValue(), version);
-            compound.setTag(key, value);
-        }
-        return compound;
-    }
-
-    default <T> Optional<T> getOptional(ComponentType<T> type) {
-        return Optional.ofNullable(this.get(type));
-    }
-
-    boolean has(ComponentType<?> type);
-
-    @Contract("_, !null -> !null")
-    default <T> @Nullable T getOr(ComponentType<T> type, @Nullable T otherValue) {
-        T value = this.get(type);
-        if (value != null) {
-            return value;
-        }
-        return otherValue;
-    }
-
-    <T> @Nullable T get(ComponentType<T> type);
-
-    default <T> void set(ComponentValue<T> component) {
-        this.set(component.getType(), component.getValue());
-    }
-
-    default <T> void set(ComponentType<T> type, @Nullable T value) {
-        this.set(type, Optional.ofNullable(value));
-    }
-
-    default <T> void unset(ComponentType<T> type) {
-        this.set(type, Optional.empty());
-    }
-
-    <T> void set(ComponentType<T> type, Optional<T> value);
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/PatchableComponentMap.java

@@ -1,117 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component;
-
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
-public class PatchableComponentMap implements IComponentMap {
-
-    public static final PatchableComponentMap EMPTY = new PatchableComponentMap(
-            Collections.emptyMap(), Collections.emptyMap());
-
-    private final Map<ComponentType<?>, ?> base;
-    private final Map<ComponentType<?>, Optional<?>> patches;
-
-    public PatchableComponentMap(StaticComponentMap base) {
-        this(base.getDelegate(), new HashMap<>());
-    }
-
-    public PatchableComponentMap(Map<ComponentType<?>, ?> base) {
-        this(base, new HashMap<>());
-    }
-
-    public PatchableComponentMap(
-            StaticComponentMap base,
-            Map<ComponentType<?>, Optional<?>> patches
-    ) {
-        this(base.getDelegate(), patches);
-    }
-
-    public PatchableComponentMap(
-            Map<ComponentType<?>, ?> base,
-            Map<ComponentType<?>, Optional<?>> patches
-    ) {
-        this.base = Collections.unmodifiableMap(new HashMap<>(base));
-        this.patches = patches;
-    }
-
-    @SuppressWarnings("unchecked") // no
-    @Override
-    public <T> @Nullable T get(ComponentType<T> type) {
-        Optional<?> patched = this.patches.get(type);
-        if (patched != null) {
-            return (T) patched.orElse(null);
-        }
-        return (T) this.base.get(type);
-    }
-
-    @Override
-    public <T> void set(ComponentType<T> type, Optional<T> value) {
-        Object baseVal = this.base.get(type);
-        T newVal = value.orElse(null);
-        if (Objects.equals(baseVal, newVal)) {
-            this.patches.remove(type); // fallback to base
-        } else {
-            this.patches.put(type, value);
-        }
-    }
-
-    @Override
-    public boolean has(ComponentType<?> type) {
-        Optional<?> patched = this.patches.get(type);
-        return patched != null ? patched.isPresent() : this.base.containsKey(type);
-    }
-
-    public PatchableComponentMap copy() {
-        return new PatchableComponentMap(this.base, new HashMap<>(this.patches));
-    }
-
-    public Map<ComponentType<?>, ?> getBase() {
-        return this.base;
-    }
-
-    public Map<ComponentType<?>, Optional<?>> getPatches() {
-        return this.patches;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof PatchableComponentMap)) return false;
-        PatchableComponentMap that = (PatchableComponentMap) obj;
-        if (!this.base.equals(that.base)) return false;
-        return this.patches.equals(that.patches);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.base, this.patches);
-    }
-
-    @Override
-    public String toString() {
-        return "PatchableComponentMap{base=" + this.base + ", patches=" + this.patches + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/StaticComponentMap.java

@@ -1,147 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component;
-
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemAttributeModifiers;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemEnchantments;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemLore;
-import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemRarity;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
-public class StaticComponentMap implements IComponentMap {
-
-    public static final StaticComponentMap EMPTY = new StaticComponentMap(Collections.emptyMap());
-
-    @ApiStatus.Obsolete
-    public static final StaticComponentMap SHARED_ITEM_COMPONENTS = builder()
-            .set(ComponentTypes.MAX_STACK_SIZE, 64)
-            .set(ComponentTypes.LORE, ItemLore.EMPTY)
-            .set(ComponentTypes.ENCHANTMENTS, ItemEnchantments.EMPTY)
-            .set(ComponentTypes.REPAIR_COST, 0)
-            .set(ComponentTypes.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY)
-            .set(ComponentTypes.RARITY, ItemRarity.COMMON)
-            .build();
-
-    private final boolean empty;
-    private final Map<ComponentType<?>, ?> delegate;
-
-    public StaticComponentMap(Map<ComponentType<?>, ?> delegate) {
-        this.empty = delegate.isEmpty();
-        this.delegate = this.empty ? Collections.emptyMap()
-                : Collections.unmodifiableMap(new HashMap<>(delegate));
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    @Override
-    public boolean has(ComponentType<?> type) {
-        return !this.empty && this.delegate.containsKey(type);
-    }
-
-    @SuppressWarnings("unchecked") // no
-    @Override
-    public <T> @Nullable T get(ComponentType<T> type) {
-        return this.empty ? null : (T) this.delegate.get(type);
-    }
-
-    @Override
-    public <T> void set(ComponentType<T> type, Optional<T> value) {
-        throw new UnsupportedOperationException();
-    }
-
-    public StaticComponentMap merge(StaticComponentMap prioritizedMap) {
-        return builder().setAll(this).setAll(prioritizedMap).build();
-    }
-
-    public Map<ComponentType<?>, ?> getDelegate() {
-        return this.delegate;
-    }
-
-    public boolean isEmpty() {
-        return this.empty;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof StaticComponentMap)) return false;
-        StaticComponentMap that = (StaticComponentMap) obj;
-        return this.delegate.equals(that.delegate);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.delegate);
-    }
-
-    @Override
-    public String toString() {
-        return "Components" + this.delegate;
-    }
-
-    public static class Builder {
-
-        private final Map<ComponentType<?>, Object> map = new HashMap<>();
-
-        public Builder() {
-        }
-
-        public StaticComponentMap build() {
-            return new StaticComponentMap(this.map);
-        }
-
-        public Builder setAll(StaticComponentMap.Builder map) {
-            return this.setAll(map.map);
-        }
-
-        public Builder setAll(StaticComponentMap map) {
-            return this.setAll(map.getDelegate());
-        }
-
-        @SuppressWarnings("unchecked")
-        public Builder setAll(Map<ComponentType<?>, ?> map) {
-            for (Map.Entry<ComponentType<?>, ?> entry : map.entrySet()) {
-                this.set((ComponentType<Object>) entry.getKey(), entry.getValue());
-            }
-            return this;
-        }
-
-        public <T> Builder set(ComponentType<T> type, Optional<T> value) {
-            return this.set(type, value.orElse(null));
-        }
-
-        public <T> Builder set(ComponentType<T> type, @Nullable T value) {
-            if (value == null) {
-                this.map.remove(type);
-            } else {
-                this.map.put(type, value);
-            }
-            return this;
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/StaticComponentType.java

@@ -1,94 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component;
-
-import com.github.retrooper.packetevents.protocol.mapper.AbstractMappedEntity;
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper.Reader;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper.Writer;
-import org.jetbrains.annotations.Nullable;
-
-public class StaticComponentType<T> extends AbstractMappedEntity implements ComponentType<T> {
-
-    private final @Nullable Reader<T> reader;
-    private final @Nullable Writer<T> writer;
-    private final @Nullable Decoder<T> decoder;
-    private final @Nullable Encoder<T> encoder;
-
-    public StaticComponentType(
-            @Nullable TypesBuilderData data,
-            @Nullable Reader<T> reader,
-            @Nullable Writer<T> writer
-    ) {
-        this(data, reader, writer, null, null);
-    }
-
-    public StaticComponentType(
-            @Nullable TypesBuilderData data,
-            @Nullable Decoder<T> decoder,
-            @Nullable Encoder<T> encoder
-    ) {
-        this(data, null, null, decoder, encoder);
-    }
-
-    public StaticComponentType(
-            @Nullable TypesBuilderData data,
-            @Nullable Reader<T> reader,
-            @Nullable Writer<T> writer,
-            @Nullable Decoder<T> decoder,
-            @Nullable Encoder<T> encoder
-    ) {
-        super(data);
-        this.reader = reader;
-        this.writer = writer;
-        this.decoder = decoder;
-        this.encoder = encoder;
-    }
-
-    @Override
-    public T read(PacketWrapper<?> wrapper) {
-        return this.reader != null ? this.reader.apply(wrapper) : null;
-    }
-
-    @Override
-    public void write(PacketWrapper<?> wrapper, T content) {
-        if (this.writer != null) {
-            this.writer.accept(wrapper, content);
-        }
-    }
-
-    @Override
-    public T decode(NBT nbt, ClientVersion version) {
-        if (this.decoder != null) {
-            return this.decoder.decode(nbt, version);
-        }
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public NBT encode(T value, ClientVersion version) {
-        if (this.encoder != null) {
-            return this.encoder.encode(value, version);
-        }
-        throw new UnsupportedOperationException();
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ArmorTrim.java

@@ -1,95 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.item.trimmaterial.TrimMaterial;
-import com.github.retrooper.packetevents.protocol.item.trimpattern.TrimPattern;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.Objects;
-
-public class ArmorTrim {
-
-    private TrimMaterial material;
-    private TrimPattern pattern;
-    private boolean showInTooltip;
-
-    public ArmorTrim(TrimMaterial material, TrimPattern pattern, boolean showInTooltip) {
-        this.material = material;
-        this.pattern = pattern;
-        this.showInTooltip = showInTooltip;
-    }
-
-    public static ArmorTrim read(PacketWrapper<?> wrapper) {
-        TrimMaterial material = TrimMaterial.read(wrapper);
-        TrimPattern pattern = TrimPattern.read(wrapper);
-        boolean showInTooltip = wrapper.readBoolean();
-        return new ArmorTrim(material, pattern, showInTooltip);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ArmorTrim trim) {
-        TrimMaterial.write(wrapper, trim.material);
-        TrimPattern.write(wrapper, trim.pattern);
-        wrapper.writeBoolean(trim.showInTooltip);
-    }
-
-    public TrimMaterial getMaterial() {
-        return this.material;
-    }
-
-    public void setMaterial(TrimMaterial material) {
-        this.material = material;
-    }
-
-    public TrimPattern getPattern() {
-        return this.pattern;
-    }
-
-    public void setPattern(TrimPattern pattern) {
-        this.pattern = pattern;
-    }
-
-    public boolean isShowInTooltip() {
-        return this.showInTooltip;
-    }
-
-    public void setShowInTooltip(boolean showInTooltip) {
-        this.showInTooltip = showInTooltip;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ArmorTrim)) return false;
-        ArmorTrim armorTrim = (ArmorTrim) obj;
-        if (this.showInTooltip != armorTrim.showInTooltip) return false;
-        if (!this.material.equals(armorTrim.material)) return false;
-        return this.pattern.equals(armorTrim.pattern);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.material, this.pattern, this.showInTooltip);
-    }
-
-    @Override
-    public String toString() {
-        return "ArmorTrim{material=" + this.material + ", pattern=" + this.pattern + ", showInTooltip=" + this.showInTooltip + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/BannerLayers.java

@@ -1,123 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.color.DyeColor;
-import com.github.retrooper.packetevents.protocol.item.banner.BannerPattern;
-import com.github.retrooper.packetevents.protocol.item.banner.BannerPatterns;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.List;
-import java.util.Objects;
-
-public class BannerLayers {
-
-    private List<Layer> layers;
-
-    public BannerLayers(List<Layer> layers) {
-        this.layers = layers;
-    }
-
-    public static BannerLayers read(PacketWrapper<?> wrapper) {
-        List<Layer> layers = wrapper.readList(Layer::read);
-        return new BannerLayers(layers);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, BannerLayers patterns) {
-        wrapper.writeList(patterns.layers, Layer::write);
-    }
-
-    public void addLayer(Layer layer) {
-        this.layers.add(layer);
-    }
-
-    public List<Layer> getLayers() {
-        return this.layers;
-    }
-
-    public void setLayers(List<Layer> layers) {
-        this.layers = layers;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof BannerLayers)) return false;
-        BannerLayers that = (BannerLayers) obj;
-        return this.layers.equals(that.layers);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.layers);
-    }
-
-    public static class Layer {
-
-        private BannerPattern pattern;
-        private DyeColor color;
-
-        public Layer(BannerPattern pattern, DyeColor color) {
-            this.pattern = pattern;
-            this.color = color;
-        }
-
-        public static Layer read(PacketWrapper<?> wrapper) {
-            BannerPattern pattern = wrapper.readMappedEntityOrDirect(
-                    BannerPatterns.getRegistry(), BannerPattern::readDirect);
-            DyeColor color = wrapper.readEnum(DyeColor.values());
-            return new Layer(pattern, color);
-        }
-
-        public static void write(PacketWrapper<?> wrapper, Layer layer) {
-            wrapper.writeMappedEntityOrDirect(layer.pattern, BannerPattern::writeDirect);
-            wrapper.writeEnum(layer.color);
-        }
-
-        public BannerPattern getPattern() {
-            return this.pattern;
-        }
-
-        public void setPattern(BannerPattern pattern) {
-            this.pattern = pattern;
-        }
-
-        public DyeColor getColor() {
-            return this.color;
-        }
-
-        public void setColor(DyeColor color) {
-            this.color = color;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof Layer)) return false;
-            Layer layer = (Layer) obj;
-            if (!this.pattern.equals(layer.pattern)) return false;
-            return this.color == layer.color;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.pattern, this.color);
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/BundleContents.java

@@ -1,68 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.item.ItemStack;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.List;
-import java.util.Objects;
-
-public class BundleContents {
-
-    private List<ItemStack> items;
-
-    public BundleContents(List<ItemStack> items) {
-        this.items = items;
-    }
-
-    public static BundleContents read(PacketWrapper<?> wrapper) {
-        List<ItemStack> items = wrapper.readList(PacketWrapper::readPresentItemStack);
-        return new BundleContents(items);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, BundleContents projectiles) {
-        wrapper.writeList(projectiles.items, PacketWrapper::writePresentItemStack);
-    }
-
-    public void addItem(ItemStack itemStack) {
-        this.items.add(itemStack);
-    }
-
-    public List<ItemStack> getItems() {
-        return this.items;
-    }
-
-    public void setItems(List<ItemStack> items) {
-        this.items = items;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof BundleContents)) return false;
-        BundleContents that = (BundleContents) obj;
-        return this.items.equals(that.items);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.items);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ChargedProjectiles.java

@@ -1,68 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.item.ItemStack;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.List;
-import java.util.Objects;
-
-public class ChargedProjectiles {
-
-    private List<ItemStack> items;
-
-    public ChargedProjectiles(List<ItemStack> items) {
-        this.items = items;
-    }
-
-    public static ChargedProjectiles read(PacketWrapper<?> wrapper) {
-        List<ItemStack> items = wrapper.readList(PacketWrapper::readPresentItemStack);
-        return new ChargedProjectiles(items);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ChargedProjectiles projectiles) {
-        wrapper.writeList(projectiles.items, PacketWrapper::writePresentItemStack);
-    }
-
-    public void addItem(ItemStack itemStack) {
-        this.items.add(itemStack);
-    }
-
-    public List<ItemStack> getItems() {
-        return this.items;
-    }
-
-    public void setItems(List<ItemStack> items) {
-        this.items = items;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ChargedProjectiles)) return false;
-        ChargedProjectiles that = (ChargedProjectiles) obj;
-        return this.items.equals(that.items);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.items);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/CustomData.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.nbt.NBTString;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-public class CustomData {
-
-    private CustomData() {
-    }
-
-    public static NBTCompound read(PacketWrapper<?> wrapper) {
-        NBT nbt = wrapper.readNBTRaw();
-        if (nbt instanceof NBTCompound) {
-            return (NBTCompound) nbt;
-        }
-        if (nbt instanceof NBTString) {
-            // TODO: parse nbt string
-        }
-        throw new UnsupportedOperationException("Unsupported custom data nbt type: " + nbt.getType());
-    }
-
-    public static void write(PacketWrapper<?> wrapper, NBTCompound compound) {
-        wrapper.writeNBT(compound);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/DebugStickState.java

@@ -1,93 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.nbt.NBTString;
-import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
-import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class DebugStickState {
-
-    private Map<StateType, String> properties;
-
-    public DebugStickState(Map<StateType, String> properties) {
-        this.properties = properties;
-    }
-
-    public static DebugStickState read(PacketWrapper<?> wrapper) {
-        NBTCompound compound = wrapper.readNBT();
-        Map<StateType, String> properties = new HashMap<>(compound.size());
-        for (Map.Entry<String, NBT> tag : compound.getTags().entrySet()) {
-            StateType stateType = StateTypes.getByName(tag.getKey());
-            String property = ((NBTString) tag.getValue()).getValue();
-            properties.put(stateType, property);
-        }
-        return new DebugStickState(properties);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, DebugStickState state) {
-        NBTCompound compound = new NBTCompound();
-        for (Map.Entry<StateType, String> property : state.properties.entrySet()) {
-            compound.setTag(property.getKey().getName(),
-                    new NBTString(property.getValue()));
-        }
-        wrapper.writeNBT(compound);
-    }
-
-    public @Nullable String getProperty(StateType stateType) {
-        return this.properties.get(stateType);
-    }
-
-    public void setProperty(StateType stateType, @Nullable String property) {
-        if (property != null) {
-            this.properties.put(stateType, property);
-        } else {
-            this.properties.remove(stateType);
-        }
-    }
-
-    public Map<StateType, String> getProperties() {
-        return this.properties;
-    }
-
-    public void setProperties(Map<StateType, String> properties) {
-        this.properties = properties;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof DebugStickState)) return false;
-        DebugStickState that = (DebugStickState) o;
-        return this.properties.equals(that.properties);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.properties);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/FireworkExplosion.java

@@ -1,134 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.List;
-import java.util.Objects;
-
-public class FireworkExplosion {
-
-    private Shape shape;
-    private List<Integer> colors;
-    private List<Integer> fadeColors;
-    private boolean hasTrail;
-    private boolean hasTwinkle;
-
-    public FireworkExplosion(
-            Shape shape, List<Integer> colors, List<Integer> fadeColors,
-            boolean hasTrail, boolean hasTwinkle
-    ) {
-        this.shape = shape;
-        this.colors = colors;
-        this.fadeColors = fadeColors;
-        this.hasTrail = hasTrail;
-        this.hasTwinkle = hasTwinkle;
-    }
-
-    public static FireworkExplosion read(PacketWrapper<?> wrapper) {
-        Shape shape = wrapper.readEnum(Shape.values());
-        List<Integer> colors = wrapper.readList(PacketWrapper::readInt);
-        List<Integer> fadeColors = wrapper.readList(PacketWrapper::readInt);
-        boolean hasTrail = wrapper.readBoolean();
-        boolean hasTwinkle = wrapper.readBoolean();
-        return new FireworkExplosion(shape, colors, fadeColors, hasTrail, hasTwinkle);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, FireworkExplosion explosion) {
-        wrapper.writeEnum(explosion.shape);
-        wrapper.writeList(explosion.colors, PacketWrapper::writeInt);
-        wrapper.writeList(explosion.fadeColors, PacketWrapper::writeInt);
-        wrapper.writeBoolean(explosion.hasTrail);
-        wrapper.writeBoolean(explosion.hasTwinkle);
-    }
-
-    public Shape getShape() {
-        return this.shape;
-    }
-
-    public void setShape(Shape shape) {
-        this.shape = shape;
-    }
-
-    public void addColor(int color) {
-        this.colors.add(color);
-    }
-
-    public List<Integer> getColors() {
-        return this.colors;
-    }
-
-    public void setColors(List<Integer> colors) {
-        this.colors = colors;
-    }
-
-    public void addFadeColor(int color) {
-        this.fadeColors.add(color);
-    }
-
-    public List<Integer> getFadeColors() {
-        return this.fadeColors;
-    }
-
-    public void setFadeColors(List<Integer> fadeColors) {
-        this.fadeColors = fadeColors;
-    }
-
-    public boolean isHasTrail() {
-        return this.hasTrail;
-    }
-
-    public void setHasTrail(boolean hasTrail) {
-        this.hasTrail = hasTrail;
-    }
-
-    public boolean isHasTwinkle() {
-        return this.hasTwinkle;
-    }
-
-    public void setHasTwinkle(boolean hasTwinkle) {
-        this.hasTwinkle = hasTwinkle;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof FireworkExplosion)) return false;
-        FireworkExplosion that = (FireworkExplosion) obj;
-        if (this.hasTrail != that.hasTrail) return false;
-        if (this.hasTwinkle != that.hasTwinkle) return false;
-        if (this.shape != that.shape) return false;
-        if (!this.colors.equals(that.colors)) return false;
-        return this.fadeColors.equals(that.fadeColors);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.shape, this.colors, this.fadeColors, this.hasTrail, this.hasTwinkle);
-    }
-
-    public enum Shape {
-        SMALL_BALL,
-        LARGE_BALL,
-        STAR,
-        CREEPER,
-        BURST,
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/FoodProperties.java

@@ -1,258 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.protocol.item.ItemStack;
-import com.github.retrooper.packetevents.protocol.potion.PotionEffect;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-public class FoodProperties {
-
-    private int nutrition;
-    private float saturation;
-    private boolean canAlwaysEat;
-    private float eatSeconds;
-    private List<PossibleEffect> effects;
-    private @Nullable ItemStack usingConvertsTo;
-
-    public FoodProperties(
-            int nutrition, float saturation, boolean canAlwaysEat
-    ) {
-        this(nutrition, saturation, canAlwaysEat, 1.6f, Collections.emptyList());
-    }
-
-    /**
-     * <code>eatSeconds</code> and <code>effects</code>
-     * have been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public FoodProperties(
-            int nutrition, float saturation, boolean canAlwaysEat,
-            float eatSeconds, List<PossibleEffect> effects
-    ) {
-        this(nutrition, saturation, canAlwaysEat, eatSeconds, effects, null);
-    }
-
-    /**
-     * <code>eatSeconds</code>, <code>effects</code> and <code>usingConvertsTo</code>
-     * have been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public FoodProperties(
-            int nutrition, float saturation, boolean canAlwaysEat, float eatSeconds,
-            List<PossibleEffect> effects, @Nullable ItemStack usingConvertsTo
-    ) {
-        this.nutrition = nutrition;
-        this.saturation = saturation;
-        this.canAlwaysEat = canAlwaysEat;
-        this.eatSeconds = eatSeconds;
-        this.effects = effects;
-        this.usingConvertsTo = usingConvertsTo;
-    }
-
-    public static FoodProperties read(PacketWrapper<?> wrapper) {
-        int nutrition = wrapper.readVarInt();
-        float saturation = wrapper.readFloat();
-        boolean canAlwaysEat = wrapper.readBoolean();
-        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_2)) {
-            return new FoodProperties(nutrition, saturation, canAlwaysEat);
-        }
-        float eatSeconds = wrapper.readFloat();
-        ItemStack usingConvertsTo = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21)
-                ? wrapper.readOptional(PacketWrapper::readItemStack) : null;
-        List<PossibleEffect> effects = wrapper.readList(PossibleEffect::read);
-        return new FoodProperties(nutrition, saturation, canAlwaysEat, eatSeconds, effects, usingConvertsTo);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, FoodProperties props) {
-        wrapper.writeVarInt(props.nutrition);
-        wrapper.writeFloat(props.saturation);
-        wrapper.writeBoolean(props.canAlwaysEat);
-        if (wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_2)) {
-            wrapper.writeFloat(props.eatSeconds);
-            if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21)) {
-                wrapper.writeOptional(props.usingConvertsTo, PacketWrapper::writeItemStack);
-            }
-            wrapper.writeList(props.effects, PossibleEffect::write);
-        }
-    }
-
-    public int getNutrition() {
-        return this.nutrition;
-    }
-
-    public void setNutrition(int nutrition) {
-        this.nutrition = nutrition;
-    }
-
-    public float getSaturation() {
-        return this.saturation;
-    }
-
-    public void setSaturation(float saturation) {
-        this.saturation = saturation;
-    }
-
-    public boolean isCanAlwaysEat() {
-        return this.canAlwaysEat;
-    }
-
-    public void setCanAlwaysEat(boolean canAlwaysEat) {
-        this.canAlwaysEat = canAlwaysEat;
-    }
-
-    /**
-     * Has been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public float getEatSeconds() {
-        return this.eatSeconds;
-    }
-
-    /**
-     * Has been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public void setEatSeconds(float eatSeconds) {
-        this.eatSeconds = eatSeconds;
-    }
-
-    /**
-     * Has been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public void addEffect(PossibleEffect effect) {
-        this.effects.add(effect);
-    }
-
-    /**
-     * Has been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public List<PossibleEffect> getEffects() {
-        return this.effects;
-    }
-
-    /**
-     * Has been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public void setEffects(List<PossibleEffect> effects) {
-        this.effects = effects;
-    }
-
-    /**
-     * Has been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public @Nullable ItemStack getUsingConvertsTo() {
-        return this.usingConvertsTo;
-    }
-
-    /**
-     * Has been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public void setUsingConvertsTo(@Nullable ItemStack usingConvertsTo) {
-        this.usingConvertsTo = usingConvertsTo;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof FoodProperties)) return false;
-        FoodProperties that = (FoodProperties) obj;
-        if (this.nutrition != that.nutrition) return false;
-        if (Float.compare(that.saturation, this.saturation) != 0) return false;
-        if (this.canAlwaysEat != that.canAlwaysEat) return false;
-        if (Float.compare(that.eatSeconds, this.eatSeconds) != 0) return false;
-        if (!this.effects.equals(that.effects)) return false;
-        return Objects.equals(this.usingConvertsTo, that.usingConvertsTo);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.nutrition, this.saturation, this.canAlwaysEat, this.eatSeconds, this.effects, this.usingConvertsTo);
-    }
-
-    /**
-     * Has been moved to {@link ItemConsumable} in 1.21.2
-     */
-    @ApiStatus.Obsolete
-    public static class PossibleEffect {
-
-        private PotionEffect effect;
-        private float probability;
-
-        public PossibleEffect(PotionEffect effect, float probability) {
-            this.effect = effect;
-            this.probability = probability;
-        }
-
-        public static PossibleEffect read(PacketWrapper<?> wrapper) {
-            PotionEffect effect = PotionEffect.read(wrapper);
-            float probability = wrapper.readFloat();
-            return new PossibleEffect(effect, probability);
-        }
-
-        public static void write(PacketWrapper<?> wrapper, PossibleEffect effect) {
-            PotionEffect.write(wrapper, effect.effect);
-            wrapper.writeFloat(effect.probability);
-        }
-
-        public PotionEffect getEffect() {
-            return this.effect;
-        }
-
-        public void setEffect(PotionEffect effect) {
-            this.effect = effect;
-        }
-
-        public float getProbability() {
-            return this.probability;
-        }
-
-        public void setProbability(float probability) {
-            this.probability = probability;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof PossibleEffect)) return false;
-            PossibleEffect that = (PossibleEffect) obj;
-            if (Float.compare(that.probability, this.probability) != 0) return false;
-            return this.effect.equals(that.effect);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.effect, this.probability);
-        }
-    }
-}
-
-

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemAdventurePredicate.java

@@ -1,330 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.mapper.MappedEntitySet;
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
-import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-// why do I have to implement this mess, I just want to deserialize items
-public class ItemAdventurePredicate {
-
-    private List<BlockPredicate> predicates;
-    private boolean showInTooltip;
-
-    public ItemAdventurePredicate(List<BlockPredicate> predicates, boolean showInTooltip) {
-        this.predicates = predicates;
-        this.showInTooltip = showInTooltip;
-    }
-
-    public static ItemAdventurePredicate read(PacketWrapper<?> wrapper) {
-        List<BlockPredicate> predicates = wrapper.readList(BlockPredicate::read);
-        boolean showInTooltip = wrapper.readBoolean();
-        return new ItemAdventurePredicate(predicates, showInTooltip);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemAdventurePredicate predicate) {
-        wrapper.writeList(predicate.predicates, BlockPredicate::write);
-        wrapper.writeBoolean(predicate.showInTooltip);
-    }
-
-    public void addPredicate(BlockPredicate predicate) {
-        this.predicates.add(predicate);
-    }
-
-    public List<BlockPredicate> getPredicates() {
-        return this.predicates;
-    }
-
-    public void setPredicates(List<BlockPredicate> predicates) {
-        this.predicates = predicates;
-    }
-
-    public boolean isShowInTooltip() {
-        return this.showInTooltip;
-    }
-
-    public void setShowInTooltip(boolean showInTooltip) {
-        this.showInTooltip = showInTooltip;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemAdventurePredicate)) return false;
-        ItemAdventurePredicate that = (ItemAdventurePredicate) obj;
-        if (this.showInTooltip != that.showInTooltip) return false;
-        return this.predicates.equals(that.predicates);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.predicates, this.showInTooltip);
-    }
-
-    public static class BlockPredicate {
-
-        private @Nullable MappedEntitySet<StateType.Mapped> blocks;
-        private @Nullable List<PropertyMatcher> properties;
-        private @Nullable NBTCompound nbt;
-
-        public BlockPredicate(
-                @Nullable MappedEntitySet<StateType.Mapped> blocks,
-                @Nullable List<PropertyMatcher> properties,
-                @Nullable NBTCompound nbt
-        ) {
-            this.blocks = blocks;
-            this.properties = properties;
-            this.nbt = nbt;
-        }
-
-        public static BlockPredicate read(PacketWrapper<?> wrapper) {
-            MappedEntitySet<StateType.Mapped> blocks = wrapper.readOptional(
-                    ew -> MappedEntitySet.read(ew, StateTypes::getMappedById));
-            List<PropertyMatcher> properties = wrapper.readOptional(
-                    ew -> wrapper.readList(PropertyMatcher::read));
-            NBTCompound nbt = wrapper.readOptional(PacketWrapper::readNBT);
-            return new BlockPredicate(blocks, properties, nbt);
-        }
-
-        public static void write(PacketWrapper<?> wrapper, BlockPredicate predicate) {
-            wrapper.writeOptional(predicate.blocks, MappedEntitySet::write);
-            wrapper.writeOptional(predicate.properties,
-                    (ew, val) -> ew.writeList(val, PropertyMatcher::write));
-            wrapper.writeOptional(predicate.nbt, PacketWrapper::writeNBT);
-        }
-
-        public @Nullable MappedEntitySet<StateType.Mapped> getBlocks() {
-            return this.blocks;
-        }
-
-        public void setBlocks(@Nullable MappedEntitySet<StateType.Mapped> blocks) {
-            this.blocks = blocks;
-        }
-
-        public void addProperty(PropertyMatcher propertyMatcher) {
-            if (this.properties == null) {
-                this.properties = new ArrayList<>(4);
-            }
-            this.properties.add(propertyMatcher);
-        }
-
-        public @Nullable List<PropertyMatcher> getProperties() {
-            return this.properties;
-        }
-
-        public void setProperties(@Nullable List<PropertyMatcher> properties) {
-            this.properties = properties;
-        }
-
-        public @Nullable NBTCompound getNbt() {
-            return this.nbt;
-        }
-
-        public void setNbt(@Nullable NBTCompound nbt) {
-            this.nbt = nbt;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof BlockPredicate)) return false;
-            BlockPredicate that = (BlockPredicate) obj;
-            if (!Objects.equals(this.blocks, that.blocks)) return false;
-            if (!Objects.equals(this.properties, that.properties)) return false;
-            return Objects.equals(this.nbt, that.nbt);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.blocks, this.properties, this.nbt);
-        }
-    }
-
-    public static class PropertyMatcher {
-
-        private String name;
-        private ValueMatcher matcher;
-
-        public PropertyMatcher(String name, ValueMatcher matcher) {
-            this.name = name;
-            this.matcher = matcher;
-        }
-
-        public static PropertyMatcher read(PacketWrapper<?> wrapper) {
-            String name = wrapper.readString();
-            ValueMatcher matcher = ValueMatcher.read(wrapper);
-            return new PropertyMatcher(name, matcher);
-        }
-
-        public static void write(PacketWrapper<?> wrapper, PropertyMatcher matcher) {
-            wrapper.writeString(matcher.name);
-            ValueMatcher.write(wrapper, matcher.matcher);
-        }
-
-        public String getName() {
-            return this.name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public ValueMatcher getMatcher() {
-            return this.matcher;
-        }
-
-        public void setMatcher(ValueMatcher matcher) {
-            this.matcher = matcher;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof PropertyMatcher)) return false;
-            PropertyMatcher that = (PropertyMatcher) obj;
-            if (!this.name.equals(that.name)) return false;
-            return this.matcher.equals(that.matcher);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.name, this.matcher);
-        }
-    }
-
-    public interface ValueMatcher {
-
-        static ValueMatcher read(PacketWrapper<?> wrapper) {
-            if (wrapper.readBoolean()) {
-                return ExactValueMatcher.read(wrapper);
-            }
-            return RangedValueMatcher.read(wrapper);
-        }
-
-        static void write(PacketWrapper<?> wrapper, ValueMatcher matcher) {
-            if (matcher instanceof ExactValueMatcher) {
-                wrapper.writeBoolean(true);
-                ExactValueMatcher.write(wrapper, (ExactValueMatcher) matcher);
-            } else if (matcher instanceof RangedValueMatcher) {
-                wrapper.writeBoolean(false);
-                RangedValueMatcher.write(wrapper, (RangedValueMatcher) matcher);
-            } else {
-                throw new IllegalArgumentException("Illegal matcher implementation: " + matcher);
-            }
-        }
-    }
-
-    public static class ExactValueMatcher implements ValueMatcher {
-
-        private String value;
-
-        public ExactValueMatcher(String value) {
-            this.value = value;
-        }
-
-        public static ExactValueMatcher read(PacketWrapper<?> wrapper) {
-            return new ExactValueMatcher(wrapper.readString());
-        }
-
-        public static void write(PacketWrapper<?> wrapper, ExactValueMatcher matcher) {
-            wrapper.writeString(matcher.value);
-        }
-
-        public String getValue() {
-            return this.value;
-        }
-
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof ExactValueMatcher)) return false;
-            ExactValueMatcher that = (ExactValueMatcher) obj;
-            return this.value.equals(that.value);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(this.value);
-        }
-    }
-
-    public static class RangedValueMatcher implements ValueMatcher {
-
-        private @Nullable String minValue;
-        private @Nullable String maxValue;
-
-        public RangedValueMatcher(@Nullable String minValue, @Nullable String maxValue) {
-            this.minValue = minValue;
-            this.maxValue = maxValue;
-        }
-
-        public static RangedValueMatcher read(PacketWrapper<?> wrapper) {
-            String minValue = wrapper.readOptional(PacketWrapper::readString);
-            String maxValue = wrapper.readOptional(PacketWrapper::readString);
-            return new RangedValueMatcher(minValue, maxValue);
-        }
-
-        public static void write(PacketWrapper<?> wrapper, RangedValueMatcher matcher) {
-            wrapper.writeOptional(matcher.minValue, PacketWrapper::writeString);
-            wrapper.writeOptional(matcher.maxValue, PacketWrapper::writeString);
-        }
-
-        public @Nullable String getMinValue() {
-            return this.minValue;
-        }
-
-        public void setMinValue(@Nullable String minValue) {
-            this.minValue = minValue;
-        }
-
-        public @Nullable String getMaxValue() {
-            return this.maxValue;
-        }
-
-        public void setMaxValue(@Nullable String maxValue) {
-            this.maxValue = maxValue;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof RangedValueMatcher)) return false;
-            RangedValueMatcher that = (RangedValueMatcher) obj;
-            if (!Objects.equals(this.minValue, that.minValue)) return false;
-            return Objects.equals(this.maxValue, that.maxValue);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.minValue, this.maxValue);
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemAttributeModifiers.java

@@ -1,312 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.protocol.attribute.Attribute;
-import com.github.retrooper.packetevents.protocol.attribute.AttributeOperation;
-import com.github.retrooper.packetevents.protocol.attribute.Attributes;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerUpdateAttributes.PropertyModifier;
-import net.kyori.adventure.util.Index;
-import org.jetbrains.annotations.ApiStatus;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-
-public class ItemAttributeModifiers {
-
-    public static final ItemAttributeModifiers EMPTY = new ItemAttributeModifiers(
-            Collections.emptyList(), true) {
-        @Override
-        public void setShowInTooltip(boolean showInTooltip) {
-            throw new UnsupportedOperationException();
-        }
-    };
-
-    private List<ModifierEntry> modifiers;
-    private boolean showInTooltip;
-
-    public ItemAttributeModifiers(List<ModifierEntry> modifiers, boolean showInTooltip) {
-        this.modifiers = modifiers;
-        this.showInTooltip = showInTooltip;
-    }
-
-    public static ItemAttributeModifiers read(PacketWrapper<?> wrapper) {
-        List<ModifierEntry> modifiers = wrapper.readList(ModifierEntry::read);
-        boolean showInTooltip = wrapper.readBoolean();
-        return new ItemAttributeModifiers(modifiers, showInTooltip);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemAttributeModifiers modifiers) {
-        wrapper.writeList(modifiers.modifiers, ModifierEntry::write);
-        wrapper.writeBoolean(modifiers.showInTooltip);
-    }
-
-    public void addModifier(ModifierEntry modifier) {
-        this.modifiers.add(modifier);
-    }
-
-    public List<ModifierEntry> getModifiers() {
-        return this.modifiers;
-    }
-
-    public void setModifiers(List<ModifierEntry> modifiers) {
-        this.modifiers = modifiers;
-    }
-
-    public boolean isShowInTooltip() {
-        return this.showInTooltip;
-    }
-
-    public void setShowInTooltip(boolean showInTooltip) {
-        this.showInTooltip = showInTooltip;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemAttributeModifiers)) return false;
-        ItemAttributeModifiers that = (ItemAttributeModifiers) obj;
-        if (this.showInTooltip != that.showInTooltip) return false;
-        return this.modifiers.equals(that.modifiers);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.modifiers, this.showInTooltip);
-    }
-
-    @Override
-    public String toString() {
-        return "ItemAttributeModifiers{modifiers=" + this.modifiers + ", showInTooltip=" + this.showInTooltip + '}';
-    }
-
-    public static class ModifierEntry {
-
-        private Attribute attribute;
-        private Modifier modifier;
-        private EquipmentSlotGroup slotGroup;
-
-        public ModifierEntry(Attribute attribute, Modifier modifier, EquipmentSlotGroup slotGroup) {
-            this.attribute = attribute;
-            this.modifier = modifier;
-            this.slotGroup = slotGroup;
-        }
-
-        public static ModifierEntry read(PacketWrapper<?> wrapper) {
-            Attribute attribute = wrapper.readMappedEntity(Attributes::getById);
-            Modifier modifier = Modifier.read(wrapper);
-            EquipmentSlotGroup slot = wrapper.readEnum(EquipmentSlotGroup.values());
-            return new ModifierEntry(attribute, modifier, slot);
-        }
-
-        public static void write(PacketWrapper<?> wrapper, ModifierEntry entry) {
-            wrapper.writeMappedEntity(entry.attribute);
-            Modifier.write(wrapper, entry.modifier);
-            wrapper.writeEnum(entry.slotGroup);
-        }
-
-        public Attribute getAttribute() {
-            return this.attribute;
-        }
-
-        public void setAttribute(Attribute attribute) {
-            this.attribute = attribute;
-        }
-
-        public Modifier getModifier() {
-            return this.modifier;
-        }
-
-        public void setModifier(Modifier modifier) {
-            this.modifier = modifier;
-        }
-
-        public EquipmentSlotGroup getSlotGroup() {
-            return this.slotGroup;
-        }
-
-        public void setSlotGroup(EquipmentSlotGroup slotGroup) {
-            this.slotGroup = slotGroup;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof ModifierEntry)) return false;
-            ModifierEntry that = (ModifierEntry) obj;
-            if (!this.attribute.equals(that.attribute)) return false;
-            if (!this.modifier.equals(that.modifier)) return false;
-            return this.slotGroup == that.slotGroup;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.attribute, this.modifier, this.slotGroup);
-        }
-
-        @Override
-        public String toString() {
-            return "ModifierEntry{attribute=" + this.attribute + ", modifier=" + this.modifier + ", slotGroup=" + this.slotGroup + '}';
-        }
-    }
-
-    public static class Modifier {
-
-        private UUID id; // removed in 1.21
-        private String name; // ResourceLocation since 1.21
-        private double value;
-        private AttributeOperation operation;
-
-        public Modifier(ResourceLocation name, double value, AttributeOperation operation) {
-            this(PropertyModifier.generateSemiUniqueId(name), name.toString(), value, operation);
-        }
-
-        @ApiStatus.Obsolete
-        public Modifier(UUID id, String name, double value, AttributeOperation operation) {
-            this.id = id;
-            this.name = name;
-            this.value = value;
-            this.operation = operation;
-        }
-
-        public static Modifier read(PacketWrapper<?> wrapper) {
-            UUID id;
-            String name;
-            if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21)) {
-                ResourceLocation nameKey = wrapper.readIdentifier();
-                name = nameKey.toString();
-                id = PropertyModifier.generateSemiUniqueId(nameKey);
-            } else {
-                id = wrapper.readUUID();
-                name = wrapper.readString();
-            }
-            double value = wrapper.readDouble();
-            AttributeOperation operation = wrapper.readEnum(AttributeOperation.values());
-            return new Modifier(id, name, value, operation);
-        }
-
-        public static void write(PacketWrapper<?> wrapper, Modifier modifier) {
-            if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21)) {
-                wrapper.writeIdentifier(new ResourceLocation(modifier.name));
-            } else {
-                wrapper.writeUUID(modifier.id);
-                wrapper.writeString(modifier.name);
-            }
-            wrapper.writeDouble(modifier.value);
-            wrapper.writeEnum(modifier.operation);
-        }
-
-        public ResourceLocation getNameKey() {
-            return new ResourceLocation(this.name);
-        }
-
-        public void setNameKey(ResourceLocation nameKey) {
-            this.name = nameKey.toString();
-        }
-
-        @ApiStatus.Obsolete
-        public UUID getId() {
-            return this.id;
-        }
-
-        @ApiStatus.Obsolete
-        public void setId(UUID id) {
-            this.id = id;
-        }
-
-        @ApiStatus.Obsolete
-        public String getName() {
-            return this.name;
-        }
-
-        @ApiStatus.Obsolete
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public double getValue() {
-            return this.value;
-        }
-
-        public void setValue(double value) {
-            this.value = value;
-        }
-
-        public AttributeOperation getOperation() {
-            return this.operation;
-        }
-
-        public void setOperation(AttributeOperation operation) {
-            this.operation = operation;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof Modifier)) return false;
-            Modifier modifier = (Modifier) obj;
-            if (Double.compare(modifier.value, this.value) != 0) return false;
-            if (!this.id.equals(modifier.id)) return false;
-            if (!this.name.equals(modifier.name)) return false;
-            return this.operation == modifier.operation;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.id, this.name, this.value, this.operation);
-        }
-
-        @Override
-        public String toString() {
-            return "Modifier{id=" + this.id + ", name='" + this.name + '\'' + ", value=" + this.value + ", operation=" + this.operation + '}';
-        }
-    }
-
-    public enum EquipmentSlotGroup {
-
-        ANY("any"),
-        MAINHAND("mainhand"),
-        OFFHAND("offhand"),
-        HAND("hand"),
-        FEET("feet"),
-        LEGS("legs"),
-        CHEST("chest"),
-        HEAD("head"),
-        ARMOR("armor"),
-        BODY("body");
-
-        public static final Index<String, EquipmentSlotGroup> ID_INDEX = Index.create(
-                EquipmentSlotGroup.class, EquipmentSlotGroup::getId);
-
-        private final String id;
-
-        EquipmentSlotGroup(String id) {
-            this.id = id;
-        }
-
-        public String getId() {
-            return this.id;
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemBees.java

@@ -1,133 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.List;
-import java.util.Objects;
-
-public class ItemBees {
-
-    private List<BeeEntry> bees;
-
-    public ItemBees(List<BeeEntry> bees) {
-        this.bees = bees;
-    }
-
-    public static ItemBees read(PacketWrapper<?> wrapper) {
-        List<BeeEntry> bees = wrapper.readList(BeeEntry::read);
-        return new ItemBees(bees);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemBees bees) {
-        wrapper.writeList(bees.bees, BeeEntry::write);
-    }
-
-    public void addBee(BeeEntry bee) {
-        this.bees.add(bee);
-    }
-
-    public List<BeeEntry> getBees() {
-        return this.bees;
-    }
-
-    public void setBees(List<BeeEntry> bees) {
-        this.bees = bees;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemBees)) return false;
-        ItemBees itemBees = (ItemBees) obj;
-        return this.bees.equals(itemBees.bees);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.bees);
-    }
-
-    public static class BeeEntry {
-
-        private NBTCompound entityData;
-        private int ticksInHive;
-        private int minTicksInHive;
-
-        public BeeEntry(NBTCompound entityData, int ticksInHive, int minTicksInHive) {
-            this.entityData = entityData;
-            this.ticksInHive = ticksInHive;
-            this.minTicksInHive = minTicksInHive;
-        }
-
-        public static BeeEntry read(PacketWrapper<?> wrapper) {
-            NBTCompound entityData = wrapper.readNBT();
-            int ticksInHive = wrapper.readVarInt();
-            int minTicksInHive = wrapper.readVarInt();
-            return new BeeEntry(entityData, ticksInHive, minTicksInHive);
-        }
-
-        public static void write(PacketWrapper<?> wrapper, BeeEntry bee) {
-            wrapper.writeNBT(bee.entityData);
-            wrapper.writeVarInt(bee.ticksInHive);
-            wrapper.writeVarInt(bee.minTicksInHive);
-        }
-
-        public NBTCompound getEntityData() {
-            return this.entityData;
-        }
-
-        public void setEntityData(NBTCompound entityData) {
-            this.entityData = entityData;
-        }
-
-        public int getTicksInHive() {
-            return this.ticksInHive;
-        }
-
-        public void setTicksInHive(int ticksInHive) {
-            this.ticksInHive = ticksInHive;
-        }
-
-        public int getMinTicksInHive() {
-            return this.minTicksInHive;
-        }
-
-        public void setMinTicksInHive(int minTicksInHive) {
-            this.minTicksInHive = minTicksInHive;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof BeeEntry)) return false;
-            BeeEntry beeEntry = (BeeEntry) obj;
-            if (this.ticksInHive != beeEntry.ticksInHive) return false;
-            if (this.minTicksInHive != beeEntry.minTicksInHive) return false;
-            return this.entityData.equals(beeEntry.entityData);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.entityData, this.ticksInHive, this.minTicksInHive);
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemBlockStateProperties.java

@@ -1,100 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.world.states.type.StateValue;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Map;
-import java.util.Objects;
-
-public class ItemBlockStateProperties {
-
-    private Map<String, String> properties;
-
-    public ItemBlockStateProperties(Map<String, String> properties) {
-        this.properties = properties;
-    }
-
-    public static ItemBlockStateProperties read(PacketWrapper<?> wrapper) {
-        Map<String, String> properties = wrapper.readMap(
-                PacketWrapper::readString, PacketWrapper::readString);
-        return new ItemBlockStateProperties(properties);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemBlockStateProperties props) {
-        wrapper.writeMap(props.properties,
-                PacketWrapper::writeString,
-                PacketWrapper::writeString);
-    }
-
-    public @Nullable Object getProperty(StateValue stateValue) {
-        String value = this.getProperty(stateValue.getName());
-        if (value != null) {
-            return stateValue.getParser().apply(value);
-        }
-        return null;
-    }
-
-    public @Nullable String getProperty(String key) {
-        return this.properties.get(key);
-    }
-
-    public void setProperty(StateValue stateValue, @Nullable Object value) {
-        this.setProperty(stateValue.getName(), value == null ? null : value.toString());
-    }
-
-    public void setProperty(String key, @Nullable String value) {
-        if (value == null) {
-            this.properties.remove(key);
-        } else {
-            this.properties.put(key, value);
-        }
-    }
-
-    public void unsetProperty(StateValue stateValue) {
-        this.unsetProperty(stateValue.getName());
-    }
-
-    public void unsetProperty(String key) {
-        this.setProperty(key, null);
-    }
-
-    public Map<String, String> getProperties() {
-        return this.properties;
-    }
-
-    public void setProperties(Map<String, String> properties) {
-        this.properties = properties;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemBlockStateProperties)) return false;
-        ItemBlockStateProperties that = (ItemBlockStateProperties) obj;
-        return this.properties.equals(that.properties);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.properties);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemConsumable.java

@@ -1,138 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.item.consumables.ConsumeEffect;
-import com.github.retrooper.packetevents.protocol.sound.Sound;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.List;
-import java.util.Objects;
-
-public class ItemConsumable {
-
-    private float consumeSeconds;
-    private Animation animation;
-    private Sound sound;
-    private boolean consumeParticles;
-    private List<ConsumeEffect> effects;
-
-    public ItemConsumable(
-            float consumeSeconds, Animation animation, Sound sound,
-            boolean consumeParticles, List<ConsumeEffect> effects
-    ) {
-        this.consumeSeconds = consumeSeconds;
-        this.animation = animation;
-        this.sound = sound;
-        this.consumeParticles = consumeParticles;
-        this.effects = effects;
-    }
-
-    public static ItemConsumable read(PacketWrapper<?> wrapper) {
-        float consumeSeconds = wrapper.readFloat();
-        Animation animation = wrapper.readEnum(Animation.values());
-        Sound sound = Sound.read(wrapper);
-        boolean consumeParticles = wrapper.readBoolean();
-        List<ConsumeEffect> effects = wrapper.readList(ConsumeEffect::readFull);
-        return new ItemConsumable(consumeSeconds, animation, sound, consumeParticles, effects);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemConsumable consumable) {
-        wrapper.writeFloat(consumable.consumeSeconds);
-        wrapper.writeEnum(consumable.animation);
-        Sound.write(wrapper, consumable.sound);
-        wrapper.writeBoolean(consumable.consumeParticles);
-        wrapper.writeList(consumable.effects, ConsumeEffect::writeFull);
-    }
-
-    public float getConsumeSeconds() {
-        return this.consumeSeconds;
-    }
-
-    public void setConsumeSeconds(float consumeSeconds) {
-        this.consumeSeconds = consumeSeconds;
-    }
-
-    public Animation getAnimation() {
-        return this.animation;
-    }
-
-    public void setAnimation(Animation animation) {
-        this.animation = animation;
-    }
-
-    public Sound getSound() {
-        return this.sound;
-    }
-
-    public void setSound(Sound sound) {
-        this.sound = sound;
-    }
-
-    public boolean isConsumeParticles() {
-        return this.consumeParticles;
-    }
-
-    public void setConsumeParticles(boolean consumeParticles) {
-        this.consumeParticles = consumeParticles;
-    }
-
-    public List<ConsumeEffect> getEffects() {
-        return this.effects;
-    }
-
-    public void setEffects(List<ConsumeEffect> effects) {
-        this.effects = effects;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemConsumable)) return false;
-        ItemConsumable that = (ItemConsumable) obj;
-        if (Float.compare(that.consumeSeconds, this.consumeSeconds) != 0) return false;
-        if (this.consumeParticles != that.consumeParticles) return false;
-        if (this.animation != that.animation) return false;
-        if (!this.sound.equals(that.sound)) return false;
-        return this.effects.equals(that.effects);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.consumeSeconds, this.animation, this.sound, this.consumeParticles, this.effects);
-    }
-
-    @Override
-    public String toString() {
-        return "ItemConsumable{consumeSeconds=" + this.consumeSeconds + ", animation=" + this.animation + ", sound=" + this.sound + ", consumeParticles=" + this.consumeParticles + ", effects=" + this.effects + '}';
-    }
-
-    public enum Animation {
-        NONE,
-        EAT,
-        DRINK,
-        BLOCK,
-        BOW,
-        SPEAR,
-        CROSSBOW,
-        SPYGLASS,
-        TOOT_HORN,
-        BRUSH,
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemContainerContents.java

@@ -1,68 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.item.ItemStack;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.List;
-import java.util.Objects;
-
-public class ItemContainerContents {
-
-    private List<ItemStack> items;
-
-    public ItemContainerContents(List<ItemStack> items) {
-        this.items = items;
-    }
-
-    public static ItemContainerContents read(PacketWrapper<?> wrapper) {
-        List<ItemStack> items = wrapper.readList(PacketWrapper::readItemStack);
-        return new ItemContainerContents(items);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemContainerContents contents) {
-        wrapper.writeList(contents.items, PacketWrapper::writeItemStack);
-    }
-
-    public void addItem(ItemStack itemStack) {
-        this.items.add(itemStack);
-    }
-
-    public List<ItemStack> getItems() {
-        return this.items;
-    }
-
-    public void setItems(List<ItemStack> items) {
-        this.items = items;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemContainerContents)) return false;
-        ItemContainerContents that = (ItemContainerContents) obj;
-        return this.items.equals(that.items);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.items);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemContainerLoot.java

@@ -1,86 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.nbt.NBTLong;
-import com.github.retrooper.packetevents.protocol.nbt.NBTNumber;
-import com.github.retrooper.packetevents.protocol.nbt.NBTString;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.Objects;
-
-public class ItemContainerLoot {
-
-    private ResourceLocation lootTable;
-    private long seed;
-
-    public ItemContainerLoot(ResourceLocation lootTable, long seed) {
-        this.lootTable = lootTable;
-        this.seed = seed;
-    }
-
-    public static ItemContainerLoot read(PacketWrapper<?> wrapper) {
-        NBTCompound compound = wrapper.readNBT();
-        ResourceLocation lootTable = new ResourceLocation(compound.getStringTagValueOrThrow("loot_table"));
-        NBTNumber seedTag = compound.getNumberTagOrNull("seed");
-        long seed = seedTag == null ? 0L : seedTag.getAsLong();
-        return new ItemContainerLoot(lootTable, seed);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemContainerLoot loot) {
-        NBTCompound compound = new NBTCompound();
-        compound.setTag("loot_table", new NBTString(loot.lootTable.toString()));
-        if (loot.seed != 0L) {
-            compound.setTag("seed", new NBTLong(loot.seed));
-        }
-        wrapper.writeNBT(compound);
-    }
-
-    public ResourceLocation getLootTable() {
-        return this.lootTable;
-    }
-
-    public void setLootTable(ResourceLocation lootTable) {
-        this.lootTable = lootTable;
-    }
-
-    public long getSeed() {
-        return this.seed;
-    }
-
-    public void setSeed(long seed) {
-        this.seed = seed;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemContainerLoot)) return false;
-        ItemContainerLoot that = (ItemContainerLoot) obj;
-        if (this.seed != that.seed) return false;
-        return this.lootTable.equals(that.lootTable);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.lootTable, this.seed);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemDamageResistant.java

@@ -1,67 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.Objects;
-
-public class ItemDamageResistant {
-
-    private ResourceLocation typesTagKey;
-
-    public ItemDamageResistant(ResourceLocation typesTagKey) {
-        this.typesTagKey = typesTagKey;
-    }
-
-    public static ItemDamageResistant read(PacketWrapper<?> wrapper) {
-        return new ItemDamageResistant(wrapper.readIdentifier());
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemDamageResistant resistant) {
-        wrapper.writeIdentifier(resistant.typesTagKey);
-    }
-
-    public ResourceLocation getTypesTagKey() {
-        return this.typesTagKey;
-    }
-
-    public void setTypesTagKey(ResourceLocation typesTagKey) {
-        this.typesTagKey = typesTagKey;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemDamageResistant)) return false;
-        ItemDamageResistant that = (ItemDamageResistant) obj;
-        return this.typesTagKey.equals(that.typesTagKey);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.typesTagKey);
-    }
-
-    @Override
-    public String toString() {
-        return "ItemDamageResistant{typesTagKey=" + this.typesTagKey + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemDeathProtection.java

@@ -1,69 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.item.consumables.ConsumeEffect;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.List;
-import java.util.Objects;
-
-public class ItemDeathProtection {
-
-    private List<ConsumeEffect<?>> deathEffects;
-
-    public ItemDeathProtection(List<ConsumeEffect<?>> deathEffects) {
-        this.deathEffects = deathEffects;
-    }
-
-    public static ItemDeathProtection read(PacketWrapper<?> wrapper) {
-        List<ConsumeEffect<?>> deathEffects = wrapper.readList(ConsumeEffect::readFull);
-        return new ItemDeathProtection(deathEffects);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemDeathProtection deathProtection) {
-        wrapper.writeList(deathProtection.deathEffects, ConsumeEffect::writeFull);
-    }
-
-    public List<ConsumeEffect<?>> getDeathEffects() {
-        return this.deathEffects;
-    }
-
-    public void setDeathEffects(List<ConsumeEffect<?>> deathEffects) {
-        this.deathEffects = deathEffects;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemDeathProtection)) return false;
-        ItemDeathProtection that = (ItemDeathProtection) obj;
-        return this.deathEffects.equals(that.deathEffects);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.deathEffects);
-    }
-
-    @Override
-    public String toString() {
-        return "ItemDeathProtection{deathEffects=" + this.deathEffects + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemDyeColor.java

@@ -1,75 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.Objects;
-
-public class ItemDyeColor {
-
-    private int rgb;
-    private boolean showInTooltip;
-
-    public ItemDyeColor(int rgb, boolean showInTooltip) {
-        this.rgb = rgb;
-        this.showInTooltip = showInTooltip;
-    }
-
-    public static ItemDyeColor read(PacketWrapper<?> wrapper) {
-        int rgb = wrapper.readInt();
-        boolean showInTooltip = wrapper.readBoolean();
-        return new ItemDyeColor(rgb, showInTooltip);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemDyeColor color) {
-        wrapper.writeInt(color.rgb);
-        wrapper.writeBoolean(color.showInTooltip);
-    }
-
-    public int getRgb() {
-        return this.rgb;
-    }
-
-    public void setRgb(int rgb) {
-        this.rgb = rgb;
-    }
-
-    public boolean isShowInTooltip() {
-        return this.showInTooltip;
-    }
-
-    public void setShowInTooltip(boolean showInTooltip) {
-        this.showInTooltip = showInTooltip;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemDyeColor)) return false;
-        ItemDyeColor that = (ItemDyeColor) obj;
-        if (this.rgb != that.rgb) return false;
-        return this.showInTooltip == that.showInTooltip;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.rgb, this.showInTooltip);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemEnchantable.java

@@ -1,67 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.Objects;
-
-public class ItemEnchantable {
-
-    private int value;
-
-    public ItemEnchantable(int value) {
-        this.value = value;
-    }
-
-    public static ItemEnchantable read(PacketWrapper<?> wrapper) {
-        int value = wrapper.readVarInt();
-        return new ItemEnchantable(value);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemEnchantable enchantable) {
-        wrapper.writeVarInt(enchantable.value);
-    }
-
-    public int getValue() {
-        return this.value;
-    }
-
-    public void setValue(int value) {
-        this.value = value;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemEnchantable)) return false;
-        ItemEnchantable that = (ItemEnchantable) obj;
-        return this.value == that.value;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.value);
-    }
-
-    @Override
-    public String toString() {
-        return "ItemEnchantable{value=" + this.value + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemEnchantments.java

@@ -1,126 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.item.enchantment.type.EnchantmentType;
-import com.github.retrooper.packetevents.protocol.item.enchantment.type.EnchantmentTypes;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
-
-public class ItemEnchantments implements Iterable<Map.Entry<EnchantmentType, Integer>> {
-
-    public static final ItemEnchantments EMPTY = new ItemEnchantments(
-            Collections.emptyMap(), true) {
-        @Override
-        public void setShowInTooltip(boolean showInTooltip) {
-            throw new UnsupportedOperationException();
-        }
-    };
-
-    private Map<EnchantmentType, Integer> enchantments;
-    private boolean showInTooltip;
-
-    public ItemEnchantments(Map<EnchantmentType, Integer> enchantments, boolean showInTooltip) {
-        this.enchantments = Collections.unmodifiableMap(enchantments);
-        this.showInTooltip = showInTooltip;
-    }
-
-    public static ItemEnchantments read(PacketWrapper<?> wrapper) {
-        Map<EnchantmentType, Integer> enchantments = wrapper.readMap(
-                ew -> wrapper.readMappedEntity(EnchantmentTypes.getRegistry()),
-                PacketWrapper::readVarInt
-        );
-        boolean showInTooltip = wrapper.readBoolean();
-        return new ItemEnchantments(enchantments, showInTooltip);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemEnchantments enchantments) {
-        ClientVersion version = wrapper.getServerVersion().toClientVersion();
-        wrapper.writeMap(enchantments.getEnchantments(),
-                (ew, enchantment) -> ew.writeVarInt(enchantment.getId(version)),
-                PacketWrapper::writeVarInt
-        );
-        wrapper.writeBoolean(enchantments.isShowInTooltip());
-    }
-
-    public int getEnchantmentLevel(EnchantmentType enchantment) {
-        return this.enchantments.getOrDefault(enchantment, 0);
-    }
-
-    public void setEnchantmentLevel(EnchantmentType enchantment, int level) {
-        if (level == 0) {
-            this.enchantments.remove(enchantment);
-        } else {
-            this.enchantments.put(enchantment, level);
-        }
-    }
-
-    public boolean isEmpty() {
-        return this.getEnchantmentCount() < 1;
-    }
-
-    public int getEnchantmentCount() {
-        return this.enchantments.size();
-    }
-
-    public Map<EnchantmentType, Integer> getEnchantments() {
-        return this.enchantments;
-    }
-
-    public void setEnchantments(Map<EnchantmentType, Integer> enchantments) {
-        this.enchantments = enchantments;
-    }
-
-    public boolean isShowInTooltip() {
-        return this.showInTooltip;
-    }
-
-    public void setShowInTooltip(boolean showInTooltip) {
-        this.showInTooltip = showInTooltip;
-    }
-
-    @Override
-    public Iterator<Map.Entry<EnchantmentType, Integer>> iterator() {
-        return this.enchantments.entrySet().iterator();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemEnchantments)) return false;
-        ItemEnchantments that = (ItemEnchantments) obj;
-        if (this.showInTooltip != that.showInTooltip) return false;
-        return this.enchantments.equals(that.enchantments);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.enchantments, this.showInTooltip);
-    }
-
-    @Override
-    public String toString() {
-        return "ItemEnchantments{enchantments=" + this.enchantments + ", showInTooltip=" + this.showInTooltip + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemEquippable.java

@@ -1,176 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
-import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
-import com.github.retrooper.packetevents.protocol.mapper.MappedEntitySet;
-import com.github.retrooper.packetevents.protocol.player.EquipmentSlot;
-import com.github.retrooper.packetevents.protocol.sound.Sound;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Objects;
-
-public class ItemEquippable {
-
-    private EquipmentSlot slot;
-    private Sound equipSound;
-    private @Nullable ResourceLocation model;
-    private @Nullable ResourceLocation cameraOverlay;
-    private @Nullable MappedEntitySet<EntityType> allowedEntities;
-    private boolean dispensable;
-    private boolean swappable;
-    private boolean damageOnHurt;
-
-    public ItemEquippable(
-            EquipmentSlot slot,
-            Sound equipSound,
-            @Nullable ResourceLocation model,
-            @Nullable ResourceLocation cameraOverlay,
-            @Nullable MappedEntitySet<EntityType> allowedEntities,
-            boolean dispensable,
-            boolean swappable,
-            boolean damageOnHurt
-    ) {
-        this.slot = slot;
-        this.equipSound = equipSound;
-        this.model = model;
-        this.cameraOverlay = cameraOverlay;
-        this.allowedEntities = allowedEntities;
-        this.dispensable = dispensable;
-        this.swappable = swappable;
-        this.damageOnHurt = damageOnHurt;
-    }
-
-    public static ItemEquippable read(PacketWrapper<?> wrapper) {
-        EquipmentSlot slot = wrapper.readEnum(EquipmentSlot.values());
-        Sound equipSound = Sound.read(wrapper);
-        ResourceLocation model = wrapper.readOptional(PacketWrapper::readIdentifier);
-        ResourceLocation cameraOverlay = wrapper.readOptional(PacketWrapper::readIdentifier);
-        MappedEntitySet<EntityType> allowedEntities = wrapper.readOptional(
-                ew -> MappedEntitySet.read(ew, EntityTypes::getById));
-        boolean dispensable = wrapper.readBoolean();
-        boolean swappable = wrapper.readBoolean();
-        boolean damageOnHurt = wrapper.readBoolean();
-        return new ItemEquippable(slot, equipSound, model,
-                cameraOverlay, allowedEntities, dispensable, swappable, damageOnHurt);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemEquippable equippable) {
-        wrapper.writeEnum(equippable.slot);
-        Sound.write(wrapper, equippable.equipSound);
-        wrapper.writeOptional(equippable.model, PacketWrapper::writeIdentifier);
-        wrapper.writeOptional(equippable.cameraOverlay, PacketWrapper::writeIdentifier);
-        wrapper.writeOptional(equippable.allowedEntities, MappedEntitySet::write);
-        wrapper.writeBoolean(equippable.dispensable);
-        wrapper.writeBoolean(equippable.swappable);
-        wrapper.writeBoolean(equippable.damageOnHurt);
-    }
-
-    public EquipmentSlot getSlot() {
-        return this.slot;
-    }
-
-    public void setSlot(EquipmentSlot slot) {
-        this.slot = slot;
-    }
-
-    public Sound getEquipSound() {
-        return this.equipSound;
-    }
-
-    public void setEquipSound(Sound equipSound) {
-        this.equipSound = equipSound;
-    }
-
-    public @Nullable ResourceLocation getModel() {
-        return this.model;
-    }
-
-    public void setModel(@Nullable ResourceLocation model) {
-        this.model = model;
-    }
-
-    public @Nullable ResourceLocation getCameraOverlay() {
-        return this.cameraOverlay;
-    }
-
-    public void setCameraOverlay(@Nullable ResourceLocation cameraOverlay) {
-        this.cameraOverlay = cameraOverlay;
-    }
-
-    public @Nullable MappedEntitySet<EntityType> getAllowedEntities() {
-        return this.allowedEntities;
-    }
-
-    public void setAllowedEntities(@Nullable MappedEntitySet<EntityType> allowedEntities) {
-        this.allowedEntities = allowedEntities;
-    }
-
-    public boolean isDispensable() {
-        return this.dispensable;
-    }
-
-    public void setDispensable(boolean dispensable) {
-        this.dispensable = dispensable;
-    }
-
-    public boolean isSwappable() {
-        return this.swappable;
-    }
-
-    public void setSwappable(boolean swappable) {
-        this.swappable = swappable;
-    }
-
-    public boolean isDamageOnHurt() {
-        return this.damageOnHurt;
-    }
-
-    public void setDamageOnHurt(boolean damageOnHurt) {
-        this.damageOnHurt = damageOnHurt;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemEquippable)) return false;
-        ItemEquippable that = (ItemEquippable) obj;
-        if (this.dispensable != that.dispensable) return false;
-        if (this.swappable != that.swappable) return false;
-        if (this.damageOnHurt != that.damageOnHurt) return false;
-        if (this.slot != that.slot) return false;
-        if (!Objects.equals(this.equipSound, that.equipSound)) return false;
-        if (!Objects.equals(this.model, that.model)) return false;
-        if (!Objects.equals(this.cameraOverlay, that.cameraOverlay)) return false;
-        return Objects.equals(this.allowedEntities, that.allowedEntities);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.slot, this.equipSound, this.model, this.cameraOverlay, this.allowedEntities, this.dispensable, this.swappable, this.damageOnHurt);
-    }
-
-    @Override
-    public String toString() {
-        return "ItemEquippable{slot=" + this.slot + ", equipSound=" + this.equipSound + ", model=" + this.model + ", cameraOverlay=" + this.cameraOverlay + ", allowedEntities=" + this.allowedEntities + ", dispensable=" + this.dispensable + ", swappable=" + this.swappable + ", damageOnHurt=" + this.damageOnHurt + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemFireworks.java

@@ -1,80 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.List;
-import java.util.Objects;
-
-public class ItemFireworks {
-
-    private int flightDuration;
-    private List<FireworkExplosion> explosions;
-
-    public ItemFireworks(int flightDuration, List<FireworkExplosion> explosions) {
-        this.flightDuration = flightDuration;
-        this.explosions = explosions;
-    }
-
-    public static ItemFireworks read(PacketWrapper<?> wrapper) {
-        int flightDuration = wrapper.readVarInt();
-        List<FireworkExplosion> explosions = wrapper.readList(FireworkExplosion::read);
-        return new ItemFireworks(flightDuration, explosions);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemFireworks fireworks) {
-        wrapper.writeVarInt(fireworks.flightDuration);
-        wrapper.writeList(fireworks.explosions, FireworkExplosion::write);
-    }
-
-    public int getFlightDuration() {
-        return this.flightDuration;
-    }
-
-    public void setFlightDuration(int flightDuration) {
-        this.flightDuration = flightDuration;
-    }
-
-    public void addExplosion(FireworkExplosion explosion) {
-        this.explosions.add(explosion);
-    }
-
-    public List<FireworkExplosion> getExplosions() {
-        return this.explosions;
-    }
-
-    public void setExplosions(List<FireworkExplosion> explosions) {
-        this.explosions = explosions;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemFireworks)) return false;
-        ItemFireworks that = (ItemFireworks) obj;
-        if (this.flightDuration != that.flightDuration) return false;
-        return this.explosions.equals(that.explosions);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.flightDuration, this.explosions);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemJukeboxPlayable.java

@@ -1,140 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.item.jukebox.IJukeboxSong;
-import com.github.retrooper.packetevents.protocol.item.jukebox.JukeboxSong;
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Objects;
-
-public class ItemJukeboxPlayable {
-
-    private @Nullable IJukeboxSong song;
-    private @Nullable ResourceLocation songKey;
-    private boolean showInTooltip;
-
-    public ItemJukeboxPlayable(
-            @Nullable JukeboxSong song,
-            @Nullable ResourceLocation songKey,
-            boolean showInTooltip
-    ) {
-        this((IJukeboxSong) song, songKey, showInTooltip);
-    }
-
-    public ItemJukeboxPlayable(
-            @Nullable IJukeboxSong song,
-            @Nullable ResourceLocation songKey,
-            boolean showInTooltip
-    ) {
-        if ((song == null) == (songKey == null)) {
-            throw new IllegalStateException("Illegal state of both song and "
-                    + "song key combined: " + song + " / " + songKey);
-        }
-
-        this.song = song;
-        this.songKey = songKey;
-        this.showInTooltip = showInTooltip;
-    }
-
-    public static ItemJukeboxPlayable read(PacketWrapper<?> wrapper) {
-        IJukeboxSong song;
-        ResourceLocation songKey;
-        if (wrapper.readBoolean()) {
-            song = IJukeboxSong.read(wrapper);
-            songKey = null;
-        } else {
-            song = null;
-            songKey = wrapper.readIdentifier();
-        }
-        boolean showInTooltip = wrapper.readBoolean();
-        return new ItemJukeboxPlayable(song, songKey, showInTooltip);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemJukeboxPlayable jukeboxPlayable) {
-        if (jukeboxPlayable.song != null) {
-            wrapper.writeBoolean(true);
-            IJukeboxSong.write(wrapper, jukeboxPlayable.song);
-        } else {
-            assert jukeboxPlayable.songKey != null;
-            wrapper.writeBoolean(false);
-            wrapper.writeIdentifier(jukeboxPlayable.songKey);
-        }
-        wrapper.writeBoolean(jukeboxPlayable.showInTooltip);
-    }
-
-    public @Nullable IJukeboxSong getJukeboxSong() {
-        return this.song;
-    }
-
-    public void setJukeboxSong(@Nullable JukeboxSong song) {
-        this.song = song;
-        this.songKey = null;
-    }
-
-    @Deprecated
-    public @Nullable JukeboxSong getSong() {
-        if (this.song == null) {
-            return null;
-        } else if (this.song instanceof JukeboxSong) {
-            return (JukeboxSong) this.song;
-        }
-        return (JukeboxSong) this.song.copy(null);
-    }
-
-    @Deprecated
-    public void setSong(JukeboxSong song) {
-        this.song = song;
-        this.songKey = null;
-    }
-
-    public @Nullable ResourceLocation getSongKey() {
-        return this.songKey;
-    }
-
-    public void setSongKey(ResourceLocation songKey) {
-        this.song = null;
-        this.songKey = songKey;
-    }
-
-    public boolean isShowInTooltip() {
-        return this.showInTooltip;
-    }
-
-    public void setShowInTooltip(boolean showInTooltip) {
-        this.showInTooltip = showInTooltip;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemJukeboxPlayable)) return false;
-        ItemJukeboxPlayable that = (ItemJukeboxPlayable) obj;
-        if (this.showInTooltip != that.showInTooltip) return false;
-        if (!Objects.equals(this.song, that.song)) return false;
-        return Objects.equals(this.songKey, that.songKey);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.song, this.songKey, this.showInTooltip);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemLock.java

@@ -1,63 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.nbt.NBTString;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.Objects;
-
-public class ItemLock {
-
-    private String code;
-
-    public ItemLock(String code) {
-        this.code = code;
-    }
-
-    public static ItemLock read(PacketWrapper<?> wrapper) {
-        NBTString codeTag = (NBTString) wrapper.readNBTRaw();
-        return new ItemLock(codeTag.getValue());
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemLock lock) {
-        wrapper.writeNBTRaw(new NBTString(lock.code));
-    }
-
-    public String getCode() {
-        return this.code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemLock)) return false;
-        ItemLock itemLock = (ItemLock) obj;
-        return this.code.equals(itemLock.code);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.code);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemLore.java

@@ -1,76 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import net.kyori.adventure.text.Component;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-public class ItemLore {
-
-    public static final ItemLore EMPTY = new ItemLore(Collections.emptyList());
-
-    private List<Component> lines;
-
-    public ItemLore(List<Component> lines) {
-        this.lines = lines;
-    }
-
-    public static ItemLore read(PacketWrapper<?> wrapper) {
-        List<Component> lines = wrapper.readList(PacketWrapper::readComponent);
-        return new ItemLore(lines);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemLore lore) {
-        wrapper.writeList(lore.lines, PacketWrapper::writeComponent);
-    }
-
-    public void addLine(Component line) {
-        this.lines.add(line);
-    }
-
-    public List<Component> getLines() {
-        return this.lines;
-    }
-
-    public void setLines(List<Component> lines) {
-        this.lines = lines;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemLore)) return false;
-        ItemLore itemLore = (ItemLore) obj;
-        return this.lines.equals(itemLore.lines);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.lines);
-    }
-
-    @Override
-    public String toString() {
-        return "ItemLore{lines=" + this.lines + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemMapDecorations.java

@@ -1,176 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.item.mapdecoration.MapDecorationType;
-import com.github.retrooper.packetevents.protocol.item.mapdecoration.MapDecorationTypes;
-import com.github.retrooper.packetevents.protocol.nbt.NBT;
-import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.nbt.NBTDouble;
-import com.github.retrooper.packetevents.protocol.nbt.NBTFloat;
-import com.github.retrooper.packetevents.protocol.nbt.NBTString;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class ItemMapDecorations {
-
-    private Map<String, Decoration> decorations;
-
-    public ItemMapDecorations(Map<String, Decoration> decorations) {
-        this.decorations = decorations;
-    }
-
-    public static ItemMapDecorations read(PacketWrapper<?> wrapper) {
-        NBTCompound compound = wrapper.readNBT();
-        Map<String, Decoration> decorations = new HashMap<>(compound.size());
-        for (Map.Entry<String, NBT> tag : compound.getTags().entrySet()) {
-            Decoration decoration = Decoration.readCompound((NBTCompound) tag.getValue());
-            decorations.put(tag.getKey(), decoration);
-        }
-        return new ItemMapDecorations(decorations);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemMapDecorations decorations) {
-        NBTCompound compound = new NBTCompound();
-        for (Map.Entry<String, Decoration> decoration : decorations.decorations.entrySet()) {
-            NBTCompound entry = new NBTCompound();
-            Decoration.writeCompound(entry, decoration.getValue());
-            compound.setTag(decoration.getKey(), entry);
-        }
-        wrapper.writeNBT(compound);
-    }
-
-    public @Nullable Decoration getDecoration(String key) {
-        return this.decorations.get(key);
-    }
-
-    public void setDecoration(String key, @Nullable Decoration decoration) {
-        if (decoration != null) {
-            this.decorations.put(key, decoration);
-        } else {
-            this.decorations.remove(key);
-        }
-    }
-
-    public Map<String, Decoration> getDecorations() {
-        return this.decorations;
-    }
-
-    public void setDecorations(Map<String, Decoration> decorations) {
-        this.decorations = decorations;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemMapDecorations)) return false;
-        ItemMapDecorations that = (ItemMapDecorations) obj;
-        return this.decorations.equals(that.decorations);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.decorations);
-    }
-
-    public static final class Decoration {
-
-        private MapDecorationType type;
-        private double x;
-        private double z;
-        private float rotation;
-
-        public Decoration(MapDecorationType type, double x, double z, float rotation) {
-            this.type = type;
-            this.x = x;
-            this.z = z;
-            this.rotation = rotation;
-        }
-
-        @ApiStatus.Internal
-        public static Decoration readCompound(NBTCompound compound) {
-            MapDecorationType type = MapDecorationTypes.getByName(compound.getStringTagValueOrThrow("type"));
-            double x = compound.getNumberTagOrThrow("x").getAsDouble();
-            double z = compound.getNumberTagOrThrow("z").getAsDouble();
-            float rotation = compound.getNumberTagOrThrow("rotation").getAsFloat();
-            return new Decoration(type, x, z, rotation);
-        }
-
-        @ApiStatus.Internal
-        public static void writeCompound(NBTCompound compound, Decoration decoration) {
-            compound.setTag("type", new NBTString(decoration.type.getName().toString()));
-            compound.setTag("x", new NBTDouble(decoration.x));
-            compound.setTag("z", new NBTDouble(decoration.z));
-            compound.setTag("rotation", new NBTFloat(decoration.rotation));
-        }
-
-        public MapDecorationType getType() {
-            return this.type;
-        }
-
-        public void setType(MapDecorationType type) {
-            this.type = type;
-        }
-
-        public double getX() {
-            return this.x;
-        }
-
-        public void setX(double x) {
-            this.x = x;
-        }
-
-        public double getZ() {
-            return this.z;
-        }
-
-        public void setZ(double z) {
-            this.z = z;
-        }
-
-        public float getRotation() {
-            return this.rotation;
-        }
-
-        public void setRotation(float rotation) {
-            this.rotation = rotation;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof Decoration)) return false;
-            Decoration that = (Decoration) obj;
-            if (Double.compare(that.x, this.x) != 0) return false;
-            if (Double.compare(that.z, this.z) != 0) return false;
-            if (Float.compare(that.rotation, this.rotation) != 0) return false;
-            return this.type.equals(that.type);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.type, this.x, this.z, this.rotation);
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemMapPostProcessingState.java

@@ -1,24 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-public enum ItemMapPostProcessingState {
-    LOCKED,
-    SCALED,
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemModel.java

@@ -1,67 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-
-import java.util.Objects;
-
-public class ItemModel {
-
-    private ResourceLocation modelLocation;
-
-    public ItemModel(ResourceLocation modelLocation) {
-        this.modelLocation = modelLocation;
-    }
-
-    public static ItemModel read(PacketWrapper<?> wrapper) {
-        return new ItemModel(wrapper.readIdentifier());
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemModel model) {
-        wrapper.writeIdentifier(model.modelLocation);
-    }
-
-    public ResourceLocation getModelLocation() {
-        return this.modelLocation;
-    }
-
-    public void setModelLocation(ResourceLocation modelLocation) {
-        this.modelLocation = modelLocation;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemModel)) return false;
-        ItemModel itemModel = (ItemModel) obj;
-        return this.modelLocation.equals(itemModel.modelLocation);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.modelLocation);
-    }
-
-    @Override
-    public String toString() {
-        return "ItemModel{modelLocation=" + this.modelLocation + '}';
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemPotionContents.java

@@ -1,101 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.protocol.potion.Potion;
-import com.github.retrooper.packetevents.protocol.potion.PotionEffect;
-import com.github.retrooper.packetevents.protocol.potion.Potions;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Objects;
-
-public class ItemPotionContents {
-
-    private @Nullable Potion potion;
-    private @Nullable Integer customColor;
-    private List<PotionEffect> customEffects;
-
-    public ItemPotionContents(
-            @Nullable Potion potion,
-            @Nullable Integer customColor,
-            List<PotionEffect> customEffects
-    ) {
-        this.potion = potion;
-        this.customColor = customColor;
-        this.customEffects = customEffects;
-    }
-
-    public static ItemPotionContents read(PacketWrapper<?> wrapper) {
-        Potion potionId = wrapper.readOptional(ew -> ew.readMappedEntity(Potions::getById));
-        Integer customColor = wrapper.readOptional(PacketWrapper::readInt);
-        List<PotionEffect> customEffects = wrapper.readList(PotionEffect::read);
-        return new ItemPotionContents(potionId, customColor, customEffects);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemPotionContents contents) {
-        wrapper.writeOptional(contents.potion, PacketWrapper::writeMappedEntity);
-        wrapper.writeOptional(contents.customColor, PacketWrapper::writeInt);
-        wrapper.writeList(contents.customEffects, PotionEffect::write);
-    }
-
-    public @Nullable Potion getPotion() {
-        return this.potion;
-    }
-
-    public void setPotion(@Nullable Potion potion) {
-        this.potion = potion;
-    }
-
-    public @Nullable Integer getCustomColor() {
-        return this.customColor;
-    }
-
-    public void setCustomColor(@Nullable Integer customColor) {
-        this.customColor = customColor;
-    }
-
-    private void addCustomEffect(PotionEffect effect) {
-        this.customEffects.add(effect);
-    }
-
-    public List<PotionEffect> getCustomEffects() {
-        return this.customEffects;
-    }
-
-    public void setCustomEffects(List<PotionEffect> customEffects) {
-        this.customEffects = customEffects;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemPotionContents)) return false;
-        ItemPotionContents that = (ItemPotionContents) obj;
-        if (!Objects.equals(this.potion, that.potion)) return false;
-        if (!Objects.equals(this.customColor, that.customColor)) return false;
-        return this.customEffects.equals(that.customEffects);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.potion, this.customColor, this.customEffects);
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemProfile.java

@@ -1,165 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-
-public class ItemProfile {
-
-    private @Nullable String name;
-    private @Nullable UUID id;
-    private List<Property> properties;
-
-    public ItemProfile(
-            @Nullable String name,
-            @Nullable UUID id,
-            List<Property> properties
-    ) {
-        this.name = name;
-        this.id = id;
-        this.properties = properties;
-    }
-
-    public static ItemProfile read(PacketWrapper<?> wrapper) {
-        String name = wrapper.readOptional(ew -> ew.readString(16));
-        UUID id = wrapper.readOptional(PacketWrapper::readUUID);
-        List<Property> properties = wrapper.readList(Property::read);
-        return new ItemProfile(name, id, properties);
-    }
-
-    public static void write(PacketWrapper<?> wrapper, ItemProfile profile) {
-        wrapper.writeOptional(profile.name, (ew, name) -> ew.writeString(name, 16));
-        wrapper.writeOptional(profile.id, PacketWrapper::writeUUID);
-        wrapper.writeList(profile.properties, Property::write);
-    }
-
-    public @Nullable String getName() {
-        return this.name;
-    }
-
-    public void setName(@Nullable String name) {
-        this.name = name;
-    }
-
-    public @Nullable UUID getId() {
-        return this.id;
-    }
-
-    public void setId(@Nullable UUID id) {
-        this.id = id;
-    }
-
-    public void addProperty(Property property) {
-        this.properties.add(property);
-    }
-
-    public List<Property> getProperties() {
-        return this.properties;
-    }
-
-    public void setProperties(List<Property> properties) {
-        this.properties = properties;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof ItemProfile)) return false;
-        ItemProfile that = (ItemProfile) obj;
-        if (!Objects.equals(this.name, that.name)) return false;
-        if (!Objects.equals(this.id, that.id)) return false;
-        return this.properties.equals(that.properties);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.name, this.id, this.properties);
-    }
-
-    public static class Property {
-
-        private String name;
-        private String value;
-        private @Nullable String signature;
-
-        public Property(String name, String value, @Nullable String signature) {
-            this.name = name;
-            this.value = value;
-            this.signature = signature;
-        }
-
-        public static Property read(PacketWrapper<?> wrapper) {
-            String name = wrapper.readString(64);
-            String value = wrapper.readString(32767);
-            String signature = wrapper.readOptional(ew -> ew.readString(1024));
-            return new Property(name, value, signature);
-        }
-
-        public static void write(PacketWrapper<?> wrapper, Property property) {
-            wrapper.writeString(property.name, 64);
-            wrapper.writeString(property.value, 32767);
-            wrapper.writeOptional(property.signature,
-                    (ew, signature) -> ew.writeString(signature, 1024));
-        }
-
-        public String getName() {
-            return this.name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getValue() {
-            return this.value;
-        }
-
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        public @Nullable String getSignature() {
-            return this.signature;
-        }
-
-        public void setSignature(@Nullable String signature) {
-            this.signature = signature;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof Property)) return false;
-            Property property = (Property) obj;
-            if (!this.name.equals(property.name)) return false;
-            if (!this.value.equals(property.value)) return false;
-            return Objects.equals(this.signature, property.signature);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.name, this.value, this.signature);
-        }
-    }
-}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemRarity.java

@@ -1,26 +0,0 @@
-/*
- * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2024 retrooper and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.github.retrooper.packetevents.protocol.component.builtin.item;
-
-public enum ItemRarity {
-    COMMON,
-    UNCOMMON,
-    RARE,
-    EPIC,
-}