Merge pull request #570 from D3lta-2-1/fabric

Fabric server side support added

.github/workflows/build.yml

@@ -0,0 +1,39 @@
+# Automatically build the project and run any configured tests for every push
+# and submitted pull request. This can help catch issues that only occur on
+# certain platforms or Java versions, and provides a first line of defence
+# against bad commits.
+
+name: build
+on: [pull_request, push]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        # Use these Java versions
+        java: [
+          17,    # Current Java LTS & minimum supported by Minecraft
+        ]
+        # and run on both Linux and Windows
+        os: [ubuntu-20.04, windows-2022]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v2
+      - name: validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: make gradle wrapper executable
+        if: ${{ runner.os != 'Windows' }}
+        run: chmod +x ./gradlew
+      - name: build
+        run: ./gradlew build
+      - name: capture build artifacts
+        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        uses: actions/upload-artifact@v2
+        with:
+          name: Artifacts
+          path: build/libs/

.gitignore

@@ -0,0 +1,33 @@
+# gradle
+
+.gradle/
+build/
+out/
+classes/
+
+# eclipse
+
+*.launch
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+
+# macos
+
+*.DS_Store
+
+# fabric
+
+run/

LICENSE

@@ -671,4 +671,4 @@ 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>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,23 +1,9 @@
-# packetevents by retrooper
+# Fabric Example Mod
 
-A lightweight spigot packetlistener & packetsender coded by retrooper.
+## Setup
 
-## About
+For setup instructions please see the [fabric wiki page](https://fabricmc.net/wiki/tutorial:setup) that relates to the IDE that you are using.
 
-This packetlistener is **only** supported on spigot servers and has been tested to work on these spigot forks: PaperSpigot, Tuinity
+## License
 
-* No dependencies
-
-* Licensed under the GPL3 license.
-
-[![](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-
-Join my discord server(to talk to me): https://discord.gg/ZWTkg4v
-
-[![](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)
-
-To learn how to setup this API please click on the link below
-[Setup Guide](https://github.com/retrooper/packetevents/wiki/PacketEvents-Setup-Guide)
-(or just paste this into your browser: https://github.com/retrooper/packetevents/wiki/PacketEvents-Setup-Guide)
+This template is available under the CC0 license. Feel free to learn from it and incorporate it in your own projects.

build.gradle

@@ -0,0 +1,93 @@
+plugins {
+	id 'fabric-loom' version '0.11-SNAPSHOT'
+	id 'maven-publish'
+}
+
+version = project.mod_version
+group = project.maven_group
+
+project.ext.adventureVersion = '4.10.1'
+project.ext.adventureDependencies=["net.kyori:adventure-api:${adventureVersion}",
+								   "net.kyori:adventure-text-serializer-gson:${adventureVersion}",
+								   "net.kyori:adventure-text-serializer-legacy:${adventureVersion}",
+								   "net.kyori:adventure-text-serializer-gson-legacy-impl:${adventureVersion}",
+		                           "net.kyori:adventure-key:${adventureVersion}",
+		                           "net.kyori:adventure-nbt:${adventureVersion}",
+                                   "net.kyori:examination-api:1.3.0",
+                                   "net.kyori:examination-string:1.3.0"]
+
+repositories {
+	mavenCentral()
+	maven { url 'https://repo.codemc.io/repository/maven-snapshots/' }
+	maven {
+		name = 'ParchmentMC'
+		url = 'https://maven.parchmentmc.org'
+	}
+}
+
+dependencies {
+	modImplementation 'com.github.retrooper.packetevents:netty-common:2.0.0-SNAPSHOT'
+	include('com.github.retrooper.packetevents:netty-common:2.0.0-SNAPSHOT')
+	modImplementation(adventureDependencies)
+	include(adventureDependencies)
+
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+
+	mappings loom.layered() {
+		officialMojangMappings()
+		parchment("org.parchmentmc.data:parchment-${project.parchment_minecraft_version}:${project.parchment_mappings}")
+	}
+
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+}
+
+configurations.all {
+	resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
+processResources {
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	it.options.release = 17
+}
+
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			from components.java
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}

gradle.properties

@@ -0,0 +1,18 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+
+# Fabric Properties
+	# check these on https://fabricmc.net/develop
+	minecraft_version=1.19.4
+	parchment_mappings=2023.03.12
+	parchment_minecraft_version=1.19.3
+	loader_version=0.14.18
+
+# Mod Properties
+	mod_version = 2.0.0
+	maven_group = io.github.retrooper
+	archives_base_name = packetevents
+
+# Dependencies
+    fabric_version=0.77.0+1.19.4
+

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

@@ -0,0 +1,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

packetevents.iml

@@ -1,44 +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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <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.7.10:1.7.10" level="project" />
-    <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: 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: org.yaml:snakeyaml:1.18" 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.google.guava:guava:21.0" 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" />
-  </component>
-</module>

pom.xml

@@ -1,115 +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.5</version>
-    <packaging>jar</packaging>
-    <name>packetevents</name>
-
-    <properties>
-        <java.version>1.8</java.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <build>
-        <defaultGoal>clean package</defaultGoal>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-    <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.7.10</artifactId>
-            <version>1.7.10</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.8.8</artifactId>
-            <version>1.8.8</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.comphenix.protocol</groupId>
-            <artifactId>ProtocolLib</artifactId>
-            <version>4.5.0</version>
-            <scope>provided</scope>
-          </dependency>
-        <!-- ViaVersion API-->
-        <dependency>
-            <groupId>us.myles</groupId>
-            <artifactId>viaversion</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- ProtocolSupport API-->
-        <dependency>
-            <groupId>com.github.ProtocolSupport</groupId>
-            <artifactId>ProtocolSupport</artifactId>
-            <version>4fdd683</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>

settings.gradle

@@ -0,0 +1,10 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}

src/main/java/io/github/retrooper/packetevents/ChannelUtilities.java

@@ -0,0 +1,21 @@
+package io.github.retrooper.packetevents;
+
+import io.netty.channel.ChannelPipeline;
+
+public class ChannelUtilities {
+    public static boolean pipelineContainsSplitterAndPrepender(ChannelPipeline pipeline)
+    {
+        boolean containsSplitter = false;
+        boolean containsPrepender = false;
+        for(var handler : pipeline) {
+            PacketEventsMod.LOGGER.info(handler.getClass().getName());
+            if(handler.getKey().equals("splitter")) {
+                containsSplitter = true;
+            }
+            if(handler.getKey().equals("prepender")) {
+                containsPrepender = true;
+            }
+        }
+        return containsSplitter && containsPrepender;
+    }
+}

src/main/java/io/github/retrooper/packetevents/PacketEvents.java

@@ -1,112 +0,0 @@
-package io.github.retrooper.packetevents;
-
-import io.github.retrooper.packetevents.annotations.PacketHandler;
-import io.github.retrooper.packetevents.event.PacketListener;
-import io.github.retrooper.packetevents.event.impl.BukkitMoveEvent;
-import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.settings.Settings;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-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 java.util.HashMap;
-
-public final class PacketEvents implements PacketListener, Listener {
-    public static HashMap<Plugin, Integer> plugins = new HashMap<Plugin, Integer>();
-    public PacketEvents(final Plugin plugin) {
-        this.plugin = plugin;
-        plugins.put(plugin, plugins.size());
-    }
-    private final Plugin plugin;
-    private final PacketEventsAPI packetEventsAPI = new PacketEventsAPI();
-    private static boolean hasLoaded;
-    private static final Settings settings = new Settings();
-
-    /**
-     * Call this before start()
-     */
-    public static void load() {
-        PacketTypeClasses.Client.load();
-        PacketTypeClasses.Server.load();
-        hasLoaded = true;
-    }
-
-    /**
-     *Loads PacketEvents if you haven't already, Sets everything up, injects all players
-     */
-    public void start() {
-        if (!hasLoaded) {
-            load();
-        }
-            //Register Bukkit and PacketListener
-            getAPI().getEventManager().registerListener(this);
-
-            Bukkit.getPluginManager().registerEvents(this, plugin);
-
-            for(final Player p : Bukkit.getServer().getOnlinePlayers()) {
-                getAPI().getPlayerUtilities().injectPlayer(p, this);
-            }
-
-    }
-
-    /**
-     * Stop all tasks and unregisters all PacketEvents' listeners
-     */
-    public void stop() {
-        getAPI().getEventManager().unregisterAllListeners();
-
-        PacketType.Client.packetIds.clear();
-        PacketType.Server.packetIds.clear();
-        for(final Player p : Bukkit.getServer().getOnlinePlayers()) {
-            getAPI().getPlayerUtilities().uninjectPlayer(p, this);
-        }
-    }
-
-    public PacketEventsAPI getAPI() {
-        return packetEventsAPI;
-    }
-
-    public Plugin getPlugin() {
-        return plugin;
-    }
-
-    public String getHandlerName() {
-        return "packetevents_" + plugins.get(plugin);
-    }
-    public static Settings getSettings() {
-        return settings;
-    }
-
-    @PacketHandler
-    public void onInject(final PlayerInjectEvent e) {
-        getAPI().getPlayerUtilities().setClientVersion(e.getPlayer(), e.getClientVersion());
-    }
-
-    @PacketHandler
-    public void onReceive(final PacketReceiveEvent e) {
-    }
-
-    @EventHandler
-    public void onJoin(final PlayerJoinEvent e) {
-        getAPI().getPlayerUtilities().injectPlayer(e.getPlayer(), this);
-    }
-
-    @EventHandler
-    public void onQuit(final PlayerQuitEvent e) {
-        getAPI().getPlayerUtilities().clearClientVersion(e.getPlayer());
-        getAPI().getPlayerUtilities().uninjectPlayer(e.getPlayer(), this);
-    }
-
-    @EventHandler
-    public void onMove(final PlayerMoveEvent e) {
-        getAPI().getEventManager().callEvent(new BukkitMoveEvent(e), getPlugin());
-    }
-}

src/main/java/io/github/retrooper/packetevents/PacketEventsAPI.java

@@ -1,68 +0,0 @@
-package io.github.retrooper.packetevents;
-
-import io.github.retrooper.packetevents.event.manager.EventManager;
-import io.github.retrooper.packetevents.settings.Settings;
-import io.github.retrooper.packetevents.utils.api.PlayerUtils;
-import io.github.retrooper.packetevents.utils.api.ServerUtils;
-import org.bukkit.scheduler.BukkitTask;
-
-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 getPlayerUtilities() {
-        return playerUtils;
-    }
-
-    /**
-     * Get all utilities to do with the server
-     *
-     * @return Server Utilities
-     */
-    public ServerUtils getServerUtilities() {
-        return serverUtils;
-    }
-
-    /**
-     * Get the event manager
-     * Used to call events, register and unregister listeners
-     *
-     * @return PacketEvents' event manager
-     */
-    public EventManager getEventManager() {
-        return eventManager;
-    }
-
-
-
-}

src/main/java/io/github/retrooper/packetevents/PacketEventsMod.java

@@ -0,0 +1,62 @@
+package io.github.retrooper.packetevents;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.PacketListenerAbstract;
+import com.github.retrooper.packetevents.event.PacketSendEvent;
+import io.github.retrooper.packetevents.factory.fabric.FabricPacketEventsBuilder;
+import io.github.retrooper.packetevents.factory.fabric.ServerInstanceManager;
+import io.github.retrooper.packetevents.mixin.ClientPacketListenerAccessor;
+import io.github.retrooper.packetevents.mixin.ConnectionAccessor;
+import io.github.retrooper.packetevents.mixin.ServerGamePacketListenerImplAccessor;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
+import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
+import net.minecraft.client.Minecraft;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PacketEventsMod implements PreLaunchEntrypoint, ModInitializer, ClientModInitializer {
+    //single player world are locked on loading, don't know why
+    public static final Logger LOGGER = LoggerFactory.getLogger("packetevents");
+
+    @Override
+    public void onPreLaunch() {
+        PacketEvents.setAPI(FabricPacketEventsBuilder.build("packetevents"));
+        PacketEvents.getAPI().getSettings().debug(true).bStats(true);
+        PacketEvents.getAPI().load();
+        //TODO Test if userconnectevent and userdisconnectevent work.
+        //especially disconnect
+    }
+
+    @Override
+    public void onInitialize() {
+        ServerInstanceManager.init();
+        PacketEvents.getAPI().init();
+        ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
+            var connection = ((ServerGamePacketListenerImplAccessor)handler).getConnection();
+            var channel = ((ConnectionAccessor)connection).getChannel();
+            if(ChannelUtilities.pipelineContainsSplitterAndPrepender(channel.pipeline()))
+                PacketEvents.getAPI().getInjector().setPlayer(channel, handler.player);
+        });
+
+        PacketEvents.getAPI().getEventManager().registerListener(new PacketListenerAbstract() {
+            @Override
+            public void onPacketSend(PacketSendEvent event) {
+                //System.out.println("Packet send: " + event.getPacketType());
+                //System.out.println("player: " + event.getPlayer());
+            }
+        });
+    }
+
+    @Override
+    public void onInitializeClient() {
+        ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
+            var connection = ((ClientPacketListenerAccessor)handler).getConnection();
+            var channel = ((ConnectionAccessor)connection).getChannel();
+            if(ChannelUtilities.pipelineContainsSplitterAndPrepender(channel.pipeline()))
+                PacketEvents.getAPI().getInjector().setPlayer(channel, Minecraft.getInstance().player);
+        });
+    }
+}

src/main/java/io/github/retrooper/packetevents/annotations/NotNull.java

@@ -1,16 +0,0 @@
-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 {
-
-
-}

src/main/java/io/github/retrooper/packetevents/annotations/Nullable.java

@@ -1,16 +0,0 @@
-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 {
-
-
-}

src/main/java/io/github/retrooper/packetevents/annotations/PacketHandler.java

@@ -1,18 +0,0 @@
-package io.github.retrooper.packetevents.annotations;
-
-import io.github.retrooper.packetevents.annotations.data.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;
-}

src/main/java/io/github/retrooper/packetevents/annotations/data/EventSynchronization.java

@@ -1,5 +0,0 @@
-package io.github.retrooper.packetevents.annotations.data;
-
-public enum EventSynchronization {
-    FORCE_SYNC, FORCE_ASYNC, NORMAL
-}

src/main/java/io/github/retrooper/packetevents/enums/ClientVersion.java

@@ -1,104 +0,0 @@
-package io.github.retrooper.packetevents.enums;
-
-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, v_1_15_1, v_1_15_2, v_1_16, v_1_16_1, HIGHER_THAN_V_1_16_1, INVALID, ACCESS_FAILURE;
-
-    public static ClientVersion fromProtocolVersion(final int protocolVersion) {
-        int remainder = -1;
-        switch (protocolVersion) {
-            case -1:
-                return ACCESS_FAILURE;
-            case 1:
-            case 2:
-            case 3:
-            case 4:
-                return LESS_THAN_V_1_7_10;
-            case 47://ranging from 1.8->1.8.9
-                return v_1_8;
-            case 107:
-                return v_1_9;
-            case 108:
-                return v_1_9_1;
-            case 109:
-                return v_1_9_2;
-            case 110:
-                return v_1_9_3; //can be 1.9.3 or 1.9.4
-            case 210:
-                return v_1_10; //could be 1.10,1.10.1, 1.10.2
-            case 315:
-                return v_1_11;
-            case 316: //could be 11.1 or 11.2
-                return v_1_11_1;
-            case 335:
-                return v_1_12;
-            case 338:
-                return v_1_12_1;
-            case 340:
-                return v_1_12_2;
-            case 393:
-                return v_1_13;
-            case 401:
-                return v_1_13_1;
-            case 404:
-                return v_1_13_2;
-            case 477:
-                return v_1_14;
-            case 480:
-                return v_1_14_1;
-            case 485:
-                return v_1_14_2;
-            case 490:
-                return v_1_14_3;
-            case 498:
-                return v_1_14_4;
-            case 573:
-                return v_1_15;
-            case 575:
-                return v_1_15_1;
-            case 578:
-                return v_1_15_2;
-            case 735:
-                return v_1_16;
-            case 736:
-                return v_1_16_1;
-            default:
-                remainder = protocolVersion;
-        }
-        if (remainder > 578) {
-            return HIGHER_THAN_V_1_16_1;
-        }
-        return INVALID;
-    }
-
-    /**
-     * Returns if the client's version is more up to date than the argument passed version
-     *
-     * @param version
-     * @return
-     */
-    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
-     * @return
-     */
-    public boolean isLowerThan(final ClientVersion version) {
-        if (version == this) return false;
-        final int len = values().length;
-        for (byte i = 0; i < len; i++) {
-            final ClientVersion v = values()[i];
-            if (v == this) {
-                return true;
-            } else if (v == version) {
-                return false;
-            }
-        }
-        return false;
-    }
-}

src/main/java/io/github/retrooper/packetevents/enums/Direction.java

@@ -1,15 +0,0 @@
-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];
-    }
-}

src/main/java/io/github/retrooper/packetevents/enums/ServerVersion.java

@@ -1,103 +0,0 @@
-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_8, v_1_9, v_1_9_4, v_1_10, v_1_11, v_1_12, v_1_13, v_1_13_2, v_1_14, v_1_15, v_1_16_1,
-    ERROR, EMPTY;
-
-    private static final ServerVersion[] reversedValues;
-    private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
-    private static ServerVersion cachedVersion;
-
-    static {
-        reversedValues = reverse(values());
-    }
-
-    private static ServerVersion getVers() {
-        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 = getVers();
-        }
-        return cachedVersion;
-    }
-
-
-    private 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
-     * @return
-     */
-    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
-     * @return
-     */
-    public boolean isLowerThan(final ServerVersion version) {
-        if (version == this) return false;
-        final int len = values().length;
-        for (byte i = 0; i < len; i++) {
-            final ServerVersion v = values()[i];
-            if (v == this) {
-                return true;
-            } else if (v == version) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-}

src/main/java/io/github/retrooper/packetevents/enums/SystemOS.java

@@ -1,32 +0,0 @@
-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;
-    }
-}

src/main/java/io/github/retrooper/packetevents/enums/minecraft/EntityAnimationType.java

@@ -1,19 +0,0 @@
-package io.github.retrooper.packetevents.enums.minecraft;
-
-public enum EntityAnimationType {
-    SWING_MAIN_ARM, DAMAGE, LEAVE_BED, SWING_OFFHAND, CRITICAL_EFFECT, MAGIC_CRITICAL_EFFECT;
-
-    public static final EntityAnimationType get(final int i) {
-        return values()[i];
-    }
-
-    public final int getIndex() {
-        for (int i = 0; i < values().length; i++) {
-            final EntityAnimationType curType = values()[0];
-            if (curType == this) {
-                return i;
-            }
-        }
-        return -1;
-    }
-}

src/main/java/io/github/retrooper/packetevents/enums/minecraft/EntityUseAction.java

@@ -1,9 +0,0 @@
-package io.github.retrooper.packetevents.enums.minecraft;
-
-public enum EntityUseAction {
-    INTERACT, INTERACT_AT, ATTACK, INVALID;
-
-    public static EntityUseAction get(final int i) {
-        return values()[i];
-    }
-}

src/main/java/io/github/retrooper/packetevents/enums/minecraft/Hand.java

@@ -1,6 +0,0 @@
-package io.github.retrooper.packetevents.enums.minecraft;
-
-public enum Hand {
-    MAIN_HAND,
-    OFF_HAND
-}

src/main/java/io/github/retrooper/packetevents/enums/minecraft/PlayerAction.java

@@ -1,59 +0,0 @@
-package io.github.retrooper.packetevents.enums.minecraft;
-
-public enum PlayerAction {
-    START_SNEAKING,
-
-    STOP_SNEAKING,
-
-    STOP_SLEEPING,
-
-    START_SPRINTING,
-
-    STOP_SPRINTING,
-
-    START_RIDING_JUMP,
-
-    STOP_RIDING_JUMP,
-
-    OPEN_INVENTORY,
-
-    START_FALL_FLYING;
-
-    public static PlayerAction get(final int i) {
-        return values()[i];
-    }
-
-    public int getIndex() {
-        for (int i = 0; i < values().length; i++) {
-            final PlayerAction action = values()[i];
-            if (action == this) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    public enum UpdatedPlayerAction {
-        PRESS_SHIFT_KEY, RELEASE_SHIFT_KEY, STOP_SLEEPING, START_SPRINTING, STOP_SPRINTING, START_RIDING_JUMP, STOP_RIDING_JUMP, OPEN_INVENTORY, START_FALL_FLYING;
-
-        public static UpdatedPlayerAction get(final int index) {
-            for (int i = 0; i < index + 1; i++) {
-                final UpdatedPlayerAction action = values()[i];
-                if (i == index) {
-                    return action;
-                }
-            }
-            return null;
-        }
-
-        public int getIndex() {
-            for (int i = 0; i < values().length; i++) {
-                final UpdatedPlayerAction action = values()[i];
-                if (action == this) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-    }
-}

src/main/java/io/github/retrooper/packetevents/enums/minecraft/PlayerDigType.java

@@ -1,26 +0,0 @@
-package io.github.retrooper.packetevents.enums.minecraft;
-
-public enum PlayerDigType {
-
-    START_DESTROY_BLOCK,
-
-    ABORT_DESTROY_BLOCK,
-
-    STOP_DESTROY_BLOCK,
-
-    DROP_ALL_ITEMS,
-
-    DROP_ITEM,
-
-    RELEASE_USE_ITEM,
-
-    SWAP_HELD_ITEMS,
-
-    SWAP_ITEM_WITH_OFFHAND,
-
-    WRONG_PACKET;
-
-    public static PlayerDigType get(final int i) {
-        return values()[i];
-    }
-}

src/main/java/io/github/retrooper/packetevents/event/PacketEvent.java

@@ -1,23 +0,0 @@
-package io.github.retrooper.packetevents.event;
-
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-
-public class PacketEvent {
-    protected static ServerVersion version = ServerVersion.getVersion();
-    private long timestamp = System.currentTimeMillis();
-
-    /**
-     * Timestamp of the packet
-     *
-     * @return
-     */
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
-    }
-}

src/main/java/io/github/retrooper/packetevents/event/PacketListener.java

@@ -1,4 +0,0 @@
-package io.github.retrooper.packetevents.event;
-
-public interface PacketListener {
-}

src/main/java/io/github/retrooper/packetevents/event/impl/BukkitMoveEvent.java

@@ -1,35 +0,0 @@
-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;
-
-    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;
-    }
-}

src/main/java/io/github/retrooper/packetevents/event/impl/PacketReceiveEvent.java

@@ -1,85 +0,0 @@
-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 String name;
-    private final Object packet;
-    private boolean cancelled;
-
-    public PacketReceiveEvent(final Player player, final String packetName, final Object packet) {
-        this.player = player;
-        this.name = packetName;
-        this.packet = packet;
-    }
-
-    /**
-     * Get the player sending the packet
-     *
-     * @return
-     */
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    /**
-     * Get the packet's name (NMS packet class simple name)
-     *
-     * @return
-     */
-    public String getPacketName() {
-        return this.name;
-    }
-
-    /**
-     * Get the NMS packet object
-     *
-     * @return packet object
-     */
-    public Object getNMSPacket() {
-        return this.packet;
-    }
-
-    /**
-     * Get the class of the NMS packet object
-     *
-     * @return packet object class
-     */
-    public Class<?> getNMSPacketClass() {
-        return getNMSPacket().getClass();
-    }
-
-    /**
-     * Get the ID of the packet
-     *
-     * @return packet id
-     */
-    public byte getPacketId() {
-        Byte id = PacketType.Client.packetIds.get(getNMSPacketClass());
-        if (id == null) {
-            return -1;
-        }
-        return id;
-    }
-
-    /**
-     * Returns if the packet has been cancelled
-     *
-     * @return cancelled
-     */
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    /**
-     * Cancel the packet
-     *
-     * @param cancelled
-     */
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}

src/main/java/io/github/retrooper/packetevents/event/impl/PacketSendEvent.java

@@ -1,70 +0,0 @@
-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 String name;
-    private final Object packet;
-    private boolean cancelled;
-
-    public PacketSendEvent(final Player player, final String packetName, final Object packet) {
-        this.player = player;
-        this.name = packetName;
-        this.packet = packet;
-        this.cancelled = false;
-    }
-
-
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    public String getPacketName() {
-        return this.name;
-    }
-
-    /**
-     * Get the ID of the packet
-     *
-     * @return packet id
-     */
-    public byte getPacketId() {
-        Byte id =
-                PacketType.Server.packetIds.get(getNMSPacketClass());
-        if (id == null) {
-            return -1;
-        }
-        return id;
-    }
-
-    /**
-     * Get the NMS packet object
-     *
-     * @return packet object
-     */
-    public Object getNMSPacket() {
-        return this.packet;
-    }
-
-    /**
-     * Get the class of the NMS packet object
-     *
-     * @return packet object class
-     */
-    public Class<?> getNMSPacketClass() {
-        return getNMSPacket().getClass();
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}
-

src/main/java/io/github/retrooper/packetevents/event/impl/PlayerInjectEvent.java

@@ -1,37 +0,0 @@
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.enums.ClientVersion;
-import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
-import org.bukkit.entity.Player;
-
-public final class PlayerInjectEvent extends PacketEvent {
-    private final Player player;
-    private final ClientVersion clientVersion;
-    private boolean cancelled;
-
-    public PlayerInjectEvent(final Player player) {
-        this.player = player;
-        this.clientVersion = ClientVersion.fromProtocolVersion(VersionLookupUtils.getProtocolVersion(player));
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    public void cancel() {
-        setCancelled(true);
-    }
-
-    public ClientVersion getClientVersion() {
-        return clientVersion;
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-}

src/main/java/io/github/retrooper/packetevents/event/impl/PlayerUninjectEvent.java

@@ -1,29 +0,0 @@
-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 boolean cancelled;
-
-    public PlayerUninjectEvent(final Player player) {
-        this.player = player;
-    }
-
-    public void cancel() {
-        setCancelled(true);
-    }
-
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    public void setCancelled(final boolean val) {
-        this.cancelled = val;
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-}

src/main/java/io/github/retrooper/packetevents/event/manager/EventManager.java

@@ -1,98 +0,0 @@
-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.annotations.data.EventSynchronization;
-import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.event.PacketListener;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public final class EventManager {
-    private final ExecutorService executorService;
-    private final HashMap<PacketListener, List<Method>> registeredMethods = new HashMap<PacketListener, List<Method>>();
-
-    public EventManager(final int threadCount) {
-        executorService = Executors.newFixedThreadPool(threadCount);
-    }
-
-    public EventManager() {
-        this(Runtime.getRuntime().availableProcessors());
-    }
-
-    public void callEvent(final PacketEvent e, final Plugin plugin) {
-        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();
-                            }
-                        }
-                    };
-                    if (annotation.synchronization() == EventSynchronization.FORCE_ASYNC) {
-                        executorService.execute(invokeMethod);
-                    } else if (annotation.synchronization() == EventSynchronization.FORCE_SYNC) {
-                        Bukkit.getScheduler().runTask(plugin, invokeMethod);
-                    } else {
-                        invokeMethod.run();
-                    }
-                }
-            }
-        }
-    }
-
-    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);
-            }
-        }
-        if (!methods.isEmpty()) {
-            registeredMethods.put(e, methods);
-        }
-    }
-
-    public void registerListeners(final PacketListener... listeners) {
-        for (final PacketListener listener : listeners) {
-            registerListener(listener);
-        }
-    }
-
-    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);
-    }
-}

src/main/java/io/github/retrooper/packetevents/example/MainExample.java

@@ -1,35 +0,0 @@
-package io.github.retrooper.packetevents.example;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.annotations.PacketHandler;
-import io.github.retrooper.packetevents.event.PacketListener;
-import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
-import org.bukkit.plugin.java.JavaPlugin;
-
-public class MainExample extends JavaPlugin implements PacketListener {
-    private final PacketEvents pe = new PacketEvents(this);
-    @Override
-    public void onLoad() {
-        PacketEvents.load();
-    }
-
-    @Override
-    public void onEnable() {
-        pe.start();
-        //If packetevents cannot detect your server version, it will use the recommended version
-        // getAPI().getSettings().setDefaultServerVersion(ServerVersion.v_1_7_10);
-
-        pe.getAPI().getEventManager().registerListeners(this);
-    }
-
-    @Override
-    public void onDisable() {
-        pe.stop();
-    }
-
-    @PacketHandler
-    public void onInject(PlayerInjectEvent e) {
-        e.getPlayer().sendMessage("you have been injected");
-        System.out.println("he has been injected");
-    }
-}

src/main/java/io/github/retrooper/packetevents/factory/fabric/FabricPacketEventsBuilder.java

@@ -0,0 +1,270 @@
+package io.github.retrooper.packetevents.factory.fabric;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.PacketEventsAPI;
+import com.github.retrooper.packetevents.injector.ChannelInjector;
+import com.github.retrooper.packetevents.manager.InternalPacketListener;
+import com.github.retrooper.packetevents.manager.player.PlayerManager;
+import com.github.retrooper.packetevents.manager.protocol.ProtocolManager;
+import com.github.retrooper.packetevents.manager.server.ServerManager;
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.netty.NettyManager;
+import com.github.retrooper.packetevents.protocol.ProtocolVersion;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.settings.PacketEventsSettings;
+import com.github.retrooper.packetevents.util.LogManager;
+import com.github.retrooper.packetevents.util.reflection.ReflectionObject;
+import io.github.retrooper.packetevents.PacketEventsMod;
+import io.github.retrooper.packetevents.handler.ServerPacketDecoder;
+import io.github.retrooper.packetevents.handler.ServerPacketEncoder;
+import io.github.retrooper.packetevents.impl.netty.NettyManagerImpl;
+import io.github.retrooper.packetevents.impl.netty.manager.player.PlayerManagerAbstract;
+import io.github.retrooper.packetevents.impl.netty.manager.protocol.ProtocolManagerAbstract;
+import io.github.retrooper.packetevents.impl.netty.manager.server.ServerManagerAbstract;
+import io.netty.channel.Channel;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.minecraft.SharedConstants;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.Connection;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.entity.player.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.regex.Pattern;
+
+public class FabricPacketEventsBuilder {
+    private static final Pattern STRIP_COLOR_PATTERN = Pattern.compile("(?i)" + '\u00A7' + "[0-9A-FK-ORX]");
+    private static PacketEventsAPI<MinecraftServer> INSTANCE;
+
+    public static void clearBuildCache() {
+        INSTANCE = null;
+    }
+
+    public static PacketEventsAPI<MinecraftServer> build(String modId) {
+        if (INSTANCE == null) {
+            INSTANCE = buildNoCache(modId);
+        }
+        return INSTANCE;
+    }
+
+    public static PacketEventsAPI<MinecraftServer> build(String modId, PacketEventsSettings settings) {
+        if (INSTANCE == null) {
+            INSTANCE = buildNoCache(modId, settings);
+        }
+        return INSTANCE;
+    }
+
+
+    public static PacketEventsAPI<MinecraftServer> buildNoCache(String modId) {
+        return buildNoCache(modId, new PacketEventsSettings());
+    }
+
+    public static PacketEventsAPI<MinecraftServer> buildNoCache(String modId, PacketEventsSettings inSettings) {
+        return new PacketEventsAPI<>() {
+            private final PacketEventsSettings settings = inSettings;
+            //TODO Implement platform version
+            private final ProtocolManager protocolManager = new ProtocolManagerAbstract() {
+                @Override
+                public ProtocolVersion getPlatformVersion() {
+                    return ProtocolVersion.UNKNOWN;
+                }
+            };
+            private final ServerManager serverManager = new ServerManagerAbstract() {
+                private static ServerVersion VERSION;
+
+                @Override
+                public ServerVersion getVersion() {
+                    //TODO Not perfect, as this is on the client! Might be inaccurate by a few patch versions.
+                    if (VERSION == null) {
+                        int targetPV = SharedConstants.getProtocolVersion();
+                        for (ServerVersion version : ServerVersion.reversedValues()) {
+                            if (version.getProtocolVersion() == targetPV) {
+                                VERSION = version;
+                            }
+                        }
+                    }
+                    return VERSION;
+                }
+            };
+
+            private final PlayerManagerAbstract playerManager = new PlayerManagerAbstract() {
+                @Override
+                public int getPing(@NotNull Object player) {
+                    UUID id = ((Player) player).getGameProfile().getId();
+                    try {
+                        var minecraft = getPlugin();
+                        if(minecraft == null)
+                            return ((LocalPlayer) player).connection.getPlayerInfo(id).getLatency();
+                        else {
+                            var playerManager = minecraft.getPlayerList();
+                            var playerEntity = playerManager.getPlayer(id);
+                            return playerEntity.latency;
+                        }
+                    } catch (Exception ex) {
+                        PacketEvents.getAPI().getLogManager().debug("Failed to get ping for player " + id);
+                        return -1;
+                    }
+                }
+
+                @Override
+                public Object getChannel(@NotNull Object player) {
+                    Connection connection = ((LocalPlayer) player).connection.getConnection();
+                    ReflectionObject reflectConnection = new ReflectionObject(connection);
+                    return reflectConnection.readObject(0, Channel.class);
+                }
+            };
+
+            private final ChannelInjector injector = new ChannelInjector() {
+                @Override
+                   public boolean isServerBound() {
+                    return true;
+                }
+
+                @Override
+                public void inject() {
+
+                }
+
+                @Override
+                public void uninject() {
+
+                }
+
+                @Override
+                public void updateUser(Object ch, User user) {
+                    Channel channel = (Channel) ch;
+                    ServerPacketDecoder decoder = (ServerPacketDecoder) channel.pipeline().get(PacketEvents.DECODER_NAME);
+                    decoder.user = user;
+                    ServerPacketEncoder encoder = (ServerPacketEncoder) channel.pipeline().get(PacketEvents.ENCODER_NAME);
+                    encoder.user = user;
+                }
+
+                @Override
+                public void setPlayer(Object ch, Object player) {
+                    Channel channel = (Channel) ch;
+                    ServerPacketDecoder decoder = (ServerPacketDecoder) channel.pipeline().get(PacketEvents.DECODER_NAME);
+                    decoder.player = (Player) player;
+
+                    ServerPacketEncoder encoder = (ServerPacketEncoder) channel.pipeline().get(PacketEvents.ENCODER_NAME);
+                    encoder.player = (Player) player;
+                }
+            };
+            private final NettyManager nettyManager = new NettyManagerImpl();
+            private final LogManager logManager = new LogManager() {
+                @Override
+                protected void log(Level level, @Nullable NamedTextColor color, String message) {
+                    //First we must strip away the color codes that might be in this message
+                    message = STRIP_COLOR_PATTERN.matcher(message).replaceAll("");
+                    PacketEventsMod.LOGGER.info(message);
+                }
+            };
+            private boolean loaded;
+            private boolean initialized;
+
+            @Override
+            public void load() {
+                if (!loaded) {
+                    final String id = modId.toLowerCase();
+                    //Resolve server version and cache
+                    PacketEvents.IDENTIFIER = "pe-" + id;
+                    PacketEvents.ENCODER_NAME = "pe-encoder-" + id;
+                    PacketEvents.DECODER_NAME = "pe-decoder-" + id;
+                    PacketEvents.CONNECTION_HANDLER_NAME = "pe-connection-handler-" + id;
+                    PacketEvents.SERVER_CHANNEL_HANDLER_NAME = "pe-connection-initializer-" + id;
+
+                    injector.inject();
+
+                    loaded = true;
+
+                    //Register internal packet listener (should be the first listener)
+                    //This listener doesn't do any modifications to the packets, just reads data
+                    getEventManager().registerListener(new InternalPacketListener());
+                }
+            }
+
+            @Override
+            public boolean isLoaded() {
+                return loaded;
+            }
+
+            @Override
+            public void init() {
+                //Load if we haven't loaded already
+                load();
+                if (!initialized) {
+                    if (settings.shouldCheckForUpdates()) {
+                        getUpdateChecker().handleUpdateCheck();
+                    }
+
+                    if (settings.isbStatsEnabled()) {
+                        //TODO Cross-platform metrics?
+                    }
+
+                    PacketType.Play.Client.load();
+                    PacketType.Play.Server.load();
+                    initialized = true;
+                }
+            }
+
+            @Override
+            public boolean isInitialized() {
+                return initialized;
+            }
+
+            @Override
+            public void terminate() {
+                if (initialized) {
+                    //Eject the injector if needed(depends on the injector implementation)
+                    injector.uninject();
+                    //Unregister all our listeners
+                    getEventManager().unregisterAllListeners();
+                    initialized = false;
+                }
+            }
+
+            @Override
+            public MinecraftServer getPlugin() {
+                return ServerInstanceManager.getServerInstance();
+            }
+
+            @Override
+            public ProtocolManager getProtocolManager() {
+                return protocolManager;
+            }
+
+            @Override
+            public ServerManager getServerManager() {
+                return serverManager;
+            }
+
+            @Override
+            public LogManager getLogManager() {
+                return logManager;
+            }
+
+            @Override
+            public PlayerManager getPlayerManager() {
+                return playerManager;
+            }
+
+            @Override
+            public ChannelInjector getInjector() {
+                return injector;
+            }
+
+            @Override
+            public PacketEventsSettings getSettings() {
+                return settings;
+            }
+
+            @Override
+            public NettyManager getNettyManager() {
+                return nettyManager;
+            }
+        };
+    }
+}

src/main/java/io/github/retrooper/packetevents/factory/fabric/ServerInstanceManager.java

@@ -0,0 +1,16 @@
+package io.github.retrooper.packetevents.factory.fabric;
+
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+import net.minecraft.server.MinecraftServer;
+
+public class ServerInstanceManager {
+    private static MinecraftServer serverInstance;
+
+    public static void init() {
+        ServerLifecycleEvents.SERVER_STARTED.register(server -> serverInstance = server);
+        ServerLifecycleEvents.SERVER_STOPPED.register(server -> serverInstance = null);
+    }
+    public static MinecraftServer getServerInstance() {
+        return serverInstance;
+    }
+}

src/main/java/io/github/retrooper/packetevents/handler/ClientPacketDecoder.java

@@ -0,0 +1,31 @@
+package io.github.retrooper.packetevents.handler;
+
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.util.PacketEventsImplHelper;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import java.util.List;
+
+@ChannelHandler.Sharable
+public class ClientPacketDecoder extends ServerPacketDecoder {
+    public ClientPacketDecoder(User user) {
+         super(user);
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception {
+        if (msg.isReadable()) {
+            ByteBuf outputBuffer = ctx.alloc().buffer().writeBytes(msg);
+            boolean recompress = handleCompression(ctx, outputBuffer);
+            PacketEventsImplHelper.handleClientBoundPacket(ctx.channel(), user, player, outputBuffer, false);
+            //TODO hasTasksAfter
+            if (outputBuffer.isReadable()) {
+                if (recompress) {
+                    recompress(ctx, outputBuffer);
+                }
+                out.add(outputBuffer.retain());
+            }
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/handler/ClientPacketEncoder.java

@@ -0,0 +1,22 @@
+package io.github.retrooper.packetevents.handler;
+
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.util.PacketEventsImplHelper;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+
+@ChannelHandler.Sharable
+public class ClientPacketEncoder extends ServerPacketEncoder {
+    public ClientPacketEncoder(User user) {
+        super(user);
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out) throws Exception {
+        if (msg.isReadable()) {
+            PacketEventsImplHelper.handleServerBoundPacket(ctx.channel(), user, player, msg, false);
+            out.writeBytes(msg);
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler.java

@@ -1,70 +0,0 @@
-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 {
-    public static final String handlerName = "packet_handler";
-    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, PacketEvents pe) {
-        final PlayerInjectEvent injectEvent = new PlayerInjectEvent(player);
-        pe.getAPI().getEventManager().callEvent(injectEvent, pe.getPlugin());
-        if (!injectEvent.isCancelled()) {
-            if (v1_7_nettyMode) {
-                NettyPacketHandler_7.injectPlayer(player, pe);
-            } else {
-                NettyPacketHandler_8.injectPlayer(player, pe);
-            }
-        }
-    }
-
-    public static Future<?> uninjectPlayer(final Player player, PacketEvents pe) {
-        final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
-        pe.getAPI().getEventManager().callEvent(uninjectEvent, pe.getPlugin());
-        if (!uninjectEvent.isCancelled()) {
-            if (v1_7_nettyMode) {
-                return NettyPacketHandler_7.uninjectPlayer(player);
-            } else {
-                return NettyPacketHandler_8.uninjectPlayer(player);
-            }
-        }
-        return null;
-    }
-
-    public static Object write(final Player sender, final Object packet, PacketEvents pe) {
-        final String packetName = packet.getClass().getSimpleName();
-        final PacketSendEvent packetSendEvent = new PacketSendEvent(sender, packetName, packet);
-        pe.getAPI().getEventManager().callEvent(packetSendEvent, pe.getPlugin());
-        if (!packetSendEvent.isCancelled()) {
-            return packet;
-        }
-        return null;
-    }
-
-    public static Object read(final Player receiver, final Object packet, PacketEvents pe) {
-        final String packetName = packet.getClass().getSimpleName();
-        final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(receiver, packetName, packet);
-        pe.getAPI().getEventManager().callEvent(packetReceiveEvent, pe.getPlugin());
-        if (!packetReceiveEvent.isCancelled()) {
-            return packet;
-        }
-        return null;
-    }
-
-
-}

src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_7.java

@@ -1,45 +0,0 @@
-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 PacketEvents pe) {
-        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
-            @Override
-            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Object packet = NettyPacketHandler.read(player, msg, pe);
-                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, pe);
-                if (packet == null) {
-                    return;
-                }
-                super.write(ctx, msg, promise);
-            }
-        };
-        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
-        pipeline.addBefore(pe.getHandlerName(), player.getName(), channelDuplexHandler);
-    }
-
-    public static Future<?> uninjectPlayer(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        return channel.eventLoop().submit(new Runnable() {
-            @Override
-            public void run() {
-                channel.pipeline().remove(player.getName());
-            }
-        });
-    }
-}

src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_8.java

@@ -1,46 +0,0 @@
-package io.github.retrooper.packetevents.handler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-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 PacketEvents pe) {
-        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
-            @Override
-            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Object packet = NettyPacketHandler.read(player, msg, pe);
-                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, pe);
-                if (packet == null) {
-                    return;
-                }
-                super.write(ctx, msg, promise);
-            }
-        };
-        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
-        pipeline.addBefore(pe.getHandlerName(), player.getName(), channelDuplexHandler);
-    }
-
-    public static Future<?> uninjectPlayer(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        return channel.eventLoop().submit(new Runnable() {
-            @Override
-            public void run() {
-                channel.pipeline().remove(player.getName());
-            }
-        });
-    }
-}

src/main/java/io/github/retrooper/packetevents/handler/PacketDecoder.java

@@ -0,0 +1,104 @@
+package io.github.retrooper.packetevents.handler;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.util.PacketEventsImplHelper;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import net.minecraft.world.entity.player.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+@ChannelHandler.Sharable
+public class PacketDecoder extends MessageToMessageDecoder<ByteBuf> {
+    private static Method DECOMPRESSOR_METHOD, COMPRESSOR_METHOD;
+    public User user;
+    public Player player;
+    public boolean checkedCompression;
+
+    public PacketDecoder(User user) {
+        this.user = user;
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception {
+        if (msg.isReadable()) {
+            ByteBuf outputBuffer = ctx.alloc().buffer().writeBytes(msg);
+            boolean recompress = handleCompression(ctx, outputBuffer);
+
+            PacketEventsImplHelper.handleClientBoundPacket(ctx.channel(), user, player, outputBuffer, false);
+            //TODO hasTasksAfter
+            if (outputBuffer.isReadable()) {
+                if (recompress) {
+                    recompress(ctx, outputBuffer);
+                }
+                out.add(outputBuffer.retain());
+            }
+        }
+    }
+
+    @Override
+    public void channelInactive(@NotNull ChannelHandlerContext ctx) throws Exception {
+        super.channelInactive(ctx);
+    }
+
+
+    protected boolean handleCompression(ChannelHandlerContext ctx, ByteBuf buffer) {
+        if (checkedCompression) return false;
+        if (ctx.pipeline().names().indexOf("decompress") > ctx.pipeline().names().indexOf(PacketEvents.DECODER_NAME)) {
+            // Need to decompress this packet due to bad order
+            ChannelHandler decompressor = ctx.pipeline().get("decompress");
+            //CompressionDecoder
+            try {
+                if (DECOMPRESSOR_METHOD == null) {
+                    DECOMPRESSOR_METHOD = decompressor.getClass().getDeclaredMethod("decode", ChannelHandlerContext.class, ByteBuf.class, List.class);
+                }
+                List<?> list = new ArrayList<>(1);
+                DECOMPRESSOR_METHOD.invoke(decompressor, ctx, buffer, list);
+                ByteBuf decompressed = (ByteBuf) list.get(0);
+                if (buffer != decompressed) {
+                    try {
+                        buffer.clear().writeBytes(decompressed);
+                    } finally {
+                        decompressed.release();
+                    }
+                }
+                //Relocate handlers
+                PacketDecoder decoder = (PacketDecoder) ctx.pipeline().remove(PacketEvents.DECODER_NAME);
+                ctx.pipeline().addAfter("decompress", PacketEvents.DECODER_NAME, decoder);
+                PacketEncoder encoder = (PacketEncoder) ctx.pipeline().remove(PacketEvents.ENCODER_NAME);
+                ctx.pipeline().addAfter("compress", PacketEvents.ENCODER_NAME, encoder);
+                checkedCompression = true;
+                return true;
+            } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
+
+    protected void recompress(ChannelHandlerContext ctx, ByteBuf buffer) {
+        ByteBuf compressed = ctx.alloc().buffer();
+        try {
+            ChannelHandler compressor = ctx.pipeline().get("compress");
+            if (COMPRESSOR_METHOD == null) {
+                COMPRESSOR_METHOD = compressor.getClass().getDeclaredMethod("encode", ChannelHandlerContext.class, ByteBuf.class, ByteBuf.class);
+            }
+            COMPRESSOR_METHOD.invoke(compressor, ctx, buffer, compressed);
+        } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        try {
+            buffer.clear().writeBytes(compressed);
+            PacketEvents.getAPI().getLogManager().debug("Recompressed packet!");
+        } finally {
+            compressed.release();
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/handler/PacketEncoder.java

@@ -0,0 +1,64 @@
+package io.github.retrooper.packetevents.handler;
+
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.util.PacketEventsImplHelper;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.EncoderException;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.util.ReferenceCountUtil;
+import net.minecraft.world.entity.player.Player;
+
+@ChannelHandler.Sharable
+public class PacketEncoder extends MessageToByteEncoder<ByteBuf> {
+    public User user;
+    public Player player;
+
+    public PacketEncoder(User user) {
+        this.user = user;
+    }
+
+    @Override
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+        ByteBuf buf = null;
+        try {
+            if (acceptOutboundMessage(msg)) {
+                ByteBuf in = (ByteBuf) msg;
+                buf = allocateBuffer(ctx, in, true);
+                try {
+                    encode(ctx, in, buf);
+                } finally {
+                    ReferenceCountUtil.release(in);
+                }
+                if (buf.isReadable()) {
+                    ctx.write(buf, promise);
+                } else {
+                    buf.release();
+                    //We cancelled this packet, do not pass it on to the next handler.
+                    //ctx.write(Unpooled.EMPTY_BUFFER, promise);
+                }
+                buf = null;
+            } else {
+                ctx.write(msg, promise);
+            }
+        } catch (EncoderException e) {
+            throw e;
+        } catch (Throwable e) {
+            throw new EncoderException(e);
+        } finally {
+            if (buf != null) {
+                buf.release();
+            }
+        }
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out) throws Exception {
+        if (msg.isReadable()) {
+            PacketEventsImplHelper.handleServerBoundPacket(ctx.channel(), user, player, msg, false);
+            out.writeBytes(msg);
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/handler/ServerPacketDecoder.java

@@ -0,0 +1,104 @@
+package io.github.retrooper.packetevents.handler;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.util.PacketEventsImplHelper;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import net.minecraft.world.entity.player.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+@ChannelHandler.Sharable
+public class ServerPacketDecoder extends MessageToMessageDecoder<ByteBuf> {
+    private static Method DECOMPRESSOR_METHOD, COMPRESSOR_METHOD;
+    public User user;
+    public Player player;
+    public boolean checkedCompression;
+
+    public ServerPacketDecoder(User user) {
+        this.user = user;
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception {
+        if (msg.isReadable()) {
+            ByteBuf outputBuffer = ctx.alloc().buffer().writeBytes(msg);
+            boolean recompress = handleCompression(ctx, outputBuffer);
+
+            PacketEventsImplHelper.handleServerBoundPacket(ctx.channel(), user, player, outputBuffer, false);
+            //TODO hasTasksAfter
+            if (outputBuffer.isReadable()) {
+                if (recompress) {
+                    recompress(ctx, outputBuffer);
+                }
+                out.add(outputBuffer.retain());
+            }
+        }
+    }
+
+    @Override
+    public void channelInactive(@NotNull ChannelHandlerContext ctx) throws Exception {
+        super.channelInactive(ctx);
+    }
+
+
+    protected boolean handleCompression(ChannelHandlerContext ctx, ByteBuf buffer) {
+        if (checkedCompression) return false;
+        if (ctx.pipeline().names().indexOf("decompress") > ctx.pipeline().names().indexOf(PacketEvents.DECODER_NAME)) {
+            // Need to decompress this packet due to bad order
+            ChannelHandler decompressor = ctx.pipeline().get("decompress");
+            //CompressionDecoder
+            try {
+                if (DECOMPRESSOR_METHOD == null) {
+                    DECOMPRESSOR_METHOD = decompressor.getClass().getDeclaredMethod("decode", ChannelHandlerContext.class, ByteBuf.class, List.class);
+                }
+                List<?> list = new ArrayList<>(1);
+                DECOMPRESSOR_METHOD.invoke(decompressor, ctx, buffer, list);
+                ByteBuf decompressed = (ByteBuf) list.get(0);
+                if (buffer != decompressed) {
+                    try {
+                        buffer.clear().writeBytes(decompressed);
+                    } finally {
+                        decompressed.release();
+                    }
+                }
+                //Relocate handlers
+                ServerPacketDecoder decoder = (ServerPacketDecoder) ctx.pipeline().remove(PacketEvents.DECODER_NAME);
+                ctx.pipeline().addAfter("decompress", PacketEvents.DECODER_NAME, decoder);
+                ServerPacketEncoder encoder = (ServerPacketEncoder) ctx.pipeline().remove(PacketEvents.ENCODER_NAME);
+                ctx.pipeline().addAfter("compress", PacketEvents.ENCODER_NAME, encoder);
+                checkedCompression = true;
+                return true;
+            } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
+
+    protected void recompress(ChannelHandlerContext ctx, ByteBuf buffer) {
+        ByteBuf compressed = ctx.alloc().buffer();
+        try {
+            ChannelHandler compressor = ctx.pipeline().get("compress");
+            if (COMPRESSOR_METHOD == null) {
+                COMPRESSOR_METHOD = compressor.getClass().getDeclaredMethod("encode", ChannelHandlerContext.class, ByteBuf.class, ByteBuf.class);
+            }
+            COMPRESSOR_METHOD.invoke(compressor, ctx, buffer, compressed);
+        } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        try {
+            buffer.clear().writeBytes(compressed);
+            PacketEvents.getAPI().getLogManager().debug("Recompressed packet!");
+        } finally {
+            compressed.release();
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/handler/ServerPacketEncoder.java

@@ -0,0 +1,64 @@
+package io.github.retrooper.packetevents.handler;
+
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.util.PacketEventsImplHelper;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.EncoderException;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.util.ReferenceCountUtil;
+import net.minecraft.world.entity.player.Player;
+
+@ChannelHandler.Sharable
+public class ServerPacketEncoder extends MessageToByteEncoder<ByteBuf> {
+    public User user;
+    public Player player;
+
+    public ServerPacketEncoder(User user) {
+        this.user = user;
+    }
+
+    @Override
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+        ByteBuf buf = null;
+        try {
+            if (acceptOutboundMessage(msg)) {
+                ByteBuf in = (ByteBuf) msg;
+                buf = allocateBuffer(ctx, in, true);
+                try {
+                    encode(ctx, in, buf);
+                } finally {
+                    ReferenceCountUtil.release(in);
+                }
+                if (buf.isReadable()) {
+                    ctx.write(buf, promise);
+                } else {
+                    buf.release();
+                    //We cancelled this packet, do not pass it on to the next handler.
+                    //ctx.write(Unpooled.EMPTY_BUFFER, promise);
+                }
+                buf = null;
+            } else {
+                ctx.write(msg, promise);
+            }
+        } catch (EncoderException e) {
+            throw e;
+        } catch (Throwable e) {
+            throw new EncoderException(e);
+        } finally {
+            if (buf != null) {
+                buf.release();
+            }
+        }
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out) throws Exception {
+        if (msg.isReadable()) {
+            PacketEventsImplHelper.handleClientBoundPacket(ctx.channel(), user, player, msg, false);
+            out.writeBytes(msg);
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/mixin/ClientPacketListenerAccessor.java

@@ -0,0 +1,12 @@
+package io.github.retrooper.packetevents.mixin;
+
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.Connection;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ClientPacketListener.class)
+public interface ClientPacketListenerAccessor {
+    @Accessor
+    Connection getConnection();
+}

src/main/java/io/github/retrooper/packetevents/mixin/ConnectionAccessor.java

@@ -0,0 +1,11 @@
+package io.github.retrooper.packetevents.mixin;
+
+import io.netty.channel.Channel;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(net.minecraft.network.Connection.class)
+public interface ConnectionAccessor {
+    @Accessor
+    Channel getChannel();
+}

src/main/java/io/github/retrooper/packetevents/mixin/PacketEventsInjectorMixin.java

@@ -0,0 +1,67 @@
+package io.github.retrooper.packetevents.mixin;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.manager.protocol.ProtocolManager;
+import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.protocol.player.UserProfile;
+import io.github.retrooper.packetevents.ChannelUtilities;
+import io.github.retrooper.packetevents.PacketEventsMod;
+import io.github.retrooper.packetevents.handler.ServerPacketDecoder;
+import io.github.retrooper.packetevents.handler.ServerPacketEncoder;
+import io.github.retrooper.packetevents.handler.ClientPacketDecoder;
+import io.github.retrooper.packetevents.handler.ClientPacketEncoder;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import net.minecraft.network.protocol.PacketFlow;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+
+@Mixin(net.minecraft.network.Connection.class)
+public class PacketEventsInjectorMixin {
+
+    @Shadow @Final
+    private PacketFlow receiving;
+
+    @Inject(method = "channelActive", at = @At("HEAD"))
+    private void channelActive(ChannelHandlerContext ctx, CallbackInfo info) {
+
+        Channel channel = ctx.channel();
+        User user = new User(channel, ConnectionState.HANDSHAKING, ClientVersion.getLatest(),
+                new UserProfile(null, null));
+        ProtocolManager.USERS.put(channel, user);
+        ServerPacketDecoder decoder;
+        ServerPacketEncoder encoder;
+        if(receiving == PacketFlow.CLIENTBOUND) {
+            PacketEventsMod.LOGGER.info("Connected as Client!");
+            decoder = new ClientPacketDecoder(user);
+            encoder = new ClientPacketEncoder(user);
+        }
+        else
+        {
+
+            PacketEventsMod.LOGGER.info("Connected as Server!");
+            decoder = new ServerPacketDecoder(user);
+            encoder = new ServerPacketEncoder(user);
+        }
+
+        if(ChannelUtilities.pipelineContainsSplitterAndPrepender(channel.pipeline()))
+        {
+            channel.pipeline().addAfter("splitter", PacketEvents.DECODER_NAME, decoder);
+            channel.pipeline().addAfter("prepender", PacketEvents.ENCODER_NAME, encoder);
+        }
+        PacketEventsMod.LOGGER.info("Pipeline: " + ChannelHelper.pipelineHandlerNamesAsString(channel));
+    }
+
+    @Inject(method = "channelInactive", at = @At("HEAD"))
+    private void channelInactive(ChannelHandlerContext ctx, CallbackInfo info) {
+        PacketEventsMod.LOGGER.debug("Disconnected!");
+    }
+}

src/main/java/io/github/retrooper/packetevents/mixin/ServerGamePacketListenerImplAccessor.java

@@ -0,0 +1,12 @@
+package io.github.retrooper.packetevents.mixin;
+
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import net.minecraft.network.Connection;
+
+@Mixin(ServerGamePacketListenerImpl.class)
+public interface ServerGamePacketListenerImplAccessor {
+    @Accessor
+    Connection getConnection();
+}

src/main/java/io/github/retrooper/packetevents/packet/PacketType.java

@@ -1,211 +0,0 @@
-package io.github.retrooper.packetevents.packet;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class PacketType {
-
-
-    public static class Client {
-        public static class Util {
-            public static boolean isInstanceOfFlying(final byte packetId) {
-                return packetId == FLYING
-                        || packetId == POSITION
-                        || packetId == POSITION_LOOK
-                        || packetId == LOOK;
-            }
-        }
-
-        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 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);
-        }
-    }
-
-
-}

src/main/java/io/github/retrooper/packetevents/packet/PacketTypeClasses.java

@@ -1,234 +0,0 @@
-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 {
-        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;
-        private static final String c = "PacketPlayIn";
-        @Nullable
-        public static final Class<?> FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying");
-
-        public static void load() {
-            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();
-        }
-    }
-
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/Sendable.java

@@ -1,5 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers;
-
-public interface Sendable {
-    Object asNMSPacket();
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/api/WrappedPacket.java

@@ -1,37 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.api;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import org.bukkit.entity.Player;
-
-public class WrappedPacket {
-    protected static ServerVersion version = ServerVersion.getVersion();
-    protected final Player player;
-    protected Object packet;
-
-    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();
-        }
-    }
-
-    protected void setup() {
-
-    }
-
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/abilities/WrappedPacketInAbilities.java

@@ -1,67 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.abilities;
-
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-public final class WrappedPacketInAbilities extends WrappedPacket {
-    private static Class<?> abilitiesClass;
-
-    static {
-
-        try {
-            abilitiesClass = NMSUtils.getNMSClass("PacketPlayInAbilities");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private boolean isVulnerable;
-    private boolean isFlying;
-    private boolean allowFly;
-    private boolean instantBuild;
-    private float flySpeed;
-    private float walkSpeed;
-
-    public WrappedPacketInAbilities(Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            this.isVulnerable = Reflection.getField(abilitiesClass, boolean.class, 0).getBoolean(packet);
-            this.isFlying = Reflection.getField(abilitiesClass, boolean.class, 1).getBoolean(packet);
-            this.allowFly = Reflection.getField(abilitiesClass, boolean.class, 2).getBoolean(packet);
-            this.instantBuild = Reflection.getField(abilitiesClass, boolean.class, 3).getBoolean(packet);
-            this.flySpeed = Reflection.getField(abilitiesClass, float.class, 0).getFloat(packet);
-            this.walkSpeed = Reflection.getField(abilitiesClass, float.class, 1).getFloat(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public boolean isVulnerable() {
-        return isVulnerable;
-    }
-
-    public boolean isFlying() {
-        return isFlying;
-    }
-
-    public boolean isFlightAllowed() {
-        return allowFly;
-    }
-
-    public boolean canInstantlyBuild() {
-        return instantBuild;
-    }
-
-    public float getFlySpeed() {
-        return flySpeed;
-    }
-
-    public float getWalkSpeed() {
-        return walkSpeed;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockdig/WrappedPacketInBlockDig.java

@@ -1,92 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.blockdig;
-
-import io.github.retrooper.packetevents.enums.Direction;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.enums.minecraft.PlayerDigType;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import io.github.retrooper.packetevents.utils.vector.Vector3i;
-
-public final class WrappedPacketInBlockDig extends WrappedPacket {
-    private static Class<?> blockDigClass, blockPositionClass, enumDirectionClass, digTypeClass;
-
-    static {
-
-        try {
-            blockDigClass = NMSUtils.getNMSClass("PacketPlayInBlockDig");
-            if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-                blockPositionClass = NMSUtils.getNMSClass("BlockPosition");
-                enumDirectionClass = NMSUtils.getNMSClass("EnumDirection");
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            digTypeClass = NMSUtils.getNMSClass("EnumPlayerDigType");
-        } catch (ClassNotFoundException e) {
-            //It is probably a subclass
-            digTypeClass = Reflection.getSubClass(blockDigClass, "EnumPlayerDigType");
-        }
-    }
-
-    private Vector3i blockPosition;
-    private Direction direction;
-    private PlayerDigType digType;
-
-    public WrappedPacketInBlockDig(Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        Direction enumDirection = null;
-        PlayerDigType enumDigType = null;
-        //1.7.10
-        try {
-            if (version.isLowerThan(ServerVersion.v_1_8)) {
-                setupCoordinates(blockDigClass, packet);
-                enumDirection = Direction.get(Reflection.getField(digTypeClass, int.class, 3).getInt(packet));
-                enumDigType = PlayerDigType.get(Reflection.getField(digTypeClass, int.class, 4).getInt(packet));
-            } else {
-                //1.8+
-                final Object blockPosObj = Reflection.getField(blockDigClass, blockPositionClass, 0).get(packet);
-                final Object enumDirectionObj = Reflection.getField(blockDigClass, enumDirectionClass, 0).get(packet);
-                final Object digTypeObj = Reflection.getField(blockDigClass, digTypeClass, 0).get(packet);
-
-                Class<?> blockPosSuper = blockPositionClass;
-                setupCoordinates(blockPosSuper, blockPosObj);
-
-                enumDirection = Direction.valueOf(((Enum) enumDirectionObj).name());
-                enumDigType = PlayerDigType.valueOf(((Enum) digTypeObj).name());
-            }
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        this.direction = enumDirection;
-        this.digType = enumDigType;
-    }
-
-    private void setupCoordinates(final Class<?> cls, final Object object) throws IllegalAccessException {
-        final int x = Reflection.getField(cls, int.class, 0).getInt(object);
-        final int y = Reflection.getField(cls, int.class, 1).getInt(object);
-        final int z = Reflection.getField(cls, int.class, 2).getInt(object);
-
-        this.blockPosition = new Vector3i(x, y, z);
-    }
-
-    public Vector3i getBlockPosition() {
-        return blockPosition;
-    }
-
-    public Direction getDirection() {
-        return direction;
-    }
-
-    public PlayerDigType getDigType() {
-        return digType;
-    }
-
-
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockplace/WrappedPacketInBlockPlace.java

@@ -1,64 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.utils.vector.Vector3i;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-
-public final class WrappedPacketInBlockPlace extends WrappedPacket {
-    static {
-        if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-            WrappedPacketInBlockPlace_1_8.initStatic();
-        }
-    }
-
-    private Vector3i blockPosition;
-    private ItemStack itemStack;
-
-    public WrappedPacketInBlockPlace(final Player player, final Object packet) {
-        super(player, packet);
-    }
-
-    @Override
-    protected void setup() {
-        //1.7.10
-        Vector3i position = null;
-        ItemStack itemStack = null;
-        try {
-            if (version.isHigherThan(ServerVersion.v_1_8_8)) {
-                final WrappedPacketInBlockPlace_1_9 blockPlace_1_9 = new WrappedPacketInBlockPlace_1_9(getPlayer(), packet);
-                final Block block = blockPlace_1_9.getBlock();
-                position = new Vector3i(block.getX(), block.getY(), block.getZ());
-                itemStack = new ItemStack(block.getType());
-            } else if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-                final WrappedPacketInBlockPlace_1_8 blockPlace_1_8 = new WrappedPacketInBlockPlace_1_8(packet);
-                position = blockPlace_1_8.getBlockPosition();
-                itemStack = blockPlace_1_8.getItemStack();
-            } else {
-                final WrappedPacketInBlockPlace_1_7_10 blockPlace_1_7_10 = new WrappedPacketInBlockPlace_1_7_10(getPlayer(), packet);
-                position = blockPlace_1_7_10.getBlockPosition();
-                this.itemStack = blockPlace_1_7_10.getItemStack();
-            }
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        }
-        this.blockPosition = position;
-        this.itemStack = itemStack;
-    }
-
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    public Vector3i getBlockPosition() {
-        return blockPosition;
-    }
-
-    public ItemStack getItemStack() {
-        return itemStack;
-    }
-
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockplace/WrappedPacketInBlockPlace_1_7_10.java

@@ -1,42 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
-
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.utils.vector.Vector3i;
-import net.minecraft.server.v1_7_R4.PacketPlayInBlockPlace;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-final class WrappedPacketInBlockPlace_1_7_10 extends WrappedPacket {
-    private Vector3i blockPosition;
-    private ItemStack itemStack;
-    private int blockFace;
-
-    WrappedPacketInBlockPlace_1_7_10(final Player player, final Object packet) {
-        super(player, packet);
-    }
-
-
-    @Override
-    protected void setup() {
-        final PacketPlayInBlockPlace blockPlace = (PacketPlayInBlockPlace) packet;
-
-        this.blockPosition = new Vector3i(blockPlace.c(), blockPlace.d(), blockPlace.e());
-
-        this.blockFace = blockPlace.d();
-
-        net.minecraft.server.v1_7_R4.ItemStack stack = blockPlace.getItemStack();
-        this.itemStack = org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack.asBukkitCopy(stack);
-    }
-
-    public Vector3i getBlockPosition() {
-        return blockPosition;
-    }
-
-    public ItemStack getItemStack() {
-        return itemStack;
-    }
-
-    public int getBlockFace() {
-        return blockFace;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockplace/WrappedPacketInBlockPlace_1_8.java

@@ -1,56 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
-
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import io.github.retrooper.packetevents.utils.vector.Vector3i;
-import org.bukkit.inventory.ItemStack;
-
-import java.lang.reflect.InvocationTargetException;
-
-final class WrappedPacketInBlockPlace_1_8 extends WrappedPacket {
-    private static Class<?> blockPlaceClass, blockPositionClass;
-    private Vector3i blockPosition;
-    private ItemStack itemStack;
-
-    WrappedPacketInBlockPlace_1_8(final Object packet) {
-        super(packet);
-    }
-
-    protected static void initStatic() {
-        try {
-            blockPlaceClass = NMSUtils.getNMSClass("PacketPlayInBlockPlace");
-
-            blockPositionClass = NMSUtils.getNMSClass("BlockPosition");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            Object nmsBlockPos = Reflection.getField(blockPlaceClass, blockPositionClass, 1).get(packet);
-
-            final int[] coords = new int[3];
-            for (int i = 0; i < 3; i++) {
-                final String s = "get" + (i == 0 ? "X" : i == 1 ? "Y" : "Z");
-                coords[i] = (int) Reflection.getMethod(blockPositionClass.getSuperclass(), s, 0).invoke(nmsBlockPos);
-            }
-
-            this.blockPosition = new Vector3i(coords[0], coords[1], coords[2]);
-
-            this.itemStack = NMSUtils.toBukkitItemStack(Reflection.getField(blockPlaceClass, NMSUtils.nmsItemStackClass, 0).get(packet));
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public Vector3i getBlockPosition() {
-        return blockPosition;
-    }
-
-    public ItemStack getItemStack() {
-        return itemStack;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockplace/WrappedPacketInBlockPlace_1_9.java

@@ -1,31 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
-
-
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.utils.BlockIteratorUtils;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-
-final class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
-    private Block block;
-
-    public WrappedPacketInBlockPlace_1_9(final Player player, final Object packet) {
-        super(player, packet);
-    }
-
-
-    @Override
-    protected void setup() {
-        this.block = BlockIteratorUtils.getBlockLookingAt(getPlayer(), 3);
-    }
-
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    public Block getBlock() {
-        return block;
-    }
-
-
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/chat/WrappedPacketInChat.java

@@ -1,38 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.chat;
-
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-public final class WrappedPacketInChat extends WrappedPacket {
-    private static Class<?> chatPacketClass;
-
-    static {
-        try {
-            chatPacketClass = NMSUtils.getNMSClass("PacketPlayInChat");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private String message;
-
-    public WrappedPacketInChat(Object packet) {
-        super(packet);
-    }
-
-
-    @Override
-    protected void setup() {
-        try {
-            final Object obj = Reflection.getField(chatPacketClass, String.class, 0).get(packet);
-            this.message = obj.toString();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/entityaction/WrappedPacketInEntityAction.java

@@ -1,98 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.entityaction;
-
-import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.enums.minecraft.PlayerAction;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import org.bukkit.entity.Entity;
-
-public final class WrappedPacketInEntityAction extends WrappedPacket {
-    private static Class<?> entityActionClass;
-    @Nullable
-    private static Class<?> enumPlayerActionClass;
-
-    static {
-        try {
-            entityActionClass = NMSUtils.getNMSClass("PacketPlayInEntityAction");
-            if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-                for (final Class<?> sub : entityActionClass.getDeclaredClasses()) {
-                    if (sub.getSimpleName().equals("EnumPlayerAction")) {
-                        enumPlayerActionClass = sub;
-                        break;
-                    }
-                }
-            } else {
-                enumPlayerActionClass = NMSUtils.getNMSClass("EnumPlayerAction");
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private Entity entity;
-    private int entityId;
-    private PlayerAction action;
-    private int jumpBoost;
-
-    public WrappedPacketInEntityAction(final Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            final int entityId = Reflection.getField(entityActionClass, int.class, 0).getInt(packet);
-            final int jumpBoost;
-            if (version.isLowerThan(ServerVersion.v_1_8)) {
-                jumpBoost = Reflection.getField(entityActionClass, int.class, 2).getInt(packet);
-            } else {
-                jumpBoost = Reflection.getField(entityActionClass, int.class, 1).getInt(packet);
-            }
-
-            int animationIndex = -1;
-
-            //1.7.10
-            if (version.isLowerThan(ServerVersion.v_1_8)) {
-                animationIndex = Reflection.getField(entityActionClass, int.class, 1).getInt(packet);
-            } else {
-                final Object enumObj = Reflection.getField(entityActionClass, enumPlayerActionClass, 0).get(packet);
-                final String enumValue = enumObj.toString();
-                try {
-                    this.action = PlayerAction.valueOf(enumValue);
-                } catch (IllegalArgumentException e) {
-                    //They aren't on a legacy version and the enum has changed
-                    final PlayerAction.UpdatedPlayerAction updatedPlayerAction = PlayerAction.UpdatedPlayerAction.valueOf(enumValue);
-                    this.action = PlayerAction.get(updatedPlayerAction.getIndex());
-                }
-            }
-
-
-            this.entityId = entityId;
-            this.jumpBoost = jumpBoost;
-            if (animationIndex != -1) {
-                this.action = PlayerAction.get(animationIndex);
-            }
-            this.entity = NMSUtils.getEntityById(this.entityId);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public Entity getEntity() {
-        return entity;
-    }
-
-    public int getEntityId() {
-        return entityId;
-    }
-
-    public PlayerAction getAction() {
-        return action;
-    }
-
-    public int getJumpBoost() {
-        return jumpBoost;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/flying/WrappedPacketInFlying.java

@@ -1,164 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.flying;
-
-
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-public class WrappedPacketInFlying extends WrappedPacket {
-    private static Class<?> flyingClass;
-
-    static {
-
-        try {
-            flyingClass = NMSUtils.getNMSClass("PacketPlayInFlying");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private double x;
-    private double y;
-    private double z;
-    private float yaw;
-    private float pitch;
-    private boolean onGround;
-    private boolean isPosition;
-    private boolean isLook;
-
-    public WrappedPacketInFlying(Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            //x, y, z, yaw pitch, onGround, isPosition, isLook
-            this.x = Reflection.getField(flyingClass, double.class, 0).getDouble(packet);
-            this.y = Reflection.getField(flyingClass, double.class, 1).getDouble(packet);
-            this.z = Reflection.getField(flyingClass, double.class, 2).getDouble(packet);
-
-            this.yaw = Reflection.getField(flyingClass, float.class, 0).getFloat(packet);
-            this.pitch = Reflection.getField(flyingClass, float.class, 1).getFloat(packet);
-
-            this.onGround = Reflection.getField(flyingClass, boolean.class, 0).getBoolean(packet);
-
-            this.isPosition = Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
-            this.isLook = Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public final double getX() {
-        return x;
-    }
-
-    public final double getY() {
-        return y;
-    }
-
-    public final double getZ() {
-        return z;
-    }
-
-    public final float getYaw() {
-        return yaw;
-    }
-
-    public final float getPitch() {
-        return pitch;
-    }
-
-    public final boolean isOnGround() {
-        return onGround;
-    }
-
-    public boolean isPosition() {
-        return isPosition;
-    }
-
-    public boolean isLook() {
-        return isLook;
-    }
-
-    public static class WrappedPacketInPosition extends WrappedPacketInFlying {
-        public WrappedPacketInPosition(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        public boolean isPosition() {
-            try {
-                return Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-            return true;
-        }
-
-        @Override
-        public boolean isLook() {
-            try {
-                return Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-            return false;
-        }
-    }
-
-    public static class WrappedPacketInPosition_Look extends WrappedPacketInFlying {
-        public WrappedPacketInPosition_Look(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        public boolean isPosition() {
-            try {
-                return Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-            return true;
-        }
-
-        @Override
-        public boolean isLook() {
-            try {
-                return Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-            return true;
-        }
-    }
-
-    public static class WrappedPacketInLook extends WrappedPacketInFlying {
-
-        public WrappedPacketInLook(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        public boolean isPosition() {
-            try {
-                return Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-            return false;
-        }
-
-        @Override
-        public boolean isLook() {
-            try {
-                return Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-            return true;
-        }
-    }
-
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/keepalive/WrappedPacketInKeepAlive.java

@@ -1,47 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.keepalive;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-public final class WrappedPacketInKeepAlive extends WrappedPacket {
-    private static Class<?> keepAliveClass;
-
-    static {
-        try {
-            keepAliveClass = NMSUtils.getNMSClass("PacketPlayInKeepAlive");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private long id;
-
-    public WrappedPacketInKeepAlive(final Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            if (version.isHigherThan(ServerVersion.v_1_12)) {
-                this.id = Reflection.getField(keepAliveClass, long.class, 0).getLong(packet);
-            } else {
-                this.id = Reflection.getField(keepAliveClass, int.class, 0).getInt(packet);
-            }
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Cast this long to an integer if you are using 1.7.10->1.12.2!
-     * In 1.13.2->1.15.2 a long is sent
-     *
-     * @return
-     */
-    public long getId() {
-        return id;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/steervehicle/WrappedPacketInSteerVehicle.java

@@ -1,55 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.steervehicle;
-
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-public class WrappedPacketInSteerVehicle extends WrappedPacket {
-    private static Class<?> packetClass;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayInSteerVehicle");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private float side, forward;
-    private boolean jump, unmount;
-
-    public WrappedPacketInSteerVehicle(Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            this.side = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-            this.forward = Reflection.getField(packetClass, float.class, 1).getFloat(packet);
-
-            this.jump = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-            this.unmount = Reflection.getField(packetClass, boolean.class, 1).getBoolean(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    //Positive side value means left, negative means right
-    public float getSideValue() {
-        return side;
-    }
-
-    //Positive forward value means forward, negative is backwards
-    public float getForwardValue() {
-        return forward;
-    }
-
-    public boolean isJump() {
-        return jump;
-    }
-
-    public boolean isUnmount() {
-        return unmount;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/transaction/WrappedPacketInTransaction.java

@@ -1,49 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.transaction;
-
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-public final class WrappedPacketInTransaction extends WrappedPacket {
-    private static Class<?> packetClass;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayInTransaction");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private int windowId;
-    private short actionNumber;
-    private boolean accepted;
-
-    public WrappedPacketInTransaction(final Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            this.windowId = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-            this.actionNumber = Reflection.getField(packetClass, short.class, 0).getShort(packet);
-            this.accepted = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public int getWindowId() {
-        return windowId;
-    }
-
-    public short getActionNumber() {
-        return actionNumber;
-    }
-
-    public boolean isAccepted() {
-        return accepted;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/useentity/WrappedPacketInUseEntity.java

@@ -1,65 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.useentity;
-
-import io.github.retrooper.packetevents.enums.minecraft.EntityUseAction;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import org.bukkit.entity.Entity;
-
-public final class WrappedPacketInUseEntity extends WrappedPacket {
-    private static Class<?> useEntityClass, entityClass, enumEntityUseActionClass;
-
-    static {
-
-        try {
-            useEntityClass = NMSUtils.getNMSClass("PacketPlayInUseEntity");
-            entityClass = NMSUtils.getNMSClass("Entity");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            enumEntityUseActionClass = NMSUtils.getNMSClass("EnumEntityUseAction");
-        } catch (ClassNotFoundException e) {
-            //That is fine, it is probably a subclass
-            for (final Class<?> sub : useEntityClass.getDeclaredClasses()) {
-                if (sub.getSimpleName().equals("EnumEntityUseAction")) {
-                    enumEntityUseActionClass = sub;
-                    break;
-                }
-            }
-        }
-    }
-
-    private int entityId;
-    private Entity entity;
-    private EntityUseAction action;
-
-    public WrappedPacketInUseEntity(final Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            this.entityId = Reflection.getField(useEntityClass, int.class, 0).getInt(packet);
-            this.entity = NMSUtils.getEntityById(this.entityId);
-            final Object useActionEnum = Reflection.getField(useEntityClass, enumEntityUseActionClass, 0).get(packet);
-            this.action = EntityUseAction.valueOf(useActionEnum.toString());
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public Entity getEntity() {
-        return entity;
-    }
-
-    public int getEntityId() {
-        return entityId;
-    }
-
-    public EntityUseAction getAction() {
-        return action;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/abilities/PlayerAbilitiesUtils.java

@@ -1,38 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.out.abilities;
-
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-final class PlayerAbilitiesUtils {
-    public static Class<?> playerAbilitiesClass;
-    public static Constructor<?> playerAbilitiesConstructor;
-
-    static {
-        try {
-            playerAbilitiesClass = NMSUtils.getNMSClass("PlayerAbilities");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        try {
-            playerAbilitiesConstructor = playerAbilitiesClass.getConstructor();
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static Object getPlayerAbilities(final boolean isVulnerable, final boolean isFlying, final boolean allowFlight, final boolean canBuildInstantly,
-                                            final float flySpeed, final float walkSpeed) throws IllegalAccessException, InvocationTargetException, InstantiationException {
-        final Object instance = playerAbilitiesConstructor.newInstance();
-        Reflection.getField(playerAbilitiesClass, boolean.class, 0).setBoolean(instance, isVulnerable);
-        Reflection.getField(playerAbilitiesClass, boolean.class, 1).setBoolean(instance, isFlying);
-        Reflection.getField(playerAbilitiesClass, boolean.class, 2).setBoolean(instance, allowFlight);
-        Reflection.getField(playerAbilitiesClass, boolean.class, 3).setBoolean(instance, canBuildInstantly);
-
-        Reflection.getField(playerAbilitiesClass, float.class, 0).setFloat(instance, flySpeed);
-        Reflection.getField(playerAbilitiesClass, float.class, 1).setFloat(instance, walkSpeed);
-        return instance;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/abilities/WrappedPacketOutAbilities.java

@@ -1,96 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.out.abilities;
-
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-public final class WrappedPacketOutAbilities extends WrappedPacket implements Sendable {
-    private static Class<?> packetClass;
-    private static Constructor<?> packetConstructor;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayOutAbilities");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            packetConstructor = packetClass.getConstructor(PlayerAbilitiesUtils.playerAbilitiesClass);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private boolean vulnerable, flying, allowFlight, instantBuild;
-    private float flySpeed, walkSpeed;
-
-    public WrappedPacketOutAbilities(final Object packet) {
-        super(packet);
-    }
-
-    public WrappedPacketOutAbilities(final boolean isVulnerable, final boolean isFlying, final boolean allowFlight, final boolean canBuildInstantly,
-                                     final float flySpeed, final float walkSpeed) {
-        super(null);
-        this.vulnerable = isVulnerable;
-        this.flying = isFlying;
-        this.allowFlight = allowFlight;
-        this.instantBuild = canBuildInstantly;
-        this.flySpeed = flySpeed;
-        this.walkSpeed = walkSpeed;
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            this.vulnerable = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-            this.flying = Reflection.getField(packetClass, boolean.class, 1).getBoolean(packet);
-            this.allowFlight = Reflection.getField(packetClass, boolean.class, 2).getBoolean(packet);
-            this.instantBuild = Reflection.getField(packetClass, boolean.class, 3).getBoolean(packet);
-
-            this.flySpeed = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-            this.walkSpeed = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public boolean isVulnerable() {
-        return vulnerable;
-    }
-
-    public boolean isFlying() {
-        return flying;
-    }
-
-    public boolean isFlightAllowed() {
-        return allowFlight;
-    }
-
-    public boolean canInstantlyBuild() {
-        return instantBuild;
-    }
-
-    public float getFlySpeed() {
-        return flySpeed;
-    }
-
-    public float getWalkSpeed() {
-        return walkSpeed;
-    }
-
-    @Override
-    public Object asNMSPacket() {
-        try {
-            return packetConstructor.newInstance(PlayerAbilitiesUtils.getPlayerAbilities(vulnerable, flying, allowFlight, instantBuild, flySpeed, walkSpeed));
-        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/animation/WrappedPacketOutAnimation.java

@@ -1,84 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.out.animation;
-
-import io.github.retrooper.packetevents.enums.minecraft.EntityAnimationType;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import org.bukkit.entity.Entity;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-public final class WrappedPacketOutAnimation extends WrappedPacket implements Sendable {
-    private static Class<?> animationClass, nmsEntityClass;
-    private static Constructor<?> animationConstructor;
-
-    static {
-        try {
-            animationClass = NMSUtils.getNMSClass("PacketPlayOutAnimation");
-            nmsEntityClass = NMSUtils.getNMSClass("Entity");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            animationConstructor = animationClass.getConstructor(nmsEntityClass, int.class);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private Entity entity;
-    private int entityID;
-    private EntityAnimationType type;
-
-    public WrappedPacketOutAnimation(final Object packet) {
-        super(packet);
-    }
-
-    public WrappedPacketOutAnimation(final Entity target, final EntityAnimationType type) {
-        super(null);
-        this.entityID = target.getEntityId();
-        this.entity = target;
-        this.type = type;
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            //a - ID
-            //b - TYPE
-            this.entityID = Reflection.getField(animationClass, int.class, 0).getInt(packet);
-            this.entity = NMSUtils.getEntityById(this.entityID);
-            this.type = EntityAnimationType.get(Reflection.getField(animationClass, int.class, 1).getInt(packet));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public Entity getEntity() {
-        return this.entity;
-    }
-
-    public int getEntityId() {
-        return this.entityID;
-    }
-
-    public EntityAnimationType getAnimationType() {
-        return type;
-    }
-
-    @Override
-    public Object asNMSPacket() {
-        final Object nmsEntity = NMSUtils.getNMSEntity(this.entity);
-        final int index = type.getIndex();
-        try {
-            return animationConstructor.newInstance(nmsEntity, index);
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/chat/WrappedPacketOutChat.java

@@ -1,97 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.out.chat;
-
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-public final class WrappedPacketOutChat extends WrappedPacket implements Sendable {
-    private static Constructor<?> chatClassConstructor;
-    private static Class<?> chatClass, iChatBaseComponentClass, chatSerializerClass;
-
-    static {
-        try {
-            chatClass = NMSUtils.getNMSClass("PacketPlayOutChat");
-            iChatBaseComponentClass = NMSUtils.getNMSClass("IChatBaseComponent");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        //In 1.8.3+ the ChatSerializer class is declared in the IChatBaseComponent class, so we have to handle that
-        try {
-            chatSerializerClass = NMSUtils.getNMSClass("ChatSerializer");
-        } catch (ClassNotFoundException e) {
-            //That is fine, it is probably a subclass
-            chatSerializerClass = Reflection.getSubClass(iChatBaseComponentClass, "ChatSerializer");
-        }
-
-        try {
-            chatClassConstructor = chatClass.getConstructor(iChatBaseComponentClass);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-
-
-    }
-
-    private String message;
-
-    public WrappedPacketOutChat(final Object packet) {
-        super(packet);
-    }
-
-    public WrappedPacketOutChat(final String message) {
-        super(null);
-        this.message = "{\"text\": \"" + message + "\"}";
-    }
-
-    public static String toStringFromIChatBaseComponent(Object obj) {
-        try {
-            return Reflection.getMethod(iChatBaseComponentClass, String.class, 0).invoke(obj).toString();
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static Object toIChatBaseComponent(String msg) {
-        try {
-            return Reflection.getMethod(chatSerializerClass, 0, String.class).invoke(null, msg);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-
-    @Override
-    protected void setup() {
-        try {
-            final Object iChatBaseObj = Reflection.getField(chatClass, iChatBaseComponentClass, 0).get(packet);
-
-            final Object contentString = Reflection.getMethod(iChatBaseComponentClass, String.class, 0).invoke(iChatBaseObj);
-
-            this.message = contentString.toString();
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public Object asNMSPacket() {
-        try {
-            return chatClassConstructor.newInstance(toIChatBaseComponent(this.message));
-        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    public String getMessage() {
-        return this.message;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entity/WrappedPacketOutEntity.java

@@ -1,90 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.out.entity;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-public class WrappedPacketOutEntity extends WrappedPacket {
-    private int entityId;
-    private double deltaX, deltaY, deltaZ;
-    private byte yaw, pitch;
-    private boolean onGround;
-
-    public WrappedPacketOutEntity(Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            this.entityId = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-            this.onGround = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-            if (version.isLowerThan(ServerVersion.v_1_9)) {
-                byte dX = Reflection.getField(packetClass, byte.class, 0).getByte(packet);
-                byte dY = Reflection.getField(packetClass, byte.class, 1).getByte(packet);
-                byte dZ = Reflection.getField(packetClass, byte.class, 2).getByte(packet);
-
-                this.deltaX = dX / 32.0;
-                this.deltaY = dY / 32.0;
-                this.deltaZ = dZ / 32.0;
-
-                this.yaw = Reflection.getField(packetClass, byte.class, 3).getByte(packet);
-                this.pitch = Reflection.getField(packetClass, byte.class, 4).getByte(packet);
-            } else {
-                short dX = Reflection.getField(packetClass, short.class, 0).getShort(packet);
-                short dY = Reflection.getField(packetClass, short.class, 1).getShort(packet);
-                short dZ = Reflection.getField(packetClass, short.class, 2).getShort(packet);
-
-                this.deltaX = dX / 4096.0;
-                this.deltaY = dY / 4096.0;
-                this.deltaZ = dZ / 4096.0;
-
-                this.yaw = Reflection.getField(packetClass, byte.class, 0).getByte(packet);
-                this.pitch = Reflection.getField(packetClass, byte.class, 1).getByte(packet);
-            }
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-
-    public byte getPitch() {
-        return pitch;
-    }
-
-    public byte getYaw() {
-        return yaw;
-    }
-
-    public double getDeltaZ() {
-        return deltaZ;
-    }
-
-    public double getDeltaY() {
-        return deltaY;
-    }
-
-    public double getDeltaX() {
-        return deltaX;
-    }
-
-    public int getEntityId() {
-        return entityId;
-    }
-
-    public boolean isOnGround() {
-        return onGround;
-    }
-
-    private static Class<?> packetClass;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayOutEntity");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entityvelocity/WrappedPacketOutEntityVelocity.java

@@ -1,124 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.out.entityvelocity;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import org.bukkit.entity.Entity;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-public final class WrappedPacketOutEntityVelocity extends WrappedPacket implements Sendable {
-    private static Constructor<?> velocityConstructor, vec3dConstructor;
-    private static Class<?> velocityClass, vec3dClass;
-
-    /**
-     * Velocity Constructor parameter types:
-     * 1.7.10->1.13.2 use int, double, double, double style,
-     * 1.14+ use int, Vec3D style
-     */
-    static {
-        try {
-
-            velocityClass = NMSUtils.getNMSClass("PacketPlayOutEntityVelocity");
-            if (version.isHigherThan(ServerVersion.v_1_13_2)) {
-                vec3dClass = NMSUtils.getNMSClass("Vec3D");
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            velocityConstructor = velocityClass.getConstructor(int.class, double.class, double.class, double.class);
-        } catch (NoSuchMethodException e) {
-            //That is fine, just a newer version
-            try {
-                velocityConstructor = velocityClass.getConstructor(int.class, vec3dClass);
-                //vec3d constructor
-                vec3dConstructor = vec3dClass.getConstructor(double.class, double.class, double.class);
-            } catch (NoSuchMethodException e2) {
-                e2.printStackTrace();
-            }
-
-        }
-    }
-
-    private Entity entity;
-    private int entityId;
-    private double velocityX, velocityY, velocityZ;
-
-    public WrappedPacketOutEntityVelocity(final Object packet) {
-        super(packet);
-    }
-
-    public WrappedPacketOutEntityVelocity(final Entity entity, final double velocityX, final double velocityY, final double velocityZ) {
-        super(null);
-        this.entityId = entity.getEntityId();
-        this.entity = entity;
-        this.velocityX = velocityX;
-        this.velocityY = velocityY;
-        this.velocityZ = velocityZ;
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            int i = 0;
-            final int entityId = Reflection.getField(velocityClass, int.class, 0).getInt(packet);
-
-            final int x = Reflection.getField(velocityClass, int.class, 1).getInt(packet);
-            final int y = Reflection.getField(velocityClass, int.class, 2).getInt(packet);
-            final int z = Reflection.getField(velocityClass, int.class, 3).getInt(packet);
-
-            this.entityId = entityId;
-            this.entity = NMSUtils.getEntityById(this.entityId);
-
-            this.velocityX = x / 8000.0D;
-            this.velocityY = y / 8000.0D;
-            this.velocityZ = z / 8000.0D;
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public int getEntityId() {
-        return entityId;
-    }
-
-    public Entity getEntity() {
-        return entity;
-    }
-
-    public double getVelocityX() {
-        return velocityX;
-    }
-
-    public double getVelocityY() {
-        return velocityY;
-    }
-
-    public double getVelocityZ() {
-        return velocityZ;
-    }
-
-    @Override
-    public Object asNMSPacket() {
-        if (version.isLowerThan(ServerVersion.v_1_14)) {
-            try {
-                return velocityConstructor.newInstance(entityId, velocityX, velocityY, velocityZ);
-            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        } else {
-            try {
-                return velocityConstructor.newInstance(entityId, vec3dConstructor.newInstance(velocityX, velocityY, velocityZ));
-            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/kickdisconnect/WrappedPacketOutKickDisconnect.java

@@ -1,64 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.out.kickdisconnect;
-
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-public final class WrappedPacketOutKickDisconnect extends WrappedPacket implements Sendable {
-    private static Class<?> packetClass, iChatBaseComponentClass;
-    private static Constructor<?> kickDisconnectConstructor;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayOutKickDisconnect");
-            iChatBaseComponentClass = NMSUtils.getNMSClass("IChatBaseComponent");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            kickDisconnectConstructor = packetClass.getConstructor(iChatBaseComponentClass);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private String kickMessage;
-
-    public WrappedPacketOutKickDisconnect(final Object packet) {
-        super(packet);
-    }
-
-    public WrappedPacketOutKickDisconnect(final String kickMessage) {
-        super(null);
-        this.kickMessage = kickMessage;
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            this.kickMessage = WrappedPacketOutChat.toStringFromIChatBaseComponent(Reflection.getField(packetClass, iChatBaseComponentClass, 0).get(packet));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public String getKickMessage() {
-        return kickMessage;
-    }
-
-    @Override
-    public Object asNMSPacket() {
-        try {
-            return kickDisconnectConstructor.newInstance(WrappedPacketOutChat.toIChatBaseComponent("{\"text\": \"" + kickMessage + "\"}"));
-        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/transaction/WrappedPacketOutTransaction.java

@@ -1,78 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.out.transaction;
-
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-public class WrappedPacketOutTransaction extends WrappedPacket implements Sendable {
-    private static Class<?> packetClass;
-    private static Constructor<?> packetConstructor;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayOutTransaction");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            packetConstructor = packetClass.getConstructor(int.class, short.class, boolean.class);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private int windowId;
-    private short actionNumber;
-    private boolean accepted;
-
-    public WrappedPacketOutTransaction(final Object packet) {
-        super(packet);
-    }
-
-    public WrappedPacketOutTransaction(final int windowId, final short actionNumber, final boolean accepted) {
-        super(null);
-        this.windowId = windowId;
-        this.actionNumber = actionNumber;
-        this.accepted = accepted;
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            this.windowId = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-            this.actionNumber = Reflection.getField(packetClass, short.class, 0).getShort(packet);
-            this.accepted = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public int getWindowId() {
-        return windowId;
-    }
-
-    public short getActionNumber() {
-        return actionNumber;
-    }
-
-    public boolean isAccepted() {
-        return accepted;
-    }
-
-    @Override
-    public Object asNMSPacket() {
-        try {
-            return packetConstructor.newInstance(windowId, actionNumber, accepted);
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/updatehealth/WrappedPacketOutUpdateHealth.java

@@ -1,83 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.out.updatehealth;
-
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-public final class WrappedPacketOutUpdateHealth extends WrappedPacket implements Sendable {
-    private static Class<?> packetClass;
-    private static Constructor<?> packetConstructor;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayOutUpdateHealth");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            packetConstructor = packetClass.getConstructor(float.class, int.class, float.class);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private float health, foodSaturation;
-    private int food;
-
-    public WrappedPacketOutUpdateHealth(final Object packet) {
-        super(packet);
-    }
-
-    /**
-     * See https://wiki.vg/Protocol#Update_Health
-     *
-     * @param health
-     * @param food
-     * @param foodSaturation
-     */
-    public WrappedPacketOutUpdateHealth(final float health, final int food, final float foodSaturation) {
-        super(null);
-        this.health = health;
-        this.food = food;
-        this.foodSaturation = foodSaturation;
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            this.health = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-            this.foodSaturation = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-            this.food = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public float getHealth() {
-        return health;
-    }
-
-    public float getFoodSaturation() {
-        return foodSaturation;
-    }
-
-    public int getFood() {
-        return food;
-    }
-
-    @Override
-    public Object asNMSPacket() {
-        try {
-            return packetConstructor.newInstance(health, food, foodSaturation);
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

src/main/java/io/github/retrooper/packetevents/reflectionutils/Reflection.java

@@ -1,190 +0,0 @@
-package io.github.retrooper.packetevents.reflectionutils;
-
-
-import io.github.retrooper.packetevents.reflectionutils.fielddata.FieldWithIndex;
-import io.github.retrooper.packetevents.reflectionutils.fielddata.FieldWithName;
-import io.github.retrooper.packetevents.reflectionutils.fielddata.FieldWithTypeAndIndex;
-import io.github.retrooper.packetevents.reflectionutils.methoddata.MethodWithIndexAndParams;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashMap;
-
-/**
- * @author retrooper
- */
-public final class Reflection {
-    private static final HashMap<Class<?>, Field[]> cachedFields = new HashMap<Class<?>, Field[]>();
-    private static final HashMap<Class<?>, Method[]> cachedMethods = new HashMap<Class<?>, Method[]>();
-    private static final HashMap<Class<?>, Class<?>[]> cachedSubclasses = new HashMap<Class<?>, Class<?>[]>();
-
-
-    //FIELDS
-    private static final HashMap<FieldWithName, Field> fieldWithNameHashMap = new HashMap<FieldWithName, Field>();
-    private static final HashMap<FieldWithTypeAndIndex, Field> fieldWithTypeAndIndexHashMap = new HashMap<FieldWithTypeAndIndex, Field>();
-    private static final HashMap<FieldWithIndex, Field> fieldWithIndexHashMap = new HashMap<FieldWithIndex, Field>();
-    private static final HashMap<MethodWithIndexAndParams, Method> methodWithIndexAndParamsHashMap = new HashMap<MethodWithIndexAndParams, Method>();
-
-    public static Field[] getFields(final Class<?> cls) {
-        if (cachedFields.containsKey(cls)) {
-            return cachedFields.get(cls);
-        } else {
-            final Field[] fields = cls.getDeclaredFields();
-            for (final Field f : fields) {
-                f.setAccessible(true);
-            }
-            cachedFields.put(cls, fields);
-            return fields;
-        }
-    }
-
-    public static Field getField(final Class<?> cls, final String name) {
-        final FieldWithName fwn = new FieldWithName(cls, name);
-        if (!fieldWithNameHashMap.containsKey(fwn)) {
-            for (final Field f : getFields(cls)) {
-                if (f.getName().equals(name)) {
-                    fieldWithNameHashMap.put(fwn, f);
-                    return f;
-                }
-            }
-        } else {
-            return fieldWithNameHashMap.get(fwn);
-        }
-        return null;
-    }
-
-    public static Field getField(final Class<?> cls, final Class<?> dataType, final int index) {
-        final FieldWithTypeAndIndex fwtai = new FieldWithTypeAndIndex(cls, dataType, index);
-        if (!fieldWithTypeAndIndexHashMap.containsKey(fwtai)) {
-            int i = 0;
-            for (final Field f : getFields(cls)) {
-                if (f.getType().equals(dataType)) {
-                    if (i++ == index) {
-                        fieldWithTypeAndIndexHashMap.put(fwtai, f);
-                        return f;
-                    }
-                }
-            }
-        } else {
-            return fieldWithTypeAndIndexHashMap.get(fwtai);
-        }
-        return null;
-    }
-
-    public static Field getField(final Class<?> cls, final int index) {
-        final FieldWithIndex fwi = new FieldWithIndex(cls, index);
-        if (!fieldWithIndexHashMap.containsKey(fwi)) {
-            int i = 0;
-            for (final Field f : getFields(cls)) {
-                if (index == i++) {
-                    fieldWithIndexHashMap.put(fwi, f);
-                    return f;
-                }
-            }
-        } else {
-            return fieldWithIndexHashMap.get(fwi);
-        }
-        return null;
-    }
-
-    //METHODS
-    public static Method[] getMethods(final Class<?> cls) {
-        if (cachedMethods.containsKey(cls)) {
-            return cachedMethods.get(cls);
-        } else {
-            final Method[] methods = cls.getDeclaredMethods();
-            for (final Method m : methods) {
-                m.setAccessible(true);
-            }
-            cachedMethods.put(cls, methods);
-            return methods;
-        }
-    }
-
-    public static Method getMethod(final Class<?> cls, final int index, final Class<?>... params) {
-        final MethodWithIndexAndParams mwiap = new MethodWithIndexAndParams(cls, index, params);
-        if (!methodWithIndexAndParamsHashMap.containsKey(mwiap)) {
-            int i = 0;
-            for (final Method m : getMethods(cls)) {
-                if (Arrays.equals(m.getParameterTypes(), params) && index == i++) {
-                    return m;
-                }
-            }
-        } else {
-            return methodWithIndexAndParamsHashMap.get(mwiap);
-        }
-        return null;
-    }
-
-    //THE REST LATER
-
-    public static Method getMethod(final Class<?> cls, final String name, Class<?> returning, Class<?>... params) {
-        for (final Method m : getMethods(cls)) {
-            if (m.getName().equals(name) && Arrays.equals(m.getParameterTypes(), params) && m.getReturnType().equals(returning)) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    public static Method getMethod(final Class<?> cls, final String name, final int index) {
-        int i = 0;
-        for (final Method m : getMethods(cls)) {
-            if (m.getName().equals(name) && index == i++) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    public static Method getMethod(final Class<?> cls, final Class<?> returning, final int index) {
-        int i = 0;
-        for (final Method m : getMethods(cls)) {
-            if (m.getReturnType().equals(returning) && index == i++) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    public static Method getMethod(final Class<?> cls, final String name, final Class<?> returning) {
-        int i = 0;
-        for (final Method m : getMethods(cls)) {
-            if (m.getName().equals(name) && m.getReturnType().equals(returning)) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    public static Class<?>[] getSubClasses(final Class<?> cls) {
-        if (cachedSubclasses.containsKey(cls)) {
-            return cachedSubclasses.get(cls);
-        } else {
-            final Class<?>[] subclasses = cls.getDeclaredClasses();
-            cachedSubclasses.put(cls, subclasses);
-            return subclasses;
-        }
-    }
-
-    public static Class<?> getSubClass(final Class<?> cls, final String name) {
-        for (final Class<?> subclass : getSubClasses(cls)) {
-            if (subclass.getSimpleName().equals(name)) {
-                return subclass;
-            }
-        }
-        return null;
-    }
-
-    public static Class<?> getSubClass(final Class<?> cls, final int index) {
-        final Class<?>[] subclasses = getSubClasses(cls);
-        for (int i = 0; i < index + 1; i++) {
-            final Class<?> c = subclasses[i];
-            if (i == index) {
-                return c;
-            }
-        }
-        return null;
-    }
-}

src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithIndex.java

@@ -1,19 +0,0 @@
-package io.github.retrooper.packetevents.reflectionutils.fielddata;
-
-public class FieldWithIndex {
-    private final Class<?> cls;
-    private final int index;
-
-    public FieldWithIndex(Class<?> cls, int index) {
-        this.cls = cls;
-        this.index = index;
-    }
-
-    public Class<?> getCls() {
-        return cls;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-}

src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithName.java

@@ -1,20 +0,0 @@
-package io.github.retrooper.packetevents.reflectionutils.fielddata;
-
-public class FieldWithName {
-
-    private final Class<?> cls;
-    private final String name;
-
-    public FieldWithName(Class<?> cls, String name) {
-        this.cls = cls;
-        this.name = name;
-    }
-
-    public Class<?> getCls() {
-        return cls;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithTypeAndIndex.java

@@ -1,24 +0,0 @@
-package io.github.retrooper.packetevents.reflectionutils.fielddata;
-
-public class FieldWithTypeAndIndex {
-    private final Class<?> cls, type;
-    private final int index;
-
-    public FieldWithTypeAndIndex(Class<?> cls, Class<?> type, int index) {
-        this.cls = cls;
-        this.type = type;
-        this.index = index;
-    }
-
-    public Class<?> getCls() {
-        return cls;
-    }
-
-    public Class<?> getType() {
-        return type;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-}

src/main/java/io/github/retrooper/packetevents/reflectionutils/methoddata/MethodWithIndexAndParams.java

@@ -1,25 +0,0 @@
-package io.github.retrooper.packetevents.reflectionutils.methoddata;
-
-public class MethodWithIndexAndParams {
-    private final Class<?> cls;
-    private final int index;
-    private final Class<?>[] params;
-
-    public MethodWithIndexAndParams(Class<?> cls, int index, Class<?>[] params) {
-        this.cls = cls;
-        this.index = index;
-        this.params = params;
-    }
-
-    public Class<?> getCls() {
-        return cls;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public Class<?>[] getParams() {
-        return params;
-    }
-}

src/main/java/io/github/retrooper/packetevents/settings/Settings.java

@@ -1,25 +0,0 @@
-package io.github.retrooper.packetevents.settings;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-
-public class Settings {
-    private ServerVersion defaultServerVersion;
-
-    /**
-     * If PacketEvents fails to detect your server version, it will use the recommended version
-     *
-     * @return Recommended version
-     */
-    public ServerVersion getDefaultServerVersion() {
-        return defaultServerVersion;
-    }
-
-    /**
-     * Set the recommended version
-     *
-     * @param version
-     */
-    public void setDefaultServerVersion(final ServerVersion version) {
-        defaultServerVersion = version;
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/BlockIteratorUtils.java

@@ -1,18 +0,0 @@
-package io.github.retrooper.packetevents.utils;
-
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.util.BlockIterator;
-
-public class BlockIteratorUtils {
-    public static Block getBlockLookingAt(final Player player, final int distance) {
-        final Location location = player.getEyeLocation();
-        final BlockIterator blocksToAdd = new BlockIterator(location, 0.0D, distance);
-        Block block = null;
-        while (blocksToAdd.hasNext()) {
-            block = blocksToAdd.next();
-        }
-        return block;
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/NMSUtils.java

@@ -1,224 +0,0 @@
-package io.github.retrooper.packetevents.utils;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.nms_entityfinder.EntityFinderUtils;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public final class NMSUtils {
-    private static final ServerVersion version =ServerVersion.getVersion();
-    public static String nettyPrefix;
-    private static final String nmsDir = ServerVersion.getNMSDirectory();
-    private static final String obcDir = ServerVersion.getOBCDirectory();
-    public static Class<?> minecraftServerClass, craftWorldsClass,
-            packetClass, entityPlayerClass, playerConnectionClass,
-            craftPlayerClass, serverConnectionClass, craftEntityClass,
-            craftItemStack, nmsItemStackClass, networkManagerClass, nettyChannelClass;
-    private static Method getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
-    private static Field entityPlayerPingField, playerConnectionField;
-
-    static {
-        try {
-            nettyPrefix = "io.netty";
-            Class.forName("io.netty.channel.Channel");
-        } catch (ClassNotFoundException e) {
-            nettyPrefix = "net.minecraft.util.io.netty";
-        }
-        try {
-            nettyChannelClass = getNettyClass("channel.Channel");
-            minecraftServerClass = getNMSClass("MinecraftServer");
-            craftWorldsClass = getOBCClass("CraftWorld");
-            craftPlayerClass = getOBCClass("entity.CraftPlayer");
-            entityPlayerClass = getNMSClass("EntityPlayer");
-            packetClass = getNMSClass("Packet");
-            playerConnectionClass = getNMSClass("PlayerConnection");
-            serverConnectionClass = getNMSClass("ServerConnection");
-            craftEntityClass = getOBCClass("entity.CraftEntity");
-            craftItemStack = getOBCClass("inventory.CraftItemStack");
-            nmsItemStackClass = getNMSClass("ItemStack");
-            networkManagerClass = getNMSClass("NetworkManager");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        //METHODS
-        try {
-            getCraftWorldHandleMethod = craftWorldsClass.getMethod("getHandle");
-            getCraftPlayerHandle = craftPlayerClass.getMethod("getHandle");
-            getCraftEntityHandle = craftEntityClass.getMethod("getHandle");
-            sendPacketMethod = playerConnectionClass.getMethod("sendPacket", packetClass);
-            getServerConnection = minecraftServerClass.getMethod("getServerConnection");
-            asBukkitCopy = craftItemStack.getMethod("asBukkitCopy", nmsItemStackClass);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-
-
-        try {
-            entityPlayerPingField = entityPlayerClass.getField("ping");
-            playerConnectionField = entityPlayerClass.getField("playerConnection");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static Object getMinecraftServerInstance() throws InvocationTargetException, IllegalAccessException {
-        return Reflection.getMethod(minecraftServerClass, "getServer", 0).invoke(null);
-    }
-
-    public static double[] recentTPS() throws IllegalAccessException, InvocationTargetException {
-        final Object minecraftServerObj = getMinecraftServerInstance();
-        return (double[]) Reflection.getField(minecraftServerClass, double[].class, 0).get(minecraftServerObj);
-    }
-
-    public static Class<?> getNMSClass(String name) throws ClassNotFoundException {
-        return Class.forName(nmsDir + "." + name);
-    }
-
-    public static Class<?> getNMSClassWithoutException(String name) {
-        try {
-            return getNMSClass(name);
-        } catch (ClassNotFoundException e) {
-            return null;
-        }
-
-    }
-
-    public static Class<?> getOBCClass(String name) throws ClassNotFoundException {
-        return Class.forName(obcDir + "." + name);
-    }
-
-    public static Class<?> getNettyClass(String name) throws ClassNotFoundException {
-        return Class.forName(nettyPrefix + "." + name);
-    }
-
-    public static final String getChannelFutureListFieldName() {
-        if (version.isLowerThan(ServerVersion.v_1_8))
-            return "e";
-        if (version.isLowerThan(ServerVersion.v_1_13))
-            return "g";
-        return "f";
-    }
-
-    @Nullable
-    public static Entity getEntityById(final int id) {
-        return EntityFinderUtils.getEntityById(id);
-    }
-
-    @Nullable
-    public static Entity getEntityByIdWithWorld(final World world, final int id) {
-        return EntityFinderUtils.getEntityByIdWithWorld(world, id);
-    }
-
-    public static Object getNMSEntity(final Entity entity) {
-        final Object craftEntity = craftEntityClass.cast(entity);
-        try {
-            return getCraftEntityHandle.invoke(craftEntity);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static Object getCraftPlayer(final Player player) {
-        return craftPlayerClass.cast(player);
-    }
-
-    public static Object getEntityPlayer(final Player player) {
-        Object entityPlayer = null;
-        try {
-            return getCraftPlayerHandle.invoke(getCraftPlayer(player));
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static Object getPlayerConnection(final Player player) {
-        try {
-            return playerConnectionField.get(getEntityPlayer(player));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static Object getNetworkManager(final Player player) {
-        try {
-            return Reflection.getField(playerConnectionClass, networkManagerClass, 0).get(getPlayerConnection(player));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static Object getChannel(final Player player) {
-        try {
-            return Reflection.getField(networkManagerClass, nettyChannelClass, 0).get(getNetworkManager(player));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static int getPlayerPing(final Player player) {
-        Object entityPlayer = getEntityPlayer(player);
-        try {
-            return entityPlayerPingField.getInt(entityPlayer);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return -1;
-    }
-
-    public static ItemStack toBukkitItemStack(final Object nmsItemstack) {
-        try {
-            return (ItemStack) asBukkitCopy.invoke(null, nmsItemstack);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static boolean is_1_8() {
-        return version.isHigherThan(ServerVersion.v_1_7_10)
-                && version.isLowerThan(ServerVersion.v_1_9);
-    }
-
-    public static void sendSendableWrapper(final Player player, final Sendable sendable) {
-        sendNMSPacket(player, sendable.asNMSPacket());
-    }
-
-    public static void sendNMSPacket(final Player player, final Object nmsPacket) {
-        Object entityPlayer = getEntityPlayer(player);
-        Object playerConnection = null;
-        try {
-            playerConnection = playerConnectionField.get(entityPlayer);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            sendPacketMethod.invoke(playerConnection, nmsPacket);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    public static String getServerConnectionFieldName() {
-        return "p";
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/api/PlayerUtils.java

@@ -1,57 +0,0 @@
-package io.github.retrooper.packetevents.utils.api;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ClientVersion;
-import io.github.retrooper.packetevents.handler.NettyPacketHandler;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import org.bukkit.entity.Player;
-
-import java.util.HashMap;
-import java.util.UUID;
-
-public final class PlayerUtils {
-    private final HashMap<UUID, ClientVersion> clientVersionsMap = new HashMap<UUID, ClientVersion>();
-
-    public int getPing(final Player player) {
-        return NMSUtils.getPlayerPing(player);
-    }
-
-    public ClientVersion getClientVersion(final UUID uuid) {
-        return clientVersionsMap.get(uuid);
-    }
-
-    public ClientVersion getClientVersion(final Player player) {
-        return getClientVersion(player.getUniqueId());
-    }
-
-    public void setClientVersion(final UUID uuid, final ClientVersion version) {
-        clientVersionsMap.put(uuid, version);
-    }
-
-    public void setClientVersion(final Player player, final ClientVersion version) {
-        setClientVersion(player.getUniqueId(), version);
-    }
-
-    public void clearClientVersion(final UUID uuid) {
-        clientVersionsMap.remove(uuid);
-    }
-
-    public void clearClientVersion(final Player player) {
-        clearClientVersion(player.getUniqueId());
-    }
-
-    public void injectPlayer(final Player player, final PacketEvents pe) {
-        NettyPacketHandler.injectPlayer(player,pe);
-    }
-
-    public void uninjectPlayer(final Player player, final PacketEvents pe) {
-        NettyPacketHandler.uninjectPlayer(player, pe);
-    }
-
-    public void sendPacket(final Player player, final Sendable sendable) {
-        NMSUtils.sendSendableWrapper(player, sendable);
-    }
-
-
-}

src/main/java/io/github/retrooper/packetevents/utils/api/ServerUtils.java

@@ -1,44 +0,0 @@
-package io.github.retrooper.packetevents.utils.api;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.enums.SystemOS;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-import java.lang.reflect.InvocationTargetException;
-
-public final class ServerUtils {
-    @Deprecated
-    public ServerVersion getServerVersion() {
-        return getVersion();
-    }
-    @Deprecated
-    public double[] getRecentServerTPS() {
-       return getRecentTPS();
-    }
-    @Deprecated
-    public double getCurrentServerTPS() {
-        return getCurrentTPS();
-    }
-
-    public ServerVersion getVersion() {
-        return ServerVersion.getVersion();
-    }
-
-    public double[] getRecentTPS() {
-        double[] tpsArray = new double[0];
-        try {
-            tpsArray = NMSUtils.recentTPS();
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return tpsArray;
-    }
-
-    public double getCurrentTPS() {
-        return getRecentTPS()[0];
-    }
-
-    public SystemOS getPlatform() {
-        return SystemOS.getOperatingSystem();
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/nms_entityfinder/EntityFinderUtils.java

@@ -1,89 +0,0 @@
-package io.github.retrooper.packetevents.utils.nms_entityfinder;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public final class EntityFinderUtils {
-    @Nullable
-    private static final ServerVersion version =ServerVersion.getVersion();
-    private static Class<?> worldServerClass;
-    private static Class<?> craftWorldClass;
-    private static Class<?> entityClass;
-    private static Method getEntityByIdMethod;
-    private static Method craftWorldGetHandle;
-    private static Method getBukkitEntity;
-
-    static {
-        try {
-            worldServerClass = NMSUtils.getNMSClass("WorldServer");
-            craftWorldClass = NMSUtils.getOBCClass("CraftWorld");
-            entityClass = NMSUtils.getNMSClass("Entity");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            getEntityByIdMethod = worldServerClass.getMethod(getEntityByNameMethodName(), int.class);
-            craftWorldGetHandle = craftWorldClass.getMethod("getHandle");
-            getBukkitEntity = entityClass.getMethod("getBukkitEntity");
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static Entity getEntityById(final int id) {
-        for (final World world : Bukkit.getWorlds()) {
-            final Entity entity = getEntityByIdWithWorld(world, id);
-            if (entity != null) {
-                return entity;
-            }
-        }
-        return null;
-    }
-
-    @Nullable
-    public static Entity getEntityByIdWithWorld(final World world, final int id) {
-        if (world == null) {
-            return null;
-        }
-        Object craftWorld = craftWorldClass.cast(world);
-
-        Object worldServer = null;
-        try {
-            worldServer = craftWorldGetHandle.invoke(craftWorld);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-
-        Object nmsEntity = null;
-        try {
-            nmsEntity = getEntityByIdMethod.invoke(worldServer, id);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        if (nmsEntity == null) {
-            return null;
-        }
-        try {
-            return (Entity) getBukkitEntity.invoke(nmsEntity);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static String getEntityByNameMethodName() {
-        if (version.isHigherThan(ServerVersion.v_1_7_10) && version.isLowerThan(ServerVersion.v_1_9)) {
-            return "a";
-        }
-        return "getEntity";
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/vector/Vector3d.java

@@ -1,16 +0,0 @@
-package io.github.retrooper.packetevents.utils.vector;
-
-public final class Vector3d {
-    public double x, y, z;
-
-    public Vector3d(final double x, final double y, final double z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    @Override
-    public String toString() {
-        return "X: " + x + ", Y: " + y + ", Z: " + z;
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/vector/Vector3f.java

@@ -1,16 +0,0 @@
-package io.github.retrooper.packetevents.utils.vector;
-
-public final class Vector3f {
-    public float x, y, z;
-
-    public Vector3f(final float x, final float y, final float z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    @Override
-    public String toString() {
-        return "X: " + x + ", Y: " + y + ", Z: " + z;
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/vector/Vector3i.java

@@ -1,16 +0,0 @@
-package io.github.retrooper.packetevents.utils.vector;
-
-public final class Vector3i {
-    public int x, y, z;
-
-    public Vector3i(final int x, final int y, final int z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    @Override
-    public String toString() {
-        return "X: " + x + ", Y: " + y + ", Z: " + z;
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ProtocolLibAPIAccessor.java

@@ -1,10 +0,0 @@
-package io.github.retrooper.packetevents.utils.versionlookup;
-
-import com.comphenix.protocol.ProtocolLibrary;
-import org.bukkit.entity.Player;
-
-class ProtocolLibAPIAccessor {
-    public static int getProtocolVersion(final Player player) {
-        return ProtocolLibrary.getProtocolManager().getProtocolVersion(player);
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ProtocolLibUtils.java

@@ -1,14 +0,0 @@
-package io.github.retrooper.packetevents.utils.versionlookup;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class ProtocolLibUtils {
-    public static boolean isAvailable() {
-        return Bukkit.getPluginManager().isPluginEnabled("ProtocolLib");
-    }
-
-    public static int getProtocolVersion(final Player player) {
-        return ProtocolLibAPIAccessor.getProtocolVersion(player);
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ProtocolSupportAPIAccessor.java

@@ -1,10 +0,0 @@
-package io.github.retrooper.packetevents.utils.versionlookup;
-
-import org.bukkit.entity.Player;
-import protocolsupport.api.ProtocolSupportAPI;
-
-class ProtocolSupportAPIAccessor {
-    public static int getProtocolVersion(final Player player) {
-        return ProtocolSupportAPI.getProtocolVersion(player).getId();
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ProtocolSupportUtils.java

@@ -1,14 +0,0 @@
-package io.github.retrooper.packetevents.utils.versionlookup;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class ProtocolSupportUtils {
-    public static boolean isAvailable() {
-        return Bukkit.getPluginManager().isPluginEnabled("ProtocolSupport");
-    }
-
-    public static int getProtocolVersion(final Player player) {
-        return ProtocolSupportAPIAccessor.getProtocolVersion(player);
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/VersionLookupUtils.java

@@ -1,25 +0,0 @@
-package io.github.retrooper.packetevents.utils.versionlookup;
-
-import org.bukkit.entity.Player;
-
-public class VersionLookupUtils {
-    /**
-     * If ViaVersion is present, we get the protocol version with the ViaVersion API.
-     * If ProtocolSupport is present, we get the protocol version with the ProtocolSupport API.
-     * If ProtocolLib is present, we get the protocol version with the ProtocolLib API.
-     * Otherwise return -1
-     *
-     * @param player
-     * @return protocol version of the player if ViaVersion or ProtocolSupport or ProtocolLib is present. Otherwise -1
-     */
-    public static int getProtocolVersion(final Player player) {
-        if (ViaUtils.isAvailable()) {
-            return ViaUtils.getProtocolVersion(player);
-        } else if (ProtocolSupportUtils.isAvailable()) {
-            return ProtocolSupportUtils.getProtocolVersion(player);
-        } else if (ProtocolLibUtils.isAvailable()) {
-            return ProtocolLibUtils.getProtocolVersion(player);
-        }
-        return -1;
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ViaAPIAccessor.java

@@ -1,16 +0,0 @@
-package io.github.retrooper.packetevents.utils.versionlookup;
-
-import org.bukkit.entity.Player;
-import us.myles.ViaVersion.api.Via;
-
-import java.util.UUID;
-
-class ViaAPIAccessor {
-    public static int getProtocolVersion(final Player player) {
-        return getProtocolVersion(player.getUniqueId());
-    }
-
-    public static int getProtocolVersion(final UUID uuid) {
-        return Via.getAPI().getPlayerVersion(uuid);
-    }
-}