1.3.1.3 Beta

* ClientVersion added isHigherThan(ClientVersion version) and isLowerThan(ClientVersion version) methods for simple client version comparison.

* Packet.isInstanceOf(fatherPacketName, childPacketName) has now been deprecated, will be removed in the next version!

It has been replaced by Packet.isFlyingPacket(nmsPacketObject), as the flying packet is the only packet that has subclasses.
The flying packet is also used a lot, so I made an efficient way to check if the nms packet object is an instanceof of it!
If you are on a 1.9+ server, it will just check if the packet is an instance of "PacketPlayInPosition" or "PacketPlayInPositionLook" or "PacketPlayInLook".

README.md

@@ -1,29 +1,28 @@
 # packetevents by retrooper
 
-An asynchronous spigot packetListener coded by retrooper.
+A lightweight spigot packetlistener & packetsender coded by retrooper.
 
-Credit to TinyProtocol, PacketEvents uses a modified version of [TinyProtocol](http://github.com/dmulloy2/ProtocolLib/blob/master/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java) by DeprecatedLuke to support 1.7.10 & 1.8.
-PacketEvents does some extra modifications to support the rest of the versions!
-All I do is make the wrapper classes and useful utilities that support 1.7.10 -> 1.15.2!
-This packetlistener is supported on spigot servers(Spigot, PaperSpigot, ...).
+## Credit:
+
+PacketEvents uses a modified version of [TinyProtocol](http://github.com/dmulloy2/ProtocolLib/blob/master/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java) by [@DeprecatedLuke](https://github.com/DeprecatedLuke) to support 1.7.10 & 1.8.
+I modified DeprecatedLuke's version of TinyProtocol and added support for 1.9+ versions.
+
+PacketEvents also took Atlas' Packet class.(all the packet names)
+
+## About
+
+This packetlistener is **only** supported on spigot servers and has been tested to work on these spigot forks: PaperSpigot, Tuinity
 
 * No dependencies
 
-* Licensed with the GPL2 license.
+* Licensed under the GPL2 license.
 
 [![](https://img.shields.io/badge/License-GPLv2-blue.svg)](https://www.gnu.org/licenses/gpl-2.0)
 
 Join my discord server(to talk to me): https://discord.gg/ZWTkg4v
 
-How to use with **Gradle, Maven, sbt and leiningen**.
-
-Click the link below.
-
-Make sure to replace **Tag** with a proper release version or a valid commit hash(first 7 characters)
-
-I recommend you to use the latest released version!
-
-
 [![](https://jitpack.io/v/retrooper/packetevents.svg)](https://jitpack.io/#retrooper/packetevents)
 
-If clicking the badge doesn't work paste this link into your browser http://jitpack.io/#retrooper/packetevents
+To learn how to setup this API please click on the link below
+[Setup Guide](https://github.com/retrooper/packetevents/wiki/PacketEvents-Setup-Guide)
+(or just paste this into your browser: https://github.com/retrooper/packetevents/wiki/PacketEvents-Setup-Guide)

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.retrooper</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.2.8</version>
+    <version>1.3.1.3</version>
     <packaging>jar</packaging>
     <name>packetevents</name>
     <properties>

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

@@ -1,100 +1,289 @@
 package io.github.retrooper.packetevents;
 
+import io.github.retrooper.packetevents.enums.ClientVersion;
 import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.event.PacketHandler;
+import io.github.retrooper.packetevents.event.PacketListener;
+import io.github.retrooper.packetevents.event.impl.PacketLoginEvent;
+import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
+import io.github.retrooper.packetevents.event.impl.PostPlayerInjectEvent;
 import io.github.retrooper.packetevents.event.impl.ServerTickEvent;
 import io.github.retrooper.packetevents.event.manager.EventManager;
-import io.github.retrooper.packetevents.injector.PacketHandler;
+import io.github.retrooper.packetevents.handler.TinyProtocolHandler;
+import io.github.retrooper.packetevents.packet.Packet;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
+import io.github.retrooper.packetevents.packetwrappers.login.WrappedPacketLoginHandshake;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitTask;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.InvocationTargetException;
-public class PacketEvents{
+import java.util.HashMap;
+
+public class PacketEvents implements PacketListener, Listener {
+
+
+    /*
+     * Login wrappers TODO
+     * PacketLoginInStart
+     * PacketLoginInEncryptionBegin
+     */
+
+    private static boolean hasRegistered;
+
     private static final ServerVersion version = ServerVersion.getVersion();
     private static PacketEvents instance;
-    public static JavaPlugin plugin;
-    private static PacketHandler packetInjector;
     private static EventManager eventManager = new EventManager();
 
     private static int currentTick;
 
     private static BukkitTask serverTickTask;
 
+    private static final HashMap<Object, ClientVersion> clientVersionLookup = new HashMap<Object, ClientVersion>();
+
     public static EventManager getEventManager() {
         return eventManager;
     }
 
 
-    public static void setup(final JavaPlugin plugin, final boolean serverTickEventEnabled) {
-        PacketEvents.plugin = plugin;
-        packetInjector = new PacketHandler(plugin);
-        packetInjector.initTinyProtocol();
+    /**
+     * Starts the server tick task and initiates the TinyProtocolHandler
+     *
+     * @param plugin
+     */
+    public static void start(final Plugin plugin) {
+        if (!hasRegistered) {
+            //Register Bukkit and PacketListener
+            getEventManager().registerListener(getInstance());
+            Bukkit.getPluginManager().registerEvents(getInstance(), plugin);
 
-        if (serverTickEventEnabled) {
-            final Runnable runnable = new Runnable() {
+            //Initialize the TinyProtocolHandler
+            TinyProtocolHandler.initTinyProtocol(plugin);
+
+            //Start the server tick task
+            final Runnable tickRunnable = new Runnable() {
                 @Override
                 public void run() {
-                    getEventManager().callEvent(new ServerTickEvent(currentTick++, PacketEvents.currentTimeMS()));
+                    getEventManager().callEvent(new ServerTickEvent(currentTick++, PacketEvents.currentCalculatedMS()));
                 }
             };
-            serverTickTask = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, runnable, 0L, 1L);
+            serverTickTask = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, tickRunnable, 0L, 1L);
+            hasRegistered = true;
         }
     }
 
-    public static void cleanup() {
+    /**
+     * Stop all tasks and unregisters all packetevent listeners
+     */
+    public static void stop() {
         if (serverTickTask != null) {
             serverTickTask.cancel();
         }
         getEventManager().unregisterAllListeners();
     }
 
-
+    /**
+     * Get the server's version
+     *
+     * @return version
+     */
     public static ServerVersion getServerVersion() {
         return version;
     }
 
+    /**
+     * Returns the server tick task, you may cancel it if you wish.
+     * To cancel it do PacketEvents.getServerTickTask().cancel();
+     * <p>
+     * This bukkit task runs asynchronously every tick and is started in the start(plugin) function
+     *
+     * @return serverTickTask
+     */
+    public static BukkitTask getServerTickTask() {
+        return serverTickTask;
+    }
+
+    /**
+     * Get an instance of the PacketEvents API class
+     *
+     * @return instance
+     */
     public static PacketEvents getInstance() {
         return instance == null ? instance = new PacketEvents() : instance;
     }
 
-    public static boolean isServerTickTaskEnabled() {
-        return serverTickTask != null;
-    }
-
 
+    /**
+     * Get the server's recent TPS values
+     * TPS stands for ticks per second.
+     * Learn more about ticks <a href="https://apexminecrafthosting.com/what-is-minecraft-tps/">"https://apexminecrafthosting.com/what-is-minecraft-tps/"</a>
+     *
+     * @return recentTPS[]
+     */
     public static double[] getRecentServerTPS() {
         double[] tpsArray = new double[0];
         try {
             tpsArray = NMSUtils.recentTPS();
-        } catch (IllegalAccessException e) {
+        } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        final int size = tpsArray.length;
-        for (int i = 0; i < size; i++) {
-            if (tpsArray[i] > 20.0) {
-                tpsArray[i] = 20.0;
-            }
         }
         return tpsArray;
     }
 
+    /**
+     * Get the server's current TPS
+     * TPS stands for ticks per second.
+     * Learn more about ticks <a href="https://apexminecrafthosting.com/what-is-minecraft-tps/">"https://apexminecrafthosting.com/what-is-minecraft-tps/"</a>
+     *
+     * @return currentTPS / recentTPS[0]
+     */
     public static double getCurrentServerTPS() {
         return getRecentServerTPS()[0];
     }
 
+    /**
+     * Get the player's ping.
+     * Learn more about ping <a href="https://en.wikipedia.org/wiki/Ping_(networking_utility)">https://en.wikipedia.org/wiki/Ping_(networking_utility)</a>
+     *
+     * @param player
+     * @return ping
+     */
     public static int getPing(final Player player) {
         return NMSUtils.getPlayerPing(player);
     }
 
-    public static long currentTimeMS() {
-        return System.currentTimeMillis();
+    /**
+     * Should I use this over System.currentTimeMillis()?
+     * <p>
+     * 1. System.currentTimeMillis() isn't supported on all machines
+     * 2. This is way more accurate than System.currentTimeMillis()
+     * 3. System.currentTimeMillis() can be up to 50ms off, depending on the operating system.
+     *
+     * @return nanoTime / 1 million
+     */
+    public static long currentCalculatedMS() {
+        return System.nanoTime() / 1000000;
     }
 
+    /**
+     * Get the player's version.
+     * Do not call this method in the PlayerInjectEvent, it is safe to call it in the PostPlayerInjectEvent.
+     * The EntityPlayer object is null at that time, resulting in the version lookup to fail.
+     *
+     * @param player
+     * @return ClientVersion
+     */
+    @Nullable
+    public static ClientVersion getClientVersion(final Player player) {
+        final Object channel = TinyProtocolHandler.getPlayerChannel(player);
+        return clientVersionLookup.get(channel);
+    }
+
+    /**
+     * Get the players' client version
+     * Do not call this method in the PlayerInjectEvent, it is safe to call it in the PostPlayerInjectEvent.
+     * The EntityPlayer object is null at that time, resulting in the version lookup to fail.
+     *
+     * @param channel
+     * @return ClientVersion
+     */
+    @Nullable
+    public static ClientVersion getClientVersion(final Object channel) {
+        return clientVersionLookup.get(channel);
+    }
+
+    @PacketHandler
+    public void onLogin(final PacketLoginEvent e) {
+        if (e.getPacketName().equals(Packet.Login.HANDSHAKE)) {
+            final WrappedPacketLoginHandshake handshake = new WrappedPacketLoginHandshake(e.getPacket());
+            final ClientVersion clientVersion = ClientVersion.fromProtocolVersion(handshake.getProtocolVersion());
+            clientVersionLookup.put(e.getNettyChannel(), clientVersion);
+        }
+    }
+
+    /**
+     * Do not check the client version in or before the PlayerInjectEvent, use the PostPlayerInjectEvent.
+     * It is not recommended to do much in the PlayerInjectEvent, as some fields in the Player object are be null.
+     * Use the PostPlayerInjectEvent which is only called after the PlayerJoinEvent if the player was injected.
+     *
+     * @param e
+     */
+    @PacketHandler
+    public void onInject(final PlayerInjectEvent e) {
+        final String username = e.getPlayer().getName();
+    }
+
+    /**
+     * Called after the PlayerJoinEvent ONLY if the player has been injected!
+     * @param e
+     */
+    @PacketHandler
+    public void onPostInject(final PostPlayerInjectEvent e) {
+        //It is safe to get his client version in here.
+        final ClientVersion clientVersion = PacketEvents.getClientVersion(e.getPlayer());
+    }
+
+    @EventHandler
+    public void onLogin(final PlayerLoginEvent e) {
+        final Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
+        boolean canJoin = true;
+        for (final Plugin pl : plugins) {
+            if (!pl.isEnabled()) {
+                canJoin = false;
+                break;
+            }
+        }
+        if (!canJoin) {
+            e.setResult(PlayerLoginEvent.Result.KICK_OTHER);
+            e.setKickMessage("Please wait for the server to finish loading all plugins");
+        }
+    }
+
+    @EventHandler
+    public void onJoin(PlayerJoinEvent e) {
+        if (hasInjected(e.getPlayer())) {
+            PacketEvents.getEventManager().callEvent(new PostPlayerInjectEvent(e.getPlayer()));
+        }
+    }
+
+    /**
+     * Version independant player injection
+     * @param player
+     */
+    public static void injectPlayer(final Player player) {
+        TinyProtocolHandler.inject(player);
+    }
+
+    /**
+     * Version independant player injection
+     * @param player
+     */
+    public static void uninjectPlayer(final Player player) {
+        TinyProtocolHandler.uninject(player);
+    }
+
+    /**
+     * Returns whether we have injected the player
+     * @param player
+     * @return hasInjected
+     */
+    public static boolean hasInjected(final Player player) {
+        return TinyProtocolHandler.hasInjected(player);
+    }
+
+    /**
+     * Send a wrapped sendable packet to a player
+     *
+     * @param player
+     * @param sendable
+     */
     public static void sendPacket(final Player player, final Sendable sendable) {
         NMSUtils.sendSendableWrapper(player, sendable);
     }

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

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

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

@@ -9,7 +9,7 @@ import io.github.retrooper.packetevents.enums.ServerVersion;
  * recommended to avoid non thread safe bukkit operations
  */
 public class PacketEvent {
-    protected long timestamp = PacketEvents.currentTimeMS();
+    protected long timestamp = PacketEvents.currentCalculatedMS();
     protected static ServerVersion version = PacketEvents.getServerVersion();
 
     /**

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

@@ -2,14 +2,20 @@ package io.github.retrooper.packetevents.event.impl;
 
 import io.github.retrooper.packetevents.event.PacketEvent;
 
-public class PacketLoginEvent extends PacketEvent {
+public final class PacketLoginEvent extends PacketEvent {
+    private final Object channel;
     private final String name;
     private final Object packet;
-    public PacketLoginEvent(final String packetName, final Object packet) {
+    public PacketLoginEvent(final Object channel, final String packetName, final Object packet) {
+        this.channel =channel;
         this.name = packetName;
         this.packet = packet;
     }
 
+    public Object getNettyChannel() {
+        return channel;
+    }
+
     public String getPacketName() {
         return name;
     }

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

@@ -3,7 +3,7 @@ package io.github.retrooper.packetevents.event.impl;
 import io.github.retrooper.packetevents.event.PacketEvent;
 import org.bukkit.entity.Player;
 
-public class PacketReceiveEvent extends PacketEvent {
+public final class PacketReceiveEvent extends PacketEvent {
     private final Player player;
     private final String name;
     private final Object packet;

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

@@ -4,7 +4,7 @@ import io.github.retrooper.packetevents.event.PacketEvent;
 import org.bukkit.entity.Player;
 
 
-public class PacketSendEvent extends PacketEvent {
+public final class PacketSendEvent extends PacketEvent {
     private final Player player;
     private final String name;
     private final Object packet;
@@ -43,217 +43,5 @@ public class PacketSendEvent extends PacketEvent {
     public boolean isCancelled() {
         return cancelled;
     }
-
-
-/*
-    /**
-     * 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;
-        }
-        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 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 motZ variable in the EntityPlayer class
-     *
-     * @return motZ
-
-    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;
-    }
-    */
-
-
 }
 

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

@@ -3,14 +3,26 @@ package io.github.retrooper.packetevents.event.impl;
 import io.github.retrooper.packetevents.event.PacketEvent;
 import org.bukkit.entity.Player;
 
-public class PlayerInjectEvent extends PacketEvent {
+public final class PlayerInjectEvent extends PacketEvent {
     private final Player player;
+    private boolean cancelled;
     public PlayerInjectEvent(final Player player) {
         this.player = player;
     }
 
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    public void cancel() {
+        setCancelled(true);
+    }
+
     public Player getPlayer() {
         return player;
     }
-
 }

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

@@ -0,0 +1,16 @@
+package io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import org.bukkit.entity.Player;
+
+public final class PostPlayerInjectEvent extends PacketEvent {
+    private final Player player;
+
+    public PostPlayerInjectEvent(final Player player) {
+        this.player = player;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+}

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

@@ -1,21 +0,0 @@
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.event.PacketEvent;
-
-//unfinished
-public class ServerReloadEvent extends PacketEvent {
-    private final long currentTime;
-
-    public ServerReloadEvent(final long currentTime){
-        this.currentTime = currentTime;
-    }
-
-    public ServerReloadEvent() {
-        this.currentTime = PacketEvents.currentTimeMS();
-    }
-
-    public final long getCurrentTime() {
-        return currentTime;
-    }
-}

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

@@ -50,4 +50,7 @@ public class EventManager {
         registeredMethods.clear();
     }
 
+    public boolean hasRegistered(final PacketListener listener) {
+        return registeredMethods.containsKey(listener);
+    }
 }

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

@@ -7,16 +7,11 @@ public class MainExample extends JavaPlugin {
     @Override
     public void onEnable() {
 
-        //Should the ServerTickEvent ever get called?
-        final boolean serverTickEventEnabled = true;
+        PacketEvents.start(this);
 
-        /**
-         * Starts the servertickevent repeating task (if enabled)
-         * and registers onJoin and onQuit events to inject and uninject players.
-         * The first argument is an instance to your Main Class,
-         * The second argument is a boolean whether the servertickevent should ever get called
-         */
-        PacketEvents.setup(this, serverTickEventEnabled);
+        //If you do not need the server tick event you can just cancel its task like this
+
+        //PacketEvents.getServerTickTask().cancel();
 
 
         /**
@@ -28,9 +23,9 @@ public class MainExample extends JavaPlugin {
     @Override
     public void onDisable() {
         /**
-         * Stops server tick event task if enabled and unregister all listeners
+         * Stops server tick event task if enabled and unregisters packetlisteners
          */
-        PacketEvents.cleanup();
+        PacketEvents.stop();
 
     }
 

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

@@ -1,5 +1,6 @@
 package io.github.retrooper.packetevents.example;
 
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.enums.*;
 import io.github.retrooper.packetevents.event.PacketEvent;
 import io.github.retrooper.packetevents.event.PacketHandler;
@@ -14,8 +15,10 @@ import io.github.retrooper.packetevents.packetwrappers.in.entityaction.WrappedPa
 import io.github.retrooper.packetevents.packetwrappers.in.flying.WrappedPacketInFlying;
 import io.github.retrooper.packetevents.packetwrappers.in.keepalive.WrappedPacketInKeepAlive;
 import io.github.retrooper.packetevents.packetwrappers.in.useentity.WrappedPacketInUseEntity;
+import io.github.retrooper.packetevents.packetwrappers.login.WrappedPacketLoginHandshake;
 import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
 import io.github.retrooper.packetevents.packetwrappers.out.entityvelocity.WrappedPacketOutEntityVelocity;
+import io.github.retrooper.packetevents.packetwrappers.out.kickdisconnect.WrappedPacketOutKickDisconnect;
 import io.github.retrooper.packetevents.utils.vector.Vector3i;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
@@ -23,11 +26,9 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 /**
- * Implementing PacketListener to listen to packets and packetevents' custom events,
+ * Implementing PacketListener to listen to packetevents' custom events,
  */
 public class RegisteredListener implements PacketListener {
-
-
     /**
      * Listen to PacketReceiveEvent
      *
@@ -37,6 +38,15 @@ public class RegisteredListener implements PacketListener {
     public void onPacketReceive(PacketReceiveEvent e) {
         final Player p = e.getPlayer();
         final long timestamp = e.getTimestamp();
+
+        //The block place name field is not set at compilation time, so we cannot use it in the switch statement
+        //On 1.7->1.8.8 servers it is "PacketPlayInBlockPlace" and on 1.9+ servers it is "PacketPlayInUseItem"
+        if(e.getPacketName().equals(Packet.Client.BLOCK_PLACE)) {
+            final WrappedPacketInBlockPlace blockPlace = new WrappedPacketInBlockPlace(e.getPlayer(), e.getPacket());
+            final Vector3i blockPosition = blockPlace.getBlockPosition();
+            final ItemStack stack = blockPlace.getItemStack();
+           // e.getPlayer().sendMessage("pos: " + blockPosition.toString() + ", type: " + stack.getType());
+        }
         switch (e.getPacketName()) {
             case Packet.Client.USE_ENTITY:
                 final WrappedPacketInUseEntity useEntity = new WrappedPacketInUseEntity(e.getPacket());
@@ -52,7 +62,7 @@ public class RegisteredListener implements PacketListener {
                 final boolean canInstantlyBuild = abilities.canInstantlyBuild();
                 final float flySpeed = abilities.getFlySpeed();
                 final float walkSpeed = abilities.getWalkSpeed();
-                // e.getPlayer().sendMessage("walkspeed: " + walkSpeed + ", flyspeed: " + flySpeed + ", canFly: " + canFly);
+               //  e.getPlayer().sendMessage("walkspeed: " + walkSpeed + ", flyspeed: " + flySpeed + ", canFly: " + canFly);
                 break;
             case Packet.Client.BLOCK_DIG:
                 //Custom PlayerDigType enum
@@ -78,20 +88,6 @@ public class RegisteredListener implements PacketListener {
             case Packet.Client.CHAT:
                 final WrappedPacketInChat chat = new WrappedPacketInChat(e.getPacket());
                 final String message = chat.getMessage();
-                if(message.contains("jump")) {
-                    //teleport them up in the air
-                   // PacketEvents.sendPacket(e.getPlayer(), new WrappedPacketOutEntityVelocity(e.getPlayer(), 0, 3, 0));
-                }
-                else if(message.contains("swing arm")) {
-                    //Swing the player's arm
-                    // PacketEvents.sendPacket(e.getPlayer(), new WrappedPacketOutAnimation(e.getPlayer(), EntityAnimationType.SWING_MAIN_ARM));
-                }
-                break;
-            case Packet.Client.BLOCK_PLACE:
-                final WrappedPacketInBlockPlace blockPlace = new WrappedPacketInBlockPlace(e.getPlayer(), e.getPacket());
-                final Vector3i blockPosition = blockPlace.getBlockPosition();
-                final Hand h = blockPlace.getHand();
-                final ItemStack stack = blockPlace.getItemStack();
                 break;
             case Packet.Client.KEEP_ALIVE:
                 final WrappedPacketInKeepAlive keepAlive = new WrappedPacketInKeepAlive(e.getPacket());
@@ -107,28 +103,29 @@ public class RegisteredListener implements PacketListener {
     }
 
 
-    /**
-     * I recommend you use the player inject event
-     * to register your players instead of any other bukkit event,
-     * to avoid any issues.
-     * @param event
-     */
     @PacketHandler
     public void onInject(PlayerInjectEvent event) {
 
     }
 
     /**
-     * I recommend you use the player uninject event,
-     * to unregister your players
-     *
-     * You can also call this event to "whitelist" a player,
-     * our API won't even notice the player exists, so you won't
-     * be able to listen to any packets from the player
-     * @param e
+     * In this event you can safely register your players, unlike the PlayerInjectEvent.
+     * In the PlayerInjectEvent some fields in the player object might be null.
+     * So use this event!
+     * @param event
      */
     @PacketHandler
-    public void onUninject(PlayerUninjectEvent e) {
+    public void onPostInject(PostPlayerInjectEvent event) {
+
+    }
+
+    /**
+     * You can use this event to unregister your players,
+     * This event is called when a player is uninjected
+     * @param event
+     */
+    @PacketHandler
+    public void onUninject(PlayerUninjectEvent event) {
 
     }
 
@@ -144,15 +141,12 @@ public class RegisteredListener implements PacketListener {
             final Player targetPlayer = p.getPlayer();
             final Object rawNMSPacket = p.getPacket();
             final long timestamp = p.getTimestamp();
-            if(p.getPacketName().equals(Packet.Server.ENTITY_VELOCITY)) {
+            if (p.getPacketName().equals(Packet.Server.ENTITY_VELOCITY)) {
                 final WrappedPacketOutEntityVelocity vel = new WrappedPacketOutEntityVelocity(p.getPacket());
                 final double velocityX = vel.getVelocityX();
                 final double velocityY = vel.getVelocityY();
                 final double velocityZ = vel.getVelocityZ();
-
-
-            }
-            else if(p.getPacketName().equals(Packet.Server.CHAT)) {
+            } else if (p.getPacketName().equals(Packet.Server.CHAT)) {
                 final WrappedPacketOutChat chat = new WrappedPacketOutChat(p.getPacket());
             }
         } else if (e instanceof CustomMoveEvent) {
@@ -163,7 +157,16 @@ public class RegisteredListener implements PacketListener {
         } else if (e instanceof ServerTickEvent) {
             final ServerTickEvent event = (ServerTickEvent) e;
             final int currentTick = event.getCurrentTick();
-            // System.out.println(PacketEvents.getCurrentServerTPS() + " is tps");
+            final double tps = PacketEvents.getCurrentServerTPS();
+        }
+        else if(e instanceof PacketLoginEvent) {
+            final PacketLoginEvent event = (PacketLoginEvent)e;
+            if(event.getPacketName().equals(Packet.Login.HANDSHAKE)) {
+                final WrappedPacketLoginHandshake handshake = new WrappedPacketLoginHandshake(event.getPacket());
+                final int protocolVersion = handshake.getProtocolVersion();
+                final String hostname = handshake.getHostname();
+                final int port = handshake.getPort();
+            }
         }
     }
 }

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

@@ -0,0 +1,92 @@
+package io.github.retrooper.packetevents.handler;
+
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.tinyprotocol.Reflection;
+import io.github.retrooper.packetevents.tinyprotocol.Reflection.FieldAccessor;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class TinyProtocolHandler {
+    private static final ServerVersion version = PacketEvents.getServerVersion();
+
+    private static Object tinyProtocol;
+
+    public static void initTinyProtocol(final Plugin plugin) {
+        if (version.isLowerThan(ServerVersion.v_1_8)) {
+            TinyProtocolHandler_1_7 tiny = new TinyProtocolHandler_1_7(plugin);
+            tiny.initTinyProtocol();
+            tinyProtocol = tiny;
+        } else {
+            TinyProtocolHandler_1_8 tiny = new TinyProtocolHandler_1_8(plugin);
+            tiny.initTinyProtocol();
+            tinyProtocol = tiny;
+        }
+    }
+
+    public static boolean hasInjected(final Player player) {
+        if (version.isLowerThan(ServerVersion.v_1_8)) {
+            TinyProtocolHandler_1_7 tiny = (TinyProtocolHandler_1_7) tinyProtocol;
+            assert tiny.tinyProtocol != null;
+            return tiny.tinyProtocol.hasInjected(player);
+        } else {
+            TinyProtocolHandler_1_8 tiny = (TinyProtocolHandler_1_8) tinyProtocol;
+            assert tiny.tinyProtocol != null;
+            return tiny.tinyProtocol.hasInjected(player);
+        }
+    }
+
+    public static void inject(final Player player) {
+        if (version.isLowerThan(ServerVersion.v_1_8)) {
+            TinyProtocolHandler_1_7 tiny = (TinyProtocolHandler_1_7) tinyProtocol;
+            assert tiny.tinyProtocol != null;
+            tiny.tinyProtocol.injectPlayer(player);
+        } else {
+            TinyProtocolHandler_1_8 tiny = (TinyProtocolHandler_1_8) tinyProtocol;
+            assert tiny.tinyProtocol != null;
+            tiny.tinyProtocol.injectPlayer(player);
+        }
+    }
+
+    public static void uninject(final Player player) {
+        if (version.isLowerThan(ServerVersion.v_1_8)) {
+            TinyProtocolHandler_1_7 tiny = (TinyProtocolHandler_1_7) tinyProtocol;
+            assert tiny.tinyProtocol != null;
+            tiny.tinyProtocol.uninjectPlayer(player);
+        } else {
+            TinyProtocolHandler_1_8 tiny = (TinyProtocolHandler_1_8) tinyProtocol;
+            assert tiny.tinyProtocol != null;
+            tiny.tinyProtocol.uninjectPlayer(player);
+        }
+    }
+
+
+    public static Object getPlayerChannel(final Player player) {
+        final Object entityPlayer = NMSUtils.getEntityPlayer(player);
+        final Object playerConnection = playerConnectionAccessor.get(entityPlayer);
+        final Object networkManager = networkManagerAccessor.get(playerConnection);
+        return nettyChannelAccessor.get(networkManager);
+    }
+
+
+    private static Class<?> networkManagerClass;
+
+    private static final FieldAccessor<?> playerConnectionAccessor, networkManagerAccessor, nettyChannelAccessor;
+
+    private static Class<?> channelClass;
+
+    static {
+        try {
+            networkManagerClass = NMSUtils.getNMSClass("NetworkManager");
+            channelClass = NMSUtils.getNettyClass("channel.Channel");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        playerConnectionAccessor = Reflection.getField(NMSUtils.entityPlayerClass, NMSUtils.playerConnectionClass, 0);
+        networkManagerAccessor = Reflection.getField(NMSUtils.playerConnectionClass, networkManagerClass, 0);
+        nettyChannelAccessor = Reflection.getField(networkManagerClass, channelClass, 0);
+    }
+}

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

@@ -1,22 +1,29 @@
-package io.github.retrooper.packetevents.injector;
+package io.github.retrooper.packetevents.handler;
 
 import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.event.impl.PacketLoginEvent;
 import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
 import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
+import io.github.retrooper.packetevents.packet.Packet;
 import io.github.retrooper.packetevents.tinyprotocol.TinyProtocol7;
 import net.minecraft.util.io.netty.channel.Channel;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-public class PacketHandler_1_7 {
+import javax.annotation.Nullable;
+
+public class TinyProtocolHandler_1_7 {
     private final Plugin plugin;
 
-    public PacketHandler_1_7(final Plugin plugin) {
+    public TinyProtocolHandler_1_7(final Plugin plugin) {
         this.plugin = plugin;
     }
 
+    @Nullable
+    public TinyProtocol7 tinyProtocol;
+
     public void initTinyProtocol() {
-        new TinyProtocol7(getPlugin()) {
+        tinyProtocol = new TinyProtocol7(getPlugin()) {
             @Override
             public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
                 final String packetName = packet.getClass().getSimpleName();
@@ -31,6 +38,12 @@ public class PacketHandler_1_7 {
             @Override
             public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
                 final String packetName = packet.getClass().getSimpleName();
+                for(final String loginPacket : Packet.Login.LOGIN_PACKETS) {
+                    if(packetName.equals(loginPacket)) {
+                        PacketEvents.getEventManager().callEvent(new PacketLoginEvent(channel, packetName, packet));
+                        return packet;
+                    }
+                }
                 final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(sender, packetName, packet);
                 PacketEvents.getEventManager().callEvent(packetReceiveEvent);
                 if (!packetReceiveEvent.isCancelled()) {

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

@@ -1,24 +1,34 @@
-package io.github.retrooper.packetevents.injector;
+package io.github.retrooper.packetevents.handler;
 
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.event.impl.PacketLoginEvent;
 import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
 import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
+import io.github.retrooper.packetevents.packet.Packet;
 import io.github.retrooper.packetevents.tinyprotocol.TinyProtocol8;
 import io.netty.channel.Channel;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-public class PacketHandler_1_8 {
+import javax.annotation.Nullable;
+
+public class TinyProtocolHandler_1_8 {
     private static final ServerVersion version = PacketEvents.getServerVersion();
     private final Plugin plugin;
 
-    public PacketHandler_1_8(final Plugin plugin) {
+    public TinyProtocolHandler_1_8(final Plugin plugin) {
         this.plugin = plugin;
     }
 
+
+
+    @Nullable
+    public TinyProtocol8 tinyProtocol;
+
+
     public void initTinyProtocol() {
-        new TinyProtocol8(getPlugin()) {
+        tinyProtocol = new TinyProtocol8(getPlugin()) {
             @Override
             public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
                 final String packetName = packet.getClass().getSimpleName();
@@ -33,6 +43,12 @@ public class PacketHandler_1_8 {
             @Override
             public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
                 final String packetName = packet.getClass().getSimpleName();
+                for (final String loginPacket : Packet.Login.LOGIN_PACKETS) {
+                    if (packetName.equals(loginPacket)) {
+                        PacketEvents.getEventManager().callEvent(new PacketLoginEvent(channel, packetName, packet));
+                        return packet;
+                    }
+                }
                 final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(sender, packetName, packet);
                 PacketEvents.getEventManager().callEvent(packetReceiveEvent);
                 if (!packetReceiveEvent.isCancelled()) {
@@ -46,19 +62,19 @@ public class PacketHandler_1_8 {
 
     public static String getNetworkManagersFieldName() {
         //1.8
-        if(version.equals(ServerVersion.v_1_8)) {
+        if (version.equals(ServerVersion.v_1_8)) {
             return "g";
         }
         //1.8.3->1.12
-        else if(version.isLowerThan(ServerVersion.v_1_13)) {
+        else if (version.isLowerThan(ServerVersion.v_1_13)) {
             return "h";
         }
         //1.13->1.14
-        else if(version.isLowerThan(ServerVersion.v_1_15)) {
+        else if (version.isLowerThan(ServerVersion.v_1_15)) {
             return "g";
         }
         //1.15
-        else  {
+        else {
             return "listeningChannels";
         }
     }

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

@@ -1,28 +0,0 @@
-package io.github.retrooper.packetevents.injector;
-
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import org.bukkit.plugin.Plugin;
-
-public class PacketHandler {
-    private static final ServerVersion version = PacketEvents.getServerVersion();
-    private final Plugin plugin;
-
-    public PacketHandler(final Plugin plugin) {
-        this.plugin = plugin;
-    }
-    public void initTinyProtocol() {
-        if(version.isLowerThan(ServerVersion.v_1_8)) {
-            new PacketHandler_1_7(getPlugin()).initTinyProtocol();
-        }
-        else {
-            new PacketHandler_1_8(getPlugin()).initTinyProtocol();
-        }
-    }
-
-    public final Plugin getPlugin() {
-        return plugin;
-    }
-
-}

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

@@ -1,13 +1,17 @@
 package io.github.retrooper.packetevents.packet;
 
+import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.utils.NMSUtils;
 
 public abstract class Packet {
+
     public static class Client {
         private static final String c = "PacketPlayIn";
 
         @Deprecated
         public static final String FLYING = c + "Flying";
 
+
         public static final String POSITION = c + "Position";
 
         public static final String POSITION_LOOK = c + "PositionLook";
@@ -23,7 +27,11 @@ public abstract class Packet {
         public static final String STEER_VEHICLE = c + "SteerVehicle";
         public static final String CUSTOM_PAYLOAD = c + "CustomPayload";
         public static final String ARM_ANIMATION = c + "ArmAnimation";
-        public static final String BLOCK_PLACE = c + "BlockPlace";
+        /**
+         * The packet name of the block place depending on your server version, "PacketPlayInBlockPlace" or "PacketPlayInUseItem"
+         */
+        public static final String BLOCK_PLACE = c + ((ServerVersion.getVersion().isHigherThan(ServerVersion.v_1_8_8)) ? "UseItem" : "BlockPlace");
+
         public static final String ABILITIES = c + "Abilities";
         public static final String HELD_ITEM_SLOT = c + "HeldItemSlot";
         public static final String CLOSE_WINDOW = c + "CloseWindow";
@@ -32,6 +40,7 @@ public abstract class Packet {
         public static final String SET_CREATIVE_SLOT = c + "SetCreativeSlot";
 
         public static final String KEEP_ALIVE = c + "KeepAlive";
+
     }
 
     public static class Server {
@@ -68,8 +77,36 @@ public abstract class Packet {
         public static final String PING = "PacketStatusInPing";
         public static final String START = "PacketStatusInStart";
         public static final String SUCCESS = "PacketLoginOutSuccess";
+
+        public static final String[] LOGIN_PACKETS = new String[]{"PacketHandshakingInSetProtocol", "PacketLoginInStart", "PacketLoginInEncryptionBegin"};
     }
 
+    /**
+     * Is this NMS packet an instanceof the "PacketPlayInFlying" packet in the 1.8 protocol?
+     * Supports 1.9->1.15.2 too!
+     * @param nmsPacket
+     * @return If the nms packet provided is an instanceof the "PacketPlayInFlying" packet in the 1.8 protocol!
+     */
+    public static boolean isInstanceOfFlyingPacket(Object nmsPacket) {
+        //1.7->1.8.8
+        if (packetPlayInFlying != null) {
+            return packetPlayInFlying.isInstance(nmsPacket);
+        } else {
+            //1.9->1.15.2
+            return packetPlayInPosition.isInstance(nmsPacket)
+                    || packetPlayInPositionLook.isInstance(nmsPacket)
+                    || packetPlayInLook.isInstance(nmsPacket);
+        }
+    }
+
+    /**
+     * Use isInstanceOfFlyingPacket(nmsPacketObject) instead of this, as the flying packet is the only packet that has subclasses (in 1.8 atleast).
+     * Will be removed in newer versions of PacketEvents!
+     * @param fatherPacket
+     * @param childPacket
+     * @return isInstanceOf
+     */
+    @Deprecated
     public static boolean isInstanceOf(String fatherPacket, String childPacket) {
         if (fatherPacket.equals(Client.FLYING) && childPacket.equals(Client.POSITION) || childPacket.equals(Client.POSITION_LOOK) || childPacket.equals(Client.LOOK)) {
             return true;
@@ -77,5 +114,21 @@ public abstract class Packet {
         return fatherPacket.equals(childPacket);
     }
 
+    private static Class<?> packetPlayInFlying, packetPlayInPosition, packetPlayInPositionLook, packetPlayInLook;
+
+    static {
+        try {
+            packetPlayInFlying = NMSUtils.getNMSClass(Client.FLYING);
+        } catch (ClassNotFoundException e) {
+            //That is fine, they are on 1.9+ so we just initiate the rest of the variables
+            try {
+                packetPlayInPosition = NMSUtils.getNMSClass(Client.POSITION);
+                packetPlayInPositionLook = NMSUtils.getNMSClass(Client.POSITION_LOOK);
+                packetPlayInLook = NMSUtils.getNMSClass(Client.LOOK);
+            } catch (ClassNotFoundException e2) {
+                e2.printStackTrace();
+            }
+        }
+    }
 
 }

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

@@ -4,14 +4,9 @@ import io.github.retrooper.packetevents.enums.ServerVersion;
 import org.bukkit.entity.Player;
 
 public class WrappedPacket {
-    private final Player player;
+    protected final Player player;
     protected Object packet;
     protected static ServerVersion version = ServerVersion.getVersion();
-    private static final String err = "Your Version is unsupported, " +
-            "please contact explored " +
-            "through his discord server (http://discord.gg/2uZY5A4) " +
-            "and tell him what version your server is running on! " +
-            "Make sure you are using spigot!";
 
     public WrappedPacket(final Object packet) {
         this.player = null;
@@ -39,12 +34,4 @@ public class WrappedPacket {
 
     }
 
-    protected void throwUnsupportedVersion() {
-        throw new IllegalStateException(err);
-    }
-
-    public final Player getPlayer() {
-        return player;
-    }
-
 }

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

@@ -5,7 +5,7 @@ import io.github.retrooper.packetevents.utils.NMSUtils;
 
 import java.lang.reflect.Field;
 
-public class WrappedPacketInAbilities extends WrappedPacket {
+public final class WrappedPacketInAbilities extends WrappedPacket {
     private boolean isVulnerable;
     private boolean isFlying;
     private boolean allowFly;

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

@@ -4,13 +4,13 @@ import io.github.retrooper.packetevents.enums.Direction;
 import io.github.retrooper.packetevents.enums.PlayerDigType;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.utils.BaseBlockUtils;
+import io.github.retrooper.packetevents.tinyprotocol.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import io.github.retrooper.packetevents.utils.vector.Vector3i;
 
 import java.lang.reflect.Field;
 
-public class WrappedPacketInBlockDig extends WrappedPacket {
+public final class WrappedPacketInBlockDig extends WrappedPacket {
     private Vector3i blockPosition;
     private Direction direction;
     private PlayerDigType digType;
@@ -41,9 +41,9 @@ public class WrappedPacketInBlockDig extends WrappedPacket {
                 final Object enumDirectionObj = fields[1].get(packet);
                 final Object digTypeObj = fields[2].get(packet);
 
-                final int x = blockPosXYZ[0].getInt(blockPosObj);
-                final int y = blockPosXYZ[1].getInt(blockPosObj);
-                final int z = blockPosXYZ[2].getInt(blockPosObj);
+                final int x = blockPosXYZ[0].get(blockPosObj);
+                final int y = blockPosXYZ[1].get(blockPosObj);
+                final int z = blockPosXYZ[2].get(blockPosObj);
 
                 this.blockPosition = new Vector3i(x, y, z);
 
@@ -79,7 +79,7 @@ public class WrappedPacketInBlockDig extends WrappedPacket {
 
     private static Class<?> blockPositionClass;
 
-    private static Field[] blockPosXYZ = new Field[3];
+    private static Reflection.FieldAccessor<Integer>[] blockPosXYZ = new Reflection.FieldAccessor[3];
 
     //1.7
     private static Field face;
@@ -107,9 +107,9 @@ public class WrappedPacketInBlockDig extends WrappedPacket {
             fields[2] = blockDigClass.getDeclaredField("c");
 
             if (version != ServerVersion.v_1_7_10) {
-                blockPosXYZ[0] = blockPositionClass.getSuperclass().getDeclaredField(BaseBlockUtils.getPosXFieldName());
-                blockPosXYZ[1] = blockPositionClass.getSuperclass().getDeclaredField(BaseBlockUtils.getPosXFieldName());
-                blockPosXYZ[2] = blockPositionClass.getSuperclass().getDeclaredField(BaseBlockUtils.getPosZFieldName());
+                blockPosXYZ[0] = Reflection.getField(blockPositionClass.getSuperclass(), int.class, 0);
+                blockPosXYZ[1] = Reflection.getField(blockPositionClass.getSuperclass(), int.class, 1);
+                blockPosXYZ[2] = Reflection.getField(blockPositionClass.getSuperclass(), int.class, 2);
             } else {
                 face = blockDigClass.getDeclaredField("face");
                 e = blockDigClass.getDeclaredField("e");
@@ -124,12 +124,6 @@ public class WrappedPacketInBlockDig extends WrappedPacket {
             }
         }
 
-        for(Field f : blockPosXYZ) {
-            if(f != null) {
-                f.setAccessible(true);
-            }
-        }
-
         if(e != null) {
             e.setAccessible(true);
         }

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

@@ -1,6 +1,5 @@
 package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
 
-import io.github.retrooper.packetevents.enums.Hand;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
 import io.github.retrooper.packetevents.utils.vector.Vector3i;
@@ -9,9 +8,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 
-public class WrappedPacketInBlockPlace extends WrappedPacket {
+public final class WrappedPacketInBlockPlace extends WrappedPacket {
     private Vector3i blockPosition;
-    private Hand hand;
     private ItemStack itemStack;
 
     public WrappedPacketInBlockPlace(final Player player, final Object packet) {
@@ -23,47 +21,40 @@ public class WrappedPacketInBlockPlace extends WrappedPacket {
         //1.7.10
         Vector3i position = null;
         ItemStack itemStack = null;
-        Hand hand = null;
         try {
         if (version.isHigherThan(ServerVersion.v_1_8_8)) {
             final WrappedPacketInBlockPlace_1_9 updatedBlockPlace = new WrappedPacketInBlockPlace_1_9(getPlayer(), packet);
             final Block block = updatedBlockPlace.getBlock();
             position = new Vector3i(block.getX(), block.getY(), block.getZ());
-            hand = updatedBlockPlace.getHand();
             itemStack = new ItemStack(block.getType());
-            //  init direction
         } else {
-            final WrappedPacketInBlockPlace_Legacy legacyBlockPlace = new WrappedPacketInBlockPlace_Legacy(packet);
+            final WrappedPacketInBlockPlace_1_8 legacyBlockPlace = new WrappedPacketInBlockPlace_1_8(packet);
             position = legacyBlockPlace.getBlockPosition();
-            hand = legacyBlockPlace.getHand();
             itemStack = legacyBlockPlace.getItemStack();
-            //init direction
         } }
         catch(IllegalArgumentException e) {
             e.printStackTrace();
         }
         this.blockPosition = position;
         this.itemStack = itemStack;
-        this.hand = hand;
+    }
+    public Player getPlayer() {
+        return this.player;
     }
 
     public Vector3i getBlockPosition() {
         return blockPosition;
     }
 
-    public Hand getHand() {
-        return hand;
-    }
-
     public ItemStack getItemStack() {
         return itemStack;
     }
 
     static {
         if (version.isHigherThan(ServerVersion.v_1_8_8)) {
-            WrappedPacketInBlockPlace_1_9.setupStaticVars();
-        } else {
-            WrappedPacketInBlockPlace_Legacy.setupStaticVars();
+            WrappedPacketInBlockPlace_1_9.initStatic();
+        } else if(version.isLowerThan(ServerVersion.v_1_9) && version.isHigherThan(ServerVersion.v_1_7_10)){
+            WrappedPacketInBlockPlace_1_8.initStatic();
         }
     }
 

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

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

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

@@ -0,0 +1,59 @@
+package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
+
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.tinyprotocol.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.utils.vector.Vector3i;
+import org.bukkit.inventory.ItemStack;
+
+final class WrappedPacketInBlockPlace_1_8 extends WrappedPacket {
+    private Vector3i blockPosition;
+    private ItemStack itemStack;
+    WrappedPacketInBlockPlace_1_8(final Object packet) {
+        super(packet);
+    }
+
+    @Override
+    protected void setup() {
+        Object nmsBlockPos = blockPositionAccessor.get(packet);
+
+        int x = (int) blockPositionXYZInvoker[0].invoke(nmsBlockPos);
+        int y = (int) blockPositionXYZInvoker[1].invoke(nmsBlockPos);
+        int z = (int) blockPositionXYZInvoker[2].invoke(nmsBlockPos);
+
+        this.blockPosition = new Vector3i(x, y, z);
+
+        this.itemStack = NMSUtils.toBukkitItemStack(itemStackFieldAccessor.get(packet));
+    }
+
+    public Vector3i getBlockPosition() {
+        return blockPosition;
+    }
+
+    public ItemStack getItemStack() {
+        return itemStack;
+    }
+
+    private static Class<?> blockPlaceClass, blockPositionClass;
+
+    private static Reflection.FieldAccessor<?> blockPositionAccessor, itemStackFieldAccessor;
+    private static final Reflection.MethodInvoker[] blockPositionXYZInvoker = new Reflection.MethodInvoker[3];
+
+    protected static void initStatic(){
+        try {
+            blockPlaceClass = NMSUtils.getNMSClass("PacketPlayInBlockPlace");
+
+            blockPositionClass = NMSUtils.getNMSClass("BlockPosition");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        itemStackFieldAccessor = Reflection.getField(blockPlaceClass, NMSUtils.nmsItemStackClass, 0);
+
+        blockPositionAccessor = Reflection.getField(blockPlaceClass, blockPositionClass, 1);
+
+        blockPositionXYZInvoker[0] = Reflection.getMethod(blockPositionClass.getSuperclass(), "getX");
+        blockPositionXYZInvoker[1] = Reflection.getMethod(blockPositionClass.getSuperclass(), "getY");
+        blockPositionXYZInvoker[2] = Reflection.getMethod(blockPositionClass.getSuperclass(), "getZ");
+    }
+}

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

@@ -1,17 +1,16 @@
 package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
 
-import io.github.retrooper.packetevents.enums.Hand;
+
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.utils.BlockFinder;
 import io.github.retrooper.packetevents.utils.NMSUtils;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
-import java.lang.reflect.Field;
+import java.util.HashSet;
 
-class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
+final class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
     private Block block;
-    private Hand hand;
 
     public WrappedPacketInBlockPlace_1_9(final Player player, final Object packet) {
         super(player, packet);
@@ -19,19 +18,12 @@ class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
 
     @Override
     protected void setup() {
-        try {
-            this.block = BlockFinder.getBlocksInDirection(getPlayer(), 10);
+        this.block = getPlayer().getTargetBlock((HashSet<Material>)null, 3);
 
-            final Object enumHandObj = enumHandField.get(packet);
-
-            this.hand = Hand.valueOf(enumHandObj.toString());
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
     }
 
-    public Hand getHand() {
-        return hand;
+    public Player getPlayer() {
+        return this.player;
     }
 
     public Block getBlock() {
@@ -39,26 +31,12 @@ class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
     }
 
     private static Class<?> blockPlaceClass_1_9;
-
-    private static Field enumHandField;
-
-
-    protected static void setupStaticVars() {
+    protected static void initStatic() {
         try {
-            blockPlaceClass_1_9 = NMSUtils.getNMSClass("PacketPlayInBlockPlace");
+            blockPlaceClass_1_9 = NMSUtils.getNMSClass("PacketPlayInUseItem");
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         }
-
-        try {
-            enumHandField = blockPlaceClass_1_9.getDeclaredField("a");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        if (!enumHandField.isAccessible()) {
-            enumHandField.setAccessible(true);
-        }
     }
 
 

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

@@ -1,153 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
-
-import io.github.retrooper.packetevents.enums.Hand;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.utils.BaseBlockUtils;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import io.github.retrooper.packetevents.utils.vector.Vector3i;
-import org.bukkit.inventory.ItemStack;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-class WrappedPacketInBlockPlace_Legacy extends WrappedPacket {
-    private Vector3i blockPosition;
-    private ItemStack itemStack;
-    private Hand hand;
-
-    WrappedPacketInBlockPlace_Legacy(final Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        try {
-            final Hand hand = Hand.MAIN_HAND;
-            final ItemStack itemStack;
-            final int x, y, z;
-            if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-                final Object nmsBlockPosObj = fields[0].get(packet);
-
-                x = blockPosXYZ[0].getInt(nmsBlockPosObj);
-                y = blockPosXYZ[1].getInt(nmsBlockPosObj);
-                z = blockPosXYZ[2].getInt(nmsBlockPosObj);
-
-                Object nmsItemStackObj = fields[1].get(packet);
-
-                Object craftItemStack = asBukkitCopyMethod.invoke(null, nmsItemStackObj);
-
-                itemStack = (ItemStack) craftItemStack;
-            }
-            //1.7.10
-            else {
-                x = fields_1_7[0].getInt(packet);
-                y = fields_1_7[1].getInt(packet);
-                z = fields_1_7[2].getInt(packet);
-
-                Object nmsItemStackObj = fields_1_7[3].get(packet);
-
-                Object craftItemStack = asBukkitCopyMethod.invoke(null, nmsItemStackObj);
-
-                itemStack = (ItemStack) craftItemStack;
-            }
-
-            this.hand = hand;
-            this.itemStack = itemStack;
-            this.blockPosition = new Vector3i(x, y, z);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public Hand getHand() {
-        return hand;
-    }
-
-    public ItemStack getItemStack() {
-        return itemStack;
-    }
-
-    public Vector3i getBlockPosition() {
-        return blockPosition;
-    }
-
-
-    private static Class<?> blockPlaceClass;
-    private static Class<?> itemStackClass;
-    private static Class<?> craftItemStackClass;
-
-    private static Class<?> blockPositionClass;
-
-    private static Field[] fields = new Field[2];
-
-    private static Field[] fields_1_7 = new Field[4];
-
-    private static Field[] blockPosXYZ = new Field[3];
-
-    private static Method asBukkitCopyMethod;
-
-
-    protected static void setupStaticVars() {
-        try {
-            blockPlaceClass = NMSUtils.getNMSClass("PacketPlayInBlockPlace");
-            itemStackClass = NMSUtils.getNMSClass("ItemStack");
-            craftItemStackClass = NMSUtils.getOBCClass("inventory.CraftItemStack");
-            if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-                blockPositionClass = NMSUtils.getNMSClass("BlockPosition");
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            asBukkitCopyMethod = craftItemStackClass.getMethod("asBukkitCopy", itemStackClass);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            if (version.isLowerThan(ServerVersion.v_1_8)) {
-                //x
-                fields_1_7[0] = blockPlaceClass.getDeclaredField("a");
-                //y
-                fields_1_7[1] = blockPlaceClass.getDeclaredField("b");
-                //z
-                fields_1_7[2] = blockPlaceClass.getDeclaredField("c");
-                //itemstack
-                fields_1_7[3] = blockPlaceClass.getDeclaredField("e");
-            } else {
-                //block pos
-                fields[0] = blockPlaceClass.getDeclaredField("b");
-                //itemstack
-                fields[1] = blockPlaceClass.getDeclaredField("d");
-
-
-                blockPosXYZ[0] = blockPositionClass.getSuperclass().getDeclaredField(BaseBlockUtils.getPosXFieldName());
-                blockPosXYZ[1] = blockPositionClass.getSuperclass().getDeclaredField(BaseBlockUtils.getPosYFieldName());
-                blockPosXYZ[2] = blockPositionClass.getSuperclass().getDeclaredField(BaseBlockUtils.getPosZFieldName());
-            }
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        for (Field f : fields) {
-            if (f != null) {
-                f.setAccessible(true);
-            }
-        }
-
-        for (Field f : fields_1_7) {
-            if (f != null) {
-                f.setAccessible(true);
-            }
-        }
-
-        for (Field f : blockPosXYZ) {
-            if (f != null) {
-                f.setAccessible(true);
-            }
-        }
-    }
-}

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

@@ -6,7 +6,7 @@ import io.github.retrooper.packetevents.utils.NMSUtils;
 
 import java.lang.reflect.Field;
 
-public class WrappedPacketInChat extends WrappedPacket {
+public final class WrappedPacketInChat extends WrappedPacket {
     private String message;
 
     public WrappedPacketInChat(Object packet) {

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

@@ -9,7 +9,7 @@ import org.bukkit.entity.Entity;
 import javax.annotation.Nullable;
 import java.lang.reflect.Field;
 
-public class WrappedPacketInEntityAction extends WrappedPacket {
+public final class WrappedPacketInEntityAction extends WrappedPacket {
     private Entity entity;
     private int entityId;
     private PlayerAction action;

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

@@ -8,7 +8,6 @@ import io.github.retrooper.packetevents.utils.NMSUtils;
 import java.lang.reflect.Field;
 
 public class WrappedPacketInFlying extends WrappedPacket {
-
     private double x;
     private double y;
     private double z;
@@ -73,27 +72,27 @@ public class WrappedPacketInFlying extends WrappedPacket {
         }
     }
 
-    public double getX() {
+    public final double getX() {
         return x;
     }
 
-    public double getY() {
+    public final double getY() {
         return y;
     }
 
-    public double getZ() {
+    public final double getZ() {
         return z;
     }
 
-    public float getYaw() {
+    public final float getYaw() {
         return yaw;
     }
 
-    public float getPitch() {
+    public final float getPitch() {
         return pitch;
     }
 
-    public boolean isOnGround() {
+    public final boolean isOnGround() {
         return onGround;
     }
 

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

@@ -6,7 +6,7 @@ import io.github.retrooper.packetevents.utils.NMSUtils;
 
 import java.lang.reflect.Field;
 
-public class WrappedPacketInKeepAlive extends WrappedPacket {
+public final class WrappedPacketInKeepAlive extends WrappedPacket {
     public WrappedPacketInKeepAlive(final Object packet) {
         super(packet);
     }

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

@@ -7,7 +7,7 @@ import org.bukkit.entity.Entity;
 
 import java.lang.reflect.Field;
 
-public class WrappedPacketInUseEntity extends WrappedPacket {
+public final class WrappedPacketInUseEntity extends WrappedPacket {
     private int entityId;
     private Entity entity;
     private EntityUseAction action;

src/main/java/io/github/retrooper/packetevents/packetwrappers/login/WrappedPacketLoginHandshake.java

@@ -1,4 +1,55 @@
 package io.github.retrooper.packetevents.packetwrappers.login;
 
-public class WrappedPacketLoginHandshake {
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.tinyprotocol.Reflection;
+import io.github.retrooper.packetevents.tinyprotocol.Reflection.FieldAccessor;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+
+public final class WrappedPacketLoginHandshake extends WrappedPacket {
+    private int protocolVersion, port;
+    private String hostname;
+
+    public WrappedPacketLoginHandshake(final Object packet) {
+        super(packet);
+    }
+
+    @Override
+    protected void setup() {
+        final Object protocolVersionObj = fields[0].get(packet);
+        final Object hostNameObj = fields[1].get(packet);
+        final Object portObj = fields[2].get(packet);
+
+        this.protocolVersion = (int)protocolVersionObj;
+        this.hostname = hostNameObj.toString();
+        this.port = (int)portObj;
+    }
+
+    public int getProtocolVersion() {
+        return protocolVersion;
+    }
+
+    public String getHostname() {
+        return hostname;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    private static Class<?> loginHandshakeClass;
+
+    private static FieldAccessor<?>[] fields = new FieldAccessor[3];
+
+    static {
+        try {
+            loginHandshakeClass = NMSUtils.getNMSClass("PacketHandshakingInSetProtocol");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        fields[0] = Reflection.getField(loginHandshakeClass, int.class, 0);
+        fields[1] = Reflection.getField(loginHandshakeClass, String.class, 0);
+        fields[2] = Reflection.getField(loginHandshakeClass, int.class, 1);
+    }
 }

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

@@ -10,7 +10,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 
-public class WrappedPacketOutAnimation extends WrappedPacket implements Sendable {
+public final class WrappedPacketOutAnimation extends WrappedPacket implements Sendable {
     private Entity entity;
     private int entityID;
     private EntityAnimationType type;
@@ -40,15 +40,15 @@ public class WrappedPacketOutAnimation extends WrappedPacket implements Sendable
 
     }
 
-    public final Entity getEntity() {
+    public Entity getEntity() {
         return this.entity;
     }
 
-    public final int getEntityId() {
+    public int getEntityId() {
         return this.entityID;
     }
 
-    public final EntityAnimationType getAnimationType() {
+    public EntityAnimationType getAnimationType() {
         return type;
     }
 

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

@@ -6,10 +6,11 @@ import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-public class WrappedPacketOutChat extends WrappedPacket implements Sendable {
+public final class WrappedPacketOutChat extends WrappedPacket implements Sendable {
     private String message;
 
     public WrappedPacketOutChat(final Object packet) {
@@ -18,58 +19,82 @@ public class WrappedPacketOutChat extends WrappedPacket implements Sendable {
 
     public WrappedPacketOutChat(final String message) {
         super(null);
-        this.message = message;
+        this.message = "{\"text\": \"" + message + "\"}";
     }
 
     @Override
     protected void setup() {
         //all fields are IChatBaseComponents, and named 'a'
-        net.minecraft.server.v1_8_R3.PacketPlayOutChat c;
+
+        try {
+            Object iChatBaseObj = iChatBaseField.get(packet);
+
+            Object contentString = getStringOfIChatBase.invoke(iChatBaseObj);
+
+            this.message = contentString.toString();
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     public Object asNMSPacket() {
-        Object iChatBaseComponentObj = null;
         try {
-            iChatBaseComponentObj = serialize.invoke(null, this.message);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        try {
-            return chatClassConstructor.newInstance(iChatBaseComponentObj);
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
+            return chatClassConstructor.newInstance(toIChatBaseComponent(this.message));
+        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
             e.printStackTrace();
         }
 
         return null;
     }
 
+    public static String toStringFromIChatBaseComponent(Object obj) {
+        try {
+            return getStringOfIChatBase.invoke(obj).toString();
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static Object toIChatBaseComponent(String msg) {
+        try {
+            return serialize.invoke(null, msg);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     public String getMessage() {
         return this.message;
     }
 
-    private static Class<?> chatClass;
-
     private static Constructor<?> chatClassConstructor;
 
-    private static Class<?> iChatBaseComponentClass;
+    private static Class<?> chatClass, iChatBaseComponentClass, chatSerializerClass;
 
-    private static Class<?> chatSerializer;
+    private static Field iChatBaseField;
 
-    private static Method serialize;
+    private static Method serialize, getStringOfIChatBase;
 
     static {
         try {
             chatClass = NMSUtils.getNMSClass("PacketPlayOutChat");
-            final String subClass = version.isHigherThan(ServerVersion.v_1_8) ? "IChatBaseComponent$" : "";
             iChatBaseComponentClass = NMSUtils.getNMSClass("IChatBaseComponent");
-            chatSerializer = NMSUtils.getNMSClass(subClass + "ChatSerializer");
+
+            //In 1.8.3+ the ChatSerializer class is declared in the IChatBaseComponent class, so we have to handle tahat
+            if(version.isHigherThan(ServerVersion.v_1_8)) {
+                for(final Class<?> cls : iChatBaseComponentClass.getDeclaredClasses()) {
+                    if(cls.getSimpleName().equals("ChatSerializer")) {
+                        chatSerializerClass = cls;
+                        break;
+                    }
+                }
+            }
+            else {
+                chatSerializerClass = NMSUtils.getNMSClass("ChatSerializer");
+            }
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         }
@@ -81,10 +106,27 @@ public class WrappedPacketOutChat extends WrappedPacket implements Sendable {
         }
 
         try {
-            serialize = chatSerializer.getMethod("a", String.class);
+            serialize = chatSerializerClass.getMethod("a", String.class);
+            getStringOfIChatBase = iChatBaseComponentClass.getMethod(getTextMethodName());
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
 
+        try {
+            iChatBaseField = chatClass.getDeclaredField("a");
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+        iChatBaseField.setAccessible(true);
+
+    }
+
+    private static String getTextMethodName() {
+        //1.7.10
+        if (version.isLowerThan(ServerVersion.v_1_8)) {
+            return "e"; //or c
+        } else {
+            return "getText";
+        }
     }
 }

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

@@ -4,14 +4,13 @@ import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
 import io.github.retrooper.packetevents.utils.NMSUtils;
-import net.minecraft.server.v1_15_R1.Vec3D;
 import org.bukkit.entity.Entity;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 
-public class WrappedPacketOutEntityVelocity extends WrappedPacket implements Sendable {
+public final class WrappedPacketOutEntityVelocity extends WrappedPacket implements Sendable {
     private Entity entity;
     private int entityId;
     private double velocityX, velocityY, velocityZ;
@@ -32,6 +31,7 @@ public class WrappedPacketOutEntityVelocity extends WrappedPacket implements Sen
     @Override
     protected void setup() {
         try {
+            int i = 0;
             final int entityId = fields[0].getInt(packet);
 
             final int x = fields[1].getInt(packet);
@@ -49,23 +49,23 @@ public class WrappedPacketOutEntityVelocity extends WrappedPacket implements Sen
         }
     }
 
-    public final int getEntityId() {
+    public int getEntityId() {
         return entityId;
     }
 
-    public final Entity getEntity() {
+    public Entity getEntity() {
         return entity;
     }
 
-    public final double getVelocityX() {
+    public double getVelocityX() {
         return velocityX;
     }
 
-    public final double getVelocityY() {
+    public double getVelocityY() {
         return velocityY;
     }
 
-    public final double getVelocityZ() {
+    public double getVelocityZ() {
         return velocityZ;
     }
 
@@ -100,8 +100,6 @@ public class WrappedPacketOutEntityVelocity extends WrappedPacket implements Sen
      * 1.14+ use int, Vec3D style
      */
     static {
-        Vec3D vec = new Vec3D(0, 0, 0);
-
         try {
 
             velocityClass = NMSUtils.getNMSClass("PacketPlayOutEntityVelocity");

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

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

src/main/java/io/github/retrooper/packetevents/tinyprotocol/TinyProtocol7.java

@@ -72,14 +72,10 @@ public abstract class TinyProtocol7 {
 
     // Packets we have to intercept
     private static final Class<?> PACKET_LOGIN_IN_START = Reflection.getMinecraftClass("PacketLoginInStart");
-    private static final Class<?> PACKET_HANDSHAKING_IN_SET_PROTOCOL = Reflection.getMinecraftClass("PacketHandshakingInSetProtocol");
     private static final FieldAccessor<GameProfile> getGameProfile = Reflection.getField(PACKET_LOGIN_IN_START, GameProfile.class, 0);
-    private static final FieldAccessor<Integer> protocolId = Reflection.getField(PACKET_HANDSHAKING_IN_SET_PROTOCOL, int.class, 0);
-    private static final FieldAccessor<Enum> protocolType = Reflection.getField(PACKET_HANDSHAKING_IN_SET_PROTOCOL, Enum.class, 0);
 
     // Speedup channel/protocol lookup
-    private Map<String, Channel> channelLookup = new MapMaker().weakValues().makeMap();
-    private Map<Channel, Integer> protocolLookup = new MapMaker().weakKeys().makeMap();
+    private final Map<String, Channel> channelLookup = new MapMaker().weakValues().makeMap();
     private Listener listener;
 
     // Channels that have already been removed
@@ -298,7 +294,7 @@ public abstract class TinyProtocol7 {
      * @return The packet to recieve instead, or NULL to cancel.
      */
     public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
-       return packet;
+        return packet;
     }
 
     /**
@@ -350,6 +346,10 @@ public abstract class TinyProtocol7 {
     }
 
 
+    /**
+     * Changed from "tiny-" to "packetevents"
+     * @return handlerName
+     */
     protected String getHandlerName() {
         return "packetevents-" + plugin.getName() + "-" + ID.incrementAndGet();
     }
@@ -362,9 +362,11 @@ public abstract class TinyProtocol7 {
      * @param player - the player to inject.
      */
     public void injectPlayer(Player player) {
-        injectChannelInternal(getChannel(player)).player = player;
-        PacketEvents.getEventManager().callEvent(new PlayerInjectEvent(player));
-
+        final PlayerInjectEvent playerInjectEvent = new PlayerInjectEvent(player);
+        PacketEvents.getEventManager().callEvent(playerInjectEvent);
+        if (!playerInjectEvent.isCancelled()) {
+            injectChannelInternal(getChannel(player)).player = player;
+        }
     }
 
     /**
@@ -421,20 +423,6 @@ public abstract class TinyProtocol7 {
         return channel;
     }
 
-    public int getProtocolVersion(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 protocolLookup.get(channel);
-    }
-
     /**
      * Uninject a specific player.
      *
@@ -550,10 +538,6 @@ public abstract class TinyProtocol7 {
             if (PACKET_LOGIN_IN_START.isInstance(packet)) {
                 GameProfile profile = getGameProfile.get(packet);
                 channelLookup.put(profile.getName(), channel);
-            } else if (PACKET_HANDSHAKING_IN_SET_PROTOCOL.isInstance(packet)) {
-                if (protocolType.get(packet).name().equalsIgnoreCase("LOGIN")) {
-                    protocolLookup.put(channel, protocolId.get(packet));
-                }
             }
         }
     }

src/main/java/io/github/retrooper/packetevents/tinyprotocol/TinyProtocol8.java

@@ -24,9 +24,8 @@ import com.mojang.authlib.GameProfile;
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
 import io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent;
-import io.github.retrooper.packetevents.injector.PacketHandler_1_8;
+import io.github.retrooper.packetevents.handler.TinyProtocolHandler_1_8;
 import io.github.retrooper.packetevents.tinyprotocol.Reflection.FieldAccessor;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection.MethodInvoker;
 import io.netty.channel.*;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -58,7 +57,7 @@ public abstract class TinyProtocol8 {
     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 Reflection.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);
@@ -68,28 +67,23 @@ public abstract class TinyProtocol8 {
     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 Class<?> PACKET_HANDSHAKING_IN_SET_PROTOCOL = Reflection.getMinecraftClass("PacketHandshakingInSetProtocol");
     private static final FieldAccessor<GameProfile> getGameProfile = Reflection.getField(PACKET_LOGIN_IN_START, GameProfile.class, 0);
-    private static final FieldAccessor<Integer> protocolId = Reflection.getField(PACKET_HANDSHAKING_IN_SET_PROTOCOL, int.class, 0);
-    private static final FieldAccessor<Enum> protocolType = Reflection.getField(PACKET_HANDSHAKING_IN_SET_PROTOCOL, Enum.class, 0);
 
     // Speedup channel/protocol lookup
-    private Map<String, Channel> channelLookup = new MapMaker().weakValues().makeMap();
-    private Map<Channel, Integer> protocolLookup = new MapMaker().weakKeys().makeMap();
+    private final 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());
+    private final 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 final List<Channel> serverChannels = Lists.newArrayList();
     private ChannelInboundHandlerAdapter serverChannelHandler;
     private ChannelInitializer<Channel> beginInitProtocol;
     private ChannelInitializer<Channel> endInitProtocol;
@@ -214,14 +208,23 @@ public abstract class TinyProtocol8 {
         plugin.getServer().getPluginManager().registerEvents(listener, plugin);
     }
 
+    /**
+     * Function modified by Retrooper
+     *
+     * @throws NoSuchFieldException
+     * @throws IllegalAccessException
+     */
     @SuppressWarnings("unchecked")
     private void registerChannelHandler() throws NoSuchFieldException, IllegalAccessException {
         Object mcServer = getMinecraftServer.get(Bukkit.getServer());
         Object serverConnection = getServerConnection.get(mcServer);
         boolean looking = true;
 
-        // We need to synchronize against this list
-        final Field networkManagersField = serverConnection.getClass().getDeclaredField(PacketHandler_1_8.getNetworkManagersFieldName());
+        /*
+         * I am doing this so we can support 1.8->1.15.2, the previous method TinyProtocol used wasn't supported on some versions
+         * like 1.15.2
+         */
+        final Field networkManagersField = serverConnection.getClass().getDeclaredField(TinyProtocolHandler_1_8.getNetworkManagersFieldName());
         networkManagersField.setAccessible(true);
         networkManagers = (List<Object>) networkManagersField.get(serverConnection);
         createServerChannelHandler();
@@ -229,7 +232,6 @@ public abstract class TinyProtocol8 {
         // 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 (!(item instanceof ChannelFuture))
                     break;
@@ -262,7 +264,6 @@ public abstract class TinyProtocol8 {
                         // That's fine
                     }
                 }
-
             });
         }
     }
@@ -284,7 +285,7 @@ public abstract class TinyProtocol8 {
      * @return The packet to send instead, or NULL to cancel the transmission.
      */
     public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
-      return packet;
+        return packet;
     }
 
     /**
@@ -350,6 +351,11 @@ public abstract class TinyProtocol8 {
     }
 
 
+    /**
+     * Changed from "tiny-" to "packetevents"
+     *
+     * @return handlerName
+     */
     protected String getHandlerName() {
         return "packetevents-" + plugin.getName() + "-" + ID.incrementAndGet();
     }
@@ -362,8 +368,11 @@ public abstract class TinyProtocol8 {
      * @param player - the player to inject.
      */
     public void injectPlayer(Player player) {
-        injectChannelInternal(getChannel(player)).player = player;
-        PacketEvents.getEventManager().callEvent(new PlayerInjectEvent(player));
+        final PlayerInjectEvent playerInjectEvent = new PlayerInjectEvent(player);
+        PacketEvents.getEventManager().callEvent(playerInjectEvent);
+        if (!playerInjectEvent.isCancelled()) {
+            injectChannelInternal(getChannel(player)).player = player;
+        }
     }
 
     /**
@@ -420,20 +429,6 @@ public abstract class TinyProtocol8 {
         return channel;
     }
 
-    public int getProtocolVersion(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 protocolLookup.get(channel);
-    }
-
     /**
      * Uninject a specific player.
      *
@@ -549,10 +544,6 @@ public abstract class TinyProtocol8 {
             if (PACKET_LOGIN_IN_START.isInstance(packet)) {
                 GameProfile profile = getGameProfile.get(packet);
                 channelLookup.put(profile.getName(), channel);
-            } else if (PACKET_HANDSHAKING_IN_SET_PROTOCOL.isInstance(packet)) {
-                if (protocolType.get(packet).name().equalsIgnoreCase("LOGIN")) {
-                    protocolLookup.put(channel, protocolId.get(packet));
-                }
             }
         }
     }

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

@@ -1,33 +0,0 @@
-package io.github.retrooper.packetevents.utils;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-
-public class BaseBlockUtils {
-    private static final ServerVersion version = PacketEvents.getServerVersion();
-
-    public static String getPosXFieldName() {
-        return "a";
-    }
-
-    public static String getPosYFieldName() {
-        if (version == ServerVersion.v_1_8) {
-            return "b";
-        } else if (version == ServerVersion.v_1_8_3
-                || version == ServerVersion.v_1_8_8
-                || version == ServerVersion.v_1_9) {
-            return "c";
-        }
-        //1.9.4 and higher
-        return "b";
-    }
-
-    public static String getPosZFieldName() {
-        if (version == ServerVersion.v_1_8) {
-            return "c";
-        } else if (version == ServerVersion.v_1_8_3 || version == ServerVersion.v_1_8_8 || version == ServerVersion.v_1_9) {
-            return "d";
-        }
-        return "c";
-    }
-}

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

@@ -1,16 +0,0 @@
-package io.github.retrooper.packetevents.utils;
-
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.util.BlockIterator;
-
-public class BlockFinder {
-    public static Block getBlocksInDirection(final Player player, final int blockDistance) {
-        final BlockIterator it = new BlockIterator(player, blockDistance);
-        Block cur = null;
-        while(it.hasNext()) {
-            cur = it.next();
-        }
-        return cur;
-    }
-}

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

@@ -6,6 +6,7 @@ import io.github.retrooper.packetevents.utils.nms_entityfinder.EntityFinderUtils
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 import javax.annotation.Nullable;
 import java.lang.reflect.Field;
@@ -16,25 +17,16 @@ public class NMSUtils {
     private static final ServerVersion version = ServerVersion.getVersion();
 
 
-    private static final String nettyPrefix = version == ServerVersion.v_1_7_10 ? "net.minecraft.util.io.netty" : "io.netty";
+    public static final String nettyPrefix = version.isLowerThan(ServerVersion.v_1_8) ? "net.minecraft.util.io.netty" : "io.netty";
     private static final String nmsDir = ServerVersion.getNMSDirectory();
     private static final String obcDir = ServerVersion.getOBCDirectory();
 
     public static Class<?> minecraftServerClass, craftWorldsClass,
-            packetClass, entityPlayerClass, playerConnectionClass, craftPlayerClass;
-    private static Class<?> serverConnectionClass, craftEntityClass;
+            packetClass, entityPlayerClass, playerConnectionClass, craftPlayerClass, serverConnectionClass, craftEntityClass, craftItemStack, nmsItemStackClass;
 
-    private static Method getServerMethod;
-    private static Method getCraftWorldHandleMethod;
-    private static Method entityMethod;
-    public static Method getServerConnection;
-    public static Method getCraftPlayerHandle;
-    public static Method getCraftEntityHandle;
-    private static Method sendPacketMethod;
+    private static Method getServerMethod, getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
 
-    private static Field recentTPSField;
-    private static Field entityPlayerPingField;
-    private static Field playerConnectionField;
+    private static Field recentTPSField, entityPlayerPingField, playerConnectionField;
 
     static {
         try {
@@ -46,6 +38,8 @@ public class NMSUtils {
             playerConnectionClass = getNMSClass("PlayerConnection");
             serverConnectionClass = getNMSClass("ServerConnection");
             craftEntityClass = getOBCClass("entity.CraftEntity");
+            craftItemStack = getOBCClass("inventory.CraftItemStack");
+            nmsItemStackClass = getNMSClass("ItemStack");
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         }
@@ -58,6 +52,7 @@ public class NMSUtils {
             getCraftEntityHandle = craftEntityClass.getMethod("getHandle");
             sendPacketMethod = playerConnectionClass.getMethod("sendPacket", packetClass);
             getServerConnection = minecraftServerClass.getMethod("getServerConnection");
+            asBukkitCopy = craftItemStack.getMethod("asBukkitCopy", nmsItemStackClass);
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
@@ -118,35 +113,29 @@ public class NMSUtils {
         final Object craftEntity = craftEntityClass.cast(entity);
         try {
             return getCraftEntityHandle.invoke(craftEntity);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
+        } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
         return null;
     }
 
+    public static Object getCraftPlayer(final Player player) {
+        return craftPlayerClass.cast(player);
+    }
+
     public static Object getEntityPlayer(final Player player) {
+        final Object craftPlayer = getCraftPlayer(player);
+        Object entityPlayer = null;
         try {
-            return getCraftPlayerHandle.invoke(craftPlayerClass.cast(player));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
+            return getCraftPlayerHandle.invoke(craftPlayer);
+        } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
         return null;
     }
 
     public static int getPlayerPing(final Player player) {
-        final Object craftPlayer = craftPlayerClass.cast(player);
-        Object entityPlayer = null;
-        try {
-            entityPlayer = getCraftPlayerHandle.invoke(craftPlayer);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        }
+        Object entityPlayer = getEntityPlayer(player);
         try {
             return entityPlayerPingField.getInt(entityPlayer);
         } catch (IllegalAccessException e) {
@@ -155,6 +144,17 @@ public class NMSUtils {
         return -1;
     }
 
+    public static ItemStack toBukkitItemStack(final Object nmsItemstack) {
+        try {
+            return (ItemStack) asBukkitCopy.invoke(null, nmsItemstack);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     public static boolean is_1_8() {
         return version.isHigherThan(ServerVersion.v_1_7_10)
                 && version.isLowerThan(ServerVersion.v_1_9);
@@ -165,15 +165,7 @@ public class NMSUtils {
     }
 
     public static void sendNMSPacket(final Player player, final Object nmsPacket) {
-        Object entityPlayer = null;
-        try {
-            entityPlayer = getCraftPlayerHandle.invoke(craftPlayerClass.cast(player));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        }
-
+        Object entityPlayer = getEntityPlayer(player);
         Object playerConnection = null;
         try {
             playerConnection = playerConnectionField.get(entityPlayer);
@@ -183,9 +175,7 @@ public class NMSUtils {
 
         try {
             sendPacketMethod.invoke(playerConnection, nmsPacket);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
+        } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
     }

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

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

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

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

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

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

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

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

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

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

src/main/resources/plugin.yml

@@ -1,4 +0,0 @@
-name: packetevents
-version: 1.2.8
-main: io.github.retrooper.packetevents.example.MainExample
-author: retrooper