Various bug fixes, support for 1.8->1.15 spigot servers, WrappedPacketPlayInUseEntity wrapper added. More coming soon.

README.md

@@ -21,7 +21,7 @@ allprojects {
 }
 
 dependencies {
-        implementation 'com.github.purplexdev:packetevents:1.0.6'
+        implementation 'com.github.purplexdev:packetevents:1.0.9'
 }
 ```
 
@@ -40,7 +40,7 @@ dependencies {
         <dependency>
             <groupId>com.github.purplexdev</groupId>
             <artifactId>packetevents</artifactId>
-            <version>1.0.6</version>
+            <version>1.0.9</version>
         </dependency>
 </dependencies>
 ```
@@ -50,14 +50,14 @@ dependencies {
 ```
 resolvers += "jitpack" at "https://jitpack.io"
 
-libraryDependencies += "com.github.purplexdev" % "packetevents" % "1.0.6"	
+libraryDependencies += "com.github.purplexdev" % "packetevents" % "1.0.9"	
 ```
 
 # leiningen
 ```
 :repositories [["jitpack" "https://jitpack.io"]]
 
-:dependencies [[com.github.purplexdev/packetevents "1.0.6"]]	
+:dependencies [[com.github.purplexdev/packetevents "1.0.9"]]	
 ```
 
 

pom.xml

@@ -4,13 +4,11 @@
          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>me.retrooper</groupId>
+    <groupId>me.purplex</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.0.6</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
-
     <name>PacketEvents</name>
-
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -19,6 +17,14 @@
     <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>
@@ -28,22 +34,6 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
         <resources>
             <resource>
@@ -56,30 +46,140 @@
     <repositories>
         <repository>
             <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
         <repository>
-            <id>libraries-mojang</id>
-            <url>https://libraries.minecraft.net/</url>
+            <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>
+
     </repositories>
 
+
     <dependencies>
         <dependency>
-            <groupId>com.mojang</groupId>
-            <artifactId>authlib</artifactId>
-            <version>1.5.21</version>
-            <scope>compile</scope>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.14.1</artifactId>
+            <version>1.14.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>4.1.42.Final</version>
-            <scope>compile</scope>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.15.1</artifactId>
+            <version>1.15.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.14.3</artifactId>
+            <version>1.14.3</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.14.2</artifactId>
+            <version>1.14.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.15</artifactId>
+            <version>1.15</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.15.2</artifactId>
+            <version>1.15.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.13.2</artifactId>
+            <version>1.13.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.8</artifactId>
+            <version>1.8</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.8.3</artifactId>
+            <version>1.8.3</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>org.github.spigot</groupId>
+            <artifactId>1.9</artifactId>
+            <version>1.9</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.9.4</artifactId>
+            <version>1.9.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.10.2</artifactId>
+            <version>1.10.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.11.1</artifactId>
+            <version>1.11.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.11.2</artifactId>
+            <version>1.11.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.12.1</artifactId>
+            <version>1.12.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.12.2</artifactId>
+            <version>1.12.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.13</artifactId>
+            <version>1.13</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.14</artifactId>
+            <version>1.14</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--Bukkit-->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
             <version>1.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>

src/main/java/com/comphenix/tinyprotocol/Reflection.java

@@ -1,403 +0,0 @@
-package com.comphenix.tinyprotocol;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.bukkit.Bukkit;
-
-/**
- * An utility class that simplifies reflection in Bukkit plugins.
- * 
- * @author Kristian
- */
-public final class Reflection {
-	/**
-	 * An interface for invoking a specific constructor.
-	 */
-	public interface ConstructorInvoker {
-		/**
-		 * Invoke a constructor for a specific class.
-		 * 
-		 * @param arguments - the arguments to pass to the constructor.
-		 * @return The constructed object.
-		 */
-		public Object invoke(Object... arguments);
-	}
-
-	/**
-	 * An interface for invoking a specific method.
-	 */
-	public interface MethodInvoker {
-		/**
-		 * Invoke a method on a specific target object.
-		 * 
-		 * @param target - the target object, or NULL for a static method.
-		 * @param arguments - the arguments to pass to the method.
-		 * @return The return value, or NULL if is void.
-		 */
-		public Object invoke(Object target, Object... arguments);
-	}
-
-	/**
-	 * An interface for retrieving the field content.
-	 * 
-	 * @param <T> - field type.
-	 */
-	public interface FieldAccessor<T> {
-		/**
-		 * Retrieve the content of a field.
-		 * 
-		 * @param target - the target object, or NULL for a static field.
-		 * @return The value of the field.
-		 */
-		public T get(Object target);
-
-		/**
-		 * Set the content of a field.
-		 * 
-		 * @param target - the target object, or NULL for a static field.
-		 * @param value - the new value of the field.
-		 */
-		public void set(Object target, Object value);
-
-		/**
-		 * Determine if the given object has this field.
-		 * 
-		 * @param target - the object to test.
-		 * @return TRUE if it does, FALSE otherwise.
-		 */
-		public boolean hasField(Object target);
-	}
-
-	// Deduce the net.minecraft.server.v* package
-	private static String OBC_PREFIX = Bukkit.getServer().getClass().getPackage().getName();
-	private static String NMS_PREFIX = OBC_PREFIX.replace("org.bukkit.craftbukkit", "net.minecraft.server");
-	private static String VERSION = OBC_PREFIX.replace("org.bukkit.craftbukkit", "").replace(".", "");
-
-	// Variable replacement
-	private static Pattern MATCH_VARIABLE = Pattern.compile("\\{([^\\}]+)\\}");
-
-	private Reflection() {
-		// Seal class
-	}
-
-	/**
-	 * Retrieve a field accessor for a specific field type and name.
-	 * 
-	 * @param target - the target type.
-	 * @param name - the name of the field, or NULL to ignore.
-	 * @param fieldType - a compatible field type.
-	 * @return The field accessor.
-	 */
-	public static <T> FieldAccessor<T> getField(Class<?> target, String name, Class<T> fieldType) {
-		return getField(target, name, fieldType, 0);
-	}
-
-	/**
-	 * Retrieve a field accessor for a specific field type and name.
-	 * 
-	 * @param className - lookup name of the class, see {@link #getClass(String)}.
-	 * @param name - the name of the field, or NULL to ignore.
-	 * @param fieldType - a compatible field type.
-	 * @return The field accessor.
-	 */
-	public static <T> FieldAccessor<T> getField(String className, String name, Class<T> fieldType) {
-		return getField(getClass(className), name, fieldType, 0);
-	}
-
-	/**
-	 * Retrieve a field accessor for a specific field type and name.
-	 * 
-	 * @param target - the target type.
-	 * @param fieldType - a compatible field type.
-	 * @param index - the number of compatible fields to skip.
-	 * @return The field accessor.
-	 */
-	public static <T> FieldAccessor<T> getField(Class<?> target, Class<T> fieldType, int index) {
-		return getField(target, null, fieldType, index);
-	}
-
-	/**
-	 * Retrieve a field accessor for a specific field type and name.
-	 * 
-	 * @param className - lookup name of the class, see {@link #getClass(String)}.
-	 * @param fieldType - a compatible field type.
-	 * @param index - the number of compatible fields to skip.
-	 * @return The field accessor.
-	 */
-	public static <T> FieldAccessor<T> getField(String className, Class<T> fieldType, int index) {
-		return getField(getClass(className), fieldType, index);
-	}
-
-	// Common method
-	private static <T> FieldAccessor<T> getField(Class<?> target, String name, Class<T> fieldType, int index) {
-		for (final Field field : target.getDeclaredFields()) {
-			if ((name == null || field.getName().equals(name)) && fieldType.isAssignableFrom(field.getType()) && index-- <= 0) {
-				field.setAccessible(true);
-
-				// A function for retrieving a specific field value
-				return new FieldAccessor<T>() {
-
-					@Override
-					@SuppressWarnings("unchecked")
-					public T get(Object target) {
-						try {
-							return (T) field.get(target);
-						} catch (IllegalAccessException e) {
-							throw new RuntimeException("Cannot access reflection.", e);
-						}
-					}
-
-					@Override
-					public void set(Object target, Object value) {
-						try {
-							field.set(target, value);
-						} catch (IllegalAccessException e) {
-							throw new RuntimeException("Cannot access reflection.", e);
-						}
-					}
-
-					@Override
-					public boolean hasField(Object target) {
-						// target instanceof DeclaringClass
-						return field.getDeclaringClass().isAssignableFrom(target.getClass());
-					}
-				};
-			}
-		}
-
-		// Search in parent classes
-		if (target.getSuperclass() != null)
-			return getField(target.getSuperclass(), name, fieldType, index);
-
-		throw new IllegalArgumentException("Cannot find field with type " + fieldType);
-	}
-
-	/**
-	 * Search for the first publicly and privately defined method of the given name and parameter count.
-	 * 
-	 * @param className - lookup name of the class, see {@link #getClass(String)}.
-	 * @param methodName - the method name, or NULL to skip.
-	 * @param params - the expected parameters.
-	 * @return An object that invokes this specific method.
-	 * @throws IllegalStateException If we cannot find this method.
-	 */
-	public static MethodInvoker getMethod(String className, String methodName, Class<?>... params) {
-		return getTypedMethod(getClass(className), methodName, null, params);
-	}
-
-	/**
-	 * Search for the first publicly and privately defined method of the given name and parameter count.
-	 * 
-	 * @param clazz - a class to start with.
-	 * @param methodName - the method name, or NULL to skip.
-	 * @param params - the expected parameters.
-	 * @return An object that invokes this specific method.
-	 * @throws IllegalStateException If we cannot find this method.
-	 */
-	public static MethodInvoker getMethod(Class<?> clazz, String methodName, Class<?>... params) {
-		return getTypedMethod(clazz, methodName, null, params);
-	}
-
-	/**
-	 * Search for the first publicly and privately defined method of the given name and parameter count.
-	 * 
-	 * @param clazz - a class to start with.
-	 * @param methodName - the method name, or NULL to skip.
-	 * @param returnType - the expected return type, or NULL to ignore.
-	 * @param params - the expected parameters.
-	 * @return An object that invokes this specific method.
-	 * @throws IllegalStateException If we cannot find this method.
-	 */
-	public static MethodInvoker getTypedMethod(Class<?> clazz, String methodName, Class<?> returnType, Class<?>... params) {
-		for (final Method method : clazz.getDeclaredMethods()) {
-			if ((methodName == null || method.getName().equals(methodName))
-					&& (returnType == null || method.getReturnType().equals(returnType))
-					&& Arrays.equals(method.getParameterTypes(), params)) {
-				method.setAccessible(true);
-
-				return new MethodInvoker() {
-
-					@Override
-					public Object invoke(Object target, Object... arguments) {
-						try {
-							return method.invoke(target, arguments);
-						} catch (Exception e) {
-							throw new RuntimeException("Cannot invoke method " + method, e);
-						}
-					}
-
-				};
-			}
-		}
-
-		// Search in every superclass
-		if (clazz.getSuperclass() != null)
-			return getMethod(clazz.getSuperclass(), methodName, params);
-
-		throw new IllegalStateException(String.format("Unable to find method %s (%s).", methodName, Arrays.asList(params)));
-	}
-
-	/**
-	 * Search for the first publically and privately defined constructor of the given name and parameter count.
-	 * 
-	 * @param className - lookup name of the class, see {@link #getClass(String)}.
-	 * @param params - the expected parameters.
-	 * @return An object that invokes this constructor.
-	 * @throws IllegalStateException If we cannot find this method.
-	 */
-	public static ConstructorInvoker getConstructor(String className, Class<?>... params) {
-		return getConstructor(getClass(className), params);
-	}
-
-	/**
-	 * Search for the first publically and privately defined constructor of the given name and parameter count.
-	 * 
-	 * @param clazz - a class to start with.
-	 * @param params - the expected parameters.
-	 * @return An object that invokes this constructor.
-	 * @throws IllegalStateException If we cannot find this method.
-	 */
-	public static ConstructorInvoker getConstructor(Class<?> clazz, Class<?>... params) {
-		for (final Constructor<?> constructor : clazz.getDeclaredConstructors()) {
-			if (Arrays.equals(constructor.getParameterTypes(), params)) {
-				constructor.setAccessible(true);
-
-				return new ConstructorInvoker() {
-
-					@Override
-					public Object invoke(Object... arguments) {
-						try {
-							return constructor.newInstance(arguments);
-						} catch (Exception e) {
-							throw new RuntimeException("Cannot invoke constructor " + constructor, e);
-						}
-					}
-
-				};
-			}
-		}
-
-		throw new IllegalStateException(String.format("Unable to find constructor for %s (%s).", clazz, Arrays.asList(params)));
-	}
-
-	/**
-	 * Retrieve a class from its full name, without knowing its type on compile time.
-	 * <p>
-	 * This is useful when looking up fields by a NMS or OBC type.
-	 * <p>
-	 * 
-	 * @see {@link #getClass()} for more information.
-	 * @param lookupName - the class name with variables.
-	 * @return The class.
-	 */
-	public static Class<Object> getUntypedClass(String lookupName) {
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		Class<Object> clazz = (Class) getClass(lookupName);
-		return clazz;
-	}
-
-	/**
-	 * Retrieve a class from its full name.
-	 * <p>
-	 * Strings enclosed with curly brackets - such as {TEXT} - will be replaced according to the following table:
-	 * <p>
-	 * <table border="1">
-	 * <tr>
-	 * <th>Variable</th>
-	 * <th>Content</th>
-	 * </tr>
-	 * <tr>
-	 * <td>{nms}</td>
-	 * <td>Actual package name of net.minecraft.server.VERSION</td>
-	 * </tr>
-	 * <tr>
-	 * <td>{obc}</td>
-	 * <td>Actual pacakge name of org.bukkit.craftbukkit.VERSION</td>
-	 * </tr>
-	 * <tr>
-	 * <td>{version}</td>
-	 * <td>The current Minecraft package VERSION, if any.</td>
-	 * </tr>
-	 * </table>
-	 * 
-	 * @param lookupName - the class name with variables.
-	 * @return The looked up class.
-	 * @throws IllegalArgumentException If a variable or class could not be found.
-	 */
-	public static Class<?> getClass(String lookupName) {
-		return getCanonicalClass(expandVariables(lookupName));
-	}
-
-	/**
-	 * Retrieve a class in the net.minecraft.server.VERSION.* package.
-	 * 
-	 * @param name - the name of the class, excluding the package.
-	 * @throws IllegalArgumentException If the class doesn't exist.
-	 */
-	public static Class<?> getMinecraftClass(String name) {
-		return getCanonicalClass(NMS_PREFIX + "." + name);
-	}
-
-	/**
-	 * Retrieve a class in the org.bukkit.craftbukkit.VERSION.* package.
-	 * 
-	 * @param name - the name of the class, excluding the package.
-	 * @throws IllegalArgumentException If the class doesn't exist.
-	 */
-	public static Class<?> getCraftBukkitClass(String name) {
-		return getCanonicalClass(OBC_PREFIX + "." + name);
-	}
-
-	/**
-	 * Retrieve a class by its canonical name.
-	 * 
-	 * @param canonicalName - the canonical name.
-	 * @return The class.
-	 */
-	private static Class<?> getCanonicalClass(String canonicalName) {
-		try {
-			return Class.forName(canonicalName);
-		} catch (ClassNotFoundException e) {
-			throw new IllegalArgumentException("Cannot find " + canonicalName, e);
-		}
-	}
-
-	/**
-	 * Expand variables such as "{nms}" and "{obc}" to their corresponding packages.
-	 * 
-	 * @param name - the full name of the class.
-	 * @return The expanded string.
-	 */
-	private static String expandVariables(String name) {
-		StringBuffer output = new StringBuffer();
-		Matcher matcher = MATCH_VARIABLE.matcher(name);
-
-		while (matcher.find()) {
-			String variable = matcher.group(1);
-			String replacement = "";
-
-			// Expand all detected variables
-			if ("nms".equalsIgnoreCase(variable))
-				replacement = NMS_PREFIX;
-			else if ("obc".equalsIgnoreCase(variable))
-				replacement = OBC_PREFIX;
-			else if ("version".equalsIgnoreCase(variable))
-				replacement = VERSION;
-			else
-				throw new IllegalArgumentException("Unknown variable: " + variable);
-
-			// Assume the expanded variables are all packages, and append a dot
-			if (replacement.length() > 0 && matcher.end() < name.length() && name.charAt(matcher.end()) != '.')
-				replacement += ".";
-			matcher.appendReplacement(output, Matcher.quoteReplacement(replacement));
-		}
-
-		matcher.appendTail(output);
-		return output.toString();
-	}
-}

src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java

@@ -1,522 +0,0 @@
-package com.comphenix.tinyprotocol;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.ChannelPromise;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.comphenix.tinyprotocol.Reflection.FieldAccessor;
-import com.comphenix.tinyprotocol.Reflection.MethodInvoker;
-import com.google.common.collect.Lists;
-import com.google.common.collect.MapMaker;
-import com.mojang.authlib.GameProfile;
-
-/**
- * Represents a very tiny alternative to ProtocolLib.
- * <p>
- * It now supports intercepting packets during login and status ping (such as OUT_SERVER_PING)!
- * 
- * @author Kristian
- */
-public abstract class TinyProtocol {
-	private static final AtomicInteger ID = new AtomicInteger(0);
-
-	// Used in order to lookup a channel
-	private static final MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
-	private static final FieldAccessor<Object> getConnection = Reflection.getField("{nms}.EntityPlayer", "playerConnection", Object.class);
-	private static final FieldAccessor<Object> getManager = Reflection.getField("{nms}.PlayerConnection", "networkManager", Object.class);
-	private static final FieldAccessor<Channel> getChannel = Reflection.getField("{nms}.NetworkManager", Channel.class, 0);
-
-	// Looking up ServerConnection
-	private static final Class<Object> minecraftServerClass = Reflection.getUntypedClass("{nms}.MinecraftServer");
-	private static final Class<Object> serverConnectionClass = Reflection.getUntypedClass("{nms}.ServerConnection");
-	private static final FieldAccessor<Object> getMinecraftServer = Reflection.getField("{obc}.CraftServer", minecraftServerClass, 0);
-	private static final FieldAccessor<Object> getServerConnection = Reflection.getField(minecraftServerClass, serverConnectionClass, 0);
-	private static final MethodInvoker getNetworkMarkers = Reflection.getTypedMethod(serverConnectionClass, null, List.class, serverConnectionClass);
-
-	// Packets we have to intercept
-	private static final Class<?> PACKET_LOGIN_IN_START = Reflection.getMinecraftClass("PacketLoginInStart");
-	private static final FieldAccessor<GameProfile> getGameProfile = Reflection.getField(PACKET_LOGIN_IN_START, GameProfile.class, 0);
-
-	// Speedup channel lookup
-	private Map<String, Channel> channelLookup = new MapMaker().weakValues().makeMap();
-	private Listener listener;
-
-	// Channels that have already been removed
-	private Set<Channel> uninjectedChannels = Collections.newSetFromMap(new MapMaker().weakKeys().<Channel, Boolean>makeMap());
-
-	// List of network markers
-	private List<Object> networkManagers;
-
-	// Injected channel handlers
-	private List<Channel> serverChannels = Lists.newArrayList();
-	private ChannelInboundHandlerAdapter serverChannelHandler;
-	private ChannelInitializer<Channel> beginInitProtocol;
-	private ChannelInitializer<Channel> endInitProtocol;
-
-	// Current handler name
-	private String handlerName;
-
-	protected volatile boolean closed;
-	protected Plugin plugin;
-
-	/**
-	 * Construct a new instance of TinyProtocol, and start intercepting packets for all connected clients and future clients.
-	 * <p>
-	 * You can construct multiple instances per plugin.
-	 * 
-	 * @param plugin - the plugin.
-	 */
-	public TinyProtocol(final Plugin plugin) {
-		this.plugin = plugin;
-
-		// Compute handler name
-		this.handlerName = getHandlerName();
-
-		// Prepare existing players
-		registerBukkitEvents();
-
-		try {
-			registerChannelHandler();
-			registerPlayers(plugin);
-		} catch (IllegalArgumentException ex) {
-			// Damn you, late bind
-			plugin.getLogger().info("[TinyProtocol] Delaying server channel injection due to late bind.");
-
-			new BukkitRunnable() {
-				@Override
-				public void run() {
-					registerChannelHandler();
-					registerPlayers(plugin);
-					plugin.getLogger().info("[TinyProtocol] Late bind injection successful.");
-				}
-			}.runTask(plugin);
-		}
-	}
-
-	private void createServerChannelHandler() {
-		// Handle connected channels
-		endInitProtocol = new ChannelInitializer<Channel>() {
-
-			@Override
-			protected void initChannel(Channel channel) throws Exception {
-				try {
-					// This can take a while, so we need to stop the main thread from interfering
-					synchronized (networkManagers) {
-						// Stop injecting channels
-						if (!closed) {
-							channel.eventLoop().submit(() -> injectChannelInternal(channel));
-						}
-					}
-				} catch (Exception e) {
-					plugin.getLogger().log(Level.SEVERE, "Cannot inject incomming channel " + channel, e);
-				}
-			}
-
-		};
-
-		// This is executed before Minecraft's channel handler
-		beginInitProtocol = new ChannelInitializer<Channel>() {
-
-			@Override
-			protected void initChannel(Channel channel) throws Exception {
-				channel.pipeline().addLast(endInitProtocol);
-			}
-
-		};
-
-		serverChannelHandler = new ChannelInboundHandlerAdapter() {
-	
-			@Override
-			public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-				Channel channel = (Channel) msg;
-
-				// Prepare to initialize ths channel
-				channel.pipeline().addFirst(beginInitProtocol);
-				ctx.fireChannelRead(msg);
-			}
-
-		};
-	}
-
-	/**
-	 * Register bukkit events.
-	 */
-	private void registerBukkitEvents() {
-		listener = new Listener() {
-
-			@EventHandler(priority = EventPriority.LOWEST)
-			public final void onPlayerLogin(PlayerLoginEvent e) {
-				if (closed)
-					return;
-
-				Channel channel = getChannel(e.getPlayer());
-
-				// Don't inject players that have been explicitly uninjected
-				if (!uninjectedChannels.contains(channel)) {
-					injectPlayer(e.getPlayer());
-				}
-			}
-
-			@EventHandler
-			public final void onPluginDisable(PluginDisableEvent e) {
-				if (e.getPlugin().equals(plugin)) {
-					close();
-				}
-			}
-
-		};
-
-		plugin.getServer().getPluginManager().registerEvents(listener, plugin);
-	}
-
-	@SuppressWarnings("unchecked")
-	private void registerChannelHandler() {
-		Object mcServer = getMinecraftServer.get(Bukkit.getServer());
-		Object serverConnection = getServerConnection.get(mcServer);
-		boolean looking = true;
-
-		// We need to synchronize against this list
-		networkManagers = (List<Object>) getNetworkMarkers.invoke(null, serverConnection);
-		createServerChannelHandler();
-
-		// Find the correct list, or implicitly throw an exception
-		for (int i = 0; looking; i++) {
-			List<Object> list = Reflection.getField(serverConnection.getClass(), List.class, i).get(serverConnection);
-
-			for (Object item : list) {
-				if (!ChannelFuture.class.isInstance(item))
-					break;
-
-				// Channel future that contains the server connection
-				Channel serverChannel = ((ChannelFuture) item).channel();
-
-				serverChannels.add(serverChannel);
-				serverChannel.pipeline().addFirst(serverChannelHandler);
-				looking = false;
-			}
-		}
-	}
-
-	private void unregisterChannelHandler() {
-		if (serverChannelHandler == null)
-			return;
-
-		for (Channel serverChannel : serverChannels) {
-			final ChannelPipeline pipeline = serverChannel.pipeline();
-
-			// Remove channel handler
-			serverChannel.eventLoop().execute(new Runnable() {
-
-				@Override
-				public void run() {
-					try {
-						pipeline.remove(serverChannelHandler);
-					} catch (NoSuchElementException e) {
-						// That's fine
-					}
-				}
-
-			});
-		}
-	}
-
-	private void registerPlayers(Plugin plugin) {
-		for (Player player : plugin.getServer().getOnlinePlayers()) {
-			injectPlayer(player);
-		}
-	}
-
-	/**
-	 * Invoked when the server is starting to send a packet to a player.
-	 * <p>
-	 * Note that this is not executed on the main thread.
-	 * 
-	 * @param receiver - the receiving player, NULL for early login/status packets.
-	 * @param channel - the channel that received the packet. Never NULL.
-	 * @param packet - the packet being sent.
-	 * @return The packet to send instead, or NULL to cancel the transmission.
-	 */
-	public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
-		return packet;
-	}
-
-	/**
-	 * Invoked when the server has received a packet from a given player.
-	 * <p>
-	 * Use {@link Channel#remoteAddress()} to get the remote address of the client.
-	 * 
-	 * @param sender - the player that sent the packet, NULL for early login/status packets.
-	 * @param channel - channel that received the packet. Never NULL.
-	 * @param packet - the packet being received.
-	 * @return The packet to recieve instead, or NULL to cancel.
-	 */
-	public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
-		return packet;
-	}
-
-	/**
-	 * Send a packet to a particular player.
-	 * <p>
-	 * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
-	 * 
-	 * @param player - the destination player.
-	 * @param packet - the packet to send.
-	 */
-	public void sendPacket(Player player, Object packet) {
-		sendPacket(getChannel(player), packet);
-	}
-
-	/**
-	 * Send a packet to a particular client.
-	 * <p>
-	 * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
-	 * 
-	 * @param channel - client identified by a channel.
-	 * @param packet - the packet to send.
-	 */
-	public void sendPacket(Channel channel, Object packet) {
-		channel.pipeline().writeAndFlush(packet);
-	}
-
-	/**
-	 * Pretend that a given packet has been received from a player.
-	 * <p>
-	 * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
-	 * 
-	 * @param player - the player that sent the packet.
-	 * @param packet - the packet that will be received by the server.
-	 */
-	public void receivePacket(Player player, Object packet) {
-		receivePacket(getChannel(player), packet);
-	}
-
-	/**
-	 * Pretend that a given packet has been received from a given client.
-	 * <p>
-	 * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
-	 * 
-	 * @param channel - client identified by a channel.
-	 * @param packet - the packet that will be received by the server.
-	 */
-	public void receivePacket(Channel channel, Object packet) {
-		channel.pipeline().context("encoder").fireChannelRead(packet);
-	}
-
-	/**
-	 * Retrieve the name of the channel injector, default implementation is "tiny-" + plugin name + "-" + a unique ID.
-	 * <p>
-	 * Note that this method will only be invoked once. It is no longer necessary to override this to support multiple instances.
-	 * 
-	 * @return A unique channel handler name.
-	 */
-	protected String getHandlerName() {
-		return "tiny-" + plugin.getName() + "-" + ID.incrementAndGet();
-	}
-
-	/**
-	 * Add a custom channel handler to the given player's channel pipeline, allowing us to intercept sent and received packets.
-	 * <p>
-	 * This will automatically be called when a player has logged in.
-	 * 
-	 * @param player - the player to inject.
-	 */
-	public void injectPlayer(Player player) {
-		injectChannelInternal(getChannel(player)).player = player;
-	}
-
-	/**
-	 * Add a custom channel handler to the given channel.
-	 * 
-	 * @param channel - the channel to inject.
-	 * @return The intercepted channel, or NULL if it has already been injected.
-	 */
-	public void injectChannel(Channel channel) {
-		injectChannelInternal(channel);
-	}
-
-	/**
-	 * Add a custom channel handler to the given channel.
-	 * 
-	 * @param channel - the channel to inject.
-	 * @return The packet interceptor.
-	 */
-	private PacketInterceptor injectChannelInternal(Channel channel) {
-		try {
-			PacketInterceptor interceptor = (PacketInterceptor) channel.pipeline().get(handlerName);
-
-			// Inject our packet interceptor
-			if (interceptor == null) {
-				interceptor = new PacketInterceptor();
-				channel.pipeline().addBefore("packet_handler", handlerName, interceptor);
-				uninjectedChannels.remove(channel);
-			}
-
-			return interceptor;
-		} catch (IllegalArgumentException e) {
-			// Try again
-			return (PacketInterceptor) channel.pipeline().get(handlerName);
-		}
-	}
-
-	/**
-	 * Retrieve the Netty channel associated with a player. This is cached.
-	 * 
-	 * @param player - the player.
-	 * @return The Netty channel.
-	 */
-	public Channel getChannel(Player player) {
-		Channel channel = channelLookup.get(player.getName());
-
-		// Lookup channel again
-		if (channel == null) {
-			Object connection = getConnection.get(getPlayerHandle.invoke(player));
-			Object manager = getManager.get(connection);
-
-			channelLookup.put(player.getName(), channel = getChannel.get(manager));
-		}
-
-		return channel;
-	}
-
-	/**
-	 * Uninject a specific player.
-	 * 
-	 * @param player - the injected player.
-	 */
-	public void uninjectPlayer(Player player) {
-		uninjectChannel(getChannel(player));
-	}
-
-	/**
-	 * Uninject a specific channel.
-	 * <p>
-	 * This will also disable the automatic channel injection that occurs when a player has properly logged in.
-	 * 
-	 * @param channel - the injected channel.
-	 */
-	public void uninjectChannel(final Channel channel) {
-		// No need to guard against this if we're closing
-		if (!closed) {
-			uninjectedChannels.add(channel);
-		}
-
-		// See ChannelInjector in ProtocolLib, line 590
-		channel.eventLoop().execute(new Runnable() {
-
-			@Override
-			public void run() {
-				channel.pipeline().remove(handlerName);
-			}
-
-		});
-	}
-
-	/**
-	 * Determine if the given player has been injected by TinyProtocol.
-	 * 
-	 * @param player - the player.
-	 * @return TRUE if it is, FALSE otherwise.
-	 */
-	public boolean hasInjected(Player player) {
-		return hasInjected(getChannel(player));
-	}
-
-	/**
-	 * Determine if the given channel has been injected by TinyProtocol.
-	 * 
-	 * @param channel - the channel.
-	 * @return TRUE if it is, FALSE otherwise.
-	 */
-	public boolean hasInjected(Channel channel) {
-		return channel.pipeline().get(handlerName) != null;
-	}
-
-	/**
-	 * Cease listening for packets. This is called automatically when your plugin is disabled.
-	 */
-	public final void close() {
-		if (!closed) {
-			closed = true;
-
-			// Remove our handlers
-			for (Player player : plugin.getServer().getOnlinePlayers()) {
-				uninjectPlayer(player);
-			}
-
-			// Clean up Bukkit
-			HandlerList.unregisterAll(listener);
-			unregisterChannelHandler();
-		}
-	}
-
-	/**
-	 * Channel handler that is inserted into the player's channel pipeline, allowing us to intercept sent and received packets.
-	 * 
-	 * @author Kristian
-	 */
-	private final class PacketInterceptor extends ChannelDuplexHandler {
-		// Updated by the login event
-		public volatile Player player;
-
-		@Override
-		public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-			// Intercept channel
-			final Channel channel = ctx.channel();
-			handleLoginStart(channel, msg);
-
-			try {
-				msg = onPacketInAsync(player, channel, msg);
-			} catch (Exception e) {
-				plugin.getLogger().log(Level.SEVERE, "Error in onPacketInAsync().", e);
-			}
-
-			if (msg != null) {
-				super.channelRead(ctx, msg);
-			}
-		}
-
-		@Override
-		public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-			try {
-				msg = onPacketOutAsync(player, ctx.channel(), msg);
-			} catch (Exception e) {
-				plugin.getLogger().log(Level.SEVERE, "Error in onPacketOutAsync().", e);
-			}
-
-			if (msg != null) {
-				super.write(ctx, msg, promise);
-			}
-		}
-
-		private void handleLoginStart(Channel channel, Object packet) {
-			if (PACKET_LOGIN_IN_START.isInstance(packet)) {
-				GameProfile profile = getGameProfile.get(packet);
-				channelLookup.put(profile.getName(), channel);
-			}
-		}
-	}
-}

src/main/java/me/purplex/packetevents/Main.java

@@ -1,54 +1,25 @@
 package me.purplex.packetevents;
 
-import com.comphenix.tinyprotocol.*;
-import io.netty.channel.Channel;
-import me.purplex.packetevents.events.packetevent.PacketSendEvent;
+import me.purplex.packetevents.customlistener.injector.PacketInjector;
 import me.purplex.packetevents.events.packetevent.ServerTickEvent;
-import me.purplex.packetevents.events.packetevent.PacketReceiveEvent;
 import me.purplex.packetevents.example.TestExample;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 import org.bukkit.event.*;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class Main extends JavaPlugin implements Listener {
 
     private static Main instance;
-    public TinyProtocol protocol;
+    private static PacketInjector packetInjector;
+
     @Override
     public void onEnable() {
         instance = this;
         Bukkit.getPluginManager().registerEvents(this, this);
-        //PacketEvents.getPacketManager().registerPacketListener(new TestExample());
-        protocol = new TinyProtocol(this) {
-            @Override
-            public Object onPacketInAsync(Player p, Channel channel, Object packet) {
-                if(packet == null)  return super.onPacketInAsync(p, channel, null);
-                if(p == null)  return super.onPacketInAsync(null, channel, packet);
-                if(channel == null)  return super.onPacketInAsync(p, null, packet);
-                String packetName = packet.getClass().getSimpleName();
-                PacketReceiveEvent e = new PacketReceiveEvent(p, packetName, packet);
-                PacketEvents.getPacketManager().callPacketReceiveEvent(e);
-                if(e.isCancelled()) {
-                    return super.onPacketInAsync(null, null, null);
-                }
-                return super.onPacketInAsync(p, channel, packet);
-            }
-
-            @Override
-            public Object onPacketOutAsync(Player p, Channel channel, Object packet) {
-                if(packet == null)  return super.onPacketInAsync(p, channel, null);
-                if(p == null)  return super.onPacketInAsync(null, channel, packet);
-                if(channel == null)  return super.onPacketInAsync(p, null, packet);
-                String packetName = packet.getClass().getSimpleName();
-                PacketSendEvent e = new PacketSendEvent(p, packetName, packet);
-                PacketEvents.getPacketManager().callPacketSendEvent(e);
-                if(e.isCancelled()) {
-                    return super.onPacketOutAsync(null, null, null);
-                }
-                return super.onPacketOutAsync(p, channel, packet);
-            }
-        };
+        packetInjector = new PacketInjector();
+        PacketEvents.getPacketManager().registerPacketListener(new TestExample());
 
         Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, new Runnable() {
             @Override
@@ -56,14 +27,28 @@ public class Main extends JavaPlugin implements Listener {
                 long now = System.currentTimeMillis();
                 PacketEvents.getPacketManager().callServerTickEvent(new ServerTickEvent(now));
             }
-        },  0L, 1L);
+        }, 0L, 1L);
 
     }
+
     @Override
     public void onDisable() {
 
     }
 
+    @EventHandler
+    public void onJoin(PlayerJoinEvent e) {
+        packetInjector.injectPlayer(e.getPlayer());
+
+    }
+
+    @EventHandler
+    public void onQuit(PlayerQuitEvent e) {
+
+        packetInjector.uninjectPlayer(e.getPlayer());
+
+    }
+
     public static Main getInstance() {
         return instance;
     }

src/main/java/me/purplex/packetevents/PacketEvents.java

@@ -1,15 +1,15 @@
 package me.purplex.packetevents;
 
-import com.comphenix.tinyprotocol.Reflection.*;
-import com.comphenix.tinyprotocol.Reflection;
-import io.netty.channel.Channel;
+import me.purplex.packetevents.enums.ServerVersion;
 import me.purplex.packetevents.events.manager.PacketManager;
-import me.purplex.packetevents.packets.Packet;
-import org.bukkit.entity.Player;
 
 public class PacketEvents {
     private static PacketManager packetManager;
 
+    public static ServerVersion getServerVersion() {
+        return ServerVersion.getVersion();
+    }
+
 
     public static PacketManager getPacketManager() {
         if (packetManager == null) {
@@ -17,42 +17,4 @@ public class PacketEvents {
         }
         return packetManager;
     }
-
-
-    public void sendPacket(Player player, Object packet) {
-        Main.getInstance().protocol.sendPacket(player, packet);
-    }
-
-    public void sendPacket(Channel channel, Object packet) {
-        Main.getInstance().protocol.sendPacket(channel, packet);
-    }
-
-    public static Class<?> getPacketCass(String packet) {
-        return Reflection.getClass("{nms}." + packet);
-    }
-
-
-    public static void sendVelocity(Player player, double x, double y, double z) {
-        Class<?> velocityClass = getPacketCass(Packet.Server.ENTITY_VELOCITY);
-        FieldAccessor<Integer> entityIdField = Reflection.getField(velocityClass, int.class, 0);
-        FieldAccessor<Integer> fieldX = Reflection.getField(velocityClass, int.class, 1);
-        FieldAccessor<Integer> fieldY = Reflection.getField(velocityClass, int.class, 2);
-        FieldAccessor<Integer> fieldZ = Reflection.getField(velocityClass, int.class, 3);
-
-        Object velocityObject = null;
-        try {
-            velocityObject = velocityClass.newInstance();
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        fieldX.set(velocityObject, (int) (x * 8000));
-        fieldY.set(velocityObject, (int) (y * 8000));
-        fieldZ.set(velocityObject, (int) (z * 8000));
-
-        entityIdField.set(velocityObject, player.getEntityId());
-        Main.getInstance().protocol.sendPacket(player, velocityObject);
-    }
 }

src/main/java/me/purplex/packetevents/customlistener/injector/PacketInjector.java

@@ -0,0 +1,118 @@
+package me.purplex.packetevents.customlistener.injector;
+
+
+import io.netty.channel.*;
+import me.purplex.packetevents.PacketEvents;
+import me.purplex.packetevents.enums.ServerVersion;
+import me.purplex.packetevents.events.packetevent.*;
+import org.bukkit.entity.Player;
+
+
+public class PacketInjector {
+    private final static ServerVersion version = ServerVersion.getVersion();
+
+    public void injectPlayer(Player player)  {
+        ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
+            @Override
+            public void channelRead(ChannelHandlerContext ctx, Object packet) {
+                String packetName = packet.getClass().getSimpleName();
+                PacketReceiveEvent e = new PacketReceiveEvent(player, packetName, packet);
+                PacketEvents.getPacketManager().callPacketReceiveEvent(e);
+                if(e.isCancelled()) {
+                    return;
+                }
+                try {
+                    super.channelRead(ctx, packet);
+                } catch (Exception exception) {
+                    exception.printStackTrace();
+                }
+            }
+
+            @Override
+            public void write(ChannelHandlerContext ctx, Object packet, ChannelPromise promise)  {
+                String packetName = packet.getClass().getSimpleName();
+                PacketSendEvent e = new PacketSendEvent(player, packetName, packet);
+                PacketEvents.getPacketManager().callPacketSendEvent(e);
+                if(e.isCancelled()) {
+                    return;
+                }
+                try {
+                    super.write(ctx, packet, promise);
+                } catch (Exception exception) {
+                    exception.printStackTrace();
+                }
+            }
+        };
+        Channel channel = getChannel(player);
+        ChannelPipeline pipeline = channel.pipeline();
+        pipeline.addBefore("packet_handler", player.getName(), channelDuplexHandler);
+    }
+
+    public void uninjectPlayer(Player player) {
+        Channel channel = getChannel(player);
+        channel.eventLoop().submit(()->{
+           channel.pipeline().remove(player.getName());
+           return null;
+        });
+    }
+
+    public Channel getChannel(Player player) {
+        Channel channel = null;
+        if (version == ServerVersion.v_1_8) {
+            net.minecraft.server.v1_8_R1.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            try {
+                channel = (Channel) networkManager.getClass().getField("i").get(networkManager);
+            } catch (IllegalAccessException | NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+        else if(version == ServerVersion.v_1_8_3) {
+            net.minecraft.server.v1_8_R2.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.k;
+        }
+        else if(version == ServerVersion.v_1_8_8) {
+            net.minecraft.server.v1_8_R3.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else if(version == ServerVersion.v_1_9) {
+            net.minecraft.server.v1_9_R1.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else if(version == ServerVersion.v_1_9_4) {
+            net.minecraft.server.v1_9_R2.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else if(version == ServerVersion.v_1_10) {
+            net.minecraft.server.v1_10_R1.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else if(version == ServerVersion.v_1_11) {
+            net.minecraft.server.v1_11_R1.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else if(version == ServerVersion.v_1_12) {
+            net.minecraft.server.v1_12_R1.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else if(version == ServerVersion.v_1_13) {
+            net.minecraft.server.v1_13_R1.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else if(version == ServerVersion.v_1_13_2) {
+            net.minecraft.server.v1_13_R2.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else if(version == ServerVersion.v_1_14) {
+            net.minecraft.server.v1_14_R1.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else if(version == ServerVersion.v_1_15) {
+            net.minecraft.server.v1_15_R1.NetworkManager networkManager = ((org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer) player).getHandle().playerConnection.networkManager;
+            channel = networkManager.channel;
+        }
+        else {
+            System.err.println("Version unsupported, please contact purplex#0001 and tell him what version your server is running on! Make sure you are using paperspigot or spigot.");
+        }
+        return channel;
+    }
+}

src/main/java/me/purplex/packetevents/enums/EntityUseAction.java

@@ -1,5 +1,5 @@
 package me.purplex.packetevents.enums;
 
 public enum EntityUseAction {
-    INTERACT, INTERACT_AT, ATTACK, INVALID, WRONG_PACKET;
+    INTERACT, INTERACT_AT, ATTACK, INVALID;
 }

src/main/java/me/purplex/packetevents/enums/PlayerAction.java

@@ -17,5 +17,5 @@ public enum PlayerAction {
 
     OPEN_INVENTORY,
 
-    START_FALL_FLYING, WRONG_PACKET;
+    START_FALL_FLYING;
 }

src/main/java/me/purplex/packetevents/enums/ServerVersion.java

@@ -0,0 +1,24 @@
+package me.purplex.packetevents.enums;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.bukkit.Bukkit;
+
+
+public enum ServerVersion
+{
+    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,
+    ERROR;
+
+    public static ServerVersion getVersion() {
+        ServerVersion[] vals = values();
+        ArrayUtils.reverse(vals);
+        for(ServerVersion val : vals) {
+            String valName = val.name().substring(2).replace("_", ".");
+            if(Bukkit.getBukkitVersion().contains(valName)) {
+                return val;
+            }
+        }
+        return ERROR;
+    }
+}
+

src/main/java/me/purplex/packetevents/events/eventmanager/PacketEventManager.java

@@ -9,11 +9,11 @@ import java.util.LinkedList;
 
 public interface PacketEventManager {
     public LinkedList<PacketListener> packetListeners = new LinkedList<>();
-    public LinkedList<PacketReceiveEvent> packetReiveEvents = new LinkedList<>();
     public void callPacketReceiveEvent(PacketReceiveEvent e);
     public void callPacketSendEvent(PacketSendEvent e);
 
     public void registerPacketListener(PacketListener e);
+    public void unregisterPacketListener(PacketListener e);
 
     public void callServerTickEvent(ServerTickEvent e);
 

src/main/java/me/purplex/packetevents/events/manager/PacketManager.java

@@ -6,7 +6,6 @@ import me.purplex.packetevents.events.handler.PacketHandler;
 import me.purplex.packetevents.events.listener.PacketListener;
 import me.purplex.packetevents.events.packetevent.PacketReceiveEvent;
 import me.purplex.packetevents.events.packetevent.PacketSendEvent;
-
 import java.lang.reflect.Method;
 
 public class PacketManager implements PacketEventManager {
@@ -52,6 +51,12 @@ public class PacketManager implements PacketEventManager {
         this.packetListeners.add(e);
     }
 
+    @Override
+    public void unregisterPacketListener(PacketListener e) {
+        this.packetListeners.remove(e);
+    }
+
+
     @Override
     public void callServerTickEvent(ServerTickEvent e) {
         for (PacketListener listener : this.packetListeners) {

src/main/java/me/purplex/packetevents/events/packetevent/PacketReceiveEvent.java

@@ -1,29 +1,21 @@
 package me.purplex.packetevents.events.packetevent;
 
-import com.comphenix.tinyprotocol.Reflection;
-import com.comphenix.tinyprotocol.Reflection.*;
-import me.purplex.packetevents.enums.EntityUseAction;
-import me.purplex.packetevents.enums.PlayerAction;
-import me.purplex.packetevents.enums.PlayerDigType;
-import me.purplex.packetevents.events.PacketEvent;
-import me.purplex.packetevents.packets.Packet;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.*;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
+import me.purplex.packetevents.PacketEvents;
+import me.purplex.packetevents.enums.ServerVersion;
+import me.purplex.packetevents.events.PacketEvent;
+import org.bukkit.entity.Player;
 
 public class PacketReceiveEvent extends PacketEvent {
-
-    private Player player;
-    private String name;
-    private Object packet;
-    private long timestamp;
+    private final Player player;
+    private final String name;
+    private final Object packet;
+    private final long timestamp;
     private boolean cancelled;
+    public final ServerVersion version;
 
     public PacketReceiveEvent(Player player, String packetName, Object packet) {
+        this.version = PacketEvents.getServerVersion();
         this.player = player;
         this.name = packetName;
         this.packet = packet;
@@ -31,9 +23,9 @@ public class PacketReceiveEvent extends PacketEvent {
         this.cancelled = false;
     }
 
-
     /**
      * Get the player sending the packet
+     *
      * @return
      */
     public Player getPlayer() {
@@ -41,7 +33,8 @@ public class PacketReceiveEvent extends PacketEvent {
     }
 
     /**
-     * Get the packet object's class name, aka. Packet Name
+     * Get the packet's name (NMS packet class simple name)
+     *
      * @return
      */
     public String getPacketName() {
@@ -50,7 +43,8 @@ public class PacketReceiveEvent extends PacketEvent {
 
     /**
      * Get the raw packet object
-     * @return
+     *
+     * @return packet
      */
     public Object getPacket() {
         return this.packet;
@@ -58,6 +52,7 @@ public class PacketReceiveEvent extends PacketEvent {
 
     /**
      * The time the packet was received(ms)
+     *
      * @return
      */
     public long getTimestamp() {
@@ -66,6 +61,7 @@ public class PacketReceiveEvent extends PacketEvent {
 
     /**
      * Cancel the packet
+     *
      * @param cancelled
      */
     public void setCancelled(boolean cancelled) {
@@ -74,199 +70,10 @@ public class PacketReceiveEvent extends PacketEvent {
 
     /**
      * Returns if the packet has been cancelled
-     * @return
+     *
+     * @return cancelled
      */
     public boolean isCancelled() {
         return cancelled;
     }
-
-    /**
-     * Get the type of dig
-     * PacketPlayInBlockDig
-     * @return
-     */
-    public PlayerDigType getPlayerDigType() {
-        String c = String.valueOf(Reflection.getMethod(packet.getClass(), "c").invoke(packet));
-        PlayerDigType type;
-        try {
-            type = PlayerDigType.valueOf(c);
-        } catch (IllegalArgumentException e) {
-            type = PlayerDigType.WRONG_PACKET;
-        }
-        return type;
-    }
-
-    /**
-     * Get the entity interact action
-     * PacketPlayInUseEntity
-     * @return
-     */
-    public EntityUseAction getEntityUseAction() {
-        Object action = null;
-        try {
-            action = FieldUtils.readDeclaredField(packet, "action", true);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        for (EntityUseAction a : EntityUseAction.values()) {
-            if (a.toString().equalsIgnoreCase(action.toString())) {
-                return a;
-            }
-        }
-        return EntityUseAction.WRONG_PACKET;
-    }
-
-    /**
-     * Get the PlayerAction
-     * PacketPlayInEntityAction
-     * @return
-     */
-    public PlayerAction getPlayerAction() {
-        Object animation = null;
-        try {
-            animation = FieldUtils.readDeclaredField(packet, "animation", true);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        for (PlayerAction a : PlayerAction.values()) {
-            if (a.toString().equalsIgnoreCase(animation.toString())) {
-                return a;
-            }
-        }
-        return PlayerAction.WRONG_PACKET;
-    }
-
-    /**
-     * Entity you interacted with
-     * PacketPlayInUseEntity
-     * @return
-     */
-    public Entity getInteractedEntity() {
-        try {
-            FieldAccessor<Integer> field = Reflection.getField(packet.getClass(), int.class, 0);
-            int id = field.get(packet);
-            for (Entity e : player.getWorld().getEntities()) {
-                if (e.getEntityId() == id) {
-                    return e;
-                }
-            }
-            for(World w : Bukkit.getWorlds()) {
-                for(Entity e  : w.getEntities()) {
-                    if(e.getEntityId() == id) {
-                        return e;
-                    }
-                }
-            }
-        } catch (Exception ex) {
-        }
-        return null;
-    }
-
-    /**
-     * Get the string message
-     * PacketPlayInChat
-     * @return
-     */
-    public String getChatPacketMessage() {
-        FieldAccessor<String> field = Reflection.getField(packet.getClass(), String.class, 0);
-        String message = field.get(packet);
-        return message;
-    }
-
-
-    public int getPing() {
-        int ping = 0;
-        try {
-            Object entityPlayer = player.getClass().getMethod("getHandle").invoke(player);
-            ping = (int) entityPlayer.getClass().getField("ping").get(entityPlayer);
-        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
-                | SecurityException | NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-        return ping;
-    }
-
-    /**
-     * Get the motX variable in the player's CraftPlayer class
-     * using Reflection
-     * @return
-     */
-    public double getMotionX() {
-        Reflection.MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
-        Object entityplayer = getPlayerHandle.invoke(player);
-        Field field = null;
-        try {
-            field = entityplayer.getClass().getField("motX");
-        } catch (NoSuchFieldException e1) {
-            e1.printStackTrace();
-        } catch (SecurityException e1) {
-            e1.printStackTrace();
-        }
-        double mot = 0.0D;
-        try {
-            mot = field.getDouble(entityplayer);
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        return mot;
-    }
-
-    /**
-     * Get the motY variable in the player's CraftPlayer class
-     * using Reflection
-     * @return
-     */
-    public double getMotionY() {
-        Reflection.MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
-        Object entityplayer = getPlayerHandle.invoke(player);
-        Field field = null;
-        try {
-            field = entityplayer.getClass().getField("motY");
-        } catch (NoSuchFieldException e1) {
-            e1.printStackTrace();
-        } catch (SecurityException e1) {
-            e1.printStackTrace();
-        }
-        double mot = 0.0D;
-        try {
-            mot = field.getDouble(entityplayer);
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        return mot;
-    }
-
-    /**
-     * Get the motZ variable in the player's CraftPlayer class
-     * using Reflection
-     * @return
-     */
-    public double getMotionZ() {
-        Reflection.MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
-        Object entityplayer = getPlayerHandle.invoke(player);
-        Field field = null;
-        try {
-            field = entityplayer.getClass().getField("motZ");
-        } catch (NoSuchFieldException e1) {
-            e1.printStackTrace();
-        } catch (SecurityException e1) {
-            e1.printStackTrace();
-        }
-        double mot = 0.0D;
-        try {
-            mot = field.getDouble(entityplayer);
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        return mot;
-    }
 }

src/main/java/me/purplex/packetevents/events/packetevent/PacketSendEvent.java

@@ -1,24 +1,20 @@
 package me.purplex.packetevents.events.packetevent;
 
-import com.comphenix.tinyprotocol.Reflection;
-import com.comphenix.tinyprotocol.Reflection.*;
+import me.purplex.packetevents.PacketEvents;
+import me.purplex.packetevents.enums.ServerVersion;
 import me.purplex.packetevents.events.PacketEvent;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-
 public class PacketSendEvent extends PacketEvent {
-    private Player player;
-    private String name;
-    private Object packet;
-    private long timestamp;
+    private final Player player;
+    private final String name;
+    private final Object packet;
+    private final long timestamp;
     private boolean cancelled;
+    public final ServerVersion version;
 
     public PacketSendEvent(Player player, String packetName, Object packet) {
+        this.version = PacketEvents.getServerVersion();
         this.player = player;
         this.name = packetName;
         this.packet = packet;
@@ -35,10 +31,17 @@ public class PacketSendEvent extends PacketEvent {
         return this.name;
     }
 
+    /**
+     * Get the raw packet object
+     *
+     * @return nmsPacket
+     */
     public Object getPacket() {
         return this.packet;
     }
 
+
+
     public long getTimestamp() {
         return timestamp;
     }
@@ -52,165 +55,216 @@ public class PacketSendEvent extends PacketEvent {
         return cancelled;
     }
 
+
+/*
     /**
-     * Get Velocity entity
-     * PacketPlayOutEntityVelocity
-     *
-     * @return
-     */
-    public Entity getVelocityEntity() {
-        //WorldServer s;
-        FieldAccessor<Integer> field = Reflection.getField(packet.getClass(), int.class, 0);
-        int id = field.get(packet);
-        for (World w : Bukkit.getWorlds()) {
-            for (Entity e : w.getEntities()) {
-                if (e.getEntityId() == id) {
-                    return e;
-                }
-            }
+     * Get the player's ping in the EntityPlayer's class
+     * @return ping
+     * @throws VersionNotFoundException
+
+    public int getPing() throws VersionNotFoundException {
+        int ping;
+        if (version == ServerVersion.v_1_8) {
+            net.minecraft.server.v1_8_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        } else if (version == ServerVersion.v_1_8_3) {
+            net.minecraft.server.v1_8_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        } else if (version == ServerVersion.v_1_8_8) {
+            net.minecraft.server.v1_8_R3.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        } else if (version == ServerVersion.v_1_9) {
+            net.minecraft.server.v1_9_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        } else if (version == ServerVersion.v_1_9_4) {
+            net.minecraft.server.v1_9_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        } else if (version == ServerVersion.v_1_10_2) {
+            net.minecraft.server.v1_10_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        } else if (version == ServerVersion.v_1_11_1 || version == ServerVersion.v_1_11_2) {
+            net.minecraft.server.v1_11_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        }  else if (version == ServerVersion.v_1_12_1 || version == ServerVersion.v_1_12_2) {
+            net.minecraft.server.v1_12_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        } else if (version == ServerVersion.v_1_13) {
+            net.minecraft.server.v1_13_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
         }
-        return null;
-    }
-
-
-    /**
-     * Get X velocity
-     * PacketPlayOutEntityVelocity
-     *
-     * @return x
-     */
-    public double getVelocityX() {
-        FieldAccessor<Integer> field = Reflection.getField(packet.getClass(), int.class, 1);
-        int i = field.get(packet);
-        double x = i / 8000.0;
-        return x;
-    }
-
-    /**
-     * Get Y velocity
-     * PacketPlayOutEntityVelocity
-     *
-     * @return y
-     */
-    public double getVelocityY() {
-        FieldAccessor<Integer> field = Reflection.getField(packet.getClass(), int.class, 2);
-        int i = field.get(packet);
-        double y = i / 8000.0;
-        return y;
-    }
-
-    /**
-     * Get Z velocity
-     * PacketPlayOutEntityVelocity
-     *
-     * @return z
-     */
-    public double getVelocityZ() {
-        FieldAccessor<Integer> field = Reflection.getField(packet.getClass(), int.class, 3);
-        int i = field.get(packet);
-        double z = i / 8000.0;
-        return z;
-    }
-
-
-    public int getPing() {
-        int ping = 0;
-        try {
-            Object entityPlayer = player.getClass().getMethod("getHandle").invoke(player);
-            ping = (int) entityPlayer.getClass().getField("ping").get(entityPlayer);
-        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
-                | SecurityException | NoSuchFieldException e) {
-            e.printStackTrace();
+        else if(version == ServerVersion.v_1_13_2) {
+            net.minecraft.server.v1_13_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        }
+        else if (version == ServerVersion.v_1_14 || version == ServerVersion.v_1_14_1) {
+            net.minecraft.server.v1_14_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        } else if (version == ServerVersion.v_1_15_1) {
+            net.minecraft.server.v1_15_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer)player).getHandle();
+            ping = ePlayer.ping;
+        } else {
+            throw new VersionNotFoundException();
         }
         return ping;
     }
 
-    /**
-     * Get the motX variable in the player's CraftPlayer class
-     * using Reflection
-     *
-     * @return
-     */
-    public double getMotionX() {
-        Reflection.MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
-        Object entityplayer = getPlayerHandle.invoke(player);
-        Field field = null;
-        try {
-            field = entityplayer.getClass().getField("motX");
-        } catch (NoSuchFieldException e1) {
-            e1.printStackTrace();
-        } catch (SecurityException e1) {
-            e1.printStackTrace();
-        }
-        double mot = 0.0D;
-        try {
-            mot = field.getDouble(entityplayer);
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
 
-        return mot;
+    /**
+     * Get the motX variable in the EntityPlayer class
+     *
+     * @return motX
+
+    public double getMotX() throws VersionNotFoundException {
+        double motX;
+        if (version == ServerVersion.v_1_8) {
+            net.minecraft.server.v1_8_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        } else if (version == ServerVersion.v_1_8_3) {
+            net.minecraft.server.v1_8_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        } else if (version == ServerVersion.v_1_8_8) {
+            net.minecraft.server.v1_8_R3.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        } else if (version == ServerVersion.v_1_9) {
+            net.minecraft.server.v1_9_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        } else if (version == ServerVersion.v_1_9_4) {
+            net.minecraft.server.v1_9_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        } else if (version == ServerVersion.v_1_10_2) {
+            net.minecraft.server.v1_10_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        } else if (version == ServerVersion.v_1_11_1 || version == ServerVersion.v_1_11_2) {
+            net.minecraft.server.v1_11_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        }  else if (version == ServerVersion.v_1_12_1 || version == ServerVersion.v_1_12_2) {
+            net.minecraft.server.v1_12_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        } else if (version == ServerVersion.v_1_13) {
+            net.minecraft.server.v1_13_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        }
+        else if(version == ServerVersion.v_1_13_2) {
+            net.minecraft.server.v1_13_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.motX;
+        }
+        else if (version == ServerVersion.v_1_14 || version == ServerVersion.v_1_14_1) {
+            net.minecraft.server.v1_14_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.getMot().getX();
+        } else if (version == ServerVersion.v_1_15_1) {
+            net.minecraft.server.v1_15_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer)player).getHandle();
+            motX = ePlayer.getMot().getX();
+        } else {
+            throw new VersionNotFoundException();
+        }
+        return motX;
+    }
+
+
+
+    /**
+     * Get the motY variable in the EntityPlayer class
+     *
+     * @return motY
+
+    public double getMotY() throws VersionNotFoundException {
+        double motY;
+        if (version == ServerVersion.v_1_8) {
+            net.minecraft.server.v1_8_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        } else if (version == ServerVersion.v_1_8_3) {
+            net.minecraft.server.v1_8_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        } else if (version == ServerVersion.v_1_8_8) {
+            net.minecraft.server.v1_8_R3.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        } else if (version == ServerVersion.v_1_9) {
+            net.minecraft.server.v1_9_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        } else if (version == ServerVersion.v_1_9_4) {
+            net.minecraft.server.v1_9_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        } else if (version == ServerVersion.v_1_10_2) {
+            net.minecraft.server.v1_10_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        } else if (version == ServerVersion.v_1_11_1 || version == ServerVersion.v_1_11_2) {
+            net.minecraft.server.v1_11_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        }  else if (version == ServerVersion.v_1_12_1 || version == ServerVersion.v_1_12_2) {
+            net.minecraft.server.v1_12_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        } else if (version == ServerVersion.v_1_13) {
+            net.minecraft.server.v1_13_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        }
+        else if(version == ServerVersion.v_1_13_2) {
+            net.minecraft.server.v1_13_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.motY;
+        }
+        else if (version == ServerVersion.v_1_14 || version == ServerVersion.v_1_14_1) {
+            net.minecraft.server.v1_14_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.getMot().getY();
+        } else if (version == ServerVersion.v_1_15_1) {
+            net.minecraft.server.v1_15_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer)player).getHandle();
+            motY = ePlayer.getMot().getY();
+        } else {
+            throw new VersionNotFoundException();
+        }
+        return motY;
     }
 
     /**
-     * Get the motY variable in the player's CraftPlayer class
-     * using Reflection
+     * Get the motZ variable in the EntityPlayer class
      *
-     * @return
-     */
-    public double getMotionY() {
-        Reflection.MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
-        Object entityplayer = getPlayerHandle.invoke(player);
-        Field field = null;
-        try {
-            field = entityplayer.getClass().getField("motY");
-        } catch (NoSuchFieldException e1) {
-            e1.printStackTrace();
-        } catch (SecurityException e1) {
-            e1.printStackTrace();
-        }
-        double mot = 0.0D;
-        try {
-            mot = field.getDouble(entityplayer);
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+     * @return motZ
 
-        return mot;
+    public double getMotZ() throws VersionNotFoundException {
+        double motZ;
+        if (version == ServerVersion.v_1_8) {
+            net.minecraft.server.v1_8_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        } else if (version == ServerVersion.v_1_8_3) {
+            net.minecraft.server.v1_8_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        } else if (version == ServerVersion.v_1_8_8) {
+            net.minecraft.server.v1_8_R3.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        } else if (version == ServerVersion.v_1_9) {
+            net.minecraft.server.v1_9_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        } else if (version == ServerVersion.v_1_9_4) {
+            net.minecraft.server.v1_9_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        } else if (version == ServerVersion.v_1_10_2) {
+            net.minecraft.server.v1_10_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        } else if (version == ServerVersion.v_1_11_1 || version == ServerVersion.v_1_11_2) {
+            net.minecraft.server.v1_11_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        }  else if (version == ServerVersion.v_1_12_1 || version == ServerVersion.v_1_12_2) {
+            net.minecraft.server.v1_12_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        } else if (version == ServerVersion.v_1_13) {
+            net.minecraft.server.v1_13_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        }
+        else if(version == ServerVersion.v_1_13_2) {
+            net.minecraft.server.v1_13_R2.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.motZ;
+        }
+        else if (version == ServerVersion.v_1_14 || version == ServerVersion.v_1_14_1) {
+            net.minecraft.server.v1_14_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.getMot().getZ();
+        } else if (version == ServerVersion.v_1_15_1) {
+            net.minecraft.server.v1_15_R1.EntityPlayer ePlayer = ((org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer)player).getHandle();
+            motZ = ePlayer.getMot().getZ();
+        } else {
+            throw new VersionNotFoundException();
+        }
+        return motZ;
     }
+    */
 
-    /**
-     * Get the motZ variable in the player's CraftPlayer class
-     * using Reflection
-     *
-     * @return
-     */
-    public double getMotionZ() {
-        Reflection.MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
-        Object entityplayer = getPlayerHandle.invoke(player);
-        Field field = null;
-        try {
-            field = entityplayer.getClass().getField("motZ");
-        } catch (NoSuchFieldException e1) {
-            e1.printStackTrace();
-        } catch (SecurityException e1) {
-            e1.printStackTrace();
-        }
-        double mot = 0.0D;
-        try {
-            mot = field.getDouble(entityplayer);
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        return mot;
-    }
 
 }
 

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/WrappedPacketPlayInUseEntity.java

@@ -0,0 +1,99 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_10.WrappedPacketPlayInUseEntity_1_10;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_11.WrappedPacketPlayInUseEntity_1_11;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_12.WrappedPacketPlayInUseEntity_1_12;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_13.WrappedPacketPlayInUseEntity_1_13;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_13_2.WrappedPacketPlayInUseEntity_1_13_2;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_14.WrappedPacketPlayInUseEntity_1_14;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_15.WrappedPacketPlayInUseEntity_1_15;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_8.WrappedPacketPlayInUseEntity_1_8;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_8_3.WrappedPacketPlayInUseEntity_1_8_3;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_8_8.WrappedPacketPlayInUseEntity_1_8_8;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_9.WrappedPacketPlayInUseEntity_1_9;
+import me.purplex.packetevents.events.packetevent.packet.impl.in._1_9_4.WrappedPacketPlayInUseEntity_1_9_4;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        if (version == ServerVersion.v_1_8) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_8(packet).getEntity();
+        } else if (version == ServerVersion.v_1_8_3) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_8_3(packet).getEntity();
+        } else if (version == ServerVersion.v_1_8_8) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_8_8(packet).getEntity();
+        } else if (version == ServerVersion.v_1_9) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_9(packet).getEntity();
+        } else if (version == ServerVersion.v_1_9_4) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_9_4(packet).getEntity();
+        } else if (version == ServerVersion.v_1_10) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_10(packet).getEntity();
+        } else if (version == ServerVersion.v_1_11) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_11(packet).getEntity();
+        } else if (version == ServerVersion.v_1_12) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_12(packet).getEntity();
+        } else if (version == ServerVersion.v_1_13) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_13(packet).getEntity();
+        } else if (version == ServerVersion.v_1_13_2) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_13_2(packet).getEntity();
+        } else if (version == ServerVersion.v_1_14) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_14(packet).getEntity();
+        } else if (version == ServerVersion.v_1_15) {
+            this.entity = new WrappedPacketPlayInUseEntity_1_15(packet).getEntity();
+        }
+    }
+
+    private void setupAction() {
+        if (version == ServerVersion.v_1_8) {
+            this.action = new WrappedPacketPlayInUseEntity_1_8(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_8_3) {
+            this.action = new WrappedPacketPlayInUseEntity_1_8_3(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_8_8) {
+            this.action = new WrappedPacketPlayInUseEntity_1_8_8(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_9) {
+            this.action = new WrappedPacketPlayInUseEntity_1_9(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_9_4) {
+            this.action = new WrappedPacketPlayInUseEntity_1_9_4(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_10) {
+            this.action = new WrappedPacketPlayInUseEntity_1_10(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_11) {
+            this.action = new WrappedPacketPlayInUseEntity_1_11(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_12) {
+            this.action = new WrappedPacketPlayInUseEntity_1_12(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_13) {
+            this.action = new WrappedPacketPlayInUseEntity_1_13(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_13_2) {
+            this.action = new WrappedPacketPlayInUseEntity_1_13_2(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_14) {
+            this.action = new WrappedPacketPlayInUseEntity_1_14(packet).getEntityUseAction();
+        } else if (version == ServerVersion.v_1_15) {
+            this.action = new WrappedPacketPlayInUseEntity_1_15(packet).getEntityUseAction();
+        }
+    }
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_10/WrappedPacketPlayInUseEntity_1_10.java

@@ -0,0 +1,54 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_10;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_10 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_10(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        net.minecraft.server.v1_10_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_10_R1.PacketPlayInUseEntity) getRawPacket();
+        net.minecraft.server.v1_10_R1.WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            org.bukkit.craftbukkit.v1_10_R1.CraftWorld craftWorld = (org.bukkit.craftbukkit.v1_10_R1.CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_10_R1.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        net.minecraft.server.v1_10_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_10_R1.PacketPlayInUseEntity) getRawPacket();
+        String name = packet.a().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_11/WrappedPacketPlayInUseEntity_1_11.java

@@ -0,0 +1,54 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_11;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_11 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_11(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        net.minecraft.server.v1_11_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_11_R1.PacketPlayInUseEntity) getRawPacket();
+        net.minecraft.server.v1_11_R1.WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            org.bukkit.craftbukkit.v1_11_R1.CraftWorld craftWorld = (org.bukkit.craftbukkit.v1_11_R1.CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_11_R1.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        net.minecraft.server.v1_11_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_11_R1.PacketPlayInUseEntity) getRawPacket();
+        String name = packet.a().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_12/WrappedPacketPlayInUseEntity_1_12.java

@@ -0,0 +1,54 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_12;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_12 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_12(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        net.minecraft.server.v1_12_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_12_R1.PacketPlayInUseEntity) getRawPacket();
+        net.minecraft.server.v1_12_R1.WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            org.bukkit.craftbukkit.v1_12_R1.CraftWorld craftWorld = (org.bukkit.craftbukkit.v1_12_R1.CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_12_R1.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        net.minecraft.server.v1_12_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_12_R1.PacketPlayInUseEntity) getRawPacket();
+        String name = packet.a().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_13/WrappedPacketPlayInUseEntity_1_13.java

@@ -0,0 +1,57 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_13;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import net.minecraft.server.v1_13_R1.PacketPlayInUseEntity;
+import net.minecraft.server.v1_13_R1.WorldServer;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_13 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_13(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        PacketPlayInUseEntity packet = (PacketPlayInUseEntity) getRawPacket();
+        WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            CraftWorld craftWorld = (CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_13_R1.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        PacketPlayInUseEntity packet = (PacketPlayInUseEntity) getRawPacket();
+        String name = packet.b().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_13_2/WrappedPacketPlayInUseEntity_1_13_2.java

@@ -0,0 +1,56 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_13_2;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
+import org.bukkit.entity.Entity;
+import net.minecraft.server.v1_13_R2.PacketPlayInUseEntity;
+import net.minecraft.server.v1_13_R2.WorldServer;
+public class WrappedPacketPlayInUseEntity_1_13_2 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_13_2(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        PacketPlayInUseEntity packet = (net.minecraft.server.v1_13_R2.PacketPlayInUseEntity) getRawPacket();
+        WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            CraftWorld craftWorld = (CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_13_R2.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        PacketPlayInUseEntity packet = (PacketPlayInUseEntity) getRawPacket();
+        String name = packet.b().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_14/WrappedPacketPlayInUseEntity_1_14.java

@@ -0,0 +1,56 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_14;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import net.minecraft.server.v1_14_R1.PacketPlayInUseEntity;
+import net.minecraft.server.v1_14_R1.WorldServer;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_14 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_14(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        PacketPlayInUseEntity packet = (PacketPlayInUseEntity) getRawPacket();
+        WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            org.bukkit.craftbukkit.v1_14_R1.CraftWorld craftWorld = (org.bukkit.craftbukkit.v1_14_R1.CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_14_R1.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        PacketPlayInUseEntity packet = (PacketPlayInUseEntity) getRawPacket();
+        String name = packet.b().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_15/WrappedPacketPlayInUseEntity_1_15.java

@@ -0,0 +1,57 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_15;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import net.minecraft.server.v1_15_R1.PacketPlayInUseEntity;
+import net.minecraft.server.v1_15_R1.WorldServer;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_15 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_15(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        PacketPlayInUseEntity packet = (PacketPlayInUseEntity) getRawPacket();
+        WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            CraftWorld craftWorld = (CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_15_R1.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        PacketPlayInUseEntity packet = (PacketPlayInUseEntity) getRawPacket();
+        String name = packet.b().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_8/WrappedPacketPlayInUseEntity_1_8.java

@@ -0,0 +1,57 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_8;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_8 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_8(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        if (version == ServerVersion.v_1_8) {
+            net.minecraft.server.v1_8_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_8_R1.PacketPlayInUseEntity) getRawPacket();
+            net.minecraft.server.v1_8_R1.WorldServer worldServer = null;
+            for (World bukkitWorld : Bukkit.getWorlds()) {
+                org.bukkit.craftbukkit.v1_8_R1.CraftWorld craftWorld = (org.bukkit.craftbukkit.v1_8_R1.CraftWorld) bukkitWorld;
+                worldServer = craftWorld.getHandle();
+                if (packet.a(worldServer) != null) {
+                    break;
+                }
+            }
+            net.minecraft.server.v1_8_R1.Entity entity = packet.a(worldServer);
+            this.entity = entity.getBukkitEntity();
+        }
+    }
+
+    private void setupAction() {
+        net.minecraft.server.v1_8_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_8_R1.PacketPlayInUseEntity) getRawPacket();
+        String name = packet.a().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}
+
+

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_8_3/WrappedPacketPlayInUseEntity_1_8_3.java

@@ -0,0 +1,56 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_8_3;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_8_3 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_8_3(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        net.minecraft.server.v1_8_R2.PacketPlayInUseEntity packet = (net.minecraft.server.v1_8_R2.PacketPlayInUseEntity) getRawPacket();
+        net.minecraft.server.v1_8_R2.WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            org.bukkit.craftbukkit.v1_8_R2.CraftWorld craftWorld = (org.bukkit.craftbukkit.v1_8_R2.CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_8_R2.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        net.minecraft.server.v1_8_R2.PacketPlayInUseEntity packet = (net.minecraft.server.v1_8_R2.PacketPlayInUseEntity) getRawPacket();
+        String name = packet.a().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}
+
+

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_8_8/PacketPlayInAbilities_1_8_8.java

@@ -0,0 +1,27 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_8_8;
+
+import java.lang.Object;
+
+public class PacketPlayInAbilities_1_8_8 {
+    private Object packet;
+
+    public PacketPlayInAbilities_1_8_8(Object packet) {
+        this.packet = packet;
+        setupFields();
+    }
+
+    private void setupA() {
+
+    }
+
+    private void setupFields() {
+        setupA();
+    }
+
+    public boolean a;
+    public boolean isFlying;
+    public boolean c;
+    public boolean d;
+    public float e;
+    public float f;
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_8_8/WrappedPacketPlayInUseEntity_1_8_8.java

@@ -0,0 +1,54 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_8_8;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_8_8 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_8_8(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        net.minecraft.server.v1_8_R3.PacketPlayInUseEntity packet = (net.minecraft.server.v1_8_R3.PacketPlayInUseEntity) getRawPacket();
+        net.minecraft.server.v1_8_R3.WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            org.bukkit.craftbukkit.v1_8_R3.CraftWorld craftWorld = (org.bukkit.craftbukkit.v1_8_R3.CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_8_R3.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+    }
+
+    private void setupAction() {
+        net.minecraft.server.v1_8_R3.PacketPlayInUseEntity packet = (net.minecraft.server.v1_8_R3.PacketPlayInUseEntity) getRawPacket();
+        String name = packet.a().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_9/WrappedPacketPlayInUseEntity_1_9.java

@@ -0,0 +1,56 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_9;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_9 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_9(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        net.minecraft.server.v1_9_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_9_R1.PacketPlayInUseEntity) getRawPacket();
+        net.minecraft.server.v1_9_R1.WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            org.bukkit.craftbukkit.v1_9_R1.CraftWorld craftWorld = (org.bukkit.craftbukkit.v1_9_R1.CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_9_R1.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        if (version == ServerVersion.v_1_8) {
+            net.minecraft.server.v1_9_R1.PacketPlayInUseEntity packet = (net.minecraft.server.v1_9_R1.PacketPlayInUseEntity) getRawPacket();
+            String name = packet.a().name();
+            this.action = EntityUseAction.valueOf(name);
+        }
+    }
+}

src/main/java/me/purplex/packetevents/events/packetevent/packet/impl/in/_1_9_4/WrappedPacketPlayInUseEntity_1_9_4.java

@@ -0,0 +1,54 @@
+package me.purplex.packetevents.events.packetevent.packet.impl.in._1_9_4;
+
+import me.purplex.packetevents.enums.EntityUseAction;
+import me.purplex.packetevents.enums.ServerVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+
+public class WrappedPacketPlayInUseEntity_1_9_4 {
+    private final ServerVersion version;
+    private Entity entity;
+    private EntityUseAction action;
+    private final Object packet;
+
+    public WrappedPacketPlayInUseEntity_1_9_4(Object packet) {
+        this.version = ServerVersion.getVersion();
+        this.packet = packet;
+        setupEntity();
+        setupAction();
+    }
+
+    private Object getRawPacket() {
+        return this.packet;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityUseAction getEntityUseAction() {
+        return action;
+    }
+
+    private void setupEntity() {
+        net.minecraft.server.v1_9_R2.PacketPlayInUseEntity packet = (net.minecraft.server.v1_9_R2.PacketPlayInUseEntity) getRawPacket();
+        net.minecraft.server.v1_9_R2.WorldServer worldServer = null;
+        for (World bukkitWorld : Bukkit.getWorlds()) {
+            org.bukkit.craftbukkit.v1_9_R2.CraftWorld craftWorld = (org.bukkit.craftbukkit.v1_9_R2.CraftWorld) bukkitWorld;
+            worldServer = craftWorld.getHandle();
+            if (packet.a(worldServer) != null) {
+                break;
+            }
+        }
+        net.minecraft.server.v1_9_R2.Entity entity = packet.a(worldServer);
+        this.entity = entity.getBukkitEntity();
+
+    }
+
+    private void setupAction() {
+        net.minecraft.server.v1_9_R2.PacketPlayInUseEntity packet = (net.minecraft.server.v1_9_R2.PacketPlayInUseEntity) getRawPacket();
+        String name = packet.a().name();
+        this.action = EntityUseAction.valueOf(name);
+    }
+}

src/main/java/me/purplex/packetevents/example/TestExample.java

@@ -1,15 +1,15 @@
 package me.purplex.packetevents.example;
 
-import me.purplex.packetevents.PacketEvents;
 import me.purplex.packetevents.enums.EntityUseAction;
-import me.purplex.packetevents.enums.PlayerDigType;
+import me.purplex.packetevents.enums.ServerVersion;
 import me.purplex.packetevents.events.packetevent.ServerTickEvent;
 import me.purplex.packetevents.events.handler.PacketHandler;
 import me.purplex.packetevents.events.listener.PacketListener;
-import me.purplex.packetevents.events.packetevent.PacketReceiveEvent;
-import me.purplex.packetevents.events.packetevent.PacketSendEvent;
+import me.purplex.packetevents.events.packetevent.*;
+import me.purplex.packetevents.events.packetevent.packet.impl.in.WrappedPacketPlayInUseEntity;
 import me.purplex.packetevents.packets.Packet;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
 
 public class TestExample implements PacketListener {
     /**
@@ -20,51 +20,25 @@ public class TestExample implements PacketListener {
 
     private int tick;
 
+    private static ServerVersion serverVersion = ServerVersion.getVersion();
 
     @PacketHandler
     public void onPacketReceive(PacketReceiveEvent e) {
+        Player p = e.getPlayer();
         //ONLY CLIENT PACKETS ALLOWED HERE!
-        long timestamp = e.getTimestamp();
+
+        //System.out.println(e.getPacket().getClass().getSimpleName());
         if (e.getPacketName().equals(Packet.Client.USE_ENTITY)) {
-            Entity entity = e.getInteractedEntity();
-            EntityUseAction entityUseAction = e.getEntityUseAction();
-            if(entityUseAction == EntityUseAction.ATTACK) {
-                //LEFT CLICKED
-                e.getPlayer().sendMessage("Attacked an entity!");
+            WrappedPacketPlayInUseEntity packet = new WrappedPacketPlayInUseEntity(e.getPacket());
+            Entity entity = packet.getEntity();
+            if (packet.getEntityUseAction() == EntityUseAction.ATTACK) {
+                double dist = entity.getLocation().distanceSquared(p.getLocation());
+                //p.sendMessage("dist: " + dist);
             }
-            e.getPlayer().sendMessage("Dist: " + entity.getLocation().distanceSquared(e.getPlayer().getLocation()));
-        } else if (e.getPacketName().equals(Packet.Client.ARM_ANIMATION)) {
+        }
 
-        } else if (e.getPacketName().equals(Packet.Client.BLOCK_DIG)) {
-            PlayerDigType type = e.getPlayerDigType();
-            if(type == PlayerDigType.ABORT_DESTROY_BLOCK) {
-                //aborted destroying a block
-            }
-        } else if (e.getPacketName().equals(Packet.Client.CHAT)) {
-            String message = e.getChatPacketMessage();
-            if(message.equals("pls jump")) {
-                //shoot them in the air
-                PacketEvents.sendVelocity(e.getPlayer(), 0.0, 50.0, 0.0);
-            }
-        }
-        else if(e.getPacketName().equals(Packet.Client.POSITION)) {
-            double motX = e.getMotionX();
-            double motY = e.getMotionY();
-            double motZ= e.getMotionZ();
-        }
     }
 
-    @PacketHandler
-    public void onPacketSend(PacketSendEvent e) {
-        //ONLY SERVER PACKETS ALLOWED HERE!
-        if (e.getPacketName().equals(Packet.Server.ENTITY_VELOCITY)) {
-            int ping = e.getPing();
-            Entity entity = e.getVelocityEntity();
-            double velX = e.getVelocityX();
-            double velY = e.getVelocityY();
-            double velZ = e.getVelocityZ();
-        }
-    }
 
     @PacketHandler
     public void onServerTick(ServerTickEvent e) {
@@ -76,4 +50,5 @@ public class TestExample implements PacketListener {
             }*/
         }
     }
+
 }