PacketEvents 2.0.2 update

Delete WrapperPlayServerChunkData default values
Fix update checker colors
2023-09-13 16:01:41 +02:00 · 2023-09-13 15:36:20 +02:00 · 2023-09-12 00:59:18 +02:00 · 2023-09-12 00:36:31 +02:00 · 2023-09-12 00:02:38 +02:00 · 2023-09-11 23:35:11 +02:00
756 changed files with 266330 additions and 24972 deletions
@@ -1,6 +1,3 @@
-# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
-
 name: Gradle Package

 on: [ push, pull_request ]
@@ -14,20 +11,45 @@ jobs:
      packages: write

    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
+      - uses: actions/checkout@v3

-    - name: Build with Gradle
-      run: gradle :clean :build
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          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: Upload build artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: packetevents-dev-build.jar
-        path: build/libs
+      - name: Build with Gradle
+        run: chmod +x gradlew && ./gradlew shadowJar
+
+      - name: Upload build artifacts api
+        uses: actions/upload-artifact@v3
+        with:
+          name: api-build
+          path: api/build/libs
+
+      - name: Upload build artifacts spigot
+        uses: actions/upload-artifact@v3
+        with:
+          name: spigot-build
+          path: spigot/build/libs
+
+      - name: Upload build artifacts netty-common
+        uses: actions/upload-artifact@v3
+        with:
+          name: netty-common-build
+          path: netty-common/build/libs
+
+      - name: Upload build artifacts bungeecord
+        uses: actions/upload-artifact@v3
+        with:
+          name: bungeecord-build
+          path: bungeecord/build/libs
+
+      - name: Upload build artifacts velocity
+        uses: actions/upload-artifact@v3
+        with:
+          name: velocity-build
+          path: velocity/build/libs
@@ -1,78 +1,18 @@
-#
-# JetBrains
-#
-
 # User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
+/.idea

-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
+*.iml
+*.ipr
 *.iws

+# IntelliJ
+out/
 # mpeltonen/sbt-idea plugin
 .idea_modules/

 # JIRA plugin
 atlassian-ide-plugin.xml

-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-
-#
-# Java
-#
-
 # Compiled class file
 *.class

@@ -82,9 +22,6 @@ fabric.properties
 # BlueJ files
 *.ctxt

-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
 # Package Files #
 *.jar
 *.war
@@ -97,21 +34,92 @@ fabric.properties
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

-#
-# Maven
-#
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-# https://github.com/takari/maven-wrapper#usage-without-binary-jar
-.mvn/wrapper/maven-wrapper.jar
-/src/main/resources/
-/.gradle/
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+.gradle
+build/
+bin/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Cache of project
+.gradletasknamecache
+
+**/build/
+
+# Common working directory
+run/
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+/src/main/resources/plugin.yml
 /.idea/
-/build/
+.vscode/
+.project
+.settings/
+.classpath
@@ -1,23 +1,30 @@
 # packetevents

-[![](https://img.shields.io/badge/License-GPLv3-yellow.svg)](https://github.com/retrooper/packetevents/blob/master/LICENSE)
-[![](https://jitpack.io/v/retrooper/packetevents.svg)](https://jitpack.io/#retrooper/packetevents)
+[![](https://img.shields.io/badge/License-GPLv3-yellow.svg)](https://github.com/retrooper/packetevents/blob/2.0/LICENSE) [![](https://github.com/retrooper/packetevents/actions/workflows/build.yml/badge.svg)](https://github.com/retrooper/packetevents/actions) [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/prqzNg9tRU)

-PacketEvents is a powerful packet library. Our packet wrappers are efficient and easy to use. We support many protocol versions. (1.8+)
+PacketEvents is a fast and efficient multi-platform packet processing library. Our packet wrappers are easy to use with multi-version support. With our API you can write code that runs on Spigot, BungeeCord, Velocity, and Fabric! Switch to PacketEvents today by joining \
+our [Discord Server](https://discord.me/packetevents) for help.

-### Resources
-* [SpigotMC](https://www.spigotmc.org/resources/packetevents-api.80279/)
-* [JavaDoc](https://packetevents.github.io/javadocs)
-* [Discord](https://discord.me/packetevents)
+### Links
+* [Find release builds on Modrinth](https://modrinth.com/plugin/packetevents)
+* [Find development builds on Jenkins](https://ci.codemc.io/job/retrooper/job/packetevents)
+* [View documentation on our JavaDocs Page](https://packetevents.github.io/javadocs)

 ### Setup
-[Learn more](https://github.com/retrooper/packetevents/wiki/1.-Setup)
+[How to Setup PacketEvents](https://github.com/retrooper/packetevents/wiki/Depending-on-pre%E2%80%90built-PacketEvents)

 ### Sponsorships
 [![](https://www.ej-technologies.com/images/product_banners/jprofiler_small.png)](https://www.ej-technologies.com/products/jprofiler/overview.html)

 ### Statistics
-PacketEvents collects statistics anonymously using bStats. It helps give us an overview of what platforms use our project. If you really don't like, you can turn it off.
+PacketEvents optionally collects statistics using [bStats](https://bstats.org/)\
+Check out our [bStats page](https://bstats.org/plugin/bukkit/packetevents/11327)

-### Credit
-PacketEvents uses an injector that is extremely similar to ViaVersion's injector. I have included license and copyright holder notice in the files taken from ViaVersion. Thank you ViaVersion.
+### 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)\
+[MCProtocolLib](https://github.com/GeyserMC/MCProtocolLib/)  
@@ -0,0 +1,3 @@
+dependencies {
+    compileOnly(adventureDependencies)
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,21 +16,20 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.packetwrappers.play.in.pickitem;
+package com.github.retrooper.packetevents;

-import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
-import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+public final class PacketEvents {
+    private static PacketEventsAPI<?> API;

-public class WrappedPacketInPickItem extends WrappedPacket {
-    public WrappedPacketInPickItem(NMSPacket packet) {
-        super(packet);
+    //Put these variable names anywhere else, they are really only for the injectors
+    public static String IDENTIFIER, ENCODER_NAME, DECODER_NAME, CONNECTION_HANDLER_NAME, SERVER_CHANNEL_HANDLER_NAME,
+    TIMEOUT_HANDLER_NAME;
+
+    public static PacketEventsAPI<?> getAPI() {
+        return API;
    }

-    public int getSlot() {
-        return readInt(0);
-    }
-
-    public void setSlot(int slot) {
-        writeInt(0, slot);
+    public static void setAPI(PacketEventsAPI<?> api) {
+        API = api;
    }
 }
@@ -0,0 +1,88 @@
+/*
+ * 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;
+
+import com.github.retrooper.packetevents.event.EventManager;
+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;
+import com.github.retrooper.packetevents.util.PEVersion;
+import com.github.retrooper.packetevents.util.updatechecker.UpdateChecker;
+
+import java.util.logging.Logger;
+
+public abstract class PacketEventsAPI<T> {
+    private static final EventManager EVENT_MANAGER = new EventManager();
+    private static final PacketEventsSettings SETTINGS = new PacketEventsSettings();
+    private static final UpdateChecker UPDATE_CHECKER = new UpdateChecker();
+    private final Logger LOGGER = Logger.getLogger(PacketEventsAPI.class.getName());
+    private static final LogManager LOG_MANAGER = new LogManager();
+    //TODO UPDATE
+    private static final PEVersion VERSION = new PEVersion(2, 0, 2);
+    
+    public EventManager getEventManager() {
+        return EVENT_MANAGER;
+    }
+
+    public PacketEventsSettings getSettings() {
+        return SETTINGS;
+    }
+
+    public UpdateChecker getUpdateChecker() {
+        return UPDATE_CHECKER;
+    }
+
+    public PEVersion getVersion() {
+        return VERSION;
+    }
+
+    public Logger getLogger() {
+        return LOGGER;
+    }
+
+    public LogManager getLogManager() {
+        return LOG_MANAGER;
+    }
+
+    public abstract void load();
+
+    public abstract boolean isLoaded();
+
+    public abstract void init();
+
+    public abstract boolean isInitialized();
+
+    public abstract void terminate();
+
+    public abstract T getPlugin();
+
+    public abstract ServerManager getServerManager();
+
+    public abstract ProtocolManager getProtocolManager();
+
+    public abstract PlayerManager getPlayerManager();
+
+    public abstract NettyManager getNettyManager();
+
+    public abstract ChannelInjector getInjector();
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,23 +16,23 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.event.eventtypes;
+package com.github.retrooper.packetevents.event;

-import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.event.PacketListenerAbstract;
-import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
+import com.github.retrooper.packetevents.event.PacketEvent;
+import com.github.retrooper.packetevents.event.PacketListenerAbstract;

 /**
 * The {@link PacketEvent} implements this interface.
- * Every inbuilt event should implement the {@link #call(PacketListenerAbstract)} method.
+ * Every inbuilt event should implement the {@link #call(PacketListenerCommon)} method.
 * If you are making a custom event, don't implement this.
- * The {@link PacketListenerAbstract#onPacketEventExternal(PacketEvent)} method is called for every event that is not in-built.
+ * The {@link PacketListenerCommon#onPacketEventExternal(PacketEvent)} method is called for every event that is not in-built.
 * including custom events.
 *
 * @author retrooper
- * @see PacketPlayReceiveEvent
 * @since 1.8
 */
 public interface CallableEvent {
-    void call(PacketListenerAbstract listener);
+    default void call(PacketListenerCommon listener) {
+        listener.onPacketEventExternal((PacketEvent) this);
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,9 +16,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.event.eventtypes;
+package com.github.retrooper.packetevents.event;

-import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;

 /**
 * Every event that supports cancellation should implement this interface.
@@ -26,11 +26,11 @@ import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 * in deciding whether the event will cancel.
 * This means an event with a lower priority than the higher priority one would not be able to decide.
 * Cancelling the event means the action assosiated with the event will be cancelled.
- * For example, cancelling the {@link PacketPlayReceiveEvent}
+ * For example, cancelling the {@link PacketReceiveEvent}
 * will prevent minecraft from processing the incoming packet.
 *
 * @author retrooper
- * @see PacketPlayReceiveEvent
+ * @see PacketReceiveEvent
 * @since 1.7
 */
 public interface CancellableEvent {
@@ -0,0 +1,124 @@
+/*
+ * 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;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.exception.InvalidHandshakeException;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+
+public class EventManager {
+    private final Map<Byte, Set<PacketListenerCommon>> listenersMap = new ConcurrentHashMap<>();
+
+    /**
+     * 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}
+     */
+    public void callEvent(PacketEvent event) {
+        callEvent(event, null);
+    }
+
+    public void callEvent(PacketEvent event, @Nullable Runnable postCallListenerAction) {
+        for (byte priority = PacketListenerPriority.LOWEST.getId(); priority <= PacketListenerPriority.MONITOR.getId(); priority++) {
+            Set<PacketListenerCommon> listeners = listenersMap.get(priority);
+            if (listeners != null) {
+                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);
+                        }
+                    }
+                    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);
+        }
+
+    }
+
+    public PacketListenerCommon registerListener(PacketListener listener, PacketListenerPriority priority) {
+        PacketListenerCommon packetListenerAbstract = listener.asAbstract(priority);
+        return registerListener(packetListenerAbstract);
+    }
+
+    /**
+     * Register the dynamic packet event listener.
+     *
+     * @param listener {@link PacketListenerCommon}
+     */
+    public PacketListenerCommon registerListener(PacketListenerCommon listener) {
+        byte priority = listener.getPriority().getId();
+        Set<PacketListenerCommon> listenerSet = listenersMap.get(priority);
+        if (listenerSet == null) {
+            listenerSet = ConcurrentHashMap.newKeySet();
+        }
+        listenerSet.add(listener);
+        listenersMap.put(priority, listenerSet);
+        return listener;
+    }
+
+    /**
+     * Register multiple dynamic packet event listeners with one method.
+     *
+     * @param listeners {@link PacketListenerCommon}
+     */
+    public PacketListenerCommon[] registerListeners(PacketListenerCommon... listeners) {
+        for (PacketListenerCommon listener : listeners) {
+            registerListener(listener);
+        }
+        return listeners;
+    }
+
+    public void unregisterListener(PacketListenerCommon listener) {
+        Set<PacketListenerCommon> listenerSet = listenersMap.get(listener.getPriority().getId());
+        if (listenerSet == null) return;
+        listenerSet.remove(listener);
+    }
+
+    public void unregisterListeners(PacketListenerCommon... listeners) {
+        for (PacketListenerCommon listener : listeners) {
+            unregisterListener(listener);
+        }
+    }
+
+
+    /**
+     * Unregister all dynamic packet event listeners.
+     */
+    public void unregisterAllListeners() {
+        listenersMap.clear();
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,10 +16,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.event;
+package com.github.retrooper.packetevents.event;


-import io.github.retrooper.packetevents.event.eventtypes.CallableEvent;
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.util.TimeStampMode;

 /**
 * An event in both of PacketEvents' event systems.
@@ -28,7 +29,23 @@ import io.github.retrooper.packetevents.event.eventtypes.CallableEvent;
 * @since 1.2.6
 */
 public abstract class PacketEvent implements CallableEvent {
-    private long timestamp = System.currentTimeMillis();
+    private final long timestamp;
+
+    public PacketEvent() {
+        TimeStampMode timeStampMode = PacketEvents.getAPI().getSettings()
+                .getTimeStampMode();
+        switch (timeStampMode) {
+            case MILLIS:
+                timestamp = System.currentTimeMillis();
+                break;
+            case NANO:
+                timestamp = System.nanoTime();
+                break;
+                //AKA NONE:
+            default:
+                timestamp = 0L;
+        }
+    }

    /**
     * Timestamp of when the PacketEvent was created.
@@ -40,20 +57,7 @@ public abstract class PacketEvent implements CallableEvent {
        return timestamp;
    }

-    /**
-     * Setter for the timestamp.
-     *
-     * @param timestamp Packet timestamp in milliseconds.
-     */
-    public void setTimestamp(final long timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public void callPacketEventExternal(final PacketListenerAbstract listener) {
+    public void callPacketEventExternal(PacketListenerCommon listener) {
        listener.onPacketEventExternal(this);
    }
-
-    public boolean isInbuilt() {
-        return false;
-    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,24 +16,14 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.event.annotation;
+package com.github.retrooper.packetevents.event;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

-/**
- * This is what you override your event listener with on the old event system.
- * You can specify the event priority of the listener method.
- *
- * @author retrooper
- * @since 1.0
- * @deprecated Was used for the old event system, the new one doesn't need this anymore.
- */
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
 public @interface PacketHandler {
-    byte priority() default 2; //NORMAL priority value
 }
@@ -0,0 +1,73 @@
+/*
+ * 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;
+
+public interface PacketListener {
+    default PacketListenerAbstract asAbstract(PacketListenerPriority priority) {
+        return new PacketListenerAbstract(priority) {
+            @Override
+            public void onUserConnect(UserConnectEvent event) {
+                PacketListener.this.onUserConnect(event);
+            }
+
+            @Override
+            public void onUserLogin(UserLoginEvent event) {
+                PacketListener.this.onUserLogin(event);
+            }
+
+            @Override
+            public void onUserDisconnect(UserDisconnectEvent event) {
+                PacketListener.this.onUserDisconnect(event);
+            }
+
+            @Override
+            public void onPacketReceive(PacketReceiveEvent event) {
+                PacketListener.this.onPacketReceive(event);
+            }
+
+            @Override
+            public void onPacketSend(PacketSendEvent event) {
+                PacketListener.this.onPacketSend(event);
+            }
+
+            @Override
+            public void onPacketEventExternal(PacketEvent event) {
+                PacketListener.this.onPacketEventExternal(event);
+            }
+        };
+    }
+
+    default void onUserConnect(UserConnectEvent event) {
+    }
+
+    default void onUserLogin(UserLoginEvent event) {
+    }
+
+    default void onUserDisconnect(UserDisconnectEvent event) {
+    }
+
+    default void onPacketReceive(PacketReceiveEvent event) {
+    }
+
+    default void onPacketSend(PacketSendEvent event) {
+    }
+
+    default void onPacketEventExternal(PacketEvent event) {
+    }
+}
@@ -0,0 +1,39 @@
+/*
+ * 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;
+
+public abstract class PacketListenerAbstract extends PacketListenerCommon {
+    public PacketListenerAbstract(PacketListenerPriority priority) {
+        super(priority);
+    }
+
+    public PacketListenerAbstract() {
+        super();
+    }
+
+    @Override
+    public void onPacketReceive(PacketReceiveEvent event) {
+
+    }
+
+    @Override
+    public void onPacketSend(PacketSendEvent event) {
+
+    }
+}
@@ -0,0 +1,64 @@
+/*
+ * 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;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Abstract packet listener.
+ *
+ * @author retrooper
+ * @since 1.8
+ */
+public abstract class PacketListenerCommon {
+    private final PacketListenerPriority priority;
+
+    public PacketListenerCommon(PacketListenerPriority priority) {
+        this.priority = priority;
+    }
+
+    public PacketListenerCommon() {
+        this.priority = PacketListenerPriority.NORMAL;
+    }
+
+    public PacketListenerPriority getPriority() {
+        return priority;
+    }
+
+    public void onUserConnect(UserConnectEvent event) {
+    }
+
+    public void onUserLogin(UserLoginEvent event) {
+    }
+
+    public void onUserDisconnect(UserDisconnectEvent event) {
+    }
+
+    void onPacketReceive(PacketReceiveEvent event) {
+    }
+
+    void onPacketSend(PacketSendEvent event) {
+    }
+
+    public void onPacketEventExternal(PacketEvent event) {
+    }
+
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,7 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.event;
+package com.github.retrooper.packetevents.event;

 /**
 * The priority of packet listeners affect the order they will be invoked in.
@@ -0,0 +1,66 @@
+/*
+ * 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;
+
+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;
+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<Object> {
+    protected PacketReceiveEvent(Object channel, User user, Object player, Object rawByteBuf,
+                                 boolean autoProtocolTranslation) throws PacketProcessException {
+        super(PacketSide.CLIENT, channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketReceiveEvent(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 void call(PacketListenerCommon listener) {
+        listener.onPacketReceive(this);
+    }
+
+    @Override
+    public PacketReceiveEvent clone() {
+        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;
+        }
+    }
+}
@@ -0,0 +1,81 @@
+/*
+ * 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;
+
+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.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<Object> {
+    private List<Runnable> tasksAfterSend = null;
+    protected PacketSendEvent(Object channel, User user, Object player, Object rawByteBuf,
+                              boolean autoProtocolTranslation) throws PacketProcessException {
+        super(PacketSide.SERVER, channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketSendEvent(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 void call(PacketListenerCommon listener) {
+        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() {
+        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;
+        }
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,23 +16,19 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.event.eventtypes;
-
-import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
-import org.bukkit.entity.Player;
+package com.github.retrooper.packetevents.event;

 /**
 * Every event that has an associated player is recommended to implement this interface.
 *
 * @author retrooper
- * @see PacketPlayReceiveEvent
 * @since 1.6.9
 */
-public interface PlayerEvent {
+public interface PlayerEvent<T> {
    /**
     * Associated player.
     *
     * @return Player.
     */
-    Player getPlayer();
+    T getPlayer();
 }
@@ -0,0 +1,231 @@
+/*
+ * 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;
+
+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;
+import com.github.retrooper.packetevents.netty.buffer.UnpooledByteBufAllocationHelper;
+import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import com.github.retrooper.packetevents.protocol.PacketSide;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+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 T player;
+    private Object byteBuf;
+    private final int packetID;
+    private final PacketTypeCommon packetType;
+    private ServerVersion serverVersion;
+    private boolean cancel;
+    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, T player, Object byteBuf,
+                               boolean autoProtocolTranslation) throws PacketProcessException {
+        this.channel = channel;
+        this.user = user;
+        this.player = player;
+        if (autoProtocolTranslation || user.getClientVersion() == null) {
+            this.serverVersion = PacketEvents.getAPI().getServerManager().getVersion();
+        } else {
+            //TODO Optimize
+            this.serverVersion = user.getClientVersion().toServerVersion();
+        }
+
+        this.byteBuf = byteBuf;
+        int size = ByteBufHelper.readableBytes(byteBuf);
+        if (size == 0) {
+            throw new PacketProcessException("Trying to process a packet, but it has no content. (Size=0)");
+        }
+        try {
+            this.packetID = ByteBufHelper.readVarInt(byteBuf);
+        } catch (Exception e) {
+            throw new PacketProcessException("Failed to read the Packet ID of a packet. (Size: " + size + ")");
+        }
+        ClientVersion version = serverVersion.toClientVersion();
+        this.packetType = PacketType.getById(packetSide, user.getConnectionState(),
+                version, packetID);
+        if (this.packetType == null) {
+            // mojang fucked 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.getConnectionState() + ", Server version: " + serverVersion.getReleaseName());
+        }
+        this.connectionState = user.getConnectionState();
+    }
+
+    public ProtocolPacketEvent(int packetID, PacketTypeCommon packetType, ServerVersion serverVersion, Object channel,
+                               User user, T player, Object byteBuf) {
+        this.channel = channel;
+        this.user = user;
+        this.player = player;
+        this.serverVersion = serverVersion;
+        this.byteBuf = byteBuf;
+        this.packetID = packetID;
+        this.packetType = packetType;
+        this.connectionState = user.getConnectionState();
+        cloned = true;
+    }
+
+    public void markForReEncode(boolean needsReEncode) {
+        this.needsReEncode = needsReEncode;
+    }
+
+    public boolean needsReEncode() {
+        return needsReEncode;
+    }
+
+
+    public boolean isClone() {
+        return cloned;
+    }
+
+    public Object getChannel() {
+        return channel;
+    }
+
+    public InetSocketAddress getSocketAddress() {
+        return (InetSocketAddress) ChannelHelper.remoteAddress(channel);
+    }
+
+    @Override
+    public User getUser() {
+        return user;
+    }
+
+    @Override
+    public T getPlayer() {
+        return player;
+    }
+
+    public ConnectionState getConnectionState() {
+        return connectionState;
+    }
+
+    //TODO Possibly put clientversion inside User class and remove here
+    @Deprecated
+    public ClientVersion getClientVersion() {
+        return user.getClientVersion();
+    }
+
+    @Deprecated
+    public void setClientVersion(@NotNull ClientVersion clientVersion) {
+        PacketEvents.getAPI().getLogManager().debug("Setting client version with deprecated method " + clientVersion.getReleaseName());
+        user.setClientVersion(clientVersion);
+    }
+
+    public ServerVersion getServerVersion() {
+        return serverVersion;
+    }
+
+    public void setServerVersion(@NotNull ServerVersion serverVersion) {
+        this.serverVersion = serverVersion;
+    }
+
+    public Object getByteBuf() {
+        return byteBuf;
+    }
+
+    public void setByteBuf(Object byteBuf) {
+        this.byteBuf = byteBuf;
+    }
+
+    public int getPacketId() {
+        return packetID;
+    }
+
+    public PacketTypeCommon getPacketType() {
+        return packetType;
+    }
+
+    @Deprecated
+    public String getPacketName() {
+        return ((Enum<?>) packetType).name();
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return this.cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean val) {
+        this.cancel = val;
+    }
+
+    @Nullable
+    public PacketWrapper<?> getLastUsedWrapper() {
+        return lastUsedWrapper;
+    }
+
+    public void setLastUsedWrapper(@Nullable PacketWrapper<?> lastUsedWrapper) {
+        this.lastUsedWrapper = lastUsedWrapper;
+    }
+
+    public List<Runnable> getPostTasks() {
+        if (postTasks == null) {
+            postTasks = new ArrayList<>();
+        }
+        return postTasks;
+    }
+
+    public boolean hasPostTasks() {
+        return postTasks != null && !postTasks.isEmpty();
+    }
+
+    @Override
+    public ProtocolPacketEvent<?> clone() {
+        return this instanceof PacketReceiveEvent ? ((PacketReceiveEvent) this).clone()
+                : ((PacketSendEvent) this).clone();
+    }
+
+    public void cleanUp() {
+        if (isClone()) {
+            ByteBufHelper.release(byteBuf);
+        }
+    }
+
+    public Object getFullBufferClone() {
+        byte[] data = ByteBufHelper.copyBytes(getByteBuf());
+        Object buffer = UnpooledByteBufAllocationHelper.buffer();
+        ByteBufHelper.writeVarInt(buffer, getPacketId());
+        ByteBufHelper.writeBytes(buffer, data);
+        return buffer;
+    }
+}
@@ -0,0 +1,80 @@
+/*
+ * 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;
+
+import com.github.retrooper.packetevents.event.simple.*;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+public abstract class SimplePacketListenerAbstract extends PacketListenerCommon {
+    public SimplePacketListenerAbstract(PacketListenerPriority priority) {
+        super(priority);
+    }
+
+    public SimplePacketListenerAbstract() {
+        super();
+    }
+
+    @Override
+    void onPacketReceive(PacketReceiveEvent event) {
+        if (event instanceof PacketHandshakeReceiveEvent) {
+            onPacketHandshakeReceive((PacketHandshakeReceiveEvent) event);
+        } else if (event instanceof PacketStatusReceiveEvent) {
+            onPacketStatusReceive((PacketStatusReceiveEvent) event);
+        } else if (event instanceof PacketLoginReceiveEvent) {
+            onPacketLoginReceive((PacketLoginReceiveEvent) event);
+        } else if (event instanceof PacketPlayReceiveEvent) {
+            onPacketPlayReceive((PacketPlayReceiveEvent) event);
+        }
+    }
+
+    @Override
+    void onPacketSend(PacketSendEvent event) {
+        if (event instanceof PacketStatusSendEvent) {
+            onPacketStatusSend((PacketStatusSendEvent) event);
+        } else if (event instanceof PacketLoginSendEvent) {
+            onPacketLoginSend((PacketLoginSendEvent) event);
+        } else if (event instanceof PacketPlaySendEvent) {
+            onPacketPlaySend((PacketPlaySendEvent) event);
+        }
+    }
+
+    public void onPacketHandshakeReceive(PacketHandshakeReceiveEvent event) {
+    }
+
+    public void onPacketStatusReceive(PacketStatusReceiveEvent event) {
+    }
+
+    public void onPacketStatusSend(PacketStatusSendEvent event) {
+    }
+
+    public void onPacketLoginReceive(PacketLoginReceiveEvent event) {
+    }
+
+    public void onPacketLoginSend(PacketLoginSendEvent event) {
+    }
+
+    public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
+    }
+
+    public void onPacketPlaySend(PacketPlaySendEvent event) {
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,17 +16,21 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.event.eventtypes;
+package com.github.retrooper.packetevents.event;

-import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import com.github.retrooper.packetevents.protocol.player.User;

-import java.net.InetSocketAddress;
-
-public abstract class CancellableNMSPacketEvent extends NMSPacketEvent implements CancellableEvent {
+public class UserConnectEvent extends PacketEvent implements CancellableEvent, UserEvent{
+    private final User user;
    private boolean cancelled;

-    public CancellableNMSPacketEvent(Object channel, NMSPacket packet) {
-        super(channel, packet);
+    public UserConnectEvent(User user) {
+        this.user = user;
+    }
+
+    @Override
+    public User getUser() {
+        return user;
    }

    @Override
@@ -35,7 +39,12 @@ public abstract class CancellableNMSPacketEvent extends NMSPacketEvent implement
    }

    @Override
-    public void setCancelled(boolean value) {
-        cancelled = value;
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    @Override
+    public void call(PacketListenerCommon listener) {
+        listener.onUserConnect(this);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,21 +16,24 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.packetwrappers.play.in.trsel;
+package com.github.retrooper.packetevents.event;

-import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
-import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import com.github.retrooper.packetevents.protocol.player.User;

-public class WrappedPacketInTrSel extends WrappedPacket {
-    public WrappedPacketInTrSel(NMSPacket packet) {
-        super(packet);
+public class UserDisconnectEvent extends PacketEvent implements UserEvent {
+    private final User user;
+
+    public UserDisconnectEvent(User user) {
+        this.user = user;
    }

-    public int getSlot() {
-        return readInt(0);
+    @Override
+    public User getUser() {
+        return user;
    }

-    public void setSlot(int slot) {
-        writeInt(0, slot);
+    @Override
+    public void call(PacketListenerCommon listener) {
+        listener.onUserDisconnect(this);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,14 +16,16 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.packetwrappers.api;
+package com.github.retrooper.packetevents.event;
+
+import com.github.retrooper.packetevents.protocol.player.User;

 /**
- * Packet-Wrappers that can be sent to clients.
+ * Event that involves users.
 *
 * @author retrooper
- * //TODO since javadoc annotation
+ * @since 2.0.0
 */
-public interface SendableWrapper {
-    Object asNMSPacket() throws Exception;
+public interface UserEvent {
+    User getUser();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,31 +16,31 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.utils.npc;
+package com.github.retrooper.packetevents.event;

-import org.jetbrains.annotations.Nullable;
+import com.github.retrooper.packetevents.protocol.player.User;

-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+public class UserLoginEvent extends PacketEvent implements CallableEvent, UserEvent, PlayerEvent<Object> {
+    private final User user;
+    private final Object player;

-public class NPCManager {
-    private final Map<Integer, NPC> npcMap = new ConcurrentHashMap<>();
-
-    @Nullable
-    public NPC getNPCById(int entityID) {
-        return npcMap.get(entityID);
+    public UserLoginEvent(User user, Object player) {
+        this.user = user;
+        this.player = player;
    }

-    public Collection<NPC> getNPCList() {
-        return npcMap.values();
+    @Override
+    public User getUser() {
+        return user;
    }

-    public void registerNPC(NPC npc) {
-        npcMap.put(npc.getEntityId(), npc);
+    @Override
+    public Object getPlayer() {
+        return player;
    }

-    public void unregisterNPC(NPC npc) {
-        npcMap.remove(npc.getEntityId());
+    @Override
+    public void call(PacketListenerCommon listener) {
+        listener.onUserLogin(this);
    }
 }
@@ -0,0 +1,58 @@
+/*
+ * 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 PacketHandshakeReceiveEvent extends PacketReceiveEvent {
+    public PacketHandshakeReceiveEvent(Object channel, User user,
+                                       Object player, Object rawByteBuf,
+                                       boolean autoProtocolTranslation) throws PacketProcessException {
+        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketHandshakeReceiveEvent(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 PacketHandshakeReceiveEvent clone() {
+        try {
+            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
+            return new PacketHandshakeReceiveEvent(getPacketId(), getPacketType(), getServerVersion(),
+                    getChannel(), getUser(), getPlayer(), clonedBuffer);
+        } catch (PacketProcessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public PacketType.Handshaking.Client getPacketType() {
+        return (PacketType.Handshaking.Client) super.getPacketType();
+    }
+}
@@ -0,0 +1,40 @@
+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 PacketHandshakeSendEvent extends PacketSendEvent {
+    public PacketHandshakeSendEvent(Object channel, User user,
+                                       Object player, Object rawByteBuf,
+                                       boolean autoProtocolTranslation) throws PacketProcessException {
+        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketHandshakeSendEvent(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 PacketHandshakeSendEvent clone() {
+        try {
+            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
+            return new PacketHandshakeSendEvent(getPacketId(), getPacketType(), getServerVersion(),
+                    getChannel(), getUser(), getPlayer(), clonedBuffer);
+        } catch (PacketProcessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public PacketType.Handshaking.Client getPacketType() {
+        return (PacketType.Handshaking.Client) super.getPacketType();
+    }
+}
@@ -0,0 +1,59 @@
+/*
+ * 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 PacketLoginReceiveEvent extends PacketReceiveEvent {
+    public PacketLoginReceiveEvent(Object channel, User user, Object player,
+                                   Object rawByteBuf,
+                                   boolean autoProtocolTranslation) throws PacketProcessException {
+        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketLoginReceiveEvent(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 PacketLoginReceiveEvent clone() {
+        try {
+            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
+            return new PacketLoginReceiveEvent(getPacketId(), getPacketType(), getServerVersion(),
+                    getChannel(), getUser(), getPlayer(), clonedBuffer);
+        } catch (PacketProcessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public PacketType.Login.Client getPacketType() {
+        return (PacketType.Login.Client) super.getPacketType();
+    }
+}
@@ -0,0 +1,57 @@
+/*
+ * 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 PacketLoginSendEvent extends PacketSendEvent {
+    public PacketLoginSendEvent(Object channel, User user, Object player, Object rawByteBuf,
+                                boolean autoProtocolTranslation) throws PacketProcessException {
+        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketLoginSendEvent(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 PacketLoginSendEvent clone() {
+        try {
+            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
+            return new PacketLoginSendEvent(getPacketId(), getPacketType(), getServerVersion(),
+                    getChannel(), getUser(), getPlayer(), clonedBuffer);
+        } catch (PacketProcessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public PacketType.Login.Server getPacketType() {
+        return (PacketType.Login.Server) super.getPacketType();
+    }
+}
@@ -0,0 +1,58 @@
+/*
+ * 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 PacketPlayReceiveEvent extends PacketReceiveEvent {
+    public PacketPlayReceiveEvent(Object channel, User user,
+                                  Object player, Object rawByteBuf,
+                                  boolean autoProtocolTranslation) throws PacketProcessException {
+        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketPlayReceiveEvent(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 PacketPlayReceiveEvent clone() {
+        try {
+            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
+            return new PacketPlayReceiveEvent(getPacketId(), getPacketType(), getServerVersion(),
+                    getChannel(), getUser(), getPlayer(), clonedBuffer);
+        } catch (PacketProcessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public PacketType.Play.Client getPacketType() {
+        return (PacketType.Play.Client) super.getPacketType();
+    }
+}
@@ -0,0 +1,58 @@
+/*
+ * 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 PacketPlaySendEvent extends PacketSendEvent {
+    public PacketPlaySendEvent(Object channel, User user,
+                               Object player, Object rawByteBuf,
+                               boolean autoProtocolTranslation) throws PacketProcessException {
+        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketPlaySendEvent(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 PacketPlaySendEvent clone() {
+        try {
+            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
+            return new PacketPlaySendEvent(getPacketId(), getPacketType(), getServerVersion(),
+                    getChannel(), getUser(), getPlayer(), clonedBuffer);
+        } catch (PacketProcessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public PacketType.Play.Server getPacketType() {
+        return (PacketType.Play.Server) super.getPacketType();
+    }
+}
@@ -0,0 +1,58 @@
+/*
+ * 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 PacketStatusReceiveEvent extends PacketReceiveEvent {
+    public PacketStatusReceiveEvent(Object channel, User user,
+                                    Object player, Object rawByteBuf,
+                                    boolean autoProtocolTranslation) throws PacketProcessException {
+        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketStatusReceiveEvent(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 PacketStatusReceiveEvent clone() {
+        try {
+            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
+            return new PacketStatusReceiveEvent(getPacketId(), getPacketType(), getServerVersion(),
+                    getChannel(), getUser(), getPlayer(), clonedBuffer);
+        } catch (PacketProcessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public PacketType.Status.Client getPacketType() {
+        return (PacketType.Status.Client) super.getPacketType();
+    }
+}
@@ -0,0 +1,58 @@
+/*
+ * 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 PacketStatusSendEvent extends PacketSendEvent {
+    public PacketStatusSendEvent(Object channel, User user, Object player, Object rawByteBuf,
+                                 boolean autoProtocolTranslation) throws PacketProcessException {
+        super(channel, user, player, rawByteBuf, autoProtocolTranslation);
+    }
+
+    protected PacketStatusSendEvent(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 PacketStatusSendEvent clone() {
+        try {
+            Object clonedBuffer = ByteBufHelper.retainedDuplicate(getByteBuf());
+            return new PacketStatusSendEvent(getPacketId(), getPacketType(), getServerVersion(),
+                    getChannel(), getUser(), getPlayer(), clonedBuffer);
+        } catch (PacketProcessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public PacketType.Status.Server getPacketType() {
+        return (PacketType.Status.Server) super.getPacketType();
+    }
+}
@@ -0,0 +1,5 @@
+package com.github.retrooper.packetevents.exception;
+
+public class CancelPacketException extends RuntimeException {
+    public static final CancelPacketException INSTANCE = new CancelPacketException();
+}
@@ -0,0 +1,4 @@
+package com.github.retrooper.packetevents.exception;
+
+public class InvalidDisconnectPacketSend extends RuntimeException {
+}
@@ -0,0 +1,4 @@
+package com.github.retrooper.packetevents.exception;
+
+public class InvalidHandshakeException extends RuntimeException {
+}
@@ -0,0 +1,33 @@
+/*
+ * 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.exception;
+
+public class PacketProcessException extends RuntimeException {
+    public PacketProcessException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+
+    public PacketProcessException(Throwable cause) {
+        super(cause);
+    }
+
+    public PacketProcessException(String msg) {
+        super(msg);
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,28 +16,22 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.injector;
+package com.github.retrooper.packetevents.injector;

-import org.bukkit.entity.Player;
+import com.github.retrooper.packetevents.protocol.player.User;

 public interface ChannelInjector {
-    default boolean isBound() {
+    default boolean isServerBound() {
        return true;
    }

    void inject();

-    void eject();
+    void uninject();

-    void injectPlayer(Player player);
+    void updateUser(Object channel, User user);

-    void ejectPlayer(Player player);
+    void setPlayer(Object channel, Object player);

-    boolean hasInjected(Player player);
-
-    void writePacket(Object channel, Object rawNMSPacket);
-
-    void flushPackets(Object channel);
-
-    void sendPacket(Object channel, Object rawNMSPacket);
+    boolean isProxy();
 }
@@ -0,0 +1,137 @@
+/*
+ * 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.manager;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.PacketListenerAbstract;
+import com.github.retrooper.packetevents.event.PacketListenerPriority;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+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.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() {
+        this(PacketListenerPriority.LOWEST);
+    }
+
+    public InternalPacketListener(PacketListenerPriority priority) {
+        super(priority);
+    }
+
+    @Override
+    public void onPacketSend(PacketSendEvent event) {
+        User user = event.getUser();
+        if (event.getPacketType() == PacketType.Login.Server.LOGIN_SUCCESS) {
+            Object channel = event.getChannel();
+            //Process outgoing login success packet
+            WrapperLoginServerLoginSuccess loginSuccess = new WrapperLoginServerLoginSuccess(event);
+            UserProfile profile = loginSuccess.getUserProfile();
+
+            //Update user profile
+            user.getProfile().setUUID(profile.getUUID());
+            user.getProfile().setName(profile.getName());
+            //Texture properties are passed in login success on 1.19
+            user.getProfile().setTextureProperties(profile.getTextureProperties());
+
+            //Map username with channel
+            synchronized (channel) {
+                ProtocolManager.CHANNELS.put(profile.getUUID(), channel);
+            }
+
+            PacketEvents.getAPI().getLogManager().debug("Mapped player UUID with their channel.");
+
+            //Switch the user's connection state to PLAY, but the variable event.getConnectionState() remains LOGIN
+            //We switch user state immediately to remain in sync with vanilla, allowing you to send PLAY packets immediately
+            user.setConnectionState(ConnectionState.PLAY);
+            PacketEvents.getAPI().getLogManager().debug("Transitioned " + profile.getName() + " into the PLAY state!");
+        }
+
+        // Join game can be used to update world height, and sets dimension data
+
+        else if (event.getPacketType() == PacketType.Play.Server.JOIN_GAME) {
+            WrapperPlayServerJoinGame joinGame = new WrapperPlayServerJoinGame(event);
+            user.setEntityId(joinGame.getEntityId());
+            user.setDimension(joinGame.getDimension());
+            if (event.getServerVersion().isOlderThanOrEquals(ServerVersion.V_1_16_5)) {
+                return; // Fixed world height, no tags are sent to the client
+            }
+
+            // Store world height
+            NBTList<NBTCompound> list = joinGame.getDimensionCodec().getCompoundTagOrNull("minecraft:dimension_type").getCompoundListTagOrNull("value");
+            user.setWorldNBT(list);
+
+            // Update world height
+            NBTCompound dimension = user.getWorldNBT(joinGame.getDimension().getDimensionName());
+            if (dimension != null) {
+                NBTCompound worldNBT = dimension.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 respawn = new WrapperPlayServerRespawn(event);
+            user.setDimension(respawn.getDimension());
+            if (event.getServerVersion().isOlderThanOrEquals(ServerVersion.V_1_16_5)) {
+                return; // Fixed world height, no tags are sent to the client
+            }
+
+            NBTCompound dimension = user.getWorldNBT(respawn.getDimension().getDimensionName());
+            if (dimension != null) {
+                NBTCompound worldNBT = dimension.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());
+            }
+        }
+    }
+
+    @Override
+    public void onPacketReceive(PacketReceiveEvent event) {
+        User user = event.getUser();
+        if (event.getPacketType() == PacketType.Handshaking.Client.HANDSHAKE) {
+            Object channel = event.getChannel();
+            InetSocketAddress address = event.getSocketAddress();
+            WrapperHandshakingClientHandshake handshake = new WrapperHandshakingClientHandshake(event);
+            ConnectionState nextState = handshake.getNextConnectionState();
+            ClientVersion clientVersion = handshake.getClientVersion();
+            //Update client version for this event call(and user)
+            user.setClientVersion(clientVersion);
+            PacketEvents.getAPI().getLogManager().debug("Processed " + address.getHostString() + ":" + address.getPort() + "'s client version. Client Version: " + clientVersion.getReleaseName());
+            //Transition into LOGIN or STATUS connection state immediately, to remain in sync with vanilla
+            user.setConnectionState(nextState);
+            PacketEvents.getAPI().getLogManager().debug("Transitioned " + address.getHostString() + ":" + address.getPort() + " into the " + nextState + " state!");
+        }
+    }
+}
@@ -0,0 +1,87 @@
+/*
+ * 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.manager.player;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.NotNull;
+
+public interface PlayerManager {
+    int getPing(@NotNull Object player);
+
+    @NotNull ClientVersion getClientVersion(@NotNull Object player);
+
+    Object getChannel(@NotNull Object player);
+
+    User getUser(@NotNull Object player);
+
+    default ConnectionState getConnectionState(@NotNull Object player) {
+        return getUser(player).getConnectionState();
+    }
+
+    default void sendPacket(@NotNull Object player, @NotNull Object byteBuf) {
+        PacketEvents.getAPI().getProtocolManager().sendPacket(getChannel(player), byteBuf);
+    }
+    default void sendPacket(@NotNull Object player, @NotNull PacketWrapper<?> wrapper) {
+        PacketEvents.getAPI().getProtocolManager().sendPacket(getChannel(player), wrapper);
+    }
+
+    default void sendPacketSilently(@NotNull Object player, @NotNull Object byteBuf) {
+        PacketEvents.getAPI().getProtocolManager().sendPacketSilently(getChannel(player), byteBuf);
+    }
+
+    default void sendPacketSilently(@NotNull Object player, @NotNull PacketWrapper<?> wrapper) {
+        PacketEvents.getAPI().getProtocolManager().sendPacketSilently(getChannel(player), wrapper);
+    }
+
+    default void writePacket(@NotNull Object player, @NotNull Object byteBuf) {
+        PacketEvents.getAPI().getProtocolManager().writePacket(getChannel(player), byteBuf);
+    }
+
+    default void writePacket(@NotNull Object player, @NotNull PacketWrapper<?> wrapper) {
+        PacketEvents.getAPI().getProtocolManager().writePacket(getChannel(player), wrapper);
+    }
+
+    default void writePacketSilently(@NotNull Object player, @NotNull Object byteBuf) {
+        PacketEvents.getAPI().getProtocolManager().writePacketSilently(getChannel(player), byteBuf);
+    }
+
+    default void writePacketSilently(@NotNull Object player, @NotNull PacketWrapper<?> wrapper) {
+        PacketEvents.getAPI().getProtocolManager().writePacketSilently(getChannel(player), wrapper);
+    }
+
+    default void receivePacket(Object player, Object byteBuf) {
+        PacketEvents.getAPI().getProtocolManager().receivePacket(getChannel(player), byteBuf);
+    }
+
+    default void receivePacket(Object player, PacketWrapper<?> wrapper) {
+        PacketEvents.getAPI().getProtocolManager().receivePacket(getChannel(player), wrapper);
+    }
+
+    default void receivePacketSilently(Object player, Object byteBuf) {
+        PacketEvents.getAPI().getProtocolManager().receivePacketSilently(getChannel(player), byteBuf);
+    }
+
+    default void receivePacketSilently(Object player, PacketWrapper<?> wrapper) {
+        PacketEvents.getAPI().getProtocolManager().receivePacketSilently(getChannel(player), wrapper);
+    }
+}
@@ -0,0 +1,166 @@
+/*
+ * 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.manager.protocol;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
+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;
+import java.util.UUID;
+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() {
+        return USERS.values();
+    }
+
+    default Collection<Object> getChannels() {
+        return CHANNELS.values();
+    }
+
+    //Methods to implement
+    ProtocolVersion getPlatformVersion();
+    void sendPacket(Object channel, Object byteBuf);
+    void sendPacketSilently(Object channel, Object byteBuf);
+    void writePacket(Object channel, Object byteBuf);
+    void writePacketSilently(Object channel, Object byteBuf);
+    void receivePacket(Object channel, Object byteBuf);
+    void receivePacketSilently(Object channel, Object byteBuf);
+    ClientVersion getClientVersion(Object channel);
+    //TODO Define method that accepts an array of channels/set/list of channels.
+
+    default void sendPackets(Object channel, Object... byteBuf) {
+        for (Object buf : byteBuf) {
+            sendPacket(channel, buf);
+        }
+    }
+
+    default void sendPacketsSilently(Object channel, Object... byteBuf) {
+        for (Object buf : byteBuf) {
+            sendPacketSilently(channel, buf);
+        }
+    }
+
+    default void writePackets(Object channel, Object... byteBuf) {
+        for (Object buf : byteBuf) {
+            writePacket(channel, buf);
+        }
+    }
+
+    default void writePacketsSilently(Object channel, Object... byteBuf) {
+        for (Object buf : byteBuf) {
+            writePacketSilently(channel, buf);
+        }
+    }
+
+    default void receivePackets(Object channel, Object... byteBuf) {
+        for (Object buf : byteBuf) {
+            receivePacket(channel, buf);
+        }
+    }
+
+    default void receivePacketsSilently(Object channel, Object... byteBuf) {
+        for (Object buf : byteBuf) {
+            receivePacketSilently(channel, buf);
+        }
+    }
+
+
+    default void setClientVersion(Object channel, ClientVersion version) {
+        getUser(channel).setClientVersion(version);
+    }
+
+    @ApiStatus.Internal
+    default Object[] transformWrappers(PacketWrapper<?> wrapper, Object channel, boolean outgoing) {
+        //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++) {
+            wrappers[i].prepareForSend(channel, outgoing);
+            buffers[i] = wrappers[i].buffer;
+            // Fix race condition when sending packets to multiple people (due to when the buffer is freed)
+            wrappers[i].buffer = null;
+        }
+        return buffers;
+    }
+
+    default void sendPacket(Object channel, PacketWrapper<?> wrapper) {
+        Object[] transformed = transformWrappers(wrapper, channel, true);
+        sendPackets(channel, transformed);
+    }
+
+    default void sendPacketSilently(Object channel, PacketWrapper<?> wrapper) {
+        Object[] transformed = transformWrappers(wrapper, channel, true);
+        sendPacketsSilently(channel, transformed);
+    }
+
+    default void writePacket(Object channel, PacketWrapper<?> wrapper) {
+        Object[] transformed = transformWrappers(wrapper, channel, true);
+        writePackets(channel, transformed);
+    }
+
+    default void writePacketSilently(Object channel, PacketWrapper<?> wrapper) {
+        Object[] transformed = transformWrappers(wrapper, channel, true);
+        writePacketsSilently(channel, transformed);
+    }
+
+    default void receivePacket(Object channel, PacketWrapper<?> wrapper) {
+        Object[] transformed = transformWrappers(wrapper, channel, false);
+        receivePackets(channel, transformed);
+    }
+
+    default void receivePacketSilently(Object channel, PacketWrapper<?> wrapper) {
+        Object[] transformed = transformWrappers(wrapper, channel, false);
+        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);
+    }
+
+    default void setUser(Object channel, User user) {
+        synchronized (channel) {
+            Object pipeline = ChannelHelper.getPipeline(channel);
+            USERS.put(pipeline, user);
+        }
+        PacketEvents.getAPI().getInjector().updateUser(channel, user);
+    }
+
+    default Object getChannel(UUID uuid) {
+        return CHANNELS.get(uuid);
+    }
+}
@@ -0,0 +1,37 @@
+/*
+ * 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.manager.server;
+
+public interface ServerManager {
+    /**
+     * Get the server version.
+     *
+     * @return Get Server Version
+     */
+    ServerVersion getVersion();
+
+    /**
+     * Get the operating system of the local machine
+     *
+     * @return Get Operating System
+     */
+    default SystemOS getOS() {
+        return SystemOS.getOS();
+    }
+}
@@ -0,0 +1,214 @@
+/*
+ * 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.manager.server;
+
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Server Version.
+ * This is a nice wrapper over minecraft's protocol versions.
+ * You won't have to memorize the protocol version, just memorize the server version you see in the launcher.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol_version_numbers">https://wiki.vg/Protocol_version_numbers</a>
+ * @since 1.6.9
+ */
+public enum ServerVersion {
+    //TODO Rename to MinecraftVersion?
+    V_1_7_10(5),
+    V_1_8(47), V_1_8_3(47), V_1_8_8(47),
+    V_1_9(107), V_1_9_2(109), V_1_9_4(110),
+    //1.10 and 1.10.1 are redundant
+    V_1_10(210), V_1_10_1(210), V_1_10_2(210),
+    V_1_11(315), V_1_11_2(316),
+    V_1_12(335), V_1_12_1(338), V_1_12_2(340),
+    V_1_13(393), V_1_13_1(401), V_1_13_2(404),
+    V_1_14(477), V_1_14_1(480), V_1_14_2(485), V_1_14_3(490), V_1_14_4(498),
+    V_1_15(573), V_1_15_1(575), V_1_15_2(578),
+    V_1_16(735), V_1_16_1(736), V_1_16_2(751), V_1_16_3(753), V_1_16_4(754), V_1_16_5(754),
+    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
+    V_1_20(763), V_1_20_1(763),
+    //TODO UPDATE Add server version constant
+    ERROR(-1, true);
+
+    private static final ServerVersion[] VALUES = values();
+    private static final ServerVersion[] REVERSED_VALUES;
+
+    static {
+        REVERSED_VALUES = values();
+        int i = 0;
+        int j = REVERSED_VALUES.length - 1;
+        ServerVersion tmp;
+        while (j > i) {
+            tmp = REVERSED_VALUES[j];
+            REVERSED_VALUES[j--] = REVERSED_VALUES[i];
+            REVERSED_VALUES[i++] = tmp;
+        }
+    }
+
+    private final int protocolVersion;
+    private final String name;
+    private ClientVersion toClientVersion;
+
+    ServerVersion(int protocolVersion) {
+        this.protocolVersion = protocolVersion;
+        this.name = name().substring(2).replace("_", ".");
+    }
+
+    ServerVersion(int protocolVersion, boolean isNotRelease) {
+        this.protocolVersion = protocolVersion;
+        if (isNotRelease) {
+            this.name = name();
+        } else {
+            this.name = name().substring(2).replace("_", ".");
+        }
+    }
+
+    public static ServerVersion[] reversedValues() {
+        return REVERSED_VALUES;
+    }
+
+    public static ServerVersion getLatest() {
+        return REVERSED_VALUES[1];
+    }
+
+    public static ServerVersion getOldest() {
+        return VALUES[0];
+    }
+
+    //TODO Optimize
+    @Deprecated
+    public static ServerVersion getById(int protocolVersion) {
+        for (ServerVersion version : VALUES) {
+            if (version.protocolVersion == protocolVersion) {
+                return version;
+            }
+        }
+        return null;
+    }
+
+    public ClientVersion toClientVersion() {
+        if (toClientVersion == null) {
+            toClientVersion = ClientVersion.getById(protocolVersion);
+        }
+        return toClientVersion;
+    }
+
+    /**
+     * Get the release name of this server version.
+     * For example, for the V_1_18 enum constant, it would return "1.18".
+     *
+     * @return Release name
+     */
+    public String getReleaseName() {
+        return name;
+    }
+
+    /**
+     * Get this server version's protocol version.
+     *
+     * @return Protocol version.
+     */
+    public int getProtocolVersion() {
+        return protocolVersion;
+    }
+
+    /**
+     * Is this server version newer than the compared server version?
+     * This method simply checks if this server version's protocol version is greater than
+     * the compared server version's protocol version.
+     *
+     * @param target Compared server version.
+     * @return Is this server version newer than the compared server version.
+     */
+    public boolean isNewerThan(ServerVersion target) {
+        return this.ordinal() > target.ordinal();
+    }
+
+    /**
+     * Is this server version older than the compared server version?
+     * This method simply checks if this server version's protocol version is less than
+     * the compared server version's protocol version.
+     *
+     * @param target Compared server version.
+     * @return Is this server version older than the compared server version.
+     */
+    public boolean isOlderThan(ServerVersion target) {
+        return this.ordinal() < target.ordinal();
+    }
+
+    /**
+     * Is this server version newer than or equal to the compared server version?
+     * This method simply checks if this server version's protocol version is greater than or equal to
+     * the compared server version's protocol version.
+     *
+     * @param target Compared server version.
+     * @return Is this server version newer than or equal to the compared server version.
+     */
+    public boolean isNewerThanOrEquals(ServerVersion target) {
+        return this.ordinal() >= target.ordinal();
+    }
+
+    /**
+     * Is this server version older than or equal to the compared server version?
+     * This method simply checks if this server version's protocol version is older than or equal to
+     * the compared server version's protocol version.
+     *
+     * @param target Compared server version.
+     * @return Is this server version older than or equal to the compared server version.
+     */
+    public boolean isOlderThanOrEquals(ServerVersion target) {
+        return this.ordinal() <= target.ordinal();
+    }
+
+    /**
+     * Is this server version newer than, older than or equal to the compared server version?
+     * This method simply checks if this server version's protocol version is greater than, less than or equal to
+     * the compared server version's protocol version.
+     *
+     * @param comparison    Comparison type.
+     * @param targetVersion Compared server version.
+     * @return true or false, based on the comparison type.
+     * @see #isNewerThan(ServerVersion)
+     * @see #isNewerThanOrEquals(ServerVersion)
+     * @see #isOlderThan(ServerVersion)
+     * @see #isOlderThanOrEquals(ServerVersion)
+     */
+    public boolean is(@NotNull VersionComparison comparison, @NotNull ServerVersion targetVersion) {
+        switch (comparison) {
+            case EQUALS:
+                return protocolVersion == targetVersion.protocolVersion;
+            case NEWER_THAN:
+                return isNewerThan(targetVersion);
+            case NEWER_THAN_OR_EQUALS:
+                return isNewerThanOrEquals(targetVersion);
+            case OLDER_THAN:
+                return isOlderThan(targetVersion);
+            case OLDER_THAN_OR_EQUALS:
+                return isOlderThanOrEquals(targetVersion);
+            default:
+                return false;
+        }
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,7 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.utils.server;
+package com.github.retrooper.packetevents.manager.server;

 /**
 * System Operating system.
@@ -27,9 +27,7 @@ package io.github.retrooper.packetevents.utils.server;
 public enum SystemOS {

    WINDOWS, MACOS, LINUX, OTHER;
-
-    private static final SystemOS[] VALUES = values();
-    private static SystemOS value;
+    private static SystemOS CACHE;

    /**
     * Get the server's operating system.
@@ -39,7 +37,7 @@ public enum SystemOS {
     */
    public static SystemOS getOSNoCache() {
        final String os = System.getProperty("os.name").toLowerCase();
-        for (SystemOS sysos : VALUES) {
+        for (SystemOS sysos : values()) {
            if (os.contains(sysos.name().toLowerCase())) {
                return sysos;
            }
@@ -54,22 +52,10 @@ public enum SystemOS {
     * @return Operating System.
     */
    public static SystemOS getOS() {
-        if (value == null) {
-            value = getOSNoCache();
+        if (CACHE == null) {
+            CACHE = getOSNoCache();
        }
-        return value;
-    }
-
-    /**
-     * Get the server's operating system.
-     * This method will CACHE for you.
-     *
-     * @return Operating System.
-     * @deprecated Use {@link #getOS()}, method renamed.
-     */
-    @Deprecated
-    public static SystemOS getOperatingSystem() {
-        return getOS();
+        return CACHE;
    }

 }
@@ -0,0 +1,45 @@
+/*
+ * 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.manager.server;
+
+/**
+ * This enum contains all possible comparison types for server versions.
+ */
+public enum VersionComparison {
+    /*
+    The server version equals the compared server version.
+     */
+    EQUALS,
+    /*
+    The server version is newer than the compared server version.
+     */
+    NEWER_THAN,
+    /*
+    The server version is newer than or equal to the compared server version.
+     */
+    NEWER_THAN_OR_EQUALS,
+    /*
+    The server version is older than the compared server version.
+     */
+    OLDER_THAN,
+    /*
+    The server version is older than or equal to the compared server version.
+     */
+    OLDER_THAN_OR_EQUALS;
+}
@@ -0,0 +1,31 @@
+/*
+ * 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.netty;
+
+import com.github.retrooper.packetevents.netty.buffer.ByteBufAllocationOperator;
+import com.github.retrooper.packetevents.netty.buffer.ByteBufOperator;
+import com.github.retrooper.packetevents.netty.channel.ChannelOperator;
+
+public interface NettyManager {
+    ChannelOperator getChannelOperator();
+
+    ByteBufOperator getByteBufOperator();
+
+    ByteBufAllocationOperator getByteBufAllocationOperator();
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,12 +16,16 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.utils.immutableset;
+package com.github.retrooper.packetevents.netty.buffer;

-abstract class ImmutableSetAbstract<T> {
-    public abstract boolean contains(T element);
+public interface ByteBufAllocationOperator {
+    Object wrappedBuffer(byte[] bytes);

-    public abstract void add(T element);
+    Object copiedBuffer(byte[] bytes);

-    public abstract void addAll(T... element);
+    Object buffer();
+
+    Object directBuffer();
+
+    Object compositeBuffer();
 }
@@ -0,0 +1,265 @@
+/*
+ * 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.netty.buffer;
+
+import com.github.retrooper.packetevents.PacketEvents;
+
+import java.nio.charset.Charset;
+
+public class ByteBufHelper {
+    public static int capacity(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().capacity(buffer);
+    }
+
+    public static Object capacity(Object buffer, int capacity) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().capacity(buffer, capacity);
+    }
+
+    public static int readerIndex(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readerIndex(buffer);
+    }
+
+    public static Object readerIndex(Object buffer, int readerIndex) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readerIndex(buffer, readerIndex);
+    }
+
+    public static int writerIndex(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().writerIndex(buffer);
+    }
+
+    public static Object writerIndex(Object buffer, int writerIndex) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().writerIndex(buffer, writerIndex);
+    }
+
+    public static int readableBytes(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readableBytes(buffer);
+    }
+
+    public static int writableBytes(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().writableBytes(buffer);
+    }
+
+    public static Object clear(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().clear(buffer);
+    }
+
+    public static String toString(Object buffer, int index, int length, Charset charset) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().toString(buffer, index, length, charset);
+    }
+
+    public static byte readByte(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readByte(buffer);
+    }
+
+    public static void writeByte(Object buffer, int value) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeByte(buffer, value);
+    }
+
+    public static boolean readBoolean(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readBoolean(buffer);
+    }
+
+    public static void writeBoolean(Object buffer, boolean value) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeBoolean(buffer, value);
+    }
+
+    public static short readUnsignedByte(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readUnsignedByte(buffer);
+    }
+
+    public static char readChar(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readChar(buffer);
+    }
+
+    public static void writeChar(Object buffer, int value) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeChar(buffer, value);
+    }
+
+    public static short readShort(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readShort(buffer);
+    }
+
+    public static int readUnsignedShort(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readUnsignedShort(buffer);
+    }
+
+    public static void writeShort(Object buffer, int value) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeShort(buffer, value);
+    }
+
+    public static int readInt(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readInt(buffer);
+    }
+
+    public static void writeInt(Object buffer, int value) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeInt(buffer, value);
+    }
+
+    public static long readUnsignedInt(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readUnsignedInt(buffer);
+    }
+
+    public static long readLong(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readLong(buffer);
+    }
+
+    public static void writeLong(Object buffer, long value) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeLong(buffer, value);
+    }
+
+    public static float readFloat(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readFloat(buffer);
+    }
+
+    public static void writeFloat(Object buffer, float value) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeFloat(buffer, value);
+    }
+
+    public static double readDouble(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readDouble(buffer);
+    }
+
+    public static void writeDouble(Object buffer, double value) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeDouble(buffer, value);
+    }
+
+    public static Object getBytes(Object buffer, int index, byte[] destination) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().getBytes(buffer, index, destination);
+    }
+
+    public static short getUnsignedByte(Object buffer, int index) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().getUnsignedByte(buffer, index);
+    }
+
+    public static boolean isReadable(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().isReadable(buffer);
+    }
+
+    public static Object copy(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().copy(buffer);
+    }
+
+    public static Object duplicate(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().duplicate(buffer);
+    }
+
+    public static boolean hasArray(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().hasArray(buffer);
+    }
+
+    public static byte[] array(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().array(buffer);
+    }
+
+    public static Object retain(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().retain(buffer);
+    }
+
+    public static Object retainedDuplicate(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().retainedDuplicate(buffer);
+    }
+
+    public static Object readSlice(Object buffer, int length) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readSlice(buffer, length);
+    }
+
+    public static Object readBytes(Object buffer, byte[] destination, int destinationIndex, int length) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readBytes(buffer, destination, destinationIndex, length);
+    }
+
+    public static Object readBytes(Object buffer, int length) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().readBytes(buffer, length);
+    }
+
+    public static Object writeBytes(Object buffer, Object src) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeBytes(buffer, src);
+    }
+
+    public static void readBytes(Object buffer, byte[] bytes) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().readBytes(buffer, bytes);
+    }
+
+    public static void writeBytes(Object buffer, byte[] bytes) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeBytes(buffer, bytes);
+    }
+
+    public static void writeBytes(Object buffer, byte[] bytes, int offset, int length) {
+        PacketEvents.getAPI().getNettyManager().getByteBufOperator().writeBytes(buffer, bytes, offset, length);
+    }
+
+    public static boolean release(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().release(buffer);
+    }
+
+    public static int refCnt(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().refCnt(buffer);
+    }
+
+    public static Object skipBytes(Object buffer, int length) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().skipBytes(buffer, length);
+    }
+
+    public static Object markReaderIndex(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().markReaderIndex(buffer);
+    }
+
+    public static Object resetReaderIndex(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().resetReaderIndex(buffer);
+    }
+
+    public static Object markWriterIndex(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().markWriterIndex(buffer);
+    }
+
+    public static Object resetWriterIndex(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().resetWriterIndex(buffer);
+    }
+
+    public static int readVarInt(Object buffer) {
+        int value = 0;
+        int length = 0;
+        byte currentByte;
+        do {
+            currentByte = readByte(buffer);
+            value |= (currentByte & 0x7F) << (length * 7);
+            length++;
+            if (length > 5) {
+                throw new RuntimeException("VarInt is too large. Must be smaller than 5 bytes.");
+            }
+        } while ((currentByte & 0x80) == 0x80);
+        return value;
+    }
+
+    public static void writeVarInt(Object buffer, int value) {
+        while (true) {
+            if ((value & ~0x7F) == 0) {
+                writeByte(buffer, value);
+                return;
+            }
+            writeByte(buffer, (value & 0x7F) | 0x80);
+            value >>>= 7;
+        }
+    }
+
+    public static byte[] copyBytes(Object buffer) {
+        byte[] bytes = new byte[readableBytes(buffer)];
+        getBytes(buffer, readerIndex(buffer), bytes);
+        return bytes;
+    }
+}
@@ -0,0 +1,232 @@
+/*
+ * 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.netty.buffer;
+
+import java.io.*;
+//TODO give netty credit
+public class ByteBufInputStream extends InputStream implements DataInput {
+    private final Object buffer;
+    private final int startIndex;
+    private final int endIndex;
+    private final boolean releaseOnClose;
+    private final StringBuilder lineBuf;
+    private boolean closed;
+
+    public ByteBufInputStream(Object buffer) {
+        this(buffer, ByteBufHelper.readableBytes(buffer));
+    }
+
+    public ByteBufInputStream(Object buffer, int length) {
+        this(buffer, length, false);
+    }
+
+    public ByteBufInputStream(Object buffer, boolean releaseOnClose) {
+        this(buffer, ByteBufHelper.readableBytes(buffer), releaseOnClose);
+    }
+
+    public ByteBufInputStream(Object buffer, int length, boolean releaseOnClose) {
+        this.lineBuf = new StringBuilder();
+        if (buffer == null) {
+            throw new NullPointerException("buffer");
+        } else if (length < 0) {
+            if (releaseOnClose) {
+                ByteBufHelper.release(buffer);
+            }
+
+            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 - Needs " + length + ", maximum is " + ByteBufHelper.readableBytes(buffer));
+        } else {
+            this.releaseOnClose = releaseOnClose;
+            this.buffer = buffer;
+            this.startIndex = ByteBufHelper.readerIndex(buffer);
+            this.endIndex = this.startIndex + length;
+            ByteBufHelper.markReaderIndex(buffer);
+        }
+    }
+
+    public int readBytes() {
+        return ByteBufHelper.readerIndex(buffer) - this.startIndex;
+    }
+
+    public void close() throws IOException {
+        try {
+            super.close();
+        } finally {
+            if (this.releaseOnClose && !this.closed) {
+                this.closed = true;
+                ByteBufHelper.release(buffer);
+            }
+
+        }
+
+    }
+
+    public int available() throws IOException {
+        return this.endIndex - ByteBufHelper.readerIndex(buffer);
+    }
+
+    public void mark(int readlimit) {
+        ByteBufHelper.markReaderIndex(buffer);
+    }
+
+    public boolean markSupported() {
+        return true;
+    }
+
+    public int read() throws IOException {
+        return !(ByteBufHelper.isReadable(buffer)) ? -1 : ByteBufHelper.readByte(buffer) & 255;
+    }
+
+
+    public int read(byte[] b, int off, int len) throws IOException {
+        int available = this.available();
+        if (available == 0) {
+            return -1;
+        } else {
+            len = Math.min(available, len);
+            ByteBufHelper.readBytes(buffer, b, off, len);
+            return len;
+        }
+    }
+
+    public void reset() throws IOException {
+        ByteBufHelper.resetReaderIndex(buffer);
+    }
+
+    public long skip(long n) throws IOException {
+        return n > 2147483647L ? (long) this.skipBytes(2147483647) : (long) this.skipBytes((int) n);
+    }
+
+    public boolean readBoolean() throws IOException {
+        this.checkAvailable(1);
+        return this.read() != 0;
+    }
+
+    public byte[] readBytes(int len) {
+        byte[] bytes = new byte[len];
+        ByteBufHelper.readBytes(buffer, bytes);
+        return bytes;
+    }
+
+    public byte readByte() throws IOException {
+        if (!(ByteBufHelper.isReadable(buffer))) {
+            throw new EOFException();
+        } else {
+            return ByteBufHelper.readByte(buffer);
+        }
+    }
+
+    public char readChar() throws IOException {
+        return (char) this.readShort();
+    }
+
+    public double readDouble() throws IOException {
+        return Double.longBitsToDouble(this.readLong());
+    }
+
+    public float readFloat() throws IOException {
+        return Float.intBitsToFloat(this.readInt());
+    }
+
+    public void readFully(byte[] b) throws IOException {
+        this.readFully(b, 0, b.length);
+    }
+
+    public void readFully(byte[] b, int off, int len) throws IOException {
+        this.checkAvailable(len);
+        ByteBufHelper.readBytes(buffer, b, off, len);
+    }
+
+    public int readInt() throws IOException {
+        this.checkAvailable(4);
+        return ByteBufHelper.readInt(buffer);
+    }
+
+    public String readLine() throws IOException {
+        this.lineBuf.setLength(0);
+
+        while (ByteBufHelper.isReadable(buffer)) {
+            int c = ByteBufHelper.readUnsignedByte(buffer);
+            switch (c) {
+                case 13:
+                    if (ByteBufHelper.isReadable(buffer)
+                            && (char) ByteBufHelper.getUnsignedByte(buffer, ByteBufHelper.readerIndex(buffer)) == '\n') {
+                        ByteBufHelper.skipBytes(buffer, 1);
+                    }
+                case 10:
+                    return this.lineBuf.toString();
+                default:
+                    this.lineBuf.append((char) c);
+            }
+        }
+
+        return this.lineBuf.length() > 0 ? this.lineBuf.toString() : null;
+    }
+
+    public long readLong() throws IOException {
+        this.checkAvailable(8);
+        return ByteBufHelper.readLong(buffer);
+    }
+
+    public long[] readLongs(int size) throws IOException {
+        long[] array = new long[size];
+
+        for (int i = 0; i < array.length; i++) {
+            array[i] = readLong();
+        }
+        return array;
+    }
+
+    public short readShort() throws IOException {
+        this.checkAvailable(2);
+        return ByteBufHelper.readShort(buffer);
+    }
+
+    public String readUTF() throws IOException {
+        return DataInputStream.readUTF(this);
+    }
+
+    public int readUnsignedByte() throws IOException {
+        return this.readByte() & 255;
+    }
+
+    public int readUnsignedShort() throws IOException {
+        return this.readShort() & '\uffff';
+    }
+
+    public int skipBytes(int n) throws IOException {
+        int nBytes = Math.min(this.available(), n);
+        ByteBufHelper.skipBytes(buffer, nBytes);
+        return nBytes;
+    }
+
+    private void checkAvailable(int fieldSize) throws IOException {
+        if (fieldSize < 0) {
+            throw new IndexOutOfBoundsException("fieldSize cannot be a negative number");
+        } else if (fieldSize > this.available()) {
+            throw new EOFException("fieldSize is too long! Length is " + fieldSize + ", but maximum is " + this.available());
+        }
+    }
+}
+
@@ -0,0 +1,116 @@
+/*
+ * 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.netty.buffer;
+
+import java.nio.charset.Charset;
+
+public interface ByteBufOperator {
+    int capacity(Object buffer);
+    Object capacity(Object buffer, int capacity);
+    int readerIndex(Object buffer);
+    Object readerIndex(Object buffer, int readerIndex);
+
+    int writerIndex(Object buffer);
+    Object writerIndex(Object buffer, int writerIndex);
+
+    int readableBytes(Object buffer);
+    int writableBytes(Object buffer);
+    Object clear(Object buffer);
+
+    byte readByte(Object buffer);
+    short readShort(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 writeInt(Object buffer, int value);
+    void writeLong(Object buffer, long value);
+
+    Object getBytes(Object buffer, int index, byte[] destination);
+    short getUnsignedByte(Object buffer, int index);
+
+    boolean isReadable(Object buffer);
+    Object copy(Object buffer);
+    Object duplicate(Object buffer);
+    boolean hasArray(Object buffer);
+    byte[] array(Object buffer);
+    Object retain(Object buffer);
+    Object retainedDuplicate(Object buffer);
+    Object readSlice(Object buffer, int length);
+    Object readBytes(Object buffer, byte[] destination, int destinationIndex, int length);
+    Object readBytes(Object buffer, int length);
+    void readBytes(Object buffer, byte[] bytes);
+
+    Object writeBytes(Object buffer, Object src);
+    Object writeBytes(Object buffer, byte[] bytes);
+    Object writeBytes(Object buffer, byte[] bytes, int offset, int length);
+
+    boolean release(Object buffer);
+    int refCnt(Object buffer);
+    Object skipBytes(Object buffer, int length);
+    String toString(Object buffer, int index, int length, Charset charset);
+    Object markReaderIndex(Object buffer);
+    Object resetReaderIndex(Object buffer);
+    Object markWriterIndex(Object buffer);
+    Object resetWriterIndex(Object buffer);
+
+    default float readFloat(Object buffer) {
+        return Float.intBitsToFloat(readInt(buffer));
+    }
+
+    default void writeFloat(Object buffer, float value) {
+        writeInt(buffer, Float.floatToIntBits(value));
+    }
+
+    default double readDouble(Object buffer) {
+        return Double.longBitsToDouble(readLong(buffer));
+    }
+
+    default void writeDouble(Object buffer, double value) {
+        writeLong(buffer, Double.doubleToLongBits(value));
+    }
+
+    default char readChar(Object buffer) {
+        return (char) readShort(buffer);
+    }
+
+    default void writeChar(Object buffer, int value) {
+        writeShort(buffer, value);
+    }
+
+    //Use writeShort to write
+    default int readUnsignedShort(Object buffer) {
+        return readShort(buffer) & '\uffff';
+    }
+
+    //Use writeByte to write
+    default short readUnsignedByte(Object buffer) {
+        return (short) (this.readByte(buffer) & 255);
+    }
+
+    default boolean readBoolean(Object buffer) {
+        return readByte(buffer) != 0;
+    }
+
+    default void writeBoolean(Object buffer, boolean value) {
+        writeByte(buffer, value ? 1 : 0);
+    }
+}
@@ -0,0 +1,114 @@
+/*
+ * 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/>.
+ */
+
+//TODO Give netty credit
+
+package com.github.retrooper.packetevents.netty.buffer;
+
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class ByteBufOutputStream extends OutputStream implements DataOutput {
+    private final Object buffer;
+    private final int startIndex;
+    private final DataOutputStream utf8out = new DataOutputStream(this);
+
+    public ByteBufOutputStream(Object buffer) {
+        if (buffer == null) {
+            throw new NullPointerException("buffer");
+        } else {
+            this.buffer = buffer;
+            this.startIndex = ByteBufHelper.writerIndex(buffer);
+        }
+    }
+
+    public int writtenBytes() {
+        return ByteBufHelper.writerIndex(buffer) - this.startIndex;
+    }
+
+    public void write(byte[] b, int off, int len) throws IOException {
+        if (len != 0) {
+            ByteBufHelper.writeBytes(buffer, b, off, len);
+        }
+    }
+
+    public void write(byte[] b) throws IOException {
+        ByteBufHelper.writeBytes(buffer, b);
+    }
+
+    public void write(int b) throws IOException {
+        ByteBufHelper.writeByte(buffer, b);
+    }
+
+    public void writeBoolean(boolean v) throws IOException {
+        ByteBufHelper.writeBoolean(buffer, v);
+    }
+
+    public void writeByte(int v) throws IOException {
+        ByteBufHelper.writeByte(buffer, v);
+    }
+
+    @Deprecated
+    public void writeBytes(String s) throws IOException {
+        throw new IllegalStateException("This operation is not supported!");
+    }
+
+    public void writeChar(int v) throws IOException {
+        ByteBufHelper.writeChar(buffer, v);
+    }
+
+    public void writeChars(String s) throws IOException {
+        int len = s.length();
+
+        for (int i = 0; i < len; ++i) {
+            ByteBufHelper.writeChar(buffer, s.charAt(i));
+        }
+
+    }
+
+    public void writeDouble(double v) throws IOException {
+        ByteBufHelper.writeDouble(buffer, v);
+    }
+
+    public void writeFloat(float v) throws IOException {
+        ByteBufHelper.writeFloat(buffer, v);
+    }
+
+    public void writeInt(int v) throws IOException {
+        ByteBufHelper.writeInt(buffer, v);
+    }
+
+    public void writeLong(long v) throws IOException {
+        ByteBufHelper.writeLong(buffer, v);
+    }
+
+    public void writeShort(int v) throws IOException {
+        ByteBufHelper.writeShort(buffer, v);
+    }
+
+    public void writeUTF(String s) throws IOException {
+        this.utf8out.writeUTF(s);
+    }
+
+    public Object buffer() {
+        return this.buffer;
+    }
+}
+
@@ -0,0 +1,43 @@
+/*
+ * 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.netty.buffer;
+
+import com.github.retrooper.packetevents.PacketEvents;
+
+public class UnpooledByteBufAllocationHelper {
+    public static Object wrappedBuffer(byte[] bytes) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().wrappedBuffer(bytes);
+    }
+
+    public static Object copiedBuffer(byte[] bytes) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().copiedBuffer(bytes);
+    }
+
+    public static Object buffer() {
+        return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().buffer();
+    }
+
+    public static Object directBuffer() {
+        return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().directBuffer();
+    }
+
+    public static Object compositeBuffer() {
+        return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().compositeBuffer();
+    }
+}
@@ -0,0 +1,103 @@
+/*
+ * 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.netty.channel;
+
+import com.github.retrooper.packetevents.PacketEvents;
+
+import java.net.SocketAddress;
+import java.util.Arrays;
+import java.util.List;
+
+public class ChannelHelper {
+    public static SocketAddress remoteAddress(Object channel) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().remoteAddress(channel);
+    }
+
+    public static SocketAddress localAddress(Object channel) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().localAddress(channel);
+    }
+
+    public static boolean isOpen(Object channel) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().isOpen(channel);
+    }
+
+    public static Object close(Object channel) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().close(channel);
+    }
+
+    public static Object write(Object channel, Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().write(channel, buffer);
+    }
+
+    public static Object flush(Object channel) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().flush(channel);
+    }
+
+    public static Object writeAndFlush(Object channel, Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().writeAndFlush(channel, buffer);
+    }
+
+    public static Object fireChannelRead(Object channel, Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().fireChannelRead(channel, buffer);
+    }
+
+    public static Object writeInContext(Object channel, String ctx, Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().writeInContext(channel, ctx, buffer);
+    }
+
+    public static Object flushInContext(Object channel, String ctx) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().flushInContext(channel, ctx);
+    }
+
+    public static Object writeAndFlushInContext(Object channel, String ctx, Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().writeAndFlushInContext(channel, ctx, buffer);
+    }
+
+    public static Object fireChannelReadInContext(Object channel, String ctx, Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().fireChannelReadInContext(channel, ctx, buffer);
+    }
+
+    public static List<String> pipelineHandlerNames(Object channel) {
+        return PacketEvents.getAPI().getNettyManager().getChannelOperator().pipelineHandlerNames(channel);
+    }
+
+    public static String pipelineHandlerNamesAsString(Object channel) {
+        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);
+    }
+
+    public static Object getPipelineContext(Object channel, String handlerName) {
+        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);
+    }
+}
@@ -0,0 +1,60 @@
+/*
+ * 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.netty.channel;
+
+import java.net.SocketAddress;
+import java.util.List;
+
+public interface ChannelOperator {
+    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);
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,17 +16,19 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.utils.player;
-//TODO Remove this enum, use Bukkit's GameMode enum everywhere.
+package com.github.retrooper.packetevents.protocol;
+
 /**
- * Representation of a player's game mode.
- *
 * @author retrooper
 * @since 1.8
 */
-public enum GameMode {
-    SURVIVAL,
-    CREATIVE,
-    ADVENTURE,
-    SPECTATOR
+public enum ConnectionState {
+    HANDSHAKING, STATUS, LOGIN, PLAY;
+
+    public static ConnectionState getById(int id) {
+        if (id >= values().length || id < 0) {
+            return null;
+        }
+        return values()[id];
+    }
 }
@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+public enum PacketSide {
+    CLIENT, SERVER;
+
+    public PacketSide getOpposite() {
+        if (this == CLIENT) {
+            return SERVER;
+        }
+        else {
+            return CLIENT;
+        }
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,8 +16,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.injector;
-
-public interface LateInjector extends ChannelInjector {
+package com.github.retrooper.packetevents.protocol;

+//TODO
+public enum ProtocolVersion {
+    UNKNOWN
 }
@@ -0,0 +1,13 @@
+package com.github.retrooper.packetevents.protocol.chat;
+
+public enum ChatCompletionAction {
+    ADD,
+    REMOVE,
+    SET;
+
+    private static final ChatCompletionAction[] VALUES = values();
+
+    public static ChatCompletionAction fromId(int id) {
+        return VALUES[id];
+    }
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.mapper.MappedEntity;
+
+public interface ChatType extends MappedEntity {
+
+}
@@ -0,0 +1,94 @@
+/*
+ * 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.ClientVersion;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.util.TypesBuilder;
+import com.github.retrooper.packetevents.util.TypesBuilderData;
+
+import java.util.HashMap;
+import java.util.Map;
+
+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);
+
+    static {
+        TYPES_BUILDER.unloadFileMappings();
+    }
+
+    public static ChatType define(String key) {
+        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 CHAT_TYPE_MAP.get(name);
+    }
+
+    public static ChatType getById(ClientVersion version, int 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");
+    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
+    public static final ChatType SYSTEM = define("system");
+    @Deprecated
+    public static final ChatType GAME_INFO = define("game_info");
+    @Deprecated
+    public static final ChatType MSG_COMMAND = define("msg_command");
+    @Deprecated
+    public static final ChatType TEAM_MSG_COMMAND = define("team_msg_command");
+}
@@ -0,0 +1,105 @@
+package com.github.retrooper.packetevents.protocol.chat;
+
+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;
+
+public class LastSeenMessages {
+    public static final LastSeenMessages EMPTY = new LastSeenMessages(new ArrayList<>());
+
+    private final List<Entry> entries;
+
+    public LastSeenMessages(List<Entry> entries) {
+        this.entries = entries;
+    }
+
+    public void updateHash(DataOutput output) throws IOException {
+        for (Entry entry : this.entries) {
+            UUID uuid = entry.getUUID();
+            byte[] lastVerifier = entry.getLastVerifier();
+            output.writeByte(70);
+            output.writeLong(uuid.getMostSignificantBits());
+            output.writeLong(uuid.getLeastSignificantBits());
+            output.write(lastVerifier);
+        }
+    }
+
+    public List<Entry> getEntries() {
+        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;
+
+        public Entry(UUID uuid, byte[] lastVerifier) {
+            this.uuid = uuid;
+            this.signature = lastVerifier;
+        }
+
+        public UUID getUUID() {
+            return uuid;
+        }
+
+        public byte[] getLastVerifier() {
+            return signature;
+        }
+    }
+
+    public static class LegacyUpdate {
+        private final LastSeenMessages lastSeenMessages;
+        private final @Nullable Entry lastReceived;
+
+        public LegacyUpdate(LastSeenMessages lastSeenMessages, @Nullable Entry lastReceived) {
+            this.lastSeenMessages = lastSeenMessages;
+            this.lastReceived = lastReceived;
+        }
+
+        public LastSeenMessages getLastSeenMessages() {
+            return lastSeenMessages;
+        }
+
+        public @Nullable Entry getLastReceived() {
+            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;
+        }
+    }
+}
@@ -0,0 +1,69 @@
+/*
+ * 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 net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
+
+public class MessageSender {
+    private @NotNull UUID uuid;
+    private @Nullable Component displayName;
+    private @Nullable Component teamName;
+
+    public MessageSender(@NotNull UUID uuid, @Nullable Component displayName, @Nullable Component teamName) {
+        this.uuid = uuid;
+        this.displayName = displayName;
+        this.teamName = teamName;
+    }
+
+    public MessageSender(@Nullable Component displayName, @Nullable Component teamName) {
+        this(new UUID(0L, 0L), displayName, teamName);
+    }
+
+    public MessageSender() {
+        this(null, null);
+    }
+
+    public UUID getUUID() {
+        return uuid;
+    }
+
+    public void setUUID(@NotNull UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public @Nullable Component getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(@Nullable Component displayName) {
+        this.displayName = displayName;
+    }
+
+    public @Nullable Component getTeamName() {
+        return teamName;
+    }
+
+    public void setTeamName(@Nullable Component teamName) {
+        this.teamName = teamName;
+    }
+}
@@ -0,0 +1,70 @@
+/*
+ * 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;
+        }
+    }
+}
@@ -0,0 +1,102 @@
+/*
+ * 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.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 Optional<Integer> redirectNodeIndex;
+    private Optional<String> name;
+    private Optional<Integer> parserID;
+    private Optional<List<Object>> properties;
+    private Optional<ResourceLocation> suggestionsType;
+
+    public Node(byte flags, List<Integer> children, @Nullable Integer redirectNodeIndex, @Nullable String name, @Nullable Integer parserID, @Nullable List<Object> properties, @Nullable ResourceLocation suggestionsType) {
+        this.flags = flags;
+        this.children = children;
+        this.redirectNodeIndex = Optional.ofNullable(redirectNodeIndex);
+        this.name = Optional.ofNullable(name);
+        this.parserID = Optional.ofNullable(parserID);
+        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 Optional<Integer> getRedirectNodeIndex() {
+        return redirectNodeIndex;
+    }
+
+    public void setRedirectNodeIndex(Optional<Integer> redirectNodeIndex) {
+        this.redirectNodeIndex = redirectNodeIndex;
+    }
+
+    public Optional<String> getName() {
+        return name;
+    }
+
+    public void setName(Optional<String> name) {
+        this.name = name;
+    }
+
+    public Optional<Integer> getParserID() {
+        return parserID;
+    }
+
+    public void setParserID(Optional<Integer> parserID) {
+        this.parserID = parserID;
+    }
+
+    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;
+    }
+}
@@ -0,0 +1,185 @@
+/*
+ * 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.resources.ResourceLocation;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+public class Parsers {
+    private static final List<Parser> parsers = Arrays.asList(
+            new Parser("brigadier:bool", null, null),
+            new Parser("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));
+                    }
+            ),
+            new Parser("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));
+                    }
+            ),
+            new Parser("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));
+                    }
+            ),
+            new Parser("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));
+                    }
+            ),
+            new Parser("brigadier:string",
+                    packetWrapper -> Collections.singletonList(packetWrapper.readVarInt()),
+                    (packetWrapper, properties) -> packetWrapper.writeVarInt((Integer) properties.get(0))
+            ),
+            new Parser("brigadier:entity",
+                    packetWrapper -> Collections.singletonList(packetWrapper.readByte()),
+                    (packetWrapper, properties) -> packetWrapper.writeByte(((Byte) properties.get(0)).intValue())
+            ),
+            new Parser("brigadier:game_profile", null, null),
+            new Parser("brigadier:block_pos", null, null),
+            new Parser("brigadier:column_pos", null, null),
+            new Parser("brigadier:vec3", null, null),
+            new Parser("brigadier:vec2", null, null),
+            new Parser("brigadier:block_state", null, null),
+            new Parser("brigadier:block_predicate", null, null),
+            new Parser("brigadier:item_stack", null, null),
+            new Parser("brigadier:item_predicate", null, null),
+            new Parser("brigadier:color", null, null),
+            new Parser("brigadier:component", null, null),
+            new Parser("brigadier:message", null, null),
+            new Parser("brigadier:nbt", null, null),
+            new Parser("brigadier:nbt_tag", null, null),
+            new Parser("brigadier:nbt_path", null, null),
+            new Parser("brigadier:objective", null, null),
+            new Parser("brigadier:objective_criteria", null, null),
+            new Parser("brigadier:operation", null, null),
+            new Parser("brigadier:particle", null, null),
+            new Parser("brigadier:angle", null, null),
+            new Parser("brigadier:rotation", null, null),
+            new Parser("brigadier:scoreboard_slot", null, null),
+            new Parser("brigadier:score_holder",
+                    packetWrapper -> Collections.singletonList(packetWrapper.readByte()),
+                    (packetWrapper, properties) -> packetWrapper.writeByte(((Byte) properties.get(0)).intValue())
+            ),
+            new Parser("brigadier:swizzle", null, null),
+            new Parser("brigadier:team", null, null),
+            new Parser("brigadier:item_slot", null, null),
+            new Parser("brigadier:resource_location", null, null),
+            new Parser("brigadier:function", null, null),
+            new Parser("brigadier:entity_anchor", null, null),
+            new Parser("brigadier:int_range", null, null),
+            new Parser("brigadier:float_range", null, null),
+            new Parser("brigadier:dimension", null, null),
+            new Parser("brigadier:gamemode", null, null),
+            new Parser("brigadier:time",
+                    packetWrapper -> Collections.singletonList(packetWrapper.readInt()),
+                    (packetWrapper, properties) -> packetWrapper.writeInt((int) properties.get(0))
+            ),
+            new Parser("brigadier:resource_or_tag",
+                    packetWrapper -> Collections.singletonList(packetWrapper.readIdentifier()),
+                    (packetWrapper, properties) -> packetWrapper.writeIdentifier((ResourceLocation) properties.get(0))
+            ),
+            new Parser("brigadier:resource_or_tag_key",
+                    packetWrapper -> Collections.singletonList(packetWrapper.readIdentifier()),
+                    (packetWrapper, properties) -> packetWrapper.writeIdentifier((ResourceLocation) properties.get(0))
+            ),
+            new Parser("brigadier:resource",
+                    packetWrapper -> Collections.singletonList(packetWrapper.readIdentifier()),
+                    (packetWrapper, properties) -> packetWrapper.writeIdentifier((ResourceLocation) properties.get(0))
+            ),
+            new Parser("brigadier:resource_key",
+                    packetWrapper -> Collections.singletonList(packetWrapper.readIdentifier()),
+                    (packetWrapper, properties) -> packetWrapper.writeIdentifier((ResourceLocation) properties.get(0))
+            ),
+            new Parser("brigadier:template_mirror", null, null),
+            new Parser("brigadier:template_rotation", null, null),
+            new Parser("brigadier:heightmap", null, null),
+            new Parser("brigadier:uuid", null, null)
+    );
+
+    public static List<Parser> getParsers() {
+        return parsers;
+    }
+
+    public static final class Parser {
+        private final String name; //not really needed, just for toString or something
+        private final Optional<Function<PacketWrapper<?>, List<Object>>> read;
+        private final Optional<BiConsumer<PacketWrapper<?>, List<Object>>> write;
+
+        public Parser(String name, @Nullable Function<PacketWrapper<?>, List<Object>> read, @Nullable BiConsumer<PacketWrapper<?>, List<Object>> write) {
+            this.name = name;
+            this.read = Optional.ofNullable(read);
+            this.write = Optional.ofNullable(write);
+        }
+
+        public Optional<List<Object>> readProperties(PacketWrapper<?> packetWrapper) {
+            return read.map(fn -> fn.apply(packetWrapper));
+        }
+
+        public void writeProperties(PacketWrapper<?> packetWrapper, List<Object> properties) {
+            write.ifPresent(fn -> fn.accept(packetWrapper, properties));
+        }
+    }
+}
@@ -0,0 +1,41 @@
+/*
+ * 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;
+    }
+}
@@ -0,0 +1,27 @@
+package com.github.retrooper.packetevents.protocol.chat;
+
+public class SignedCommandArgument {
+    private String argument;
+    private byte[] signature;
+
+    public SignedCommandArgument(String argument, byte[] signature) {
+        this.argument = argument;
+        this.signature = signature;
+    }
+
+    public String getArgument() {
+        return argument;
+    }
+
+    public void setArgument(String argument) {
+        this.argument = argument;
+    }
+
+    public byte[] getSignature() {
+        return signature;
+    }
+
+    public void setSignature(byte[] signature) {
+        this.signature = signature;
+    }
+}
@@ -0,0 +1,52 @@
+/*
+ * 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.filter;
+
+import java.util.BitSet;
+
+public class FilterMask {
+    public static final FilterMask FULLY_FILTERED;
+    public static final FilterMask PASS_THROUGH;
+
+    static {
+        FULLY_FILTERED = new FilterMask(new BitSet(0), FilterMaskType.FULLY_FILTERED);
+        PASS_THROUGH = new FilterMask(new BitSet(0), FilterMaskType.PASS_THROUGH);
+    }
+
+    private final BitSet mask;
+    private final FilterMaskType type;
+
+    private FilterMask(BitSet mask, FilterMaskType type) {
+        this.type = type;
+        this.mask = mask;
+    }
+
+    public FilterMask(BitSet mask) {
+        this.type = FilterMaskType.PARTIALLY_FILTERED;
+        this.mask = mask;
+    }
+
+    public BitSet getMask() {
+        return mask;
+    }
+
+    public FilterMaskType getType() {
+        return type;
+    }
+}
@@ -0,0 +1,35 @@
+/*
+ * 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.filter;
+
+public enum FilterMaskType {
+    PASS_THROUGH,
+    FULLY_FILTERED,
+    PARTIALLY_FILTERED;
+
+    public static final FilterMaskType[] VALUES = values();
+
+    public int getId() {
+        return ordinal();
+    }
+
+    public static FilterMaskType getById(int id) {
+        return VALUES[id];
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,31 +16,33 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.packetwrappers.play.in.setcreativeslot;
+package com.github.retrooper.packetevents.protocol.chat.message;

-import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
-import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
-import org.bukkit.inventory.ItemStack;
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import net.kyori.adventure.text.Component;

-public class WrappedPacketInSetCreativeSlot extends WrappedPacket {
+public class ChatMessage {
+    private Component chatContent;
+    private ChatType type;

-    public WrappedPacketInSetCreativeSlot(final NMSPacket packet) {
-        super(packet);
+    protected ChatMessage(Component chatContent, ChatType type) {
+        this.chatContent = chatContent;
+        this.type = type;
    }

-    public int getSlot() {
-        return readInt(0);
+    public Component getChatContent() {
+        return chatContent;
    }

-    public void setSlot(int value) {
-        writeInt(0, value);
+    public ChatType getType() {
+        return type;
    }

-    public ItemStack getClickedItem() {
-        return readItemStack(0);
+    public void setChatContent(Component chatContent) {
+        this.chatContent = chatContent;
    }

-    public void setClickedItem(ItemStack stack) {
-        writeItemStack(0, stack);
+    public void setType(ChatType type) {
+        this.type = type;
    }
-}
+}
@@ -0,0 +1,28 @@
+/*
+ * 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.message;
+
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import net.kyori.adventure.text.Component;
+
+public class ChatMessageLegacy extends ChatMessage {
+    public ChatMessageLegacy(Component chatContent, ChatType type) {
+        super(chatContent, type);
+    }
+}
@@ -0,0 +1,41 @@
+/*
+ * 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.message;
+
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import net.kyori.adventure.text.Component;
+
+import java.util.UUID;
+
+public class ChatMessage_v1_16 extends ChatMessage {
+    private UUID senderUUID;
+
+    public ChatMessage_v1_16(Component chatContent, ChatType type, UUID senderUUID) {
+        super(chatContent, type);
+        this.senderUUID = senderUUID;
+    }
+
+    public UUID getSenderUUID() {
+        return senderUUID;
+    }
+
+    public void setSenderUUID(UUID senderUUID) {
+        this.senderUUID = senderUUID;
+    }
+}
@@ -0,0 +1,95 @@
+/*
+ * 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.message;
+
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import net.kyori.adventure.text.Component;
+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 {
+    private @Nullable Component unsignedChatContent;
+    private Component senderDisplayName;
+    private @Nullable Component teamName;
+    private Instant timestamp;
+    private long salt;
+    private byte[] signature;
+
+    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);
+        this.unsignedChatContent = unsignedChatContent;
+        this.senderDisplayName = senderDisplayName;
+        this.teamName = teamName;
+        this.timestamp = timestamp;
+        this.salt = salt;
+        this.signature = signature;
+    }
+
+    public @Nullable Component getUnsignedChatContent() {
+        return unsignedChatContent;
+    }
+
+    public Component getSenderDisplayName() {
+        return senderDisplayName;
+    }
+
+    public @Nullable Component getTeamName() {
+        return teamName;
+    }
+
+    public Instant getTimestamp() {
+        return timestamp;
+    }
+
+    public long getSalt() {
+        return salt;
+    }
+
+    public byte[] getSignature() {
+        return signature;
+    }
+
+    public void setUnsignedChatContent(@Nullable Component unsignedChatContent) {
+        this.unsignedChatContent = unsignedChatContent;
+    }
+
+    public void setSenderDisplayName(Component senderDisplayName) {
+        this.senderDisplayName = senderDisplayName;
+    }
+
+    public void setTeamName(@Nullable Component teamName) {
+        this.teamName = teamName;
+    }
+
+    public void setTimestamp(Instant timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public void setSalt(long salt) {
+        this.salt = salt;
+    }
+
+    public void setSignature(byte[] signature) {
+        this.signature = signature;
+    }
+}
@@ -0,0 +1,181 @@
+/*
+ * 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.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 net.kyori.adventure.text.Component;
+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 {
+    private String plainContent;
+    private @Nullable Component unsignedChatContent;
+    private ChatTypeBoundNetwork chatType;
+    private byte @Nullable [] previousSignature;
+    private byte[] signature;
+    private Instant timestamp;
+    private long salt;
+    private LastSeenMessages lastSeenMessages;
+    private FilterMask filterMask;
+
+    public ChatMessage_v1_19_1(String plainContent, Component decoratedChatContent,
+                               @Nullable Component unsignedChatContent,
+                               UUID senderUUID, ChatTypeBoundNetwork chatType,
+                               byte @Nullable [] previousSignature, byte[] signature,
+                               Instant timestamp, long salt,
+                               LastSeenMessages lastSeenMessages,
+                               FilterMask filterMask) {
+        super(decoratedChatContent, chatType.getType(), senderUUID);
+        this.plainContent = plainContent;
+        this.unsignedChatContent = unsignedChatContent;
+        this.chatType = chatType;
+        this.previousSignature = previousSignature;
+        this.signature = signature;
+        this.timestamp = timestamp;
+        this.salt = salt;
+        this.lastSeenMessages = lastSeenMessages;
+        this.filterMask = filterMask;
+    }
+
+    public String getPlainContent() {
+        return plainContent;
+    }
+
+    public void setPlainContent(String plainContent) {
+        this.plainContent = plainContent;
+    }
+
+    public boolean isChatContentDecorated() {
+        return !getChatContent().equals(Component.text(plainContent));
+    }
+
+    public @Nullable Component getUnsignedChatContent() {
+        return unsignedChatContent;
+    }
+
+    public void setUnsignedChatContent(@Nullable Component unsignedChatContent) {
+        this.unsignedChatContent = unsignedChatContent;
+    }
+
+    @Override
+    public ChatType getType() {
+        return chatType.getType();
+    }
+
+    @Override
+    public void setType(ChatType type) {
+        chatType.setType(type);
+    }
+
+    public ChatTypeBoundNetwork getChatType() {
+        return chatType;
+    }
+
+    public void setChatType(ChatTypeBoundNetwork type) {
+        this.chatType = type;
+    }
+
+    public byte @Nullable [] getPreviousSignature() {
+        return previousSignature;
+    }
+
+    public void setPreviousSignature(byte @Nullable [] previousSignature) {
+        this.previousSignature = previousSignature;
+    }
+
+    public byte[] getSignature() {
+        return signature;
+    }
+
+    public void setSignature(byte[] signature) {
+        this.signature = signature;
+    }
+
+    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 getLastSeenMessages() {
+        return lastSeenMessages;
+    }
+
+    public void setLastSeenMessages(LastSeenMessages lastSeenMessages) {
+        this.lastSeenMessages = lastSeenMessages;
+    }
+
+    public FilterMask getFilterMask() {
+        return filterMask;
+    }
+
+    public void setFilterMask(FilterMask filterMask) {
+        this.filterMask = filterMask;
+    }
+
+    public static class ChatTypeBoundNetwork {
+        private ChatType type;
+        private Component name;
+        private @Nullable Component targetName;
+
+        public ChatTypeBoundNetwork(ChatType type, Component name, @Nullable Component targetName) {
+            this.type = type;
+            this.name = name;
+            this.targetName = targetName;
+        }
+
+        public ChatType getType() {
+            return type;
+        }
+
+        public void setType(ChatType type) {
+            this.type = type;
+        }
+
+        public Component getName() {
+            return name;
+        }
+
+        public void setName(Component name) {
+            this.name = name;
+        }
+
+        public @Nullable Component getTargetName() {
+            return targetName;
+        }
+
+        public void setTargetName(@Nullable Component targetName) {
+            this.targetName = targetName;
+        }
+    }
+}
@@ -0,0 +1,119 @@
+package com.github.retrooper.packetevents.protocol.chat.message;
+
+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;
+    ChatMessage_v1_19_1.ChatTypeBoundNetwork chatType;
+
+    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, ChatMessage_v1_19_1.ChatTypeBoundNetwork chatType) {
+        super(Component.text(plainContent), chatType.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.chatType = chatType;
+    }
+
+    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 ChatMessage_v1_19_1.ChatTypeBoundNetwork getChatType() {
+        return chatType;
+    }
+
+    public void setChatType(ChatMessage_v1_19_1.ChatTypeBoundNetwork chatType) {
+        this.chatType = chatType;
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,17 +16,14 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.event.manager;
+package com.github.retrooper.packetevents.protocol.chat.message.reader;

-/**
- * Class storing a static instance of the dynamic and the legacy event manager.
- *
- * @author retrooper
- * @since 1.8
- */
-public class PEEventManager implements EventManager {
+import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.NotNull;

-    public static final EventManagerLegacy EVENT_MANAGER_LEGACY = new EventManagerLegacy();
-    public static final EventManagerModern EVENT_MANAGER_MODERN = new EventManagerModern();
+public interface ChatMessageProcessor {
+    ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper);

+    void writeChatMessage(@NotNull PacketWrapper<?> wrapper, @NotNull ChatMessage data);
 }
@@ -0,0 +1,44 @@
+/*
+ * 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.message.reader.impl;
+
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import com.github.retrooper.packetevents.protocol.chat.ChatTypes;
+import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage;
+import com.github.retrooper.packetevents.protocol.chat.message.ChatMessageLegacy;
+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;
+
+public class ChatMessageProcessorLegacy implements ChatMessageProcessor {
+    @Override
+    public ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper) {
+        Component chatContent = wrapper.readComponent();
+        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.writeByte(data.getType().getId(wrapper.getServerVersion().toClientVersion()));
+    }
+}
@@ -0,0 +1,48 @@
+/*
+ * 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.message.reader.impl;
+
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import com.github.retrooper.packetevents.protocol.chat.ChatTypes;
+import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage;
+import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage_v1_16;
+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.util.UUID;
+
+public class ChatMessageProcessor_v1_16 implements ChatMessageProcessor {
+    @Override
+    public ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper) {
+        Component chatContent = wrapper.readComponent();
+        int id = wrapper.readByte();
+        ChatType type = ChatTypes.getById(wrapper.getServerVersion().toClientVersion(), id);
+        UUID senderUUID = wrapper.readUUID();
+        return new ChatMessage_v1_16(chatContent, type, senderUUID);
+    }
+
+    @Override
+    public void writeChatMessage(@NotNull PacketWrapper<?> wrapper, @NotNull ChatMessage data) {
+        wrapper.writeComponent(data.getChatContent());
+        wrapper.writeByte(data.getType().getId(wrapper.getServerVersion().toClientVersion()));
+        wrapper.writeUUID(((ChatMessage_v1_16) data).getSenderUUID());
+    }
+}
@@ -0,0 +1,64 @@
+/*
+ * 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.message.reader.impl;
+
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import com.github.retrooper.packetevents.protocol.chat.ChatTypes;
+import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage;
+import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage_v1_19;
+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 org.jetbrains.annotations.Nullable;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public class ChatMessageProcessor_v1_19 implements ChatMessageProcessor {
+    @Override
+    public ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper) {
+        Component chatContent = wrapper.readComponent();
+        Component unsignedChatContent = wrapper.readOptional(PacketWrapper::readComponent);
+        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);
+        Instant timestamp = wrapper.readTimestamp();
+        long salt = wrapper.readLong();
+        byte[] signature = wrapper.readByteArray();
+        return new ChatMessage_v1_19(chatContent, unsignedChatContent, type, senderUUID, senderDisplayName, teamName,
+                timestamp, salt, signature);
+    }
+
+    @Override
+    public void writeChatMessage(@NotNull PacketWrapper<?> wrapper, @NotNull ChatMessage data) {
+        ChatMessage_v1_19 newData = (ChatMessage_v1_19) data;
+        wrapper.writeComponent(newData.getChatContent());
+        wrapper.writeOptional(newData.getUnsignedChatContent(), PacketWrapper::writeComponent);
+        wrapper.writeVarInt(newData.getType().getId(wrapper.getServerVersion().toClientVersion()));
+        wrapper.writeUUID(newData.getSenderUUID());
+        wrapper.writeComponent(newData.getSenderDisplayName());
+        wrapper.writeOptional(newData.getTeamName(), PacketWrapper::writeComponent);
+        wrapper.writeTimestamp(newData.getTimestamp());
+        wrapper.writeLong(newData.getSalt());
+        wrapper.writeByteArray(newData.getSignature());
+    }
+}
@@ -0,0 +1,73 @@
+/*
+ * 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.message.reader.impl;
+
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import com.github.retrooper.packetevents.protocol.chat.ChatTypes;
+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.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_1 implements ChatMessageProcessor {
+    @Override
+    public ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper) {
+        byte[] previousSignature = wrapper.readOptional(PacketWrapper::readByteArray);
+        UUID senderUUID = wrapper.readUUID();
+        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) {
+            chatContent = Component.text(plainContent);
+        }
+        Instant timestamp = wrapper.readTimestamp();
+        long salt = wrapper.readLong();
+        LastSeenMessages lastSeenMessages = wrapper.readLastSeenMessages();
+        Component unsignedChatContent = wrapper.readOptional(PacketWrapper::readComponent);
+        FilterMask filterMask = wrapper.readFilterMask();
+        ChatMessage_v1_19_1.ChatTypeBoundNetwork chatType = wrapper.readChatTypeBoundNetwork();
+        return new ChatMessage_v1_19_1(plainContent, chatContent, unsignedChatContent, senderUUID, chatType,
+                previousSignature, signature, timestamp, salt, lastSeenMessages, filterMask);
+    }
+
+    @Override
+    public void writeChatMessage(@NotNull PacketWrapper<?> wrapper, @NotNull ChatMessage data) {
+        ChatMessage_v1_19_1 newData = (ChatMessage_v1_19_1) data;
+        wrapper.writeOptional(newData.getPreviousSignature(), PacketWrapper::writeByteArray);
+        wrapper.writeUUID(newData.getSenderUUID());
+        wrapper.writeByteArray(newData.getSignature());
+        wrapper.writeString(newData.getPlainContent(), 256);
+        wrapper.writeOptional(newData.getChatContent(), PacketWrapper::writeComponent);
+        wrapper.writeTimestamp(newData.getTimestamp());
+        wrapper.writeLong(newData.getSalt());
+        wrapper.writeLastSeenMessages(newData.getLastSeenMessages());
+        wrapper.writeOptional(newData.getUnsignedChatContent(), PacketWrapper::writeComponent);
+        wrapper.writeFilterMask(newData.getFilterMask());
+        wrapper.writeChatTypeBoundNetwork(newData.getChatType());
+    }
+}
@@ -0,0 +1,47 @@
+package com.github.retrooper.packetevents.protocol.chat.message.reader.impl;
+
+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();
+        ChatMessage_v1_19_1.ChatTypeBoundNetwork 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.getChatType());
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,30 +16,40 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.utils.player;
+package com.github.retrooper.packetevents.protocol.entity.data;

-public class Skin {
-    private String value;
-    private String signature;
+public class EntityData {
+    private int index;
+    private EntityDataType<?> type;
+    private Object value;

-    public Skin(String value, String signature) {
+    public EntityData(int index, EntityDataType<?> type, Object value) {
+        this.index = index;
+        this.type = type;
        this.value = value;
-        this.signature = signature;
    }

-    public String getValue() {
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public EntityDataType<?> getType() {
+        return type;
+    }
+
+    public void setType(EntityDataType<?> type) {
+        this.type = type;
+    }
+
+    public Object getValue() {
        return value;
    }

-    public void setValue(String value) {
+    public void setValue(Object value) {
        this.value = value;
    }
-
-    public String getSignature() {
-        return signature;
-    }
-
-    public void setSignature(String signature) {
-        this.signature = signature;
-    }
-}
+}
@@ -0,0 +1,56 @@
+/*
+ * 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.entity.data;
+
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+public class EntityDataType<T> {
+    private final String name;
+    private final int[] ids;
+    private final Function<PacketWrapper<?>, T> dataDeserializer;
+    private final BiConsumer<PacketWrapper<?>, Object> dataSerializer;
+
+    public EntityDataType(String name, int[] ids, Function<PacketWrapper<?>, T> dataDeserializer, BiConsumer<PacketWrapper<?>, Object> dataSerializer) {
+        this.name = name;
+        this.ids = ids;
+        this.dataDeserializer = dataDeserializer;
+        this.dataSerializer = dataSerializer;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getId(ClientVersion version) {
+        int index = EntityDataTypes.TYPES_BUILDER.getDataIndex(version);
+        return ids[index];
+    }
+
+    public Function<PacketWrapper<?>, T> getDataDeserializer() {
+        return dataDeserializer;
+    }
+
+    public BiConsumer<PacketWrapper<?>, Object> getDataSerializer() {
+        return dataSerializer;
+    }
+}
@@ -0,0 +1,343 @@
+/*
+ * 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.entity.data;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.protocol.entity.pose.EntityPose;
+import com.github.retrooper.packetevents.protocol.entity.sniffer.SnifferState;
+import com.github.retrooper.packetevents.protocol.entity.villager.VillagerData;
+import com.github.retrooper.packetevents.protocol.item.ItemStack;
+import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
+import com.github.retrooper.packetevents.protocol.particle.Particle;
+import com.github.retrooper.packetevents.protocol.particle.type.ParticleType;
+import com.github.retrooper.packetevents.protocol.particle.type.ParticleTypes;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.protocol.world.BlockFace;
+import com.github.retrooper.packetevents.protocol.world.WorldBlockPosition;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.util.*;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+public class EntityDataTypes {
+    //1.7 -> 1.18 block_position is just 3 ints, not serialized with a long
+    //short was removed in 1.9+
+    //boolean was added in 1.9
+    //nbt was added in 1.12
+
+    private static final Map<String, EntityDataType<?>> ENTITY_DATA_TYPE_MAP = new HashMap<>();
+    private static final Map<Byte, Map<Integer, EntityDataType<?>>> ENTITY_DATA_TYPE_ID_MAP = new HashMap<>();
+    protected static final TypesBuilder TYPES_BUILDER = new TypesBuilder("entity/entity_data_type_mappings",
+            ClientVersion.V_1_8,
+            ClientVersion.V_1_9,
+            ClientVersion.V_1_11,
+            ClientVersion.V_1_13,
+            ClientVersion.V_1_14,
+            ClientVersion.V_1_19,
+            ClientVersion.V_1_19_3,
+            ClientVersion.V_1_19_4);
+
+    public static final EntityDataType<Byte> BYTE = define("byte", PacketWrapper::readByte, PacketWrapper::writeByte);
+
+    public static final EntityDataType<Short> SHORT = define("short", PacketWrapper::readShort, PacketWrapper::writeShort);
+
+    public static final EntityDataType<Integer> INT = define("int", wrapper -> {
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_9)) {
+            return wrapper.readVarInt();
+        } else {
+            return wrapper.readInt();
+        }
+    }, (wrapper, value) -> {
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_9)) {
+            wrapper.writeVarInt(value);
+        } else {
+            wrapper.writeInt(value);
+        }
+    });
+
+    public static final EntityDataType<Long> LONG = define("long", PacketWrapper::readVarLong, PacketWrapper::writeVarLong);
+
+    public static final EntityDataType<Float> FLOAT = define("float", PacketWrapper::readFloat, PacketWrapper::writeFloat);
+
+    public static final EntityDataType<String> STRING = define("string", PacketWrapper::readString, PacketWrapper::writeString);
+
+    public static final EntityDataType<String> COMPONENT = define("component", PacketWrapper::readComponentJSON, PacketWrapper::writeComponentJSON);
+
+    public static final EntityDataType<Optional<String>> OPTIONAL_COMPONENT = define("optional_component", readOptionalComponentDeserializer(), writeOptionalComponentSerializer());
+
+    public static final EntityDataType<ItemStack> ITEMSTACK = define("itemstack", PacketWrapper::readItemStack, PacketWrapper::writeItemStack);
+
+    public static final EntityDataType<Optional<ItemStack>> OPTIONAL_ITEMSTACK = define("optional_itemstack",
+            (PacketWrapper<?> wrapper) -> Optional.of(wrapper.readItemStack()),
+            (PacketWrapper<?> wrapper, Optional<ItemStack> value) -> wrapper.writeItemStack(value.orElse(null)));
+
+    public static final EntityDataType<Boolean> BOOLEAN = define("boolean", PacketWrapper::readBoolean, PacketWrapper::writeBoolean);
+
+    public static final EntityDataType<Vector3f> ROTATION = define("rotation",
+            (PacketWrapper<?> wrapper) -> new Vector3f(wrapper.readFloat(), wrapper.readFloat(), wrapper.readFloat()),
+            (PacketWrapper<?> wrapper, Vector3f value) -> {
+                wrapper.writeFloat(value.x);
+                wrapper.writeFloat(value.y);
+                wrapper.writeFloat(value.z);
+            });
+
+    public static final EntityDataType<Vector3i> BLOCK_POSITION = define("block_position", (PacketWrapper<?> wrapper) -> {
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_9)) {
+            return wrapper.readBlockPosition();
+        } else {
+            int x = wrapper.readInt();
+            int y = wrapper.readInt();
+            int z = wrapper.readInt();
+            return new Vector3i(x, y, z);
+        }
+    }, (wrapper, blockPosition) -> {
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_9)) {
+            wrapper.writeBlockPosition(blockPosition);
+        } else {
+            wrapper.writeInt(blockPosition.getX());
+            wrapper.writeInt(blockPosition.getY());
+            wrapper.writeInt(blockPosition.getZ());
+        }
+    });
+
+    public static final EntityDataType<Optional<Vector3i>> OPTIONAL_BLOCK_POSITION = define("optional_block_position",
+            readOptionalBlockPositionDeserializer(), writeOptionalBlockPositionSerializer());
+
+    public static final EntityDataType<BlockFace> BLOCK_FACE = define("block_face", (PacketWrapper<?> wrapper) -> {
+                int id = wrapper.readVarInt();
+                return BlockFace.getBlockFaceByValue(id);
+            },
+            (PacketWrapper<?> wrapper, BlockFace value) -> wrapper.writeVarInt(value.getFaceValue()));
+
+    public static final EntityDataType<Optional<UUID>> OPTIONAL_UUID = define("optional_uuid",
+            (PacketWrapper<?> wrapper) -> Optional.ofNullable(wrapper.readOptional(PacketWrapper::readUUID)),
+            (PacketWrapper<?> wrapper, Optional<UUID> value) ->
+                    wrapper.writeOptional(value.orElse(null), PacketWrapper::writeUUID));
+
+    public static final EntityDataType<Integer> BLOCK_STATE = define("block_state",
+            readIntDeserializer(), writeIntSerializer());
+
+    public static final EntityDataType<Integer> OPTIONAL_BLOCK_STATE = define("optional_block_state", readIntDeserializer(), writeIntSerializer());
+
+    public static final EntityDataType<NBTCompound> NBT = define("nbt", PacketWrapper::readNBT, PacketWrapper::writeNBT);
+
+    public static final EntityDataType<Particle> PARTICLE = define("particle", wrapper -> {
+        int id = wrapper.readVarInt();
+        ParticleType type = ParticleTypes.getById(PacketEvents.getAPI().getServerManager().getVersion().toClientVersion(), id);
+        return new Particle(type, type.readDataFunction().apply(wrapper));
+    }, (wrapper, particle) -> {
+        wrapper.writeVarInt(particle.getType().getId(PacketEvents.getAPI().getServerManager().getVersion().toClientVersion()));
+        particle.getType().writeDataFunction().accept(wrapper, particle.getData());
+    });
+
+    public static final EntityDataType<VillagerData> VILLAGER_DATA = define("villager_data", PacketWrapper::readVillagerData, PacketWrapper::writeVillagerData);
+
+    public static final EntityDataType<Optional<Integer>> OPTIONAL_INT = define("optional_int", (PacketWrapper<?> wrapper) -> {
+        int i = wrapper.readVarInt();
+        return i == 0 ? Optional.empty() : Optional.of(i - 1);
+    }, (PacketWrapper<?> wrapper, Optional<Integer> value) -> {
+        wrapper.writeVarInt(value.orElse(-1) + 1);
+    });
+
+    public static final EntityDataType<EntityPose> ENTITY_POSE = define("entity_pose", (PacketWrapper<?> wrapper) -> {
+        int id = wrapper.readVarInt();
+        return EntityPose.getById(wrapper.getServerVersion().toClientVersion(), id);
+    }, (PacketWrapper<?> wrapper, EntityPose value) -> wrapper.writeVarInt(value.getId(wrapper.getServerVersion().toClientVersion())));
+
+    public static final EntityDataType<Integer> CAT_VARIANT = define("cat_variant_type", readIntDeserializer(), writeIntSerializer());
+
+    public static final EntityDataType<Integer> FROG_VARIANT = define("frog_variant_type", readIntDeserializer(), writeIntSerializer());
+
+    public static final EntityDataType<Optional<WorldBlockPosition>> OPTIONAL_GLOBAL_POSITION = define("optional_global_position",
+            (PacketWrapper<?> wrapper) -> Optional.ofNullable(wrapper.readOptional(w -> new WorldBlockPosition(new ResourceLocation(w.readString(32767)), w.readBlockPosition()))),
+            (PacketWrapper<?> wrapper, Optional<WorldBlockPosition> value) -> wrapper.writeOptional(value.orElse(null), (w, globalPos) -> {
+                w.writeString(globalPos.getWorld().toString());
+                w.writeBlockPosition(globalPos.getBlockPosition());
+            }));
+
+    public static final EntityDataType<Integer> PAINTING_VARIANT_TYPE = define("painting_variant_type", readIntDeserializer(), writeIntSerializer());
+
+    public static final EntityDataType<SnifferState> SNIFFER_STATE = define("sniffer_state", (PacketWrapper<?> wrapper) -> {
+        int id = wrapper.readVarInt();
+        return SnifferState.values()[id];
+    }, (PacketWrapper<?> wrapper, SnifferState value) -> wrapper.writeVarInt(value.ordinal()));
+
+
+    public static final EntityDataType<Vector3f> VECTOR3F = define("vector3f",
+            (PacketWrapper<?> wrapper) -> new Vector3f(wrapper.readFloat(), wrapper.readFloat(), wrapper.readFloat()),
+            (PacketWrapper<?> wrapper, Vector3f value) -> {
+                wrapper.writeFloat(value.x);
+                wrapper.writeFloat(value.y);
+                wrapper.writeFloat(value.z);
+            });
+
+    public static final EntityDataType<Quaternion4f> QUATERNION = define("quaternion",
+            (PacketWrapper<?> wrapper) -> new Quaternion4f(wrapper.readFloat(), wrapper.readFloat(), wrapper.readFloat(), wrapper.readFloat()),
+            (PacketWrapper<?> wrapper, Quaternion4f value) -> {
+                wrapper.writeFloat(value.getX());
+                wrapper.writeFloat(value.getY());
+                wrapper.writeFloat(value.getZ());
+                wrapper.writeFloat(value.getW());
+            });
+
+    public static EntityDataType<?> getById(ClientVersion version, int id) {
+        int index = TYPES_BUILDER.getDataIndex(version);
+        Map<Integer, EntityDataType<?>> typeIdMap = ENTITY_DATA_TYPE_ID_MAP.get((byte) index);
+        return typeIdMap.get(id);
+    }
+
+    public static EntityDataType<?> getByName(String name) {
+        return ENTITY_DATA_TYPE_MAP.get(name);
+    }
+
+    public static <T> EntityDataType<T> define(String name, Function<PacketWrapper<?>, T> deserializer, BiConsumer<PacketWrapper<?>, T> serializer) {
+        TypesBuilderData data = TYPES_BUILDER.define(name);
+        EntityDataType<T> type = new EntityDataType<>(name, data.getData(), deserializer,
+                (BiConsumer<PacketWrapper<?>, Object>) serializer);
+        ENTITY_DATA_TYPE_MAP.put(type.getName(), type);
+        for (ClientVersion version : TYPES_BUILDER.getVersions()) {
+            int index = TYPES_BUILDER.getDataIndex(version);
+            if (index == -1) continue;
+            Map<Integer, EntityDataType<?>> typeIdMap = ENTITY_DATA_TYPE_ID_MAP
+                    .computeIfAbsent((byte) index, k -> new HashMap<>());
+            typeIdMap.put(type.getId(version), type);
+        }
+        return type;
+    }
+
+    private static <T> Function<PacketWrapper<?>, T> readIntDeserializer() {
+        if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_9)) {
+            return (PacketWrapper<?> wrapper) -> (T) ((Object) wrapper.readVarInt());
+        } else {
+            return (PacketWrapper<?> wrapper) -> (T) ((Object) wrapper.readInt());
+        }
+    }
+
+    private static <T> BiConsumer<PacketWrapper<?>, T> writeIntSerializer() {
+        return (PacketWrapper<?> wrapper, T value) -> {
+            int output = 0;
+            if (value instanceof Byte) {
+                output = ((Byte) value).intValue();
+            } else if (value instanceof Short) {
+                output = ((Short) value).intValue();
+            } else if (value instanceof Integer) {
+                output = (Integer) value;
+            } else if (value instanceof Long) {
+                output = ((Long) value).intValue();
+            }
+            if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_9)) {
+                wrapper.writeVarInt(output);
+            } else {
+                wrapper.writeInt(output);
+            }
+        };
+    }
+
+    private static <T> Function<PacketWrapper<?>, T> readOptionalComponentDeserializer() {
+        return (PacketWrapper<?> wrapper) -> {
+            if (wrapper.readBoolean()) {
+                return (T) Optional.of(wrapper.readString());
+            } else {
+                return (T) Optional.empty();
+            }
+        };
+    }
+
+    private static <T> BiConsumer<PacketWrapper<?>, T> writeOptionalComponentSerializer() {
+        return (PacketWrapper<?> wrapper, T value) -> {
+            if (value instanceof Optional) {
+                Optional<String> optional = (Optional<String>) value;
+                if (optional.isPresent()) {
+                    wrapper.writeBoolean(true);
+                    wrapper.writeString(optional.get());
+                } else {
+                    wrapper.writeBoolean(false);
+                }
+            } else {
+                wrapper.writeBoolean(false);
+            }
+        };
+    }
+
+    private static <T> Function<PacketWrapper<?>, T> readOptionalBlockPositionDeserializer() {
+        if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_9)) {
+            return (PacketWrapper<?> wrapper) -> {
+                if (wrapper.readBoolean()) {
+                    return (T) Optional.of(wrapper.readBlockPosition());
+                } else {
+                    return (T) Optional.empty();
+                }
+            };
+        } else {
+            return (PacketWrapper<?> wrapper) -> {
+                if (wrapper.readBoolean()) {
+                    int x = wrapper.readInt();
+                    int y = wrapper.readInt();
+                    int z = wrapper.readInt();
+                    return (T) Optional.of(new Vector3i(x, y, z));
+                } else {
+                    return (T) Optional.empty();
+                }
+            };
+        }
+    }
+
+    private static <T> BiConsumer<PacketWrapper<?>, T> writeOptionalBlockPositionSerializer() {
+        if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_9)) {
+            return (PacketWrapper<?> wrapper, T value) -> {
+                if (value instanceof Optional) {
+                    Optional<?> optional = (Optional<?>) value;
+                    if (optional.isPresent()) {
+                        wrapper.writeBoolean(true);
+                        wrapper.writeBlockPosition((Vector3i) optional.get());
+                    } else {
+                        wrapper.writeBoolean(false);
+                    }
+                } else {
+                    wrapper.writeBoolean(false);
+                }
+            };
+        } else {
+            return (PacketWrapper<?> wrapper, T value) -> {
+                if (value instanceof Optional) {
+                    Optional<?> optional = (Optional<?>) value;
+                    if (optional.isPresent()) {
+                        wrapper.writeBoolean(true);
+                        Vector3i position = (Vector3i) optional.get();
+                        wrapper.writeInt(position.getX());
+                        wrapper.writeInt(position.getY());
+                        wrapper.writeInt(position.getZ());
+                    } else {
+                        wrapper.writeBoolean(false);
+                    }
+                } else {
+                    wrapper.writeBoolean(false);
+                }
+            };
+        }
+    }
+
+}
@@ -0,0 +1,61 @@
+/*
+ * 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.entity.pose;
+
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+
+public enum EntityPose {
+    STANDING,
+    FALL_FLYING,
+    SLEEPING,
+    SWIMMING,
+    SPIN_ATTACK,
+    CROUCHING,
+    LONG_JUMPING,
+    DYING,
+    CROAKING,
+    USING_TONGUE,
+    SITTING,
+    ROARING,
+    SNIFFING,
+    EMERGING,
+    DIGGING;
+
+   public int getId(ClientVersion version) {
+       if (this == DYING && version.isOlderThan(ClientVersion.V_1_17)) {
+           return 6;
+       }
+       if (this.ordinal() >= 11 && version.isOlderThan(ClientVersion.V_1_19_3)) {
+           return this.ordinal() - 1;
+       }
+       return ordinal();
+   }
+
+   public static EntityPose getById(ClientVersion version, int id) {
+       // The LONG_JUMPING pose was added in 1.17, shifting things by 1
+       if (id == 6 && version.isOlderThan(ClientVersion.V_1_17)) {
+           return DYING;
+       }
+       // The SITTING pose was added in 1.19.3, shifting Warden's poses by 1
+       if (id >= 10 && version.isOlderThan(ClientVersion.V_1_19_3)) {
+           id++;
+       }
+       return values()[id];
+   }
+}
@@ -0,0 +1,29 @@
+/*
+ * 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.entity.sniffer;
+
+public enum SnifferState {
+    IDLING,
+    FEELING_HAPPY,
+    SCENTING,
+    SNIFFING,
+    SEARCHING,
+    DIGGING,
+    RISING
+}
@@ -0,0 +1,91 @@
+/*
+ * 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.entity.transform;
+
+import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
+import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
+import com.github.retrooper.packetevents.protocol.player.UserProfile;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+
+public class EntityTransformType {
+    public static final EntityTransformType IDENTITY = new EntityTransformType(null, 1.0F, null);
+
+    private @Nullable TypeModifier typeModifier;
+    private float scale;
+    private @Nullable UserProfile playerSkin;
+
+    //Scale must be between 0.1F and 16.0F
+    public EntityTransformType(@Nullable TypeModifier typeModifier, float scale, @Nullable UserProfile playerSkin) {
+        this.typeModifier = typeModifier;
+        this.scale = scale;
+        this.playerSkin = playerSkin;
+    }
+
+    public Optional<TypeModifier> getTypeModifier() {
+        return Optional.ofNullable(typeModifier);
+    }
+
+    public void setTypeModifier(@Nullable TypeModifier typeModifier) {
+        this.typeModifier = typeModifier;
+    }
+
+    public float getScale() {
+        return scale;
+    }
+
+    public void setScale(float scale) {
+        this.scale = scale;
+    }
+
+    public Optional<UserProfile> getPlayerSkin() {
+        return Optional.ofNullable(playerSkin);
+    }
+
+    public void setPlayerSkin(@Nullable UserProfile playerSkin) {
+        this.playerSkin = playerSkin;
+    }
+
+    public static class TypeModifier {
+        private EntityType entityType;
+        private @Nullable NBTCompound tag;
+
+        public TypeModifier(EntityType entityType, @Nullable NBTCompound tag) {
+            this.entityType = entityType;
+            this.tag = tag;
+        }
+
+        public EntityType getEntityType() {
+            return entityType;
+        }
+
+        public void setEntityType(EntityType entityType) {
+            this.entityType = entityType;
+        }
+
+        public Optional<NBTCompound> getTag() {
+            return Optional.ofNullable(tag);
+        }
+
+        public void setTag(@Nullable NBTCompound tag) {
+            this.tag = tag;
+        }
+    }
+}
@@ -0,0 +1,28 @@
+/*
+ * 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.entity.type;
+
+import com.github.retrooper.packetevents.protocol.mapper.LegacyMappedEntity;
+import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
+
+import java.util.Optional;
+
+public interface EntityType extends MappedEntity, LegacyMappedEntity {
+    Optional<EntityType> getParent();
+}
@@ -0,0 +1,311 @@
+/*
+ * 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.entity.type;
+
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.util.TypesBuilder;
+import com.github.retrooper.packetevents.util.TypesBuilderData;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+public class EntityTypes {
+    private static final Map<String, EntityType> ENTITY_TYPE_MAP = new HashMap<>();
+    //Key - mappings version, value - map with entity type ids and entity types
+    private static final Map<Byte, Map<Integer, EntityType>> ENTITY_TYPE_ID_MAP = new HashMap<>();
+    private static final Map<Byte, Map<Integer, EntityType>> LEGACY_ENTITY_TYPE_ID_MAP = new HashMap<>();
+    private static final TypesBuilder TYPES_BUILDER = new TypesBuilder("entity/entity_type_mappings",
+            ClientVersion.V_1_10,
+            ClientVersion.V_1_11,
+            ClientVersion.V_1_12,
+            ClientVersion.V_1_13,
+            ClientVersion.V_1_14,
+            ClientVersion.V_1_15,
+            ClientVersion.V_1_16,
+            ClientVersion.V_1_16_2,
+            ClientVersion.V_1_17,
+            ClientVersion.V_1_19,
+            ClientVersion.V_1_19_3,
+            ClientVersion.V_1_19_4);
+    private static final TypesBuilder LEGACY_TYPES_BUILDER = new TypesBuilder("entity/legacy_entity_type_mappings",
+            ClientVersion.V_1_8,
+            ClientVersion.V_1_9,
+            ClientVersion.V_1_10,
+            ClientVersion.V_1_11,
+            ClientVersion.V_1_12,
+            ClientVersion.V_1_13);
+
+
+    static {
+        TYPES_BUILDER.unloadFileMappings();
+        LEGACY_TYPES_BUILDER.unloadFileMappings();
+    }
+
+    public static EntityType define(String key, @Nullable EntityType parent) {
+        TypesBuilderData data = TYPES_BUILDER.define(key);
+        TypesBuilderData legacyData = LEGACY_TYPES_BUILDER.define(key);
+        Optional<EntityType> optParent = Optional.ofNullable(parent);
+        EntityType entityType = new EntityType() {
+            private final int[] ids = data.getData();
+            private final int[] legacyIds = legacyData.getData();
+
+            @Override
+            public Optional<EntityType> getParent() {
+                return optParent;
+            }
+
+            @Override
+            public int getLegacyId(ClientVersion version) {
+                if (version.isNewerThanOrEquals(ClientVersion.V_1_14)) {
+                    return -1;
+                }
+                int index = LEGACY_TYPES_BUILDER.getDataIndex(version);
+                return legacyIds[index];
+            }
+
+            @Override
+            public ResourceLocation getName() {
+                return data.getName();
+            }
+
+            @Override
+            public int getId(ClientVersion version) {
+                int index = TYPES_BUILDER.getDataIndex(version);
+                return ids[index];
+            }
+        };
+        ENTITY_TYPE_MAP.put(entityType.getName().toString(), entityType);
+        for (ClientVersion version : TYPES_BUILDER.getVersions()) {
+            int index = TYPES_BUILDER.getDataIndex(version);
+            Map<Integer, EntityType> typeIdMap = ENTITY_TYPE_ID_MAP.computeIfAbsent((byte) index, k -> new HashMap<>());
+            typeIdMap.put(entityType.getId(version), entityType);
+        }
+
+        for (ClientVersion version : LEGACY_TYPES_BUILDER.getVersions()) {
+            int index = LEGACY_TYPES_BUILDER.getDataIndex(version);
+            Map<Integer, EntityType> legacyTypeIdMap = LEGACY_ENTITY_TYPE_ID_MAP.computeIfAbsent((byte) index, k -> new HashMap<>());
+            legacyTypeIdMap.put(entityType.getLegacyId(version), entityType);
+        }
+
+        return entityType;
+    }
+
+    public static boolean isTypeInstanceOf(EntityType type, EntityType parent) {
+        while (type != null) {
+            if (type == parent) {
+                return true;
+            }
+            if (type.getParent().isPresent()) {
+                type = type.getParent().get();
+            } else {
+                return false;
+            }
+        }
+        return false;
+    }
+
+    //with minecraft:key
+    public static EntityType getByName(String name) {
+        return ENTITY_TYPE_MAP.get(name);
+    }
+
+    public static EntityType getById(ClientVersion version, int id) {
+        int index = TYPES_BUILDER.getDataIndex(version);
+        return ENTITY_TYPE_ID_MAP.get((byte) index).get(id);
+    }
+
+    public static EntityType getByLegacyId(ClientVersion version, int id) {
+        if (version.isNewerThanOrEquals(ClientVersion.V_1_14)) {
+            return null;
+        }
+        int index = LEGACY_TYPES_BUILDER.getDataIndex(version);
+        return LEGACY_ENTITY_TYPE_ID_MAP.get((byte) index).get(id);
+    }
+
+    // Credit to ViaVersion for these categories
+    public static final EntityType ENTITY = define("entity", null);
+    public static final EntityType LIVINGENTITY = define("livingentity", ENTITY);
+    public static final EntityType ABSTRACT_INSENTIENT = define("abstract_insentient", LIVINGENTITY);
+    public static final EntityType ABSTRACT_CREATURE = define("abstract_creature", ABSTRACT_INSENTIENT);
+    public static final EntityType ABSTRACT_AGEABLE = define("abstract_ageable", ABSTRACT_CREATURE);
+    public static final EntityType ABSTRACT_ANIMAL = define("abstract_animal", ABSTRACT_AGEABLE);
+    public static final EntityType ABSTRACT_TAMEABLE_ANIMAL = define("abstract_tameable_animal", ABSTRACT_ANIMAL);
+    public static final EntityType ABSTRACT_PARROT = define("abstract_parrot", ABSTRACT_TAMEABLE_ANIMAL);
+    public static final EntityType ABSTRACT_HORSE = define("abstract_horse", ABSTRACT_ANIMAL);
+    public static final EntityType CHESTED_HORSE = define("chested_horse", ABSTRACT_HORSE);
+    public static final EntityType ABSTRACT_GOLEM = define("abstract_golem", ABSTRACT_CREATURE);
+    public static final EntityType ABSTRACT_FISHES = define("abstract_fishes", ABSTRACT_CREATURE);
+    public static final EntityType ABSTRACT_MONSTER = define("abstract_monster", ABSTRACT_CREATURE);
+    public static final EntityType ABSTRACT_PIGLIN = define("abstract_piglin", ABSTRACT_MONSTER);
+    public static final EntityType ABSTRACT_ILLAGER_BASE = define("abstract_illager_base", ABSTRACT_MONSTER);
+    public static final EntityType ABSTRACT_EVO_ILLU_ILLAGER = define("abstract_evo_illu_illager", ABSTRACT_ILLAGER_BASE);
+    public static final EntityType ABSTRACT_SKELETON = define("abstract_skeleton", ABSTRACT_MONSTER);
+    public static final EntityType ABSTRACT_FLYING = define("abstract_flying", ABSTRACT_INSENTIENT);
+    public static final EntityType ABSTRACT_AMBIENT = define("abstract_ambient", ABSTRACT_INSENTIENT);
+    public static final EntityType ABSTRACT_WATERMOB = define("abstract_watermob", ABSTRACT_INSENTIENT);
+    public static final EntityType ABSTRACT_HANGING = define("abstract_hanging", ENTITY);
+    public static final EntityType ABSTRACT_LIGHTNING = define("abstract_lightning", ENTITY);
+    public static final EntityType ABSTRACT_ARROW = define("abstract_arrow", ENTITY);
+    public static final EntityType ABSTRACT_FIREBALL = define("abstract_fireball", ENTITY);
+    public static final EntityType PROJECTILE_ABSTRACT = define("projectile_abstract", ENTITY);
+    public static final EntityType MINECART_ABSTRACT = define("minecart_abstract", ENTITY);
+    public static final EntityType CHESTED_MINECART_ABSTRACT = define("chested_minecart_abstract", MINECART_ABSTRACT);
+    public static final EntityType AREA_EFFECT_CLOUD = define("area_effect_cloud", ENTITY);
+    public static final EntityType ARMOR_STAND = define("armor_stand", LIVINGENTITY);
+    public static final EntityType ALLAY = define("allay", ABSTRACT_CREATURE);
+    public static final EntityType ARROW = define("arrow", ABSTRACT_ARROW);
+    public static final EntityType AXOLOTL = define("axolotl", ABSTRACT_ANIMAL);
+    public static final EntityType BAT = define("bat", ABSTRACT_AMBIENT);
+    public static final EntityType BEE = define("bee", ABSTRACT_INSENTIENT);
+    public static final EntityType BLAZE = define("blaze", ABSTRACT_MONSTER);
+    public static final EntityType BOAT = define("boat", ENTITY);
+    public static final EntityType CHEST_BOAT = define("chest_boat", BOAT);
+    public static final EntityType CAT = define("cat", ABSTRACT_TAMEABLE_ANIMAL);
+    public static final EntityType CAMEL = define("camel", ABSTRACT_HORSE);
+    public static final EntityType SPIDER = define("spider", ABSTRACT_MONSTER);
+    public static final EntityType CAVE_SPIDER = define("cave_spider", SPIDER);
+    public static final EntityType CHICKEN = define("chicken", ABSTRACT_ANIMAL);
+    public static final EntityType COD = define("cod", ABSTRACT_FISHES);
+    public static final EntityType COW = define("cow", ABSTRACT_ANIMAL);
+    public static final EntityType CREEPER = define("creeper", ABSTRACT_MONSTER);
+    public static final EntityType DOLPHIN = define("dolphin", ABSTRACT_INSENTIENT);
+    public static final EntityType DONKEY = define("donkey", CHESTED_HORSE);
+    public static final EntityType DRAGON_FIREBALL = define("dragon_fireball", ABSTRACT_FIREBALL);
+    public static final EntityType ZOMBIE = define("zombie", ABSTRACT_MONSTER);
+    public static final EntityType DROWNED = define("drowned", ZOMBIE);
+    public static final EntityType GUARDIAN = define("guardian", ABSTRACT_MONSTER);
+    public static final EntityType ELDER_GUARDIAN = define("elder_guardian", GUARDIAN);
+    public static final EntityType END_CRYSTAL = define("end_crystal", ENTITY);
+    public static final EntityType ENDER_DRAGON = define("ender_dragon", ABSTRACT_INSENTIENT);
+    public static final EntityType ENDERMAN = define("enderman", ABSTRACT_MONSTER);
+    public static final EntityType ENDERMITE = define("endermite", ABSTRACT_MONSTER);
+    public static final EntityType EVOKER = define("evoker", ABSTRACT_EVO_ILLU_ILLAGER);
+    public static final EntityType EVOKER_FANGS = define("evoker_fangs", ENTITY);
+    public static final EntityType EXPERIENCE_ORB = define("experience_orb", ENTITY);
+    public static final EntityType EYE_OF_ENDER = define("eye_of_ender", ENTITY);
+    public static final EntityType FALLING_BLOCK = define("falling_block", ENTITY);
+    public static final EntityType FIREWORK_ROCKET = define("firework_rocket", ENTITY);
+    public static final EntityType FOX = define("fox", ABSTRACT_ANIMAL);
+    public static final EntityType FROG = define("frog", ABSTRACT_ANIMAL);
+    public static final EntityType GHAST = define("ghast", ABSTRACT_FLYING);
+    public static final EntityType GIANT = define("giant", ABSTRACT_MONSTER);
+    public static final EntityType ITEM_FRAME = define("item_frame", ABSTRACT_HANGING);
+    public static final EntityType GLOW_ITEM_FRAME = define("glow_item_frame", ITEM_FRAME);
+    public static final EntityType SQUID = define("squid", ABSTRACT_WATERMOB);
+    public static final EntityType GLOW_SQUID = define("glow_squid", SQUID);
+    public static final EntityType GOAT = define("goat", ABSTRACT_ANIMAL);
+    public static final EntityType HOGLIN = define("hoglin", ABSTRACT_ANIMAL);
+    public static final EntityType HORSE = define("horse", ABSTRACT_HORSE);
+    public static final EntityType HUSK = define("husk", ZOMBIE);
+    public static final EntityType ILLUSIONER = define("illusioner", ABSTRACT_EVO_ILLU_ILLAGER);
+    public static final EntityType IRON_GOLEM = define("iron_golem", ABSTRACT_GOLEM);
+    public static final EntityType ITEM = define("item", ENTITY);
+    public static final EntityType FIREBALL = define("fireball", ABSTRACT_FIREBALL);
+    public static final EntityType LEASH_KNOT = define("leash_knot", ABSTRACT_HANGING);
+    public static final EntityType LIGHTNING_BOLT = define("lightning_bolt", ABSTRACT_LIGHTNING);
+    public static final EntityType LLAMA = define("llama", CHESTED_HORSE);
+    public static final EntityType LLAMA_SPIT = define("llama_spit", ENTITY);
+    public static final EntityType SLIME = define("slime", ABSTRACT_INSENTIENT);
+    public static final EntityType MAGMA_CUBE = define("magma_cube", SLIME);
+    public static final EntityType MARKER = define("marker", ENTITY);
+    public static final EntityType MINECART = define("minecart", MINECART_ABSTRACT);
+    public static final EntityType CHEST_MINECART = define("chest_minecart", CHESTED_MINECART_ABSTRACT);
+    public static final EntityType COMMAND_BLOCK_MINECART = define("command_block_minecart", MINECART_ABSTRACT);
+    public static final EntityType FURNACE_MINECART = define("furnace_minecart", MINECART_ABSTRACT);
+    public static final EntityType HOPPER_MINECART = define("hopper_minecart", CHESTED_MINECART_ABSTRACT);
+    public static final EntityType SPAWNER_MINECART = define("spawner_minecart", MINECART_ABSTRACT);
+    public static final EntityType TNT_MINECART = define("tnt_minecart", MINECART_ABSTRACT);
+    public static final EntityType MULE = define("mule", CHESTED_HORSE);
+    public static final EntityType MOOSHROOM = define("mooshroom", COW);
+    public static final EntityType OCELOT = define("ocelot", ABSTRACT_TAMEABLE_ANIMAL);
+    public static final EntityType PAINTING = define("painting", ABSTRACT_HANGING);
+    public static final EntityType PANDA = define("panda", ABSTRACT_INSENTIENT);
+    public static final EntityType PARROT = define("parrot", ABSTRACT_PARROT);
+    public static final EntityType PHANTOM = define("phantom", ABSTRACT_FLYING);
+    public static final EntityType PIG = define("pig", ABSTRACT_ANIMAL);
+    public static final EntityType PIGLIN = define("piglin", ABSTRACT_PIGLIN);
+    public static final EntityType PIGLIN_BRUTE = define("piglin_brute", ABSTRACT_PIGLIN);
+    public static final EntityType PILLAGER = define("pillager", ABSTRACT_ILLAGER_BASE);
+    public static final EntityType POLAR_BEAR = define("polar_bear", ABSTRACT_ANIMAL);
+    public static final EntityType TNT = define("tnt", ENTITY);
+    public static final EntityType PUFFERFISH = define("pufferfish", ABSTRACT_FISHES);
+    public static final EntityType RABBIT = define("rabbit", ABSTRACT_ANIMAL);
+    public static final EntityType RAVAGER = define("ravager", ABSTRACT_MONSTER);
+    public static final EntityType SALMON = define("salmon", ABSTRACT_FISHES);
+    public static final EntityType SHEEP = define("sheep", ABSTRACT_ANIMAL);
+    public static final EntityType SHULKER = define("shulker", ABSTRACT_GOLEM); // yes this is correct
+    public static final EntityType SHULKER_BULLET = define("shulker_bullet", ENTITY);
+    public static final EntityType SILVERFISH = define("silverfish", ABSTRACT_MONSTER);
+    public static final EntityType SKELETON = define("skeleton", ABSTRACT_SKELETON);
+    public static final EntityType SKELETON_HORSE = define("skeleton_horse", ABSTRACT_HORSE);
+    public static final EntityType SMALL_FIREBALL = define("small_fireball", ABSTRACT_FIREBALL);
+    public static final EntityType SNOW_GOLEM = define("snow_golem", ABSTRACT_GOLEM);
+    public static final EntityType SNOWBALL = define("snowball", PROJECTILE_ABSTRACT);
+    public static final EntityType SPECTRAL_ARROW = define("spectral_arrow", ABSTRACT_ARROW);
+    public static final EntityType STRAY = define("stray", ABSTRACT_SKELETON);
+    public static final EntityType STRIDER = define("strider", ABSTRACT_ANIMAL);
+    public static final EntityType EGG = define("egg", PROJECTILE_ABSTRACT);
+    public static final EntityType ENDER_PEARL = define("ender_pearl", PROJECTILE_ABSTRACT);
+    public static final EntityType EXPERIENCE_BOTTLE = define("experience_bottle", PROJECTILE_ABSTRACT);
+    public static final EntityType POTION = define("potion", PROJECTILE_ABSTRACT);
+    public static final EntityType TADPOLE = define("tadpole", ABSTRACT_FISHES);
+    @Deprecated // Exists only in 1.9 and 1.10
+    public static final EntityType TIPPED_ARROW = define("tipped_arrow", ARROW);
+    public static final EntityType TRIDENT = define("trident", ABSTRACT_ARROW);
+    public static final EntityType TRADER_LLAMA = define("trader_llama", CHESTED_HORSE);
+    public static final EntityType TROPICAL_FISH = define("tropical_fish", ABSTRACT_FISHES);
+    public static final EntityType TURTLE = define("turtle", ABSTRACT_ANIMAL);
+    public static final EntityType VEX = define("vex", ABSTRACT_MONSTER);
+    public static final EntityType VILLAGER = define("villager", ABSTRACT_AGEABLE);
+    public static final EntityType VINDICATOR = define("vindicator", ABSTRACT_ILLAGER_BASE);
+    public static final EntityType WANDERING_TRADER = define("wandering_trader", ABSTRACT_AGEABLE);
+    public static final EntityType WARDEN = define("warden", ABSTRACT_MONSTER);
+    public static final EntityType WITCH = define("witch", ABSTRACT_MONSTER);
+    public static final EntityType WITHER = define("wither", ABSTRACT_MONSTER);
+    public static final EntityType WITHER_SKELETON = define("wither_skeleton", ABSTRACT_SKELETON);
+    public static final EntityType WITHER_SKULL = define("wither_skull", ABSTRACT_FIREBALL);
+    public static final EntityType WOLF = define("wolf", ABSTRACT_TAMEABLE_ANIMAL);
+    public static final EntityType ZOGLIN = define("zoglin", ABSTRACT_MONSTER);
+    public static final EntityType ZOMBIE_HORSE = define("zombie_horse", ABSTRACT_HORSE);
+    public static final EntityType ZOMBIE_VILLAGER = define("zombie_villager", ZOMBIE);
+    public static final EntityType ZOMBIFIED_PIGLIN = define("zombified_piglin", ZOMBIE);
+    public static final EntityType PLAYER = define("player", LIVINGENTITY);
+    public static final EntityType FISHING_BOBBER = define("fishing_bobber", ENTITY);
+    public static final EntityType ENDER_SIGNAL = define("ender_signal", ENTITY);
+    public static final EntityType THROWN_EXP_BOTTLE = define("thrown_exp_bottle", PROJECTILE_ABSTRACT);
+    public static final EntityType PRIMED_TNT = define("primed_tnt", ENTITY);
+    public static final EntityType FIREWORK = define("firework", ENTITY);
+    public static final EntityType MINECART_COMMAND = define("minecart_command", MINECART_ABSTRACT);
+    public static final EntityType MINECART_RIDEABLE = define("minecart_rideable", MINECART_ABSTRACT);
+    public static final EntityType MINECART_CHEST = define("minecart_chest", MINECART_ABSTRACT);
+    public static final EntityType MINECART_FURNACE = define("minecart_furnace", MINECART_ABSTRACT);
+    public static final EntityType MINECART_TNT = define("minecart_tnt", MINECART_ABSTRACT);
+    public static final EntityType MINECART_HOPPER = define("minecart_hopper", MINECART_ABSTRACT);
+    public static final EntityType MINECART_MOB_SPAWNER = define("minecart_mob_spawner", MINECART_ABSTRACT);
+    // Display type entities added in 1.19.4
+    public static final EntityType DISPLAY = define("display", ENTITY);
+    public static final EntityType BLOCK_DISPLAY = define("block_display", DISPLAY);
+    public static final EntityType ITEM_DISPLAY = define("item_display", DISPLAY);
+    public static final EntityType TEXT_DISPLAY = define("text_display", DISPLAY);
+    public static final EntityType INTERACTION = define("interaction", DISPLAY);
+    public static final EntityType SNIFFER = define("sniffer", ABSTRACT_ANIMAL);
+}
@@ -0,0 +1,64 @@
+/*
+ * 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.entity.villager;
+
+import com.github.retrooper.packetevents.protocol.entity.villager.profession.VillagerProfession;
+import com.github.retrooper.packetevents.protocol.entity.villager.profession.VillagerProfessions;
+import com.github.retrooper.packetevents.protocol.entity.villager.type.VillagerType;
+import com.github.retrooper.packetevents.protocol.entity.villager.type.VillagerTypes;
+
+public class VillagerData {
+    private VillagerType type;
+    private VillagerProfession profession;
+    private int level;
+
+    public VillagerData(VillagerType type, VillagerProfession profession, int level) {
+        this.type = type;
+        this.profession = profession;
+        this.level = level;
+    }
+
+    public VillagerData(int typeId, int professionId, int level) {
+        this(VillagerTypes.getById(typeId), VillagerProfessions.getById(professionId), level);
+    }
+
+    public VillagerType getType() {
+        return type;
+    }
+
+    public void setType(VillagerType type) {
+        this.type = type;
+    }
+
+    public VillagerProfession getProfession() {
+        return profession;
+    }
+
+    public void setProfession(VillagerProfession profession) {
+        this.profession = profession;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.entity.villager.profession;
+
+import com.github.retrooper.packetevents.protocol.mapper.StaticMappedEntity;
+
+public interface VillagerProfession extends StaticMappedEntity {
+
+}
@@ -0,0 +1,73 @@
+/*
+ * 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.entity.villager.profession;
+
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.util.TypesBuilder;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class VillagerProfessions {
+    private static final Map<String, VillagerProfession> VILLAGER_PROFESSION_MAP = new HashMap<>();
+    private static final Map<Byte, VillagerProfession> VILLAGER_PROFESSION_ID_MAP = new HashMap<>();
+
+    public static VillagerProfession define(int id, String name) {
+        ResourceLocation location = new ResourceLocation(name);
+        VillagerProfession type = new VillagerProfession() {
+            @Override
+            public ResourceLocation getName() {
+                return location;
+            }
+
+            @Override
+            public int getId() {
+                return id;
+            }
+        };
+        VILLAGER_PROFESSION_MAP.put(type.getName().toString(), type);
+        VILLAGER_PROFESSION_ID_MAP.put((byte) type.getId(), type);
+        return type;
+    }
+
+    public static VillagerProfession getById(int id) {
+        return VILLAGER_PROFESSION_ID_MAP.get((byte)id);
+    }
+
+
+    public static VillagerProfession getByName(String name) {
+        return VILLAGER_PROFESSION_MAP.get(name);
+    }
+
+    public static final VillagerProfession NONE = define(0, "minecraft:none");
+    public static final VillagerProfession ARMORER = define(1, "minecraft:armorer");
+    public static final VillagerProfession BUTCHER = define(2, "minecraft:butcher");
+    public static final VillagerProfession CARTOGRAPHER = define(3, "minecraft:cartographer");
+    public static final VillagerProfession CLERIC = define(4, "minecraft:cleric");
+    public static final VillagerProfession FARMER = define(5, "minecraft:farmer");
+    public static final VillagerProfession FISHERMAN = define(6, "minecraft:fisherman");
+    public static final VillagerProfession FLETCHER = define(7, "minecraft:fletcher");
+    public static final VillagerProfession LEATHERWORKER = define(8, "minecraft:leatherworker");
+    public static final VillagerProfession LIBRARIAN = define(9, "minecraft:librarian");
+    public static final VillagerProfession MASON = define(10, "minecraft:mason");
+    public static final VillagerProfession NITWIT = define(11, "minecraft:nitwit");
+    public static final VillagerProfession SHEPHERD = define(12, "minecraft:shepherd");
+    public static final VillagerProfession TOOLSMITH = define(13, "minecraft:toolsmith");
+    public static final VillagerProfession WEAPONSMITH = define(14, "minecraft:weaponsmith");
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.entity.villager.type;
+
+import com.github.retrooper.packetevents.protocol.mapper.StaticMappedEntity;
+
+public interface VillagerType extends StaticMappedEntity {
+
+}
@@ -0,0 +1,65 @@
+/*
+ * 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.entity.villager.type;
+
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class VillagerTypes {
+    private static final Map<String, VillagerType> VILLAGER_TYPE_MAP = new HashMap<>();
+    private static final Map<Byte, VillagerType> VILLAGER_TYPE_ID_MAP = new HashMap<>();
+
+
+    public static VillagerType define(int id, String name) {
+        ResourceLocation location = new ResourceLocation(name);
+        VillagerType type = new VillagerType() {
+            @Override
+            public ResourceLocation getName() {
+                return location;
+            }
+
+            @Override
+            public int getId() {
+                return id;
+            }
+        };
+        VILLAGER_TYPE_MAP.put(type.getName().toString(), type);
+        VILLAGER_TYPE_ID_MAP.put((byte)type.getId(), type);
+        return type;
+    }
+
+    public static VillagerType getById(int id) {
+        return VILLAGER_TYPE_ID_MAP.get((byte)id);
+    }
+
+
+    public static VillagerType getByName(String name) {
+        return VILLAGER_TYPE_MAP.get(name);
+    }
+
+    public static final VillagerType DESERT = define(0, "minecraft:desert");
+    public static final VillagerType JUNGLE = define(1, "minecraft:jungle");
+    public static final VillagerType PLAINS = define(2, "minecraft:plains");
+    public static final VillagerType SAVANNA = define(3, "minecraft:savanna");
+    public static final VillagerType SNOW = define(4, "minecraft:snow");
+    public static final VillagerType SWAMP = define(5, "minecraft:swamp");
+    public static final VillagerType TAIGA = define(6, "minecraft:taiga");
+}
@@ -0,0 +1,338 @@
+/*
+ * 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.item;
+
+import com.github.retrooper.packetevents.protocol.item.enchantment.Enchantment;
+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.item.type.ItemType;
+import com.github.retrooper.packetevents.protocol.item.type.ItemTypes;
+import com.github.retrooper.packetevents.protocol.nbt.*;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class ItemStack {
+    public static final ItemStack EMPTY = new ItemStack(ItemTypes.AIR, 0, new NBTCompound(), 0);
+    private final ItemType type;
+    private int amount;
+    @Nullable
+    private NBTCompound nbt;
+    private int legacyData = -1;
+
+    private boolean cachedIsEmpty = false;
+
+    private ItemStack(ItemType type, int amount, @Nullable NBTCompound nbt, int legacyData) {
+        this.type = type;
+        this.amount = amount;
+        this.nbt = nbt;
+        this.legacyData = legacyData;
+        updateCachedEmptyStatus();
+    }
+
+    public int getMaxStackSize() {
+        return getType().getMaxAmount();
+    }
+
+    public boolean isStackable() {
+        return this.getMaxStackSize() > 1 && (!this.isDamageableItem() || !this.isDamaged());
+    }
+
+    public boolean isDamageableItem() {
+        if (!this.cachedIsEmpty && this.getType().getMaxDurability() > 0) {
+            NBTCompound tag = this.getNBT();
+            return tag == null || !tag.getBoolean("Unbreakable");
+        }
+        return false;
+    }
+
+    public boolean isDamaged() {
+        return this.isDamageableItem() && this.getDamageValue() > 0;
+    }
+
+    public int getDamageValue() {
+        if (nbt == null) return 0;
+        NBTInt damage = this.nbt.getTagOfTypeOrNull("Damage", NBTInt.class);
+        return damage == null ? 0 : damage.getAsInt();
+    }
+
+    public void setDamageValue(int damage) {
+        this.getOrCreateTag().setTag("Damage", new NBTInt(Math.max(0, damage)));
+    }
+
+    public int getMaxDamage() {
+        return this.getType().getMaxDurability();
+    }
+
+    public NBTCompound getOrCreateTag() {
+        if (this.nbt == null) {
+            this.nbt = new NBTCompound();
+        }
+
+        return this.nbt;
+    }
+
+    private void updateCachedEmptyStatus() {
+        cachedIsEmpty = isEmpty();
+    }
+
+    public ItemType getType() {
+        return cachedIsEmpty ? ItemTypes.AIR : type;
+    }
+
+    public int getAmount() {
+        return cachedIsEmpty ? 0 : amount;
+    }
+
+    public void shrink(int amount) {
+        this.setAmount(this.getAmount() - amount);
+    }
+
+    public void grow(int amount) {
+        this.setAmount(this.getAmount() + amount);
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+        updateCachedEmptyStatus();
+    }
+
+    public ItemStack split(int toTake) {
+        int i = Math.min(toTake, getAmount());
+        ItemStack itemstack = this.copy();
+        itemstack.setAmount(i);
+        this.shrink(i);
+        return itemstack;
+    }
+
+    public ItemStack copy() {
+        return cachedIsEmpty ? EMPTY : new ItemStack(type, amount, nbt == null ? null : nbt.copy(), legacyData);
+    }
+
+    @Nullable
+    public NBTCompound getNBT() {
+        return nbt;
+    }
+
+    public void setNBT(NBTCompound nbt) {
+        this.nbt = nbt;
+    }
+
+    public int getLegacyData() {
+        return legacyData;
+    }
+
+    public void setLegacyData(int legacyData) {
+        this.legacyData = legacyData;
+    }
+
+    public boolean isEnchantable(ClientVersion version) {
+        if (getType() == ItemTypes.BOOK) return getAmount() == 1;
+        if (getType() == ItemTypes.ENCHANTED_BOOK) return false;
+        return getMaxStackSize() == 1 && canBeDepleted() && !isEnchanted(version);
+    }
+
+    public boolean isEnchanted(ClientVersion version) {
+        String tagName = getEnchantmentsTagName(version);
+        return !isEmpty() && this.nbt != null && this.nbt.getCompoundListTagOrNull(tagName) != null && !this.nbt.getCompoundListTagOrNull(tagName).getTags().isEmpty();
+    }
+
+    private List<Enchantment> getEnchantments(@Nullable NBTCompound nbt, ClientVersion version) {
+        String tagName = getEnchantmentsTagName(version);
+
+        if (nbt == null || nbt.getCompoundListTagOrNull(tagName) == null)
+            return new ArrayList<>(0);
+
+        NBTList<NBTCompound> nbtList = nbt.getCompoundListTagOrNull(tagName);
+        List<NBTCompound> compounds = nbtList.getTags();
+        List<Enchantment> enchantments = new ArrayList<>(compounds.size());
+
+        for (NBTCompound compound : compounds) {
+            EnchantmentType type = getEnchantmentTypeFromTag(compound, version);
+
+            if (type != null) {
+                NBTShort levelTag = compound.getTagOfTypeOrNull("lvl", NBTShort.class);
+                int level = levelTag.getAsInt();
+                Enchantment enchantment = Enchantment.builder().type(type).level(level).build();
+                enchantments.add(enchantment);
+            }
+        }
+
+        return enchantments;
+    }
+
+    public List<Enchantment> getEnchantments(ClientVersion version) {
+        return getEnchantments(this.nbt, version);
+    }
+
+    public int getEnchantmentLevel(EnchantmentType enchantment, ClientVersion version) {
+        if (isEnchanted(version)) {
+            // isEnchanted() is true, so we can assume that nbt is not null
+            assert nbt != null;
+            String tagName = getEnchantmentsTagName(version);
+            for (NBTCompound base : nbt.getCompoundListTagOrNull(tagName).getTags()) {
+                EnchantmentType type = getEnchantmentTypeFromTag(base, version);
+                if (enchantment == type) {
+                    return base.getTagOfTypeOrNull("lvl", NBTShort.class).getAsInt();
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    @Nullable
+    private static EnchantmentType getEnchantmentTypeFromTag(NBTCompound tag, ClientVersion version) {
+        if (version.isNewerThanOrEquals(ClientVersion.V_1_13)) {
+            String id = tag.getStringTagValueOrNull("id");
+            return EnchantmentTypes.getByName(id);
+        } else {
+            NBTShort idTag = tag.getTagOfTypeOrNull("id", NBTShort.class);
+            return EnchantmentTypes.getById(version, idTag.getAsInt());
+        }
+    }
+
+    public void setEnchantments(List<Enchantment> enchantments, ClientVersion version) {
+        nbt = getOrCreateTag(); // Create tag if null
+        String tagName = getEnchantmentsTagName(version);
+        if (enchantments.isEmpty()) {
+            //Let us clear the enchantments
+            if (nbt.getTagOrNull(tagName) != null) {
+                nbt.removeTag(tagName);
+            }
+        } else {
+            List<NBTCompound> list = new ArrayList<>();
+            for (Enchantment enchantment : enchantments) {
+                NBTCompound compound = new NBTCompound();
+                if (version.isNewerThanOrEquals(ClientVersion.V_1_13)) {
+                    compound.setTag("id", new NBTString(enchantment.getType().getName().toString()));
+                } else {
+                    compound.setTag("id", new NBTShort((short) enchantment.getType().getId(version)));
+                }
+
+                compound.setTag("lvl", new NBTShort((short) enchantment.getLevel()));
+                list.add(compound);
+            }
+            assert nbt != null; // NBT was created in getOrCreateTag()
+            nbt.setTag(tagName, new NBTList<>(NBTType.COMPOUND, list));
+        }
+    }
+
+    public String getEnchantmentsTagName(ClientVersion version) {
+        String tagName = version.isNewerThanOrEquals(ClientVersion.V_1_13) ? "Enchantments" : "ench";
+        if (type == ItemTypes.ENCHANTED_BOOK) {
+            tagName = "StoredEnchantments";
+        }
+        return tagName;
+    }
+
+    public boolean canBeDepleted() {
+        return this.getType().getMaxDurability() > 0;
+    }
+
+    public boolean is(ItemType type) {
+        return this.getType() == type;
+    }
+
+    public static boolean isSameItemSameTags(ItemStack stack, ItemStack otherStack) {
+        return stack.is(otherStack.getType()) && ItemStack.tagMatches(stack, otherStack);
+    }
+
+    public static boolean tagMatches(ItemStack left, ItemStack right) {
+        if (left == right) {
+            return true;
+        }
+        if (left == null) {
+            return right.isEmpty();
+        }
+        if (right == null) {
+            return left.isEmpty();
+        }
+        return Objects.equals(left.nbt, right.nbt);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj instanceof ItemStack) {
+            ItemStack itemStack = (ItemStack) obj;
+            return getType().equals(itemStack.getType())
+                    && amount == itemStack.amount
+                    && Objects.equals(nbt, itemStack.nbt)
+                    && legacyData == itemStack.legacyData;
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        if (cachedIsEmpty) {
+            return "ItemStack[null]";
+        } else {
+            String identifier = type == null ? "null" : type.getName().toString();
+            int maxAmount = getType().getMaxAmount();
+            return "ItemStack[type=" + identifier + ", amount=" + amount + "/" + maxAmount
+                    + ", nbt tag names: " + (nbt != null ? nbt.getTagNames() : "[null]") + ", legacyData=" + legacyData + "]";
+        }
+    }
+
+    public boolean isEmpty() {
+        return type == null || type == ItemTypes.AIR || amount <= 0;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private ItemType type;
+        private int amount = 1;
+        private NBTCompound nbt = null;
+        private int legacyData = -1;
+
+        public Builder type(ItemType type) {
+            this.type = type;
+            return this;
+        }
+
+        public Builder amount(int amount) {
+            this.amount = amount;
+            return this;
+        }
+
+        public Builder nbt(NBTCompound nbt) {
+            this.nbt = nbt;
+            return this;
+        }
+
+        public Builder legacyData(int legacyData) {
+            this.legacyData = legacyData;
+            return this;
+        }
+
+        public ItemStack build() {
+            return new ItemStack(type, amount, nbt, legacyData);
+        }
+
+    }
+}
@@ -0,0 +1,18 @@
+package com.github.retrooper.packetevents.protocol.item.book;
+
+public enum BookType {
+    CRAFTING,
+    FURNACE,
+    BLAST_FURNACE,
+    SMOKER;
+
+    public int getId() {
+        return ordinal();
+    }
+
+    public static BookType getById(int id) {
+        return VALUES[id];
+    }
+    
+    private static final BookType[] VALUES = values();
+}
@@ -0,0 +1,71 @@
+/*
+ * 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.item.enchantment;
+
+import com.github.retrooper.packetevents.protocol.item.enchantment.type.EnchantmentType;
+import com.github.retrooper.packetevents.protocol.item.enchantment.type.EnchantmentTypes;
+
+public class Enchantment {
+    private EnchantmentType type;
+    private int level;
+
+    private Enchantment(EnchantmentType type, int level) {
+        this.type = type;
+        this.level = level;
+    }
+
+    public EnchantmentType getType() {
+        return type;
+    }
+
+    public void setType(EnchantmentType type) {
+        this.type = type;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private EnchantmentType type;
+        private int level;
+
+        public Builder type(EnchantmentType type) {
+            this.type = type;
+            return this;
+        }
+
+        public Builder level(int level) {
+            this.level = level;
+            return this;
+        }
+
+        public Enchantment build() {
+            return new Enchantment(type, level);
+        }
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,10 +16,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.injector;
+package com.github.retrooper.packetevents.protocol.item.enchantment.type;

-import org.bukkit.entity.Player;
+import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;

-public interface EarlyInjector extends ChannelInjector {
-    void updatePlayerObject(Player player, Object channel);
+public interface EnchantmentType extends MappedEntity {
 }
@@ -0,0 +1,129 @@
+/*
+ * 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.item.enchantment.type;
+
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.util.TypesBuilder;
+import com.github.retrooper.packetevents.util.TypesBuilderData;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class EnchantmentTypes {
+    private static final Map<String, EnchantmentType> ENCHANTMENT_TYPE_MAPPINGS = new HashMap<>();
+    private static final Map<Byte, Map<Integer, EnchantmentType>> ENCHANTMENT_TYPE_ID_MAPPINGS = new HashMap<>();
+    private static final TypesBuilder TYPES_BUILDER = new TypesBuilder("enchantment/enchantment_type_mappings",
+            ClientVersion.V_1_12,
+            ClientVersion.V_1_13,
+            ClientVersion.V_1_14,
+            ClientVersion.V_1_16,
+            ClientVersion.V_1_19);
+
+    public static EnchantmentType define(String key) {
+        TypesBuilderData data = TYPES_BUILDER.define(key);
+        EnchantmentType enchantmentType = new EnchantmentType() {
+            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];
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                if (obj instanceof EnchantmentType) {
+                    return getName() == ((EnchantmentType) obj).getName();
+                }
+                return false;
+            }
+        };
+
+        ENCHANTMENT_TYPE_MAPPINGS.put(enchantmentType.getName().toString(), enchantmentType);
+        for (ClientVersion version : TYPES_BUILDER.getVersions()) {
+            int index = TYPES_BUILDER.getDataIndex(version);
+            Map<Integer, EnchantmentType> typeIdMap = ENCHANTMENT_TYPE_ID_MAPPINGS.computeIfAbsent((byte) index, k -> new HashMap<>());
+            typeIdMap.put(enchantmentType.getId(version), enchantmentType);
+        }
+        return enchantmentType;
+    }
+
+    @Nullable
+    public static EnchantmentType getByName(String name) {
+        return ENCHANTMENT_TYPE_MAPPINGS.get(name);
+    }
+
+    @Nullable
+    public static EnchantmentType getById(ClientVersion version, int id) {
+        int index = TYPES_BUILDER.getDataIndex(version);
+        Map<Integer, EnchantmentType> typeIdMap = ENCHANTMENT_TYPE_ID_MAPPINGS.get((byte) index);
+        return typeIdMap.get(id);
+    }
+
+    public static final EnchantmentType ALL_DAMAGE_PROTECTION = define("protection");
+    public static final EnchantmentType FIRE_PROTECTION = define("fire_protection");
+    public static final EnchantmentType FALL_PROTECTION = define("feather_falling");
+    public static final EnchantmentType BLAST_PROTECTION = define("blast_protection");
+    public static final EnchantmentType PROJECTILE_PROTECTION = define("projectile_protection");
+    public static final EnchantmentType RESPIRATION = define("respiration");
+    public static final EnchantmentType AQUA_AFFINITY = define("aqua_affinity");
+    public static final EnchantmentType THORNS = define("thorns");
+    public static final EnchantmentType DEPTH_STRIDER = define("depth_strider");
+    public static final EnchantmentType FROST_WALKER = define("frost_walker");
+    public static final EnchantmentType BINDING_CURSE = define("binding_curse");
+    public static final EnchantmentType SOUL_SPEED = define("soul_speed");
+    public static final EnchantmentType SWIFT_SNEAK = define("swift_sneak");
+    public static final EnchantmentType SHARPNESS = define("sharpness");
+    public static final EnchantmentType SMITE = define("smite");
+    public static final EnchantmentType BANE_OF_ARTHROPODS = define("bane_of_arthropods");
+    public static final EnchantmentType KNOCKBACK = define("knockback");
+    public static final EnchantmentType FIRE_ASPECT = define("fire_aspect");
+    public static final EnchantmentType MOB_LOOTING = define("looting");
+    public static final EnchantmentType SWEEPING_EDGE = define("sweeping");
+    public static final EnchantmentType BLOCK_EFFICIENCY = define("efficiency");
+    public static final EnchantmentType SILK_TOUCH = define("silk_touch");
+    public static final EnchantmentType UNBREAKING = define("unbreaking");
+    public static final EnchantmentType BLOCK_FORTUNE = define("fortune");
+    public static final EnchantmentType POWER_ARROWS = define("power");
+    public static final EnchantmentType PUNCH_ARROWS = define("punch");
+    public static final EnchantmentType FLAMING_ARROWS = define("flame");
+    public static final EnchantmentType INFINITY_ARROWS = define("infinity");
+    public static final EnchantmentType FISHING_LUCK = define("luck_of_the_sea");
+    public static final EnchantmentType FISHING_SPEED = define("lure");
+    public static final EnchantmentType LOYALTY = define("loyalty");
+    public static final EnchantmentType IMPALING = define("impaling");
+    public static final EnchantmentType RIPTIDE = define("riptide");
+    public static final EnchantmentType CHANNELING = define("channeling");
+    public static final EnchantmentType MULTISHOT = define("multishot");
+    public static final EnchantmentType QUICK_CHARGE = define("quick_charge");
+    public static final EnchantmentType PIERCING = define("piercing");
+    public static final EnchantmentType MENDING = define("mending");
+    public static final EnchantmentType VANISHING_CURSE = define("vanishing_curse");
+
+    static {
+        TYPES_BUILDER.unloadFileMappings();
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of packetevents - https://github.com/retrooper/packetevents
- * Copyright (C) 2021 retrooper and contributors
+ * 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
@@ -16,22 +16,27 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package io.github.retrooper.packetevents.event.eventtypes;
+package com.github.retrooper.packetevents.protocol.item.type;

-import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
-import org.jetbrains.annotations.NotNull;
+import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
+import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
 import org.jetbrains.annotations.Nullable;

-/**
- * Every event that allows you to schedule a task that will run after the action associated with the event.
- *
- * @author retrooper
- * @since 1.8
- */
-public interface PostTaskEvent {
-    boolean isPostTaskAvailable();
+import java.util.Set;

-    @Nullable Runnable getPostTask();
+public interface ItemType extends MappedEntity {
+    int getMaxAmount();

-    void setPostTask(@NotNull Runnable postTask);
+    int getMaxDurability();
+
+    boolean isMusicDisc();
+
+    ItemType getCraftRemainder();
+
+    @Nullable
+    StateType getPlacedType();
+
+    Set<ItemTypes.ItemAttribute> getAttributes();
+
+    boolean hasAttribute(ItemTypes.ItemAttribute attribute);
 }