Updated to 1.8.2 (Support latest ProtocolLib snapshots & supposed to support future 5.0.0 release of protocollib)

We now support latest ProtocolLib snapshots. I'm sort of perplexed why this works, but seems like our initializer is wrapping itself somehow? Well it works
Older versions of packetevents' update checker will break. We never followed version semantics till now.
2022-03-08 19:23:30 +01:00 · 2022-03-08 19:20:14 +01:00 · 2022-03-07 22:33:09 +01:00 · 2022-03-07 22:28:51 +01:00 · 2022-03-07 21:09:01 +01:00 · 2022-03-07 20:49:46 +01:00
322 changed files with 27738 additions and 5766 deletions
@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: retrooper
+custom: ['https://paypal.me/retrooperdev']
@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Report a bug to help us fix
+title: "[BUG REPORT]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+*Example:*
+1. Login on the 1.16.4 minecraft client.
+2. Join the server while it is still starting up.
+3. ....
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**About your server (please complete the following information):**
+ - Spigot: [eg. Paper or Tuinity]
+    We only accept reports that are reproducible
+    on one of the supported spigots.
+ 
+- Server Version: [eg. 1.16.4]
+    Feel free to report bugs for versions newer than 1.7.10, even if we
+    don’t support them yet, but be aware that we might have already
+    found the bug and fixed it in a dev build, just before you reported it.
+    Please don’t get frustrated in such cases.
+
+- Plugins List if possible: [eg. ViaVersion, ProtocolLib, HolographicDisplays]
+
+**Additional context**
+Add any other context about the problem here.
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: FEATURE REQUEST
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered to solve your solution without
+us adding this as a feature?**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master, dev ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, dev ]
+  schedule:
+    - cron: '39 0 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
@@ -0,0 +1,33 @@
+# 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 ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      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
+
+    - name: Build with Gradle
+      run: gradle :clean :build
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: packetevents-dev-build.jar
+        path: build/libs
@@ -1,30 +0,0 @@
-name: Generate and deploy JavaDocs
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: mvn install
-    - name: List target/apidocs
-      run: ls target/apidocs
-    - name: GitHub Pages
-      uses: crazy-max/ghaction-github-pages@v2.1.2
-      env:
-        GH_PAT: ${{ secrets.GH_PAT }}
-      with:
-        target_branch: javadocs
-        keep_history: true
-        build_dir: target/apidocs
-        commit_message: Update JavaDocs
@@ -110,4 +110,8 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 # https://github.com/takari/maven-wrapper#usage-without-binary-jar
-.mvn/wrapper/maven-wrapper.jar
+.mvn/wrapper/maven-wrapper.jar
+/src/main/resources/
+/.gradle/
+/.idea/
+/build/
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="packetevents" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="packetevents" target="8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-  </component>
-</project>
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="viaversion-repo" />
-      <option name="name" value="viaversion-repo" />
-      <option name="url" value="https://repo.viaversion.com" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jitpack.io" />
-      <option name="name" value="jitpack.io" />
-      <option name="url" value="https://jitpack.io" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="spigot-repo" />
-      <option name="name" value="spigot-repo" />
-      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="funkemunky-releases" />
-      <option name="name" value="funkemunky-releases" />
-      <option name="url" value="https://nexus.funkemunky.cc/content/repositories/releases/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="dmulloy2-repo" />
-      <option name="name" value="dmulloy2-repo" />
-      <option name="url" value="https://repo.dmulloy2.net/nexus/repository/public/" />
-    </remote-repository>
-  </component>
-</project>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
-    </list>
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="13" project-jdk-type="JavaSDK" />
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/packetevents.iml" filepath="$PROJECT_DIR$/packetevents.iml" />
-    </modules>
-  </component>
-</project>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
@@ -1,21 +1,674 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007

-Copyright (c) 2020 retrooper
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
@@ -1,20 +1,27 @@
-# packetevents by retrooper
-
-A lightweight spigot packetlistener & packetsender coded by retrooper.
-
-## About
-
-This packetlistener is **only** supported on spigot servers and has been tested to work on these spigot forks: PaperSpigot, Tuinity
-
-* No dependencies
-
-* Licensed under the MIT license
-
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-
-Our discord server: https://discord.me/packetevents
+# packetevents

+[![](https://img.shields.io/badge/License-GPLv3-yellow.svg)](https://github.com/retrooper/packetevents/blob/dev/LICENSE)
 [![](https://jitpack.io/v/retrooper/packetevents.svg)](https://jitpack.io/#retrooper/packetevents)

-[![](https://jitci.com/gh/retrooper/packetevents/svg)](https://jitci.com/gh/retrooper/packetevents)
+PacketEvents is an open-source Packet API. It has many cross-version packet-wrappers. You can process incoming and outgoing packets on the server. You can even send packets with our packet-wrappers. We are here to save you a ton of time.

+### Resources
+* [SpigotMC](https://www.spigotmc.org/resources/packetevents-api.80279/)
+* [JavaDoc](https://packetevents.github.io/javadocs)
+* [Discord](https://discord.me/packetevents)
+
+### Setup
+[Learn more](https://github.com/retrooper/packetevents/wiki/1.-Setup)
+
+### Contributing/Forking
+[Learn more](https://github.com/retrooper/packetevents/wiki/2.-Contributing-and-Forking)\
+Our discord server has a role for contributors and forkers.
+
+### 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.
+
+### 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.
@@ -0,0 +1,4 @@
+# Table of contents
+
+* [Initial page](README.md)
+
@@ -0,0 +1,83 @@
+plugins {
+    id 'java'
+    id 'maven-publish'
+}
+
+//gradle myJavadocs
+task myJavadocs(type: Javadoc) {
+    source = sourceSets.main.allJava
+    File projectDir = getProjectDir()
+    File javadocsDir = new File(projectDir.getParentFile().getAbsolutePath() + "/docs");
+    javadocsDir.mkdirs()
+    setDestinationDir(javadocsDir)
+}
+
+repositories {
+    mavenLocal()
+    maven {
+        url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
+    }
+
+    maven {
+        url 'https://papermc.io/repo/repository/maven-public/'
+    }
+
+    maven {
+        url 'https://repo.opencollab.dev/maven-snapshots/'
+    }
+
+    maven {
+        url 'https://repo.opencollab.dev/maven-releases/'
+    }
+
+    maven {
+        url = uri('https://jitpack.io/')
+    }
+
+    maven {
+        url = uri('https://nexus.funkemunky.cc/content/repositories/releases/')
+    }
+
+    maven {
+        url = uri('https://repo.viaversion.com/')
+    }
+
+    maven {
+        url = uri('https://oss.sonatype.org/content/repositories/releases/')
+    }
+
+    maven {
+        url = uri('https://repo.maven.apache.org/maven2/')
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'org.jetbrains:annotations:22.0.0'
+
+    compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
+    compileOnly 'com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT'
+    compileOnly 'com.viaversion:viaversion-api:4.0.1'
+    compileOnly 'com.github.ProtocolSupport:ProtocolSupport:3d24efeda6'
+
+    compileOnly 'org.github.spigot:1.16.2:1.16.2'
+    compileOnly 'org.github.spigot:1.8.8:1.8.8'
+    compileOnly 'org.github.spigot:1.7.10:1.7.10'
+}
+
+group = 'io.github.retrooper'
+version = '1.8.2'
+description = 'packetevents'
+java.sourceCompatibility = JavaVersion.VERSION_1_8
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from(components.java)
+        }
+    }
+}
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
@@ -0,0 +1,169 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/.idea/libraries" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.github.spigot:1.8.8:1.8.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.github.spigot:1.7.10:1.7.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.protocol:ProtocolLib:4.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.executors:BukkitExecutors:1.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-common:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-bukkit:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-bukkit-legacy:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-bungee:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-fabric:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-sponge:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-sponge-legacy:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-velocity:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.ProtocolSupport:ProtocolSupport:4fdd683" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: it.unimi.dsi:fastutil:8.2.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:17.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.8.8-R0.1-SNAPSHOT" level="project" />
-  </component>
-</module>
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>io.github.retrooper</groupId>
-    <artifactId>packetevents</artifactId>
-    <version>1.6.2</version>
-
-    <!-- You can build the project with this: "mvn clean compile assembly:single" -->
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <packaging>jar</packaging>
-    <name>packetevents</name>
-
-    <properties>
-        <java.version>1.8</java.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-        <repository>
-            <id>funkemunky-releases</id>
-            <url>https://nexus.funkemunky.cc/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>viaversion-repo</id>
-            <url>https://repo.viaversion.com</url>
-        </repository>
-        <repository>
-            <id>dmulloy2-repo</id>
-            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
-        </repository>
-    </repositories>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.8.8</artifactId>
-            <version>1.8.8</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.7.10</artifactId>
-            <version>1.7.10</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.comphenix.protocol</groupId>
-            <artifactId>ProtocolLib</artifactId>
-            <version>4.5.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>us.myles</groupId>
-            <artifactId>viaversion</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.ProtocolSupport</groupId>
-            <artifactId>ProtocolSupport</artifactId>
-            <version>4fdd683</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>
@@ -0,0 +1,5 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+rootProject.name = 'packetevents'
@@ -1,147 +1,370 @@
-/**
- * Copyright (c) 2020 retrooper
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents;

-import io.github.retrooper.packetevents.api.PacketEventsAPI;
-import io.github.retrooper.packetevents.enums.ClientVersion;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.event.PacketListener;
-import io.github.retrooper.packetevents.event.impl.BukkitMoveEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.bstats.Metrics;
+import io.github.retrooper.packetevents.event.impl.PostPlayerInjectEvent;
+import io.github.retrooper.packetevents.event.manager.EventManager;
+import io.github.retrooper.packetevents.event.manager.PEEventManager;
+import io.github.retrooper.packetevents.exceptions.PacketEventsLoadFailureException;
+import io.github.retrooper.packetevents.injector.GlobalChannelInjector;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.packetwrappers.play.out.entityequipment.WrappedPacketOutEntityEquipment;
+import io.github.retrooper.packetevents.processor.BukkitEventProcessorInternal;
+import io.github.retrooper.packetevents.processor.PacketProcessorInternal;
 import io.github.retrooper.packetevents.settings.PacketEventsSettings;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import io.github.retrooper.packetevents.utils.nms_entityfinder.EntityFinderUtils;
-import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
+import io.github.retrooper.packetevents.updatechecker.UpdateChecker;
+import io.github.retrooper.packetevents.utils.entityfinder.EntityFinderUtils;
+import io.github.retrooper.packetevents.utils.guava.GuavaUtils;
+import io.github.retrooper.packetevents.utils.netty.bytebuf.ByteBufUtil;
+import io.github.retrooper.packetevents.utils.netty.bytebuf.ByteBufUtil_7;
+import io.github.retrooper.packetevents.utils.netty.bytebuf.ByteBufUtil_8;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.player.PlayerUtils;
+import io.github.retrooper.packetevents.utils.server.ServerUtils;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
+import io.github.retrooper.packetevents.utils.version.PEVersion;
 import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.ServicePriority;
+import org.bukkit.plugin.java.JavaPlugin;

-public final class PacketEvents implements PacketListener, Listener {
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;

-    private static final PacketEventsAPI packetEventsAPI = new PacketEventsAPI();
-    private static final PacketEvents instance = new PacketEvents();
-    private static final PacketEventsSettings settings = new PacketEventsSettings();
+public final class PacketEvents implements Listener, EventManager {
+    private static PacketEvents instance;
    private static Plugin plugin;
-    private static boolean hasLoaded, hasStarted;
+    private final PEVersion version = new PEVersion(1, 8, 2);
+    private final EventManager eventManager = new PEEventManager();
+    private final PlayerUtils playerUtils = new PlayerUtils();
+    private final ServerUtils serverUtils = new ServerUtils();
+    private final PacketProcessorInternal packetProcessorInternal = new PacketProcessorInternal();
+    private final BukkitEventProcessorInternal bukkitEventProcessorInternal = new BukkitEventProcessorInternal();
+    private final GlobalChannelInjector injector = new GlobalChannelInjector();
+    private final AtomicBoolean injectorReady = new AtomicBoolean();
+    private String handlerName;
+    private PacketEventsSettings settings = new PacketEventsSettings();
+    private ByteBufUtil byteBufUtil;
+    private UpdateChecker updateChecker;
+    private volatile boolean loading, loaded;
+    private boolean initialized, initializing, terminating;
+    private boolean lateBind = false;
+
+    public static PacketEvents create(final Plugin plugin) {
+        if (Bukkit.isPrimaryThread()) {
+            //We are on the main thread
+            if (!Bukkit.getServicesManager().isProvidedFor(PacketEvents.class)) {
+                //We can register in the service manager.
+                instance = new PacketEvents();
+                Bukkit.getServicesManager().register(PacketEvents.class, instance,
+                        plugin, ServicePriority.Normal);
+                PacketEvents.plugin = plugin;
+                return instance;
+            } else {
+                //We have already registered. Let us load what was registered.
+                return instance = Bukkit.getServicesManager().load(PacketEvents.class);
+            }
+        } else {
+            //We are off thread, we cannot use the service manager.
+            if (instance == null) {
+                PacketEvents.plugin = plugin;
+                instance = new PacketEvents();
+            }
+            return instance;
+        }
+    }
+
+    public static PacketEvents get() {
+        return instance;
+    }
+
+    @Deprecated
+    public static PacketEvents getAPI() {
+        return instance;
+    }
+
+
+    public void load() {
+        if (!loaded && !loading) {
+            loading = true;
+            //Resolve server version and cache
+            ServerVersion version = ServerVersion.getVersion();
+            WrappedPacket.version = version;
+            NMSUtils.version = version;
+            EntityFinderUtils.version = version;
+            handlerName = "pe-" + plugin.getName();
+            try {
+                NMSUtils.load();
+
+                PacketTypeClasses.load();
+
+                PacketType.load();
+
+                EntityFinderUtils.load();
+
+                getServerUtils().entityCache = GuavaUtils.makeMap();
+
+                if (version.isNewerThanOrEquals(ServerVersion.v_1_9)) {
+                    for (WrappedPacketOutEntityEquipment.EquipmentSlot slot : WrappedPacketOutEntityEquipment.EquipmentSlot.values()) {
+                        slot.id = (byte) slot.ordinal();
+                    }
+                } else {
+                    WrappedPacketOutEntityEquipment.EquipmentSlot.MAINHAND.id = 0;
+                    WrappedPacketOutEntityEquipment.EquipmentSlot.OFFHAND.id = -1; //Invalid
+                    WrappedPacketOutEntityEquipment.EquipmentSlot.BOOTS.id = 1;
+                    WrappedPacketOutEntityEquipment.EquipmentSlot.LEGGINGS.id = 2;
+                    WrappedPacketOutEntityEquipment.EquipmentSlot.CHESTPLATE.id = 3;
+                    WrappedPacketOutEntityEquipment.EquipmentSlot.HELMET.id = 4;
+                }
+            } catch (Exception ex) {
+                loading = false;
+                throw new PacketEventsLoadFailureException(ex);
+            }
+
+            byteBufUtil = NMSUtils.legacyNettyImportMode ? new ByteBufUtil_7() : new ByteBufUtil_8();
+            updateChecker = new UpdateChecker();
+            if (!injectorReady.get()) {
+                injector.load();
+                lateBind = !injector.isBound();
+                //If late-bind is enabled, we will inject a bit later.
+                if (!lateBind) {
+                    injector.inject();
+                }
+                injectorReady.set(true);
+            }
+
+            loaded = true;
+            loading = false;
+        }
+    }
+
+    public void loadAsyncNewThread() {
+        new Thread(this::load).start();
+    }
+
+    public void loadAsync(ExecutorService executorService) {
+        executorService.execute(this::load);
+    }
+
+    public void loadSettings(PacketEventsSettings settings) {
+        this.settings = settings;
+    }
+
+    public void init() {
+        init(getSettings());
+    }
+
+    public void init(PacketEventsSettings packetEventsSettings) {
+        //Load if we haven't loaded already
+        load();
+        if (!initialized && !initializing) {
+            initializing = true;
+            settings = packetEventsSettings;
+            settings.lock();
+
+            if (settings.shouldCheckForUpdates()) {
+                handleUpdateCheck();
+            }
+
+            if (settings.isbStatsEnabled()) {
+                Metrics metrics = new Metrics((JavaPlugin) getPlugin(), 11327);
+                //Just to have an idea what versions of packetevents people use
+                metrics.addCustomChart(new Metrics.SimplePie("packetevents_version", () -> {
+                    return getVersion().toString();
+                }));
+            }
+
+            //We must wait for the injector to initialize.
+
+            //Wait for the injector to be ready.
+            while (!injectorReady.get()) {
+            }
+
+            Runnable postInjectTask = () -> {
+                Bukkit.getPluginManager().registerEvents(bukkitEventProcessorInternal, plugin);
+                for (final Player p : Bukkit.getOnlinePlayers()) {
+                    try {
+                        injector.injectPlayer(p);
+                        getEventManager().callEvent(new PostPlayerInjectEvent(p, false));
+                    } catch (Exception ex) {
+                        p.kickPlayer("Failed to inject... Please rejoin!");
+                    }
+                }
+            };
+
+            if (lateBind) {
+                //If late-bind is enabled, we still need to inject (after all plugins enabled).
+                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, injector::inject);
+                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, postInjectTask);
+            } else {
+                postInjectTask.run();
+            }
+
+            initialized = true;
+            initializing = false;
+        }
+    }
+
+    @Deprecated
+    public void init(Plugin plugin) {
+        init(plugin, settings);
+    }
+
+    @Deprecated
+    public void init(Plugin pl, PacketEventsSettings packetEventsSettings) {
+        init(packetEventsSettings);
+    }
+
+    public void terminate() {
+        if (initialized && !terminating) {
+            //Eject all players
+            for (Player p : Bukkit.getOnlinePlayers()) {
+                injector.ejectPlayer(p);
+            }
+            //Eject the injector if needed
+            injector.eject();
+            //Unregister all our listeners
+            getEventManager().unregisterAllListeners();
+            initialized = false;
+            terminating = false;
+        }
+    }

    /**
-     * Call this before start()
+     * Use {@link #terminate()}. This is deprecated
     *
-     * Recommended on your onLoad() Bukkit Method
+     * @deprecated "Stop" might be misleading and "terminate" sounds better I guess...
     */
-    public static void load() {
-        //SERVER VERSION LOADING
-
-        //Server Version loading
-        ServerVersion.load();
-
-        ServerVersion version = ServerVersion.getVersion();
-        WrappedPacket.version = version;
-        PacketEvent.version = version;
-        NMSUtils.version = version;
-        EntityFinderUtils.version = version;
-
-        NMSUtils.load();
-
-        PacketTypeClasses.Client.load();
-        PacketTypeClasses.Server.load();
-
-        EntityFinderUtils.load();
-
-        WrappedPacket.loadAllWrappers();
-
-        VersionLookupUtils.load();
-        ClientVersion.prepareLookUp();
-        hasLoaded = true;
+    @Deprecated
+    public void stop() {
+        terminate();
    }

-    /**
-     * Loads PacketEvents if you haven't already, Sets everything up, injects all players
-     * @param pl Plugin instance
-     */
-    public static void start(final Plugin pl) {
-        if (!hasLoaded) {
-            load();
-        }
-        if (!hasStarted) {
-            plugin = pl;
-            //Register Bukkit and PacketListener
-            getAPI().getEventManager().registerListener(instance);
-
-            Bukkit.getPluginManager().registerEvents(instance, plugin);
-
-            for (final Player p : Bukkit.getOnlinePlayers()) {
-                getAPI().getPlayerUtils().injectPlayer(p);
-            }
-            hasStarted = true;
-        }
+    public boolean isLoading() {
+        return loading;
    }

-    /**
-     * Stop all tasks and unregisters all PacketEvents' listeners
-     */
-    public static void stop() {
-        if (hasStarted) {
-            for (final Player p : Bukkit.getOnlinePlayers()) {
-                getAPI().getPlayerUtils().uninjectPlayer(p);
-            }
-            getAPI().getEventManager().unregisterAllListeners();
-
-            PacketType.Client.packetIds.clear();
-            PacketType.Server.packetIds.clear();
-        }
+    public boolean hasLoaded() {
+        return loaded;
    }

-    public static boolean hasLoaded() {
-        return hasLoaded;
+    public boolean isTerminating() {
+        return terminating;
    }

-    public static boolean hasStarted() {
-        return hasStarted;
+    @Deprecated
+    public boolean isStopping() {
+        return isTerminating();
    }

-    public static PacketEventsAPI getAPI() {
-        return packetEventsAPI;
+    public boolean isInitializing() {
+        return initializing;
    }

-    public static Plugin getPlugin() {
+    public boolean isInitialized() {
+        return initialized;
+    }
+
+    public Plugin getPlugin() {
        return plugin;
    }

-    public static String getHandlerName(final String name) {
-        return "pe-" + settings.getIdentifier() + "-" + name;
+    public GlobalChannelInjector getInjector() {
+        return injector;
    }

-    public static PacketEventsSettings getSettings() {
+    public PacketProcessorInternal getInternalPacketProcessor() {
+        return packetProcessorInternal;
+    }
+
+    public String getHandlerName() {
+        return handlerName;
+    }
+
+    public PacketEventsSettings getSettings() {
        return settings;
    }

-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onJoin(final PlayerJoinEvent e) {
-        getAPI().getPlayerUtils().injectPlayer(e.getPlayer());
-        getAPI().getPlayerUtils().setClientVersion(e.getPlayer(), ClientVersion.fromProtocolVersion((short) VersionLookupUtils.getProtocolVersion(e.getPlayer())));
+    public PEVersion getVersion() {
+        return version;
    }

-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onQuit(final PlayerQuitEvent e) {
-        getAPI().getPlayerUtils().clearClientVersion(e.getPlayer());
-        getAPI().getPlayerUtils().uninjectPlayer(e.getPlayer());
+    public EventManager getEventManager() {
+        return eventManager;
    }

-    @EventHandler
-    public void onMove(final PlayerMoveEvent e) {
-        BukkitMoveEvent moveEvent = new BukkitMoveEvent(e);
-        getAPI().getEventManager().callEvent(moveEvent);
-        e.setCancelled(moveEvent.isCancelled());
+    public PlayerUtils getPlayerUtils() {
+        return playerUtils;
    }
-}
+
+    public ServerUtils getServerUtils() {
+        return serverUtils;
+    }
+
+    public ByteBufUtil getByteBufUtil() {
+        return byteBufUtil;
+    }
+
+    public UpdateChecker getUpdateChecker() {
+        return updateChecker;
+    }
+
+    private void handleUpdateCheck() {
+        if (updateChecker == null) {
+            updateChecker = new UpdateChecker();
+        }
+        Thread thread = new Thread(() -> {
+            getPlugin().getLogger().info("[packetevents] Checking for an update, please wait...");
+            UpdateChecker.UpdateCheckerStatus status = updateChecker.checkForUpdate();
+            int seconds = 5;
+            int retryCount = 5;
+            for (int i = 0; i < retryCount; i++) {
+                if (status != UpdateChecker.UpdateCheckerStatus.FAILED) {
+                    break;
+                }
+                getPlugin().getLogger().severe("[packetevents] Checking for an update again in " + seconds + " seconds...");
+                try {
+                    Thread.sleep(seconds * 1000L);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+
+                seconds *= 2;
+
+                status = updateChecker.checkForUpdate();
+
+                if (i == (retryCount - 1)) {
+                    getPlugin().getLogger().severe("[packetevents] PacketEvents failed to check for an update. No longer retrying.");
+                    break;
+                }
+
+            }
+
+        }, "packetevents-update-check-thread");
+        thread.start();
+    }
+
+}
@@ -0,0 +1,47 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents;
+
+import io.github.retrooper.packetevents.settings.PacketEventsSettings;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class PacketEventsPlugin extends JavaPlugin {
+    @Override
+    public void onLoad() {
+        PacketEventsSettings settings = PacketEvents.create(this).getSettings();
+        settings
+                .fallbackServerVersion(ServerVersion.getLatest())
+                .compatInjector(false)
+                .checkForUpdates(true)
+                .bStats(true);
+        PacketEvents.get().loadAsyncNewThread();
+        //You can do something here as it is loading
+    }
+
+    @Override
+    public void onEnable() {
+        PacketEvents.get().init();
+    }
+
+    @Override
+    public void onDisable() {
+        PacketEvents.get().terminate();
+    }
+}
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2020 retrooper
- */
-
-package io.github.retrooper.packetevents.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * This annotation indicates that something might be unstable.
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Beta {
-}
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.annotations;
-
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Is for sure not null.
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface NotNull {
-
-
-}
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.annotations;
-
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Could be null.
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Nullable {
-
-
-}
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.annotations;
-
-import io.github.retrooper.packetevents.enums.EventSynchronization;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-/**
- * Just like Bukkit's @EventHandler, but for PacketEvents' custom event system.
- * Make sure your class implements the PacketListener interface, and is registered when annotating your method with this annotation!
- */
-public @interface PacketHandler {
-    EventSynchronization synchronization() default EventSynchronization.NORMAL;
-}
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.api;
-
-import io.github.retrooper.packetevents.event.manager.EventManager;
-import io.github.retrooper.packetevents.utils.api.PlayerUtils;
-import io.github.retrooper.packetevents.utils.api.ServerUtils;
-
-public final class PacketEventsAPI {
-    private final EventManager eventManager = new EventManager();
-    private final PlayerUtils playerUtils = new PlayerUtils();
-    private final ServerUtils serverUtils = new ServerUtils();
-
-    /**
-     * Not thread safe
-     * Preciser than #currentMillis()
-     * Expensive
-     * Returns crazy values when you change system time
-     *
-     * @return {@link System#nanoTime()} / 1000000(1 million)
-     */
-    public long currentPreciseMillis() {
-        return System.nanoTime() / 1000000;
-    }
-
-    /**
-     * Thread safe
-     * Less precise compared to #currentPreciseMillis()
-     * Cheap
-     * Doesn't break when system time is changed
-     *
-     * @return {@link System#currentTimeMillis()}
-     */
-    public long currentMillis() {
-        return System.currentTimeMillis();
-    }
-
-    /**
-     * Get all utilities to do with the player
-     *
-     * @return Player Utilities
-     */
-    public PlayerUtils getPlayerUtils() {
-        return playerUtils;
-    }
-
-    /**
-     * Get all utilities to do with the server
-     *
-     * @return Server Utilities
-     */
-    public ServerUtils getServerUtils() {
-        return serverUtils;
-    }
-
-
-    /**
-     * Get the event manager
-     * Used to call events, register and unregister listeners
-     *
-     * @return PacketEvents' event manager
-     */
-    public EventManager getEventManager() {
-        return eventManager;
-    }
-}
@@ -0,0 +1,860 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.bstats;
+
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import javax.net.ssl.HttpsURLConnection;
+import java.io.*;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+import java.util.zip.GZIPOutputStream;
+
+public class Metrics {
+
+    private final Plugin plugin;
+
+    private final MetricsBase metricsBase;
+
+    /**
+     * Creates a new Metrics instance.
+     *
+     * @param plugin    Your plugin instance.
+     * @param serviceId The id of the service. It can be found at <a
+     *                  href="https://bstats.org/what-is-my-plugin-id">What is my plugin id?</a>
+     */
+    public Metrics(JavaPlugin plugin, int serviceId) {
+        this.plugin = plugin;
+        // Get the config file
+        File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
+        File configFile = new File(bStatsFolder, "config.yml");
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+        if (!config.isSet("serverUuid")) {
+            config.addDefault("enabled", true);
+            config.addDefault("serverUuid", UUID.randomUUID().toString());
+            config.addDefault("logFailedRequests", false);
+            config.addDefault("logSentData", false);
+            config.addDefault("logResponseStatusText", false);
+            // Inform the server owners about bStats
+            config
+                    .options()
+                    .header(
+                            "bStats (https://bStats.org) collects some basic information for plugin authors, like how\n"
+                                    + "many people use their plugin and their total player count. It's recommended to keep bStats\n"
+                                    + "enabled, but if you're not comfortable with this, you can turn this setting off. There is no\n"
+                                    + "performance penalty associated with having metrics enabled, and data sent to bStats is fully\n"
+                                    + "anonymous.")
+                    .copyDefaults(true);
+            try {
+                config.save(configFile);
+            } catch (IOException ignored) {
+            }
+        }
+        // Load the data
+        boolean enabled = config.getBoolean("enabled", true);
+        String serverUUID = config.getString("serverUuid");
+        boolean logErrors = config.getBoolean("logFailedRequests", false);
+        boolean logSentData = config.getBoolean("logSentData", false);
+        boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false);
+        metricsBase =
+                new MetricsBase(
+                        "bukkit",
+                        serverUUID,
+                        serviceId,
+                        enabled,
+                        this::appendPlatformData,
+                        this::appendServiceData,
+                        submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask),
+                        plugin::isEnabled,
+                        (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error),
+                        (message) -> this.plugin.getLogger().log(Level.INFO, message),
+                        logErrors,
+                        logSentData,
+                        logResponseStatusText);
+    }
+
+    /**
+     * Adds a custom chart.
+     *
+     * @param chart The chart to add.
+     */
+    public void addCustomChart(CustomChart chart) {
+        metricsBase.addCustomChart(chart);
+    }
+
+    private void appendPlatformData(JsonObjectBuilder builder) {
+        builder.appendField("playerAmount", getPlayerAmount());
+        builder.appendField("onlineMode", Bukkit.getOnlineMode() ? 1 : 0);
+        builder.appendField("bukkitVersion", Bukkit.getVersion());
+        builder.appendField("bukkitName", Bukkit.getName());
+        builder.appendField("javaVersion", System.getProperty("java.version"));
+        builder.appendField("osName", System.getProperty("os.name"));
+        builder.appendField("osArch", System.getProperty("os.arch"));
+        builder.appendField("osVersion", System.getProperty("os.version"));
+        builder.appendField("coreCount", Runtime.getRuntime().availableProcessors());
+    }
+
+    private void appendServiceData(JsonObjectBuilder builder) {
+        builder.appendField("pluginVersion", plugin.getDescription().getVersion());
+    }
+
+    private int getPlayerAmount() {
+        try {
+            // Around MC 1.8 the return type was changed from an array to a collection,
+            // This fixes java.lang.NoSuchMethodError:
+            // org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
+            Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
+            return onlinePlayersMethod.getReturnType().equals(Collection.class)
+                    ? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
+                    : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
+        } catch (Exception e) {
+            // Just use the new method if the reflection failed
+            return Bukkit.getOnlinePlayers().size();
+        }
+    }
+
+    public static class MetricsBase {
+
+        /**
+         * The version of the Metrics class.
+         */
+        public static final String METRICS_VERSION = "2.2.1";
+
+        private static final ScheduledExecutorService scheduler =
+                Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics"));
+
+        private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s";
+
+        private final String platform;
+
+        private final String serverUuid;
+
+        private final int serviceId;
+
+        private final Consumer<JsonObjectBuilder> appendPlatformDataConsumer;
+
+        private final Consumer<JsonObjectBuilder> appendServiceDataConsumer;
+
+        private final Consumer<Runnable> submitTaskConsumer;
+
+        private final Supplier<Boolean> checkServiceEnabledSupplier;
+
+        private final BiConsumer<String, Throwable> errorLogger;
+
+        private final Consumer<String> infoLogger;
+
+        private final boolean logErrors;
+
+        private final boolean logSentData;
+
+        private final boolean logResponseStatusText;
+
+        private final Set<CustomChart> customCharts = new HashSet<>();
+
+        private final boolean enabled;
+
+        /**
+         * Creates a new MetricsBase class instance.
+         *
+         * @param platform                    The platform of the service.
+         * @param serviceId                   The id of the service.
+         * @param serverUuid                  The server uuid.
+         * @param enabled                     Whether or not data sending is enabled.
+         * @param appendPlatformDataConsumer  A consumer that receives a {@code JsonObjectBuilder} and
+         *                                    appends all platform-specific data.
+         * @param appendServiceDataConsumer   A consumer that receives a {@code JsonObjectBuilder} and
+         *                                    appends all service-specific data.
+         * @param submitTaskConsumer          A consumer that takes a runnable with the submit task. This can be
+         *                                    used to delegate the data collection to a another thread to prevent errors caused by
+         *                                    concurrency. Can be {@code null}.
+         * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled.
+         * @param errorLogger                 A consumer that accepts log message and an error.
+         * @param infoLogger                  A consumer that accepts info log messages.
+         * @param logErrors                   Whether or not errors should be logged.
+         * @param logSentData                 Whether or not the sent data should be logged.
+         * @param logResponseStatusText       Whether or not the response status text should be logged.
+         */
+        public MetricsBase(
+                String platform,
+                String serverUuid,
+                int serviceId,
+                boolean enabled,
+                Consumer<JsonObjectBuilder> appendPlatformDataConsumer,
+                Consumer<JsonObjectBuilder> appendServiceDataConsumer,
+                Consumer<Runnable> submitTaskConsumer,
+                Supplier<Boolean> checkServiceEnabledSupplier,
+                BiConsumer<String, Throwable> errorLogger,
+                Consumer<String> infoLogger,
+                boolean logErrors,
+                boolean logSentData,
+                boolean logResponseStatusText) {
+            this.platform = platform;
+            this.serverUuid = serverUuid;
+            this.serviceId = serviceId;
+            this.enabled = enabled;
+            this.appendPlatformDataConsumer = appendPlatformDataConsumer;
+            this.appendServiceDataConsumer = appendServiceDataConsumer;
+            this.submitTaskConsumer = submitTaskConsumer;
+            this.checkServiceEnabledSupplier = checkServiceEnabledSupplier;
+            this.errorLogger = errorLogger;
+            this.infoLogger = infoLogger;
+            this.logErrors = logErrors;
+            this.logSentData = logSentData;
+            this.logResponseStatusText = logResponseStatusText;
+            checkRelocation();
+            if (enabled) {
+                startSubmitting();
+            }
+        }
+
+        /**
+         * Gzips the given string.
+         *
+         * @param str The string to gzip.
+         * @return The gzipped string.
+         */
+        private static byte[] compress(final String str) throws IOException {
+            if (str == null) {
+                return null;
+            }
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
+                gzip.write(str.getBytes(StandardCharsets.UTF_8));
+            }
+            return outputStream.toByteArray();
+        }
+
+        public void addCustomChart(CustomChart chart) {
+            this.customCharts.add(chart);
+        }
+
+        private void startSubmitting() {
+            final Runnable submitTask =
+                    () -> {
+                        if (!enabled || !checkServiceEnabledSupplier.get()) {
+                            // Submitting data or service is disabled
+                            scheduler.shutdown();
+                            return;
+                        }
+                        if (submitTaskConsumer != null) {
+                            submitTaskConsumer.accept(this::submitData);
+                        } else {
+                            this.submitData();
+                        }
+                    };
+            // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution
+            // of requests on the
+            // bStats backend. To circumvent this problem, we introduce some randomness into the initial
+            // and second delay.
+            // WARNING: You must not modify and part of this Metrics class, including the submit delay or
+            // frequency!
+            // WARNING: Modifying this code will get your plugin banned on bStats. Just don't do it!
+            long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3));
+            long secondDelay = (long) (1000 * 60 * (Math.random() * 30));
+            scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS);
+            scheduler.scheduleAtFixedRate(
+                    submitTask, initialDelay + secondDelay, 1000 * 60 * 30, TimeUnit.MILLISECONDS);
+        }
+
+        private void submitData() {
+            final JsonObjectBuilder baseJsonBuilder = new JsonObjectBuilder();
+            appendPlatformDataConsumer.accept(baseJsonBuilder);
+            final JsonObjectBuilder serviceJsonBuilder = new JsonObjectBuilder();
+            appendServiceDataConsumer.accept(serviceJsonBuilder);
+            JsonObjectBuilder.JsonObject[] chartData =
+                    customCharts.stream()
+                            .map(customChart -> customChart.getRequestJsonObject(errorLogger, logErrors))
+                            .filter(Objects::nonNull)
+                            .toArray(JsonObjectBuilder.JsonObject[]::new);
+            serviceJsonBuilder.appendField("id", serviceId);
+            serviceJsonBuilder.appendField("customCharts", chartData);
+            baseJsonBuilder.appendField("service", serviceJsonBuilder.build());
+            baseJsonBuilder.appendField("serverUUID", serverUuid);
+            baseJsonBuilder.appendField("metricsVersion", METRICS_VERSION);
+            JsonObjectBuilder.JsonObject data = baseJsonBuilder.build();
+            scheduler.execute(
+                    () -> {
+                        try {
+                            // Send the data
+                            sendData(data);
+                        } catch (Exception e) {
+                            // Something went wrong! :(
+                            if (logErrors) {
+                                errorLogger.accept("Could not submit bStats metrics data", e);
+                            }
+                        }
+                    });
+        }
+
+        private void sendData(JsonObjectBuilder.JsonObject data) throws Exception {
+            if (logSentData) {
+                infoLogger.accept("Sent bStats metrics data: " + data.toString());
+            }
+            String url = String.format(REPORT_URL, platform);
+            HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection();
+            // Compress the data to save bandwidth
+            byte[] compressedData = compress(data.toString());
+            connection.setRequestMethod("POST");
+            connection.addRequestProperty("Accept", "application/json");
+            connection.addRequestProperty("Connection", "close");
+            connection.addRequestProperty("Content-Encoding", "gzip");
+            connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
+            connection.setRequestProperty("Content-Type", "application/json");
+            connection.setRequestProperty("User-Agent", "Metrics-Service/1");
+            connection.setDoOutput(true);
+            try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
+                outputStream.write(compressedData);
+            }
+            StringBuilder builder = new StringBuilder();
+            try (BufferedReader bufferedReader =
+                         new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+                String line;
+                while ((line = bufferedReader.readLine()) != null) {
+                    builder.append(line);
+                }
+            }
+            if (logResponseStatusText) {
+                infoLogger.accept("Sent data to bStats and received response: " + builder);
+            }
+        }
+
+        /**
+         * Checks that the class was properly relocated.
+         */
+        private void checkRelocation() {
+            // You can use the property to disable the check in your test environment
+            if (System.getProperty("bstats.relocatecheck") == null
+                    || !System.getProperty("bstats.relocatecheck").equals("false")) {
+                // Maven's Relocate is clever and changes strings, too. So we have to use this little
+                // "trick" ... :D
+                final String defaultPackage =
+                        new String(new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
+                final String examplePackage =
+                        new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
+                // We want to make sure no one just copy & pastes the example and uses the wrong package
+                // names
+                if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage)
+                        || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) {
+                    throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
+                }
+            }
+        }
+    }
+
+    public static class AdvancedBarChart extends CustomChart {
+
+        private final Callable<Map<String, int[]>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId  The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
+            JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
+            Map<String, int[]> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean allSkipped = true;
+            for (Map.Entry<String, int[]> entry : map.entrySet()) {
+                if (entry.getValue().length == 0) {
+                    // Skip this invalid
+                    continue;
+                }
+                allSkipped = false;
+                valuesBuilder.appendField(entry.getKey(), entry.getValue());
+            }
+            if (allSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
+        }
+    }
+
+    public static class SimpleBarChart extends CustomChart {
+
+        private final Callable<Map<String, Integer>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId  The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
+            JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
+            Map<String, Integer> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                valuesBuilder.appendField(entry.getKey(), new int[]{entry.getValue()});
+            }
+            return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
+        }
+    }
+
+    public static class MultiLineChart extends CustomChart {
+
+        private final Callable<Map<String, Integer>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId  The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
+            JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
+            Map<String, Integer> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean allSkipped = true;
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                if (entry.getValue() == 0) {
+                    // Skip this invalid
+                    continue;
+                }
+                allSkipped = false;
+                valuesBuilder.appendField(entry.getKey(), entry.getValue());
+            }
+            if (allSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
+        }
+    }
+
+    public static class AdvancedPie extends CustomChart {
+
+        private final Callable<Map<String, Integer>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId  The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
+            JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
+            Map<String, Integer> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean allSkipped = true;
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                if (entry.getValue() == 0) {
+                    // Skip this invalid
+                    continue;
+                }
+                allSkipped = false;
+                valuesBuilder.appendField(entry.getKey(), entry.getValue());
+            }
+            if (allSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
+        }
+    }
+
+    public abstract static class CustomChart {
+
+        private final String chartId;
+
+        protected CustomChart(String chartId) {
+            if (chartId == null) {
+                throw new IllegalArgumentException("chartId must not be null");
+            }
+            this.chartId = chartId;
+        }
+
+        public JsonObjectBuilder.JsonObject getRequestJsonObject(
+                BiConsumer<String, Throwable> errorLogger, boolean logErrors) {
+            JsonObjectBuilder builder = new JsonObjectBuilder();
+            builder.appendField("chartId", chartId);
+            try {
+                JsonObjectBuilder.JsonObject data = getChartData();
+                if (data == null) {
+                    // If the data is null we don't send the chart.
+                    return null;
+                }
+                builder.appendField("data", data);
+            } catch (Throwable t) {
+                if (logErrors) {
+                    errorLogger.accept("Failed to get data for custom chart with id " + chartId, t);
+                }
+                return null;
+            }
+            return builder.build();
+        }
+
+        protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception;
+    }
+
+    public static class SingleLineChart extends CustomChart {
+
+        private final Callable<Integer> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId  The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public SingleLineChart(String chartId, Callable<Integer> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
+            int value = callable.call();
+            if (value == 0) {
+                // Null = skip the chart
+                return null;
+            }
+            return new JsonObjectBuilder().appendField("value", value).build();
+        }
+    }
+
+    public static class SimplePie extends CustomChart {
+
+        private final Callable<String> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId  The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public SimplePie(String chartId, Callable<String> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
+            String value = callable.call();
+            if (value == null || value.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            return new JsonObjectBuilder().appendField("value", value).build();
+        }
+    }
+
+    public static class DrilldownPie extends CustomChart {
+
+        private final Callable<Map<String, Map<String, Integer>>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId  The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        public JsonObjectBuilder.JsonObject getChartData() throws Exception {
+            JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
+            Map<String, Map<String, Integer>> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean reallyAllSkipped = true;
+            for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
+                JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
+                boolean allSkipped = true;
+                for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
+                    valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
+                    allSkipped = false;
+                }
+                if (!allSkipped) {
+                    reallyAllSkipped = false;
+                    valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
+                }
+            }
+            if (reallyAllSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
+        }
+    }
+
+    /**
+     * An extremely simple JSON builder.
+     *
+     * <p>While this class is neither feature-rich nor the most performant one, it's sufficient enough
+     * for its use-case.
+     */
+    public static class JsonObjectBuilder {
+
+        private StringBuilder builder = new StringBuilder();
+
+        private boolean hasAtLeastOneField = false;
+
+        public JsonObjectBuilder() {
+            builder.append("{");
+        }
+
+        /**
+         * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt.
+         *
+         * <p>This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'.
+         * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n").
+         *
+         * @param value The value to escape.
+         * @return The escaped value.
+         */
+        private static String escape(String value) {
+            final StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < value.length(); i++) {
+                char c = value.charAt(i);
+                if (c == '"') {
+                    builder.append("\\\"");
+                } else if (c == '\\') {
+                    builder.append("\\\\");
+                } else if (c <= '\u000F') {
+                    builder.append("\\u000").append(Integer.toHexString(c));
+                } else if (c <= '\u001F') {
+                    builder.append("\\u00").append(Integer.toHexString(c));
+                } else {
+                    builder.append(c);
+                }
+            }
+            return builder.toString();
+        }
+
+        /**
+         * Appends a null field to the JSON.
+         *
+         * @param key The key of the field.
+         * @return A reference to this object.
+         */
+        public JsonObjectBuilder appendNull(String key) {
+            appendFieldUnescaped(key, "null");
+            return this;
+        }
+
+        /**
+         * Appends a string field to the JSON.
+         *
+         * @param key   The key of the field.
+         * @param value The value of the field.
+         * @return A reference to this object.
+         */
+        public JsonObjectBuilder appendField(String key, String value) {
+            if (value == null) {
+                throw new IllegalArgumentException("JSON value must not be null");
+            }
+            appendFieldUnescaped(key, "\"" + escape(value) + "\"");
+            return this;
+        }
+
+        /**
+         * Appends an integer field to the JSON.
+         *
+         * @param key   The key of the field.
+         * @param value The value of the field.
+         * @return A reference to this object.
+         */
+        public JsonObjectBuilder appendField(String key, int value) {
+            appendFieldUnescaped(key, String.valueOf(value));
+            return this;
+        }
+
+        /**
+         * Appends an object to the JSON.
+         *
+         * @param key    The key of the field.
+         * @param object The object.
+         * @return A reference to this object.
+         */
+        public JsonObjectBuilder appendField(String key, JsonObject object) {
+            if (object == null) {
+                throw new IllegalArgumentException("JSON object must not be null");
+            }
+            appendFieldUnescaped(key, object.toString());
+            return this;
+        }
+
+        /**
+         * Appends a string array to the JSON.
+         *
+         * @param key    The key of the field.
+         * @param values The string array.
+         * @return A reference to this object.
+         */
+        public JsonObjectBuilder appendField(String key, String[] values) {
+            if (values == null) {
+                throw new IllegalArgumentException("JSON values must not be null");
+            }
+            String escapedValues =
+                    Arrays.stream(values)
+                            .map(value -> "\"" + escape(value) + "\"")
+                            .collect(Collectors.joining(","));
+            appendFieldUnescaped(key, "[" + escapedValues + "]");
+            return this;
+        }
+
+        /**
+         * Appends an integer array to the JSON.
+         *
+         * @param key    The key of the field.
+         * @param values The integer array.
+         * @return A reference to this object.
+         */
+        public JsonObjectBuilder appendField(String key, int[] values) {
+            if (values == null) {
+                throw new IllegalArgumentException("JSON values must not be null");
+            }
+            String escapedValues =
+                    Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(","));
+            appendFieldUnescaped(key, "[" + escapedValues + "]");
+            return this;
+        }
+
+        /**
+         * Appends an object array to the JSON.
+         *
+         * @param key    The key of the field.
+         * @param values The integer array.
+         * @return A reference to this object.
+         */
+        public JsonObjectBuilder appendField(String key, JsonObject[] values) {
+            if (values == null) {
+                throw new IllegalArgumentException("JSON values must not be null");
+            }
+            String escapedValues =
+                    Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(","));
+            appendFieldUnescaped(key, "[" + escapedValues + "]");
+            return this;
+        }
+
+        /**
+         * Appends a field to the object.
+         *
+         * @param key          The key of the field.
+         * @param escapedValue The escaped value of the field.
+         */
+        private void appendFieldUnescaped(String key, String escapedValue) {
+            if (builder == null) {
+                throw new IllegalStateException("JSON has already been built");
+            }
+            if (key == null) {
+                throw new IllegalArgumentException("JSON key must not be null");
+            }
+            if (hasAtLeastOneField) {
+                builder.append(",");
+            }
+            builder.append("\"").append(escape(key)).append("\":").append(escapedValue);
+            hasAtLeastOneField = true;
+        }
+
+        /**
+         * Builds the JSON string and invalidates this builder.
+         *
+         * @return The built JSON string.
+         */
+        public JsonObject build() {
+            if (builder == null) {
+                throw new IllegalStateException("JSON has already been built");
+            }
+            JsonObject object = new JsonObject(builder.append("}").toString());
+            builder = null;
+            return object;
+        }
+
+        /**
+         * A super simple representation of a JSON object.
+         *
+         * <p>This class only exists to make methods of the {@link JsonObjectBuilder} type-safe and not
+         * allow a raw string inputs for methods like {@link JsonObjectBuilder#appendField(String,
+         * JsonObject)}.
+         */
+        public static class JsonObject {
+
+            private final String value;
+
+            private JsonObject(String value) {
+                this.value = value;
+            }
+
+            @Override
+            public String toString() {
+                return value;
+            }
+        }
+    }
+}
@@ -1,109 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.enums;
-
-import io.github.retrooper.packetevents.PacketEvents;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum ClientVersion {
-    LESS_THAN_V_1_7_10, v_1_7_10, v_1_8, v_1_9, v_1_9_1, v_1_9_2, v_1_9_3, v_1_10, v_1_11, v_1_11_1, v_1_12, v_1_12_1, v_1_12_2,
-    v_1_13, v_1_13_1, v_1_13_2, v_1_14, v_1_14_1, v_1_14_2, v_1_14_3, v_1_14_4, v_1_15_PRE_1, v_1_15_PRE_2, v_1_15_PRE_3, v_1_15_PRE_4, v_1_15_PRE_5, v_1_15_PRE_6, v_1_15_PRE_7,
-    v_1_15, v_1_15_1, v_1_15_2, v_1_16, v_1_16_PRE_1, v_1_16_PRE_2, v_1_16_PRE_3, v_1_16_PRE_4, v_1_16_PRE_5, v_1_16_PRE_6, v_1_16_PRE_7, v_1_16_PRE_8, v_1_16_RC_1, v_1_16_1, v_1_16_2, HIGHER_THAN_V_1_16_2, INVALID, ACCESS_FAILURE;
-
-    private static final Map<Integer, ClientVersion> VERSION_LOOKUP = new HashMap<Integer, ClientVersion>();
-
-    public static void prepareLookUp() {
-        VERSION_LOOKUP.put(-1, ACCESS_FAILURE);
-        VERSION_LOOKUP.put(1, LESS_THAN_V_1_7_10);
-        VERSION_LOOKUP.put(2, LESS_THAN_V_1_7_10);
-        VERSION_LOOKUP.put(3, LESS_THAN_V_1_7_10);
-        VERSION_LOOKUP.put(4, LESS_THAN_V_1_7_10);
-        VERSION_LOOKUP.put(5, v_1_7_10);
-        VERSION_LOOKUP.put(47, v_1_8);
-        VERSION_LOOKUP.put(107, v_1_9);
-        VERSION_LOOKUP.put(108, v_1_9_1);
-        VERSION_LOOKUP.put(109, v_1_9_2);
-        VERSION_LOOKUP.put(110, v_1_9_3);
-        VERSION_LOOKUP.put(210, v_1_10);
-        VERSION_LOOKUP.put(315, v_1_11);
-        VERSION_LOOKUP.put(316, v_1_11_1);
-        VERSION_LOOKUP.put(335, v_1_12);
-        VERSION_LOOKUP.put(338, v_1_12_1);
-        VERSION_LOOKUP.put(340, v_1_12_2);
-        VERSION_LOOKUP.put(393, v_1_13);
-        VERSION_LOOKUP.put(401, v_1_13_1);
-        VERSION_LOOKUP.put(404, v_1_13_2);
-        VERSION_LOOKUP.put(477, v_1_14);
-        VERSION_LOOKUP.put(480, v_1_14_1);
-        VERSION_LOOKUP.put(485, v_1_14_2);
-        VERSION_LOOKUP.put(490, v_1_14_3);
-        VERSION_LOOKUP.put(498, v_1_14_4);
-        VERSION_LOOKUP.put(565, v_1_15_PRE_1);
-        VERSION_LOOKUP.put(566, v_1_15_PRE_2);
-        VERSION_LOOKUP.put(567, v_1_15_PRE_3);
-        VERSION_LOOKUP.put(569, v_1_15_PRE_4);
-        VERSION_LOOKUP.put(570, v_1_15_PRE_5);
-        VERSION_LOOKUP.put(571, v_1_15_PRE_6);
-        VERSION_LOOKUP.put(572, v_1_15_PRE_7);
-        VERSION_LOOKUP.put(573, v_1_15);
-        VERSION_LOOKUP.put(575, v_1_15_1);
-        VERSION_LOOKUP.put(578, v_1_15_2);
-        VERSION_LOOKUP.put(721, v_1_16_PRE_1);
-        VERSION_LOOKUP.put(722, v_1_16_PRE_2);
-        VERSION_LOOKUP.put(725, v_1_16_PRE_3);
-        VERSION_LOOKUP.put(727, v_1_16_PRE_4);
-        VERSION_LOOKUP.put(729, v_1_16_PRE_5);
-        VERSION_LOOKUP.put(730, v_1_16_PRE_6);
-        VERSION_LOOKUP.put(732, v_1_16_PRE_7);
-        VERSION_LOOKUP.put(733, v_1_16_PRE_8);
-        VERSION_LOOKUP.put(734, v_1_16_RC_1);
-        VERSION_LOOKUP.put(735, v_1_16);
-        VERSION_LOOKUP.put(736, v_1_16_1);
-        VERSION_LOOKUP.put(737, v_1_16_2);
-    }
-
-    public static ClientVersion fromProtocolVersion(short protocolVersion) {
-        if (protocolVersion == -1 && PacketEvents.getSettings().doAutoResolveClientProtocolVersion()) {
-            protocolVersion = ServerVersion.getVersion().toProtocolVersion();
-        }
-        final ClientVersion lookedUp = VERSION_LOOKUP.get(protocolVersion);
-        if (lookedUp != null) {
-            return lookedUp;
-        }
-        return protocolVersion > 737 ? HIGHER_THAN_V_1_16_2 : INVALID;
-    }
-
-    /**
-     * Returns if the client's version is more up to date than the argument passed version
-     *
-     * @param version The version to compare to the client's value.
-     * @return True if the supplied version is lower, false if it is equal or higher than the client's version.
-     */
-    public boolean isHigherThan(final ClientVersion version) {
-        if (this == version) return false;
-        return !isLowerThan(version);
-    }
-
-    /**
-     * Returns if the client's version is more outdated than the argument passed version
-     *
-     * @param version The version to compare to the client's value.
-     * @return True if the supplied version is higher, false if it is equal or lower than the client's version.
-     */
-    public boolean isLowerThan(final ClientVersion version) {
-        if (this == version) return false;
-        final int len = ClientVersion.values().length;
-        for (byte i = 0; i < len; i++) {
-            final ClientVersion v = ClientVersion.values()[i];
-            if (v == this) {
-                return true;
-            } else if (v == version) {
-                return false;
-            }
-        }
-        return false;
-    }
-}
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.enums;
-
-public enum Direction {
-    DOWN, UP, NORTH, SOUTH, WEST, EAST, NORTH_EAST,
-    NORTH_WEST, SOUTH_EAST,
-    SOUTH_WEST, WEST_NORTH_WEST,
-    NORTH_NORTH_WEST, NORTH_NORTH_EAST,
-    EAST_NORTH_EAST, EAST_SOUTH_EAST,
-    SOUTH_SOUTH_EAST, SOUTH_SOUTH_WEST,
-    WEST_SOUTH_WEST, SELF, NULL;
-
-    public static Direction get(final int i) {
-        return values()[i];
-    }
-}
@@ -1,8 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.enums;
-
-public enum EventSynchronization {
-    NORMAL, FORCE_SYNC, FORCE_ASYNC
-}
@@ -1,178 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.enums;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import org.bukkit.Bukkit;
-
-/**
- * @author retrooper
- */
-public enum ServerVersion {
-
-    v_1_7_10, v_1_8, v_1_8_3, v_1_8_4, v_1_8_5, v_1_8_6, v_1_8_7, v_1_8_8,
-    v_1_9, v_1_9_2, v_1_9_4, v_1_10, v_1_10_2, v_1_11, v_1_11_1, v_1_11_2,
-    v_1_12, v_1_12_1, v_1_12_2, v_1_13, v_1_13_1, v_1_13_2, v_1_14, v_1_14_1,
-    v_1_14_2, v_1_14_3, v_1_14_4, v_1_15, v_1_15_1, v_1_15_2, v_1_16, v_1_16_1,
-    v_1_16_2, ERROR, EMPTY;
-
-    private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
-    public static ServerVersion[] reversedValues;
-    private static ServerVersion cachedVersion;
-
-    public static void load() {
-        reversedValues = ServerVersion.reverse(values());
-    }
-
-    private static ServerVersion getVersionNoCache() {
-        for (final ServerVersion val : reversedValues) {
-            String valName = val.name().substring(2).replace("_", ".");
-            if (Bukkit.getBukkitVersion().contains(valName)) {
-                return val;
-            } else if (PacketEvents.getSettings().getDefaultServerVersion() != null) {
-                return PacketEvents.getSettings().getDefaultServerVersion();
-            }
-        }
-        return ERROR;
-    }
-
-    public static ServerVersion getVersion() {
-        if (cachedVersion == null) {
-            cachedVersion = getVersionNoCache();
-        }
-        return cachedVersion;
-    }
-
-
-    public static ServerVersion[] reverse(final ServerVersion[] arr) {
-        ServerVersion[] array = arr.clone();
-        if (array == null) {
-            return null;
-        }
-        int i = 0;
-        int j = array.length - 1;
-        ServerVersion tmp;
-        while (j > i) {
-            tmp = array[j];
-            array[j] = array[i];
-            array[i] = tmp;
-            j--;
-            i++;
-        }
-        return array;
-    }
-
-    public static String getNmsSuffix() {
-        return nmsVersionSuffix;
-    }
-
-    public static String getNMSDirectory() {
-        return "net.minecraft.server." + getNmsSuffix();
-    }
-
-    public static String getOBCDirectory() {
-        return "org.bukkit.craftbukkit." + getNmsSuffix();
-    }
-
-    /**
-     * Returns if the current version is more up to date than the argument passed version
-     *
-     * @param version The version to compare to the server's value.
-     * @return True if the supplied version is lower, false if it is equal or higher than the server's version.
-     */
-    public boolean isHigherThan(final ServerVersion version) {
-        if (this == version) return false;
-        return !isLowerThan(version);
-    }
-
-    /**
-     * Returns if the current version is more outdated than the argument passed version
-     *
-     * @param version The version to compare to the server's value.
-     * @return True if the supplied version is higher, false if it is equal or lower than the server's version.
-     */
-    public boolean isLowerThan(final ServerVersion version) {
-        if (this == version) return false;
-        final int len = ServerVersion.values().length;
-        for (byte i = 0; i < len; i++) {
-            final ServerVersion v = ServerVersion.values()[i];
-            if (v == this) {
-                return true;
-            } else if (v == version) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Converts the server version to a protocol version.
-     * Recommended to cache.
-     * @return protocol version
-     */
-    public short toProtocolVersion() {
-        switch (this) {
-            case v_1_7_10:
-                return 5;
-            case v_1_8:
-            case v_1_8_3:
-            case v_1_8_4:
-            case v_1_8_5:
-            case v_1_8_6:
-            case v_1_8_7:
-            case v_1_8_8:
-                return 47;
-            case v_1_9:
-                return 107;
-            case v_1_9_2:
-                return 109;
-            case v_1_9_4:
-                return 110;
-            case v_1_10:
-            case v_1_10_2:
-                return 210;
-            case v_1_11:
-                return 315;
-            case v_1_11_1:
-            case v_1_11_2:
-                return 316;
-            case v_1_12:
-                return 335;
-            case v_1_12_1:
-                return 338;
-            case v_1_12_2:
-                return 340;
-            case v_1_13:
-                return 393;
-            case v_1_13_1:
-                return 401;
-            case v_1_13_2:
-                return 404;
-            case v_1_14:
-                return 477;
-            case v_1_14_1:
-                return 480;
-            case v_1_14_2:
-                return 485;
-            case v_1_14_3:
-                return 490;
-            case v_1_14_4:
-                return 498;
-            case v_1_15:
-                return 573;
-            case v_1_15_1:
-                return 575;
-            case v_1_15_2:
-                return 578;
-            case v_1_16:
-                return 735;
-            case v_1_16_1:
-                return 736;
-            case v_1_16_2:
-                return 751;
-            default:
-                return -1;
-        }
-    }
-}
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.enums;
-
-public enum SystemOS {
-    WINDOWS, MACOS, LINUX, OTHER;
-
-    private static SystemOS value;
-
-    private static SystemOS getOS() {
-        final String os = System.getProperty("os.name");
-        for (final String osName : getOperatingSystemNames()) {
-            if (os.toLowerCase().contains(osName.toLowerCase())) {
-                return SystemOS.valueOf(osName);
-            }
-        }
-        return OTHER;
-    }
-
-    public static SystemOS getOperatingSystem() {
-        if (value == null) {
-            value = getOS();
-        }
-        return value;
-    }
-
-    public static String[] getOperatingSystemNames() {
-        final String[] arr = new String[values().length - 1];
-        for (int i = 0; i < values().length - 1; i++) {
-            arr[i] = values()[i].name();
-        }
-        return arr;
-    }
-}
@@ -1,27 +1,59 @@
-/**
- * Copyright (c) 2020 retrooper
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event;


-import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.event.eventtypes.CallableEvent;

-public abstract class PacketEvent {
-    public static ServerVersion version;
+/**
+ * An event in both of PacketEvents' event systems.
+ *
+ * @author retrooper
+ * @since 1.2.6
+ */
+public abstract class PacketEvent implements CallableEvent {
    private long timestamp = System.currentTimeMillis();

    /**
-     * Timestamp of the packet
+     * Timestamp of when the PacketEvent was created.
+     * Basically timestamp of the packet.
     *
-     * @return timestamp in milliseconds
+     * @return Packet timestamp in milliseconds.
     */
    public long getTimestamp() {
        return timestamp;
    }

-    public void setTimestamp(long timestamp) {
+    /**
+     * Setter for the timestamp.
+     *
+     * @param timestamp Packet timestamp in milliseconds.
+     */
+    public void setTimestamp(final long timestamp) {
        this.timestamp = timestamp;
    }

-    public abstract boolean isAsyncByDefault();
-}
+    public void callPacketEventExternal(final PacketListenerAbstract listener) {
+        listener.onPacketEventExternal(this);
+    }
+
+    public boolean isInbuilt() {
+        return false;
+    }
+}
@@ -1,7 +1,32 @@
-/**
- * Copyright (c) 2020 retrooper
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event;

+/**
+ * The legacy Packet listener.
+ * Implement this interface in your listener if you are using the legacy event system.
+ *
+ * @author retrooper
+ * @see PacketListenerAbstract
+ * @since 1.2.6
+ * @deprecated There is a new and better listener for the new event system.
+ */
+@Deprecated
 public interface PacketListener {
 }
@@ -0,0 +1,201 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event;
+
+import io.github.retrooper.packetevents.event.impl.*;
+import io.github.retrooper.packetevents.event.priority.PacketEventPriority;
+import io.github.retrooper.packetevents.utils.immutableset.ImmutableSetCustom;
+
+/**
+ * Abstract packet listener.
+ *
+ * @author retrooper
+ * @since 1.8
+ */
+public abstract class PacketListenerAbstract {
+    private final PacketListenerPriority priority;
+    public ImmutableSetCustom<Byte> serverSidedStatusAllowance;
+    public ImmutableSetCustom<Byte> serverSidedLoginAllowance;
+    public ImmutableSetCustom<Byte> serverSidedPlayAllowance;
+
+    public ImmutableSetCustom<Byte> clientSidedStatusAllowance;
+    public ImmutableSetCustom<Byte> clientSidedHandshakeAllowance;
+    public ImmutableSetCustom<Byte> clientSidedLoginAllowance;
+    public ImmutableSetCustom<Byte> clientSidedPlayAllowance;
+
+    @Deprecated
+    public PacketListenerAbstract(final PacketEventPriority priority) {
+        this(PacketListenerPriority.getById(priority.getPriorityValue()));
+    }
+
+    public PacketListenerAbstract(PacketListenerPriority priority) {
+        this.priority = priority;
+        this.serverSidedStatusAllowance = null;
+        this.serverSidedLoginAllowance = null;
+        this.serverSidedPlayAllowance = null;
+
+        this.clientSidedStatusAllowance = null;
+        this.clientSidedHandshakeAllowance = null;
+        this.clientSidedLoginAllowance = null;
+        this.clientSidedPlayAllowance = null;
+    }
+
+
+    public PacketListenerAbstract() {
+        this(PacketListenerPriority.NORMAL);
+    }
+
+    public PacketListenerPriority getPriority() {
+        return priority;
+    }
+
+    public void onPacketStatusReceive(PacketStatusReceiveEvent event) {
+    }
+
+    public void onPacketStatusSend(PacketStatusSendEvent event) {
+    }
+
+    public void onPacketHandshakeReceive(PacketHandshakeReceiveEvent event) {
+    }
+
+    public void onPacketLoginReceive(PacketLoginReceiveEvent event) {
+    }
+
+    public void onPacketLoginSend(PacketLoginSendEvent event) {
+    }
+
+    public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
+    }
+
+    public void onPacketPlaySend(PacketPlaySendEvent event) {
+    }
+
+    public void onPostPacketPlayReceive(PostPacketPlayReceiveEvent event) {
+    }
+
+    public void onPostPacketPlaySend(PostPacketPlaySendEvent event) {
+    }
+
+    public void onPostPlayerInject(PostPlayerInjectEvent event) {
+    }
+
+    public void onPlayerInject(PlayerInjectEvent event) {
+    }
+
+    public void onPlayerEject(PlayerEjectEvent event) {
+    }
+
+    public void onPacketEventExternal(PacketEvent event) {
+    }
+
+    public final void addServerSidedStatusFilter(Byte... statusPacketIDs) {
+        if (this.serverSidedStatusAllowance == null) {
+            this.serverSidedStatusAllowance = new ImmutableSetCustom<>(statusPacketIDs);
+        } else {
+            this.serverSidedStatusAllowance.addAll(statusPacketIDs);
+        }
+    }
+
+    public final void addServerSidedLoginFilter(Byte... loginPacketIDs) {
+        if (this.serverSidedLoginAllowance == null) {
+            this.serverSidedLoginAllowance = new ImmutableSetCustom<>(loginPacketIDs);
+        } else {
+            this.serverSidedLoginAllowance.addAll(loginPacketIDs);
+        }
+    }
+
+    public final void addServerSidedPlayFilter(Byte... playPacketIDs) {
+        if (this.serverSidedPlayAllowance == null) {
+            this.serverSidedPlayAllowance = new ImmutableSetCustom<>(playPacketIDs);
+        } else {
+            this.serverSidedPlayAllowance.addAll(playPacketIDs);
+        }
+    }
+
+    public final void addClientSidedStatusFilter(Byte... statusPacketIDs) {
+        if (this.clientSidedStatusAllowance == null) {
+            this.clientSidedStatusAllowance = new ImmutableSetCustom<>(statusPacketIDs);
+        } else {
+            this.clientSidedStatusAllowance.addAll(statusPacketIDs);
+        }
+    }
+
+    public final void addClientSidedHandshakeFilter(Byte... handshakePacketIDs) {
+        if (this.clientSidedHandshakeAllowance == null) {
+            this.clientSidedHandshakeAllowance = new ImmutableSetCustom<>(handshakePacketIDs);
+        } else {
+            this.clientSidedHandshakeAllowance.addAll(handshakePacketIDs);
+        }
+    }
+
+    public final void addClientSidedLoginFilter(Byte... loginPacketIDs) {
+        if (this.clientSidedLoginAllowance == null) {
+            this.clientSidedLoginAllowance = new ImmutableSetCustom<>(loginPacketIDs);
+        } else {
+            this.clientSidedLoginAllowance.addAll(loginPacketIDs);
+        }
+    }
+
+    public final void addClientSidedPlayFilter(Byte... playPacketIDs) {
+        if (this.clientSidedPlayAllowance == null) {
+            this.clientSidedPlayAllowance = new ImmutableSetCustom<>(playPacketIDs);
+        } else {
+            this.clientSidedPlayAllowance.addAll(playPacketIDs);
+        }
+    }
+
+    public final void filterAll() {
+        filterServerSidedStatus();
+        filterServerSidedLogin();
+        filterServerSidedPlay();
+
+        filterClientSidedStatus();
+        filterClientSidedHandshake();
+        filterClientSidedLogin();
+        filterClientSidedPlay();
+    }
+
+    public final void filterServerSidedStatus() {
+        this.serverSidedStatusAllowance = new ImmutableSetCustom<>();
+    }
+
+    public final void filterServerSidedLogin() {
+        this.serverSidedLoginAllowance = new ImmutableSetCustom<>();
+    }
+
+    public final void filterServerSidedPlay() {
+        this.serverSidedPlayAllowance = new ImmutableSetCustom<>();
+    }
+
+    public final void filterClientSidedStatus() {
+        this.clientSidedStatusAllowance = new ImmutableSetCustom<>();
+    }
+
+    public final void filterClientSidedHandshake() {
+        this.clientSidedHandshakeAllowance = new ImmutableSetCustom<>();
+    }
+
+    public final void filterClientSidedLogin() {
+        this.clientSidedLoginAllowance = new ImmutableSetCustom<>();
+    }
+
+    public final void filterClientSidedPlay() {
+        this.clientSidedPlayAllowance = new ImmutableSetCustom<>();
+    }
+}
@@ -0,0 +1,45 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event;
+
+import io.github.retrooper.packetevents.event.priority.PacketEventPriority;
+
+/**
+ * Deprecated abstract PacketListener.
+ * Please use {@link PacketListenerAbstract}, but this class will still work for a bit.
+ *
+ * @author retrooper
+ * @since 1.7.7
+ */
+@Deprecated
+public abstract class PacketListenerDynamic extends PacketListenerAbstract {
+    @Deprecated
+    public PacketListenerDynamic(final PacketEventPriority priority) {
+        super(priority);
+    }
+
+    public PacketListenerDynamic(PacketListenerPriority priority) {
+        super(priority);
+    }
+
+
+    public PacketListenerDynamic() {
+        super(PacketListenerPriority.NORMAL);
+    }
+}
@@ -0,0 +1,72 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event;
+
+/**
+ * The priority of packet listeners affect the order they will be invoked in.
+ * The lowest priority listeners are invoked first, the most high ones are invoked last.
+ * The most high priority listener has the final decider on an event being cancelled.
+ * This priority can be specified in the PacketListenerAbstract constructor.
+ * If you don't specify a priority in the constructor, it will use the {@link #NORMAL} priority.
+ *
+ * @author retrooper
+ * @since 1.8
+ */
+public enum PacketListenerPriority {
+    /**
+     * Listener is of very low importance.
+     * This listener will be ran first.
+     */
+    LOWEST,
+
+    /**
+     * Listener is of low importance.
+     */
+    LOW,
+
+    /**
+     * Default listener priority.
+     * Listener is neither important nor unimportant and may run normally.
+     */
+    NORMAL,
+
+    /**
+     * Listener is of high importance.
+     */
+    HIGH,
+
+    /**
+     * Listener is of critical importance and wants to decide the cancellation of an event.
+     */
+    HIGHEST,
+
+    /**
+     * Listener is purely trying to decide the cancellation of an event.
+     * This listener should be ran last.
+     */
+    MONITOR;
+
+    public static PacketListenerPriority getById(byte id) {
+        return values()[id];
+    }
+
+    public byte getId() {
+        return (byte) ordinal();
+    }
+}
@@ -0,0 +1,39 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.annotation;
+
+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,38 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.eventtypes;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
+
+/**
+ * The {@link PacketEvent} implements this interface.
+ * Every inbuilt event should implement the {@link #call(PacketListenerAbstract)} 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.
+ * including custom events.
+ *
+ * @author retrooper
+ * @see PacketPlayReceiveEvent
+ * @since 1.8
+ */
+public interface CallableEvent {
+    void call(PacketListenerAbstract listener);
+}
@@ -0,0 +1,51 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.eventtypes;
+
+import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
+
+/**
+ * Every event that supports cancellation should implement this interface.
+ * PacketEvents' event system lets the highest priority listener be have the highest priority
+ * 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}
+ * will prevent minecraft from processing the incoming packet.
+ *
+ * @author retrooper
+ * @see PacketPlayReceiveEvent
+ * @since 1.7
+ */
+public interface CancellableEvent {
+
+    /**
+     * This method returns if the event will be cancelled.
+     *
+     * @return Will the event be cancelled.
+     */
+    boolean isCancelled();
+
+    /**
+     * Cancel or proceed with the event.
+     *
+     * @param val Is the event cancelled
+     */
+    void setCancelled(boolean val);
+}
@@ -0,0 +1,41 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.eventtypes;
+
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+
+import java.net.InetSocketAddress;
+
+public abstract class CancellableNMSPacketEvent extends NMSPacketEvent implements CancellableEvent {
+    private boolean cancelled;
+
+    public CancellableNMSPacketEvent(Object channel, NMSPacket packet) {
+        super(channel, packet);
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean value) {
+        cancelled = value;
+    }
+}
@@ -0,0 +1,114 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.eventtypes;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import io.github.retrooper.packetevents.utils.netty.channel.ChannelUtils;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+
+import java.net.InetSocketAddress;
+
+/**
+ * The {@code NMSPacketEvent} abstract class represents an event that has to do with an actual packet.
+ * Don't mix this up with {@link io.github.retrooper.packetevents.event.PacketEvent}.
+ * The PacketEvent class represents an event that belongs to PacketEvent's packet system.
+ *
+ * @author retrooper
+ * @since 1.8
+ */
+public abstract class NMSPacketEvent extends PacketEvent implements CallableEvent {
+    private final Object channel;
+    private final InetSocketAddress socketAddress;
+    private final byte packetID;
+    protected NMSPacket packet;
+
+    public NMSPacketEvent(Object channel, NMSPacket packet) {
+        this.channel = channel;
+        this.socketAddress = ChannelUtils.getSocketAddress(channel);
+        this.packet = packet;
+        packetID = PacketType.packetIDMap.getOrDefault(packet.getRawNMSPacket().getClass(), PacketType.INVALID);
+    }
+
+    /**
+     * Get the associated player's socket address.
+     *
+     * @return Socket address of the associated player.
+     */
+    public final InetSocketAddress getSocketAddress() {
+        return socketAddress;
+    }
+
+    /**
+     * Get the associated player's netty channel.
+     * @return Netty channel
+     */
+    public Object getChannel() {
+        return channel;
+    }
+
+    /**
+     * This method returns the NMS name of the packet.
+     * To get the name of the packet we get the class of the packet and then the simple name of the class.
+     * See also: {@link Class#getSimpleName()}
+     * We cache the name after the first call to improve performance.
+     * It is not recommended to call this method unless you NEED it.
+     * If you are comparing packet types, use the {@link PacketType} byte system.
+     * You would only need the packet name if packet type system doesn't contain your desired packet yet.
+     *
+     * @return Name of the packet.
+     */
+    @Deprecated
+    public final String getPacketName() {
+        return ClassUtil.getClassSimpleName(packet.getRawNMSPacket().getClass());
+    }
+
+    /**
+     * Get the NMS packet.
+     *
+     * @return Get NMS packet.
+     */
+    public final NMSPacket getNMSPacket() {
+        return packet;
+    }
+
+    /**
+     * Update the NMS Packet.
+     *
+     * @param packet NMS Object
+     */
+    public final void setNMSPacket(NMSPacket packet) {
+        this.packet = packet;
+    }
+
+    /**
+     * Get the Packet ID.
+     *
+     * @return Packet ID.
+     */
+    public byte getPacketId() {
+        return packetID;
+    }
+
+    @Override
+    public boolean isInbuilt() {
+        return true;
+    }
+}
@@ -0,0 +1,38 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.eventtypes;
+
+import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
+import org.bukkit.entity.Player;
+
+/**
+ * Every event that has an associated player is recommended to implement this interface.
+ *
+ * @author retrooper
+ * @see PacketPlayReceiveEvent
+ * @since 1.6.9
+ */
+public interface PlayerEvent {
+    /**
+     * Associated player.
+     *
+     * @return Player.
+     */
+    Player getPlayer();
+}
@@ -0,0 +1,37 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.eventtypes;
+
+import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
+import org.jetbrains.annotations.NotNull;
+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();
+
+    @Nullable Runnable getPostTask();
+
+    void setPostTask(@NotNull Runnable postTask);
+}
@@ -1,56 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.event.PacketEvent;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerMoveEvent;
-
-public final class BukkitMoveEvent extends PacketEvent {
-    private final Player player;
-    private final Location to, from;
-    private boolean cancelled;
-
-    public BukkitMoveEvent(final Player player, final Location to, final Location from) {
-        this.player = player;
-        this.to = to;
-        this.from = from;
-    }
-
-    public BukkitMoveEvent(final PlayerMoveEvent e) {
-        this.player = e.getPlayer();
-        this.to = e.getTo();
-        this.from = e.getFrom();
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-    public Location getFrom() {
-        return from;
-    }
-
-    public Location getTo() {
-        return to;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(final boolean val) {
-        this.cancelled = val;
-    }
-
-    public void cancel() {
-        setCancelled(true);
-    }
-
-    @Override
-    public boolean isAsyncByDefault() {
-        return false;
-    }
-}
@@ -0,0 +1,48 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableNMSPacketEvent;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+
+import java.net.InetSocketAddress;
+
+/**
+ * The {@code PacketHandshakeReceiveEvent} event is fired whenever the a HANDSHAKE packet is received from a client.
+ * The {@code PacketHandshakeReceiveEvent} has no Bukkit player, the player object is null in this state.
+ * Use the {@link #getSocketAddress()} to identify who sends the packet.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol#Handshaking">https://wiki.vg/Protocol#Handshaking</a>
+ * @since 1.8
+ */
+public class PacketHandshakeReceiveEvent extends CancellableNMSPacketEvent {
+    public PacketHandshakeReceiveEvent(Object channel, NMSPacket packet) {
+        super(channel, packet);
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        if (listener.clientSidedLoginAllowance == null || listener.clientSidedLoginAllowance.contains(getPacketId())) {
+            listener.onPacketHandshakeReceive(this);
+        }
+    }
+}
+
@@ -0,0 +1,47 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableNMSPacketEvent;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+
+import java.net.InetSocketAddress;
+
+/**
+ * The {@code PacketLoginReceiveEvent} event is fired whenever the a LOGIN packet is received from a client.
+ * The {@code PacketLoginReceiveEvent} has no Bukkit player, the player object is null in this state.
+ * Use the {@link #getSocketAddress()} to identify who sends the packet.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol#Login">https://wiki.vg/Protocol#Login</a>
+ * @since 1.8
+ */
+public class PacketLoginReceiveEvent extends CancellableNMSPacketEvent {
+    public PacketLoginReceiveEvent(Object channel, NMSPacket packet) {
+        super(channel, packet);
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        if (listener.clientSidedLoginAllowance == null || listener.clientSidedLoginAllowance.contains(getPacketId())) {
+            listener.onPacketLoginReceive(this);
+        }
+    }
+}
@@ -0,0 +1,65 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableNMSPacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PostTaskEvent;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import org.jetbrains.annotations.NotNull;
+
+import java.net.InetSocketAddress;
+
+/**
+ * The {@code PacketLoginSendEvent} event is fired whenever the a LOGIN packet is being planned to be sent to the client.
+ * The {@code PacketLoginSendEvent} has no Bukkit player, the player object is null in this state.
+ * Use the {@link #getSocketAddress()} to identify who sends the packet.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol#Login">https://wiki.vg/Protocol#Login</a>
+ * @since 1.8
+ */
+public class PacketLoginSendEvent extends CancellableNMSPacketEvent implements PostTaskEvent {
+    private Runnable postTask;
+    public PacketLoginSendEvent(Object channel, NMSPacket packet) {
+        super(channel, packet);
+    }
+
+    @Override
+    public boolean isPostTaskAvailable() {
+        return postTask != null;
+    }
+
+    @Override
+    public Runnable getPostTask() {
+        return postTask;
+    }
+
+    @Override
+    public void setPostTask(@NotNull Runnable postTask) {
+        this.postTask = postTask;
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        if (listener.serverSidedLoginAllowance == null || listener.serverSidedLoginAllowance.contains(getPacketId())) {
+            listener.onPacketLoginSend(this);
+        }
+    }
+}
@@ -0,0 +1,64 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableNMSPacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * The {@code PacketPlayReceiveEvent} event is fired whenever the a PLAY packet is
+ * received from any connected client.
+ * Cancelling this event will result in preventing minecraft from processing the incoming packet.
+ * It would be as if the player never sent the packet from the server's view.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol#Play">https://wiki.vg/Protocol#Play</a>
+ * @since 1.2.6
+ */
+public final class PacketPlayReceiveEvent extends CancellableNMSPacketEvent implements PlayerEvent {
+    private final Player player;
+
+    public PacketPlayReceiveEvent(Player player, Object channel, NMSPacket packet) {
+        super(channel, packet);
+        this.player = player;
+    }
+
+    /**
+     * This method returns the bukkit player object of the packet sender.
+     * The player object might be null during early packets.
+     *
+     * @return Packet sender.
+     */
+    @NotNull
+    @Override
+    public Player getPlayer() {
+        return player;
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        if (listener.clientSidedPlayAllowance == null || listener.clientSidedPlayAllowance.contains(getPacketId())) {
+            listener.onPacketPlayReceive(this);
+        }
+    }
+}
@@ -0,0 +1,82 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableNMSPacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PostTaskEvent;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The {@code PacketPlaySendEvent} event is fired whenever the a PLAY packet is about to be sent to a client.
+ * Cancelling this event will result in preventing minecraft from sending the packet.
+ * The player won't receive the packet if you cancel it.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol#Play">https://wiki.vg/Protocol#Play</a>
+ * @since 1.2.6
+ */
+public final class PacketPlaySendEvent extends CancellableNMSPacketEvent implements PlayerEvent, PostTaskEvent {
+    private final Player player;
+    private Runnable postTask;
+
+    public PacketPlaySendEvent(final Player player, final Object channel, final NMSPacket packet) {
+        super(channel, packet);
+        this.player = player;
+    }
+
+    /**
+     * This method returns the bukkit player object of the packet receiver.
+     * The player object might be null during early packets.
+     *
+     * @return Packet receiver.
+     */
+    @NotNull
+    @Override
+    public Player getPlayer() {
+        return player;
+    }
+
+    @Override
+    public boolean isPostTaskAvailable() {
+        return postTask != null;
+    }
+
+    @Override
+    public Runnable getPostTask() {
+        return postTask;
+    }
+
+    @Override
+    public void setPostTask(@NotNull Runnable postTask) {
+        this.postTask = postTask;
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        if (listener.serverSidedPlayAllowance == null || listener.serverSidedPlayAllowance.contains(getPacketId())) {
+            listener.onPacketPlaySend(this);
+        }
+    }
+}
+
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
-import org.bukkit.entity.Player;
-
-public final class PacketReceiveEvent extends PacketEvent {
-    private final Player player;
-    private final Object packet;
-    private boolean cancelled;
-
-    public PacketReceiveEvent(final Player player, final Object packet) {
-        this.player = player;
-        this.packet = packet;
-    }
-
-    /**
-     * Get the player sending the packet
-     *
-     * @return player
-     */
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    /**
-     * Get the packet's name (NMS packet class simple name).
-     * @deprecated It is recommended not to use this, it is an expensive method to call.
-     * @return Name of the packet
-     */
-    @Deprecated
-    public String getPacketName() {
-        return this.packet.getClass().getSimpleName();
-    }
-
-    /**
-     * Get the NMS packet object
-     *
-     * @return packet object
-     */
-    public Object getNMSPacket() {
-        return this.packet;
-    }
-
-    /**
-     * Get the class of the NMS packet object
-     * Deprecated, as it is useless, rather use getNMSPacket().getClass()
-     *
-     * @return packet object class
-     */
-    @Deprecated
-    public Class<?> getNMSPacketClass() {
-        return packet.getClass();
-    }
-
-    /**
-     * Get the ID of the packet
-     *
-     * @return packet id
-     */
-    public byte getPacketId() {
-        return PacketType.Client.packetIds.getOrDefault(packet.getClass(), (byte) -1);
-    }
-
-    /**
-     * Returns if the packet has been cancelled
-     *
-     * @return cancelled
-     */
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    /**
-     * Cancel the packet
-     *
-     * @param cancelled boolean
-     */
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    @Override
-    public boolean isAsyncByDefault() {
-        return true;
-    }
-}
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
-import org.bukkit.entity.Player;
-
-
-public final class PacketSendEvent extends PacketEvent {
-    private final Player player;
-    private final Object packet;
-    private boolean cancelled;
-
-    public PacketSendEvent(final Player player, final Object packet) {
-        this.player = player;
-        this.packet = packet;
-        this.cancelled = false;
-    }
-
-
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    /**
-     * Get the packet's name (NMS packet class simple name)
-     * @deprecated It is recommended not to use this, as it is an expensive function to call.
-     * @return Name of the packet
-     */
-    @Deprecated
-    public String getPacketName() {
-        return this.packet.getClass().getSimpleName();
-    }
-
-    /**
-     * Get the ID of the packet
-     *
-     * @return packet id
-     */
-    public byte getPacketId() {
-        return PacketType.Server.packetIds.getOrDefault(packet.getClass(), (byte) -1);
-    }
-
-    /**
-     * Get the NMS packet object
-     *
-     * @return packet object
-     */
-    public Object getNMSPacket() {
-        return this.packet;
-    }
-
-    /**
-     * Get the class of the NMS packet object.
-     * Deprecated because it is useless, rather use getNMSPacket().getClass().
-     *
-     * @return packet object class
-     */
-    @Deprecated
-    public Class<?> getNMSPacketClass() {
-        return packet.getClass();
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    @Override
-    public boolean isAsyncByDefault() {
-        return true;
-    }
-}
-
@@ -0,0 +1,47 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableNMSPacketEvent;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+
+import java.net.InetSocketAddress;
+
+/**
+ * The {@code PacketStatusReceiveEvent} event is fired whenever the server receives a STATUS packet from a client.
+ * The {@code PacketStatusSendEvent} has no Bukkit player, the player object is null in this state.
+ * Use the {@link #getSocketAddress()} to identify who sends the packet.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol#Status">https://wiki.vg/Protocol#Status</a>
+ * @since 1.8
+ */
+public class PacketStatusReceiveEvent extends CancellableNMSPacketEvent {
+    public PacketStatusReceiveEvent(final Object channel, final NMSPacket packet) {
+        super(channel, packet);
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        if (listener.clientSidedStatusAllowance == null || listener.clientSidedStatusAllowance.contains(getPacketId())) {
+            listener.onPacketStatusReceive(this);
+        }
+    }
+}
@@ -0,0 +1,68 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableNMSPacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PostTaskEvent;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.InetSocketAddress;
+
+/**
+ * The {@code PacketStatusSendEvent} event is fired whenever the server wants to send a STATUS packet to a client.
+ * This class implements {@link CancellableEvent}.
+ * The {@code PacketStatusSendEvent} has no Bukkit player, the player object is null in this state.
+ * Use the {@link #getSocketAddress()} to identify who sends the packet.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol#Status">https://wiki.vg/Protocol#Status</a>
+ * @since 1.8
+ */
+public class PacketStatusSendEvent extends CancellableNMSPacketEvent implements PostTaskEvent {
+    private Runnable postTask;
+    public PacketStatusSendEvent(Object channel, NMSPacket packet) {
+        super(channel, packet);
+    }
+
+    @Override
+    public boolean isPostTaskAvailable() {
+        return postTask != null;
+    }
+
+    @Override
+    public Runnable getPostTask() {
+        return postTask;
+    }
+
+    @Override
+    public void setPostTask(@NotNull Runnable postTask) {
+        this.postTask = postTask;
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        if (listener.serverSidedStatusAllowance == null || listener.serverSidedStatusAllowance.contains(getPacketId())) {
+            listener.onPacketStatusSend(this);
+        }
+    }
+}
@@ -0,0 +1,84 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * The {@code PlayerEjectEvent} event is fired whenever a player is ejected.
+ * This class implements {@link CancellableEvent} and {@link PlayerEvent}.
+ *
+ * @author retrooper
+ * @see <a href="https://github.com/retrooper/packetevents/blob/dev/src/main/java/io/github/retrooper/packetevents/handler/PacketHandlerInternal.java">https://github.com/retrooper/packetevents/blob/dev/src/main/java/io/github/retrooper/packetevents/handler/PacketHandlerInternal.java</a>
+ * @since 1.6.9
+ */
+public final class PlayerEjectEvent extends PacketEvent implements CancellableEvent, PlayerEvent {
+    private final Player player;
+    private boolean cancelled;
+
+    public PlayerEjectEvent(final Player player) {
+        this.player = player;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean value) {
+        cancelled = value;
+    }
+
+    /**
+     * This method returns the bukkit player object of the player being ejected.
+     * The player object is guaranteed to NOT be null.
+     *
+     * @return Ejected player.
+     */
+    @NotNull
+    @Override
+    public Player getPlayer() {
+        return player;
+    }
+
+    /**
+     * @return Is the event called async?
+     * @deprecated Now always false
+     */
+    @Deprecated
+    public boolean isAsync() {
+        return false;
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        listener.onPlayerEject(this);
+    }
+
+    @Override
+    public boolean isInbuilt() {
+        return true;
+    }
+}
@@ -1,37 +1,100 @@
-/**
- * Copyright (c) 2020 retrooper
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;

+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
+import io.github.retrooper.packetevents.utils.netty.channel.ChannelUtils;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Nullable;

-public final class PlayerInjectEvent extends PacketEvent {
+import java.net.InetSocketAddress;
+
+/**
+ * The {@code PlayerInjectEvent} event is fired whenever a player is injected.
+ * A player is injected by PacketEvents whenever they join the server.
+ * This class implements {@link CancellableEvent} and {@link PlayerEvent}.
+ *
+ * @author retrooper
+ * @see <a href="https://github.com/retrooper/packetevents/blob/dev/src/main/java/io/github/retrooper/packetevents/handler/PacketHandlerInternal.java">https://github.com/retrooper/packetevents/blob/dev/src/main/java/io/github/retrooper/packetevents/handler/PacketHandlerInternal.java</a>
+ * @since 1.6.9
+ */
+public final class PlayerInjectEvent extends PacketEvent implements CancellableEvent, PlayerEvent {
    private final Player player;
+    private final InetSocketAddress address;
    private boolean cancelled;

    public PlayerInjectEvent(final Player player) {
        this.player = player;
+        this.address = ChannelUtils.getSocketAddress(PacketEvents.get().getPlayerUtils().getChannel(player));
    }

+    @Override
    public boolean isCancelled() {
        return cancelled;
    }

-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    public void cancel() {
-        setCancelled(true);
+    @Override
+    public void setCancelled(boolean value) {
+        cancelled = value;
    }

+    /**
+     * This method returns the bukkit player object of the player being injected.
+     * This player might not be fully initialized.
+     *
+     * @return Injected Player.
+     */
+    @Nullable
+    @Override
    public Player getPlayer() {
        return player;
    }

-    @Override
-    public boolean isAsyncByDefault() {
+    /**
+     * This method returns the socket address injecting player.
+     *
+     * @return Socket address of the injecting player.
+     */
+    @Nullable
+    public InetSocketAddress getSocketAddress() {
+        return address;
+    }
+
+    /**
+     * @deprecated Will always be false
+     */
+    @Deprecated
+    public boolean isAsync() {
        return false;
    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        listener.onPlayerInject(this);
+    }
+
+    @Override
+    public boolean isInbuilt() {
+        return true;
+    }
 }
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.event.PacketEvent;
-import org.bukkit.entity.Player;
-
-public final class PlayerUninjectEvent extends PacketEvent {
-    private final Player player;
-    private final boolean sync;
-    private boolean cancelled;
-
-    @Deprecated
-    public PlayerUninjectEvent(final Player player, @Deprecated final boolean sync) {
-        this.player = player;
-        this.sync = sync;
-    }
-
-    public PlayerUninjectEvent(final Player player) {
-        this.player = player;
-        this.sync = true;
-    }
-
-    public void cancel() {
-        setCancelled(true);
-    }
-
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    public void setCancelled(final boolean val) {
-        this.cancelled = val;
-    }
-
-    /**
-     * Whether the uninjection was called synchronously or asynchronously.
-     * The event is still called synchronously.
-     * By default all uninjections are called aynchronously in this build.
-     *
-     * @return If the uninjection was done async or sync
-     * @deprecated because it is unneeded
-     */
-    @Deprecated
-    public boolean isSync() {
-        return sync;
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-    @Override
-    public boolean isAsyncByDefault() {
-        return false;
-    }
-}
@@ -0,0 +1,60 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.NMSPacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import org.bukkit.entity.Player;
+
+/**
+ * The {@code PostPacketPlayReceiveEvent} event is fired after all PacketEvents listeners finished processing
+ * the {@code PacketPlayReceiveEvent}. This event won't be called if the PacketPlayReceiveEvent event was cancelled.
+ * You cannot cancel this event.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol#Serverbound_4">https://wiki.vg/Protocol#Serverbound_4</a>
+ * @since 1.7
+ */
+public class PostPacketPlayReceiveEvent extends NMSPacketEvent implements PlayerEvent {
+    private final Player player;
+
+    public PostPacketPlayReceiveEvent(final Player player, final Object channel, final NMSPacket packet) {
+        super(channel, packet);
+        this.player = player;
+    }
+
+    /**
+     * This method returns the bukkit player object of the packet sender.
+     *
+     * @return Packet sender.
+     */
+    @Override
+    public Player getPlayer() {
+        return player;
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        if (listener.clientSidedPlayAllowance == null || listener.clientSidedPlayAllowance.contains(getPacketId())) {
+            listener.onPostPacketPlayReceive(this);
+        }
+    }
+}
@@ -0,0 +1,60 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.NMSPacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import org.bukkit.entity.Player;
+
+/**
+ * The {@code PostPacketPlaySendEvent} event is fired after all PacketEvents listeners finished processing
+ * the {@code PacketPlaySendEvent}. This event won't be called if the PacketPlaySendEvent event was cancelled.
+ * You cannot cancel this event.
+ *
+ * @author retrooper
+ * @see <a href="https://wiki.vg/Protocol#Clientbound_4">https://wiki.vg/Protocol#Clientbound_4</a>
+ * @since 1.7
+ */
+public class PostPacketPlaySendEvent extends NMSPacketEvent implements PlayerEvent {
+    private final Player player;
+
+    public PostPacketPlaySendEvent(final Player player, final Object channel, final NMSPacket packet) {
+        super(channel, packet);
+        this.player = player;
+    }
+
+    /**
+     * This method returns the bukkit player object of the packet sender.
+     *
+     * @return Packet receiver.
+     */
+    @Override
+    public Player getPlayer() {
+        return player;
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        if (listener.serverSidedPlayAllowance == null || listener.serverSidedPlayAllowance.contains(getPacketId())) {
+            listener.onPostPacketPlaySend(this);
+        }
+    }
+}
@@ -0,0 +1,106 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
+import io.github.retrooper.packetevents.utils.netty.channel.ChannelUtils;
+import io.github.retrooper.packetevents.utils.player.ClientVersion;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.net.InetSocketAddress;
+
+/**
+ * The {@code PostPlayerInjectEvent} event is fired after a successful injection.
+ * Use the {@link #isAsync()} method to figure out if is being called sync or async.
+ * A player is injected by PacketEvents each time they join the server.
+ *
+ * @author retrooper
+ * @see <a href="https://github.com/retrooper/packetevents/blob/dev/src/main/java/io/github/retrooper/packetevents/handler/PacketHandlerInternal.java">https://github.com/retrooper/packetevents/blob/dev/src/main/java/io/github/retrooper/packetevents/handler/PacketHandlerInternal.java</a>
+ * @since 1.3
+ */
+public class PostPlayerInjectEvent extends PacketEvent implements PlayerEvent {
+    private final Player player;
+    private final boolean async;
+
+    public PostPlayerInjectEvent(Player player, boolean async) {
+        this.player = player;
+        this.async = async;
+    }
+
+    /**
+     * This method returns the bukkit player object of the player that has been injected.
+     * The player is guaranteed to not be null.
+     *
+     * @return Injected Player.
+     */
+    @NotNull
+    @Override
+    public Player getPlayer() {
+        return player;
+    }
+
+    /**
+     * This method returns the cached netty channel of the player.
+     *
+     * @return Netty channel of the injected player.
+     */
+    @NotNull
+    public Object getChannel() {
+        return PacketEvents.get().getPlayerUtils().getChannel(player);
+    }
+
+    @NotNull
+    public InetSocketAddress getSocketAddress() {
+        return ChannelUtils.getSocketAddress(getChannel());
+    }
+
+    /**
+     * This method returns the ClientVersion of the injected player.
+     *
+     * @return ClientVersion of injected player.
+     * @see ClientVersion
+     */
+    @NotNull
+    public ClientVersion getClientVersion() {
+        return PacketEvents.get().getPlayerUtils().getClientVersion(player);
+    }
+
+    /**
+     * Has the event been called async or sync?
+     *
+     * @return Was the event call in an async context?
+     */
+    public boolean isAsync() {
+        return async;
+    }
+
+    @Override
+    public void call(PacketListenerAbstract listener) {
+        listener.onPostPlayerInject(this);
+    }
+
+    @Override
+    public boolean isInbuilt() {
+        return true;
+    }
+}
@@ -1,97 +1,194 @@
-/**
- * Copyright (c) 2020 retrooper
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.manager;

 import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.annotations.PacketHandler;
 import io.github.retrooper.packetevents.event.PacketEvent;
 import io.github.retrooper.packetevents.event.PacketListener;
-import org.bukkit.Bukkit;
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.PacketListenerDynamic;

-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+/**
+ * This is the event manager interface.
+ * Every method is already implemented, we just use this
+ * to have less code duplications.
+ * You can either call event manager methods in the
+ * {@link io.github.retrooper.packetevents.PacketEvents} instance or with an instance of the
+ * {@link PEEventManager} stored in {@link PacketEvents}.
+ *
+ * @author retrooper
+ * @see PacketEvents#getEventManager()
+ * @since 1.0
+ */
+public interface EventManager {

-public final class EventManager {
-    private final HashMap<PacketListener, List<Method>> registeredMethods = new HashMap<PacketListener, List<Method>>();
+    /**
+     * Call a packet event.
+     * This will let all listeners(new and deprecated listeners) process the event.
+     * It isn't recommended to use a mix of both listeners(new and deprecated),
+     * but it will work and they are compatible.
+     *
+     * @param event {@link PacketEvent}
+     * @return Same event manager instance.
+     */
+    default EventManager callEvent(PacketEvent event) {
+        //The dynamic event manager calls the legacy event manager.
+        PEEventManager.EVENT_MANAGER_MODERN.callEvent(event);
+        return this;
+    }

-    public void callEvent(final PacketEvent e) {
-        for (final PacketListener listener : registeredMethods.keySet()) {
-            //Annotated methods
-            final List<Method> methods = registeredMethods.get(listener);
-            for (final Method method : methods) {
-                final Class<?> parameterType = method.getParameterTypes()[0];
-                if (parameterType.equals(PacketEvent.class)
-                        || parameterType.isInstance(e)) {
-                    final PacketHandler annotation = method.getAnnotation(PacketHandler.class);
-                    final Runnable invokeMethod = new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                method.invoke(listener, e);
-                            } catch (IllegalAccessException | InvocationTargetException ex) {
-                                ex.printStackTrace();
-                            }
-                        }
-                    };
-
-                    switch (annotation.synchronization()) {
-                        case FORCE_ASYNC:
-                            Bukkit.getScheduler().runTaskAsynchronously(PacketEvents.getPlugin(), invokeMethod);
-                            break;
-                        case FORCE_SYNC:
-                            Bukkit.getScheduler().runTask(PacketEvents.getPlugin(), invokeMethod);
-                            break;
-                        default:
-                            try {
-                                method.invoke(listener, e);
-                            } catch (IllegalAccessException | InvocationTargetException ex) {
-                                ex.printStackTrace();
-                            }
-                            break;
-                    }
-                }
-            }
+    /**
+     * Register a deprecated event listener.
+     * Not recommended to use the deprecated event listener.
+     *
+     * @param listener {@link PacketListener}
+     * @return Same event manager instance.
+     */
+    @Deprecated
+    default EventManager registerListener(PacketListener listener) {
+        if (listener != null) {
+            PEEventManager.EVENT_MANAGER_LEGACY.registerListener(listener);
        }
+        return this;
    }

-    public void registerListener(final PacketListener e) {
-        final List<Method> methods = new ArrayList<Method>();
-        for (final Method m : e.getClass().getMethods()) {
-            if (m.isAnnotationPresent(PacketHandler.class)
-                    && m.getParameterTypes().length == 1) {
-                methods.add(m);
-            }
+    /**
+     * Register multiple deprecated event listeners with one method.
+     * Not recommended to use the deprecated event listener.
+     *
+     * @param listeners {@link PacketListener}
+     * @return Same event manager instance.
+     */
+    @Deprecated
+    default EventManager registerListeners(PacketListener... listeners) {
+        PEEventManager.EVENT_MANAGER_LEGACY.registerListeners(listeners);
+        return this;
+    }
+
+    /**
+     * Unregister a deprecated event listener.
+     * Not recommended to use the deprecated event listener.
+     *
+     * @param listener {@link PacketListener}
+     * @return Same event manager instance.
+     */
+    @Deprecated
+    default EventManager unregisterListener(PacketListener listener) {
+        PEEventManager.EVENT_MANAGER_LEGACY.unregisterListener(listener);
+        return this;
+    }
+
+    /**
+     * Unregister multiple deprecated event listeners with one method.
+     * Not recommended to use the deprecated event listener.
+     *
+     * @param listeners {@link PacketListener}
+     * @return Same event manager instance.
+     */
+    @Deprecated
+    default EventManager unregisterListeners(PacketListener... listeners) {
+        PEEventManager.EVENT_MANAGER_LEGACY.unregisterListeners(listeners);
+        return this;
+    }
+
+    /**
+     * Register a PacketListenerDynamic listener.
+     *
+     * @param listener {@link PacketListenerDynamic}
+     * @return Same event manager instance.
+     */
+    @Deprecated
+    default EventManager registerListener(PacketListenerDynamic listener) {
+        PEEventManager.EVENT_MANAGER_MODERN.registerListener(listener);
+        return this;
+    }
+
+    /**
+     * Register multiple PacketListenerDynamic listeners.
+     *
+     * @param listeners {@link PacketListenerDynamic}
+     * @return Same event manager instance.
+     */
+    @Deprecated
+    default EventManager registerListeners(PacketListenerDynamic... listeners) {
+        PEEventManager.EVENT_MANAGER_MODERN.registerListeners(listeners);
+        return this;
+    }
+
+
+    /**
+     * Register a PacketListenerAbstract listener.
+     *
+     * @param listener {@link PacketListenerAbstract}
+     * @return Same event manager instance.
+     */
+    default EventManager registerListener(PacketListenerAbstract listener) {
+        if (listener != null) {
+            PEEventManager.EVENT_MANAGER_MODERN.registerListener(listener);
        }
-        if (!methods.isEmpty()) {
-            registeredMethods.put(e, methods);
+        return this;
+    }
+
+    /**
+     * Register multiple PacketListenerAbstract listeners.
+     *
+     * @param listeners {@link PacketListenerAbstract}
+     * @return Same event manager instance.
+     */
+    default EventManager registerListeners(PacketListenerAbstract... listeners) {
+        PEEventManager.EVENT_MANAGER_MODERN.registerListeners(listeners);
+        return this;
+    }
+
+    /**
+     * Unregister a PacketListenerAbstract listener.
+     *
+     * @param listener {@link PacketListenerAbstract}
+     * @return Same event manager instance.
+     */
+    default EventManager unregisterListener(PacketListenerAbstract listener) {
+        if (listener != null) {
+            PEEventManager.EVENT_MANAGER_MODERN.unregisterListener(listener);
        }
+        return this;
    }

-    public void registerListeners(final PacketListener... listeners) {
-        for (final PacketListener listener : listeners) {
-            registerListener(listener);
-        }
+    /**
+     * Unregister multiple PacketListenerAbstract listeners.
+     *
+     * @param listeners {@link PacketListenerAbstract}
+     * @return Same event manager instance.
+     */
+    default EventManager unregisterListeners(PacketListenerAbstract... listeners) {
+        PEEventManager.EVENT_MANAGER_MODERN.unregisterListeners(listeners);
+        return this;
    }

-    public void unregisterListener(final PacketListener e) {
-        registeredMethods.remove(e);
-    }
-
-    public void unregisterListeners(final PacketListener... listeners) {
-        for (final PacketListener listener : listeners) {
-            unregisterListener(listener);
-        }
-    }
-
-    public void unregisterAllListeners() {
-        registeredMethods.clear();
-    }
-
-    public boolean isRegistered(final PacketListener listener) {
-        return registeredMethods.containsKey(listener);
+    /**
+     * Unregister all registered event listeners.
+     * All the deprecated and the dynamic listeners will be unregistered.
+     *
+     * @return Same event manager instance.
+     */
+    default EventManager unregisterAllListeners() {
+        PEEventManager.EVENT_MANAGER_MODERN.unregisterAllListeners();
+        PEEventManager.EVENT_MANAGER_LEGACY.unregisterAllListeners();
+        return this;
    }
 }
@@ -0,0 +1,160 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.manager;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.PacketListener;
+import io.github.retrooper.packetevents.event.annotation.PacketHandler;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+@Deprecated
+class EventManagerLegacy {
+    /**
+     * Map storing all all legacy packet event listeners.
+     * The key is an individual listener, the values are the key's event methods.
+     */
+
+    private final Map<PacketListener, HashSet<Method>> staticRegisteredMethods = new HashMap<>();
+
+    /**
+     * Call a PacketEvent with the legacy event manager.
+     * This method processes the event on all legacy packet event listeners.
+     * This method is actually called by {@link EventManagerModern#callEvent(PacketEvent)} as the
+     * if you mix the two event systems, the dynamic listeners are always processed first and pass
+     * their highest reached event priority that this legacy one has to beat/reach to be able to cancel
+     * the event.
+     * This downside of this system is the event listeners aren't executed in any particular order, just
+     * in the order they were registered.
+     * This system is also slower than the other event system.
+     *
+     * @param event         {@link PacketEvent}
+     * @param eventPriority Priority the legacy listeners should beat to decide cancellation of the event.
+     */
+    @Deprecated
+    public void callEvent(final PacketEvent event, byte eventPriority) {
+        boolean isCancelled = false;
+        if (event instanceof CancellableEvent) {
+            isCancelled = ((CancellableEvent) event).isCancelled();
+        }
+        //STATIC LISTENERS
+        for (final PacketListener listener : staticRegisteredMethods.keySet()) {
+            HashSet<Method> methods = staticRegisteredMethods.get(listener);
+
+            for (Method method : methods) {
+                Class<?> parameterType = method.getParameterTypes()[0];
+                if (parameterType.equals(PacketEvent.class)
+                        || parameterType.isInstance(event)) {
+
+                    PacketHandler annotation = method.getAnnotation(PacketHandler.class);
+                    try {
+                        method.invoke(listener, event);
+                    } catch (IllegalAccessException | InvocationTargetException ex) {
+                        ex.printStackTrace();
+                    }
+                    if (event instanceof CancellableEvent) {
+                        CancellableEvent ce = (CancellableEvent) event;
+                        if (annotation.priority() >= eventPriority) {
+                            eventPriority = annotation.priority();
+                            isCancelled = ce.isCancelled();
+                        }
+                    }
+                }
+            }
+        }
+        if (event instanceof CancellableEvent) {
+            CancellableEvent ce = (CancellableEvent) event;
+            ce.setCancelled(isCancelled);
+        }
+    }
+
+    /**
+     * Register a legacy packet event listener.
+     * Not recommended to use the deprecated event listener.
+     *
+     * @param listener {@link PacketListener}
+     */
+    @Deprecated
+    public void registerListener(final PacketListener listener) {
+        final HashSet<Method> methods = new HashSet<>();
+        for (final Method m : listener.getClass().getDeclaredMethods()) {
+            if (!m.isAccessible()) {
+                m.setAccessible(true);
+            }
+            if (m.isAnnotationPresent(PacketHandler.class)
+                    && m.getParameterTypes().length == 1) {
+                methods.add(m);
+            }
+        }
+
+        if (!methods.isEmpty()) {
+            staticRegisteredMethods.put(listener, methods);
+        }
+    }
+
+    /**
+     * Register multiple legacy packet event listeners with one method.
+     * Not recommended to use the deprecated event listener.
+     *
+     * @param listeners {@link PacketListener}
+     */
+    @Deprecated
+    public void registerListeners(final PacketListener... listeners) {
+        for (final PacketListener listener : listeners) {
+            registerListener(listener);
+        }
+    }
+
+    /**
+     * Unregister a legacy packet event listener.
+     * Not recommended to use the deprecated event listener.
+     *
+     * @param listener {@link PacketListener}
+     */
+    @Deprecated
+    public void unregisterListener(final PacketListener listener) {
+        staticRegisteredMethods.remove(listener);
+    }
+
+    /**
+     * Unregister multiple legacy packet event listeners with one method.
+     * Not recommended to use the deprecated event listener.
+     *
+     * @param listeners {@link PacketListener}
+     */
+    @Deprecated
+    public void unregisterListeners(final PacketListener... listeners) {
+        for (final PacketListener listener : listeners) {
+            unregisterListener(listener);
+        }
+    }
+
+    /**
+     * Unregister all legacy packet event listeners.
+     */
+    @Deprecated
+    public void unregisterAllListeners() {
+        staticRegisteredMethods.clear();
+    }
+}
@@ -0,0 +1,127 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.manager;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
+import io.github.retrooper.packetevents.event.priority.PacketEventPriority;
+import io.github.retrooper.packetevents.event.PacketListenerPriority;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+
+class EventManagerModern {
+    private final Map<Byte, HashSet<PacketListenerAbstract>> listenersMap = new ConcurrentHashMap<>();
+
+    /**
+     * Call the PacketEvent.
+     * This method processes the event on all the registered dynamic packet event listeners.
+     * The {@link PacketEventPriority#LOWEST} prioritized listeners will be processing first,
+     * the {@link PacketEventPriority#MONITOR} will be processing last and can
+     * be the final decider whether the event has been cancelled or not.
+     * This call event also calls the legacy event manager call event.
+     *
+     * @param event {@link PacketEvent}
+     * @see EventManagerLegacy#callEvent(PacketEvent, byte)
+     */
+    public void callEvent(final PacketEvent event) {
+        byte highestReachedPriority = (byte) (PacketListenerPriority.LOWEST.getId() - 1);
+        for (byte priority = PacketListenerPriority.LOWEST.getId(); priority <= PacketListenerPriority.MONITOR.getId(); priority++) {
+            HashSet<PacketListenerAbstract> listeners = listenersMap.get(priority);
+            if (listeners != null) {
+                for (PacketListenerAbstract listener : listeners) {
+                    try {
+                        event.call(listener);
+                    } catch (Exception ex) {
+                        PacketEvents.get().getPlugin().getLogger()
+                                .log(Level.SEVERE, "PacketEvents found an exception while calling a packet listener.", ex);
+                    }
+                    //TODO Remove, because its redundant. We are only keeping it for compatibility with the legacy event manager.
+                    if (event instanceof CancellableEvent) {
+                        if (priority > highestReachedPriority) {
+                            highestReachedPriority = priority;
+                        }
+                    }
+                }
+            }
+        }
+        PEEventManager.EVENT_MANAGER_LEGACY.callEvent(event, highestReachedPriority);
+    }
+
+    /**
+     * Register the dynamic packet event listener.
+     *
+     * @param listener {@link PacketListenerAbstract}
+     */
+    public synchronized void registerListener(final PacketListenerAbstract listener) {
+        byte priority = listener.getPriority().getId();
+        HashSet<PacketListenerAbstract> listenerSet = listenersMap.get(priority);
+        if (listenerSet == null) {
+            listenerSet = new HashSet<>();
+        }
+        listenerSet.add(listener);
+        listenersMap.put(priority, listenerSet);
+    }
+
+    /**
+     * Register multiple dynamic packet event listeners with one method.
+     *
+     * @param listeners {@link PacketListenerAbstract}
+     */
+    public synchronized void registerListeners(PacketListenerAbstract... listeners) {
+        for (PacketListenerAbstract listener : listeners) {
+            registerListener(listener);
+        }
+    }
+
+    /**
+     * Unregister the dynamic packet event listener.
+     *
+     * @param listener {@link PacketListenerAbstract}
+     */
+    public synchronized void unregisterListener(final PacketListenerAbstract listener) {
+        byte priority = listener.getPriority().getId();
+        HashSet<PacketListenerAbstract> listenerSet = listenersMap.get(priority);
+        if (listenerSet != null) {
+            listenerSet.remove(listener);
+        }
+    }
+
+    /**
+     * Unregister multiple dynamic packet event listeners with one method.
+     *
+     * @param listeners {@link PacketListenerAbstract}
+     */
+    public synchronized void unregisterListeners(PacketListenerAbstract... listeners) {
+        for (PacketListenerAbstract listener : listeners) {
+            unregisterListener(listener);
+        }
+    }
+
+    /**
+     * Unregister all dynamic packet event listeners.
+     */
+    public synchronized void unregisterAllListeners() {
+        listenersMap.clear();
+    }
+}
@@ -0,0 +1,32 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.manager;
+
+/**
+ * Class storing a static instance of the dynamic and the legacy event manager.
+ *
+ * @author retrooper
+ * @since 1.8
+ */
+public class PEEventManager implements EventManager {
+
+    public static final EventManagerLegacy EVENT_MANAGER_LEGACY = new EventManagerLegacy();
+    public static final EventManagerModern EVENT_MANAGER_MODERN = new EventManagerModern();
+
+}
@@ -0,0 +1,92 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.event.priority;
+
+/**
+ * Event priority enum for the new event system.
+ * The event priority counts for the whole {@link io.github.retrooper.packetevents.event.PacketListenerAbstract}
+ * and not for just one event.
+ * The priority can be specified in the PacketListenerAbstract constructor.
+ * If you don't specify a priority in the constructor, it will use the {@link #NORMAL} priority.
+ *
+ * @author retrooper
+ * @since 1.6.9
+ */
+@Deprecated
+public enum PacketEventPriority {
+    /**
+     * The weakest event priority.
+     * The first to be processed(IN THE DYNAMIC EVENT SYSTEM ONLY).
+     * Use this if you need to be the first processing the event and
+     * need no power in cancelling an event or preventing an event cancellation.
+     */
+    LOWEST,
+
+    /**
+     * A weak event priority.
+     * Second to be processed(IN THE DYNAMIC EVENT SYSTEM ONLY).
+     * Use this if you would prefer to be one of the first to process the event,
+     * but don't mind if some other listener processes before you.
+     */
+    LOW,
+
+    /**
+     * Default event priority.
+     * Third to be processed(IN THE DYNAMIC EVENT SYSTEM ONLY).
+     * Use this if you don't really care/know when you process or just want to
+     * be in the middle.
+     */
+    NORMAL,
+
+    /**
+     * Higher than the {@link PacketEventPriority#NORMAL} event priority.
+     * Fourth to be processed(IN THE DYNAMIC EVENT SYSTEM ONLY).
+     * Use this if you want to process before the default event prioritized listeners.
+     */
+    HIGH,
+
+    /**
+     * Second most powerful event priority.
+     * Fifth to be processed(IN THE DYNAMIC EVENT SYSTEM ONLY).
+     * Use this if you prefer to be one of the last to process,
+     * but don't mind if some other listener really needs to process after you.
+     * Also use this if you prefer deciding if the event cancelled or not, but don't
+     * mind if some other listener urgently needs to decide over you.
+     * {@link PacketEventPriority#MONITOR} is rarely ever recommended to use.
+     */
+    HIGHEST,
+
+    /**
+     * Most powerful event priority.
+     * Last(Sixth) to be processed(IN THE DYNAMIC EVENT SYSTEM ONLY).
+     * Use this if you urgently need to be the last to process
+     * or urgently need to be the final decider whether the event has cancelled or not.
+     * This is rarely recommended.
+     */
+    MONITOR;
+
+
+    public static PacketEventPriority getPacketEventPriority(byte bytePriority) {
+        return values()[bytePriority];
+    }
+
+    public byte getPriorityValue() {
+        return (byte) ordinal();
+    }
+}
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.example;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.annotations.PacketHandler;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.event.PacketListener;
-import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
-import io.github.retrooper.packetevents.packetwrappers.in.useentity.WrappedPacketInUseEntity;
-import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
-import org.bukkit.plugin.java.JavaPlugin;
-public class MainExample extends JavaPlugin implements PacketListener {
-
-    @Override
-    public void onLoad() {
-        PacketEvents.load();
-    }
-
-    @Override
-    public void onEnable() {
-
-        PacketEvents.getSettings().setDefaultServerVersion(ServerVersion.v_1_7_10);
-
-        //ClientVersion cannot be resolved, it is the same as the server's.
-        //The clientversion can only not be resolved if
-        // ViaVersion, ProtocolSuppport, or ProtocolLib isn't present.
-        //ClientVersion might be resolvable if the server version is 1.7.10.
-        PacketEvents.getSettings().setDoAutoResolveClientProtocolVersion(true);
-
-        //Deprecated, as it is no longer needed
-        //PacketEvents.getSettings().setIdentifier("packetevents_api");
-
-        PacketEvents.start(this);
-        PacketEvents.getAPI().getEventManager().registerListener(this);
-    }
-
-    @Override
-    public void onDisable() {
-        PacketEvents.stop();
-    }
-
-}
@@ -0,0 +1,45 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.exceptions;
+
+/**
+ * An exception thrown by PacketEvents when the {@link io.github.retrooper.packetevents.PacketEvents#load}
+ * method fails to execute without any exceptions.
+ * Resulting in PacketEvents failing to load.
+ *
+ * @author retrooper
+ * @since 1.7.6
+ */
+public class PacketEventsLoadFailureException extends RuntimeException {
+    public PacketEventsLoadFailureException(String message) {
+        super(message);
+    }
+
+    public PacketEventsLoadFailureException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PacketEventsLoadFailureException() {
+        this("PacketEvents failed to load...");
+    }
+
+    public PacketEventsLoadFailureException(Throwable cause) {
+        this("PacketEvents failed to load...", cause);
+    }
+}
@@ -0,0 +1,40 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.exceptions;
+
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+
+/**
+ * An exception thrown by PacketEvents when a wrapper fails
+ * to find a field.
+ *
+ * @author retrooper
+ * @see io.github.retrooper.packetevents.packetwrappers.WrappedPacket#read(int, Class)
+ * @see io.github.retrooper.packetevents.packetwrappers.WrappedPacket#write(Class, int, Object)
+ * @since 1.6.9
+ */
+public class WrapperFieldNotFoundException extends RuntimeException {
+    public WrapperFieldNotFoundException(String message) {
+        super(message);
+    }
+
+    public WrapperFieldNotFoundException(Class<?> packetClass, Class<?> type, int index) {
+        this("PacketEvents failed to find a " + ClassUtil.getClassSimpleName(type) + " indexed " + index + " by its type in the " + packetClass.getName() + " class!");
+    }
+}
@@ -0,0 +1,42 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.exceptions;
+
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+
+/**
+ * An exception thrown by PacketEvents when a wrapper is used although it isn't supported on the local server version.
+ * Make sure to decompile a wrapper before using it, if you are unsure if it is supported through out all the server versions.
+ * We override a {@link WrappedPacket#isSupported()} method if it isn't supported on all server versions.
+ *
+ * @author retrooper
+ * @see WrappedPacket#isSupported()
+ * @see WrappedPacket.SupportedVersions
+ * @since 1.7
+ */
+public class WrapperUnsupportedUsageException extends RuntimeException {
+    public WrapperUnsupportedUsageException(String message) {
+        super(message);
+    }
+
+    public WrapperUnsupportedUsageException(Class<? extends WrappedPacket> wrapperClass) {
+        this("You are using a packet wrapper which happens to be unsupported on the local server version. Packet wrapper you attempted to use: " + ClassUtil.getClassSimpleName(wrapperClass));
+    }
+}
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.handler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.Future;
-
-public class NettyPacketHandler {
-    private static boolean v1_7_nettyMode = false;
-
-    static {
-        try {
-            Class.forName("io.netty.channel.Channel");
-        } catch (ClassNotFoundException e) {
-            v1_7_nettyMode = true;
-        }
-    }
-
-    public static void injectPlayer(final Player player) {
-        final PlayerInjectEvent injectEvent = new PlayerInjectEvent(player);
-        PacketEvents.getAPI().getEventManager().callEvent(injectEvent);
-        if (!injectEvent.isCancelled()) {
-            if (v1_7_nettyMode) {
-                NettyPacketHandler_7.injectPlayer(player);
-            } else {
-                NettyPacketHandler_8.injectPlayer(player);
-            }
-        }
-    }
-
-    public static Future<?> uninjectPlayerAsync(final Player player) {
-        try {
-            final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
-            PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
-            if (!uninjectEvent.isCancelled()) {
-                if (v1_7_nettyMode) {
-                    return NettyPacketHandler_7.uninjectPlayerAsync(player);
-                } else {
-                    return NettyPacketHandler_8.uninjectPlayerAsync(player);
-                }
-            }
-        } catch (Exception ignored) {
-
-        }
-        return null;
-    }
-
-    public static void uninjectPlayer(final Player player) {
-        try {
-            final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
-            PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
-            if (!uninjectEvent.isCancelled()) {
-                if (v1_7_nettyMode) {
-                    NettyPacketHandler_7.uninjectPlayer(player);
-                } else {
-                    NettyPacketHandler_8.uninjectPlayer(player);
-                }
-            }
-        } catch (Exception ex) {
-            //Failed, but that is alright
-        }
-    }
-
-    public static Object write(final Player sender, final Object packet) {
-        final PacketSendEvent packetSendEvent = new PacketSendEvent(sender, packet);
-        PacketEvents.getAPI().getEventManager().callEvent(packetSendEvent);
-        if (!packetSendEvent.isCancelled()) {
-            return packet;
-        }
-        return null;
-    }
-
-    public static Object read(final Player receiver, final Object packet) {
-        final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(receiver, packet);
-        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent);
-        if (!packetReceiveEvent.isCancelled()) {
-            return packet;
-        }
-        return null;
-    }
-}
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.handler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import net.minecraft.util.io.netty.channel.*;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.Future;
-
-final class NettyPacketHandler_7 {
-
-    public static void injectPlayer(final Player player) {
-        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
-            @Override
-            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Object packet = NettyPacketHandler.read(player, msg);
-                if (packet == null) {
-                    return;
-                }
-                super.channelRead(ctx, msg);
-            }
-
-            @Override
-            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-                Object packet = NettyPacketHandler.write(player, msg);
-                if (packet == null) {
-                    return;
-                }
-                super.write(ctx, msg, promise);
-            }
-        };
-        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
-        pipeline.addBefore("packet_handler", PacketEvents.getHandlerName(player.getName()), channelDuplexHandler);
-    }
-
-    public static void uninjectPlayer(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-    }
-
-    public static Future<?> uninjectPlayerAsync(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        return channel.eventLoop().submit(() -> {
-            channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-        });
-    }
-}
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.handler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import io.netty.channel.*;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.Future;
-
-final class NettyPacketHandler_8 {
-
-    public static void injectPlayer(final Player player) {
-        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
-            @Override
-            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Object packet = NettyPacketHandler.read(player, msg);
-                if (packet == null) {
-                    return;
-                }
-                super.channelRead(ctx, msg);
-            }
-
-            @Override
-            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-                Object packet = NettyPacketHandler.write(player, msg);
-                if (packet == null) {
-                    return;
-                }
-                super.write(ctx, msg, promise);
-            }
-        };
-        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
-        pipeline.addBefore("packet_handler", PacketEvents.getHandlerName(player.getName()), channelDuplexHandler);
-    }
-
-    public static void uninjectPlayer(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-    }
-
-    public static Future<?> uninjectPlayerAsync(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        return channel.eventLoop().submit(() -> {
-            channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-        });
-    }
-}
@@ -0,0 +1,43 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.injector;
+
+import org.bukkit.entity.Player;
+
+public interface ChannelInjector {
+    default boolean isBound() {
+        return true;
+    }
+
+    void inject();
+
+    void eject();
+
+    void injectPlayer(Player player);
+
+    void ejectPlayer(Player player);
+
+    boolean hasInjected(Player player);
+
+    void writePacket(Object channel, Object rawNMSPacket);
+
+    void flushPackets(Object channel);
+
+    void sendPacket(Object channel, Object rawNMSPacket);
+}
@@ -0,0 +1,25 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.injector;
+
+import org.bukkit.entity.Player;
+
+public interface EarlyInjector extends ChannelInjector {
+    void updatePlayerObject(Player player, Object channel);
+}
@@ -0,0 +1,98 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.injector;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.event.impl.PlayerEjectEvent;
+import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
+import io.github.retrooper.packetevents.injector.legacy.early.EarlyChannelInjectorLegacy;
+import io.github.retrooper.packetevents.injector.legacy.late.LateChannelInjectorLegacy;
+import io.github.retrooper.packetevents.injector.modern.early.EarlyChannelInjectorModern;
+import io.github.retrooper.packetevents.injector.modern.late.LateChannelInjectorModern;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import org.bukkit.entity.Player;
+
+public class GlobalChannelInjector {
+    private ChannelInjector injector;
+
+    public void load() {
+        boolean legacy = NMSUtils.legacyNettyImportMode;
+        if (!PacketEvents.get().getSettings().shouldUseCompatibilityInjector()) {
+            injector = legacy ? new EarlyChannelInjectorLegacy() : new EarlyChannelInjectorModern();
+        } else {
+            injector = legacy ? new LateChannelInjectorLegacy() : new LateChannelInjectorModern();
+        }
+    }
+
+    public boolean isBound() {
+        return injector.isBound();
+    }
+
+    public void inject() {
+        try {
+            //Try inject...
+            injector.inject();
+        } catch (Exception ex) {
+            //Failed to inject! Let us revert to the compatibility injector and re-inject.
+            if (injector instanceof EarlyInjector) {
+                PacketEvents.get().getSettings().compatInjector(true);
+                load();
+                injector.inject();
+                PacketEvents.get().getPlugin().getLogger().warning("[packetevents] Failed to inject with the Early Injector. Reverting to the Compatibility/Late Injector... This is just a warning, but please report this!");
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    public void eject() {
+        injector.eject();
+    }
+
+    public void injectPlayer(Player player) {
+        PlayerInjectEvent injectEvent = new PlayerInjectEvent(player);
+        PacketEvents.get().callEvent(injectEvent);
+        if (!injectEvent.isCancelled()) {
+            injector.injectPlayer(player);
+        }
+    }
+
+    public void ejectPlayer(Player player) {
+        PlayerEjectEvent ejectEvent = new PlayerEjectEvent(player);
+        PacketEvents.get().callEvent(ejectEvent);
+        if (!ejectEvent.isCancelled()) {
+            injector.ejectPlayer(player);
+        }
+    }
+
+    public boolean hasInjected(Player player) {
+        return injector.hasInjected(player);
+    }
+
+    public void writePacket(Object ch, Object rawNMSPacket) {
+        injector.writePacket(ch, rawNMSPacket);
+    }
+
+    public void flushPackets(Object ch) {
+        injector.flushPackets(ch);
+    }
+
+    public void sendPacket(Object ch, Object rawNMSPacket) {
+        injector.sendPacket(ch, rawNMSPacket);
+    }
+}
@@ -0,0 +1,23 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.injector;
+
+public interface LateInjector extends ChannelInjector {
+
+}
@@ -0,0 +1,58 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2021 ViaVersion 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 io.github.retrooper.packetevents.injector.legacy;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.processor.PacketProcessorInternal;
+import net.minecraft.util.io.netty.channel.ChannelDuplexHandler;
+import net.minecraft.util.io.netty.channel.ChannelHandler;
+import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
+import net.minecraft.util.io.netty.channel.ChannelPromise;
+import org.bukkit.entity.Player;
+@ChannelHandler.Sharable
+public class PlayerChannelHandlerLegacy extends ChannelDuplexHandler {
+    /**
+     * Associated player.
+     * This is null until we inject the player.
+     */
+    public volatile Player player;
+
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, Object packet) throws Exception {
+        PacketProcessorInternal.PacketData data = PacketEvents.get().getInternalPacketProcessor().read(player, ctx.channel(), packet);
+        if (data.packet != null) {
+            super.channelRead(ctx, data.packet);
+            PacketEvents.get().getInternalPacketProcessor().postRead(player, ctx.channel(), data.packet);
+        }
+    }
+
+    @Override
+    public void write(final ChannelHandlerContext ctx, Object packet, final ChannelPromise promise) throws Exception {
+        PacketProcessorInternal.PacketData data = PacketEvents.get().getInternalPacketProcessor().write(player, ctx.channel(), packet);
+        if (data.postAction != null) {
+            promise.addListener(f -> {
+                data.postAction.run();
+            });
+        }
+        if (data.packet != null) {
+            super.write(ctx, data.packet, promise);
+            PacketEvents.get().getInternalPacketProcessor().postWrite(player, ctx.channel(), data.packet);
+        }
+    }
+}
@@ -0,0 +1,321 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2021 ViaVersion 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 io.github.retrooper.packetevents.injector.legacy.early;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.injector.EarlyInjector;
+import io.github.retrooper.packetevents.injector.legacy.PlayerChannelHandlerLegacy;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.list.ListWrapper;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.netty.channel.epoll.EpollSocketChannel;
+import net.minecraft.util.io.netty.channel.Channel;
+import net.minecraft.util.io.netty.channel.ChannelFuture;
+import net.minecraft.util.io.netty.channel.ChannelHandler;
+import net.minecraft.util.io.netty.channel.ChannelInitializer;
+import net.minecraft.util.io.netty.channel.socket.nio.NioSocketChannel;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginDescriptionFile;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class EarlyChannelInjectorLegacy implements EarlyInjector {
+    private final List<ChannelFuture> injectedFutures = new ArrayList<>();
+    private final List<Map<Field, Object>> injectedLists = new ArrayList<>();
+
+    @Override
+    public boolean isBound() {
+        try {
+            Object connection = NMSUtils.getMinecraftServerConnection();
+            if (connection == null) {
+                return false;
+            }
+            for (Field field : connection.getClass().getDeclaredFields()) {
+                field.setAccessible(true);
+                final Object value = field.get(connection);
+                if (value instanceof List) {
+                    // Inject the list
+                    synchronized (value) {
+                        for (Object o : (List<?>) value) {
+                            if (o instanceof ChannelFuture) {
+                                return true;
+                            } else {
+                                break; // not the right list.
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return false;
+    }
+
+    @Override
+    public void inject() {
+        try {
+            Object serverConnection = NMSUtils.getMinecraftServerConnection();
+            for (Field field : serverConnection.getClass().getDeclaredFields()) {
+                field.setAccessible(true);
+                Object value = null;
+                try {
+                    value = field.get(serverConnection);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                if (value instanceof List) {
+                    //Get the list.
+                    List<?> listWrapper = new ListWrapper((List<?>) value) {
+                        @Override
+                        public void processAdd(Object o) {
+                            if (o instanceof ChannelFuture) {
+                                try {
+                                    injectChannelFuture((ChannelFuture) o);
+                                } catch (Exception ex) {
+                                    ex.printStackTrace();
+                                }
+                            }
+                        }
+                    };
+                    HashMap<Field, Object> map = new HashMap<>();
+                    map.put(field, serverConnection);
+                    injectedLists.add(map);
+
+                    field.set(serverConnection, listWrapper);
+
+                    synchronized (listWrapper) {
+                        for (Object serverChannel : (List<?>) value) {
+                            //Is this the server channel future list?
+                            if (serverChannel instanceof ChannelFuture) {
+                                //Yes it is...
+                                injectChannelFuture((ChannelFuture) serverChannel);
+                            } else {
+                                break;//Wrong list
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            PacketEvents.get().getPlugin().getLogger().severe("PacketEvents failed to inject!");
+            ex.printStackTrace();
+        }
+
+        //Player channels might have been registered already. Let us add our handlers. We are a little late though.
+        //This only happens when you join extremely early on older versions of minecraft.
+        List<Object> networkManagers = NMSUtils.getNetworkManagers();
+        synchronized (networkManagers) {
+            for (Object networkManager : networkManagers) {
+                WrappedPacket networkManagerWrapper = new WrappedPacket(new NMSPacket(networkManager), NMSUtils.networkManagerClass);
+                Channel channel = (Channel) networkManagerWrapper.readObject(0, NMSUtils.nettyChannelClass);
+                if (channel == null ||
+                        (!(channel.getClass().equals(NioSocketChannel.class))) &&
+                                !(channel.getClass().equals(EpollSocketChannel.class))) {
+                    continue;
+                }
+
+                if (channel.pipeline().get(PacketEvents.get().getHandlerName()) != null) {
+                    channel.pipeline().remove(PacketEvents.get().getHandlerName());
+                }
+
+                if (channel.pipeline().get("packet_handler") != null) {
+                    channel.pipeline().addBefore("packet_handler", PacketEvents.get().getHandlerName(), new PlayerChannelHandlerLegacy());
+                }
+            }
+        }
+    }
+
+
+    private void injectChannelFuture(ChannelFuture channelFuture) {
+        List<String> channelHandlerNames = channelFuture.channel().pipeline().names();
+        ChannelHandler bootstrapAcceptor = null;
+        Field bootstrapAcceptorField = null;
+        for (String handlerName : channelHandlerNames) {
+            ChannelHandler handler = channelFuture.channel().pipeline().get(handlerName);
+            try {
+                bootstrapAcceptorField = handler.getClass().getDeclaredField("childHandler");
+                bootstrapAcceptorField.setAccessible(true);
+                bootstrapAcceptorField.get(handler);
+                bootstrapAcceptor = handler;
+            } catch (Exception ignored) {
+
+            }
+        }
+
+        if (bootstrapAcceptor == null) {
+            bootstrapAcceptor = channelFuture.channel().pipeline().first();
+        }
+
+        ChannelInitializer<?> oldChannelInitializer = null;
+        try {
+            oldChannelInitializer = (ChannelInitializer<?>) bootstrapAcceptorField.get(bootstrapAcceptor);
+
+            ChannelInitializer<?> channelInitializer = new PEChannelInitializerLegacy(oldChannelInitializer);
+
+            //Replace the old channel initializer with our own.
+            bootstrapAcceptorField.setAccessible(true);
+            bootstrapAcceptorField.set(bootstrapAcceptor, channelInitializer);
+
+            injectedFutures.add(channelFuture);
+        } catch (IllegalAccessException e) {
+            ClassLoader cl = bootstrapAcceptor.getClass().getClassLoader();
+            if (cl.getClass().getName().equals("org.bukkit.plugin.java.PluginClassLoader")) {
+                PluginDescriptionFile yaml = null;
+                try {
+                    yaml = (PluginDescriptionFile) PluginDescriptionFile.class.getDeclaredField("description").get(cl);
+                } catch (IllegalAccessException | NoSuchFieldException e2) {
+                    e2.printStackTrace();
+                }
+                throw new IllegalStateException("PacketEvents failed to inject, because of " + bootstrapAcceptor.getClass().getName() + ", you might want to try running without " + yaml.getName() + "?");
+            } else {
+                throw new IllegalStateException("PacketEvents failed to find core component 'childHandler', please check your plugins. issue: " + bootstrapAcceptor.getClass().getName());
+            }
+        }
+
+    }
+
+    @Override
+    public void eject() {
+        Field childHandlerField = null;
+        for (ChannelFuture future : injectedFutures) {
+            List<String> names = future.channel().pipeline().names();
+            ChannelHandler bootstrapAcceptor = null;
+            // Pick best
+            for (String name : names) {
+                try {
+                    ChannelHandler handler = future.channel().pipeline().get(name);
+                    if (childHandlerField == null) {
+                        childHandlerField = handler.getClass().getDeclaredField("childHandler");
+                        childHandlerField.setAccessible(true);
+                    }
+
+                    ChannelInitializer<Channel> oldInit = (ChannelInitializer<Channel>) childHandlerField.get(handler);
+                    if (oldInit instanceof PEChannelInitializerLegacy) {
+                        bootstrapAcceptor = handler;
+                    }
+                } catch (Exception e) {
+                    // Not this one
+                }
+            }
+            // Default to first
+            if (bootstrapAcceptor == null) {
+                bootstrapAcceptor = future.channel().pipeline().first();
+            }
+
+            try {
+                ChannelInitializer<Channel> oldInit = (ChannelInitializer<Channel>) childHandlerField.get(bootstrapAcceptor);
+                if (oldInit instanceof PEChannelInitializerLegacy) {
+                    childHandlerField.setAccessible(true);
+                    childHandlerField.set(bootstrapAcceptor, ((PEChannelInitializerLegacy) oldInit).getOldChannelInitializer());
+                }
+            } catch (Exception e) {
+                PacketEvents.get().getPlugin().getLogger().severe("PacketEvents failed to eject the injection handler! Please reboot!");
+            }
+        }
+        injectedFutures.clear();
+
+        for (Map<Field, Object> map : injectedLists) {
+            try {
+                for (Field key : map.keySet()) {
+                    key.setAccessible(true);
+                    Object o = map.get(key);
+                    if (o instanceof ListWrapper) {
+                        key.set(o, ((ListWrapper) o).getOriginalList());
+                    }
+                }
+
+            } catch (IllegalAccessException e) {
+                PacketEvents.get().getPlugin().getLogger().severe("PacketEvents failed to eject the injection handler! Please reboot!!");
+            }
+        }
+
+        injectedLists.clear();
+    }
+
+    @Override
+    public void injectPlayer(Player player) {
+        Object channel = PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel != null) {
+            updatePlayerObject(player, channel);
+        }
+    }
+
+    @Override
+    public void ejectPlayer(Player player) {
+        Object channel = PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel != null) {
+            try {
+                ((Channel) channel).pipeline().remove(PacketEvents.get().getHandlerName());
+            } catch (Exception ignored) {
+
+            }
+        }
+    }
+
+    @Override
+    public boolean hasInjected(Player player) {
+        Object channel = PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel == null) {
+            return false;
+        }
+        PlayerChannelHandlerLegacy handler = getHandler(channel);
+        return handler != null && handler.player != null;
+    }
+
+    @Override
+    public void writePacket(Object ch, Object rawNMSPacket) {
+        Channel channel = (Channel) ch;
+        channel.write(rawNMSPacket);
+    }
+
+    @Override
+    public void flushPackets(Object ch) {
+        Channel channel = (Channel) ch;
+        channel.flush();
+    }
+
+    @Override
+    public void sendPacket(Object ch, Object rawNMSPacket) {
+        Channel channel = (Channel) ch;
+        channel.writeAndFlush(rawNMSPacket);
+    }
+
+    private PlayerChannelHandlerLegacy getHandler(Object rawChannel) {
+        Channel channel = (Channel) rawChannel;
+        ChannelHandler handler = channel.pipeline().get(PacketEvents.get().getHandlerName());
+        if (handler instanceof PlayerChannelHandlerLegacy) {
+            return (PlayerChannelHandlerLegacy) handler;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void updatePlayerObject(Player player, Object rawChannel) {
+        PlayerChannelHandlerLegacy handler = getHandler(rawChannel);
+        if (handler != null) {
+            handler.player = player;
+        }
+    }
+}
@@ -0,0 +1,64 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2021 ViaVersion 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 io.github.retrooper.packetevents.injector.legacy.early;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.injector.legacy.PlayerChannelHandlerLegacy;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.netty.channel.epoll.EpollSocketChannel;
+import net.minecraft.util.io.netty.channel.Channel;
+import net.minecraft.util.io.netty.channel.ChannelInitializer;
+import net.minecraft.util.io.netty.channel.socket.nio.NioSocketChannel;
+
+import java.lang.reflect.Method;
+
+public class PEChannelInitializerLegacy extends ChannelInitializer<Channel> {
+    private final ChannelInitializer<?> oldChannelInitializer;
+    private Method initChannelMethod;
+
+    public PEChannelInitializerLegacy(ChannelInitializer<?> oldChannelInitializer) {
+        this.oldChannelInitializer = oldChannelInitializer;
+        load();
+    }
+
+    private void load() {
+        initChannelMethod = Reflection.getMethod(oldChannelInitializer.getClass(), "initChannel", 0);
+    }
+
+    public ChannelInitializer<?> getOldChannelInitializer() {
+        return oldChannelInitializer;
+    }
+
+    @Override
+    protected void initChannel(Channel channel) throws Exception {
+        initChannelMethod.invoke(oldChannelInitializer, channel);
+        PlayerChannelHandlerLegacy channelHandler = new PlayerChannelHandlerLegacy();
+        if (channel.getClass().equals(NioSocketChannel.class)
+                || channel.getClass().equals(EpollSocketChannel.class)) {
+            if (channel.pipeline().get("packet_handler") != null) {
+                String handlerName = PacketEvents.get().getHandlerName();
+                if (channel.pipeline().get(handlerName) != null) {
+                    PacketEvents.get().getPlugin().getLogger().warning("[PacketEvents] Attempted to initialize a channel twice!");
+                } else {
+                    channel.pipeline().addBefore("packet_handler", handlerName, channelHandler);
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,86 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.injector.legacy.late;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.injector.LateInjector;
+import io.github.retrooper.packetevents.injector.legacy.PlayerChannelHandlerLegacy;
+import io.netty.channel.epoll.EpollSocketChannel;
+import net.minecraft.util.io.netty.channel.Channel;
+import net.minecraft.util.io.netty.channel.socket.nio.NioSocketChannel;
+import org.bukkit.entity.Player;
+
+public class LateChannelInjectorLegacy implements LateInjector {
+    @Override
+    public void inject() {
+
+    }
+
+    @Override
+    public void eject() {
+
+    }
+
+    @Override
+    public void injectPlayer(Player player) {
+        PlayerChannelHandlerLegacy playerChannelHandlerLegacy = new PlayerChannelHandlerLegacy();
+        playerChannelHandlerLegacy.player = player;
+        Channel channel = (Channel) PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel.getClass().equals(NioSocketChannel.class)
+        || channel.getClass().equals(EpollSocketChannel.class)) {
+            channel.pipeline().addBefore("packet_handler", PacketEvents.get().getHandlerName(), playerChannelHandlerLegacy);
+        }
+    }
+
+    @Override
+    public void ejectPlayer(Player player) {
+        Object channel = PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel != null) {
+            try {
+                ((Channel) channel).pipeline().remove(PacketEvents.get().getHandlerName());
+            } catch (Exception ignored) {
+
+            }
+        }
+    }
+
+    @Override
+    public boolean hasInjected(Player player) {
+        Channel channel = (Channel) PacketEvents.get().getPlayerUtils().getChannel(player);
+        return channel.pipeline().get(PacketEvents.get().getHandlerName()) != null;
+    }
+
+    @Override
+    public void writePacket(Object ch, Object rawNMSPacket) {
+        Channel channel = (Channel) ch;
+        channel.write(rawNMSPacket);
+    }
+
+    @Override
+    public void flushPackets(Object ch) {
+        Channel channel = (Channel) ch;
+        channel.flush();
+    }
+
+    @Override
+    public void sendPacket(Object rawChannel, Object packet) {
+        Channel channel = (Channel) rawChannel;
+        channel.pipeline().writeAndFlush(packet);
+    }
+}
@@ -0,0 +1,58 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2021 ViaVersion 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 io.github.retrooper.packetevents.injector.modern;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.processor.PacketProcessorInternal;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import org.bukkit.entity.Player;
+@ChannelHandler.Sharable
+public class PlayerChannelHandlerModern extends ChannelDuplexHandler {
+    /**
+     * Associated player.
+     * This is null until we inject the player.
+     */
+    public volatile Player player;
+
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, Object packet) throws Exception {
+        PacketProcessorInternal.PacketData data = PacketEvents.get().getInternalPacketProcessor().read(player, ctx.channel(), packet);
+        if (data.packet != null) {
+            super.channelRead(ctx, data.packet);
+            PacketEvents.get().getInternalPacketProcessor().postRead(player, ctx.channel(), data.packet);
+        }
+    }
+
+    @Override
+    public void write(final ChannelHandlerContext ctx, Object packet, final ChannelPromise promise) throws Exception {
+        PacketProcessorInternal.PacketData data = PacketEvents.get().getInternalPacketProcessor().write(player, ctx.channel(), packet);
+        if (data.postAction != null) {
+            promise.addListener(f -> {
+                data.postAction.run();
+            });
+        }
+        if (data.packet != null) {
+            super.write(ctx, data.packet, promise);
+            PacketEvents.get().getInternalPacketProcessor().postWrite(player, ctx.channel(), data.packet);
+        }
+    }
+}
@@ -0,0 +1,330 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2021 ViaVersion 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 io.github.retrooper.packetevents.injector.modern.early;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.injector.EarlyInjector;
+import io.github.retrooper.packetevents.injector.modern.PlayerChannelHandlerModern;
+import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.list.ListWrapper;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.epoll.EpollSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginDescriptionFile;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class EarlyChannelInjectorModern implements EarlyInjector {
+    private final List<ChannelFuture> injectedFutures = new ArrayList<>();
+    private final List<Map<Field, Object>> injectedLists = new ArrayList<>();
+
+    @Override
+    public boolean isBound() {
+        try {
+            Object connection = NMSUtils.getMinecraftServerConnection();
+            if (connection == null) {
+                return false;
+            }
+            for (Field field : connection.getClass().getDeclaredFields()) {
+                field.setAccessible(true);
+                final Object value = field.get(connection);
+                if (value instanceof List) {
+                    // Inject the list
+                    synchronized (value) {
+                        for (Object o : (List) value) {
+                            if (o instanceof ChannelFuture) {
+                                return true;
+                            } else {
+                                break; // not the right list.
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+        }
+        return false;
+    }
+
+    @Override
+    public void inject() {
+        try {
+           /* if (PaperChannelInjector.PAPER_INJECTION_METHOD) {
+                PaperChannelInjector.setPaperChannelInitializeListener();
+                return;
+            }*/
+            Object serverConnection = NMSUtils.getMinecraftServerConnection();
+            for (Field field : serverConnection.getClass().getDeclaredFields()) {
+                field.setAccessible(true);
+                Object value = null;
+                try {
+                    value = field.get(serverConnection);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                if (value instanceof List) {
+                    //Get the list.
+                    List listWrapper = new ListWrapper((List) value) {
+                        @Override
+                        public void processAdd(Object o) {
+                            if (o instanceof ChannelFuture) {
+                                try {
+                                    injectChannelFuture((ChannelFuture) o);
+                                } catch (Exception ex) {
+                                    ex.printStackTrace();
+                                }
+                            }
+                        }
+                    };
+                    HashMap<Field, Object> map = new HashMap<>();
+                    map.put(field, serverConnection);
+                    injectedLists.add(map);
+
+                    field.set(serverConnection, listWrapper);
+
+                    synchronized (listWrapper) {
+                        for (Object serverChannel : (List) value) {
+                            //Is this the server channel future list?
+                            if (serverChannel instanceof ChannelFuture) {
+                                //Yes it is...
+                                injectChannelFuture((ChannelFuture) serverChannel);
+                            } else {
+                                break;//Wrong list
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            throw new IllegalStateException("PacketEvents failed to inject!", ex);
+        }
+
+        //Player channels might have been registered already. Let us add our handlers. We are a little late though.
+        //This only happens when you join extremely early on older versions of minecraft.
+        List<Object> networkManagers = NMSUtils.getNetworkManagers();
+        synchronized (networkManagers) {
+            for (Object networkManager : networkManagers) {
+                WrappedPacket networkManagerWrapper = new WrappedPacket(new NMSPacket(networkManager), NMSUtils.networkManagerClass);
+                Channel channel = (Channel) networkManagerWrapper.readObject(0, NMSUtils.nettyChannelClass);
+                if (channel == null ||
+                        (!(channel.getClass().equals(NioSocketChannel.class))) &&
+                                !(channel.getClass().equals(EpollSocketChannel.class))) {
+                    continue;
+                }
+
+                if (channel.pipeline().get(PacketEvents.get().getHandlerName()) != null) {
+                    channel.pipeline().remove(PacketEvents.get().getHandlerName());
+                }
+
+                if (channel.pipeline().get("packet_handler") != null) {
+                    channel.pipeline().addBefore("packet_handler", PacketEvents.get().getHandlerName(), new PlayerChannelHandlerModern());
+                }
+            }
+        }
+    }
+
+
+    private void injectChannelFuture(ChannelFuture channelFuture) {
+        List<String> channelHandlerNames = channelFuture.channel().pipeline().names();
+        ChannelHandler bootstrapAcceptor = null;
+        Field bootstrapAcceptorField = null;
+        for (String handlerName : channelHandlerNames) {
+            ChannelHandler handler = channelFuture.channel().pipeline().get(handlerName);
+            try {
+                bootstrapAcceptorField = handler.getClass().getDeclaredField("childHandler");
+                bootstrapAcceptorField.setAccessible(true);
+                bootstrapAcceptorField.get(handler);
+                bootstrapAcceptor = handler;
+            } catch (Exception ignored) {
+            }
+        }
+
+        if (bootstrapAcceptor == null) {
+            bootstrapAcceptor = channelFuture.channel().pipeline().first();
+        }
+
+        ChannelInitializer<?> oldChannelInitializer;
+        try {
+            oldChannelInitializer = (ChannelInitializer<?>) bootstrapAcceptorField.get(bootstrapAcceptor);
+
+            ChannelInitializer<?> channelInitializer = new PEChannelInitializerModern(oldChannelInitializer);
+
+            //Replace the old channel initializer with our own.
+            bootstrapAcceptorField.setAccessible(true);
+            bootstrapAcceptorField.set(bootstrapAcceptor, channelInitializer);
+            injectedFutures.add(channelFuture);
+        } catch (IllegalAccessException e) {
+            ClassLoader cl = bootstrapAcceptor.getClass().getClassLoader();
+            if (cl.getClass().getName().equals("org.bukkit.plugin.java.PluginClassLoader")) {
+                PluginDescriptionFile yaml = null;
+                try {
+                    yaml = (PluginDescriptionFile) PluginDescriptionFile.class.getDeclaredField("description").get(cl);
+                } catch (IllegalAccessException | NoSuchFieldException e2) {
+                    e2.printStackTrace();
+                }
+                throw new IllegalStateException("PacketEvents failed to inject, because of " + bootstrapAcceptor.getClass().getName() + ", you might want to try running without " + yaml.getName() + "?");
+            } else {
+                throw new IllegalStateException("PacketEvents failed to find core component 'childHandler', please check your plugins. issue: " + bootstrapAcceptor.getClass().getName());
+            }
+        }
+
+    }
+
+    @Override
+    public void eject() {
+        // TODO: Uninject from players currently online to prevent protocol lib issues.
+       /* if (PaperChannelInjector.PAPER_INJECTION_METHOD) {
+            try {
+                PaperChannelInjector.removePaperChannelInitializeListener();
+            } catch (ReflectiveOperationException e) {
+                e.printStackTrace();
+            }
+        }*/
+        Field childHandlerField = null;
+        for (ChannelFuture future : injectedFutures) {
+            List<String> names = future.channel().pipeline().names();
+            ChannelHandler bootstrapAcceptor = null;
+            // Pick best
+            for (String name : names) {
+                try {
+                    ChannelHandler handler = future.channel().pipeline().get(name);
+                    if (childHandlerField == null) {
+                        childHandlerField = handler.getClass().getDeclaredField("childHandler");
+                        childHandlerField.setAccessible(true);
+                    }
+
+                    ChannelInitializer<Channel> oldInit = (ChannelInitializer<Channel>) childHandlerField.get(handler);
+                    if (oldInit instanceof PEChannelInitializerModern) {
+                        bootstrapAcceptor = handler;
+                    }
+                } catch (Exception ignored) {
+                    // Not this one
+                }
+            }
+            // Default to first
+            if (bootstrapAcceptor == null) {
+                bootstrapAcceptor = future.channel().pipeline().first();
+            }
+
+            try {
+                ChannelInitializer<Channel> oldInit = (ChannelInitializer<Channel>) childHandlerField.get(bootstrapAcceptor);
+                if (oldInit instanceof PEChannelInitializerModern) {
+                    childHandlerField.setAccessible(true);
+                    childHandlerField.set(bootstrapAcceptor, ((PEChannelInitializerModern) oldInit).getOldChannelInitializer());
+                }
+            } catch (Exception e) {
+                PacketEvents.get().getPlugin().getLogger().severe("PacketEvents failed to eject the injection handler! Please reboot!");
+            }
+        }
+        injectedFutures.clear();
+
+        for (Map<Field, Object> map : injectedLists) {
+            try {
+                for (Field key : map.keySet()) {
+                    key.setAccessible(true);
+                    Object o = map.get(key);
+                    if (o instanceof ListWrapper) {
+                        key.set(o, ((ListWrapper) o).getOriginalList());
+                    }
+                }
+
+            } catch (IllegalAccessException e) {
+                PacketEvents.get().getPlugin().getLogger().severe("PacketEvents failed to eject the injection handler! Please reboot!!");
+            }
+        }
+
+        injectedLists.clear();
+    }
+
+    @Override
+    public void injectPlayer(Player player) {
+        Object channel = PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel != null) {
+            updatePlayerObject(player, channel);
+        }
+    }
+
+    @Override
+    public void ejectPlayer(Player player) {
+        Object channel = PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel != null) {
+            Channel chnl = (Channel) channel;
+            try {
+                chnl.pipeline().remove(PacketEvents.get().getHandlerName());
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    @Override
+    public boolean hasInjected(Player player) {
+        Object channel = PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel == null) {
+            return false;
+        }
+        PlayerChannelHandlerModern handler = getHandler(channel);
+        return handler != null && handler.player != null;
+    }
+
+    @Override
+    public void writePacket(Object ch, Object rawNMSPacket) {
+        Channel channel = (Channel) ch;
+        channel.write(rawNMSPacket);
+    }
+
+    @Override
+    public void flushPackets(Object ch) {
+        Channel channel = (Channel) ch;
+        channel.flush();
+    }
+
+    @Override
+    public void sendPacket(Object ch, Object rawNMSPacket) {
+        Channel channel = (Channel) ch;
+        channel.writeAndFlush(rawNMSPacket);
+    }
+
+    private PlayerChannelHandlerModern getHandler(Object rawChannel) {
+        Channel channel = (Channel) rawChannel;
+        ChannelHandler handler = channel.pipeline().get(PacketEvents.get().getHandlerName());
+        if (handler instanceof PlayerChannelHandlerModern) {
+            return (PlayerChannelHandlerModern) handler;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void updatePlayerObject(Player player, Object rawChannel) {
+        PlayerChannelHandlerModern handler = getHandler(rawChannel);
+        if (handler != null) {
+            handler.player = player;
+        }
+    }
+}
@@ -0,0 +1,69 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2021 ViaVersion 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 io.github.retrooper.packetevents.injector.modern.early;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.injector.modern.PlayerChannelHandlerModern;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.epoll.EpollSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+
+import java.lang.reflect.Method;
+
+public class PEChannelInitializerModern extends ChannelInitializer<Channel> {
+    private final ChannelInitializer<?> oldChannelInitializer;
+    private Method initChannelMethod;
+
+    public PEChannelInitializerModern(ChannelInitializer<?> oldChannelInitializer) {
+        this.oldChannelInitializer = oldChannelInitializer;
+        load();
+    }
+
+    public static void postInitChannel(Channel channel) {
+        if (channel.getClass().equals(NioSocketChannel.class)
+                || channel.getClass().equals(EpollSocketChannel.class)) {
+            PlayerChannelHandlerModern channelHandler = new PlayerChannelHandlerModern();
+            if (channel.pipeline().get("packet_handler") != null) {
+                String handlerName = PacketEvents.get().getHandlerName();
+                if (channel.pipeline().get(handlerName) != null) {
+                    //Just ignore this to support latest ProtocolLib snapshots.
+                    //PacketEvents.get().getPlugin().getLogger().warning("[PacketEvents] Attempted to initialize a channel twice!");
+                } else {
+                    channel.pipeline().addBefore("packet_handler", handlerName, channelHandler);
+                }
+            }
+        }
+    }
+
+    private void load() {
+        initChannelMethod = Reflection.getMethod(oldChannelInitializer.getClass(), "initChannel", 0);
+    }
+
+    public ChannelInitializer<?> getOldChannelInitializer() {
+        return oldChannelInitializer;
+    }
+
+    @Override
+    protected void initChannel(Channel channel) throws Exception {
+        initChannelMethod.invoke(oldChannelInitializer, channel);
+        postInitChannel(channel);
+    }
+}
@@ -0,0 +1,87 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.injector.modern.late;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.injector.LateInjector;
+import io.github.retrooper.packetevents.injector.modern.PlayerChannelHandlerModern;
+import io.netty.channel.Channel;
+import io.netty.channel.epoll.EpollSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import org.bukkit.entity.Player;
+
+public class LateChannelInjectorModern implements LateInjector {
+    @Override
+    public void inject() {
+
+    }
+
+    @Override
+    public void eject() {
+
+    }
+
+    @Override
+    public void injectPlayer(Player player) {
+        PlayerChannelHandlerModern playerChannelHandlerModern = new PlayerChannelHandlerModern();
+        playerChannelHandlerModern.player = player;
+        Channel channel = (Channel) PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel.getClass().equals(NioSocketChannel.class) ||
+                channel.getClass().equals(EpollSocketChannel.class)) {
+            channel.pipeline().addBefore("packet_handler", PacketEvents.get().getHandlerName(), playerChannelHandlerModern);
+        }
+    }
+
+    @Override
+    public void ejectPlayer(Player player) {
+        Object channel = PacketEvents.get().getPlayerUtils().getChannel(player);
+        if (channel != null) {
+            Channel chnl = (Channel) channel;
+            try {
+                chnl.pipeline().remove(PacketEvents.get().getHandlerName());
+            } catch (Exception ex) {
+
+            }
+        }
+    }
+
+    @Override
+    public boolean hasInjected(Player player) {
+        Channel channel = (Channel) PacketEvents.get().getPlayerUtils().getChannel(player);
+        return channel.pipeline().get(PacketEvents.get().getHandlerName()) != null;
+    }
+
+    @Override
+    public void writePacket(Object ch, Object rawNMSPacket) {
+        Channel channel = (Channel) ch;
+        channel.write(rawNMSPacket);
+    }
+
+    @Override
+    public void flushPackets(Object ch) {
+        Channel channel = (Channel) ch;
+        channel.flush();
+    }
+
+    @Override
+    public void sendPacket(Object rawChannel, Object packet) {
+        Channel channel = (Channel) rawChannel;
+        channel.pipeline().writeAndFlush(packet);
+    }
+}
@@ -1,219 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.packet;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class PacketType {
-
-    public static class Client {
-        public static final Map<Class<?>, Byte> packetIds = new HashMap<Class<?>, Byte>();
-        public static final byte TELEPORT_ACCEPT = 0,
-                TILE_NBT_QUERY = 1, DIFFICULTY_CHANGE = 2, CHAT = 3, CLIENT_COMMAND = 4,
-                SETTINGS = 5, TAB_COMPLETE = 6, TRANSACTION = 7, ENCHANT_ITEM = 8,
-                WINDOW_CLICK = 9, CLOSE_WINDOW = 10, CUSTOM_PAYLOAD = 11, B_EDIT = 12,
-                ENTITY_NBT_QUERY = 13, USE_ENTITY = 14, JIGSAW_GENERATE = 15, KEEP_ALIVE = 16,
-                DIFFICULTY_LOCK = 17, POSITION = 18, POSITION_LOOK = 19, LOOK = 20,
-                FLYING = 21, VEHICLE_MOVE = 22, BOAT_MOVE = 23, PICK_ITEM = 24,
-                AUTO_RECIPE = 25, ABILITIES = 26, BLOCK_DIG = 27, ENTITY_ACTION = 28,
-                STEER_VEHICLE = 29, RECIPE_DISPLAYED = 30, ITEM_NAME = 31, RESOURCE_PACK_STATUS = 32,
-                ADVANCEMENTS = 33, TR_SEL = 34, BEACON = 35, HELD_ITEM_SLOT = 36,
-                SET_COMMAND_BLOCK = 37, SET_COMMAND_MINECART = 38, SET_CREATIVE_SLOT = 39, SET_JIGSAW = 40,
-                STRUCT = 41, UPDATE_SIGN = 42, ARM_ANIMATION = 43, SPECTATE = 44,
-                USE_ITEM = 45, BLOCK_PLACE = 46;
-
-        public static void init() {
-            packetIds.put(PacketTypeClasses.Client.TELEPORT_ACCEPT, TELEPORT_ACCEPT);
-            packetIds.put(PacketTypeClasses.Client.TILE_NBT_QUERY, TILE_NBT_QUERY);
-            packetIds.put(PacketTypeClasses.Client.DIFFICULTY_CHANGE, DIFFICULTY_CHANGE);
-            packetIds.put(PacketTypeClasses.Client.CHAT, CHAT);
-            packetIds.put(PacketTypeClasses.Client.CLIENT_COMMAND, CLIENT_COMMAND);
-            packetIds.put(PacketTypeClasses.Client.SETTINGS, SETTINGS);
-            packetIds.put(PacketTypeClasses.Client.TAB_COMPLETE, TAB_COMPLETE);
-            packetIds.put(PacketTypeClasses.Client.TRANSACTION, TRANSACTION);
-            packetIds.put(PacketTypeClasses.Client.ENCHANT_ITEM, ENCHANT_ITEM);
-            packetIds.put(PacketTypeClasses.Client.WINDOW_CLICK, WINDOW_CLICK);
-            packetIds.put(PacketTypeClasses.Client.CLOSE_WINDOW, CLOSE_WINDOW);
-            packetIds.put(PacketTypeClasses.Client.CUSTOM_PAYLOAD, CUSTOM_PAYLOAD);
-            packetIds.put(PacketTypeClasses.Client.B_EDIT, B_EDIT);
-            packetIds.put(PacketTypeClasses.Client.ENTITY_NBT_QUERY, ENTITY_NBT_QUERY);
-            packetIds.put(PacketTypeClasses.Client.USE_ENTITY, USE_ENTITY);
-            packetIds.put(PacketTypeClasses.Client.JIGSAW_GENERATE, JIGSAW_GENERATE);
-            packetIds.put(PacketTypeClasses.Client.KEEP_ALIVE, KEEP_ALIVE);
-            packetIds.put(PacketTypeClasses.Client.DIFFICULTY_LOCK, DIFFICULTY_LOCK);
-            packetIds.put(PacketTypeClasses.Client.POSITION, POSITION);
-            packetIds.put(PacketTypeClasses.Client.POSITION_LOOK, POSITION_LOOK);
-            packetIds.put(PacketTypeClasses.Client.LOOK, LOOK);
-            packetIds.put(PacketTypeClasses.Client.FLYING, FLYING);
-            packetIds.put(PacketTypeClasses.Client.VEHICLE_MOVE, VEHICLE_MOVE);
-            packetIds.put(PacketTypeClasses.Client.BOAT_MOVE, BOAT_MOVE);
-            packetIds.put(PacketTypeClasses.Client.PICK_ITEM, PICK_ITEM);
-            packetIds.put(PacketTypeClasses.Client.AUTO_RECIPE, AUTO_RECIPE);
-            packetIds.put(PacketTypeClasses.Client.ABILITIES, ABILITIES);
-            packetIds.put(PacketTypeClasses.Client.BLOCK_DIG, BLOCK_DIG);
-            packetIds.put(PacketTypeClasses.Client.ENTITY_ACTION, ENTITY_ACTION);
-            packetIds.put(PacketTypeClasses.Client.STEER_VEHICLE, STEER_VEHICLE);
-            packetIds.put(PacketTypeClasses.Client.RECIPE_DISPLAYED, RECIPE_DISPLAYED);
-            packetIds.put(PacketTypeClasses.Client.ITEM_NAME, ITEM_NAME);
-            packetIds.put(PacketTypeClasses.Client.RESOURCE_PACK_STATUS, RESOURCE_PACK_STATUS);
-            packetIds.put(PacketTypeClasses.Client.ADVANCEMENTS, ADVANCEMENTS);
-            packetIds.put(PacketTypeClasses.Client.TR_SEL, TR_SEL);
-            packetIds.put(PacketTypeClasses.Client.BEACON, BEACON);
-            packetIds.put(PacketTypeClasses.Client.HELD_ITEM_SLOT, HELD_ITEM_SLOT);
-            packetIds.put(PacketTypeClasses.Client.SET_COMMAND_BLOCK, SET_COMMAND_BLOCK);
-            packetIds.put(PacketTypeClasses.Client.SET_COMMAND_MINECART, SET_COMMAND_MINECART);
-            packetIds.put(PacketTypeClasses.Client.SET_CREATIVE_SLOT, SET_CREATIVE_SLOT);
-            packetIds.put(PacketTypeClasses.Client.SET_JIGSAW, SET_JIGSAW);
-            packetIds.put(PacketTypeClasses.Client.STRUCT, STRUCT);
-            packetIds.put(PacketTypeClasses.Client.UPDATE_SIGN, UPDATE_SIGN);
-            packetIds.put(PacketTypeClasses.Client.ARM_ANIMATION, ARM_ANIMATION);
-            packetIds.put(PacketTypeClasses.Client.SPECTATE, SPECTATE);
-            packetIds.put(PacketTypeClasses.Client.USE_ITEM, USE_ITEM);
-            packetIds.put(PacketTypeClasses.Client.BLOCK_PLACE, BLOCK_PLACE);
-        }
-
-        public static class Util {
-            public static boolean isInstanceOfFlying(final byte packetId) {
-                return packetId == FLYING
-                        || packetId == POSITION
-                        || packetId == POSITION_LOOK
-                        || packetId == LOOK;
-            }
-        }
-    }
-
-    public static class Server {
-        public static final Map<Class<?>, Byte> packetIds = new HashMap<Class<?>, Byte>();
-        public static byte SPAWN_ENTITY = 0, SPAWN_ENTITY_EXPERIENCE_ORB = 1, SPAWN_ENTITY_WEATHER = 2, SPAWN_ENTITY_LIVING = 3,
-                SPAWN_ENTITY_PAINTING = 4, SPAWN_ENTITY_SPAWN = 5, ANIMATION = 6, STATISTIC = 7,
-                BLOCK_BREAK = 8, BLOCK_BREAK_ANIMATION = 9, TILE_ENTITY_DATA = 10, BLOCK_ACTION = 11,
-                BLOCK_CHANGE = 12, BOSS = 13, SERVER_DIFFICULTY = 14, CHAT = 15, MULTI_BLOCK_CHANGE = 16,
-                TAB_COMPLETE = 17, COMMANDS = 18, TRANSACTION = 19, CLOSE_WINDOW = 20,
-                WINDOW_ITEMS = 21, WINDOW_DATA = 22, SET_SLOT = 23, SET_COOLDOWN = 24,
-                CUSTOM_PAYLOAD = 25, CUSTOM_SOUND_EFFECT = 26, KICK_DISCONNECT = 27, ENTITY_STATUS = 28,
-                EXPLOSION = 29, UNLOAD_CHUNK = 30, GAME_STATE_CHANGE = 31, OPEN_WINDOW_HORSE = 32,
-                KEEP_ALIVE = 33, MAP_CHUNK = 34, WORLD_EVENT = 35, WORLD_PARTICLES = 36,
-                LIGHT_UPDATE = 37, LOGIN = 38, MAP = 39, OPEN_WINDOW_MERCHANT = 40,
-                REL_ENTITY_MOVE = 41, REL_ENTITY_MOVE_LOOK = 42, ENTITY_LOOK = 43, ENTITY = 44,
-                VEHICLE_MOVE = 45, OPEN_BOOK = 46, OPEN_WINDOW = 47, OPEN_SIGN_EDITOR = 48,
-                AUTO_RECIPE = 49, ABILITIES = 50, COMBAT_EVENT = 51, PLAYER_INFO = 52,
-                LOOK_AT = 53, POSITION = 54, RECIPES = 55, ENTITY_DESTROY = 56,
-                REMOVE_ENTITY_EFFECT = 57, RESOURCE_PACK_SEND = 58, RESPAWN = 59, ENTITY_HEAD_ROTATION = 60,
-                SELECT_ADVANCEMENT_TAB = 61, WORLD_BORDER = 62, CAMERA = 63, HELD_ITEM_SLOT = 64,
-                VIEW_CENTRE = 65, VIEW_DISTANCE = 66, SCOREBOARD_DISPLAY_OBJECTIVE = 67, ENTITY_METADATA = 68,
-                ATTACH_ENTITY = 69, ENTITY_VELOCITY = 70, ENTITY_EQUIPMENT = 71, EXPERIENCE = 72,
-                UPDATE_HEALTH = 73, SCOREBOARD_OBJECTIVE = 74, MOUNT = 75, SCOREBOARD_TEAM = 76,
-                SCOREBOARD_SCORE = 77, SPAWN_POSITION = 78, UPDATE_TIME = 79, TITLE = 80,
-                ENTITY_SOUND = 81, NAMED_SOUND_EFFECT = 82, STOP_SOUND = 83, PLAYER_LIST_HEADER_FOOTER = 84,
-                NBT_QUERY = 85, COLLECT = 86, ENTITY_TELEPORT = 87, ADVANCEMENTS = 88, UPDATE_ATTRIBUTES = 89,
-                ENTITY_EFFECT = 90, RECIPE_UPDATE = 91, TAGS = 92, MAP_CHUNK_BULK = 93;
-
-        public static void init() {
-            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY, SPAWN_ENTITY);
-            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_EXPERIENCE_ORB, SPAWN_ENTITY_EXPERIENCE_ORB);
-            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_WEATHER, SPAWN_ENTITY_WEATHER);
-            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_LIVING, SPAWN_ENTITY_LIVING);
-            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_PAINTING, SPAWN_ENTITY_PAINTING);
-            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_SPAWN, SPAWN_ENTITY_SPAWN);
-            packetIds.put(PacketTypeClasses.Server.ANIMATION, ANIMATION);
-            packetIds.put(PacketTypeClasses.Server.STATISTIC, STATISTIC);
-            packetIds.put(PacketTypeClasses.Server.BLOCK_BREAK, BLOCK_BREAK);
-            packetIds.put(PacketTypeClasses.Server.BLOCK_BREAK_ANIMATION, BLOCK_BREAK_ANIMATION);
-            packetIds.put(PacketTypeClasses.Server.TILE_ENTITY_DATA, TILE_ENTITY_DATA);
-            packetIds.put(PacketTypeClasses.Server.BLOCK_ACTION, BLOCK_ACTION);
-            packetIds.put(PacketTypeClasses.Server.BLOCK_CHANGE, BLOCK_CHANGE);
-            packetIds.put(PacketTypeClasses.Server.BOSS, BOSS);
-            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY, SPAWN_ENTITY);
-            packetIds.put(PacketTypeClasses.Server.SERVER_DIFFICULTY, SERVER_DIFFICULTY);
-            packetIds.put(PacketTypeClasses.Server.CHAT, CHAT);
-            packetIds.put(PacketTypeClasses.Server.MULTI_BLOCK_CHANGE, MULTI_BLOCK_CHANGE);
-            packetIds.put(PacketTypeClasses.Server.TAB_COMPLETE, TAB_COMPLETE);
-            packetIds.put(PacketTypeClasses.Server.COMMANDS, COMMANDS);
-            packetIds.put(PacketTypeClasses.Server.TRANSACTION, TRANSACTION);
-            packetIds.put(PacketTypeClasses.Server.CLOSE_WINDOW, CLOSE_WINDOW);
-            packetIds.put(PacketTypeClasses.Server.WINDOW_ITEMS, WINDOW_ITEMS);
-            packetIds.put(PacketTypeClasses.Server.WINDOW_DATA, WINDOW_DATA);
-            packetIds.put(PacketTypeClasses.Server.SET_SLOT, SET_SLOT);
-            packetIds.put(PacketTypeClasses.Server.CUSTOM_PAYLOAD, CUSTOM_PAYLOAD);
-            packetIds.put(PacketTypeClasses.Server.CUSTOM_SOUND_EFFECT, CUSTOM_SOUND_EFFECT);
-            packetIds.put(PacketTypeClasses.Server.KICK_DISCONNECT, KICK_DISCONNECT);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_STATUS, ENTITY_STATUS);
-            packetIds.put(PacketTypeClasses.Server.EXPLOSION, EXPLOSION);
-            packetIds.put(PacketTypeClasses.Server.UNLOAD_CHUNK, UNLOAD_CHUNK);
-            packetIds.put(PacketTypeClasses.Server.GAME_STATE_CHANGE, GAME_STATE_CHANGE);
-            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW_HORSE, OPEN_WINDOW_HORSE);
-            packetIds.put(PacketTypeClasses.Server.KEEP_ALIVE, KEEP_ALIVE);
-            packetIds.put(PacketTypeClasses.Server.MAP_CHUNK, MAP_CHUNK);
-            packetIds.put(PacketTypeClasses.Server.WORLD_EVENT, SPAWN_ENTITY);
-            packetIds.put(PacketTypeClasses.Server.WORLD_PARTICLES, WORLD_PARTICLES);
-            packetIds.put(PacketTypeClasses.Server.LIGHT_UPDATE, LIGHT_UPDATE);
-            packetIds.put(PacketTypeClasses.Server.LOGIN, LOGIN);
-            packetIds.put(PacketTypeClasses.Server.MAP, MAP);
-            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW_MERCHANT, OPEN_WINDOW_MERCHANT);
-            packetIds.put(PacketTypeClasses.Server.REL_ENTITY_MOVE, REL_ENTITY_MOVE);
-            packetIds.put(PacketTypeClasses.Server.REL_ENTITY_MOVE_LOOK, REL_ENTITY_MOVE_LOOK);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_LOOK, ENTITY_LOOK);
-            packetIds.put(PacketTypeClasses.Server.ENTITY, ENTITY);
-            packetIds.put(PacketTypeClasses.Server.VEHICLE_MOVE, VEHICLE_MOVE);
-            packetIds.put(PacketTypeClasses.Server.OPEN_BOOK, OPEN_BOOK);
-            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW, OPEN_WINDOW);
-            packetIds.put(PacketTypeClasses.Server.OPEN_SIGN_EDITOR, OPEN_SIGN_EDITOR);
-            packetIds.put(PacketTypeClasses.Server.AUTO_RECIPE, AUTO_RECIPE);
-            packetIds.put(PacketTypeClasses.Server.ABILITIES, ABILITIES);
-            packetIds.put(PacketTypeClasses.Server.COMBAT_EVENT, COMBAT_EVENT);
-            packetIds.put(PacketTypeClasses.Server.PLAYER_INFO, PLAYER_INFO);
-            packetIds.put(PacketTypeClasses.Server.LOOK_AT, LOOK_AT);
-            packetIds.put(PacketTypeClasses.Server.POSITION, POSITION);
-            packetIds.put(PacketTypeClasses.Server.RECIPES, RECIPES);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_DESTROY, ENTITY_DESTROY);
-            packetIds.put(PacketTypeClasses.Server.REMOVE_ENTITY_EFFECT, REMOVE_ENTITY_EFFECT);
-            packetIds.put(PacketTypeClasses.Server.RESOURCE_PACK_SEND, RESOURCE_PACK_SEND);
-            packetIds.put(PacketTypeClasses.Server.RESPAWN, RESPAWN);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_HEAD_ROTATION, ENTITY_HEAD_ROTATION);
-            packetIds.put(PacketTypeClasses.Server.SELECT_ADVANCEMENT_TAB, SELECT_ADVANCEMENT_TAB);
-            packetIds.put(PacketTypeClasses.Server.WORLD_BORDER, WORLD_BORDER);
-            packetIds.put(PacketTypeClasses.Server.CAMERA, CAMERA);
-            packetIds.put(PacketTypeClasses.Server.HELD_ITEM_SLOT, HELD_ITEM_SLOT);
-            packetIds.put(PacketTypeClasses.Server.VIEW_CENTRE, VIEW_CENTRE);
-            packetIds.put(PacketTypeClasses.Server.VIEW_DISTANCE, VIEW_DISTANCE);
-            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_DISPLAY_OBJECTIVE, SCOREBOARD_DISPLAY_OBJECTIVE);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_METADATA, ENTITY_METADATA);
-            packetIds.put(PacketTypeClasses.Server.ATTACH_ENTITY, ATTACH_ENTITY);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_VELOCITY, ENTITY_VELOCITY);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_EQUIPMENT, ENTITY_EQUIPMENT);
-            packetIds.put(PacketTypeClasses.Server.EXPERIENCE, EXPERIENCE);
-            packetIds.put(PacketTypeClasses.Server.UPDATE_HEALTH, UPDATE_HEALTH);
-            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_OBJECTIVE, SCOREBOARD_OBJECTIVE);
-            packetIds.put(PacketTypeClasses.Server.MOUNT, MOUNT);
-            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_TEAM, SCOREBOARD_TEAM);
-            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_SCORE, SCOREBOARD_SCORE);
-            packetIds.put(PacketTypeClasses.Server.SPAWN_POSITION, SPAWN_POSITION);
-            packetIds.put(PacketTypeClasses.Server.UPDATE_TIME, UPDATE_TIME);
-            packetIds.put(PacketTypeClasses.Server.TITLE, TITLE);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_SOUND, ENTITY_SOUND);
-            packetIds.put(PacketTypeClasses.Server.NAMED_SOUND_EFFECT, NAMED_SOUND_EFFECT);
-            packetIds.put(PacketTypeClasses.Server.STOP_SOUND, STOP_SOUND);
-            packetIds.put(PacketTypeClasses.Server.PLAYER_LIST_HEADER_FOOTER, PLAYER_LIST_HEADER_FOOTER);
-            packetIds.put(PacketTypeClasses.Server.NBT_QUERY, NBT_QUERY);
-            packetIds.put(PacketTypeClasses.Server.COLLECT, COLLECT);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_TELEPORT, ENTITY_TELEPORT);
-            packetIds.put(PacketTypeClasses.Server.ADVANCEMENTS, ADVANCEMENTS);
-            packetIds.put(PacketTypeClasses.Server.UPDATE_ATTRIBUTES, UPDATE_ATTRIBUTES);
-            packetIds.put(PacketTypeClasses.Server.ENTITY_EFFECT, ENTITY_EFFECT);
-            packetIds.put(PacketTypeClasses.Server.RECIPE_UPDATE, RECIPE_UPDATE);
-            packetIds.put(PacketTypeClasses.Server.TAGS, TAGS);
-            packetIds.put(PacketTypeClasses.Server.MAP_CHUNK_BULK, MAP_CHUNK_BULK);
-        }
-
-        public static class Util {
-            public static boolean isInstanceOfEntity(final byte packetId) {
-                return packetId == ENTITY || packetId == REL_ENTITY_MOVE ||
-                        packetId == REL_ENTITY_MOVE_LOOK || packetId == ENTITY_LOOK;
-            }
-        }
-    }
-
-
-}
@@ -1,237 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.packet;
-
-import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-public class PacketTypeClasses {
-    public static class Client {
-        private static final String c = "PacketPlayIn";
-        @Nullable
-        public static Class<?> FLYING;
-
-        public static Class<?> POSITION, POSITION_LOOK, LOOK, CLIENT_COMMAND,
-                TRANSACTION, BLOCK_DIG, ENTITY_ACTION, USE_ENTITY,
-                WINDOW_CLICK, STEER_VEHICLE, CUSTOM_PAYLOAD, ARM_ANIMATION,
-                BLOCK_PLACE, USE_ITEM, ABILITIES, HELD_ITEM_SLOT,
-                CLOSE_WINDOW, TAB_COMPLETE, CHAT, SET_CREATIVE_SLOT,
-                KEEP_ALIVE, SETTINGS, ENCHANT_ITEM, TELEPORT_ACCEPT,
-                TILE_NBT_QUERY, DIFFICULTY_CHANGE, B_EDIT, ENTITY_NBT_QUERY,
-                JIGSAW_GENERATE, DIFFICULTY_LOCK, VEHICLE_MOVE, BOAT_MOVE, PICK_ITEM,
-                AUTO_RECIPE, RECIPE_DISPLAYED, ITEM_NAME, RESOURCE_PACK_STATUS,
-                ADVANCEMENTS, TR_SEL, BEACON, SET_COMMAND_BLOCK,
-                SET_COMMAND_MINECART, SET_JIGSAW, STRUCT, UPDATE_SIGN, SPECTATE;
-
-        public static void load() {
-            FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying");
-            try {
-                POSITION = NMSUtils.getNMSClass(c + "Position");
-                POSITION_LOOK = NMSUtils.getNMSClass(c + "PositionLook");
-                LOOK = NMSUtils.getNMSClass(c + "Look");
-            } catch (ClassNotFoundException e) {
-                POSITION = Reflection.getSubClass(FLYING, c + "Position");
-                POSITION_LOOK = Reflection.getSubClass(FLYING, c + "PositionLook");
-                LOOK = Reflection.getSubClass(FLYING, c + "Look");
-            }
-
-            try {
-                SETTINGS = NMSUtils.getNMSClass(c + "Settings");
-                ENCHANT_ITEM = NMSUtils.getNMSClass(c + "EnchantItem");
-
-                CLIENT_COMMAND = NMSUtils.getNMSClass(c + "ClientCommand");
-                TRANSACTION = NMSUtils.getNMSClass(c + "Transaction");
-                BLOCK_DIG = NMSUtils.getNMSClass(c + "BlockDig");
-                ENTITY_ACTION = NMSUtils.getNMSClass(c + "EntityAction");
-                USE_ENTITY = NMSUtils.getNMSClass(c + "UseEntity");
-                WINDOW_CLICK = NMSUtils.getNMSClass(c + "WindowClick");
-                STEER_VEHICLE = NMSUtils.getNMSClass(c + "SteerVehicle");
-                CUSTOM_PAYLOAD = NMSUtils.getNMSClass(c + "CustomPayload");
-                ARM_ANIMATION = NMSUtils.getNMSClass(c + "ArmAnimation");
-                ABILITIES = NMSUtils.getNMSClass(c + "Abilities");
-                HELD_ITEM_SLOT = NMSUtils.getNMSClass(c + "HeldItemSlot");
-                CLOSE_WINDOW = NMSUtils.getNMSClass(c + "CloseWindow");
-                TAB_COMPLETE = NMSUtils.getNMSClass(c + "TabComplete");
-                CHAT = NMSUtils.getNMSClass(c + "Chat");
-                SET_CREATIVE_SLOT = NMSUtils.getNMSClass(c + "SetCreativeSlot");
-                KEEP_ALIVE = NMSUtils.getNMSClass(c + "KeepAlive");
-                UPDATE_SIGN = NMSUtils.getNMSClassWithoutException(c + "UpdateSign");
-
-                TELEPORT_ACCEPT = NMSUtils.getNMSClassWithoutException(c + "TeleportAccept");
-                TILE_NBT_QUERY = NMSUtils.getNMSClassWithoutException(c + "TileNBTQuery");
-                DIFFICULTY_CHANGE = NMSUtils.getNMSClassWithoutException(c + "DifficultyChange");
-                B_EDIT = NMSUtils.getNMSClassWithoutException(c + "BEdit");
-                ENTITY_NBT_QUERY = NMSUtils.getNMSClassWithoutException(c + "EntityNBTQuery");
-                JIGSAW_GENERATE = NMSUtils.getNMSClassWithoutException(c + "JigsawGenerate");
-                DIFFICULTY_LOCK = NMSUtils.getNMSClassWithoutException(c + "DifficultyLock");
-                VEHICLE_MOVE = NMSUtils.getNMSClassWithoutException(c + "VehicleMove");
-                BOAT_MOVE = NMSUtils.getNMSClassWithoutException(c + "BoatMove");
-                PICK_ITEM = NMSUtils.getNMSClassWithoutException(c + "PickItem");
-                AUTO_RECIPE = NMSUtils.getNMSClassWithoutException(c + "AutoRecipe");
-                RECIPE_DISPLAYED = NMSUtils.getNMSClassWithoutException(c + "RecipeDisplayed");
-                ITEM_NAME = NMSUtils.getNMSClassWithoutException(c + "ItemName");
-                //1.8+
-                RESOURCE_PACK_STATUS = NMSUtils.getNMSClassWithoutException(c + "ResourcePackStatus");
-
-                ADVANCEMENTS = NMSUtils.getNMSClassWithoutException(c + "Advancements");
-                TR_SEL = NMSUtils.getNMSClassWithoutException(c + "TrSel");
-                BEACON = NMSUtils.getNMSClassWithoutException(c + "Beacon");
-                SET_COMMAND_BLOCK = NMSUtils.getNMSClassWithoutException(c + "SetCommandBlock");
-                SET_COMMAND_MINECART = NMSUtils.getNMSClassWithoutException(c + "SetCommandMinecart");
-                SET_JIGSAW = NMSUtils.getNMSClassWithoutException(c + "SetJigsaw");
-                STRUCT = NMSUtils.getNMSClassWithoutException(c + "Struct");
-                SPECTATE = NMSUtils.getNMSClassWithoutException(c + "Spectate");
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
-            //Block place
-            try {
-                BLOCK_PLACE = NMSUtils.getNMSClass(c + "BlockPlace");
-            } catch (ClassNotFoundException e) {
-                //They are just on a newer version
-                try {
-                    USE_ITEM = NMSUtils.getNMSClass(c + "UseItem");
-                } catch (ClassNotFoundException e2) {
-                    e.printStackTrace();
-                    e2.printStackTrace();
-                }
-            }
-
-            PacketType.Client.init();
-        }
-    }
-
-    public static class Server {
-        private static final String s = "PacketPlayOut";
-        public static Class<?> SPAWN_ENTITY, SPAWN_ENTITY_EXPERIENCE_ORB, SPAWN_ENTITY_WEATHER, SPAWN_ENTITY_LIVING,
-                SPAWN_ENTITY_PAINTING, SPAWN_ENTITY_SPAWN, ANIMATION, STATISTIC,
-                BLOCK_BREAK, BLOCK_BREAK_ANIMATION, TILE_ENTITY_DATA, BLOCK_ACTION,
-                BLOCK_CHANGE, BOSS, SERVER_DIFFICULTY, CHAT, MULTI_BLOCK_CHANGE,
-                TAB_COMPLETE, COMMANDS, TRANSACTION, CLOSE_WINDOW,
-                WINDOW_ITEMS, WINDOW_DATA, SET_SLOT, SET_COOLDOWN,
-                CUSTOM_PAYLOAD, CUSTOM_SOUND_EFFECT, KICK_DISCONNECT, ENTITY_STATUS,
-                EXPLOSION, UNLOAD_CHUNK, GAME_STATE_CHANGE, OPEN_WINDOW_HORSE,
-                KEEP_ALIVE, MAP_CHUNK, WORLD_EVENT, WORLD_PARTICLES,
-                LIGHT_UPDATE, LOGIN, MAP, OPEN_WINDOW_MERCHANT,
-                REL_ENTITY_MOVE, REL_ENTITY_MOVE_LOOK, ENTITY_LOOK, ENTITY,
-                VEHICLE_MOVE, OPEN_BOOK, OPEN_WINDOW, OPEN_SIGN_EDITOR,
-                AUTO_RECIPE, ABILITIES, COMBAT_EVENT, PLAYER_INFO,
-                LOOK_AT, POSITION, RECIPES, ENTITY_DESTROY,
-                REMOVE_ENTITY_EFFECT, RESOURCE_PACK_SEND, RESPAWN, ENTITY_HEAD_ROTATION,
-                SELECT_ADVANCEMENT_TAB, WORLD_BORDER, CAMERA, HELD_ITEM_SLOT,
-                VIEW_CENTRE, VIEW_DISTANCE, SCOREBOARD_DISPLAY_OBJECTIVE, ENTITY_METADATA,
-                ATTACH_ENTITY, ENTITY_VELOCITY, ENTITY_EQUIPMENT, EXPERIENCE,
-                UPDATE_HEALTH, SCOREBOARD_OBJECTIVE, MOUNT, SCOREBOARD_TEAM,
-                SCOREBOARD_SCORE, SPAWN_POSITION, UPDATE_TIME, TITLE,
-                ENTITY_SOUND, NAMED_SOUND_EFFECT, STOP_SOUND, PLAYER_LIST_HEADER_FOOTER,
-                NBT_QUERY, COLLECT, ENTITY_TELEPORT, ADVANCEMENTS, UPDATE_ATTRIBUTES,
-                ENTITY_EFFECT, RECIPE_UPDATE, TAGS, MAP_CHUNK_BULK;
-
-        public static void load() {
-            SPAWN_ENTITY = NMSUtils.getNMSClassWithoutException(s + "SpawnEntity");
-            SPAWN_ENTITY_EXPERIENCE_ORB = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityExperienceOrb");
-            SPAWN_ENTITY_WEATHER = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityWeather");
-            SPAWN_ENTITY_LIVING = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityLiving");
-            SPAWN_ENTITY_PAINTING = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityPainting");
-            SPAWN_ENTITY_SPAWN = NMSUtils.getNMSClassWithoutException(s + "SpawnEntitySpawn");
-            ANIMATION = NMSUtils.getNMSClassWithoutException(s + "Animation");
-            STATISTIC = NMSUtils.getNMSClassWithoutException(s + "Statistic");
-            BLOCK_BREAK = NMSUtils.getNMSClassWithoutException(s + "BlockBreak");
-            BLOCK_BREAK_ANIMATION = NMSUtils.getNMSClassWithoutException(s + "BlockBreakAnimation");
-            TILE_ENTITY_DATA = NMSUtils.getNMSClassWithoutException(s + "TileEntityData");
-            BLOCK_ACTION = NMSUtils.getNMSClassWithoutException(s + "BlockAction");
-            BLOCK_CHANGE = NMSUtils.getNMSClassWithoutException(s + "BlockChange");
-            BOSS = NMSUtils.getNMSClassWithoutException(s + "Boss");
-            SERVER_DIFFICULTY = NMSUtils.getNMSClassWithoutException(s + "ServerDifficulty");
-            CHAT = NMSUtils.getNMSClassWithoutException(s + "Chat");
-            MULTI_BLOCK_CHANGE = NMSUtils.getNMSClassWithoutException(s + "MultiBlockChange");
-            TAB_COMPLETE = NMSUtils.getNMSClassWithoutException(s + "TabComplete");
-            COMMANDS = NMSUtils.getNMSClassWithoutException(s + "Commands");
-            TRANSACTION = NMSUtils.getNMSClassWithoutException(s + "Transaction");
-            CLOSE_WINDOW = NMSUtils.getNMSClassWithoutException(s + "CloseWindow");
-            WINDOW_ITEMS = NMSUtils.getNMSClassWithoutException(s + "WindowItems");
-            WINDOW_DATA = NMSUtils.getNMSClassWithoutException(s + "WindowData");
-            SET_SLOT = NMSUtils.getNMSClassWithoutException(s + "SetSlot");
-            SET_COOLDOWN = NMSUtils.getNMSClassWithoutException(s + "SetCooldown");
-            CUSTOM_PAYLOAD = NMSUtils.getNMSClassWithoutException(s + "CustomPayload");
-            CUSTOM_SOUND_EFFECT = NMSUtils.getNMSClassWithoutException(s + "CustomSoundEffect");
-            KICK_DISCONNECT = NMSUtils.getNMSClassWithoutException(s + "KickDisconnect");
-            ENTITY_STATUS = NMSUtils.getNMSClassWithoutException(s + "EntityStatus");
-            EXPLOSION = NMSUtils.getNMSClassWithoutException(s + "Explosion");
-            UNLOAD_CHUNK = NMSUtils.getNMSClassWithoutException(s + "UnloadChunk");
-            GAME_STATE_CHANGE = NMSUtils.getNMSClassWithoutException(s + "GameStateChange");
-            OPEN_WINDOW_HORSE = NMSUtils.getNMSClassWithoutException(s + "OpenWindowHorse");
-            KEEP_ALIVE = NMSUtils.getNMSClassWithoutException(s + "KeepAlive");
-            MAP_CHUNK = NMSUtils.getNMSClassWithoutException(s + "MapChunk");
-            WORLD_EVENT = NMSUtils.getNMSClassWithoutException(s + "WorldEvent");
-            WORLD_PARTICLES = NMSUtils.getNMSClassWithoutException(s + "WorldParticles");
-            LIGHT_UPDATE = NMSUtils.getNMSClassWithoutException(s + "LightUpdate");
-            LOGIN = NMSUtils.getNMSClassWithoutException(s + "Login");
-            MAP = NMSUtils.getNMSClassWithoutException(s + "Map");
-            OPEN_WINDOW_MERCHANT = NMSUtils.getNMSClassWithoutException(s + "OpenWindowMerchant");
-            ENTITY = NMSUtils.getNMSClassWithoutException(s + "Entity");
-            REL_ENTITY_MOVE = Reflection.getSubClass(ENTITY, s + "RelEntityMove");
-            REL_ENTITY_MOVE_LOOK = Reflection.getSubClass(ENTITY, s + "RelEntityMoveLook");
-            ENTITY_LOOK = Reflection.getSubClass(ENTITY, s + "EntityLook");
-            if (REL_ENTITY_MOVE == null) {
-                //is not a subclass and should be accessed normally
-                REL_ENTITY_MOVE = NMSUtils.getNMSClassWithoutException(s + "RelEntityMove");
-                REL_ENTITY_MOVE_LOOK = NMSUtils.getNMSClassWithoutException(s + "RelEntityMoveLook");
-                ENTITY_LOOK = NMSUtils.getNMSClassWithoutException(s + "RelEntityLook");
-            }
-            VEHICLE_MOVE = NMSUtils.getNMSClassWithoutException(s + "VehicleMove");
-            OPEN_BOOK = NMSUtils.getNMSClassWithoutException(s + "OpenBook");
-            OPEN_WINDOW = NMSUtils.getNMSClassWithoutException(s + "OpenWindow");
-            OPEN_SIGN_EDITOR = NMSUtils.getNMSClassWithoutException(s + "OpenSignEditor");
-            AUTO_RECIPE = NMSUtils.getNMSClassWithoutException(s + "AutoRecipe");
-            ABILITIES = NMSUtils.getNMSClassWithoutException(s + "Abilities");
-            COMBAT_EVENT = NMSUtils.getNMSClassWithoutException(s + "CombatEvent");
-            PLAYER_INFO = NMSUtils.getNMSClassWithoutException(s + "PlayerInfo");
-            LOOK_AT = NMSUtils.getNMSClassWithoutException(s + "LookAt");
-            POSITION = NMSUtils.getNMSClassWithoutException(s + "Position");
-            RECIPES = NMSUtils.getNMSClassWithoutException(s + "Recipes");
-            ENTITY_DESTROY = NMSUtils.getNMSClassWithoutException(s + "EntityDestroy");
-            REMOVE_ENTITY_EFFECT = NMSUtils.getNMSClassWithoutException(s + "RemoveEntityEffect");
-            RESOURCE_PACK_SEND = NMSUtils.getNMSClassWithoutException(s + "ResourcePackSend");
-            RESPAWN = NMSUtils.getNMSClassWithoutException(s + "Respawn");
-            ENTITY_HEAD_ROTATION = NMSUtils.getNMSClassWithoutException(s + "EntityHeadRotation");
-            SELECT_ADVANCEMENT_TAB = NMSUtils.getNMSClassWithoutException(s + "SelectAdvancementTab");
-            WORLD_BORDER = NMSUtils.getNMSClassWithoutException(s + "WorldBorder");
-            CAMERA = NMSUtils.getNMSClassWithoutException(s + "Camera");
-            HELD_ITEM_SLOT = NMSUtils.getNMSClassWithoutException(s + "HeldItemSlot");
-            VIEW_CENTRE = NMSUtils.getNMSClassWithoutException(s + "ViewCentre");
-            VIEW_DISTANCE = NMSUtils.getNMSClassWithoutException(s + "ViewDistance");
-            SCOREBOARD_DISPLAY_OBJECTIVE = NMSUtils.getNMSClassWithoutException(s + "ScoreboardDisplayObjective");
-            ENTITY_METADATA = NMSUtils.getNMSClassWithoutException(s + "EntityMetadata");
-            ATTACH_ENTITY = NMSUtils.getNMSClassWithoutException(s + "AttachEntity");
-            ENTITY_VELOCITY = NMSUtils.getNMSClassWithoutException(s + "EntityVelocity");
-            ENTITY_EQUIPMENT = NMSUtils.getNMSClassWithoutException(s + "EntityEquipment");
-            EXPERIENCE = NMSUtils.getNMSClassWithoutException(s + "Experience");
-            UPDATE_HEALTH = NMSUtils.getNMSClassWithoutException(s + "UpdateHealth");
-            SCOREBOARD_OBJECTIVE = NMSUtils.getNMSClassWithoutException(s + "ScoreboardObjective");
-            MOUNT = NMSUtils.getNMSClassWithoutException(s + "Mount");
-            SCOREBOARD_TEAM = NMSUtils.getNMSClassWithoutException(s + "ScoreboardTeam");
-            SCOREBOARD_SCORE = NMSUtils.getNMSClassWithoutException(s + "ScoreboardScore");
-            SPAWN_POSITION = NMSUtils.getNMSClassWithoutException(s + "SpawnPosition");
-            UPDATE_TIME = NMSUtils.getNMSClassWithoutException(s + "UpdateTime");
-            TITLE = NMSUtils.getNMSClassWithoutException(s + "Title");
-            ENTITY_SOUND = NMSUtils.getNMSClassWithoutException(s + "EntitySound");
-            NAMED_SOUND_EFFECT = NMSUtils.getNMSClassWithoutException(s + "NamedSoundEffect");
-            STOP_SOUND = NMSUtils.getNMSClassWithoutException(s + "StopSound");
-            PLAYER_LIST_HEADER_FOOTER = NMSUtils.getNMSClassWithoutException(s + "PlayerListHeaderFooter");
-            NBT_QUERY = NMSUtils.getNMSClassWithoutException(s + "NBTQuery");
-            COLLECT = NMSUtils.getNMSClassWithoutException(s + "Collect");
-            ENTITY_TELEPORT = NMSUtils.getNMSClassWithoutException(s + "EntityTeleport");
-            ADVANCEMENTS = NMSUtils.getNMSClassWithoutException(s + "Advancements");
-            UPDATE_ATTRIBUTES = NMSUtils.getNMSClassWithoutException(s + "UpdateAttributes");
-            ENTITY_EFFECT = NMSUtils.getNMSClassWithoutException(s + "EntityEffect");
-            RECIPE_UPDATE = NMSUtils.getNMSClassWithoutException(s + "RecipeUpdate");
-            TAGS = NMSUtils.getNMSClassWithoutException(s + "Tags");
-            MAP_CHUNK_BULK = NMSUtils.getNMSClassWithoutException(s + "MapChunkBulk");
-            PacketType.Server.init();
-        }
-    }
-
-}
@@ -0,0 +1,27 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.packettype;
+
+/**
+ * @author retrooper
+ * @since 1.8
+ */
+public enum PacketState {
+    STATUS, HANDSHAKING, LOGIN, PLAY
+}
@@ -0,0 +1,467 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.packettype;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
+
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+/**
+ * Packet Type IDs.
+ * This is the Packet ID system, it is recommended to use this over packet comparisons by packet name.
+ * This is also faster than comparing packet names.
+ *
+ * @author retrooper
+ * @since 1.6.8
+ */
+public class PacketType {
+    /**
+     * If a Packet Type could not be resolved, it will be set to the current value of this constant.
+     * This value may change over the versions so it is important to use the variable and not hard code its value.
+     */
+    public static final byte INVALID = -128;
+    public static final Map<Class<?>, Byte> packetIDMap = new IdentityHashMap<>();
+    private static final boolean isNine = ServerVersion.getVersion().isNewerThanOrEquals(ServerVersion.v_1_9);
+
+    private static void insertPacketID(Class<?> cls, byte packetID) {
+        if (cls != null) {
+            packetIDMap.put(cls, packetID);
+        }
+    }
+
+    public static void load() {
+        Status.Client.load();
+        Status.Server.load();
+
+        Handshaking.Client.load();
+
+        Login.Client.load();
+        Login.Server.load();
+
+        Play.Client.load();
+        Play.Server.load();
+    }
+
+    /**
+     * Status Packet IDs.
+     *
+     * @author retrooper
+     * @see <a href="https://wiki.vg/Protocol#Status">https://wiki.vg/Protocol#Status</a>
+     * @since 1.7
+     */
+    public static class Status {
+        /**
+         * Server-bound (client-sided) Status Packet IDs.
+         *
+         * @author retrooper
+         * @see <a href="https://wiki.vg/Protocol#Serverbound_2">https://wiki.vg/Protocol#Serverbound_2</a>
+         * @since 1.8
+         */
+        public static class Client {
+            public static final byte START = -127, PING = -126;
+
+            private static void load() {
+                insertPacketID(PacketTypeClasses.Status.Client.START, Client.START);
+                insertPacketID(PacketTypeClasses.Status.Client.PING, Client.PING);
+            }
+        }
+
+        /**
+         * Client-bound (server-sided) Status Packet IDs.
+         *
+         * @author retrooper
+         * @see <a href="https://wiki.vg/Protocol#Clientbound_2">https://wiki.vg/Protocol#Clientbound_2</a>
+         * @since 1.8
+         */
+        public static class Server {
+            public static final byte PONG = -125, SERVER_INFO = -124;
+
+            private static void load() {
+                insertPacketID(PacketTypeClasses.Status.Server.PONG, Server.PONG);
+                insertPacketID(PacketTypeClasses.Status.Server.SERVER_INFO, Server.SERVER_INFO);
+            }
+        }
+    }
+
+    /**
+     * Handshaking Packet IDs.
+     *
+     * @author retrooper
+     * @see <a href="https://wiki.vg/Protocol#Handshaking">https://wiki.vg/Protocol#Handshaking</a>
+     * @since 1.8
+     */
+    public static class Handshaking {
+        /**
+         * Server-bound (client-sided) Handshaking Packet IDs.
+         *
+         * @author retrooper
+         * @since 1.8
+         */
+        public static class Client {
+            public static final byte SET_PROTOCOL = -123;
+
+            private static void load() {
+                insertPacketID(PacketTypeClasses.Handshaking.Client.SET_PROTOCOL, Client.SET_PROTOCOL);
+            }
+        }
+    }
+
+    /**
+     * Login Packet IDs.
+     *
+     * @author retrooper
+     * @see <a href="https://wiki.vg/Protocol#Login">https://wiki.vg/Protocol#Login</a>
+     * @since 1.7
+     */
+    public static class Login {
+        /**
+         * Server-bound (client-sided) Login Packet IDs.
+         *
+         * @author retrooper
+         * @see <a href="https://wiki.vg/Protocol#Serverbound_3">https://wiki.vg/Protocol#Serverbound_3</a>
+         * @since 1.8
+         */
+        public static class Client {
+            public static final byte CUSTOM_PAYLOAD = -122, START = -121, ENCRYPTION_BEGIN = -120;
+
+            private static void load() {
+                insertPacketID(PacketTypeClasses.Login.Client.CUSTOM_PAYLOAD, Client.CUSTOM_PAYLOAD);
+                insertPacketID(PacketTypeClasses.Login.Client.START, Client.START);
+                insertPacketID(PacketTypeClasses.Login.Client.ENCRYPTION_BEGIN, Client.ENCRYPTION_BEGIN);
+            }
+        }
+
+        /**
+         * Client-bound (server-sided) Login Packet IDs.
+         *
+         * @author retrooper
+         * @see <a href="https://wiki.vg/Protocol#Clientbound_3">https://wiki.vg/Protocol#Clientbound_3</a>
+         * @since 1.8
+         */
+        public static class Server {
+            public static final byte CUSTOM_PAYLOAD = -119, DISCONNECT = -118, ENCRYPTION_BEGIN = -117, SUCCESS = -116, SET_COMPRESSION = -115;
+
+            private static void load() {
+                insertPacketID(PacketTypeClasses.Login.Server.CUSTOM_PAYLOAD, Server.CUSTOM_PAYLOAD);
+                insertPacketID(PacketTypeClasses.Login.Server.DISCONNECT, Server.DISCONNECT);
+                insertPacketID(PacketTypeClasses.Login.Server.ENCRYPTION_BEGIN, Server.ENCRYPTION_BEGIN);
+                insertPacketID(PacketTypeClasses.Login.Server.SUCCESS, Server.SUCCESS);
+                insertPacketID(PacketTypeClasses.Login.Server.SET_COMPRESSION, Server.SET_COMPRESSION);
+            }
+        }
+    }
+
+    /**
+     * Play Packet IDs.
+     *
+     * @author retrooper
+     * @see <a href="https://wiki.vg/Protocol#Play">https://wiki.vg/Protocol#Play</a>
+     * @since 1.8
+     */
+    public static class Play {
+        /**
+         * Server-bound (client-sided) Play Packet IDs.
+         *
+         * @author retrooper
+         * @see <a href="https://wiki.vg/Protocol#Serverbound_4">https://wiki.vg/Protocol#Serverbound_4</a>
+         * @since 1.8
+         */
+        public static class Client {
+            public static final byte TELEPORT_ACCEPT = -114,
+                    TILE_NBT_QUERY = -113, DIFFICULTY_CHANGE = -112, CHAT = -111, CLIENT_COMMAND = -110,
+                    SETTINGS = -109, TAB_COMPLETE = -108, TRANSACTION = -107, ENCHANT_ITEM = -106,
+                    WINDOW_CLICK = -105, CLOSE_WINDOW = -104, CUSTOM_PAYLOAD = -103, B_EDIT = -102,
+                    ENTITY_NBT_QUERY = -101, USE_ENTITY = -100, JIGSAW_GENERATE = -99, KEEP_ALIVE = -98,
+                    DIFFICULTY_LOCK = -97, POSITION = -96, POSITION_LOOK = -95, LOOK = -94,
+                    FLYING = -93, VEHICLE_MOVE = -92, BOAT_MOVE = -91, PICK_ITEM = -90,
+                    AUTO_RECIPE = -89, ABILITIES = -88, BLOCK_DIG = -87, ENTITY_ACTION = -86,
+                    STEER_VEHICLE = -85, RECIPE_DISPLAYED = -84, ITEM_NAME = -83, RESOURCE_PACK_STATUS = -82,
+                    ADVANCEMENTS = -81, TR_SEL = -80, BEACON = -79, HELD_ITEM_SLOT = -78,
+                    SET_COMMAND_BLOCK = -77, SET_COMMAND_MINECART = -76, SET_CREATIVE_SLOT = -75, SET_JIGSAW = -74,
+                    STRUCT = -73, UPDATE_SIGN = -72, ARM_ANIMATION = -71, SPECTATE = -70,
+                    USE_ITEM = -69, BLOCK_PLACE = -68, PONG = 28;
+
+            private static void load() {
+                insertPacketID(PacketTypeClasses.Play.Client.TELEPORT_ACCEPT, TELEPORT_ACCEPT);
+                insertPacketID(PacketTypeClasses.Play.Client.TILE_NBT_QUERY, TILE_NBT_QUERY);
+                insertPacketID(PacketTypeClasses.Play.Client.DIFFICULTY_CHANGE, DIFFICULTY_CHANGE);
+                insertPacketID(PacketTypeClasses.Play.Client.CHAT, CHAT);
+                insertPacketID(PacketTypeClasses.Play.Client.CLIENT_COMMAND, CLIENT_COMMAND);
+                insertPacketID(PacketTypeClasses.Play.Client.SETTINGS, SETTINGS);
+                insertPacketID(PacketTypeClasses.Play.Client.TAB_COMPLETE, TAB_COMPLETE);
+                insertPacketID(PacketTypeClasses.Play.Client.TRANSACTION, TRANSACTION);
+                insertPacketID(PacketTypeClasses.Play.Client.ENCHANT_ITEM, ENCHANT_ITEM);
+                insertPacketID(PacketTypeClasses.Play.Client.WINDOW_CLICK, WINDOW_CLICK);
+                insertPacketID(PacketTypeClasses.Play.Client.CLOSE_WINDOW, CLOSE_WINDOW);
+                insertPacketID(PacketTypeClasses.Play.Client.CUSTOM_PAYLOAD, CUSTOM_PAYLOAD);
+                insertPacketID(PacketTypeClasses.Play.Client.B_EDIT, B_EDIT);
+                insertPacketID(PacketTypeClasses.Play.Client.ENTITY_NBT_QUERY, ENTITY_NBT_QUERY);
+                insertPacketID(PacketTypeClasses.Play.Client.USE_ENTITY, USE_ENTITY);
+                insertPacketID(PacketTypeClasses.Play.Client.JIGSAW_GENERATE, JIGSAW_GENERATE);
+                insertPacketID(PacketTypeClasses.Play.Client.KEEP_ALIVE, KEEP_ALIVE);
+                insertPacketID(PacketTypeClasses.Play.Client.DIFFICULTY_LOCK, DIFFICULTY_LOCK);
+                insertPacketID(PacketTypeClasses.Play.Client.POSITION, POSITION);
+                insertPacketID(PacketTypeClasses.Play.Client.POSITION_LOOK, POSITION_LOOK);
+                insertPacketID(PacketTypeClasses.Play.Client.LOOK, LOOK);
+                insertPacketID(PacketTypeClasses.Play.Client.GROUND, FLYING);
+                insertPacketID(PacketTypeClasses.Play.Client.VEHICLE_MOVE, VEHICLE_MOVE);
+                insertPacketID(PacketTypeClasses.Play.Client.BOAT_MOVE, BOAT_MOVE);
+                insertPacketID(PacketTypeClasses.Play.Client.PICK_ITEM, PICK_ITEM);
+                insertPacketID(PacketTypeClasses.Play.Client.AUTO_RECIPE, AUTO_RECIPE);
+                insertPacketID(PacketTypeClasses.Play.Client.ABILITIES, ABILITIES);
+                insertPacketID(PacketTypeClasses.Play.Client.BLOCK_DIG, BLOCK_DIG);
+                insertPacketID(PacketTypeClasses.Play.Client.ENTITY_ACTION, ENTITY_ACTION);
+                insertPacketID(PacketTypeClasses.Play.Client.STEER_VEHICLE, STEER_VEHICLE);
+                insertPacketID(PacketTypeClasses.Play.Client.RECIPE_DISPLAYED, RECIPE_DISPLAYED);
+                insertPacketID(PacketTypeClasses.Play.Client.ITEM_NAME, ITEM_NAME);
+                insertPacketID(PacketTypeClasses.Play.Client.RESOURCE_PACK_STATUS, RESOURCE_PACK_STATUS);
+                insertPacketID(PacketTypeClasses.Play.Client.ADVANCEMENTS, ADVANCEMENTS);
+                insertPacketID(PacketTypeClasses.Play.Client.TR_SEL, TR_SEL);
+                insertPacketID(PacketTypeClasses.Play.Client.BEACON, BEACON);
+                insertPacketID(PacketTypeClasses.Play.Client.HELD_ITEM_SLOT, HELD_ITEM_SLOT);
+                insertPacketID(PacketTypeClasses.Play.Client.SET_COMMAND_BLOCK, SET_COMMAND_BLOCK);
+                insertPacketID(PacketTypeClasses.Play.Client.SET_COMMAND_MINECART, SET_COMMAND_MINECART);
+                insertPacketID(PacketTypeClasses.Play.Client.SET_CREATIVE_SLOT, SET_CREATIVE_SLOT);
+                insertPacketID(PacketTypeClasses.Play.Client.SET_JIGSAW, SET_JIGSAW);
+                insertPacketID(PacketTypeClasses.Play.Client.STRUCT, STRUCT);
+                insertPacketID(PacketTypeClasses.Play.Client.UPDATE_SIGN, UPDATE_SIGN);
+                insertPacketID(PacketTypeClasses.Play.Client.ARM_ANIMATION, ARM_ANIMATION);
+                insertPacketID(PacketTypeClasses.Play.Client.SPECTATE, SPECTATE);
+                insertPacketID(PacketTypeClasses.Play.Client.USE_ITEM, USE_ITEM);
+                insertPacketID(PacketTypeClasses.Play.Client.BLOCK_PLACE, BLOCK_PLACE);
+                insertPacketID(PacketTypeClasses.Play.Client.PONG, PONG);
+            }
+
+            /**
+             * Server-bound Play Packet Type utility.
+             * Save a few lines of code by using this.
+             *
+             * @author retrooper
+             * @since 1.8
+             */
+            public static class Util {
+                /**
+                 * Is the play packet a PacketPlayInFlying, PacketPlayInPosition, PacketPlayInPositionLook
+                 * or a PacketPlayInLook packet?
+                 *
+                 * @param packetID Play Packet ID.
+                 * @return Is the Packet ID an instance of the PacketPlayInFlying packet?
+                 */
+                public static boolean isInstanceOfFlying(final byte packetID) {
+                    return packetID == FLYING
+                            || packetID == POSITION
+                            || packetID == POSITION_LOOK
+                            || packetID == LOOK;
+                }
+
+                /**
+                 * Is this the packet where the client places a block?
+                 * On 1.7.10 - 1.8.8 the client sends a PacketPlayInBlockPlace packet when actually placing the block.
+                 * On 1.9 - now the client sends a PacketPlayInUseItem packet when placing the block and the
+                 * PacketPlayInBlockPlace has a different use.
+                 * This method is a nice utility supporting all these versions letting you know
+                 * if the client played a block.
+                 * The {@link io.github.retrooper.packetevents.packetwrappers.play.in.blockplace.WrappedPacketInBlockPlace} wrapper
+                 * only works on an actual block place.
+                 * Use this method before using the wrapper to support all minecraft versions.
+                 *
+                 * @param packetID Play Packet ID.
+                 * @return Has the client placed a block?
+                 */
+                public static boolean isBlockPlace(final byte packetID) {
+                    return isNine ? packetID == PacketType.Play.Client.USE_ITEM : packetID == PacketType.Play.Client.BLOCK_PLACE;
+                }
+            }
+        }
+
+        /**
+         * Client-bound (server-sided) Play Packet IDs.
+         *
+         * @author retrooper
+         * @see <a href="https://wiki.vg/Protocol#Clientbound_4">https://wiki.vg/Protocol#Clientbound_4</a>
+         * @since 1.8
+         */
+        public static class Server {
+            public static final byte SPAWN_ENTITY = -67, SPAWN_ENTITY_EXPERIENCE_ORB = -66, SPAWN_ENTITY_WEATHER = -65, SPAWN_ENTITY_LIVING = -64,
+                    SPAWN_ENTITY_PAINTING = -63, SPAWN_ENTITY_SPAWN = -62, ANIMATION = -61, STATISTIC = -60,
+                    BLOCK_BREAK = -59, BLOCK_BREAK_ANIMATION = -58, TILE_ENTITY_DATA = -57, BLOCK_ACTION = -56,
+                    BLOCK_CHANGE = -55, BOSS = -54, SERVER_DIFFICULTY = -53, CHAT = -52, MULTI_BLOCK_CHANGE = -51,
+                    TAB_COMPLETE = -50, COMMANDS = -49, TRANSACTION = -48, CLOSE_WINDOW = -47,
+                    WINDOW_ITEMS = -46, WINDOW_DATA = -45, SET_SLOT = -44, SET_COOLDOWN = -43,
+                    CUSTOM_PAYLOAD = -42, CUSTOM_SOUND_EFFECT = -41, KICK_DISCONNECT = -40, ENTITY_STATUS = -39,
+                    EXPLOSION = -38, UNLOAD_CHUNK = -37, GAME_STATE_CHANGE = -36, OPEN_WINDOW_HORSE = -35,
+                    KEEP_ALIVE = -34, MAP_CHUNK = -33, WORLD_EVENT = -32, WORLD_PARTICLES = -31,
+                    LIGHT_UPDATE = -30, LOGIN = -29, MAP = -28, OPEN_WINDOW_MERCHANT = -27,
+                    REL_ENTITY_MOVE = -26, REL_ENTITY_MOVE_LOOK = -25, ENTITY_LOOK = -24, ENTITY = -23,
+                    VEHICLE_MOVE = -22, OPEN_BOOK = -21, OPEN_WINDOW = -20, OPEN_SIGN_EDITOR = -19,
+                    AUTO_RECIPE = -18, ABILITIES = -17, COMBAT_EVENT = -16, PLAYER_INFO = -15,
+                    LOOK_AT = -14, POSITION = -13, RECIPES = -12, ENTITY_DESTROY = -11,
+                    REMOVE_ENTITY_EFFECT = -10, RESOURCE_PACK_SEND = -9, RESPAWN = -8, ENTITY_HEAD_ROTATION = -7,
+                    SELECT_ADVANCEMENT_TAB = -6, WORLD_BORDER = -5, CAMERA = -4, HELD_ITEM_SLOT = -3,
+                    VIEW_CENTRE = -2, VIEW_DISTANCE = -1, SCOREBOARD_DISPLAY_OBJECTIVE = 0, ENTITY_METADATA = 1,
+                    ATTACH_ENTITY = 2, ENTITY_VELOCITY = 3, ENTITY_EQUIPMENT = 4, EXPERIENCE = 5,
+                    UPDATE_HEALTH = 6, SCOREBOARD_OBJECTIVE = 7, MOUNT = 8, SCOREBOARD_TEAM = 9,
+                    SCOREBOARD_SCORE = 10, SPAWN_POSITION = 11, UPDATE_TIME = 12, TITLE = 13,
+                    ENTITY_SOUND = 14, NAMED_SOUND_EFFECT = 15, STOP_SOUND = 16, PLAYER_LIST_HEADER_FOOTER = 17,
+                    NBT_QUERY = 18, COLLECT = 19, ENTITY_TELEPORT = 20, ADVANCEMENTS = 21, UPDATE_ATTRIBUTES = 22,
+                    ENTITY_EFFECT = 23, RECIPE_UPDATE = 24, TAGS = 25, MAP_CHUNK_BULK = 26, NAMED_ENTITY_SPAWN = 27, PING = 29,
+                    ADD_VIBRATION_SIGNAL = 30, CLEAR_TITLES = 31, INITIALIZE_BORDER = 32, PLAYER_COMBAT_END = 33,
+                    PLAYER_COMBAT_ENTER = 34, PLAYER_COMBAT_KILL = 35, SET_ACTIONBAR_TEXT = 36, SET_BORDER_CENTER = 37,
+                    SET_BORDER_LERP_SIZE = 38, SET_BORDER_SIZE = 39, SET_BORDER_WARNING_DELAY = 40, SET_BORDER_WARNING_DISTANCE = 41,
+                    SET_SUBTITLE_TEXT = 42, SET_TITLES_ANIMATION = 43, SET_TITLE_TEXT = 44;
+
+            private static void load() {
+                insertPacketID(PacketTypeClasses.Play.Server.SPAWN_ENTITY, SPAWN_ENTITY);
+                insertPacketID(PacketTypeClasses.Play.Server.SPAWN_ENTITY_EXPERIENCE_ORB, SPAWN_ENTITY_EXPERIENCE_ORB);
+                insertPacketID(PacketTypeClasses.Play.Server.SPAWN_ENTITY_WEATHER, SPAWN_ENTITY_WEATHER);
+                insertPacketID(PacketTypeClasses.Play.Server.SPAWN_ENTITY_LIVING, SPAWN_ENTITY_LIVING);
+                insertPacketID(PacketTypeClasses.Play.Server.SPAWN_ENTITY_PAINTING, SPAWN_ENTITY_PAINTING);
+                insertPacketID(PacketTypeClasses.Play.Server.SPAWN_ENTITY_SPAWN, SPAWN_ENTITY_SPAWN);
+                insertPacketID(PacketTypeClasses.Play.Server.ANIMATION, ANIMATION);
+                insertPacketID(PacketTypeClasses.Play.Server.STATISTIC, STATISTIC);
+                insertPacketID(PacketTypeClasses.Play.Server.BLOCK_BREAK, BLOCK_BREAK);
+                insertPacketID(PacketTypeClasses.Play.Server.BLOCK_BREAK_ANIMATION, BLOCK_BREAK_ANIMATION);
+                insertPacketID(PacketTypeClasses.Play.Server.TILE_ENTITY_DATA, TILE_ENTITY_DATA);
+                insertPacketID(PacketTypeClasses.Play.Server.BLOCK_ACTION, BLOCK_ACTION);
+                insertPacketID(PacketTypeClasses.Play.Server.BLOCK_CHANGE, BLOCK_CHANGE);
+                insertPacketID(PacketTypeClasses.Play.Server.BOSS, BOSS);
+                insertPacketID(PacketTypeClasses.Play.Server.SERVER_DIFFICULTY, SERVER_DIFFICULTY);
+                insertPacketID(PacketTypeClasses.Play.Server.CHAT, CHAT);
+                insertPacketID(PacketTypeClasses.Play.Server.MULTI_BLOCK_CHANGE, MULTI_BLOCK_CHANGE);
+                insertPacketID(PacketTypeClasses.Play.Server.TAB_COMPLETE, TAB_COMPLETE);
+                insertPacketID(PacketTypeClasses.Play.Server.COMMANDS, COMMANDS);
+                insertPacketID(PacketTypeClasses.Play.Server.TRANSACTION, TRANSACTION);
+                insertPacketID(PacketTypeClasses.Play.Server.CLOSE_WINDOW, CLOSE_WINDOW);
+                insertPacketID(PacketTypeClasses.Play.Server.WINDOW_ITEMS, WINDOW_ITEMS);
+                insertPacketID(PacketTypeClasses.Play.Server.WINDOW_DATA, WINDOW_DATA);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_SLOT, SET_SLOT);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_COOLDOWN, SET_COOLDOWN);
+                insertPacketID(PacketTypeClasses.Play.Server.CUSTOM_PAYLOAD, CUSTOM_PAYLOAD);
+                insertPacketID(PacketTypeClasses.Play.Server.CUSTOM_SOUND_EFFECT, CUSTOM_SOUND_EFFECT);
+                insertPacketID(PacketTypeClasses.Play.Server.KICK_DISCONNECT, KICK_DISCONNECT);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_STATUS, ENTITY_STATUS);
+                insertPacketID(PacketTypeClasses.Play.Server.EXPLOSION, EXPLOSION);
+                insertPacketID(PacketTypeClasses.Play.Server.UNLOAD_CHUNK, UNLOAD_CHUNK);
+                insertPacketID(PacketTypeClasses.Play.Server.GAME_STATE_CHANGE, GAME_STATE_CHANGE);
+                insertPacketID(PacketTypeClasses.Play.Server.OPEN_WINDOW_HORSE, OPEN_WINDOW_HORSE);
+                insertPacketID(PacketTypeClasses.Play.Server.KEEP_ALIVE, KEEP_ALIVE);
+                insertPacketID(PacketTypeClasses.Play.Server.MAP_CHUNK, MAP_CHUNK);
+                insertPacketID(PacketTypeClasses.Play.Server.WORLD_EVENT, WORLD_EVENT);
+                insertPacketID(PacketTypeClasses.Play.Server.WORLD_PARTICLES, WORLD_PARTICLES);
+                insertPacketID(PacketTypeClasses.Play.Server.LIGHT_UPDATE, LIGHT_UPDATE);
+                insertPacketID(PacketTypeClasses.Play.Server.LOGIN, LOGIN);
+                insertPacketID(PacketTypeClasses.Play.Server.MAP, MAP);
+                insertPacketID(PacketTypeClasses.Play.Server.OPEN_WINDOW_MERCHANT, OPEN_WINDOW_MERCHANT);
+                insertPacketID(PacketTypeClasses.Play.Server.REL_ENTITY_MOVE, REL_ENTITY_MOVE);
+                insertPacketID(PacketTypeClasses.Play.Server.REL_ENTITY_MOVE_LOOK, REL_ENTITY_MOVE_LOOK);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_LOOK, ENTITY_LOOK);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY, ENTITY);
+                insertPacketID(PacketTypeClasses.Play.Server.VEHICLE_MOVE, VEHICLE_MOVE);
+                insertPacketID(PacketTypeClasses.Play.Server.OPEN_BOOK, OPEN_BOOK);
+                insertPacketID(PacketTypeClasses.Play.Server.OPEN_WINDOW, OPEN_WINDOW);
+                insertPacketID(PacketTypeClasses.Play.Server.OPEN_SIGN_EDITOR, OPEN_SIGN_EDITOR);
+                insertPacketID(PacketTypeClasses.Play.Server.AUTO_RECIPE, AUTO_RECIPE);
+                insertPacketID(PacketTypeClasses.Play.Server.ABILITIES, ABILITIES);
+                insertPacketID(PacketTypeClasses.Play.Server.COMBAT_EVENT, COMBAT_EVENT);
+                insertPacketID(PacketTypeClasses.Play.Server.PLAYER_INFO, PLAYER_INFO);
+                insertPacketID(PacketTypeClasses.Play.Server.LOOK_AT, LOOK_AT);
+                insertPacketID(PacketTypeClasses.Play.Server.POSITION, POSITION);
+                insertPacketID(PacketTypeClasses.Play.Server.RECIPES, RECIPES);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_DESTROY, ENTITY_DESTROY);
+                insertPacketID(PacketTypeClasses.Play.Server.REMOVE_ENTITY_EFFECT, REMOVE_ENTITY_EFFECT);
+                insertPacketID(PacketTypeClasses.Play.Server.RESOURCE_PACK_SEND, RESOURCE_PACK_SEND);
+                insertPacketID(PacketTypeClasses.Play.Server.RESPAWN, RESPAWN);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_HEAD_ROTATION, ENTITY_HEAD_ROTATION);
+                insertPacketID(PacketTypeClasses.Play.Server.SELECT_ADVANCEMENT_TAB, SELECT_ADVANCEMENT_TAB);
+                insertPacketID(PacketTypeClasses.Play.Server.WORLD_BORDER, WORLD_BORDER);
+                insertPacketID(PacketTypeClasses.Play.Server.CAMERA, CAMERA);
+                insertPacketID(PacketTypeClasses.Play.Server.HELD_ITEM_SLOT, HELD_ITEM_SLOT);
+                insertPacketID(PacketTypeClasses.Play.Server.VIEW_CENTRE, VIEW_CENTRE);
+                insertPacketID(PacketTypeClasses.Play.Server.VIEW_DISTANCE, VIEW_DISTANCE);
+                insertPacketID(PacketTypeClasses.Play.Server.SCOREBOARD_DISPLAY_OBJECTIVE, SCOREBOARD_DISPLAY_OBJECTIVE);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_METADATA, ENTITY_METADATA);
+                insertPacketID(PacketTypeClasses.Play.Server.ATTACH_ENTITY, ATTACH_ENTITY);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_VELOCITY, ENTITY_VELOCITY);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_EQUIPMENT, ENTITY_EQUIPMENT);
+                insertPacketID(PacketTypeClasses.Play.Server.EXPERIENCE, EXPERIENCE);
+                insertPacketID(PacketTypeClasses.Play.Server.UPDATE_HEALTH, UPDATE_HEALTH);
+                insertPacketID(PacketTypeClasses.Play.Server.SCOREBOARD_OBJECTIVE, SCOREBOARD_OBJECTIVE);
+                insertPacketID(PacketTypeClasses.Play.Server.MOUNT, MOUNT);
+                insertPacketID(PacketTypeClasses.Play.Server.SCOREBOARD_TEAM, SCOREBOARD_TEAM);
+                insertPacketID(PacketTypeClasses.Play.Server.SCOREBOARD_SCORE, SCOREBOARD_SCORE);
+                insertPacketID(PacketTypeClasses.Play.Server.SPAWN_POSITION, SPAWN_POSITION);
+                insertPacketID(PacketTypeClasses.Play.Server.UPDATE_TIME, UPDATE_TIME);
+                insertPacketID(PacketTypeClasses.Play.Server.TITLE, TITLE);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_SOUND, ENTITY_SOUND);
+                insertPacketID(PacketTypeClasses.Play.Server.NAMED_SOUND_EFFECT, NAMED_SOUND_EFFECT);
+                insertPacketID(PacketTypeClasses.Play.Server.STOP_SOUND, STOP_SOUND);
+                insertPacketID(PacketTypeClasses.Play.Server.PLAYER_LIST_HEADER_FOOTER, PLAYER_LIST_HEADER_FOOTER);
+                insertPacketID(PacketTypeClasses.Play.Server.NBT_QUERY, NBT_QUERY);
+                insertPacketID(PacketTypeClasses.Play.Server.COLLECT, COLLECT);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_TELEPORT, ENTITY_TELEPORT);
+                insertPacketID(PacketTypeClasses.Play.Server.ADVANCEMENTS, ADVANCEMENTS);
+                insertPacketID(PacketTypeClasses.Play.Server.UPDATE_ATTRIBUTES, UPDATE_ATTRIBUTES);
+                insertPacketID(PacketTypeClasses.Play.Server.ENTITY_EFFECT, ENTITY_EFFECT);
+                insertPacketID(PacketTypeClasses.Play.Server.RECIPE_UPDATE, RECIPE_UPDATE);
+                insertPacketID(PacketTypeClasses.Play.Server.TAGS, TAGS);
+                insertPacketID(PacketTypeClasses.Play.Server.MAP_CHUNK_BULK, MAP_CHUNK_BULK);
+                insertPacketID(PacketTypeClasses.Play.Server.NAMED_ENTITY_SPAWN, NAMED_ENTITY_SPAWN);
+                insertPacketID(PacketTypeClasses.Play.Server.PING, PING);
+                insertPacketID(PacketTypeClasses.Play.Server.ADD_VIBRATION_SIGNAL, ADD_VIBRATION_SIGNAL);
+                insertPacketID(PacketTypeClasses.Play.Server.CLEAR_TITLES, CLEAR_TITLES );
+                insertPacketID(PacketTypeClasses.Play.Server.INITIALIZE_BORDER, INITIALIZE_BORDER);
+                insertPacketID(PacketTypeClasses.Play.Server.PLAYER_COMBAT_END, PLAYER_COMBAT_END);
+                insertPacketID(PacketTypeClasses.Play.Server.PLAYER_COMBAT_ENTER, PLAYER_COMBAT_ENTER);
+                insertPacketID(PacketTypeClasses.Play.Server.PLAYER_COMBAT_KILL, PLAYER_COMBAT_KILL);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_ACTIONBAR_TEXT, SET_ACTIONBAR_TEXT);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_BORDER_CENTER, SET_BORDER_CENTER);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_BORDER_LERP_SIZE, SET_BORDER_LERP_SIZE);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_BORDER_SIZE, SET_BORDER_SIZE);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_BORDER_WARNING_DELAY, SET_BORDER_WARNING_DELAY);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_BORDER_WARNING_DISTANCE, SET_BORDER_WARNING_DISTANCE);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_SUBTITLE_TEXT, SET_SUBTITLE_TEXT);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_TITLES_ANIMATION, SET_TITLES_ANIMATION);
+                insertPacketID(PacketTypeClasses.Play.Server.SET_TITLE_TEXT, SET_TITLE_TEXT);
+            }
+
+            /**
+             * Client-bound Play Packet Type utility.
+             * Save a few lines of code by using this.
+             *
+             * @author retrooper
+             * @since 1.8
+             */
+            public static class Util {
+                /**
+                 * Is the play packet a PacketPlayOutEntity, PacketPlayOutRelEntityMove, PacketPlayOutRelEntityMoveLook
+                 * or a PacketPlayOutEntityLook packet?
+                 *
+                 * @param packetID Play Packet ID.
+                 * @return Is the Packet ID an instance of the PacketPlayOutEntity packet?
+                 */
+                public static boolean isInstanceOfEntity(final byte packetID) {
+                    return packetID == ENTITY || packetID == REL_ENTITY_MOVE ||
+                            packetID == REL_ENTITY_MOVE_LOOK || packetID == ENTITY_LOOK;
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,410 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.packettype;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
+
+public class PacketTypeClasses {
+    public static void load() {
+        //STATUS
+        PacketTypeClasses.Status.Client.load();
+        PacketTypeClasses.Status.Server.load();
+        //HANDSHAKING
+        PacketTypeClasses.Handshaking.Client.load();
+        //LOGIN
+        PacketTypeClasses.Login.Client.load();
+        PacketTypeClasses.Login.Server.load();
+        //PLAY
+        PacketTypeClasses.Play.Client.load();
+        PacketTypeClasses.Play.Server.load();
+    }
+
+    public static class Status {
+        public static class Client {
+            private static String PREFIX;
+            public static Class<?> START, PING;
+
+            public static void load() {
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_17)) {
+                    PREFIX  = "net.minecraft.network.protocol.status.";
+                }
+                else {
+                    PREFIX = ServerVersion.getNMSDirectory() + ".";
+                }
+                Client.START = Reflection.getClassByNameWithoutException(PREFIX + "PacketStatusInStart");
+                Client.PING = Reflection.getClassByNameWithoutException(PREFIX + "PacketStatusInPing");
+            }
+        }
+
+        public static class Server {
+            private static String PREFIX;
+            public static Class<?> PONG, SERVER_INFO;
+
+            public static void load() {
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_17)) {
+                    PREFIX  = "net.minecraft.network.protocol.status.";
+                }
+                else {
+                    PREFIX = ServerVersion.getNMSDirectory() + ".";
+                }
+                Server.PONG = Reflection.getClassByNameWithoutException(PREFIX + "PacketStatusOutPong");
+                Server.SERVER_INFO = Reflection.getClassByNameWithoutException(PREFIX + "PacketStatusOutServerInfo");
+            }
+        }
+    }
+
+    public static class Handshaking {
+        public static class Client {
+            private static String PREFIX;
+            public static Class<?> SET_PROTOCOL;
+
+            public static void load() {
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_17)) {
+                    PREFIX  = "net.minecraft.network.protocol.handshake.";
+                }
+                else {
+                    PREFIX = ServerVersion.getNMSDirectory() + ".";
+                }
+                Handshaking.Client.SET_PROTOCOL = Reflection.getClassByNameWithoutException(PREFIX + "PacketHandshakingInSetProtocol");
+            }
+        }
+    }
+
+    public static class Login {
+        public static class Client {
+            private static String PREFIX;
+            public static Class<?> CUSTOM_PAYLOAD, START, ENCRYPTION_BEGIN;
+
+            public static void load() {
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_17)) {
+                    PREFIX  = "net.minecraft.network.protocol.login.";
+                }
+                else {
+                    PREFIX = ServerVersion.getNMSDirectory() + ".";
+                }
+                //In and Out custom payload login packets have been here since 1.13
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_13)) {
+                    Client.CUSTOM_PAYLOAD = Reflection.getClassByNameWithoutException(PREFIX + "PacketLoginInCustomPayload");
+                }
+                Client.START = Reflection.getClassByNameWithoutException(PREFIX + "PacketLoginInStart");
+                Client.ENCRYPTION_BEGIN = Reflection.getClassByNameWithoutException(PREFIX + "PacketLoginInEncryptionBegin");
+            }
+        }
+
+        public static class Server {
+            private static String PREFIX;
+            public static Class<?> CUSTOM_PAYLOAD, DISCONNECT, ENCRYPTION_BEGIN, SUCCESS, SET_COMPRESSION;
+
+            public static void load() {
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_17)) {
+                    PREFIX  = "net.minecraft.network.protocol.login.";
+                }
+                else {
+                    PREFIX = ServerVersion.getNMSDirectory() + ".";
+                }
+                //In and Out custom payload login packets have been here since 1.13
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_13)) {
+                    Server.CUSTOM_PAYLOAD = Reflection.getClassByNameWithoutException(PREFIX + "PacketLoginOutCustomPayload");
+                }
+                Server.DISCONNECT = Reflection.getClassByNameWithoutException(PREFIX + "PacketLoginOutDisconnect");
+                Server.ENCRYPTION_BEGIN = Reflection.getClassByNameWithoutException(PREFIX + "PacketLoginOutEncryptionBegin");
+                Server.SUCCESS = Reflection.getClassByNameWithoutException(PREFIX + "PacketLoginOutSuccess");
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThan(ServerVersion.v_1_7_10)) {
+                    Server.SET_COMPRESSION = Reflection.getClassByNameWithoutException(PREFIX + "PacketLoginOutSetCompression");
+                }
+            }
+        }
+    }
+
+    public static class Play {
+        public static class Client {
+            private static String COMMON_PREFIX;
+            private static String PREFIX;
+            public static Class<?> FLYING, POSITION, POSITION_LOOK, LOOK, GROUND, CLIENT_COMMAND,
+                    TRANSACTION, BLOCK_DIG, ENTITY_ACTION, USE_ENTITY,
+                    WINDOW_CLICK, STEER_VEHICLE, CUSTOM_PAYLOAD, ARM_ANIMATION,
+                    BLOCK_PLACE, USE_ITEM, ABILITIES, HELD_ITEM_SLOT,
+                    CLOSE_WINDOW, TAB_COMPLETE, CHAT, SET_CREATIVE_SLOT,
+                    KEEP_ALIVE, SETTINGS, ENCHANT_ITEM, TELEPORT_ACCEPT,
+                    TILE_NBT_QUERY, DIFFICULTY_CHANGE, B_EDIT, ENTITY_NBT_QUERY,
+                    JIGSAW_GENERATE, DIFFICULTY_LOCK, VEHICLE_MOVE, BOAT_MOVE, PICK_ITEM,
+                    AUTO_RECIPE, RECIPE_DISPLAYED, ITEM_NAME, RESOURCE_PACK_STATUS,
+                    ADVANCEMENTS, TR_SEL, BEACON, SET_COMMAND_BLOCK,
+                    SET_COMMAND_MINECART, SET_JIGSAW, STRUCT, UPDATE_SIGN, SPECTATE, PONG;
+
+            /**
+             * Initiate all server-bound play packet classes.
+             */
+            public static void load() {
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_17)) {
+                    PREFIX  = "net.minecraft.network.protocol.game.";
+                }
+                else {
+                    PREFIX = ServerVersion.getNMSDirectory() + ".";
+                }
+                COMMON_PREFIX  = PREFIX + "PacketPlayIn";
+                FLYING = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Flying");
+                try {
+                    POSITION = Class.forName(COMMON_PREFIX + "Position");
+                    POSITION_LOOK = Class.forName(COMMON_PREFIX + "PositionLook");
+                    LOOK = Class.forName(COMMON_PREFIX + "Look");
+                } catch (ClassNotFoundException ex) {
+                    POSITION = SubclassUtil.getSubClass(FLYING,"PacketPlayInPosition");
+                    POSITION_LOOK = SubclassUtil.getSubClass(FLYING, "PacketPlayInPositionLook");
+                    LOOK = SubclassUtil.getSubClass(FLYING, "PacketPlayInLook");
+                }
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_17)) {
+                    GROUND = SubclassUtil.getSubClass(FLYING, "d");
+                }
+                else {
+                    GROUND = FLYING;
+                }
+                //This packet does not exist in the 1.17+ protocol
+                TRANSACTION = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Transaction");
+                //This packet was added in 1.17 protocol
+                PONG = Reflection.getClassByNameWithoutException(PREFIX + "ServerboundPongPacket");
+                try {
+                    SETTINGS = Class.forName(COMMON_PREFIX + "Settings");
+                    ENCHANT_ITEM = Class.forName(COMMON_PREFIX + "EnchantItem");
+
+                    CLIENT_COMMAND = Class.forName(COMMON_PREFIX + "ClientCommand");
+                    BLOCK_DIG = Class.forName(COMMON_PREFIX + "BlockDig");
+                    ENTITY_ACTION = Class.forName(COMMON_PREFIX + "EntityAction");
+                    USE_ENTITY = Class.forName(COMMON_PREFIX + "UseEntity");
+                    WINDOW_CLICK = Class.forName(COMMON_PREFIX + "WindowClick");
+                    STEER_VEHICLE = Class.forName(COMMON_PREFIX + "SteerVehicle");
+                    CUSTOM_PAYLOAD = Class.forName(COMMON_PREFIX + "CustomPayload");
+                    ARM_ANIMATION = Class.forName(COMMON_PREFIX + "ArmAnimation");
+                    ABILITIES = Class.forName(COMMON_PREFIX + "Abilities");
+                    HELD_ITEM_SLOT = Class.forName(COMMON_PREFIX + "HeldItemSlot");
+                    CLOSE_WINDOW = Class.forName(COMMON_PREFIX + "CloseWindow");
+                    TAB_COMPLETE = Class.forName(COMMON_PREFIX + "TabComplete");
+                    CHAT = Class.forName(COMMON_PREFIX + "Chat");
+                    SET_CREATIVE_SLOT = Class.forName(COMMON_PREFIX + "SetCreativeSlot");
+                    KEEP_ALIVE = Class.forName(COMMON_PREFIX + "KeepAlive");
+                    UPDATE_SIGN = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "UpdateSign");
+
+                    TELEPORT_ACCEPT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "TeleportAccept");
+                    TILE_NBT_QUERY = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "TileNBTQuery");
+                    DIFFICULTY_CHANGE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "DifficultyChange");
+                    B_EDIT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "BEdit");
+                    ENTITY_NBT_QUERY = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntityNBTQuery");
+                    JIGSAW_GENERATE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "JigsawGenerate");
+                    DIFFICULTY_LOCK = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "DifficultyLock");
+                    VEHICLE_MOVE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "VehicleMove");
+                    BOAT_MOVE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "BoatMove");
+                    PICK_ITEM = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "PickItem");
+                    AUTO_RECIPE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "AutoRecipe");
+                    RECIPE_DISPLAYED = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "RecipeDisplayed");
+                    ITEM_NAME = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ItemName");
+                    //1.8+
+                    RESOURCE_PACK_STATUS = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ResourcePackStatus");
+
+                    ADVANCEMENTS = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Advancements");
+                    TR_SEL = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "TrSel");
+                    BEACON = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Beacon");
+                    SET_COMMAND_BLOCK = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SetCommandBlock");
+                    SET_COMMAND_MINECART = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SetCommandMinecart");
+                    SET_JIGSAW = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SetJigsaw");
+                    STRUCT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Struct");
+                    SPECTATE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Spectate");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                try {
+                    BLOCK_PLACE = Class.forName(COMMON_PREFIX + "BlockPlace");
+                    USE_ITEM = Class.forName(COMMON_PREFIX + "UseItem");
+                } catch (Exception ignored) {
+                }
+
+            }
+        }
+
+        public static class Server {
+            private static String COMMON_PREFIX, PREFIX;
+            public static Class<?> SPAWN_ENTITY, SPAWN_ENTITY_EXPERIENCE_ORB, SPAWN_ENTITY_WEATHER, SPAWN_ENTITY_LIVING,
+                    SPAWN_ENTITY_PAINTING, SPAWN_ENTITY_SPAWN, ANIMATION, STATISTIC,
+                    BLOCK_BREAK, BLOCK_BREAK_ANIMATION, TILE_ENTITY_DATA, BLOCK_ACTION,
+                    BLOCK_CHANGE, BOSS, SERVER_DIFFICULTY, CHAT, MULTI_BLOCK_CHANGE,
+                    TAB_COMPLETE, COMMANDS, TRANSACTION, CLOSE_WINDOW,
+                    WINDOW_ITEMS, WINDOW_DATA, SET_SLOT, SET_COOLDOWN,
+                    CUSTOM_PAYLOAD, CUSTOM_SOUND_EFFECT, KICK_DISCONNECT, ENTITY_STATUS,
+                    EXPLOSION, UNLOAD_CHUNK, GAME_STATE_CHANGE, OPEN_WINDOW_HORSE,
+                    KEEP_ALIVE, MAP_CHUNK, WORLD_EVENT, WORLD_PARTICLES,
+                    LIGHT_UPDATE, LOGIN, MAP, OPEN_WINDOW_MERCHANT,
+                    REL_ENTITY_MOVE, REL_ENTITY_MOVE_LOOK, ENTITY_LOOK, ENTITY,
+                    VEHICLE_MOVE, OPEN_BOOK, OPEN_WINDOW, OPEN_SIGN_EDITOR,
+                    AUTO_RECIPE, ABILITIES, COMBAT_EVENT, PLAYER_INFO,
+                    LOOK_AT, POSITION, RECIPES, ENTITY_DESTROY,
+                    REMOVE_ENTITY_EFFECT, RESOURCE_PACK_SEND, RESPAWN, ENTITY_HEAD_ROTATION,
+                    SELECT_ADVANCEMENT_TAB, WORLD_BORDER, CAMERA, HELD_ITEM_SLOT,
+                    VIEW_CENTRE, VIEW_DISTANCE, SCOREBOARD_DISPLAY_OBJECTIVE, ENTITY_METADATA,
+                    ATTACH_ENTITY, ENTITY_VELOCITY, ENTITY_EQUIPMENT, EXPERIENCE,
+                    UPDATE_HEALTH, SCOREBOARD_OBJECTIVE, MOUNT, SCOREBOARD_TEAM,
+                    SCOREBOARD_SCORE, SPAWN_POSITION, UPDATE_TIME, TITLE,
+                    ENTITY_SOUND, NAMED_SOUND_EFFECT, STOP_SOUND, PLAYER_LIST_HEADER_FOOTER,
+                    NBT_QUERY, COLLECT, ENTITY_TELEPORT, ADVANCEMENTS, UPDATE_ATTRIBUTES,
+                    ENTITY_EFFECT, RECIPE_UPDATE, TAGS, MAP_CHUNK_BULK, NAMED_ENTITY_SPAWN, PING, ADD_VIBRATION_SIGNAL,
+                    CLEAR_TITLES, INITIALIZE_BORDER, PLAYER_COMBAT_END, PLAYER_COMBAT_ENTER, PLAYER_COMBAT_KILL,
+                    SET_ACTIONBAR_TEXT, SET_BORDER_CENTER, SET_BORDER_LERP_SIZE, SET_BORDER_SIZE, SET_BORDER_WARNING_DELAY,
+                    SET_BORDER_WARNING_DISTANCE, SET_SUBTITLE_TEXT, SET_TITLES_ANIMATION, SET_TITLE_TEXT;
+
+            /**
+             * Initiate all client-bound packet classes.
+             */
+            public static void load() {
+                if (PacketEvents.get().getServerUtils().getVersion().isNewerThanOrEquals(ServerVersion.v_1_17)) {
+                    PREFIX  = "net.minecraft.network.protocol.game.";
+                }
+                else {
+                    PREFIX = ServerVersion.getNMSDirectory() + ".";
+                }
+                COMMON_PREFIX  = PREFIX + "PacketPlayOut";
+                SPAWN_ENTITY = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SpawnEntity");
+                SPAWN_ENTITY_EXPERIENCE_ORB = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SpawnEntityExperienceOrb");
+                SPAWN_ENTITY_WEATHER = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SpawnEntityWeather");
+                SPAWN_ENTITY_LIVING = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SpawnEntityLiving");
+                SPAWN_ENTITY_PAINTING = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SpawnEntityPainting");
+                SPAWN_ENTITY_SPAWN = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SpawnEntitySpawn");
+                ANIMATION = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Animation");
+                STATISTIC = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Statistic");
+                BLOCK_BREAK = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "BlockBreak");
+                BLOCK_BREAK_ANIMATION = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "BlockBreakAnimation");
+                TILE_ENTITY_DATA = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "TileEntityData");
+                BLOCK_ACTION = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "BlockAction");
+                BLOCK_CHANGE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "BlockChange");
+                BOSS = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Boss");
+                SERVER_DIFFICULTY = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ServerDifficulty");
+                CHAT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Chat");
+                MULTI_BLOCK_CHANGE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "MultiBlockChange");
+                TAB_COMPLETE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "TabComplete");
+                COMMANDS = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Commands");
+                TRANSACTION = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Transaction");
+                CLOSE_WINDOW = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "CloseWindow");
+                WINDOW_ITEMS = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "WindowItems");
+                WINDOW_DATA = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "WindowData");
+                SET_SLOT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SetSlot");
+                SET_COOLDOWN = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SetCooldown");
+                CUSTOM_PAYLOAD = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "CustomPayload");
+                CUSTOM_SOUND_EFFECT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "CustomSoundEffect");
+                KICK_DISCONNECT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "KickDisconnect");
+                ENTITY_STATUS = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntityStatus");
+                EXPLOSION = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Explosion");
+                UNLOAD_CHUNK = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "UnloadChunk");
+                GAME_STATE_CHANGE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "GameStateChange");
+                OPEN_WINDOW_HORSE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "OpenWindowHorse");
+                KEEP_ALIVE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "KeepAlive");
+                MAP_CHUNK = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "MapChunk");
+                WORLD_EVENT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "WorldEvent");
+                WORLD_PARTICLES = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "WorldParticles");
+                LIGHT_UPDATE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "LightUpdate");
+                LOGIN = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Login");
+                MAP = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Map");
+                OPEN_WINDOW_MERCHANT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "OpenWindowMerchant");
+                ENTITY = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Entity");
+                REL_ENTITY_MOVE = SubclassUtil.getSubClass(ENTITY, "PacketPlayOutRelEntityMove");
+                REL_ENTITY_MOVE_LOOK = SubclassUtil.getSubClass(ENTITY, "PacketPlayOutRelEntityMoveLook");
+                ENTITY_LOOK = SubclassUtil.getSubClass(ENTITY, "PacketPlayOutEntityLook");
+                if (REL_ENTITY_MOVE == null) {
+                    //is not a subclass and should be accessed normally
+                    REL_ENTITY_MOVE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "RelEntityMove");
+                    REL_ENTITY_MOVE_LOOK = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "RelEntityMoveLook");
+                    ENTITY_LOOK = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "RelEntityLook");
+                }
+                VEHICLE_MOVE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "VehicleMove");
+                OPEN_BOOK = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "OpenBook");
+                OPEN_WINDOW = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "OpenWindow");
+                OPEN_SIGN_EDITOR = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "OpenSignEditor");
+                AUTO_RECIPE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "AutoRecipe");
+                ABILITIES = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Abilities");
+                COMBAT_EVENT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "CombatEvent");
+                PLAYER_INFO = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "PlayerInfo");
+                LOOK_AT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "LookAt");
+                POSITION = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Position");
+                RECIPES = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Recipes");
+                ENTITY_DESTROY = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntityDestroy");
+                REMOVE_ENTITY_EFFECT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "RemoveEntityEffect");
+                RESOURCE_PACK_SEND = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ResourcePackSend");
+                RESPAWN = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Respawn");
+                ENTITY_HEAD_ROTATION = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntityHeadRotation");
+                SELECT_ADVANCEMENT_TAB = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SelectAdvancementTab");
+                WORLD_BORDER = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "WorldBorder");
+                CAMERA = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Camera");
+                HELD_ITEM_SLOT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "HeldItemSlot");
+                VIEW_CENTRE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ViewCentre");
+                VIEW_DISTANCE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ViewDistance");
+                SCOREBOARD_DISPLAY_OBJECTIVE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ScoreboardDisplayObjective");
+                ENTITY_METADATA = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntityMetadata");
+                ATTACH_ENTITY = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "AttachEntity");
+                ENTITY_VELOCITY = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntityVelocity");
+                ENTITY_EQUIPMENT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntityEquipment");
+                EXPERIENCE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Experience");
+                UPDATE_HEALTH = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "UpdateHealth");
+                SCOREBOARD_OBJECTIVE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ScoreboardObjective");
+                MOUNT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Mount");
+                SCOREBOARD_TEAM = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ScoreboardTeam");
+                SCOREBOARD_SCORE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "ScoreboardScore");
+                SPAWN_POSITION = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "SpawnPosition");
+                UPDATE_TIME = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "UpdateTime");
+                TITLE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Title");
+                ENTITY_SOUND = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntitySound");
+                NAMED_SOUND_EFFECT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "NamedSoundEffect");
+                STOP_SOUND = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "StopSound");
+                PLAYER_LIST_HEADER_FOOTER = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "PlayerListHeaderFooter");
+                NBT_QUERY = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "NBTQuery");
+                COLLECT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Collect");
+                ENTITY_TELEPORT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntityTeleport");
+                ADVANCEMENTS = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Advancements");
+                UPDATE_ATTRIBUTES = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "UpdateAttributes");
+                ENTITY_EFFECT = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "EntityEffect");
+                RECIPE_UPDATE = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "RecipeUpdate");
+                TAGS = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "Tags");
+                MAP_CHUNK_BULK = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "MapChunkBulk");
+                NAMED_ENTITY_SPAWN = Reflection.getClassByNameWithoutException(COMMON_PREFIX + "NamedEntitySpawn");
+
+                //These packets were added in 1.17
+                PING = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundPingPacket");
+                ADD_VIBRATION_SIGNAL = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundAddVibrationSignalPacket");
+                CLEAR_TITLES = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundClearTitlesPacket");
+                INITIALIZE_BORDER = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundInitializeBorderPacket");
+                PLAYER_COMBAT_END = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundPlayerCombatEndPacket");
+                PLAYER_COMBAT_ENTER = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundPlayerCombatEnterPacket");
+                PLAYER_COMBAT_KILL = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundPlayerCombatKillPacket");
+                SET_ACTIONBAR_TEXT = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundSetActionBarTextPacket");
+                SET_BORDER_CENTER = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundSetBorderCenterPacket");
+                SET_BORDER_LERP_SIZE = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundSetBorderLerpSizePacket");
+                SET_BORDER_SIZE = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundSetBorderSizePacket");
+                SET_BORDER_WARNING_DELAY = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundSetBorderWarningDelayPacket");
+                SET_BORDER_WARNING_DISTANCE = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundSetBorderWarningDistancePacket");
+                SET_SUBTITLE_TEXT = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundSetSubtitleTextPacket");
+                SET_TITLES_ANIMATION = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundSetTitlesAnimationPacket");
+                SET_TITLE_TEXT = Reflection.getClassByNameWithoutException(PREFIX + "ClientboundSetTitleTextPacket");
+
+                // 1.18+ only, doesn't follow the naming convention
+                if (MAP_CHUNK == null) {
+                    MAP_CHUNK = Reflection.getClassByNameWithoutException("net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket");
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,37 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.packetwrappers;
+
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+
+public class NMSPacket {
+    private final Object rawNMSPacket;
+
+    public NMSPacket(Object rawNMSPacket) {
+        this.rawNMSPacket = rawNMSPacket;
+    }
+
+    public Object getRawNMSPacket() {
+        return rawNMSPacket;
+    }
+
+    public String getName() {
+        return ClassUtil.getClassSimpleName(rawNMSPacket.getClass());
+    }
+}
@@ -1,8 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.packetwrappers;
-
-public interface Sendable {
-    Object asNMSPacket();
-}
@@ -0,0 +1,593 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.packetwrappers;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.exceptions.WrapperFieldNotFoundException;
+import io.github.retrooper.packetevents.exceptions.WrapperUnsupportedUsageException;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
+import io.github.retrooper.packetevents.packetwrappers.api.WrapperPacketReader;
+import io.github.retrooper.packetevents.packetwrappers.api.WrapperPacketWriter;
+import io.github.retrooper.packetevents.utils.enums.EnumUtil;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.player.GameMode;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
+import io.github.retrooper.packetevents.utils.vector.Vector3i;
+import io.github.retrooper.packetevents.utils.world.Difficulty;
+import io.github.retrooper.packetevents.utils.world.Dimension;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+
+public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
+    private static final Map<Class<? extends WrappedPacket>, Boolean> LOADED_WRAPPERS = new ConcurrentHashMap<>();
+    private static final Map<Class<?>, Map<Class<?>, Field[]>> FIELD_CACHE = new ConcurrentHashMap<>();
+    private static final Field[] EMPTY_FIELD_ARRAY = new Field[0];
+    private static byte isVersion_1_17 = -1;
+    public static ServerVersion version;
+    protected final NMSPacket packet;
+    private final Class<?> packetClass;
+
+    public WrappedPacket() {
+        packet = null;
+        packetClass = null;
+        load0();
+    }
+
+    public WrappedPacket(final NMSPacket packet) {
+        this(packet, packet.getRawNMSPacket().getClass());
+    }
+
+    public WrappedPacket(final NMSPacket packet, Class<?> packetClass) {
+        if (packetClass.getSuperclass().equals(PacketTypeClasses.Play.Client.FLYING)) {
+            packetClass = PacketTypeClasses.Play.Client.FLYING;
+        } else if (packetClass.getSuperclass().equals(PacketTypeClasses.Play.Server.ENTITY)) {
+            packetClass = PacketTypeClasses.Play.Server.ENTITY;
+        }
+        this.packetClass = packetClass;
+        this.packet = packet;
+        load0();
+    }
+
+    private void load0() {
+        final Class<? extends WrappedPacket> clazz = getClass();
+        if (!LOADED_WRAPPERS.containsKey(clazz)) {
+            if (!isSupported()) {
+                throw new WrapperUnsupportedUsageException(getClass());
+            }
+            try {
+                load();
+            } catch (Exception ex) {
+                String wrapperName = ClassUtil.getClassSimpleName(clazz);
+                PacketEvents.get().getPlugin().getLogger()
+                        .log(Level.SEVERE, "PacketEvents found an exception while loading the " + wrapperName + " packet wrapper. Please report this bug! Tell us about your server version, spigot and code(of you using the wrapper)", ex);
+                LOADED_WRAPPERS.put(clazz, false);
+            }
+            LOADED_WRAPPERS.put(clazz, true);
+        }
+    }
+
+    protected void load() {
+    }
+
+    protected boolean hasLoaded() {
+        return LOADED_WRAPPERS.getOrDefault(getClass(), false);
+    }
+
+    protected void throwUnsupportedOperation(Enum<?> enumConst) throws UnsupportedOperationException {
+        Class<?> enumConstClass = enumConst.getClass();
+        Field field = null;
+        try {
+            field = enumConstClass.getField(enumConst.name());
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+        if (field.isAnnotationPresent(SupportedVersions.class)) {
+            SupportedVersions supportedVersions = field.getAnnotation(SupportedVersions.class);
+            List<ServerVersion> versionList = parseSupportedVersionsAnnotation(supportedVersions);
+            String supportedVersionsMsg = Arrays.toString(versionList.toArray(new ServerVersion[0]));
+            throw new UnsupportedOperationException("PacketEvents failed to use the " + enumConst.name() + " enum constant in the " + enumConstClass.getSimpleName() + " enum. This enum constant is not supported on your server version. (" + PacketEvents.get().getServerUtils().getVersion() + ")\n This enum constant is only supported on these server versions: " + supportedVersionsMsg);
+        } else {
+            throw new UnsupportedOperationException("PacketEvents failed to use the " + enumConst.name() + " enum constant in the " + enumConstClass.getSimpleName() + " enum. This enum constant is not supported on your server version. (" + PacketEvents.get().getServerUtils().getVersion() + ")\n Failed to find out what server versions this enum constant is supported on.");
+        }
+    }
+
+    protected void throwUnsupportedOperation() throws UnsupportedOperationException {
+        final String currentMethodName = "throwUnsupportedOperation";
+        StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
+        int stackTraceElementIndex = 2;
+        for (int i = 0; i < stackTraceElements.length; i++) {
+            StackTraceElement element = stackTraceElements[i];
+            if (element.getMethodName().equals(currentMethodName)) {
+                stackTraceElementIndex = i + 1; //It is the next method
+                break;
+            }
+        }
+        StackTraceElement stackTraceElement = stackTraceElements[stackTraceElementIndex];
+        String methodName = stackTraceElement.getMethodName();
+        List<Method> possibleMethods = Reflection.getMethods(getClass(), methodName, (Class<?>) null);
+        Method method = null;
+        for (Method m : possibleMethods) {
+            if (m.isAnnotationPresent(SupportedVersions.class)) {
+                method = m;
+                break;
+            }
+        }
+        if (method == null) {
+            throw new UnsupportedOperationException("PacketEvents failed to access your requested field. This field is not supported on your server version. Failed to lookup the server versions this field supports...");
+        } else {
+            SupportedVersions supportedVersions = method.getAnnotation(SupportedVersions.class);
+            List<ServerVersion> versionList = parseSupportedVersionsAnnotation(supportedVersions);
+
+            String supportedVersionsMsg = Arrays.toString(versionList.toArray(new ServerVersion[0]));
+            throw new UnsupportedOperationException("PacketEvents failed to access your requested field. This field is not supported on your server version. (" + PacketEvents.get().getServerUtils().getVersion() + ")\n This field is only supported on these server versions: " + supportedVersionsMsg);
+        }
+    }
+
+    private List<ServerVersion> parseSupportedVersionsAnnotation(SupportedVersions supportedVersions) {
+        List<ServerVersion> versionList = new ArrayList<>();
+        for (int i = 0; i < supportedVersions.ranges().length; i += 2) {
+            ServerVersion first = supportedVersions.ranges()[i];
+            ServerVersion last = supportedVersions.ranges()[i + 1];
+            if (first == last) {
+                versionList.add(first);
+                continue;
+            } else if (first == ServerVersion.ERROR) {
+                first = ServerVersion.getOldest();
+            } else if (last == ServerVersion.ERROR) {
+                last = ServerVersion.getLatest();
+            }
+            versionList.addAll(Arrays.asList(ServerVersion.values()).subList(first.ordinal(), last.ordinal() + 1));
+        }
+        versionList.remove(ServerVersion.ERROR);
+        return versionList;
+    }
+
+
+    @Override
+    public boolean readBoolean(int index) {
+        return read(index, boolean.class);
+    }
+
+    @Override
+    public byte readByte(int index) {
+        return read(index, byte.class);
+    }
+
+    @Override
+    public short readShort(int index) {
+        return read(index, short.class);
+    }
+
+    @Override
+    public int readInt(int index) {
+        return read(index, int.class);
+    }
+
+    @Override
+    public long readLong(int index) {
+        return read(index, long.class);
+    }
+
+    @Override
+    public float readFloat(int index) {
+        return read(index, float.class);
+    }
+
+    @Override
+    public double readDouble(int index) {
+        return read(index, double.class);
+    }
+
+    @Override
+    public boolean[] readBooleanArray(int index) {
+        return read(index, boolean[].class);
+    }
+
+    @Override
+    public byte[] readByteArray(int index) {
+        return read(index, byte[].class);
+    }
+
+    @Override
+    public short[] readShortArray(int index) {
+        return read(index, short[].class);
+    }
+
+    @Override
+    public int[] readIntArray(int index) {
+        return read(index, int[].class);
+    }
+
+    @Override
+    public long[] readLongArray(int index) {
+        return read(index, long[].class);
+    }
+
+    @Override
+    public float[] readFloatArray(int index) {
+        return read(index, float[].class);
+    }
+
+    @Override
+    public double[] readDoubleArray(int index) {
+        return read(index, double[].class);
+    }
+
+    @Override
+    public String[] readStringArray(int index) {
+        return read(index, String[].class); // JavaImpact: Can we be sure that returning the original array is okay? retrooper: Yes
+    }
+
+    @Override
+    public String readString(int index) {
+        return read(index, String.class);
+    }
+
+    @Override
+    public Object readAnyObject(int index) {
+        try {
+            Field f = packetClass.getDeclaredFields()[index];
+            if (!f.isAccessible()) {
+                f.setAccessible(true);
+            }
+            try {
+                return f.get(packet.getRawNMSPacket());
+            } catch (IllegalAccessException | NullPointerException | ArrayIndexOutOfBoundsException e) {
+                e.printStackTrace();
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw new WrapperFieldNotFoundException("PacketEvents failed to find any field indexed " + index + " in the " + ClassUtil.getClassSimpleName(packetClass) + " class!");
+        }
+        return null;
+    }
+
+    @Override
+    public <T> T readObject(int index, Class<? extends T> type) {
+        return read(index, type);
+    }
+
+    @Override
+    public Enum<?> readEnumConstant(int index, Class<? extends Enum<?>> type) {
+        return read(index, type);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T read(int index, Class<? extends T> type) {
+        try {
+            Field field = getField(type, index);
+            return (T) field.get(packet.getRawNMSPacket());
+        } catch (IllegalAccessException | NullPointerException | ArrayIndexOutOfBoundsException e) {
+            throw new WrapperFieldNotFoundException(packetClass, type, index);
+        }
+    }
+
+
+    @Override
+    public void writeBoolean(int index, boolean value) {
+        write(boolean.class, index, value);
+    }
+
+    @Override
+    public void writeByte(int index, byte value) {
+        write(byte.class, index, value);
+    }
+
+    @Override
+    public void writeShort(int index, short value) {
+        write(short.class, index, value);
+    }
+
+    @Override
+    public void writeInt(int index, int value) {
+        write(int.class, index, value);
+    }
+
+    @Override
+    public void writeLong(int index, long value) {
+        write(long.class, index, value);
+    }
+
+    @Override
+    public void writeFloat(int index, float value) {
+        write(float.class, index, value);
+    }
+
+    @Override
+    public void writeDouble(int index, double value) {
+        write(double.class, index, value);
+    }
+
+    @Override
+    public void writeString(int index, String value) {
+        write(String.class, index, value);
+    }
+
+    @Override
+    public void writeObject(int index, Object value) {
+        write(value.getClass(), index, value);
+    }
+
+    @Override
+    public void writeBooleanArray(int index, boolean[] array) {
+        write(boolean[].class, index, array);
+    }
+
+    @Override
+    public void writeByteArray(int index, byte[] value) {
+        write(byte[].class, index, value);
+    }
+
+    @Override
+    public void writeShortArray(int index, short[] value) {
+        write(short[].class, index, value);
+    }
+
+    @Override
+    public void writeIntArray(int index, int[] value) {
+        write(int[].class, index, value);
+    }
+
+    @Override
+    public void writeLongArray(int index, long[] value) {
+        write(long[].class, index, value);
+    }
+
+    @Override
+    public void writeFloatArray(int index, float[] value) {
+        write(float[].class, index, value);
+    }
+
+    @Override
+    public void writeDoubleArray(int index, double[] value) {
+        write(double[].class, index, value);
+    }
+
+    @Override
+    public void writeStringArray(int index, String[] value) {
+        write(String[].class, index, value);
+    }
+
+    @Override
+    public void writeAnyObject(int index, Object value) {
+        try {
+            Field f = packetClass.getDeclaredFields()[index];
+            if (!f.isAccessible()) {
+                f.setAccessible(true);
+            }
+            f.set(packet.getRawNMSPacket(), value);
+        } catch (Exception e) {
+            throw new WrapperFieldNotFoundException("PacketEvents failed to find any field indexed " + index + " in the " + ClassUtil.getClassSimpleName(packetClass) + " class!");
+        }
+    }
+
+    @Override
+    public void writeEnumConstant(int index, Enum<?> enumConstant) {
+        try {
+            write(enumConstant.getClass(), index, enumConstant);
+        } catch (WrapperFieldNotFoundException ex) {
+            write(enumConstant.getDeclaringClass(), index, enumConstant);
+        }
+    }
+
+    public void write(Class<?> type, int index, Object value) throws WrapperFieldNotFoundException {
+        Field field = getField(type, index);
+        if (field == null) {
+            throw new WrapperFieldNotFoundException(packetClass, type, index);
+        }
+        try {
+            field.set(packet.getRawNMSPacket(), value);
+        } catch (IllegalAccessException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public Vector3i readBlockPosition(int index) {
+        Object blockPosObj = readObject(index, NMSUtils.blockPosClass);
+        try {
+            int x = (Integer) NMSUtils.getBlockPosX.invoke(blockPosObj);
+            int y = (Integer) NMSUtils.getBlockPosY.invoke(blockPosObj);
+            int z = (Integer) NMSUtils.getBlockPosZ.invoke(blockPosObj);
+            return new Vector3i(x, y, z);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public Vector3i readSectionPosition(int index) {
+        Object blockPosObj = readObject(index, NMSUtils.sectionPositionClass);
+        try {
+            int x = (Integer) NMSUtils.getBlockPosX.invoke(blockPosObj);
+            int y = (Integer) NMSUtils.getBlockPosY.invoke(blockPosObj);
+            int z = (Integer) NMSUtils.getBlockPosZ.invoke(blockPosObj);
+            return new Vector3i(x, y, z);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public void writeBlockPosition(int index, Vector3i blockPosition) {
+        Object blockPosObj = NMSUtils.generateNMSBlockPos(blockPosition);
+        write(NMSUtils.blockPosClass, index, blockPosObj);
+    }
+
+    public ItemStack readItemStack(int index) {
+        Object nmsItemStack = readObject(index, NMSUtils.nmsItemStackClass);
+        return NMSUtils.toBukkitItemStack(nmsItemStack);
+    }
+
+    public void writeItemStack(int index, ItemStack stack) {
+        Object nmsItemStack = NMSUtils.toNMSItemStack(stack);
+        write(NMSUtils.nmsItemStackClass, index, nmsItemStack);
+    }
+
+    @Nullable
+    public GameMode readGameMode(int index) {
+        Enum<?> enumConst = readEnumConstant(index, NMSUtils.enumGameModeClass);
+        int targetIndex = enumConst.ordinal() - 1;
+        if (targetIndex == -1) {
+            return null;
+        }
+        return GameMode.values()[targetIndex];
+    }
+
+    public void writeGameMode(int index, @Nullable GameMode gameMode) {
+        int i = gameMode != null ? (gameMode.ordinal() + 1) : (0);
+        Enum<?> enumConst = EnumUtil.valueByIndex(NMSUtils.enumGameModeClass, i);
+        writeEnumConstant(index, enumConst);
+    }
+
+    public Dimension readDimension(int index, int dimensionIDLegacyIndex) {
+        int dimensionID;
+        if (version.isOlderThan(ServerVersion.v_1_13_2)) {
+            dimensionID = readInt(dimensionIDLegacyIndex);
+        } else {
+            Object dimensionManagerObject = readObject(index, NMSUtils.dimensionManagerClass);
+            WrappedPacket dimensionManagerWrapper = new WrappedPacket(new NMSPacket(dimensionManagerObject));
+            dimensionID = dimensionManagerWrapper.readInt(0) - 1;
+        }
+        return Dimension.getById(dimensionID);
+    }
+
+    public void writeDimension(int index, int dimensionIDLegacyIndex, Dimension dimension) {
+        if (version.isOlderThan(ServerVersion.v_1_13_2)) {
+            writeInt(dimensionIDLegacyIndex, dimension.getId());
+        } else {
+            Object dimensionManagerObject = readObject(index, NMSUtils.dimensionManagerClass);
+            WrappedPacket dimensionManagerWrapper = new WrappedPacket(new NMSPacket(dimensionManagerObject));
+            dimensionManagerWrapper.writeInt(0, dimension.getId() + 1);
+        }
+    }
+
+
+    public Difficulty readDifficulty(int index) {
+        Enum<?> enumConstant = readEnumConstant(index, NMSUtils.enumDifficultyClass);
+        return Difficulty.values()[enumConstant.ordinal()];
+    }
+
+    public void writeDifficulty(int index, Difficulty difficulty) {
+        Enum<?> enumConstant = EnumUtil.valueByIndex(NMSUtils.enumDifficultyClass, difficulty.ordinal());
+        writeEnumConstant(index, enumConstant);
+    }
+
+    public String readIChatBaseComponent(int index) {
+        Object iChatBaseComponent = readObject(index, NMSUtils.iChatBaseComponentClass);
+        return NMSUtils.readIChatBaseComponent(iChatBaseComponent);
+    }
+
+    public void writeIChatBaseComponent(int index, String content) {
+        Object iChatBaseComponent = NMSUtils.generateIChatBaseComponent(content);
+        write(NMSUtils.iChatBaseComponentClass, index, iChatBaseComponent);
+    }
+
+    public String readMinecraftKey(int index) {
+        if (isVersion_1_17 == -1) {
+            isVersion_1_17 = (byte) (version.isNewerThanOrEquals(ServerVersion.v_1_17) ? 1 : 0);
+        }
+        int namespaceIndex = isVersion_1_17 == 1 ? 2 : 0;
+        int keyIndex = isVersion_1_17 == 1 ? 3 : 1;
+        Object minecraftKey = readObject(index, NMSUtils.minecraftKeyClass);
+        WrappedPacket minecraftKeyWrapper = new WrappedPacket(new NMSPacket(minecraftKey));
+        return minecraftKeyWrapper.readString(namespaceIndex) + ":" + minecraftKeyWrapper.readString(keyIndex);
+    }
+
+    public void writeMinecraftKey(int index, String content) {
+        Object minecraftKey = null;
+        try {
+            minecraftKey = NMSUtils.minecraftKeyConstructor.newInstance(content);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        write(NMSUtils.minecraftKeyClass, index, minecraftKey);
+    }
+
+    public List<Object> readList(int index) {
+        return read(index, List.class);
+    }
+
+    public void writeList(int index, List<Object> list) {
+        write(List.class, index, list);
+    }
+
+    private Field getField(Class<?> type, int index) {
+        Map<Class<?>, Field[]> cached = FIELD_CACHE.computeIfAbsent(packetClass, k -> new ConcurrentHashMap<>());
+        Field[] fields = cached.computeIfAbsent(type, typeClass -> getFields(typeClass, packetClass.getDeclaredFields()));
+        if (fields.length >= index + 1) {
+            return fields[index];
+        } else {
+            throw new WrapperFieldNotFoundException(packetClass, type, index);
+        }
+    }
+
+    private Field[] getFields(Class<?> type, Field[] fields) {
+        List<Field> ret = new ArrayList<>();
+        for (Field field : fields) {
+            if (field.getType().equals(type)) {
+                if (!field.isAccessible()) {
+                    field.setAccessible(true);
+                }
+                ret.add(field);
+            }
+        }
+        return ret.toArray(EMPTY_FIELD_ARRAY);
+    }
+
+
+    /**
+     * Does the local server version support reading at-least one field with this packet wrapper?
+     * If it does, we can label this wrapper to be supported on the local server version.
+     * One example where it would not be supported would be if the packet the wrapper is wrapping doesn't even exist on the local server version.
+     *
+     * @return Is the wrapper supported on the local server version?
+     */
+    public boolean isSupported() {
+        return true;
+    }
+
+    /**
+     * If a method in a wrapper is annotated with this, it means it isn't supported on all server versions.
+     * It not being supported by all server versions can lead to exceptions. Make sure you always decompile a wrapper getter before using it.
+     * This annotation will specify what versions are supported.
+     *
+     * @author retrooper
+     * @since 1.8
+     */
+    @Target({ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR})
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface SupportedVersions {
+        ServerVersion[] ranges() default {};
+    }
+}
@@ -0,0 +1,29 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2021 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 io.github.retrooper.packetevents.packetwrappers.api;
+
+/**
+ * Packet-Wrappers that can be sent to clients.
+ *
+ * @author retrooper
+ * //TODO since javadoc annotation
+ */
+public interface SendableWrapper {
+    Object asNMSPacket() throws Exception;
+}
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.packetwrappers.api;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.in.abilities.WrappedPacketInAbilities;
-import io.github.retrooper.packetevents.packetwrappers.in.armanimation.WrappedPacketInArmAnimation;
-import io.github.retrooper.packetevents.packetwrappers.in.blockdig.WrappedPacketInBlockDig;
-import io.github.retrooper.packetevents.packetwrappers.in.blockplace.WrappedPacketInBlockPlace;
-import io.github.retrooper.packetevents.packetwrappers.in.chat.WrappedPacketInChat;
-import io.github.retrooper.packetevents.packetwrappers.in.clientcommand.WrappedPacketInClientCommand;
-import io.github.retrooper.packetevents.packetwrappers.in.custompayload.WrappedPacketInCustomPayload;
-import io.github.retrooper.packetevents.packetwrappers.in.entityaction.WrappedPacketInEntityAction;
-import io.github.retrooper.packetevents.packetwrappers.in.flying.WrappedPacketInFlying;
-import io.github.retrooper.packetevents.packetwrappers.in.helditemslot.WrappedPacketInHeldItemSlot;
-import io.github.retrooper.packetevents.packetwrappers.in.keepalive.WrappedPacketInKeepAlive;
-import io.github.retrooper.packetevents.packetwrappers.in.settings.WrappedPacketInSettings;
-import io.github.retrooper.packetevents.packetwrappers.in.steervehicle.WrappedPacketInSteerVehicle;
-import io.github.retrooper.packetevents.packetwrappers.in.transaction.WrappedPacketInTransaction;
-import io.github.retrooper.packetevents.packetwrappers.in.useentity.WrappedPacketInUseEntity;
-import io.github.retrooper.packetevents.packetwrappers.in.windowclick.WrappedPacketInWindowClick;
-import io.github.retrooper.packetevents.packetwrappers.out.abilities.WrappedPacketOutAbilities;
-import io.github.retrooper.packetevents.packetwrappers.out.animation.WrappedPacketOutAnimation;
-import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
-import io.github.retrooper.packetevents.packetwrappers.out.entity.WrappedPacketOutEntity;
-import io.github.retrooper.packetevents.packetwrappers.out.entityvelocity.WrappedPacketOutEntityVelocity;
-import io.github.retrooper.packetevents.packetwrappers.out.keepalive.WrappedPacketOutKeepAlive;
-import io.github.retrooper.packetevents.packetwrappers.out.kickdisconnect.WrappedPacketOutKickDisconnect;
-import io.github.retrooper.packetevents.packetwrappers.out.position.WrappedPacketOutPosition;
-import io.github.retrooper.packetevents.packetwrappers.out.transaction.WrappedPacketOutTransaction;
-import io.github.retrooper.packetevents.packetwrappers.out.updatehealth.WrappedPacketOutUpdateHealth;
-import org.bukkit.entity.Player;
-
-public class WrappedPacket {
-    public static ServerVersion version = null;
-    protected final Player player;
-    protected Object packet;
-
-    public WrappedPacket() {
-        this.player = null;
-        this.packet = null;
-    }
-
-    public WrappedPacket(final Object packet) {
-        this.player = null;
-        if (packet == null) return;
-        this.packet = packet;
-        try {
-            setup();
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public WrappedPacket(final Player player, final Object packet) {
-        this.player = player;
-        if (packet == null) return;
-        this.packet = packet;
-        try {
-            setup();
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void loadAllWrappers() {
-        //SERVER BOUND
-        WrappedPacketInAbilities.load();
-        WrappedPacketInArmAnimation.load();
-        WrappedPacketInBlockDig.load();
-        WrappedPacketInBlockPlace.load();
-        WrappedPacketInChat.load();
-        WrappedPacketInClientCommand.load();
-        WrappedPacketInCustomPayload.load();
-        WrappedPacketInEntityAction.load();
-        WrappedPacketInFlying.load();
-        WrappedPacketInHeldItemSlot.load();
-        WrappedPacketInKeepAlive.load();
-        WrappedPacketInSettings.load();
-        WrappedPacketInSteerVehicle.load();
-        WrappedPacketInTransaction.load();
-        WrappedPacketInUseEntity.load();
-        WrappedPacketInWindowClick.load();
-
-        //CLIENTBOUND
-        WrappedPacketOutAbilities.load();
-        WrappedPacketOutAnimation.load();
-        WrappedPacketOutChat.load();
-        WrappedPacketOutEntity.load();
-        WrappedPacketOutEntityVelocity.load();
-        WrappedPacketOutKeepAlive.load();
-        WrappedPacketOutKickDisconnect.load();
-        WrappedPacketOutPosition.load();
-        WrappedPacketOutTransaction.load();
-        WrappedPacketOutUpdateHealth.load();
-    }
-
-    protected void setup() {
-
-    }
-
-}