Merge pull request #57 from retrooper/dev

PacketEvents 1.7.1 Release

README.md

@@ -1,10 +1,10 @@
 # packetevents 
 
-A spigot packet API with some nice utlities.
+A Spigot packet API with some nice utlities.
 
 ## About
 
-This packetlistener is **only** supported on spigot servers and has been tested to work on these spigot forks: PaperSpigot, Tuinity
+This packetlistener is **only** supported on Spigot servers and has been tested to work on these Spigot forks: PaperMC, Tuinity
 
 * No dependencies
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.retrooper</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.6.9</version>
+    <version>1.7.1</version>
 
     <!-- You can build the project with this: "mvn clean compile assembly:single" -->
     <build>
@@ -74,6 +74,27 @@
 
 
     <dependencies>
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.16.2</artifactId>
+            <version>1.16.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.13.2</artifactId>
+            <version>1.13.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.github.spigot</groupId>
+            <artifactId>1.12.2</artifactId>
+            <version>1.12.2</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.github.spigot</groupId>
             <artifactId>1.8.8</artifactId>

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

@@ -24,34 +24,43 @@
 
 package io.github.retrooper.packetevents;
 
-import io.github.retrooper.packetevents.enums.ClientVersion;
-import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.bungee.BungeePluginMessageListener;
 import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.event.impl.BukkitMoveEvent;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packetmanager.PacketManager;
+import io.github.retrooper.packetevents.packetmanager.netty.NettyPacketManager;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.settings.PacketEventsSettings;
+import io.github.retrooper.packetevents.updatechecker.UpdateChecker;
 import io.github.retrooper.packetevents.utils.entityfinder.EntityFinderUtils;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.player.ClientVersion;
+import io.github.retrooper.packetevents.utils.server.PEVersion;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Random;
+import java.util.concurrent.Future;
 
 public final class PacketEvents implements Listener {
+    private static final String nettyHandlerIdentifier = generateRandomNettyIdentifier();
+
     private static final PacketEventsAPI packetEventsAPI = new PacketEventsAPI();
     private static final PacketEvents instance = new PacketEvents();
     private static final ArrayList<Plugin> plugins = new ArrayList<Plugin>(1);
-    private static boolean loaded, initialized, isBungee;
-    private static final PEVersion version = new PEVersion(1, 6, 9);
+    private static boolean loaded, initialized;
+    private static final PEVersion version = new PEVersion(1, 7, 1);
+
+    private static PacketEventsSettings settings = new PacketEventsSettings();
 
     /**
      * This loads the PacketEvents API.
@@ -73,21 +82,38 @@ public final class PacketEvents implements Listener {
      * All PacketEvents' wrappers are setup and do all loading they need to do.
      */
     public static void load() {
-        ServerVersion version = ServerVersion.getVersion();
-        WrappedPacket.version = version;
-        PacketEvent.version = version;
-        NMSUtils.version = version;
-        EntityFinderUtils.version = version;
+        if (!loaded) {
+            ServerVersion version = ServerVersion.getVersion();
+            WrappedPacket.version = version;
+            PacketEvent.version = version;
+            NMSUtils.version = version;
+            EntityFinderUtils.version = version;
 
-        NMSUtils.load();
+            try {
+                NMSUtils.load();
 
-        PacketTypeClasses.Client.load();
-        PacketTypeClasses.Server.load();
+                PacketTypeClasses.Client.load();
+                PacketTypeClasses.Server.load();
+                PacketTypeClasses.Login.load();
+                PacketTypeClasses.Status.load();
 
-        EntityFinderUtils.load();
+                EntityFinderUtils.load();
 
-        WrappedPacket.loadAllWrappers();
-        loaded = true;
+                WrappedPacket.loadAllWrappers();
+            } catch (Exception ex) {
+                throw new IllegalStateException("PacketEvents failed to successfully load...", ex);
+            }
+            loaded = true;
+        }
+
+    }
+
+    public static void loadSettings(PacketEventsSettings settings) {
+        PacketEvents.settings = settings;
+    }
+
+    public static void init(final Plugin plugin) {
+        init(plugin, settings);
     }
 
     /**
@@ -101,49 +127,36 @@ public final class PacketEvents implements Listener {
      *
      * @param pl JavaPlugin instance
      */
-    public static void init(final Plugin pl) {
-        if (!loaded) {
-            load();
-        }
+    public static void init(final Plugin pl, PacketEventsSettings packetEventsSettings) {
+        load();
         if (!initialized) {
+            settings = packetEventsSettings;
             plugins.add(pl);
+
             //Register Bukkit listener
             Bukkit.getPluginManager().registerEvents(instance, plugins.get(0));
+            PacketEvents.getAPI().packetManager = new PacketManager(plugins.get(0), settings.shouldInjectEarly());
 
             for (final Player p : Bukkit.getOnlinePlayers()) {
                 getAPI().getPlayerUtils().injectPlayer(p);
             }
-            initialized = true;
 
-            Class<?> spigotConfigClass;
-            try {
-                spigotConfigClass = Class.forName("org.spigotmc.SpigotConfig");
-                Field f = spigotConfigClass.getDeclaredField("bungee");
-                isBungee = f.getBoolean(null);
-            } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
-                isBungee = false;
-            }
-
-            if (PacketEvents.getAPI().getSettings().shouldCheckForUpdates()) {
-                Bukkit.getScheduler().runTask(pl, new Runnable() {
+            if (settings.shouldCheckForUpdates()) {
+                Future<?> future = NettyPacketManager.executorService.submit(new Runnable() {
                     @Override
                     public void run() {
                         new UpdateChecker().handleUpdate();
                     }
                 });
             }
-        }
-    }
 
-    /**
-     * Loads PacketEvents if you haven't already, Sets everything up, injects all players
-     *
-     * @param pl Plugin instance
-     * @deprecated Use {@link #init(Plugin)}
-     */
-    @Deprecated
-    public static void start(final Plugin pl) {
-        init(pl);
+            if (getAPI().getServerUtils().isBungeeCordEnabled()) {
+                Bukkit.getMessenger().registerOutgoingPluginChannel(plugins.get(0), "BungeeCord");
+                Bukkit.getServer().getMessenger().registerIncomingPluginChannel(plugins.get(0), BungeePluginMessageListener.tagName, new BungeePluginMessageListener());
+            }
+
+            initialized = true;
+        }
     }
 
     /**
@@ -154,9 +167,11 @@ public final class PacketEvents implements Listener {
             for (final Player p : Bukkit.getOnlinePlayers()) {
                 getAPI().getPlayerUtils().ejectPlayer(p);
             }
+
             getAPI().getEventManager().unregisterAllListeners();
 
             initialized = false;
+            NettyPacketManager.executorService.shutdownNow();
         }
     }
 
@@ -164,11 +179,6 @@ public final class PacketEvents implements Listener {
         return loaded;
     }
 
-    @Deprecated
-    public static boolean hasStarted() {
-        return initialized;
-    }
-
     public static boolean isInitialized() {
         return initialized;
     }
@@ -177,21 +187,21 @@ public final class PacketEvents implements Listener {
         return packetEventsAPI;
     }
 
-    @Deprecated
-    public static Plugin getPlugin() {
-        return plugins.get(0);
-    }
-
     public static ArrayList<Plugin> getPlugins() {
         return plugins;
     }
 
     public static String getHandlerName(final String name) {
-        return "pe-" + PacketEvents.getAPI().getSettings().getIdentifier() + "-" + name;
+        return "pe-" + nettyHandlerIdentifier + "-" + name;
     }
 
+    /**
+     * Get the PacketEvents settings.
+     *
+     * @return Configure some settings for the API
+     */
     public static PacketEventsSettings getSettings() {
-        return PacketEvents.getAPI().getSettings();
+        return settings;
     }
 
     public static PEVersion getVersion() {
@@ -199,32 +209,54 @@ public final class PacketEvents implements Listener {
     }
 
     @EventHandler
-    public void onJoin(final PlayerJoinEvent e) {
-        if (!VersionLookupUtils.hasLoaded()) {
-            VersionLookupUtils.load();
+    public void onLogin(PlayerLoginEvent e) {
+        if (PacketEvents.getSettings().shouldInjectEarly()) {
+            assert getAPI().packetManager.tinyProtocol != null;
+            try {
+                if (getAPI().packetManager.tinyProtocol.canInject(e.getPlayer())) {
+                    getAPI().packetManager.injectPlayer(e.getPlayer());
+                }
+            } catch (Exception ex) {
+                e.disallow(PlayerLoginEvent.Result.KICK_OTHER, "We are unable to inject you. Please try again!");
+            }
         }
-        //for now we don't support bungee, rather handle it than have it FALSE
-        //and return the version of the server.
-        if (isBungee) {
-            PacketEvents.getAPI().getPlayerUtils().clientVersionsMap.put(e.getPlayer().getUniqueId(), ClientVersion.UNKNOWN);
-        } else {
-            ClientVersion version = ClientVersion.getClientVersion(VersionLookupUtils.getProtocolVersion(e.getPlayer()));
-            PacketEvents.getAPI().getPlayerUtils().clientVersionsMap.put(e.getPlayer().getUniqueId(), version);
-        }
-        PacketEvents.getAPI().getPlayerUtils().injectPlayer(e.getPlayer());
     }
 
+    @EventHandler
+    public void onJoin(final PlayerJoinEvent e) {
+        if (!VersionLookupUtils.hasHandledLoadedDependencies()) {
+            VersionLookupUtils.handleLoadedDependencies();
+        }
+        Object channel = NMSUtils.getChannel(e.getPlayer());
+        //Waiting for the BungeeCord server to send their plugin message with your version,
+        //So we leave bungee alone
+        if (!PacketEvents.getAPI().getServerUtils().isBungeeCordEnabled()) {
+            if (VersionLookupUtils.isDependencyAvailable()) {
+                ClientVersion version = ClientVersion.getClientVersion(VersionLookupUtils.getProtocolVersion(e.getPlayer()));
+                PacketEvents.getAPI().getPlayerUtils().clientVersionsMap.put(channel, version);
+            }
+        }
+        if (!PacketEvents.getSettings().shouldInjectEarly()) {
+            PacketEvents.getAPI().packetManager.injectPlayer(e.getPlayer());
+        }
+    }
+
+
     @EventHandler
     public void onQuit(final PlayerQuitEvent e) {
         PacketEvents.getAPI().getPlayerUtils().ejectPlayer(e.getPlayer());
         PacketEvents.getAPI().getPlayerUtils().clientVersionsMap.remove(e.getPlayer().getUniqueId());
     }
 
-    @EventHandler
-    public void onMove(final PlayerMoveEvent e) {
-        BukkitMoveEvent moveEvent = new BukkitMoveEvent(e);
-        PacketEvents.getAPI().getEventManager().callEvent(moveEvent);
-        e.setCancelled(moveEvent.isCancelled());
+    private static String generateRandomNettyIdentifier() {
+        String alphabet = "abcdefghijklmnopqrstuvwxyz";
+        StringBuilder sb = new StringBuilder();
+        Random random = new Random();
+        while (sb.length() < 13) {
+            int index = (int) (random.nextFloat() * alphabet.length());
+            sb.append(alphabet.charAt(index));
+        }
+        return sb.toString();
     }
 
-}
+}

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

@@ -25,6 +25,7 @@
 package io.github.retrooper.packetevents;
 
 import io.github.retrooper.packetevents.event.manager.EventManager;
+import io.github.retrooper.packetevents.packetmanager.PacketManager;
 import io.github.retrooper.packetevents.settings.PacketEventsSettings;
 import io.github.retrooper.packetevents.utils.player.PlayerUtils;
 import io.github.retrooper.packetevents.utils.server.ServerUtils;
@@ -33,34 +34,7 @@ public final class PacketEventsAPI {
     private final EventManager eventManager = new EventManager();
     private final PlayerUtils playerUtils = new PlayerUtils();
     private final ServerUtils serverUtils = new ServerUtils();
-    private final PacketEventsSettings settings = new PacketEventsSettings();
-    //private final UpdateChecker updateChecker = new UpdateChecker();
-
-    /**
-     * Not thread safe
-     * Preciser than #currentMillis()
-     * Expensive
-     * Returns crazy values when you change system time
-     *
-     * @return {@link System#nanoTime()} / 1000000(1 million)
-     */
-    @Deprecated
-    public long currentPreciseMillis() {
-        return System.nanoTime() / 1000000;
-    }
-
-    /**
-     * Thread safe
-     * Less precise compared to #currentPreciseMillis()
-     * Cheap
-     * Doesn't break when system time is changed
-     *
-     * @return {@link System#currentTimeMillis()}
-     */
-    @Deprecated
-    public long currentMillis() {
-        return System.currentTimeMillis();
-    }
+    public PacketManager packetManager = null;
 
     /**
      * Get all utilities to do with the player
@@ -90,22 +64,4 @@ public final class PacketEventsAPI {
     public EventManager getEventManager() {
         return eventManager;
     }
-
-    /**
-     * Get the PacketEvents settings.
-     *
-     * @return Configure some settings for the API
-     */
-    public PacketEventsSettings getSettings() {
-        return settings;
-    }
-/*
-    /**
-     * Get the update checker
-     * @return Update Checker
-     *
-    public UpdateChecker getUpdateChecker() {
-        return updateChecker;
-    }
-*/
 }

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

@@ -1,44 +0,0 @@
-package io.github.retrooper.packetevents;
-
-import org.bukkit.Bukkit;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-
-public class UpdateChecker {
-    public void handleUpdate() {
-        try {
-            String line = readLatestVersion();
-            PEVersion newVersion = new PEVersion(line);
-            PEVersion localVersion = PacketEvents.getVersion();
-            if (localVersion.isOlder(newVersion)) {
-                inform("[PacketEvents] There is an update available for the PacketEvents API! (" + newVersion.toString() + ")");
-            }
-            else if(localVersion.equals(newVersion)) {
-                inform("[PacketEvents] You are on the latest released version of PacketEvents. (" + newVersion.toString() + ")");
-            }
-            else if(localVersion.isNewer(newVersion)) {
-                inform("[PacketEvents] You are on a dev or pre released build of PacketEvents. Your build: (" + localVersion.toString() + ") | Last released build: (" + newVersion.toString() + ")");
-            }
-        } catch (IOException ignored) {
-            //Thats fine, Not important
-        }
-    }
-
-    private void inform(String message) {
-        Bukkit.getLogger().info(message);
-    }
-
-    private String readLatestVersion() throws IOException {
-        URLConnection connection = new URL("https://api.spigotmc.org/legacy/update.php?resource=80279").openConnection();
-        connection.addRequestProperty("User-Agent", "Mozilla/4.0");
-
-        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-
-        return reader.readLine();
-    }
-}

src/main/java/io/github/retrooper/packetevents/bungee/BungeePluginMessageListener.java

@@ -0,0 +1,55 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.bungee;
+
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteStreams;
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.player.ClientVersion;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.messaging.PluginMessageListener;
+
+import java.util.UUID;
+
+public class BungeePluginMessageListener implements PluginMessageListener {
+    public static String tagName = "packetevents";
+
+    @Override
+    public void onPluginMessageReceived(String tag, Player player, byte[] bytes) {
+        if (tag.equals(tagName)) {
+            ByteArrayDataInput in = ByteStreams.newDataInput(bytes);
+            if (in.readUTF().equals("version")) {
+                String uuidString = in.readUTF();
+                Object channel = NMSUtils.getChannel(player);
+                short protocolVersion = in.readShort();
+                ClientVersion version = ClientVersion.getClientVersion(protocolVersion);
+                PacketEvents.getAPI().getPlayerUtils().clientVersionsMap.put(channel, version);
+            }
+        }
+    }
+
+
+}

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

@@ -1,202 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020 retrooper
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package io.github.retrooper.packetevents.enums;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-
-/**
- * @author retrooper
- */
-public enum ServerVersion {
-
-    v_1_7_10, v_1_8, v_1_8_3, v_1_8_4, v_1_8_5, v_1_8_6, v_1_8_7, v_1_8_8,
-    v_1_9, v_1_9_2, v_1_9_4, v_1_10, v_1_10_2, v_1_11, v_1_11_1, v_1_11_2,
-    v_1_12, v_1_12_1, v_1_12_2, v_1_13, v_1_13_1, v_1_13_2, v_1_14, v_1_14_1,
-    v_1_14_2, v_1_14_3, v_1_14_4, v_1_15, v_1_15_1, v_1_15_2, v_1_16, v_1_16_1,
-    v_1_16_2, v_1_16_3, ERROR, EMPTY;
-
-    private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
-    public static ServerVersion[] reversedValues = new ServerVersion[values().length];
-    private static ServerVersion cachedVersion;
-
-    private static ServerVersion getVersionNoCache() {
-        if(reversedValues[0] == null) {
-            reversedValues = ServerVersion.reverse(values());
-        }
-        for (final ServerVersion val : reversedValues) {
-            String valName = val.name().substring(2).replace("_", ".");
-            if (Bukkit.getBukkitVersion().contains(valName)) {
-                return val;
-            }
-        }
-        if(PacketEvents.getSettings().getDefaultServerVersion() != null) {
-            return PacketEvents.getSettings().getDefaultServerVersion();
-        }
-        return ERROR;
-    }
-
-    public static ServerVersion getVersion() {
-        if (cachedVersion == null) {
-            cachedVersion = getVersionNoCache();
-        }
-        return cachedVersion;
-    }
-
-
-    public static ServerVersion[] reverse(final ServerVersion[] arr) {
-        ServerVersion[] array = arr.clone();
-        if (array == null) {
-            return null;
-        }
-        int i = 0;
-        int j = array.length - 1;
-        ServerVersion tmp;
-        while (j > i) {
-            tmp = array[j];
-            array[j] = array[i];
-            array[i] = tmp;
-            j--;
-            i++;
-        }
-        return array;
-    }
-
-    public static String getNmsSuffix() {
-        return nmsVersionSuffix;
-    }
-
-    public static String getNMSDirectory() {
-        return "net.minecraft.server." + getNmsSuffix();
-    }
-
-    public static String getOBCDirectory() {
-        return "org.bukkit.craftbukkit." + getNmsSuffix();
-    }
-
-    /**
-     * Returns if the current version is more up to date than the argument passed version
-     *
-     * @param version The version to compare to the server's value.
-     * @return True if the supplied version is lower, false if it is equal or higher than the server's version.
-     */
-    public boolean isHigherThan(final ServerVersion version) {
-        if (this == version) return false;
-        return !isLowerThan(version);
-    }
-
-    /**
-     * Returns if the current version is more outdated than the argument passed version
-     *
-     * @param version The version to compare to the server's value.
-     * @return True if the supplied version is higher, false if it is equal or lower than the server's version.
-     */
-    public boolean isLowerThan(final ServerVersion version) {
-        if (this == version) return false;
-        final int len = ServerVersion.values().length;
-        for (byte i = 0; i < len; i++) {
-            final ServerVersion v = ServerVersion.values()[i];
-            if (v == this) {
-                return true;
-            } else if (v == version) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Converts the server version to a protocol version.
-     * Recommended to cache.
-     * @return protocol version
-     */
-    public short toProtocolVersion() {
-        switch (this) {
-            case v_1_7_10:
-                return 5;
-            case v_1_8:
-            case v_1_8_3:
-            case v_1_8_4:
-            case v_1_8_5:
-            case v_1_8_6:
-            case v_1_8_7:
-            case v_1_8_8:
-                return 47;
-            case v_1_9:
-                return 107;
-            case v_1_9_2:
-                return 109;
-            case v_1_9_4:
-                return 110;
-            case v_1_10:
-            case v_1_10_2:
-                return 210;
-            case v_1_11:
-                return 315;
-            case v_1_11_1:
-            case v_1_11_2:
-                return 316;
-            case v_1_12:
-                return 335;
-            case v_1_12_1:
-                return 338;
-            case v_1_12_2:
-                return 340;
-            case v_1_13:
-                return 393;
-            case v_1_13_1:
-                return 401;
-            case v_1_13_2:
-                return 404;
-            case v_1_14:
-                return 477;
-            case v_1_14_1:
-                return 480;
-            case v_1_14_2:
-                return 485;
-            case v_1_14_3:
-                return 490;
-            case v_1_14_4:
-                return 498;
-            case v_1_15:
-                return 573;
-            case v_1_15_1:
-                return 575;
-            case v_1_15_2:
-                return 578;
-            case v_1_16:
-                return 735;
-            case v_1_16_1:
-                return 736;
-            case v_1_16_2:
-                return 751;
-            case v_1_16_3:
-                return 753;
-            default:
-                return -1;
-        }
-    }
-}

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

@@ -25,7 +25,7 @@
 package io.github.retrooper.packetevents.event;
 
 
-import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 
 /**
  * An event in the PacketEvents EventManager system.

src/main/java/io/github/retrooper/packetevents/event/annotation/PacketHandler.java

@@ -22,11 +22,9 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.annotations;
+package io.github.retrooper.packetevents.event.annotation;
 
-import io.github.retrooper.packetevents.enums.EventSynchronization;
-import io.github.retrooper.packetevents.enums.PacketEventPriority;
-import org.bukkit.event.EventHandler;
+import io.github.retrooper.packetevents.event.priority.PacketEventPriority;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -37,8 +35,5 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface PacketHandler {
-    @Deprecated
-    EventSynchronization synchronization() default EventSynchronization.NORMAL;
-
     byte priority() default PacketEventPriority.NORMAL;
 }

src/main/java/io/github/retrooper/packetevents/event/eventtypes/CancellableEvent.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.event;
+package io.github.retrooper.packetevents.event.eventtypes;
 
 /**
  * This indicates that it is possible to cancel an event,

src/main/java/io/github/retrooper/packetevents/event/eventtypes/PlayerEvent.java

@@ -22,9 +22,16 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.enums;
+package io.github.retrooper.packetevents.event.eventtypes;
 
-@Deprecated
-public enum EventSynchronization {
-    NORMAL, FORCE_SYNC, FORCE_ASYNC
+import org.bukkit.entity.Player;
+
+/**
+ * Event having to do with a player.
+ */
+public interface PlayerEvent {
+    /**
+     * Associated player.
+     */
+    Player getPlayer();
 }

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

@@ -1,60 +0,0 @@
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.event.CancellableEvent;
-import io.github.retrooper.packetevents.event.PacketEvent;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerMoveEvent;
-
-//Do not use this, I plan to remove this event.
-//If you wish you may recreate this class yourself and use it.
-@Deprecated
-public final class BukkitMoveEvent extends PacketEvent implements CancellableEvent {
-    private final Player player;
-    private final Location to, from;
-    private boolean cancelled;
-
-    public BukkitMoveEvent(final Player player, final Location to, final Location from) {
-        this.player = player;
-        this.to = to;
-        this.from = from;
-    }
-
-    public BukkitMoveEvent(final PlayerMoveEvent e) {
-        this.player = e.getPlayer();
-        this.to = e.getTo();
-        this.from = e.getFrom();
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-    public Location getFrom() {
-        return from;
-    }
-
-    public Location getTo() {
-        return to;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean val) {
-        this.cancelled = val;
-    }
-
-    @Override
-    public void cancel() {
-        this.cancelled = true;
-    }
-
-    @Override
-    public void uncancel() {
-        this.cancelled = false;
-    }
-}

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

@@ -0,0 +1,96 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+
+/**
+ * This event is called when we receive a login packet.
+ */
+public class PacketLoginEvent extends PacketEvent implements CancellableEvent {
+    private final Object channel;
+    private final Object packet;
+    private boolean cancelled;
+
+    public PacketLoginEvent(final Object channel, final Object packet) {
+        this.channel = channel;
+        this.packet = packet;
+    }
+
+    public Object getChannel() {
+        return channel;
+    }
+
+    /**
+     * Get the packet's name (NMS packet class simple name).
+     * The class simple name is cached.
+     *
+     * @return Name of the packet
+     */
+    public String getPacketName() {
+        return ClassUtil.getClassSimpleName(packet.getClass());
+    }
+
+    /**
+     * Get the raw packet object
+     *
+     * @return packet object
+     */
+    public Object getNMSPacket() {
+        return packet;
+    }
+
+    /**
+     * Get the ID of the packet
+     *
+     * @return packet id
+     */
+    public byte getPacketId() {
+        return PacketType.Login.packetIds.getOrDefault(packet.getClass(), (byte) -1);
+    }
+
+    @Override
+    public void cancel() {
+        cancelled = true;
+    }
+
+    @Override
+    public void uncancel() {
+        cancelled = false;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean value) {
+        cancelled = value;
+    }
+}

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

@@ -24,15 +24,17 @@
 
 package io.github.retrooper.packetevents.event.impl;
 
-import io.github.retrooper.packetevents.event.CancellableEvent;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
 import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
 import org.bukkit.entity.Player;
 
 /**
  * This event is called each time a packet is received from a client.
  */
-public final class PacketReceiveEvent extends PacketEvent implements CancellableEvent {
+public final class PacketReceiveEvent extends PacketEvent implements CancellableEvent, PlayerEvent {
     private final Player player;
     private final Object packet;
     private boolean cancelled;
@@ -46,18 +48,18 @@ public final class PacketReceiveEvent extends PacketEvent implements Cancellable
      * Get the packet sender
      * @return player
      */
+    @Override
     public Player getPlayer() {
-        return this.player;
+        return player;
     }
 
     /**
      * Get the packet's name (NMS packet class simple name).
+     * The class simple name is cached.
      * @return Name of the packet
-     * @deprecated It is recommended not to use this.
      */
-    @Deprecated
     public String getPacketName() {
-        return this.packet.getClass().getSimpleName();
+        return ClassUtil.getClassSimpleName(packet.getClass());
     }
 
     /**
@@ -65,17 +67,7 @@ public final class PacketReceiveEvent extends PacketEvent implements Cancellable
      * @return packet object
      */
     public Object getNMSPacket() {
-        return this.packet;
-    }
-
-    /**
-     * Get the class of the NMS packet object
-     * @deprecated It is useless, rather use getNMSPacket().getClass()
-     * @return packet object class
-     */
-    @Deprecated
-    public Class<?> getNMSPacketClass() {
-        return packet.getClass();
+        return packet;
     }
 
     /**
@@ -88,12 +80,12 @@ public final class PacketReceiveEvent extends PacketEvent implements Cancellable
 
     @Override
     public void cancel() {
-        this.cancelled = true;
+        cancelled = true;
     }
 
     @Override
     public void uncancel() {
-        this.cancelled = false;
+        cancelled = false;
     }
 
     @Override
@@ -102,8 +94,8 @@ public final class PacketReceiveEvent extends PacketEvent implements Cancellable
     }
 
     @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    public void setCancelled(boolean value) {
+        cancelled = value;
     }
 
 }

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

@@ -24,15 +24,17 @@
 
 package io.github.retrooper.packetevents.event.impl;
 
-import io.github.retrooper.packetevents.event.CancellableEvent;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
 import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
 import org.bukkit.entity.Player;
 
 /**
  * This event is called each time the server sends a packet to the client.
  */
-public final class PacketSendEvent extends PacketEvent implements CancellableEvent {
+public final class PacketSendEvent extends PacketEvent implements CancellableEvent, PlayerEvent {
     private final Player player;
     private final Object packet;
     private boolean cancelled;
@@ -43,19 +45,18 @@ public final class PacketSendEvent extends PacketEvent implements CancellableEve
         this.cancelled = false;
     }
 
-
+    @Override
     public Player getPlayer() {
-        return this.player;
+        return player;
     }
 
     /**
-     * Get the packet's name (NMS packet class simple name)
-     * @deprecated It is recommended not to use this, as it is an expensive function to call.
+     * Get the packet's name (NMS packet class simple name).
+     * The class simple name is cached.
      * @return Name of the packet
      */
-    @Deprecated
     public String getPacketName() {
-        return this.packet.getClass().getSimpleName();
+        return ClassUtil.getClassSimpleName(packet.getClass());
     }
 
     /**
@@ -73,18 +74,17 @@ public final class PacketSendEvent extends PacketEvent implements CancellableEve
      * @return packet object
      */
     public Object getNMSPacket() {
-        return this.packet;
+        return packet;
     }
 
-    /**
-     * Get the class of the NMS packet object.
-     * Deprecated because it is useless, rather use getNMSPacket().getClass().
-     *
-     * @return packet object class
-     */
-    @Deprecated
-    public Class<?> getNMSPacketClass() {
-        return packet.getClass();
+    @Override
+    public void cancel() {
+        cancelled = true;
+    }
+
+    @Override
+    public void uncancel() {
+        cancelled = false;
     }
 
     @Override
@@ -93,16 +93,8 @@ public final class PacketSendEvent extends PacketEvent implements CancellableEve
     }
 
     @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    public void setCancelled(boolean value) {
+        cancelled = value;
     }
-
-    @Override
-    public void cancel() {
-        this.cancelled = true;
-    }
-
-    @Override
-    public void uncancel() { this.cancelled = false;}
 }
 

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

@@ -0,0 +1,93 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+
+public class PacketStatusEvent extends PacketEvent implements CancellableEvent {
+    private final Object channel;
+    private final Object packet;
+    private boolean cancelled;
+
+    public PacketStatusEvent(final Object channel, final Object packet) {
+        this.channel = channel;
+        this.packet = packet;
+    }
+
+    public Object getChannel() {
+        return channel;
+    }
+
+    /**
+     * Get the packet's name (NMS packet class simple name).
+     * The class simple name is cached.
+     *
+     * @return Name of the packet
+     */
+    public String getPacketName() {
+        return ClassUtil.getClassSimpleName(packet.getClass());
+    }
+
+    /**
+     * Get the raw packet object
+     *
+     * @return packet object
+     */
+    public Object getNMSPacket() {
+        return packet;
+    }
+
+    /**
+     * Get the ID of the packet
+     *
+     * @return packet id
+     */
+    public byte getPacketId() {
+        return PacketType.Status.packetIds.getOrDefault(packet.getClass(), (byte) -1);
+    }
+
+    @Override
+    public void cancel() {
+        cancelled = true;
+    }
+
+    @Override
+    public void uncancel() {
+        cancelled = false;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean value) {
+        cancelled = value;
+    }
+}

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

@@ -24,45 +24,50 @@
 
 package io.github.retrooper.packetevents.event.impl;
 
-import io.github.retrooper.packetevents.event.CancellableEvent;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
 import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
 import org.bukkit.entity.Player;
 
 /**
  * This event is called each time you eject a player.
  */
-public final class PlayerUninjectEvent extends PacketEvent implements CancellableEvent {
+public final class PlayerEjectEvent extends PacketEvent implements CancellableEvent, PlayerEvent {
     private final Player player;
     private final boolean async;
     private boolean cancelled;
 
-    public PlayerUninjectEvent(final Player player, final boolean isAsync) {
+    public PlayerEjectEvent(final Player player, final boolean isAsync) {
         this.player = player;
         this.async = isAsync;
     }
 
-    public PlayerUninjectEvent(final Player player) {
-        this(player, false);
+    public PlayerEjectEvent(final Player player) {
+        this.player = player;
+        this.async = true; //default value
     }
 
     @Override
     public void cancel() {
-        this.cancelled = true;
+        cancelled = true;
     }
 
     @Override
-    public void uncancel() {this.cancelled = false; }
+    public void uncancel() {
+        cancelled = false;
+    }
 
     @Override
     public boolean isCancelled() {
-        return this.cancelled;
+        return cancelled;
     }
 
     @Override
-    public void setCancelled(final boolean val) {
-        this.cancelled = val;
+    public void setCancelled(boolean value) {
+        cancelled = value;
     }
 
+    @Override
     public Player getPlayer() {
         return player;
     }

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

@@ -24,14 +24,15 @@
 
 package io.github.retrooper.packetevents.event.impl;
 
-import io.github.retrooper.packetevents.event.CancellableEvent;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
 import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
 import org.bukkit.entity.Player;
 
 /**
  * This event is called each time you inject a player.
  */
-public final class PlayerInjectEvent extends PacketEvent implements CancellableEvent {
+public final class PlayerInjectEvent extends PacketEvent implements CancellableEvent, PlayerEvent {
     private final Player player;
     private final boolean async;
     private boolean cancelled;
@@ -45,24 +46,27 @@ public final class PlayerInjectEvent extends PacketEvent implements CancellableE
         this.async = isAsync;
     }
 
+    @Override
+    public void cancel() {
+        cancelled = true;
+    }
+
+    @Override
+    public void uncancel() {
+        cancelled = false;
+    }
+
     @Override
     public boolean isCancelled() {
         return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    public void setCancelled(boolean value) {
+        cancelled = value;
     }
 
     @Override
-    public void cancel() {
-        this.cancelled = true;
-    }
-
-    @Override
-    public void uncancel() {this.cancelled = false; }
-
     public Player getPlayer() {
         return player;
     }
@@ -70,5 +74,4 @@ public final class PlayerInjectEvent extends PacketEvent implements CancellableE
     public boolean isAsync() {
         return async;
     }
-
 }

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

@@ -0,0 +1,75 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+import org.bukkit.entity.Player;
+
+public class PostPacketReceiveEvent extends PacketEvent implements PlayerEvent {
+    private final Player player;
+    private final Object packet;
+
+    public PostPacketReceiveEvent(final Player player, final Object packet) {
+        this.player = player;
+        this.packet = packet;
+    }
+
+    /**
+     * Get the packet sender
+     * @return player
+     */
+    @Override
+    public Player getPlayer() {
+        return player;
+    }
+
+    /**
+     * Get the packet's name (NMS packet class simple name).
+     * The class simple name is cached.
+     * @return Name of the packet
+     */
+    public String getPacketName() {
+        return ClassUtil.getClassSimpleName(packet.getClass());
+    }
+
+    /**
+     * Get the raw packet object
+     * @return packet object
+     */
+    public Object getNMSPacket() {
+        return packet;
+    }
+
+    /**
+     * Get the ID of the packet
+     * @return packet id
+     */
+    public byte getPacketId() {
+        return PacketType.Client.packetIds.getOrDefault(packet.getClass(), (byte) -1);
+    }
+}

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

@@ -0,0 +1,75 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.event.eventtypes.PlayerEvent;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+import org.bukkit.entity.Player;
+
+public class PostPacketSendEvent extends PacketEvent implements PlayerEvent {
+    private final Player player;
+    private final Object packet;
+
+    public PostPacketSendEvent(final Player player, final Object packet) {
+        this.player = player;
+        this.packet = packet;
+    }
+
+    /**
+     * Get the packet sender
+     * @return player
+     */
+    @Override
+    public Player getPlayer() {
+        return player;
+    }
+
+    /**
+     * Get the packet's name (NMS packet class simple name).
+     * The class simple name is cached.
+     * @return Name of the packet
+     */
+    public String getPacketName() {
+        return ClassUtil.getClassSimpleName(packet.getClass());
+    }
+
+    /**
+     * Get the raw packet object
+     * @return packet object
+     */
+    public Object getNMSPacket() {
+        return packet;
+    }
+
+    /**
+     * Get the ID of the packet
+     * @return packet id
+     */
+    public byte getPacketId() {
+        return PacketType.Server.packetIds.getOrDefault(packet.getClass(), (byte) -1);
+    }
+}

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

@@ -25,14 +25,13 @@
 package io.github.retrooper.packetevents.event.manager;
 
 import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.annotations.PacketHandler;
-import io.github.retrooper.packetevents.enums.PacketEventPriority;
-import io.github.retrooper.packetevents.event.CancellableEvent;
+import io.github.retrooper.packetevents.event.annotation.PacketHandler;
+import io.github.retrooper.packetevents.event.eventtypes.CancellableEvent;
 import io.github.retrooper.packetevents.event.PacketEvent;
 import io.github.retrooper.packetevents.event.PacketListener;
+import io.github.retrooper.packetevents.event.priority.PacketEventPriority;
 import io.github.retrooper.packetevents.utils.protocollib.ProtocolLibListener;
 import io.github.retrooper.packetevents.utils.protocollib.ProtocolLibUtils;
-import org.bukkit.Bukkit;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -53,44 +52,17 @@ public final class EventManager {
                         || parameterType.isInstance(e)) {
 
                     PacketHandler annotation = method.getAnnotation(PacketHandler.class);
-                    Runnable invokeMethod = new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                method.invoke(listener, e);
-                            } catch (IllegalAccessException | InvocationTargetException ex) {
-                                ex.printStackTrace();
-                            }
-                            if (e instanceof CancellableEvent) {
-                                CancellableEvent ce = (CancellableEvent) e;
-                                if (annotation.priority() >= eventPriority[0]) {
-                                    eventPriority[0] = annotation.priority();
-                                    isCancelled[0] = ce.isCancelled();
-                                }
-                            }
+                    try {
+                        method.invoke(listener, e);
+                    } catch (IllegalAccessException | InvocationTargetException ex) {
+                        ex.printStackTrace();
+                    }
+                    if (e instanceof CancellableEvent) {
+                        CancellableEvent ce = (CancellableEvent) e;
+                        if (annotation.priority() >= eventPriority[0]) {
+                            eventPriority[0] = annotation.priority();
+                            isCancelled[0] = ce.isCancelled();
                         }
-                    };
-                    switch (annotation.synchronization()) {
-                        case FORCE_ASYNC:
-                            Bukkit.getScheduler().runTaskAsynchronously(PacketEvents.getPlugin(), invokeMethod);
-                            break;
-                        case FORCE_SYNC:
-                            Bukkit.getScheduler().runTask(PacketEvents.getPlugin(), invokeMethod);
-                            break;
-                        default:
-                            try {
-                                method.invoke(listener, e);
-                            } catch (IllegalAccessException | InvocationTargetException ex) {
-                                ex.printStackTrace();
-                            }
-                            if (e instanceof CancellableEvent) {
-                                CancellableEvent ce = (CancellableEvent) e;
-                                if (annotation.priority() >= eventPriority[0]) {
-                                    eventPriority[0] = annotation.priority();
-                                    isCancelled[0] = ce.isCancelled();
-                                }
-                            }
-                            break;
                     }
                     if (e instanceof CancellableEvent) {
                         CancellableEvent cancellableEvent = (CancellableEvent) e;
@@ -104,6 +76,9 @@ public final class EventManager {
     public void registerListener(final PacketListener listener) {
         final ConcurrentLinkedQueue<Method> methods = new ConcurrentLinkedQueue<>();
         for (final Method m : listener.getClass().getDeclaredMethods()) {
+            if(!m.isAccessible()) {
+                m.setAccessible(true);
+            }
             if (m.isAnnotationPresent(PacketHandler.class)
                     && m.getParameterTypes().length == 1) {
                 methods.add(m);
@@ -112,7 +87,7 @@ public final class EventManager {
 
         if (!methods.isEmpty()) {
             if (ProtocolLibUtils.isAvailable()
-                    && PacketEvents.getAPI().getSettings().isUseProtocolLibIfAvailable()) {
+                    && PacketEvents.getSettings().shouldUseProtocolLibIfAvailable()) {
                 ProtocolLibListener.registerProtocolLibListener(listener, methods);
             } else {
                 registeredMethods.put(listener, methods);

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

@@ -26,6 +26,14 @@ package io.github.retrooper.packetevents.example;
 
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.PacketListener;
+import io.github.retrooper.packetevents.event.annotation.PacketHandler;
+import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
+import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
+import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.packetwrappers.out.animation.WrappedPacketOutAnimation;
+import io.github.retrooper.packetevents.packetwrappers.out.explosion.WrappedPacketOutExplosion;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class MainExample extends JavaPlugin implements PacketListener {
@@ -37,8 +45,11 @@ public class MainExample extends JavaPlugin implements PacketListener {
 
     @Override
     public void onEnable() {
-        PacketEvents.init(this);
+        PacketEvents.getSettings().injectAsync(true).ejectAsync(true)
+                .backupServerVersion(ServerVersion.v_1_7_10).
+                useProtocolLibIfAvailable(true).checkForUpdates(true).injectEarly(true);
         PacketEvents.getAPI().getEventManager().registerListener(this);
+        PacketEvents.init(this);
     }
 
     @Override

src/main/java/io/github/retrooper/packetevents/exceptions/WrapperFieldNotFoundException.java

@@ -0,0 +1,37 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.exceptions;
+
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+
+public class WrapperFieldNotFoundException extends RuntimeException{
+    public WrapperFieldNotFoundException(String message) {
+        super(message);
+    }
+
+    public WrapperFieldNotFoundException(Class<?> packetClass, Class<?> type, int index) {
+        this("PacketEvents failed to find a " + ClassUtil.getClassSimpleName(type) + " indexed " + index + " by its type in the " + packetClass.getName() + " class!");
+    }
+}

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

@@ -1,187 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020 retrooper
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package io.github.retrooper.packetevents.nettyhandler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent;
-import io.github.retrooper.packetevents.utils.nms.NMSUtils;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-public class NettyPacketHandler {
-    public static boolean v1_7_nettyMode = false;
-    private static final ExecutorService singleThreadedExecutor = Executors.newSingleThreadExecutor();
-
-    static {
-        try {
-            Class.forName("io.netty.channel.Channel");
-        } catch (ClassNotFoundException e) {
-            v1_7_nettyMode = true;
-        }
-    }
-
-    /**
-     * Synchronously inject a player
-     *
-     * @param player Target player to inject
-     */
-    public static void injectPlayer(final Player player) {
-        try {
-            final PlayerInjectEvent injectEvent = new PlayerInjectEvent(player);
-            PacketEvents.getAPI().getEventManager().callEvent(injectEvent);
-            if (!injectEvent.isCancelled()) {
-                if (v1_7_nettyMode) {
-                    NettyPacketHandler_7.injectPlayer(player);
-                } else {
-                    NettyPacketHandler_8.injectPlayer(player);
-                }
-            }
-        } catch (Exception ignored) {
-
-        }
-    }
-
-    /**
-     * Asynchronously inject a player
-     *
-     * @param player
-     * @return {@link java.util.concurrent.Future}
-     */
-    public static Future<?> injectPlayerAsync(final Player player) {
-        //Make sure we cache the channel SYNCHRONOUSLY
-        Object channel = NMSUtils.getChannel(player);
-        return singleThreadedExecutor.submit(() -> {
-            try {
-                final PlayerInjectEvent injectEvent = new PlayerInjectEvent(player, true);
-                PacketEvents.getAPI().getEventManager().callEvent(injectEvent);
-                if (!injectEvent.isCancelled()) {
-                    if (v1_7_nettyMode) {
-                        NettyPacketHandler_7.injectPlayer(player);
-                    } else {
-                        NettyPacketHandler_8.injectPlayer(player);
-                    }
-                }
-            } catch (Exception ignored) {
-
-            }
-        });
-    }
-
-    /**
-     * Synchronously eject a player.
-     *
-     * @param player
-     */
-    public static void ejectPlayer(final Player player) {
-        NMSUtils.channelCache.remove(player.getUniqueId());
-        try {
-            final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
-            PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
-            if (!uninjectEvent.isCancelled()) {
-                if (v1_7_nettyMode) {
-                    NettyPacketHandler_7.ejectPlayer(player);
-                } else {
-                    NettyPacketHandler_8.ejectPlayer(player);
-                }
-            }
-        } catch (Exception ignored) {
-
-        }
-    }
-
-    /**
-     * Asynchronously eject a player
-     *
-     * @param player
-     * @return {@link java.util.concurrent.Future}
-     */
-    public static Future<?> ejectPlayerAsync(final Player player) {
-        NMSUtils.channelCache.remove(player.getUniqueId());
-        Future<?> f = singleThreadedExecutor.submit(() -> {
-            try {
-                final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player, true);
-                PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
-                if (!uninjectEvent.isCancelled()) {
-                    if (v1_7_nettyMode) {
-                        NettyPacketHandler_7.ejectPlayer(player);
-                    } else {
-                        NettyPacketHandler_8.ejectPlayer(player);
-                    }
-                }
-            } catch (Exception ignored) {
-
-            }
-        });
-        return f;
-    }
-
-    /**
-     * This function is called each time the server plans to send a packet to the client.
-     *
-     * @param sender
-     * @param packet
-     * @return
-     */
-    public static Object write(final Player sender, final Object packet) {
-        final PacketSendEvent packetSendEvent = new PacketSendEvent(sender, packet);
-        PacketEvents.getAPI().getEventManager().callEvent(packetSendEvent);
-        if (!packetSendEvent.isCancelled()) {
-            return packet;
-        }
-        return null;
-    }
-
-
-    /**
-     * This function is called each time the server receives a packet from the client.
-     *
-     * @param receiver
-     * @param packet
-     * @return
-     */
-    public static Object read(final Player receiver, final Object packet) {
-        final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(receiver, packet);
-        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent);
-        if (!packetReceiveEvent.isCancelled()) {
-            return packet;
-        }
-        return null;
-    }
-
-    public static void sendPacket(Object channel, Object packet) {
-        if(v1_7_nettyMode) {
-            NettyPacketHandler_7.sendPacket(channel, packet);
-        }
-        else {
-            NettyPacketHandler_8.sendPacket(channel, packet);
-        }
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetmanager/PacketManager.java

@@ -0,0 +1,266 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetmanager;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.event.impl.*;
+import io.github.retrooper.packetevents.packetmanager.netty.NettyPacketManager;
+import io.github.retrooper.packetevents.packetmanager.tinyprotocol.TinyProtocol;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.packetwrappers.login.in.WrappedPacketLoginHandshake;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.player.ClientVersion;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+public class PacketManager {
+    private final Plugin plugin;
+    private final boolean tinyProtocolMode;
+    public final TinyProtocol tinyProtocol;
+    public final NettyPacketManager nettyProtocol;
+    private final HashMap<UUID, Long> keepAliveMap = new HashMap<>();
+
+    public PacketManager(Plugin plugin, boolean tinyProtocolMode) {
+        this.plugin = plugin;
+        this.tinyProtocolMode = tinyProtocolMode;
+        if (tinyProtocolMode) {
+            tinyProtocol = new TinyProtocol(plugin);
+            nettyProtocol = null;
+        } else {
+            tinyProtocol = null;
+            nettyProtocol = new NettyPacketManager(plugin);
+        }
+    }
+
+    public void injectPlayer(Player player) {
+        if (PacketEvents.getSettings().shouldInjectAsync()) {
+            injectPlayerAsync(player);
+        } else {
+            injectPlayerSync(player);
+        }
+    }
+
+    public void ejectPlayer(Player player) {
+        if (PacketEvents.getSettings().shouldEjectAsync()) {
+            ejectPlayerAsync(player);
+        } else {
+            ejectPlayerSync(player);
+        }
+    }
+
+    public void injectPlayerSync(Player player) {
+        PlayerInjectEvent injectEvent = new PlayerInjectEvent(player, false);
+        PacketEvents.getAPI().getEventManager().callEvent(injectEvent);
+        if (!injectEvent.isCancelled()) {
+            if (tinyProtocolMode) {
+                tinyProtocol.injectPlayer(player);
+            } else {
+                nettyProtocol.injectPlayer(player);
+            }
+        }
+    }
+
+    public void injectPlayerAsync(Player player) {
+        PlayerInjectEvent injectEvent = new PlayerInjectEvent(player, true);
+        PacketEvents.getAPI().getEventManager().callEvent(injectEvent);
+        if (!injectEvent.isCancelled()) {
+            if (tinyProtocolMode) {
+                tinyProtocol.injectPlayerAsync(player);
+            } else {
+                nettyProtocol.injectPlayerAsync(player);
+            }
+        }
+    }
+
+    public void ejectPlayerSync(Player player) {
+        PlayerEjectEvent ejectEvent = new PlayerEjectEvent(player, false);
+        PacketEvents.getAPI().getEventManager().callEvent(ejectEvent);
+        if (!ejectEvent.isCancelled()) {
+            keepAliveMap.remove(player.getUniqueId());
+            NMSUtils.channelCache.remove(player.getUniqueId());
+            if (tinyProtocolMode) {
+                tinyProtocol.ejectPlayer(player);
+            } else {
+                nettyProtocol.ejectPlayer(player);
+            }
+        }
+    }
+
+    public void ejectPlayerAsync(Player player) {
+        PlayerEjectEvent ejectEvent = new PlayerEjectEvent(player, true);
+        PacketEvents.getAPI().getEventManager().callEvent(ejectEvent);
+        if (!ejectEvent.isCancelled()) {
+            keepAliveMap.remove(player.getUniqueId());
+            NMSUtils.channelCache.remove(player.getUniqueId());
+            if (tinyProtocolMode) {
+                tinyProtocol.ejectPlayerAsync(player);
+            } else {
+                nettyProtocol.ejectPlayerAsync(player);
+            }
+        }
+    }
+
+    public void sendPacket(Object channel, Object packet) {
+        if (tinyProtocolMode) {
+            tinyProtocol.sendPacket(channel, packet);
+        } else {
+            nettyProtocol.sendPacket(channel, packet);
+        }
+    }
+
+    public Object read(Player player, Object channel, Object packet) {
+        switch (ClassUtil.getClassSimpleName(packet.getClass())) {
+            case "PacketHandshakingInSetProtocol":
+            case "PacketLoginInCustomPayload":
+            case "PacketLoginInStart":
+            case "PacketLoginInEncryptionBegin":
+                final PacketLoginEvent packetLoginEvent = new PacketLoginEvent(channel, packet);
+                PacketEvents.getAPI().getEventManager().callEvent(packetLoginEvent);
+                interceptLogin(packetLoginEvent);
+                if (packetLoginEvent.isCancelled()) {
+                    packet = null;
+                }
+                break;
+            case "PacketStatusInPing":
+                final PacketStatusEvent packetStatusEvent = new PacketStatusEvent(channel, packet);
+                PacketEvents.getAPI().getEventManager().callEvent(packetStatusEvent);
+                interceptStatus(packetStatusEvent);
+                if (packetStatusEvent.isCancelled()) {
+                    packet = null;
+                }
+                break;
+            default:
+                final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(player, packet);
+                PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent);
+                interceptRead(packetReceiveEvent);
+                if (packetReceiveEvent.isCancelled()) {
+                    packet = null;
+                }
+                break;
+        }
+        return packet;
+    }
+
+    public Object write(Player player, Object channel, Object packet) {
+        switch (ClassUtil.getClassSimpleName(packet.getClass())) {
+            case "PacketLoginOutDisconnect":
+            case "PacketLoginOutEncryptionBegin":
+            case "PacketLoginOutSetCompression":
+            case "PacketLoginOutSuccess":
+                final PacketLoginEvent packetLoginEvent = new PacketLoginEvent(channel, packet);
+                PacketEvents.getAPI().getEventManager().callEvent(packetLoginEvent);
+                interceptLogin(packetLoginEvent);
+                if (packetLoginEvent.isCancelled()) {
+                    packet = null;
+                }
+                break;
+            case "PacketStatusOutPong":
+                final PacketStatusEvent packetStatusEvent = new PacketStatusEvent(channel, packet);
+                PacketEvents.getAPI().getEventManager().callEvent(packetStatusEvent);
+                interceptStatus(packetStatusEvent);
+                if (packetStatusEvent.isCancelled()) {
+                    packet = null;
+                }
+                break;
+            default:
+                final PacketSendEvent packetSendEvent = new PacketSendEvent(player, packet);
+                PacketEvents.getAPI().getEventManager().callEvent(packetSendEvent);
+                interceptWrite(packetSendEvent);
+                if (packetSendEvent.isCancelled()) {
+                    packet = null;
+                }
+                break;
+        }
+
+        return packet;
+    }
+
+    public void postRead(Player player, Object packet) {
+        switch (ClassUtil.getClassSimpleName(packet.getClass())) {
+            case "PacketHandshakingInSetProtocol":
+            case "PacketLoginInCustomPayload":
+            case "PacketLoginInStart":
+            case "PacketLoginInEncryptionBegin":
+            case "PacketStatusInPing":
+                break;
+            default:
+                PacketEvents.getAPI().getEventManager().callEvent(new PostPacketReceiveEvent(player, packet));
+                break;
+        }
+    }
+
+    public void postWrite(Player player, Object packet) {
+        switch (ClassUtil.getClassSimpleName(packet.getClass())) {
+            case "PacketLoginOutDisconnect":
+            case "PacketLoginOutEncryptionBegin":
+            case "PacketLoginOutSetCompression":
+            case "PacketLoginOutSuccess":
+            case "PacketStatusOutPong":
+                break;
+            default:
+                PacketEvents.getAPI().getEventManager().callEvent(new PostPacketSendEvent(player, packet));
+                break;
+        }
+    }
+
+
+    private void interceptRead(PacketReceiveEvent event) {
+        if (event.getPacketId() == PacketType.Client.KEEP_ALIVE) {
+            UUID uuid = event.getPlayer().getUniqueId();
+            long timestamp = keepAliveMap.getOrDefault(uuid, event.getTimestamp());
+            long currentTime = event.getTimestamp();
+            long ping = currentTime - timestamp;
+            long smoothedPing = ((PacketEvents.getAPI().getPlayerUtils().getSmoothedPing(event.getPlayer()) * 3) + ping) / 4;
+            PacketEvents.getAPI().getPlayerUtils().playerPingMap.put(uuid, (short) ping);
+            PacketEvents.getAPI().getPlayerUtils().playerSmoothedPingMap.put(uuid, (short) smoothedPing);
+        }
+    }
+
+    private void interceptWrite(PacketSendEvent event) {
+        if (event.getPacketId() == PacketType.Server.KEEP_ALIVE) {
+            keepAliveMap.put(event.getPlayer().getUniqueId(), event.getTimestamp());
+        }
+    }
+
+    private void interceptLogin(PacketLoginEvent event) {
+        if (event.getPacketId() == PacketType.Login.HANDSHAKE) {
+            if (!VersionLookupUtils.isDependencyAvailable()) {
+                WrappedPacketLoginHandshake handshake = new WrappedPacketLoginHandshake(event.getNMSPacket());
+                int protocolVersion = handshake.getProtocolVersion();
+                ClientVersion version = ClientVersion.getClientVersion(protocolVersion);
+                PacketEvents.getAPI().getPlayerUtils().clientVersionsMap.put(event.getChannel(), version);
+            }
+        }
+    }
+
+    private void interceptStatus(PacketStatusEvent event) {
+
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetmanager/netty/NettyPacketManager.java

@@ -0,0 +1,136 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetmanager.netty;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class NettyPacketManager {
+    public static boolean v1_7_nettyMode = false;
+    public static final ExecutorService
+            executorService =
+            Executors.newFixedThreadPool(Math.max(Runtime.getRuntime().availableProcessors(), 64));
+
+    static {
+        try {
+            Class.forName("io.netty.channel.Channel");
+        } catch (ClassNotFoundException e) {
+            v1_7_nettyMode = true;
+        }
+    }
+
+    private Plugin plugin;
+    private Object npm;
+
+    public NettyPacketManager(Plugin plugin) {
+        this.plugin = plugin;
+        if (v1_7_nettyMode) {
+            npm = new NettyPacketManager_7();
+        } else {
+            npm = new NettyPacketManager_8();
+        }
+    }
+
+    /**
+     * Synchronously inject a player
+     *
+     * @param player Target player to inject
+     */
+    public void injectPlayer(final Player player) {
+        if (v1_7_nettyMode) {
+            NettyPacketManager_7 npm_7 = (NettyPacketManager_7)npm;
+            npm_7.injectPlayer(player);
+        } else {
+            NettyPacketManager_8 npm_8 = (NettyPacketManager_8)npm;
+            npm_8.injectPlayer(player);
+        }
+    }
+
+    /**
+     * Asynchronously inject a player
+     *
+     * @param player
+     */
+    public void injectPlayerAsync(final Player player) {
+        //Redundant channel variable created just so we can cache it synchronously.
+        Object channel = NMSUtils.getChannel(player);
+        executorService.execute(() -> {
+            if (v1_7_nettyMode) {
+                NettyPacketManager_7 npm_7 = (NettyPacketManager_7)npm;
+                npm_7.injectPlayer(player);
+            } else {
+                NettyPacketManager_8 npm_8 = (NettyPacketManager_8)npm;
+                npm_8.injectPlayer(player);
+            }
+        });
+    }
+
+    /**
+     * Synchronously eject a player.
+     *
+     * @param player
+     */
+    public void ejectPlayer(final Player player) {
+        if (v1_7_nettyMode) {
+            NettyPacketManager_7 npm_7 = (NettyPacketManager_7)npm;
+            npm_7.ejectPlayer(player);
+        } else {
+            NettyPacketManager_8 npm_8 = (NettyPacketManager_8)npm;
+            npm_8.ejectPlayer(player);
+        }
+    }
+
+    /**
+     * Asynchronously eject a player
+     *
+     * @param player
+     */
+    public void ejectPlayerAsync(final Player player) {
+        executorService.execute(() -> {
+            if (v1_7_nettyMode) {
+                NettyPacketManager_7 npm_7 = (NettyPacketManager_7)npm;
+                npm_7.ejectPlayer(player);
+            } else {
+                NettyPacketManager_8 npm_8 = (NettyPacketManager_8)npm;
+                npm_8.ejectPlayer(player);
+            }
+        });
+    }
+
+    public void sendPacket(Object channel, Object packet) {
+        if (v1_7_nettyMode) {
+            NettyPacketManager_7 npm_7 = (NettyPacketManager_7)npm;
+            npm_7.sendPacket(channel, packet);
+        } else {
+            NettyPacketManager_8 npm_8 = (NettyPacketManager_8)npm;
+            npm_8.sendPacket(channel, packet);
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetmanager/netty/NettyPacketManager_7.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.nettyhandler;
+package io.github.retrooper.packetevents.packetmanager.netty;
 
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
@@ -31,33 +31,36 @@ import net.minecraft.util.io.netty.channel.ChannelDuplexHandler;
 import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
 import net.minecraft.util.io.netty.channel.ChannelPipeline;
 import net.minecraft.util.io.netty.channel.ChannelPromise;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-final class NettyPacketHandler_7 {
+final class NettyPacketManager_7 {
+    NettyPacketManager_7() {
 
+    }
     /**
      * Inject a player using 1.7.10's netty import location
      * @param player
      */
-    public static void injectPlayer(final Player player) {
+    public void injectPlayer(final Player player) {
         final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
             @Override
             public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Object packet = NettyPacketHandler.read(player, msg);
+                Object packet = PacketEvents.getAPI().packetManager.read(player, ctx.channel(), msg);
                 if (packet == null) {
                     return;
                 }
                 super.channelRead(ctx, msg);
+                PacketEvents.getAPI().packetManager.postRead(player, packet);
             }
 
             @Override
             public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-                Object packet = NettyPacketHandler.write(player, msg);
+                Object packet = PacketEvents.getAPI().packetManager.write(player, ctx.channel(),msg);
                 if (packet == null) {
                     return;
                 }
                 super.write(ctx, msg, promise);
+                PacketEvents.getAPI().packetManager.postWrite(player, packet);
             }
         };
         final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
@@ -66,15 +69,15 @@ final class NettyPacketHandler_7 {
 
     /**
      * Eject a player using 1.7.10 netty import location.
-     * @param player
+     * @param player Target Player
      */
-    public static void ejectPlayer(final Player player) {
+    public void ejectPlayer(final Player player) {
          Channel channel = (Channel) NMSUtils.getChannelNoCache(player);
+        assert channel != null;
         channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-        //Make sure we are removing the cache synchronously
     }
 
-    public static void sendPacket(Object rawChannel, Object packet) {
+    public void sendPacket(Object rawChannel, Object packet) {
         Channel channel = (Channel)rawChannel;
         channel.pipeline().writeAndFlush(packet);
     }

src/main/java/io/github/retrooper/packetevents/packetmanager/netty/NettyPacketManager_8.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.nettyhandler;
+package io.github.retrooper.packetevents.packetmanager.netty;
 
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
@@ -31,32 +31,36 @@ import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelPromise;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-final class NettyPacketHandler_8 {
+final class NettyPacketManager_8 {
+    NettyPacketManager_8() {
+
+    }
     /**
      * Inject a player with 1.8+ netty import location.
      * @param player
      */
-    public static void injectPlayer(final Player player) {
+    public void injectPlayer(final Player player) {
         final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
             @Override
             public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Object packet = NettyPacketHandler.read(player, msg);
+                Object packet = PacketEvents.getAPI().packetManager.read(player, ctx.channel(),msg);
                 if (packet == null) {
                     return;
                 }
                 super.channelRead(ctx, msg);
+                PacketEvents.getAPI().packetManager.postRead(player, packet);
             }
 
             @Override
             public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-                Object packet = NettyPacketHandler.write(player, msg);
+                Object packet = PacketEvents.getAPI().packetManager.write(player, ctx.channel(),msg);
                 if (packet == null) {
                     return;
                 }
                 super.write(ctx, msg, promise);
+                PacketEvents.getAPI().packetManager.postWrite(player, packet);
             }
         };
         final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
@@ -67,20 +71,13 @@ final class NettyPacketHandler_8 {
      * Eject a player with 1.8+ netty import location.
      * @param player
      */
-    public static void ejectPlayer(final Player player) {
+    public void ejectPlayer(final Player player) {
         final Channel channel = (Channel) NMSUtils.getChannelNoCache(player);
+        assert channel != null;
         channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-        //Make sure we are removing the cache synchronously
-        Bukkit.getScheduler().runTask(PacketEvents.getPlugins().get(0), new Runnable() {
-            @Override
-            public void run() {
-                //Make sure we are removing the cache SYNCHRONOUSLY
-                NMSUtils.channelCache.remove(player.getUniqueId());
-            }
-        });
     }
 
-    public static void sendPacket(Object rawChannel, Object packet) {
+    public void sendPacket(Object rawChannel, Object packet) {
         Channel channel = (Channel)rawChannel;
         channel.pipeline().writeAndFlush(packet);
     }

src/main/java/io/github/retrooper/packetevents/packetmanager/tinyprotocol/Reflection.java

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

src/main/java/io/github/retrooper/packetevents/packetmanager/tinyprotocol/TinyProtocol.java

@@ -0,0 +1,124 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetmanager.tinyprotocol;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.packetmanager.netty.NettyPacketManager;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class TinyProtocol {
+    private final Object tinyProt;
+
+    public TinyProtocol(Plugin plugin) {
+        if (NettyPacketManager.v1_7_nettyMode) {
+            tinyProt = new TinyProtocol7(plugin);
+        } else {
+            tinyProt = new TinyProtocol8(plugin);
+        }
+    }
+
+    public void injectPlayer(Player player) {
+        if (!NettyPacketManager.v1_7_nettyMode) {
+            TinyProtocol8 tp8 = (TinyProtocol8) tinyProt;
+            tp8.injectPlayer(player);
+        } else {
+            TinyProtocol7 tp7 = (TinyProtocol7) tinyProt;
+            tp7.injectPlayer(player);
+        }
+    }
+
+    public void injectPlayerAsync(Player player) {
+        if (!NettyPacketManager.v1_7_nettyMode) {
+            TinyProtocol8 tp8 = (TinyProtocol8) tinyProt;
+            tp8.injectPlayerAsync(player);
+        } else {
+            TinyProtocol7 tp7 = (TinyProtocol7) tinyProt;
+            tp7.injectPlayerAsync(player);
+        }
+    }
+
+    public void ejectPlayer(Player player) {
+        if (!NettyPacketManager.v1_7_nettyMode) {
+            TinyProtocol8 tp8 = (TinyProtocol8) tinyProt;
+            tp8.uninjectPlayer(player);
+        } else {
+            TinyProtocol7 tp7 = (TinyProtocol7) tinyProt;
+            tp7.uninjectPlayer(player);
+        }
+    }
+
+    public void ejectPlayerAsync(Player player) {
+        if (!NettyPacketManager.v1_7_nettyMode) {
+            TinyProtocol8 tp8 = (TinyProtocol8) tinyProt;
+            tp8.uninjectPlayerAsync(player);
+        } else {
+            TinyProtocol7 tp7 = (TinyProtocol7) tinyProt;
+            tp7.uninjectPlayerAsync(player);
+        }
+    }
+
+    public void sendPacket(Object channel, Object packet) {
+        if (!NettyPacketManager.v1_7_nettyMode) {
+            TinyProtocol8 tp8 = (TinyProtocol8) tinyProt;
+            tp8.sendPacket(channel, packet);
+        } else {
+            TinyProtocol7 tp7 = (TinyProtocol7) tinyProt;
+            tp7.sendPacket(channel, packet);
+        }
+    }
+
+    public Object read(Player player, Object channel, Object packet) {
+        return PacketEvents.getAPI().packetManager.read(player, channel, packet);
+    }
+
+    public Object write(Player player, Object channel, Object packet) {
+        return PacketEvents.getAPI().packetManager.write(player, channel, packet);
+    }
+
+    public Object getChannel(Player player) {
+        if (NettyPacketManager.v1_7_nettyMode) {
+            TinyProtocol7 tp7 = (TinyProtocol7) tinyProt;
+            return tp7.getChannel(player);
+        } else {
+            TinyProtocol8 tp8 = (TinyProtocol8) tinyProt;
+            return tp8.getChannel(player);
+        }
+    }
+
+    public boolean canInject(Player player) {
+        Object channel = getChannel(player);
+        if(channel == null) {
+            return false;
+        }
+        if (NettyPacketManager.v1_7_nettyMode) {
+            TinyProtocol7 tp7 = (TinyProtocol7) tinyProt;
+            return !tp7.uninjectedChannels.contains(channel);
+        } else {
+            TinyProtocol8 tp8 = (TinyProtocol8) tinyProt;
+            return !tp8.uninjectedChannels.contains(channel);
+        }
+    }
+}

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

@@ -0,0 +1,551 @@
+/*
+ * This file is part of Hawk Anticheat.
+ * Copyright (C) 2018 Hawk Development Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.github.retrooper.packetevents.packetmanager.tinyprotocol;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.packetmanager.netty.NettyPacketManager;
+import io.github.retrooper.packetevents.packetmanager.tinyprotocol.Reflection.FieldAccessor;
+import io.github.retrooper.packetevents.packetmanager.tinyprotocol.Reflection.MethodInvoker;
+import net.minecraft.util.com.google.common.collect.Lists;
+import net.minecraft.util.com.google.common.collect.MapMaker;
+import net.minecraft.util.com.mojang.authlib.GameProfile;
+import net.minecraft.util.io.netty.channel.*;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+
+/**
+ * Represents a very tiny alternative to ProtocolLib.
+ * <p>
+ * It now supports intercepting packets during login and status ping (such as OUT_SERVER_PING)!
+ *
+ * @author Kristian
+ */
+
+//BROKEN: NPEs when player joins while server is starting, and using PlayerJoinEvent instead will cause NPE for protocol version lookup.
+//Protocol version number lookup method from DeprecatedLuke's version of TinyProtocol
+public class TinyProtocol7 {
+    private static final AtomicInteger ID = new AtomicInteger();
+
+    // Used in order to lookup a channel
+    private static final MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
+    private static final FieldAccessor<Object> getConnection = Reflection.getField("{nms}.EntityPlayer", "playerConnection", Object.class);
+    private static final FieldAccessor<Object> getManager = Reflection.getField("{nms}.PlayerConnection", "networkManager", Object.class);
+    private static final FieldAccessor<Channel> getChannel = Reflection.getField("{nms}.NetworkManager", Channel.class, 0);
+
+    // Looking up ServerConnection
+    private static final Class<Object> minecraftServerClass = Reflection.getUntypedClass("{nms}.MinecraftServer");
+    private static final Class<Object> serverConnectionClass = Reflection.getUntypedClass("{nms}.ServerConnection");
+    private static final FieldAccessor<Object> getMinecraftServer = Reflection.getField("{obc}.CraftServer", minecraftServerClass, 0);
+    private static final FieldAccessor<Object> getServerConnection = Reflection.getField(minecraftServerClass, serverConnectionClass, 0);
+    private static final MethodInvoker getNetworkMarkers = Reflection.getTypedMethod(serverConnectionClass, null, List.class, serverConnectionClass);
+
+    // Packets we have to intercept
+    private static final Class<?> PACKET_LOGIN_IN_START = Reflection.getMinecraftClass("PacketLoginInStart");
+    private static final Class<?> PACKET_HANDSHAKING_IN_SET_PROTOCOL = Reflection.getMinecraftClass("PacketHandshakingInSetProtocol");
+    private static final FieldAccessor<GameProfile> getGameProfile = Reflection.getField(PACKET_LOGIN_IN_START, GameProfile.class, 0);
+
+    // Speedup channel/protocol lookup
+    private Map<String, Channel> channelLookup = new MapMaker().weakValues().makeMap();
+    private Listener listener;
+
+    // Channels that have already been removed
+    public Set<Channel> uninjectedChannels = Collections.newSetFromMap(new MapMaker().weakKeys().<Channel, Boolean>makeMap());
+
+    // List of network markers
+    private List<Object> networkManagers;
+
+    // Injected channel handlers
+    private List<Channel> serverChannels = Lists.newArrayList();
+    private ChannelInboundHandlerAdapter serverChannelHandler;
+    private ChannelInitializer<Channel> beginInitProtocol;
+    private ChannelInitializer<Channel> endInitProtocol;
+
+    // Current handler name
+    private String handlerName;
+
+    protected volatile boolean closed;
+    protected Plugin plugin;
+
+    /**
+     * Construct a new instance of TinyProtocol, and start intercepting packets for all connected clients and future clients.
+     * <p>
+     * You can construct multiple instances per plugin.
+     *
+     * @param plugin - the plugin.
+     */
+    public TinyProtocol7(final Plugin plugin) {
+        this.plugin = plugin;
+
+        // Compute handler name
+        this.handlerName = getHandlerName();
+
+        try {
+            registerChannelHandler();
+            registerPlayers(plugin);
+        } catch (IllegalArgumentException ex) {
+            // Damn you, late bind
+            plugin.getLogger().info("Delaying server channel injection due to late bind.");
+
+            new BukkitRunnable() {
+                @Override
+                public void run() {
+                    registerChannelHandler();
+                    registerPlayers(plugin);
+                    plugin.getLogger().info("Late bind injection successful.");
+                }
+            }.runTask(plugin);
+        }
+    }
+
+    private void createServerChannelHandler() {
+        // Handle connected channels
+        endInitProtocol = new ChannelInitializer<Channel>() {
+
+            @Override
+            protected void initChannel(Channel channel) throws Exception {
+                try {
+                    // This can take a while, so we need to stop the main thread from interfering
+                    synchronized (networkManagers) {
+                        // Stop injecting channels
+                        if (!closed) {
+                            channel.eventLoop().submit(() -> injectChannelInternal(channel));
+                        }
+                    }
+                } catch (Exception e) {
+                    plugin.getLogger().log(Level.SEVERE, "Cannot inject incomming channel " + channel, e);
+                }
+            }
+
+        };
+
+        // This is executed before Minecraft's channel handler
+        beginInitProtocol = new ChannelInitializer<Channel>() {
+
+            @Override
+            protected void initChannel(Channel channel) throws Exception {
+                channel.pipeline().addLast(endInitProtocol);
+            }
+
+        };
+
+        serverChannelHandler = new ChannelInboundHandlerAdapter() {
+
+            @Override
+            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                Channel channel = (Channel) msg;
+
+                // Prepare to initialize ths channel
+                channel.pipeline().addFirst(beginInitProtocol);
+                ctx.fireChannelRead(msg);
+            }
+
+        };
+    }
+
+
+    @SuppressWarnings("unchecked")
+    private void registerChannelHandler() {
+        Object mcServer = getMinecraftServer.get(Bukkit.getServer());
+        Object serverConnection = getServerConnection.get(mcServer);
+        boolean looking = true;
+
+        // We need to synchronize against this list
+        networkManagers = (List<Object>) getNetworkMarkers.invoke(null, serverConnection);
+        createServerChannelHandler();
+
+        // Find the correct list, or implicitly throw an exception
+        for (int i = 0; looking; i++) {
+            List<Object> list = Reflection.getField(serverConnection.getClass(), List.class, i).get(serverConnection);
+
+            for (Object item : list) {
+                if (!(item instanceof ChannelFuture))
+                    break;
+
+                // Channel future that contains the server connection
+                Channel serverChannel = ((ChannelFuture) item).channel();
+
+                serverChannels.add(serverChannel);
+                serverChannel.pipeline().addFirst(serverChannelHandler);
+                looking = false;
+            }
+        }
+    }
+
+    private void unregisterChannelHandler() {
+        if (serverChannelHandler == null)
+            return;
+
+        for (Channel serverChannel : serverChannels) {
+            final ChannelPipeline pipeline = serverChannel.pipeline();
+
+            // Remove channel handler
+            serverChannel.eventLoop().execute(new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        pipeline.remove(serverChannelHandler);
+                    } catch (NoSuchElementException e) {
+                        // That's fine
+                    }
+                }
+
+            });
+        }
+    }
+
+    private void registerPlayers(Plugin plugin) {
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            injectPlayer(player);
+        }
+    }
+
+    /**
+     * Invoked when the server is starting to send a packet to a player.
+     * <p>
+     * Note that this is not executed on the main thread.
+     *
+     * @param receiver - the receiving player, NULL for early login/status packets.
+     * @param channel  - the channel that received the packet. Never NULL.
+     * @param packet   - the packet being sent.
+     * @return The packet to send instead, or NULL to cancel the transmission.
+     */
+    public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
+        return PacketEvents.getAPI().packetManager.write(receiver, channel, packet);
+    }
+
+    /**
+     * Invoked when the server has received a packet from a given player.
+     * <p>
+     * Use {@link Channel#remoteAddress()} to get the remote address of the client.
+     *
+     * @param sender  - the player that sent the packet, NULL for early login/status packets.
+     * @param channel - channel that received the packet. Never NULL.
+     * @param packet  - the packet being received.
+     * @return The packet to recieve instead, or NULL to cancel.
+     */
+    public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
+        return PacketEvents.getAPI().packetManager.read(sender, channel,packet);
+    }
+
+    /**
+     * Send a packet to a particular player.
+     * <p>
+     * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
+     *
+     * @param player - the destination player.
+     * @param packet - the packet to send.
+     */
+    public void sendPacket(Player player, Object packet) {
+        sendPacket(getChannel(player), packet);
+    }
+
+    /**
+     * Send a packet to a particular client.
+     * <p>
+     * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
+     *
+     * @param channel - client identified by a channel.
+     * @param packet  - the packet to send.
+     */
+    public void sendPacket(Channel channel, Object packet) {
+        channel.pipeline().writeAndFlush(packet);
+    }
+
+    public void sendPacket(Object channel, Object packet) {
+        sendPacket((Channel) channel, packet);
+    }
+
+    /**
+     * Pretend that a given packet has been received from a player.
+     * <p>
+     * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
+     *
+     * @param player - the player that sent the packet.
+     * @param packet - the packet that will be received by the server.
+     */
+    public void receivePacket(Player player, Object packet) {
+        receivePacket(getChannel(player), packet);
+    }
+
+    /**
+     * Pretend that a given packet has been received from a given client.
+     * <p>
+     * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
+     *
+     * @param channel - client identified by a channel.
+     * @param packet  - the packet that will be received by the server.
+     */
+    public void receivePacket(Channel channel, Object packet) {
+        channel.pipeline().context("encoder").fireChannelRead(packet);
+    }
+
+    /**
+     * Retrieve the name of the channel injector, default implementation is "tiny-" + plugin name + "-" + a unique ID.
+     * <p>
+     * Note that this method will only be invoked once. It is no longer necessary to override this to support multiple instances.
+     *
+     * @return A unique channel handler name.
+     */
+    protected String getHandlerName() {
+        return "PacketEvents-" + ID.incrementAndGet();
+    }
+
+    /**
+     * Add a custom channel handler to the given player's channel pipeline, allowing us to intercept sent and received packets.
+     * <p>
+     * This will automatically be called when a player has logged in.
+     *
+     * @param player - the player to inject.
+     */
+    public void injectPlayer(Player player) {
+        injectChannelInternal(getChannel(player)).player = player;
+    }
+
+    public void injectPlayerAsync(Player player) {
+        Channel channel = getChannel(player);
+        injectChannelInternalAsync(channel).player = player;
+    }
+
+    /**
+     * Add a custom channel handler to the given channel.
+     *
+     * @param channel - the channel to inject.
+     */
+    public void injectChannel(Channel channel) {
+        injectChannelInternal(channel);
+    }
+
+    public void injectChannelAsync(Channel channel) {
+        injectChannelInternalAsync(channel);
+    }
+
+    /**
+     * Add a custom channel handler to the given channel.
+     *
+     * @param channel - the channel to inject.
+     * @return The packet interceptor.
+     */
+    private PacketInterceptor injectChannelInternal(Channel channel) {
+        try {
+            PacketInterceptor interceptor = (PacketInterceptor) channel.pipeline().get(handlerName);
+
+            // Inject our packet interceptor
+            if (interceptor == null) {
+                interceptor = new PacketInterceptor();
+                channel.pipeline().addBefore("packet_handler", handlerName, interceptor);
+                uninjectedChannels.remove(channel);
+            }
+
+            return interceptor;
+        } catch (IllegalArgumentException e) {
+            // Try again
+            return (PacketInterceptor) channel.pipeline().get(handlerName);
+        }
+    }
+
+    private PacketInterceptor injectChannelInternalAsync(Channel channel) {
+        try {
+            PacketInterceptor interceptor = (PacketInterceptor) channel.pipeline().get(handlerName);
+
+            // Inject our packet interceptor
+            if (interceptor == null) {
+                interceptor = new PacketInterceptor();
+                final PacketInterceptor pi = interceptor;
+                NettyPacketManager.executorService.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        channel.pipeline().addBefore("packet_handler", handlerName, pi);
+                    }
+                });
+                uninjectedChannels.remove(channel);
+            }
+
+            return interceptor;
+        } catch (IllegalArgumentException e) {
+            // Try again
+            return (PacketInterceptor) channel.pipeline().get(handlerName);
+        }
+    }
+
+    /**
+     * Retrieve the Netty channel associated with a player. This is cached.
+     *
+     * @param player - the player.
+     * @return The Netty channel.
+     */
+    public Channel getChannel(Player player) {
+        Channel channel = channelLookup.get(player.getName());
+
+        // Lookup channel again
+        if (channel == null) {
+            Object connection = getConnection.get(getPlayerHandle.invoke(player));
+            Object manager = getManager.get(connection);
+
+            channelLookup.put(player.getName(), channel = getChannel.get(manager));
+        }
+
+        return channel;
+    }
+
+    /**
+     * Uninject a specific player.
+     *
+     * @param player - the injected player.
+     */
+    public void uninjectPlayer(Player player) {
+        uninjectChannel(getChannel(player));
+    }
+
+    public void uninjectPlayerAsync(Player player) {
+        Channel channel = getChannel(player);
+        uninjectChannelAsync(channel);
+    }
+
+    /**
+     * Uninject a specific channel.
+     * <p>
+     * This will also disable the automatic channel injection that occurs when a player has properly logged in.
+     *
+     * @param channel - the injected channel.
+     */
+    public void uninjectChannel(final Channel channel) {
+        // No need to guard against this if we're closing
+        if (!closed) {
+            uninjectedChannels.add(channel);
+        }
+
+        // See ChannelInjector in ProtocolLib, line 590
+        channel.pipeline().remove(handlerName);
+    }
+
+    public void uninjectChannelAsync(Channel channel) {
+        // No need to guard against this if we're closing
+        if (!closed) {
+            uninjectedChannels.add(channel);
+        }
+
+        // See ChannelInjector in ProtocolLib, line 590
+        NettyPacketManager.executorService.execute(new Runnable() {
+            @Override
+            public void run() {
+                channel.pipeline().remove(handlerName);
+            }
+        });
+
+    }
+
+    /**
+     * Determine if the given player has been injected by TinyProtocol.
+     *
+     * @param player - the player.
+     * @return TRUE if it is, FALSE otherwise.
+     */
+    public boolean hasInjected(Player player) {
+        return hasInjected(getChannel(player));
+    }
+
+    /**
+     * Determine if the given channel has been injected by TinyProtocol.
+     *
+     * @param channel - the channel.
+     * @return TRUE if it is, FALSE otherwise.
+     */
+    public boolean hasInjected(Channel channel) {
+        return channel.pipeline().get(handlerName) != null;
+    }
+
+    /**
+     * Cease listening for packets. This is called automatically when your plugin is disabled.
+     */
+    public final void close() {
+        if (!closed) {
+            closed = true;
+
+            // Remove our handlers
+            for (Player player : plugin.getServer().getOnlinePlayers()) {
+                uninjectPlayer(player);
+            }
+
+            // Clean up Bukkit
+            HandlerList.unregisterAll(listener);
+            unregisterChannelHandler();
+        }
+    }
+
+    /**
+     * Channel handler that is inserted into the player's channel pipeline, allowing us to intercept sent and received packets.
+     *
+     * @author Kristian
+     */
+    private final class PacketInterceptor extends ChannelDuplexHandler {
+        // Updated by the login event
+        public volatile Player player;
+
+        @Override
+        public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+            // Intercept channel
+            final Channel channel = ctx.channel();
+            handleLoginStart(channel, msg);
+
+            try {
+                msg = onPacketInAsync(player, channel, msg);
+            } catch (Exception e) {
+                plugin.getLogger().log(Level.SEVERE, "Error in onPacketInAsync().", e);
+            }
+
+            if (msg != null) {
+                super.channelRead(ctx, msg);
+                PacketEvents.getAPI().packetManager.postRead(player, msg);
+            }
+        }
+
+        @Override
+        public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+            try {
+                msg = onPacketOutAsync(player, ctx.channel(), msg);
+            } catch (Exception e) {
+                plugin.getLogger().log(Level.SEVERE, "Error in onPacketOutAsync().", e);
+            }
+
+            if (msg != null) {
+                super.write(ctx, msg, promise);
+                PacketEvents.getAPI().packetManager.postWrite(player, msg);
+            }
+        }
+
+        private void handleLoginStart(Channel channel, Object packet) {
+            if (PACKET_LOGIN_IN_START.isInstance(packet)) {
+                GameProfile profile = getGameProfile.get(packet);
+                channelLookup.put(profile.getName(), channel);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,558 @@
+/*
+ * This file is part of Hawk Anticheat.
+ * Copyright (C) 2018 Hawk Development Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.retrooper.packetevents.packetmanager.tinyprotocol;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.MapMaker;
+import com.mojang.authlib.GameProfile;
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.packetmanager.netty.NettyPacketManager;
+import io.github.retrooper.packetevents.packetmanager.tinyprotocol.Reflection.FieldAccessor;
+import io.github.retrooper.packetevents.packetmanager.tinyprotocol.Reflection.MethodInvoker;
+import io.netty.channel.*;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+
+/**
+ * Represents a very tiny alternative to ProtocolLib.
+ * <p>
+ * It now supports intercepting packets during login and status ping (such as OUT_SERVER_PING)!
+ *
+ * @author Kristian
+ */
+
+//BROKEN: NPEs when player joins while server is starting, and using PlayerJoinEvent instead will cause NPE for protocol version lookup.
+//Protocol version number lookup method from DeprecatedLuke's version of TinyProtocol
+public class TinyProtocol8 {
+    private static final AtomicInteger ID = new AtomicInteger();
+
+    // Used in order to lookup a channel
+    private static final MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
+    private static final FieldAccessor<Object> getConnection = Reflection.getField("{nms}.EntityPlayer", "playerConnection", Object.class);
+    private static final FieldAccessor<Object> getManager = Reflection.getField("{nms}.PlayerConnection", "networkManager", Object.class);
+    private static final FieldAccessor<Channel> getChannel = Reflection.getField("{nms}.NetworkManager", Channel.class, 0);
+
+    // Looking up ServerConnection
+    private static final Class<Object> minecraftServerClass = Reflection.getUntypedClass("{nms}.MinecraftServer");
+    private static final Class<Object> serverConnectionClass = Reflection.getUntypedClass("{nms}.ServerConnection");
+    private static final FieldAccessor<Object> getMinecraftServer = Reflection.getField("{obc}.CraftServer", minecraftServerClass, 0);
+    private static final FieldAccessor<Object> getServerConnection = Reflection.getField(minecraftServerClass, serverConnectionClass, 0);
+    private static final MethodInvoker getNetworkMarkers = Reflection.getTypedMethod(serverConnectionClass, null, List.class, serverConnectionClass);
+
+    // Packets we have to intercept
+    private static final Class<?> PACKET_LOGIN_IN_START = Reflection.getMinecraftClass("PacketLoginInStart");
+    private static final 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 Listener listener;
+
+    // Channels that have already been removed
+    public Set<Channel> uninjectedChannels = Collections.newSetFromMap(new MapMaker().weakKeys().<Channel, Boolean>makeMap());
+
+    // List of network markers
+    private List<Object> networkManagers;
+
+    // Injected channel handlers
+    private List<Channel> serverChannels = Lists.newArrayList();
+    private ChannelInboundHandlerAdapter serverChannelHandler;
+    private ChannelInitializer<Channel> beginInitProtocol;
+    private ChannelInitializer<Channel> endInitProtocol;
+
+    // Current handler name
+    private String handlerName;
+
+    protected volatile boolean closed;
+    protected Plugin plugin;
+
+    /**
+     * Construct a new instance of TinyProtocol, and start intercepting packets for all connected clients and future clients.
+     * <p>
+     * You can construct multiple instances per plugin.
+     *
+     * @param plugin - the plugin.
+     */
+    public TinyProtocol8(final Plugin plugin) {
+        this.plugin = plugin;
+
+        // Compute handler name
+        this.handlerName = getHandlerName();
+
+        try {
+            registerChannelHandler();
+            registerPlayers(plugin);
+        } catch (IllegalArgumentException ex) {
+            // Damn you, late bind
+            plugin.getLogger().info("Delaying server channel injection due to late bind.");
+
+            new BukkitRunnable() {
+                @Override
+                public void run() {
+                    registerChannelHandler();
+                    registerPlayers(plugin);
+                    plugin.getLogger().info("Late bind injection successful.");
+                }
+            }.runTask(plugin);
+        }
+    }
+
+    private void createServerChannelHandler() {
+        // Handle connected channels
+        endInitProtocol = new ChannelInitializer<Channel>() {
+
+            @Override
+            protected void initChannel(Channel channel) throws Exception {
+                try {
+                    // This can take a while, so we need to stop the main thread from interfering
+                    synchronized (networkManagers) {
+                        // Stop injecting channels
+                        if (!closed) {
+                            channel.eventLoop().submit(() -> injectChannelInternal(channel));
+                        }
+                    }
+                } catch (Exception e) {
+                    plugin.getLogger().log(Level.SEVERE, "Cannot inject incomming channel " + channel, e);
+                }
+            }
+
+        };
+
+        // This is executed before Minecraft's channel handler
+        beginInitProtocol = new ChannelInitializer<Channel>() {
+
+            @Override
+            protected void initChannel(Channel channel) throws Exception {
+                channel.pipeline().addLast(endInitProtocol);
+            }
+
+        };
+
+        serverChannelHandler = new ChannelInboundHandlerAdapter() {
+
+            @Override
+            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                Channel channel = (Channel) msg;
+
+                // Prepare to initialize ths channel
+                channel.pipeline().addFirst(beginInitProtocol);
+                ctx.fireChannelRead(msg);
+            }
+
+        };
+    }
+
+    /**
+     * Register bukkit events.
+     */
+
+    @SuppressWarnings("unchecked")
+    private void registerChannelHandler() {
+        Object mcServer = getMinecraftServer.get(Bukkit.getServer());
+        Object serverConnection = getServerConnection.get(mcServer);
+        boolean looking = true;
+
+        // We need to synchronize against this list
+        networkManagers = (List<Object>) getNetworkMarkers.invoke(null, serverConnection);
+        createServerChannelHandler();
+
+        // Find the correct list, or implicitly throw an exception
+        for (int i = 0; looking; i++) {
+            List<Object> list = Reflection.getField(serverConnection.getClass(), List.class, i).get(serverConnection);
+
+            for (Object item : list) {
+                if (!(item instanceof ChannelFuture))
+                    break;
+
+                // Channel future that contains the server connection
+                Channel serverChannel = ((ChannelFuture) item).channel();
+
+                serverChannels.add(serverChannel);
+                serverChannel.pipeline().addFirst(serverChannelHandler);
+                looking = false;
+            }
+        }
+    }
+
+    private void unregisterChannelHandler() {
+        if (serverChannelHandler == null)
+            return;
+
+        for (Channel serverChannel : serverChannels) {
+            final ChannelPipeline pipeline = serverChannel.pipeline();
+
+            // Remove channel handler
+            serverChannel.eventLoop().execute(new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        pipeline.remove(serverChannelHandler);
+                    } catch (NoSuchElementException e) {
+                        // That's fine
+                    }
+                }
+
+            });
+        }
+    }
+
+    private void registerPlayers(Plugin plugin) {
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            injectPlayer(player);
+        }
+    }
+
+    /**
+     * Invoked when the server is starting to send a packet to a player.
+     * <p>
+     * Note that this is not executed on the main thread.
+     *
+     * @param receiver - the receiving player, NULL for early login/status packets.
+     * @param channel  - the channel that received the packet. Never NULL.
+     * @param packet   - the packet being sent.
+     * @return The packet to send instead, or NULL to cancel the transmission.
+     */
+    public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
+        return PacketEvents.getAPI().packetManager.write(receiver, channel, packet);
+    }
+
+    /**
+     * Invoked when the server has received a packet from a given player.
+     * <p>
+     * Use {@link Channel#remoteAddress()} to get the remote address of the client.
+     *
+     * @param sender  - the player that sent the packet, NULL for early login/status packets.
+     * @param channel - channel that received the packet. Never NULL.
+     * @param packet  - the packet being received.
+     * @return The packet to recieve instead, or NULL to cancel.
+     */
+    public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
+        return PacketEvents.getAPI().packetManager.read(sender, channel, packet);
+    }
+
+    /**
+     * Send a packet to a particular player.
+     * <p>
+     * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
+     *
+     * @param player - the destination player.
+     * @param packet - the packet to send.
+     */
+    public void sendPacket(Player player, Object packet) {
+        sendPacket(getChannel(player), packet);
+    }
+
+    /**
+     * Send a packet to a particular client.
+     * <p>
+     * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
+     *
+     * @param channel - client identified by a channel.
+     * @param packet  - the packet to send.
+     */
+    public void sendPacket(Channel channel, Object packet) {
+        channel.pipeline().writeAndFlush(packet);
+    }
+
+    public void sendPacket(Object channel, Object packet) {
+        sendPacket((Channel) channel, packet);
+    }
+
+    /**
+     * Pretend that a given packet has been received from a player.
+     * <p>
+     * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
+     *
+     * @param player - the player that sent the packet.
+     * @param packet - the packet that will be received by the server.
+     */
+    public void receivePacket(Player player, Object packet) {
+        receivePacket(getChannel(player), packet);
+    }
+
+    /**
+     * Pretend that a given packet has been received from a given client.
+     * <p>
+     * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
+     *
+     * @param channel - client identified by a channel.
+     * @param packet  - the packet that will be received by the server.
+     */
+    public void receivePacket(Channel channel, Object packet) {
+        channel.pipeline().context("encoder").fireChannelRead(packet);
+    }
+
+    /**
+     * Retrieve the name of the channel injector, default implementation is "tiny-" + plugin name + "-" + a unique ID.
+     * <p>
+     * Note that this method will only be invoked once. It is no longer necessary to override this to support multiple instances.
+     *
+     * @return A unique channel handler name.
+     */
+    protected String getHandlerName() {
+        return "PacketEvents-" + ID.incrementAndGet();
+    }
+
+    /**
+     * Add a custom channel handler to the given player's channel pipeline, allowing us to intercept sent and received packets.
+     * <p>
+     * This will automatically be called when a player has logged in.
+     *
+     * @param player - the player to inject.
+     */
+    public void injectPlayer(Player player) {
+        injectChannelInternal(getChannel(player)).player = player;
+    }
+
+    public void injectPlayerAsync(Player player) {
+        Channel channel = getChannel(player);
+        injectChannelInternalAsync(channel).player = player;
+    }
+
+    /**
+     * Add a custom channel handler to the given channel.
+     *
+     * @param channel - the channel to inject.
+     */
+    public void injectChannel(Channel channel) {
+        injectChannelInternal(channel);
+    }
+
+    public void injectChannelAsync(Channel channel) {
+        injectChannelInternalAsync(channel);
+    }
+
+    /**
+     * Add a custom channel handler to the given channel.
+     *
+     * @param channel - the channel to inject.
+     * @return The packet interceptor.
+     */
+    private PacketInterceptor injectChannelInternal(Channel channel) {
+        try {
+            PacketInterceptor interceptor = (PacketInterceptor) channel.pipeline().get(handlerName);
+
+            // Inject our packet interceptor
+            if (interceptor == null) {
+                interceptor = new PacketInterceptor();
+                channel.pipeline().addBefore("packet_handler", handlerName, interceptor);
+                uninjectedChannels.remove(channel);
+            }
+
+            return interceptor;
+        } catch (IllegalArgumentException e) {
+            // Try again
+            return (PacketInterceptor) channel.pipeline().get(handlerName);
+        }
+    }
+
+    private PacketInterceptor injectChannelInternalAsync(Channel channel) {
+        try {
+            PacketInterceptor interceptor = (PacketInterceptor) channel.pipeline().get(handlerName);
+
+            // Inject our packet interceptor
+            if (interceptor == null) {
+                interceptor = new PacketInterceptor();
+                final PacketInterceptor pi = interceptor;
+                NettyPacketManager.executorService.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        channel.pipeline().addBefore("packet_handler", handlerName, pi);
+                    }
+                });
+
+                uninjectedChannels.remove(channel);
+            }
+
+            return interceptor;
+        } catch (IllegalArgumentException e) {
+            // Try again
+            return (PacketInterceptor) channel.pipeline().get(handlerName);
+        }
+    }
+
+    /**
+     * Retrieve the Netty channel associated with a player. This is cached.
+     *
+     * @param player - the player.
+     * @return The Netty channel.
+     */
+    public Channel getChannel(Player player) {
+        Channel channel = channelLookup.get(player.getName());
+
+        // Lookup channel again
+        if (channel == null) {
+            Object connection = getConnection.get(getPlayerHandle.invoke(player));
+            Object manager = getManager.get(connection);
+
+            channelLookup.put(player.getName(), channel = getChannel.get(manager));
+        }
+
+        return channel;
+    }
+
+    /**
+     * Uninject a specific player.
+     *
+     * @param player - the injected player.
+     */
+    public void uninjectPlayer(Player player) {
+        uninjectChannel(getChannel(player));
+    }
+
+    public void uninjectPlayerAsync(Player player) {
+        Channel channel = getChannel(player);
+        uninjectChannelAsync(channel);
+    }
+
+    /**
+     * Uninject a specific channel.
+     * <p>
+     * This will also disable the automatic channel injection that occurs when a player has properly logged in.
+     *
+     * @param channel - the injected channel.
+     */
+    public void uninjectChannel(final Channel channel) {
+        // No need to guard against this if we're closing
+        if (!closed) {
+            uninjectedChannels.add(channel);
+        }
+
+        // See ChannelInjector in ProtocolLib, line 590
+        channel.pipeline().remove(handlerName);
+    }
+
+    public void uninjectChannelAsync(Channel channel) {
+        // No need to guard against this if we're closing
+        if (!closed) {
+            uninjectedChannels.add(channel);
+        }
+
+        // See ChannelInjector in ProtocolLib, line 590
+        NettyPacketManager.executorService.execute(new Runnable() {
+            @Override
+            public void run() {
+                channel.pipeline().remove(handlerName);
+            }
+        });
+
+    }
+
+    /**
+     * Determine if the given player has been injected by TinyProtocol.
+     *
+     * @param player - the player.
+     * @return TRUE if it is, FALSE otherwise.
+     */
+    public boolean hasInjected(Player player) {
+        return hasInjected(getChannel(player));
+    }
+
+    /**
+     * Determine if the given channel has been injected by TinyProtocol.
+     *
+     * @param channel - the channel.
+     * @return TRUE if it is, FALSE otherwise.
+     */
+    public boolean hasInjected(Channel channel) {
+        return channel.pipeline().get(handlerName) != null;
+    }
+
+    /**
+     * Cease listening for packets. This is called automatically when your plugin is disabled.
+     */
+    public final void close() {
+        if (!closed) {
+            closed = true;
+
+            // Remove our handlers
+            for (Player player : plugin.getServer().getOnlinePlayers()) {
+                uninjectPlayer(player);
+            }
+
+            // Clean up Bukkit
+            HandlerList.unregisterAll(listener);
+            unregisterChannelHandler();
+        }
+    }
+
+    /**
+     * Channel handler that is inserted into the player's channel pipeline, allowing us to intercept sent and received packets.
+     *
+     * @author Kristian
+     */
+    private final class PacketInterceptor extends ChannelDuplexHandler {
+        // Updated by the login event
+        public volatile Player player;
+
+        @Override
+        public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+            // Intercept channel
+            final Channel channel = ctx.channel();
+            handleLoginStart(channel, msg);
+
+            try {
+                msg = onPacketInAsync(player, channel, msg);
+            } catch (Exception e) {
+                plugin.getLogger().log(Level.SEVERE, "Error in onPacketInAsync().", e);
+            }
+
+            if (msg != null) {
+                super.channelRead(ctx, msg);
+                PacketEvents.getAPI().packetManager.postRead(player, msg);
+            }
+        }
+
+        @Override
+        public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+            try {
+                msg = onPacketOutAsync(player, ctx.channel(), msg);
+            } catch (Exception e) {
+                plugin.getLogger().log(Level.SEVERE, "Error in onPacketOutAsync().", e);
+            }
+
+            if (msg != null) {
+                super.write(ctx, msg, promise);
+                PacketEvents.getAPI().packetManager.postWrite(player, msg);
+            }
+        }
+
+        private void handleLoginStart(Channel channel, Object packet) {
+            if (PACKET_LOGIN_IN_START.isInstance(packet)) {
+                GameProfile profile = getGameProfile.get(packet);
+                channelLookup.put(profile.getName(), channel);
+            }
+        }
+    }
+}

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

@@ -24,14 +24,39 @@
 
 package io.github.retrooper.packetevents.packettype;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-
 import java.util.HashMap;
 import java.util.Map;
 
 public class PacketType {
+    public static class Status {
+        public static final Map<Class<?>, Byte> packetIds = new HashMap<>();
+        public static final byte PING = 0, PONG = 1;
+
+        public static void init() {
+            packetIds.put(PacketTypeClasses.Status.PING, PING);
+            packetIds.put(PacketTypeClasses.Status.PONG, PONG);
+        }
+    }
+    public static class Login {
+        public static final Map<Class<?>, Byte> packetIds = new HashMap<>();
+        public static final byte HANDSHAKE = 0,
+        IN_CUSTOM_PAYLOAD = 1, OUT_CUSTOM_PAYLOAD = 2,IN_START = 3, IN_ENCRYPTION_BEGIN = 4,
+        DISCONNECT = 5, OUT_ENCRYPTION_BEGIN = 6, OUT_SUCCESS = 7;
+
+        public static void init() {
+            packetIds.put(PacketTypeClasses.Login.HANDSHAKE, HANDSHAKE);
+            packetIds.put(PacketTypeClasses.Login.IN_CUSTOM_PAYLOAD, IN_CUSTOM_PAYLOAD);
+            packetIds.put(PacketTypeClasses.Login.OUT_CUSTOM_PAYLOAD, OUT_CUSTOM_PAYLOAD);
+            packetIds.put(PacketTypeClasses.Login.IN_START, IN_START);
+            packetIds.put(PacketTypeClasses.Login.IN_ENCRYPTION_BEGIN, IN_ENCRYPTION_BEGIN);
+            packetIds.put(PacketTypeClasses.Login.DISCONNECT, DISCONNECT);
+            packetIds.put(PacketTypeClasses.Login.OUT_ENCRYPTION_BEGIN, OUT_ENCRYPTION_BEGIN);
+            packetIds.put(PacketTypeClasses.Login.OUT_SUCCESS, OUT_SUCCESS);
+        }
+    }
+
     public static class Client {
-        public static final Map<Class<?>, Byte> packetIds = new HashMap<Class<?>, Byte>();
+        public static final Map<Class<?>, Byte> packetIds = new HashMap<>();
         public static final byte TELEPORT_ACCEPT = 0,
                 TILE_NBT_QUERY = 1, DIFFICULTY_CHANGE = 2, CHAT = 3, CLIENT_COMMAND = 4,
                 SETTINGS = 5, TAB_COMPLETE = 6, TRANSACTION = 7, ENCHANT_ITEM = 8,
@@ -99,6 +124,7 @@ public class PacketType {
         public static class Util {
             /**
              * Is the packet an instance of the PacketPlayInFlying packet?
+             *
              * @param packetID
              * @return packetID == FLYING or POSITION or POSITION_LOOK or LOOK
              */
@@ -112,7 +138,7 @@ public class PacketType {
     }
 
     public static class Server {
-        public static final Map<Class<?>, Byte> packetIds = new HashMap<Class<?>, Byte>();
+        public static final Map<Class<?>, Byte> packetIds = new HashMap<>();
         public static final byte SPAWN_ENTITY = 0, SPAWN_ENTITY_EXPERIENCE_ORB = 1, SPAWN_ENTITY_WEATHER = 2, SPAWN_ENTITY_LIVING = 3,
                 SPAWN_ENTITY_PAINTING = 4, SPAWN_ENTITY_SPAWN = 5, ANIMATION = 6, STATISTIC = 7,
                 BLOCK_BREAK = 8, BLOCK_BREAK_ANIMATION = 9, TILE_ENTITY_DATA = 10, BLOCK_ACTION = 11,
@@ -239,6 +265,7 @@ public class PacketType {
         public static class Util {
             /**
              * Is the packet an instance of the PacketPlayOutEntity packet?
+             *
              * @param packetID
              * @return packetID == ENTITY or REL_ENTITY_MOVE or REL_ENTITY_MOVE_LOOK or ENTITY_LOOK
              */

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

@@ -22,13 +22,40 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.packet;
+package io.github.retrooper.packetevents.packettype;
 
-import io.github.retrooper.packetevents.packettype.PacketType;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;
 
 public class PacketTypeClasses {
+    public static class Status {
+        public static Class<?> PING, PONG;
+
+        public static void load() {
+            PING = NMSUtils.getNMSClassWithoutException("PacketStatusInPing");
+            PONG = NMSUtils.getNMSClassWithoutException("PacketStatusOutPong");
+            PacketType.Status.init();
+        }
+    }
+    public static class Login {
+        public static Class<?>  HANDSHAKE,
+                IN_CUSTOM_PAYLOAD, OUT_CUSTOM_PAYLOAD,IN_START, IN_ENCRYPTION_BEGIN,
+                DISCONNECT, OUT_ENCRYPTION_BEGIN, OUT_SUCCESS;
+
+        public static void load() {
+            HANDSHAKE = NMSUtils.getNMSClassWithoutException("PacketHandshakingInSetProtocol");
+            //In and Out custom payload login packets have been here since AROUND 1.13.2?
+            IN_CUSTOM_PAYLOAD = NMSUtils.getNMSClassWithoutException("PacketLoginInCustomPayload");
+            OUT_CUSTOM_PAYLOAD = NMSUtils.getNMSClassWithoutException("PacketLoginOutCustomPayload");
+            IN_START = NMSUtils.getNMSClassWithoutException("PacketLoginInStart");
+            IN_ENCRYPTION_BEGIN = NMSUtils.getNMSClassWithoutException("PacketLoginInEncryptionBegin");
+            DISCONNECT = NMSUtils.getNMSClassWithoutException("PacketLoginOutDisconnect");
+            OUT_ENCRYPTION_BEGIN = NMSUtils.getNMSClassWithoutException("PacketLoginOutEncryptionBegin");
+            OUT_SUCCESS = NMSUtils.getNMSClassWithoutException("PacketLoginOutSuccess");
+            PacketType.Login.init();
+        }
+    }
+
     public static class Client {
         private static final String c = "PacketPlayIn";
         public static Class<?> FLYING, POSITION, POSITION_LOOK, LOOK, CLIENT_COMMAND,
@@ -107,17 +134,16 @@ public class PacketTypeClasses {
             } catch (ClassNotFoundException e) {
                 e.printStackTrace();
             }
-            //Block place
+
             try {
                 BLOCK_PLACE = NMSUtils.getNMSClass(c + "BlockPlace");
             } catch (ClassNotFoundException e) {
-                //They are just on a newer version
-                try {
-                    USE_ITEM = NMSUtils.getNMSClass(c + "UseItem");
-                } catch (ClassNotFoundException e2) {
-                    e.printStackTrace();
-                    e2.printStackTrace();
-                }
+
+            }
+            try {
+                USE_ITEM = NMSUtils.getNMSClass(c + "UseItem");
+            } catch (ClassNotFoundException e2) {
+
             }
 
             PacketType.Client.init();

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

@@ -24,22 +24,15 @@
 
 package io.github.retrooper.packetevents.packetwrappers;
 
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.in.abilities.WrappedPacketInAbilities;
-import io.github.retrooper.packetevents.packetwrappers.in.armanimation.WrappedPacketInArmAnimation;
+import io.github.retrooper.packetevents.exceptions.WrapperFieldNotFoundException;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.in.blockdig.WrappedPacketInBlockDig;
 import io.github.retrooper.packetevents.packetwrappers.in.blockplace.WrappedPacketInBlockPlace;
-import io.github.retrooper.packetevents.packetwrappers.in.chat.WrappedPacketInChat;
 import io.github.retrooper.packetevents.packetwrappers.in.clientcommand.WrappedPacketInClientCommand;
 import io.github.retrooper.packetevents.packetwrappers.in.custompayload.WrappedPacketInCustomPayload;
 import io.github.retrooper.packetevents.packetwrappers.in.entityaction.WrappedPacketInEntityAction;
-import io.github.retrooper.packetevents.packetwrappers.in.flying.WrappedPacketInFlying;
-import io.github.retrooper.packetevents.packetwrappers.in.helditemslot.WrappedPacketInHeldItemSlot;
 import io.github.retrooper.packetevents.packetwrappers.in.keepalive.WrappedPacketInKeepAlive;
 import io.github.retrooper.packetevents.packetwrappers.in.settings.WrappedPacketInSettings;
-import io.github.retrooper.packetevents.packetwrappers.in.steervehicle.WrappedPacketInSteerVehicle;
-import io.github.retrooper.packetevents.packetwrappers.in.transaction.WrappedPacketInTransaction;
 import io.github.retrooper.packetevents.packetwrappers.in.updatesign.WrappedPacketInUpdateSign;
 import io.github.retrooper.packetevents.packetwrappers.in.useentity.WrappedPacketInUseEntity;
 import io.github.retrooper.packetevents.packetwrappers.in.windowclick.WrappedPacketInWindowClick;
@@ -48,46 +41,61 @@ import io.github.retrooper.packetevents.packetwrappers.out.animation.WrappedPack
 import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
 import io.github.retrooper.packetevents.packetwrappers.out.custompayload.WrappedPacketOutCustomPayload;
 import io.github.retrooper.packetevents.packetwrappers.out.entity.WrappedPacketOutEntity;
+import io.github.retrooper.packetevents.packetwrappers.out.entitystatus.WrappedPacketOutEntityStatus;
+import io.github.retrooper.packetevents.packetwrappers.out.entityteleport.WrappedPacketOutEntityTeleport;
 import io.github.retrooper.packetevents.packetwrappers.out.entityvelocity.WrappedPacketOutEntityVelocity;
+import io.github.retrooper.packetevents.packetwrappers.out.experience.WrappedPacketOutExperience;
+import io.github.retrooper.packetevents.packetwrappers.out.explosion.WrappedPacketOutExplosion;
 import io.github.retrooper.packetevents.packetwrappers.out.gamestatechange.WrappedPacketOutGameStateChange;
 import io.github.retrooper.packetevents.packetwrappers.out.keepalive.WrappedPacketOutKeepAlive;
 import io.github.retrooper.packetevents.packetwrappers.out.kickdisconnect.WrappedPacketOutKickDisconnect;
 import io.github.retrooper.packetevents.packetwrappers.out.position.WrappedPacketOutPosition;
 import io.github.retrooper.packetevents.packetwrappers.out.transaction.WrappedPacketOutTransaction;
 import io.github.retrooper.packetevents.packetwrappers.out.updatehealth.WrappedPacketOutUpdateHealth;
+import io.github.retrooper.packetevents.utils.reflection.ClassUtil;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 import org.bukkit.entity.Player;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-public class WrappedPacket implements WrapperPacketReader {
-    private static final HashMap<Class<?>, HashMap<Class<?>, Field[]>> fieldCache = new HashMap<>();
+public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
+    private static final Map<Class<?>, Map<Class<?>, Field[]>> fieldCache = new HashMap<>();
     public static ServerVersion version;
     protected final Player player;
     protected Object packet;
     private Class<?> packetClass;
 
     public WrappedPacket() {
-        this(null);
+        this.player = null;
     }
 
     public WrappedPacket(final Object packet) {
-        this(null, packet);
+        this(packet, packet.getClass());
+    }
+
+    public WrappedPacket(final Object packet, final Class<?> packetClass) {
+        this(null, packet, packetClass);
     }
 
     public WrappedPacket(final Player player, final Object packet) {
+        this(player, packet, packet.getClass());
+    }
+
+    public WrappedPacket(final Player player, final Object packet, Class<?> packetClass) {
         if (packet == null) {
             this.player = null;
             return;
         }
-        this.packetClass = packet.getClass();
         if (packet.getClass().getSuperclass().equals(PacketTypeClasses.Client.FLYING)) {
             packetClass = PacketTypeClasses.Client.FLYING;
         } else if (packet.getClass().getSuperclass().equals(PacketTypeClasses.Server.ENTITY)) {
             packetClass = PacketTypeClasses.Server.ENTITY;
         }
+        this.packetClass = packetClass;
 
 
         if (!fieldCache.containsKey(packetClass)) {
@@ -147,7 +155,7 @@ public class WrappedPacket implements WrapperPacketReader {
                 }
             }
 
-            HashMap<Class<?>, Field[]> map = new HashMap<>();
+            Map<Class<?>, Field[]> map = new HashMap<>();
             if (!boolFields.isEmpty()) {
                 map.put(boolean.class, boolFields.toArray(new Field[0]));
             }
@@ -220,20 +228,13 @@ public class WrappedPacket implements WrapperPacketReader {
 
     public static void loadAllWrappers() {
         //SERVER BOUND
-        WrappedPacketInAbilities.load();
-        WrappedPacketInArmAnimation.load();
         WrappedPacketInBlockDig.load();
         WrappedPacketInBlockPlace.load();
-        WrappedPacketInChat.load();
         WrappedPacketInClientCommand.load();
         WrappedPacketInCustomPayload.load();
         WrappedPacketInEntityAction.load();
-        WrappedPacketInFlying.load();
-        WrappedPacketInHeldItemSlot.load();
         WrappedPacketInKeepAlive.load();
         WrappedPacketInSettings.load();
-        WrappedPacketInSteerVehicle.load();
-        WrappedPacketInTransaction.load();
         WrappedPacketInUseEntity.load();
         WrappedPacketInUpdateSign.load();
         WrappedPacketInWindowClick.load();
@@ -244,6 +245,7 @@ public class WrappedPacket implements WrapperPacketReader {
         WrappedPacketOutChat.load();
         WrappedPacketOutEntity.load();
         WrappedPacketOutEntityVelocity.load();
+        WrappedPacketOutEntityTeleport.load();
         WrappedPacketOutKeepAlive.load();
         WrappedPacketOutKickDisconnect.load();
         WrappedPacketOutPosition.load();
@@ -251,6 +253,9 @@ public class WrappedPacket implements WrapperPacketReader {
         WrappedPacketOutUpdateHealth.load();
         WrappedPacketOutGameStateChange.load();
         WrappedPacketOutCustomPayload.load();
+        WrappedPacketOutExplosion.load();
+        WrappedPacketOutEntityStatus.load();
+        WrappedPacketOutExperience.load();
     }
 
     protected void setup() {
@@ -259,93 +264,45 @@ public class WrappedPacket implements WrapperPacketReader {
 
     @Override
     public boolean readBoolean(int index) {
-        if (fieldCache.containsKey(packetClass)) {
-            try {
-                return fieldCache.get(packetClass).get(boolean.class)[index].getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return false;
+        return (boolean) read(boolean.class, index);
     }
 
     @Override
     public byte readByte(int index) {
-        if (fieldCache.containsKey(packetClass)) {
-            try {
-                return fieldCache.get(packetClass).get(byte.class)[index].getByte(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return 0;
+        return (byte) read(byte.class, index);
     }
 
     @Override
     public short readShort(int index) {
-        if (fieldCache.containsKey(packetClass)) {
-            try {
-                return fieldCache.get(packetClass).get(short.class)[index].getShort(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return 0;
+        return (short) read(short.class, index);
     }
 
     @Override
     public int readInt(int index) {
-        if (fieldCache.containsKey(packetClass)) {
-            try {
-                return fieldCache.get(packetClass).get(int.class)[index].getInt(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return 0;
+        return (int) read(int.class, index);
     }
 
     @Override
     public long readLong(int index) {
-        if (fieldCache.containsKey(packetClass)) {
-            try {
-                return fieldCache.get(packetClass).get(long.class)[index].getLong(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return 0L;
+        return (long) read(long.class, index);
     }
 
     @Override
     public float readFloat(int index) {
-        if (fieldCache.containsKey(packetClass)) {
-            try {
-                return fieldCache.get(packetClass).get(float.class)[index].getFloat(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return 0.0F;
+        return (float) read(float.class, index);
     }
 
     @Override
     public double readDouble(int index) {
-        if (fieldCache.containsKey(packetClass)) {
-            try {
-                return fieldCache.get(packetClass).get(double.class)[index].getDouble(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return 0.0;
+        return (double) read(double.class, index);
     }
 
     @Override
     public boolean[] readBooleanArray(int index) {
-        if (fieldCache.containsKey(packetClass)) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached != null) {
             try {
-                return (boolean[]) fieldCache.get(packetClass).get(boolean[].class)[index].get(packet);
+                return (boolean[]) cached.get(boolean[].class)[index].get(packet);
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
@@ -363,14 +320,15 @@ public class WrappedPacket implements WrapperPacketReader {
                 }
             }
         }
-        return new boolean[0];
+        throw new WrapperFieldNotFoundException(packetClass, boolean[].class, index);
     }
 
     @Override
     public byte[] readByteArray(int index) {
-        if (fieldCache.containsKey(packetClass)) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached != null) {
             try {
-                return (byte[]) fieldCache.get(packetClass).get(byte[].class)[index].get(packet);
+                return (byte[]) cached.get(byte[].class)[index].get(packet);
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
@@ -388,14 +346,15 @@ public class WrappedPacket implements WrapperPacketReader {
                 }
             }
         }
-        return new byte[0];
+        throw new WrapperFieldNotFoundException(packetClass, byte[].class, index);
     }
 
     @Override
     public short[] readShortArray(int index) {
-        if (fieldCache.containsKey(packetClass)) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached != null) {
             try {
-                return (short[]) fieldCache.get(packetClass).get(short[].class)[index].get(packet);
+                return (short[]) cached.get(short[].class)[index].get(packet);
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
@@ -413,14 +372,15 @@ public class WrappedPacket implements WrapperPacketReader {
                 }
             }
         }
-        return new short[0];
+        throw new WrapperFieldNotFoundException(packetClass, short[].class, index);
     }
 
     @Override
     public int[] readIntArray(int index) {
-        if (fieldCache.containsKey(packetClass)) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached != null) {
             try {
-                return (int[]) fieldCache.get(packetClass).get(int[].class)[index].get(packet);
+                return (int[]) cached.get(int[].class)[index].get(packet);
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
@@ -438,14 +398,15 @@ public class WrappedPacket implements WrapperPacketReader {
                 }
             }
         }
-        return new int[0];
+        throw new WrapperFieldNotFoundException(packetClass, int[].class, index);
     }
 
     @Override
     public long[] readLongArray(int index) {
-        if (fieldCache.containsKey(packetClass)) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached != null) {
             try {
-                return (long[]) fieldCache.get(packetClass).get(long[].class)[index].get(packet);
+                return (long[]) cached.get(long[].class)[index].get(packet);
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
@@ -463,14 +424,15 @@ public class WrappedPacket implements WrapperPacketReader {
                 }
             }
         }
-        return new long[0];
+        throw new WrapperFieldNotFoundException(packetClass, long[].class, index);
     }
 
     @Override
     public float[] readFloatArray(int index) {
-        if (fieldCache.containsKey(packetClass)) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached != null) {
             try {
-                return (float[]) fieldCache.get(packetClass).get(float[].class)[index].get(packet);
+                return (float[]) cached.get(float[].class)[index].get(packet);
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
@@ -488,14 +450,15 @@ public class WrappedPacket implements WrapperPacketReader {
                 }
             }
         }
-        return new float[0];
+        throw new WrapperFieldNotFoundException(packetClass, float[].class, index);
     }
 
     @Override
     public double[] readDoubleArray(int index) {
-        if (fieldCache.containsKey(packetClass)) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached != null) {
             try {
-                return (double[]) fieldCache.get(packetClass).get(double[].class)[index].get(packet);
+                return (double[]) cached.get(double[].class)[index].get(packet);
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
@@ -513,14 +476,15 @@ public class WrappedPacket implements WrapperPacketReader {
                 }
             }
         }
-        return new double[0];
+        throw new WrapperFieldNotFoundException(packetClass, double[].class, index);
     }
 
     @Override
     public String[] readStringArray(int index) {
-        if (fieldCache.containsKey(packetClass)) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached != null) {
             try {
-                Object[] array = (Object[]) fieldCache.get(packetClass).get(String[].class)[index].get(packet);
+                Object[] array = (Object[]) cached.get(String[].class)[index].get(packet);
                 int len = array.length;
                 String[] stringArray = new String[len];
                 for (int i = 0; i < len; i++) {
@@ -531,31 +495,35 @@ public class WrappedPacket implements WrapperPacketReader {
                 e.printStackTrace();
             }
         }
-        return new String[0];
+        throw new WrapperFieldNotFoundException(packetClass, String[].class, index);
     }
 
     @Override
     public String readString(int index) {
-        if (fieldCache.containsKey(packetClass)) {
-            try {
-                Field[] fields = fieldCache.get(packetClass).get(String.class);
-                Object obj = fields[index].get(packet);
-                return obj.toString();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
+       return (String) read(String.class, index);
     }
 
     public Object readAnyObject(int index) {
-        return packetClass.getDeclaredFields()[index];
+        try {
+            Field f = packetClass.getDeclaredFields()[index];
+            if (!f.isAccessible()) {
+                f.setAccessible(true);
+            }
+            try {
+                return f.get(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw new WrapperFieldNotFoundException("PacketEvents failed to find any field indexed " + index + " in the " + ClassUtil.getClassSimpleName(packetClass) + " class!");
+        }
+        return null;
     }
 
     public Object readObject(int index, Class<?> type) {
-        if (fieldCache.containsKey(packetClass)) {
-            HashMap<Class<?>, Field[]> map = fieldCache.get(packetClass);
-            if (!map.containsKey(type)) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached != null) {
+            if (!cached.containsKey(type)) {
                 List<Field> typeFields = new ArrayList<>();
                 for (Field f : packetClass.getDeclaredFields()) {
                     f.setAccessible(true);
@@ -564,24 +532,98 @@ public class WrappedPacket implements WrapperPacketReader {
                     }
                 }
                 if (!typeFields.isEmpty()) {
-                    map.put(type, typeFields.toArray(new Field[0]));
+                    cached.put(type, typeFields.toArray(new Field[0]));
                 }
             }
 
         }
         try {
-            return fieldCache.get(packetClass).get(type)[index].get(packet);
+            return cached.get(type)[index].get(packet);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        throw new WrapperFieldNotFoundException(packetClass, type, index);
+    }
+
+    public Object[] readObjectArray(int index, Class<?> type) {
+        return (Object[]) readObject(index, type);
+    }
+
+    @Override
+    public void writeBoolean(int index, boolean value) {
+        write(boolean.class, index, value);
+    }
+
+    @Override
+    public void writeByte(int index, byte value) {
+        write(byte.class, index, value);
+    }
+
+    @Override
+    public void writeShort(int index, short value) {
+        write(short.class, index, value);
+    }
+
+    @Override
+    public void writeInt(int index, int value) {
+        write(int.class, index, value);
+    }
+
+    @Override
+    public void writeLong(int index, long value) {
+        write(long.class, index, value);
+    }
+
+    @Override
+    public void writeFloat(int index, float value) {
+        write(float.class, index, value);
+    }
+
+    @Override
+    public void writeDouble(int index, double value) {
+        write(double.class, index, value);
+    }
+
+    @Override
+    public void writeString(int index, String value) {
+        write(String.class, index, value);
+    }
+
+    private void write(Class<?> type, int index, Object value) throws WrapperFieldNotFoundException {
+        Field field = getField(type, index);
+        if(field == null) {
+            throw new WrapperFieldNotFoundException(packetClass, type, index);
+        }
+        try {
+            field.set(packet, value);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private Object read(Class<?> type, int index) throws WrapperFieldNotFoundException {
+        Field field = getField(type, index);
+        if(field == null) {
+            throw new WrapperFieldNotFoundException(packetClass, type, index);
+        }
+        try {
+            return field.get(packet);
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
         return null;
     }
 
-    public Object[] readObjectArray(int index, Class<?> type) {
-        Object res = readObject(index, type);
-        if (res == null) {
-            return new Object[0];
+    private Field getField(Class<?> type, int index) {
+        Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
+        if (cached == null) {
+            return null;
         }
-        return (Object[]) res;
+        Field[] fields = cached.get(type);
+        if (fields != null) {
+            return fields[index];
+        }
+        return null;
     }
+
 }

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

@@ -0,0 +1,45 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers;
+
+public interface WrapperPacketWriter {
+
+    //TODO write for the arrays
+    void writeBoolean(int index, boolean value);
+
+    void writeByte(int index, byte value);
+
+    void writeShort(int index, short value);
+
+    void writeInt(int index, int value);
+
+    void writeLong(int index, long value);
+
+    void writeFloat(int index, float value);
+
+    void writeDouble(int index, double value);
+
+    void writeString(int index, String value);
+}

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

@@ -26,41 +26,15 @@ package io.github.retrooper.packetevents.packetwrappers.in.abilities;
 
 import io.github.retrooper.packetevents.annotations.NotNull;
 import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
 
 public final class WrappedPacketInAbilities extends WrappedPacket {
-    private static boolean isMoreThanOneBoolPresent;
-    private boolean isVulnerable;
-    private boolean isFlying;
-    private boolean allowFly;
-    private boolean instantBuild;
-    private float flySpeed;
-    private float walkSpeed;
 
     public WrappedPacketInAbilities(Object packet) {
         super(packet);
     }
-
-    public static void load() {
-        isMoreThanOneBoolPresent = Reflection.getField(PacketTypeClasses.Client.ABILITIES, boolean.class, 1) != null;
-    }
-
-    @Override
-    protected void setup() {
-        if (isMoreThanOneBoolPresent) {
-            this.isVulnerable = readBoolean(0);
-            this.isFlying = readBoolean(1);
-            this.allowFly = readBoolean(2);
-            this.instantBuild = readBoolean(3);
-            this.flySpeed = readFloat(0);
-            this.walkSpeed = readFloat(1);
-        } else {
-            this.isFlying = readBoolean(0);
-        }
-    }
-
     /**
      * This will return null if the server version is not available in 1.16.x and above
      *
@@ -68,13 +42,13 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
      */
     @Deprecated
     @Nullable
-    public Boolean isVulnerable() {
-        return isVulnerable;
+    public boolean isVulnerable() {
+        return readBoolean(0);
     }
 
     @NotNull
     public boolean isFlying() {
-        return isFlying;
+        return readBoolean(1);
     }
 
     /**
@@ -84,8 +58,8 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
      */
     @Deprecated
     @Nullable
-    public Boolean isFlightAllowed() {
-        return allowFly;
+    public boolean isFlightAllowed() {
+        return readBoolean(2);
     }
 
     /**
@@ -95,8 +69,8 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
      */
     @Deprecated
     @Nullable
-    public Boolean canInstantlyBuild() {
-        return instantBuild;
+    public boolean canInstantlyBuild() {
+        return readBoolean(3);
     }
 
     /**
@@ -106,8 +80,8 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
      */
     @Deprecated
     @Nullable
-    public Float getFlySpeed() {
-        return flySpeed;
+    public float getFlySpeed() {
+        return readFloat(0);
     }
 
     /**
@@ -117,7 +91,7 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
      */
     @Deprecated
     @Nullable
-    public Float getWalkSpeed() {
-        return walkSpeed;
+    public float getWalkSpeed() {
+        return readFloat(1);
     }
 }

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

@@ -25,20 +25,17 @@
 package io.github.retrooper.packetevents.packetwrappers.in.blockdig;
 
 import io.github.retrooper.packetevents.enums.Direction;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;
-import io.github.retrooper.packetevents.utils.vector.Vector3i;
 
 public final class WrappedPacketInBlockDig extends WrappedPacket {
     private static Class<?> blockDigClass, blockPositionClass, enumDirectionClass, digTypeClass;
     private static boolean isVersionLowerThan_v_1_8;
-    private Vector3i blockPosition;
-    private Direction direction;
-    private PlayerDigType digType;
+    private Object blockPosObj, enumDirObj, digTypeObj;
     public WrappedPacketInBlockDig(Object packet) {
         super(packet);
     }
@@ -65,76 +62,55 @@ public final class WrappedPacketInBlockDig extends WrappedPacket {
         }
     }
 
-    @Override
-    protected void setup() {
-        Direction enumDirection = null;
-        PlayerDigType enumDigType = null;
-        int x = 0, y = 0, z = 0;
-        //1.7.10
-        try {
-            if (isVersionLowerThan_v_1_8) {
-                enumDigType = PlayerDigType.values()[(readInt(4))];
-                x = readInt(0);
-                y = readInt(1);
-                z = readInt(2);
-                enumDirection = null;
-            } else {
-                //1.8+
-                final Object blockPosObj = readObject(0, blockPositionClass);
-                final Object enumDirectionObj = readObject(0, enumDirectionClass);
-                final Object digTypeObj = readObject(0, digTypeClass);
-
-                x = Reflection.getField(blockPositionClass, int.class, 0).getInt(blockPosObj);
-                y = Reflection.getField(blockPositionClass, int.class, 1).getInt(blockPosObj);
-                z = Reflection.getField(blockPositionClass, int.class, 2).getInt(blockPosObj);
-
-                //.toString() won't work so we must do this
-                enumDirection = Direction.valueOf(((Enum)enumDirectionObj).name());
-                enumDigType = PlayerDigType.valueOf(((Enum)digTypeObj).name());
-            }
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        this.blockPosition = new Vector3i(x, y, z);
-        if (enumDirection == null) {
-            this.direction = Direction.NULL;
-        } else {
-            this.direction = enumDirection;
-        }
-        this.digType = enumDigType;
-    }
-
     /**
      * Get X position of the block
      * @return Block Position X
      */
-    public int getBlockPositionX() {
-        return blockPosition.x;
+    public int getX() {
+        if(isVersionLowerThan_v_1_8) {
+            return readInt(0);
+        }
+        else {
+            if(blockPosObj == null) {
+                blockPosObj = readObject(0, blockPositionClass);
+            }
+            WrappedPacket blockPosWrapper = new WrappedPacket(blockPosObj);
+            return blockPosWrapper.readInt(0);
+        }
     }
 
     /**
      * Get Y position of the block
      * @return Block Position Y
      */
-    public int getBlockPositionY() {
-        return blockPosition.y;
+    public int getY() {
+        if(isVersionLowerThan_v_1_8) {
+            return readInt(1);
+        }
+        else {
+            if(blockPosObj == null) {
+                blockPosObj = readObject(0, blockPositionClass);
+            }
+            WrappedPacket blockPosWrapper = new WrappedPacket(blockPosObj);
+            return blockPosWrapper.readInt(1);
+        }
     }
 
     /**
      * Get Z position of the block
      * @return Block Position Z
      */
-    public int getBlockPositionZ() {
-        return blockPosition.z;
-    }
-
-    /**
-     * Use {@link #getBlockPositionX()}, {@link #getBlockPositionY()}, {@link #getBlockPositionZ()}
-     * @return Block Position
-     */
-    @Deprecated
-    public Vector3i getBlockPosition() {
-        return blockPosition;
+    public int getZ() {
+        if(isVersionLowerThan_v_1_8) {
+            return readInt(2);
+        }
+        else {
+            if(blockPosObj == null) {
+                blockPosObj = readObject(0, blockPositionClass);
+            }
+            WrappedPacket blockPosWrapper = new WrappedPacket(blockPosObj);
+            return blockPosWrapper.readInt(2);
+        }
     }
 
     /**
@@ -143,7 +119,15 @@ public final class WrappedPacketInBlockDig extends WrappedPacket {
      * @return Direction
      */
     public Direction getDirection() {
-        return direction;
+        if(isVersionLowerThan_v_1_8) {
+            return Direction.NULL;
+        }
+        else {
+            if(enumDirObj == null) {
+                enumDirObj = readObject(0, enumDirectionClass);
+            }
+            return Direction.valueOf(((Enum)enumDirObj).name());
+        }
     }
 
     /**
@@ -151,7 +135,12 @@ public final class WrappedPacketInBlockDig extends WrappedPacket {
      * @return Dig Type
      */
     public PlayerDigType getDigType() {
-        return digType;
+        if(isVersionLowerThan_v_1_8) {
+            return PlayerDigType.values()[readInt(4)];
+        }
+        else {
+            return PlayerDigType.valueOf(((Enum)readObject(0, digTypeClass)).name());
+        }
     }
 
     public enum PlayerDigType {
@@ -165,6 +154,4 @@ public final class WrappedPacketInBlockDig extends WrappedPacket {
         SWAP_ITEM_WITH_OFFHAND,
         WRONG_PACKET
     }
-
-
 }

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

@@ -24,10 +24,8 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
 
-import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
-import io.github.retrooper.packetevents.utils.vector.Vector3i;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -35,8 +33,8 @@ import org.bukkit.inventory.ItemStack;
 
 public final class WrappedPacketInBlockPlace extends WrappedPacket {
     private static boolean isHigherThan_v_1_8_8, isHigherThan_v_1_7_10;
-    private Vector3i blockPosition;
-    private ItemStack itemStack;
+    private WrappedPacket cachedWrappedPacket;
+
     public WrappedPacketInBlockPlace(final Player player, final Object packet) {
         super(player, packet);
     }
@@ -49,81 +47,92 @@ public final class WrappedPacketInBlockPlace extends WrappedPacket {
         }
     }
 
-    @Override
-    protected void setup() {
-        //1.7.10
-        Vector3i position = null;
-        ItemStack itemStack = null;
-        try {
-            if (isHigherThan_v_1_8_8) {
-                final WrappedPacketInBlockPlace_1_9 blockPlace_1_9 = new WrappedPacketInBlockPlace_1_9(getPlayer(), packet);
-                final Block block = blockPlace_1_9.getBlock();
-                position = new Vector3i(block.getX(), block.getY(), block.getZ());
-                itemStack = new ItemStack(block.getType());
-            } else if (isHigherThan_v_1_7_10) {
-                final WrappedPacketInBlockPlace_1_8 blockPlace_1_8 = new WrappedPacketInBlockPlace_1_8(packet);
-                position = blockPlace_1_8.getBlockPosition();
-                itemStack = blockPlace_1_8.getItemStack();
-            } else {
-                final WrappedPacketInBlockPlace_1_7_10 blockPlace_1_7_10 = new WrappedPacketInBlockPlace_1_7_10(getPlayer(), packet);
-                position = blockPlace_1_7_10.getBlockPosition();
-                itemStack = blockPlace_1_7_10.getItemStack();
-            }
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        }
-        this.blockPosition = position;
-        this.itemStack = itemStack;
-    }
-
-    /**
-     * Get the player that placed the block
-     * @return Block placer
-     */
     public Player getPlayer() {
-        return this.player;
+        return player;
     }
 
-    /**
-     * Get X position of the block
-     * @return Block Position X
-     */
-    public int getBlockPositionX() {
-        return blockPosition.x;
+    public int getX() {
+        if (isHigherThan_v_1_8_8) {
+            if (cachedWrappedPacket == null) {
+                WrappedPacketInBlockPlace_1_9 blockPlace_1_9 = new WrappedPacketInBlockPlace_1_9(getPlayer(), packet);
+                cachedWrappedPacket = blockPlace_1_9;
+                return blockPlace_1_9.getBlock().getX();
+            }
+            return ((WrappedPacketInBlockPlace_1_9)cachedWrappedPacket).getBlock().getX();
+        } else if (isHigherThan_v_1_7_10) {
+           if(cachedWrappedPacket == null) {
+               WrappedPacketInBlockPlace_1_8 blockPlace_1_8 = new WrappedPacketInBlockPlace_1_8(packet);
+               cachedWrappedPacket = blockPlace_1_8;
+               return blockPlace_1_8.getX();
+           }
+        } else {
+            WrappedPacketInBlockPlace_1_7_10 blockPlace_1_7_10 = new WrappedPacketInBlockPlace_1_7_10(packet);
+            return blockPlace_1_7_10.x;
+        }
+        return 0;
     }
 
-    /**
-     * Get Y position of the block
-     * @return Block Position Y
-     */
-    public int getBlockPositionY() {
-        return blockPosition.y;
+    public int getY() {
+        if (isHigherThan_v_1_8_8) {
+            if (cachedWrappedPacket == null) {
+                WrappedPacketInBlockPlace_1_9 blockPlace_1_9 = new WrappedPacketInBlockPlace_1_9(getPlayer(), packet);
+                cachedWrappedPacket = blockPlace_1_9;
+                return blockPlace_1_9.getBlock().getY();
+            }
+            return ((WrappedPacketInBlockPlace_1_9)cachedWrappedPacket).getBlock().getX();
+        } else if (isHigherThan_v_1_7_10) {
+            if(cachedWrappedPacket == null) {
+                WrappedPacketInBlockPlace_1_8 blockPlace_1_8 = new WrappedPacketInBlockPlace_1_8(packet);
+                cachedWrappedPacket = blockPlace_1_8;
+                return blockPlace_1_8.getY();
+            }
+        } else {
+            WrappedPacketInBlockPlace_1_7_10 blockPlace_1_7_10 = new WrappedPacketInBlockPlace_1_7_10(packet);
+            return blockPlace_1_7_10.y;
+        }
+        return 0;
     }
 
-    /**
-     * Get Z position of the block
-     * @return Block Position Z
-     */
-    public int getBlockPositionZ() {
-        return blockPosition.z;
+    public int getZ() {
+        if (isHigherThan_v_1_8_8) {
+            if (cachedWrappedPacket == null) {
+                WrappedPacketInBlockPlace_1_9 blockPlace_1_9 = new WrappedPacketInBlockPlace_1_9(getPlayer(), packet);
+                cachedWrappedPacket = blockPlace_1_9;
+                return blockPlace_1_9.getBlock().getZ();
+            }
+            return ((WrappedPacketInBlockPlace_1_9)cachedWrappedPacket).getBlock().getX();
+        } else if (isHigherThan_v_1_7_10) {
+            if(cachedWrappedPacket == null) {
+                WrappedPacketInBlockPlace_1_8 blockPlace_1_8 = new WrappedPacketInBlockPlace_1_8(packet);
+                cachedWrappedPacket = blockPlace_1_8;
+                return blockPlace_1_8.getZ();
+            }
+        } else {
+            WrappedPacketInBlockPlace_1_7_10 blockPlace_1_7_10 = new WrappedPacketInBlockPlace_1_7_10(packet);
+            return blockPlace_1_7_10.z;
+        }
+        return 0;
     }
 
-    /**
-     * Use {@link #getBlockPositionX()}, {@link #getBlockPositionY()}, {@link #getBlockPositionZ()}
-     * @return Block Position
-     */
-    @Deprecated
-    public Vector3i getBlockPosition() {
-        return blockPosition;
-    }
-
-    /**
-     * The ItemStack of the placed block.
-     * @return ItemStack
-     */
-    @Nullable
     public ItemStack getItemStack() {
-        return itemStack;
+        if (isHigherThan_v_1_8_8) {
+            if (cachedWrappedPacket == null) {
+                WrappedPacketInBlockPlace_1_9 blockPlace_1_9 = new WrappedPacketInBlockPlace_1_9(getPlayer(), packet);
+                cachedWrappedPacket = blockPlace_1_9;
+                return new ItemStack(blockPlace_1_9.getBlock().getType());
+            }
+            return new ItemStack(((WrappedPacketInBlockPlace_1_9)cachedWrappedPacket).getBlock().getType());
+        } else if (isHigherThan_v_1_7_10) {
+            if(cachedWrappedPacket == null) {
+                WrappedPacketInBlockPlace_1_8 blockPlace_1_8 = new WrappedPacketInBlockPlace_1_8(packet);
+                cachedWrappedPacket = blockPlace_1_8;
+                return blockPlace_1_8.getItemStack();
+            }
+        } else {
+            WrappedPacketInBlockPlace_1_7_10 blockPlace_1_7_10 = new WrappedPacketInBlockPlace_1_7_10(packet);
+            return blockPlace_1_7_10.itemStack;
+        }
+        return null;
     }
 
 }

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

@@ -25,18 +25,17 @@
 package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
 
 import io.github.retrooper.packetevents.packetwrappers.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;
+    public int x, y, z;
+    public ItemStack itemStack;
+    public int blockFace;
 
-    WrappedPacketInBlockPlace_1_7_10(final Player player, final Object packet) {
-        super(player, packet);
+    WrappedPacketInBlockPlace_1_7_10(final Object packet) {
+        super(packet);
     }
 
 
@@ -44,23 +43,13 @@ final class WrappedPacketInBlockPlace_1_7_10 extends WrappedPacket {
     protected void setup() {
         final PacketPlayInBlockPlace blockPlace = (PacketPlayInBlockPlace) packet;
 
-        this.blockPosition = new Vector3i(blockPlace.c(), blockPlace.d(), blockPlace.e());
+        x = blockPlace.c();
+        y = blockPlace.d();
+        z = 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

@@ -24,19 +24,18 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.exceptions.WrapperFieldNotFoundException;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
-import io.github.retrooper.packetevents.utils.reflection.Reflection;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
-import io.github.retrooper.packetevents.utils.vector.Vector3i;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
 import org.bukkit.inventory.ItemStack;
 
 import java.lang.reflect.InvocationTargetException;
 
 final class WrappedPacketInBlockPlace_1_8 extends WrappedPacket {
     private static Class<?> blockPlaceClass, blockPositionClass, blockPositionSuperClass;
-    private Vector3i blockPosition;
-    private ItemStack itemStack;
+    private Object blockPosObj;
 
     WrappedPacketInBlockPlace_1_8(final Object packet) {
         super(packet);
@@ -52,40 +51,43 @@ final class WrappedPacketInBlockPlace_1_8 extends WrappedPacket {
         blockPositionSuperClass = blockPositionClass.getSuperclass();
     }
 
-    @Override
-    protected void setup() {
+    public int getX() {
+        if(blockPosObj == null) {
+            blockPosObj = new WrappedPacket(packet).readObject(0, blockPositionClass);
+        }
         try {
-            Object nmsBlockPos = Reflection.getField(blockPlaceClass, blockPositionClass, 1).get(packet);
-            this.blockPosition = new Vector3i(0, 0, 0);
-            this.blockPosition.x = (int) Reflection.getMethod(blockPositionSuperClass, "getX", 0).invoke(nmsBlockPos);
-            this.blockPosition.y = (int) Reflection.getMethod(blockPositionSuperClass, "getY", 0).invoke(nmsBlockPos);
-            this.blockPosition.z = (int) Reflection.getMethod(blockPositionSuperClass, "getZ", 0).invoke(nmsBlockPos);
-
-
-            this.itemStack = NMSUtils.toBukkitItemStack(readObject(0, NMSUtils.nmsItemStackClass));
+            return (int)Reflection.getMethod(blockPositionSuperClass, "getX", 0).invoke(blockPosObj);
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
+        return 0;
     }
 
-    @Deprecated
-    public Vector3i getBlockPosition() {
-        return blockPosition;
+    public int getY() {
+        if(blockPosObj == null) {
+            blockPosObj = new WrappedPacket(packet).readObject(0, blockPositionClass);
+        }
+        try {
+            return (int)Reflection.getMethod(blockPositionSuperClass, "getY", 0).invoke(blockPosObj);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return 0;
     }
 
-    public int getBlockPositionX() {
-        return blockPosition.x;
-    }
-
-    public int getBlockPositionY() {
-        return blockPosition.y;
-    }
-
-    public int getBlockPositionZ() {
-        return blockPosition.z;
+    public int getZ() {
+        if(blockPosObj == null) {
+            blockPosObj = new WrappedPacket(packet).readObject(0, blockPositionClass);
+        }
+        try {
+            return (int)Reflection.getMethod(blockPositionSuperClass, "getZ", 0).invoke(blockPosObj);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return 0;
     }
 
     public ItemStack getItemStack() {
-        return itemStack;
+        return NMSUtils.toBukkitItemStack(readObject(0, NMSUtils.nmsItemStackClass));
     }
 }

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

@@ -31,25 +31,15 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
 final class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
-    private Block block;
-
     public WrappedPacketInBlockPlace_1_9(final Player player, final Object packet) {
         super(player, packet);
     }
 
-
-    @Override
-    protected void setup() {
-        this.block = BlockIteratorUtils.getBlockLookingAt(getPlayer(), 3);
-    }
-
     public Player getPlayer() {
         return this.player;
     }
 
     public Block getBlock() {
-        return block;
+        return BlockIteratorUtils.getBlockLookingAt(getPlayer(),3);
     }
-
-
 }

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

@@ -24,31 +24,19 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.chat;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
 public final class WrappedPacketInChat extends WrappedPacket {
-    private static Class<?> chatPacketClass;
-    private String message;
-
     public WrappedPacketInChat(Object packet) {
         super(packet);
     }
 
-    public static void load() {
-        chatPacketClass = PacketTypeClasses.Client.CHAT;
-    }
-
-    @Override
-    protected void setup() {
-        this.message = readString(0);
-    }
-
     /**
      * Get the message.
+     *
      * @return Chat Message
      */
     public String getMessage() {
-        return message;
+        return readString(0);
     }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/clientcommand/WrappedPacketInClientCommand.java

@@ -24,22 +24,21 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.clientcommand;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;
 
 public final class WrappedPacketInClientCommand extends WrappedPacket {
-    private static Class<?> packetClass;
     private static Class<?> enumClientCommandClass;
-    private ClientCommand clientCommand;
+    private Object enumObj;
 
     public WrappedPacketInClientCommand(Object packet) {
         super(packet);
     }
 
     public static void load() {
-        packetClass = PacketTypeClasses.Client.CLIENT_COMMAND;
+        Class<?> packetClass = PacketTypeClasses.Client.CLIENT_COMMAND;
 
         try {
             enumClientCommandClass = NMSUtils.getNMSClass("EnumClientCommand");
@@ -49,19 +48,16 @@ public final class WrappedPacketInClientCommand extends WrappedPacket {
         }
     }
 
-    @Override
-    public void setup() {
-        Object enumObj = readObject(0, enumClientCommandClass);
-        this.clientCommand = ClientCommand.valueOf(enumObj.toString());
-    }
-
     /**
      * Get the Client Command enum sent in the packet
      *
      * @return ClientCommand
      */
     public ClientCommand getClientCommand() {
-        return clientCommand;
+        if(enumObj == null) {
+            enumObj = readObject(0, enumClientCommandClass);
+        }
+        return ClientCommand.valueOf(enumObj.toString());
     }
 
     public enum ClientCommand {

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/custompayload/WrappedPacketInCustomPayload.java

@@ -24,31 +24,30 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.custompayload;
 
-import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
-import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.github.retrooper.packetevents.utils.bytebuf.ByteBufUtil;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
-
-import java.lang.reflect.Field;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
 
 public final class WrappedPacketInCustomPayload extends WrappedPacket {
-    private static Class<?> packetClass, nmsMinecraftKey, nmsPacketDataSerializer;
+    private static Class<?> nmsMinecraftKey, packetDataSerializerClass, byteBufClass;
+
+    private static boolean strPresent, byteArrayPresent;
 
-    private static boolean strPresentInIndex0;
-    private String data;
-    private Object minecraftKey, dataSerializer;
     public WrappedPacketInCustomPayload(Object packet) {
         super(packet);
     }
 
     public static void load() {
-        packetClass = PacketTypeClasses.Client.CUSTOM_PAYLOAD;
-        strPresentInIndex0 = Reflection.getField(packetClass, String.class, 0) != null;
+        Class<?> packetClass = PacketTypeClasses.Client.CUSTOM_PAYLOAD;
+        strPresent = Reflection.getField(packetClass, String.class, 0) != null;
+        byteArrayPresent = Reflection.getField(packetClass, byte[].class, 0) != null;
+        packetDataSerializerClass = NMSUtils.getNMSClassWithoutException("PacketDataSerializer");
         try {
-            nmsPacketDataSerializer = NMSUtils.getNMSClass("PacketDataSerializer");
+            byteBufClass = NMSUtils.getNettyClass("buffer.ByteBuf");
         } catch (ClassNotFoundException e) {
-            e.printStackTrace();
+
         }
         try {
             //Only on 1.13+
@@ -58,50 +57,26 @@ public final class WrappedPacketInCustomPayload extends WrappedPacket {
         }
     }
 
-    @Override
-    public void setup() {
-        if (!strPresentInIndex0) {
-            this.minecraftKey = readObject(0, nmsMinecraftKey);
-            this.dataSerializer = readObject(0, nmsPacketDataSerializer);
-
+    public String getTag() {
+        if (strPresent) {
+            return readString(0);
         } else {
-            Field dataSerializerField = Reflection.getField(packetClass, nmsPacketDataSerializer, 0);
-            try {
-                this.data = (String) Reflection.getField(packetClass, String.class, 0).get(packet);
-                if (dataSerializerField != null) {
-                    this.dataSerializer = dataSerializerField.get(packet);
-                }
-
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-
+            Object minecraftKey = readObject(0, nmsMinecraftKey);
+            WrappedPacket minecraftKeyWrapper = new WrappedPacket(minecraftKey);
+            return minecraftKeyWrapper.readString(1);
         }
     }
 
-    /**
-     * Get the data
-     * @return String data
-     */
-    public String getData() {
-        return data;
-    }
+    public byte[] getData() {
+        if (byteArrayPresent) {
+            return readByteArray(0);
+        } else {
+            Object dataSerializer = readObject(0, packetDataSerializerClass);
+            WrappedPacket byteBufWrapper = new WrappedPacket(dataSerializer);
 
-    /**
-     * Get the minecraft key
-     * @return Minecraft Key object
-     */
-    public Object getMinecraftKey() {
-        return minecraftKey;
-    }
+            Object byteBuf = byteBufWrapper.readObject(0, byteBufClass);
 
-
-    /**
-     * Get the data serializer
-     * @return Data Serializer object
-     */
-    @Nullable
-    public Object getDataSerializer() {
-        return dataSerializer;
+            return ByteBufUtil.getBytes(byteBuf);
+        }
     }
 }

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

@@ -25,7 +25,7 @@
 package io.github.retrooper.packetevents.packetwrappers.in.entityaction;
 
 import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;
@@ -36,21 +36,19 @@ import java.util.HashMap;
 public final class WrappedPacketInEntityAction extends WrappedPacket {
     private static final HashMap<String, PlayerAction> cachedPlayerActionNames = new HashMap<String, PlayerAction>();
     private static final HashMap<Integer, PlayerAction> cachedPlayerActionIDs = new HashMap<Integer, PlayerAction>();
-    private static Class<?> entityActionClass;
     @Nullable
     private static Class<?> enumPlayerActionClass;
     private static boolean isLowerThan_v_1_8;
     private Entity entity;
-    private int entityId;
+    private int entityId = -1;
     private PlayerAction action;
-    private int jumpBoost;
 
     public WrappedPacketInEntityAction(final Object packet) {
         super(packet);
     }
 
     public static void load() {
-        entityActionClass = NMSUtils.getNMSClassWithoutException("PacketPlayInEntityAction");
+        Class<?> entityActionClass = NMSUtils.getNMSClassWithoutException("PacketPlayInEntityAction");
         isLowerThan_v_1_8 = version.isLowerThan(ServerVersion.v_1_8);
         if (!isLowerThan_v_1_8) {
             enumPlayerActionClass = SubclassUtil.getSubClass(entityActionClass, "EnumPlayerAction");
@@ -73,32 +71,6 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
         cachedPlayerActionIDs.put(7, PlayerAction.OPEN_INVENTORY); //horse interaction
 
     }
-
-    @Override
-    protected void setup() {
-        final int entityId = readInt(0);
-        final int jumpBoost;
-        if (isLowerThan_v_1_8) {
-            jumpBoost = readInt(2);
-        } else {
-            jumpBoost = readInt(1);
-        }
-
-        //1.7.10
-        if (isLowerThan_v_1_8) {
-            int animationIndex = readInt(1);
-            this.action = cachedPlayerActionIDs.get(animationIndex);
-        } else {
-            final Object enumObj = readObject(0, enumPlayerActionClass);
-            final String enumValueName = enumObj.toString();
-            this.action = cachedPlayerActionNames.get(enumValueName);
-        }
-
-
-        this.entityId = entityId;
-        this.jumpBoost = jumpBoost;
-    }
-
     /**
      * Lookup the associated entity by the ID that was sent in the packet.
      *
@@ -106,7 +78,7 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
      */
     public Entity getEntity() {
         if(entity == null) {
-            return entity = NMSUtils.getEntityById(this.entityId);
+            return entity = NMSUtils.getEntityById(getEntityId());
         }
         return entity;
     }
@@ -119,7 +91,10 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
      * @return Entity ID
      */
     public int getEntityId() {
-        return entityId;
+        if(entityId != -1) {
+            return entityId;
+        }
+        return readInt(0);
     }
 
     /**
@@ -128,7 +103,14 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
      * @return Player Action
      */
     public PlayerAction getAction() {
-        return action;
+        if (isLowerThan_v_1_8) {
+            int animationIndex = readInt(1);
+            return cachedPlayerActionIDs.get(animationIndex);
+        } else {
+            final Object enumObj = readObject(0, enumPlayerActionClass);
+            final String enumValueName = enumObj.toString();
+            return cachedPlayerActionNames.get(enumValueName);
+        }
     }
 
     /**
@@ -137,7 +119,11 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
      * @return Jump Boost
      */
     public int getJumpBoost() {
-        return jumpBoost;
+        if (isLowerThan_v_1_8) {
+            return readInt(2);
+        } else {
+            return readInt(1);
+        }
     }
 
     public enum PlayerAction {

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

@@ -25,72 +25,42 @@
 package io.github.retrooper.packetevents.packetwrappers.in.flying;
 
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
 public class WrappedPacketInFlying extends WrappedPacket {
-    private static Class<?> flyingClass;
-    private double x;
-    private double y;
-    private double z;
-    private float yaw;
-    private float pitch;
-    private boolean onGround;
-    private boolean isPosition;
-    private boolean isLook;
     public WrappedPacketInFlying(Object packet) {
         super(packet);
     }
-
-    public static void load() {
-        flyingClass = PacketTypeClasses.Client.FLYING;
-    }
-
-    @Override
-    protected void setup() {
-        x = readDouble(0);
-        y = readDouble(1);
-        z = readDouble(2);
-
-        yaw = readFloat(0);
-        pitch = readFloat(1);
-
-        onGround = readBoolean(0);
-
-        isPosition = readBoolean(1);
-        isLook = readBoolean(2);
-    }
-
+    
     public double getX() {
-        return x;
+        return readDouble(0);
     }
 
     public double getY() {
-        return y;
+        return readDouble(1);
     }
 
     public double getZ() {
-        return z;
+        return readDouble(2);
     }
 
     public float getYaw() {
-        return yaw;
+        return readFloat(0);
     }
 
     public float getPitch() {
-        return pitch;
+        return readFloat(1);
     }
 
     public boolean isOnGround() {
-        return onGround;
+        return readBoolean(0);
     }
 
     public final boolean isPosition() {
-        return isPosition;
+        return readBoolean(1);
     }
 
     public final boolean isLook() {
-        return isLook;
+        return readBoolean(2);
     }
-
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/helditemslot/WrappedPacketInHeldItemSlot.java

@@ -24,36 +24,20 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.helditemslot;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
 public final class WrappedPacketInHeldItemSlot extends WrappedPacket {
-    private static Class<?> packetClass;
-    private int itemInHandIndex;
-
     public WrappedPacketInHeldItemSlot(Object packet) {
         super(packet);
     }
 
-    public static void load() {
-        packetClass = PacketTypeClasses.Client.HELD_ITEM_SLOT;
-    }
-
-    @Override
-    public void setup() {
-        try {
-            itemInHandIndex = readInt(0);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
     /**
      * Get the index of the item we currently have in hand.
      * @return Item in hand Index
      */
-    public int getItemInHandIndex() {
-        return itemInHandIndex;
+    public int getCurrentSelectedSlot() {
+        return readInt(0);
     }
 
 }

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

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.keepalive;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
 
@@ -42,15 +42,6 @@ public final class WrappedPacketInKeepAlive extends WrappedPacket {
         integerPresentInIndex0 = Reflection.getField(packetClass, int.class, 0) != null;
     }
 
-    @Override
-    protected void setup() {
-        if (!integerPresentInIndex0) {
-            this.id = readLong(0);
-        } else {
-            this.id = readInt(0);
-        }
-    }
-
     /**
      * Get the ID response from the client.
      *
@@ -59,6 +50,11 @@ public final class WrappedPacketInKeepAlive extends WrappedPacket {
      * @return response ID
      */
     public long getId() {
-        return id;
+        if(!integerPresentInIndex0) {
+            return readLong(0);
+        }
+        else {
+            return readInt(0);
+        }
     }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/settings/WrappedPacketInSettings.java

@@ -25,31 +25,27 @@
 package io.github.retrooper.packetevents.packetwrappers.in.settings;
 
 import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 
 import java.util.HashMap;
 
 public class WrappedPacketInSettings extends WrappedPacket {
-    private static Class<?> packetClass;
     private static Class<?> chatVisibilityEnumClass;
 
     private static boolean isLowerThan_v_1_8;
-    private String locale;
-    private int viewDistance;
-    private ChatVisibility chatVisibility;
-    private boolean chatColors;
-    private HashMap<DisplayedSkinPart, Boolean> displayedSkinParts;
+    private Object chatVisibilityEnumObj;
+    private HashMap<DisplayedSkinPart, Boolean> displayedSkinParts = new HashMap<>();
 
     public WrappedPacketInSettings(final Object packet) {
         super(packet);
     }
 
     public static void load() {
-        packetClass = PacketTypeClasses.Client.SETTINGS;
+        Class<?> packetClass = PacketTypeClasses.Client.SETTINGS;
 
         isLowerThan_v_1_8 = version.isLowerThan(ServerVersion.v_1_8);
 
@@ -63,35 +59,64 @@ public class WrappedPacketInSettings extends WrappedPacket {
         }
     }
 
-    public static Class<?> getChatVisibilityEnumClass() {
-        return chatVisibilityEnumClass;
+    /**
+     * Get language client setting
+     *
+     * @return String Locale
+     */
+    public String getLocale() {
+        return readString(0);
     }
 
-    @Override
-    protected void setup() {
-        try {
-            //LOCALE
-            this.locale = readString(0);
-            //VIEW DISTANCE
-            this.viewDistance = readInt(0);
+    /**
+     * Get client view distance.
+     *
+     * @return View Distance
+     */
+    public int getViewDistance() {
+        return readInt(0);
+    }
 
-            //CHAT VISIBILITY
-            Object chatVisibilityEnumObject = readObject(0, chatVisibilityEnumClass);
-            String enumValueAsString = chatVisibilityEnumObject.toString();
-            if (enumValueAsString.equals("FULL")) {
-                chatVisibility = ChatVisibility.ENABLED;
-            } else if (enumValueAsString.equals("SYSTEM")) {
-                chatVisibility = ChatVisibility.COMMANDS_ONLY;
-            } else {
-                chatVisibility = ChatVisibility.HIDDEN;
-            }
+    /**
+     * Get Chat Visibility
+     *
+     * @return Chat Visibility
+     */
+    public ChatVisibility getChatVisibility() {
+        if (chatVisibilityEnumObj == null) {
+            chatVisibilityEnumObj = readObject(0, chatVisibilityEnumClass);
+        }
+        String enumValueAsString = chatVisibilityEnumObj.toString();
+        if (enumValueAsString.equals("FULL")) {
+            return ChatVisibility.ENABLED;
+        } else if (enumValueAsString.equals("SYSTEM")) {
+            return ChatVisibility.COMMANDS_ONLY;
+        } else {
+            return ChatVisibility.HIDDEN;
+        }
+    }
 
-            //CHAT COLORS
-            this.chatColors = readBoolean(0);
-
-            //DISPLAYED SKIN PARTS
-            this.displayedSkinParts = new HashMap<DisplayedSkinPart, Boolean>();
+    /**
+     * Is chat colors
+     *
+     * @return Chat Colors
+     */
+    public boolean isChatColors() {
+        return readBoolean(0);
+    }
 
+    /**
+     * Get Displayed skin parts.
+     * <p>
+     * It is possible for some keys to not exist.
+     * If that is the case, the server version is 1.7.10.
+     * 1.7.10 only sends the cape skin part.
+     *
+     * @return A map with a Skin Parts as a key, and a boolean as a value.
+     */
+    @Nullable
+    public HashMap<DisplayedSkinPart, Boolean> getDisplayedSkinPartsMap() {
+        if (displayedSkinParts.isEmpty()) {
             if (isLowerThan_v_1_8) {
                 //in 1.7.10 only the cape display skin part is sent
                 boolean capeEnabled = readBoolean(1);
@@ -107,60 +132,7 @@ public class WrappedPacketInSettings extends WrappedPacket {
                 displayedSkinParts.put(DisplayedSkinPart.RIGHT_PANTS, (skinPartFlags & 0x20) != 0);
                 displayedSkinParts.put(DisplayedSkinPart.HAT, (skinPartFlags & 0x40) != 0);
             }
-
-        } catch (Exception e) {
-            e.printStackTrace();
         }
-
-    }
-
-    /**
-     * Get language client setting
-     *
-     * @return String Locale
-     */
-    public String getLocale() {
-        return locale;
-    }
-
-    /**
-     * Get client view distance.
-     *
-     * @return View Distance
-     */
-    public int getViewDistance() {
-        return viewDistance;
-    }
-
-    /**
-     * Get Chat Visibility
-     *
-     * @return Chat Visibility
-     */
-    public ChatVisibility getChatVisibility() {
-        return chatVisibility;
-    }
-
-    /**
-     * Is chat colors
-     *
-     * @return Chat Colors
-     */
-    public boolean isChatColors() {
-        return chatColors;
-    }
-
-    /**
-     * Get Displayed skin parts.
-     * <p>
-     * It is possible for some keys to not exist.
-     * If that is the case, the server version is 1.7.10.
-     * 1.7.10 only sends the cape skin part.
-     *
-     * @return A map with a Skin Parts as a key, and a boolean as a value.
-     */
-    @Nullable
-    public HashMap<DisplayedSkinPart, Boolean> getDisplayedSkinPartsMap() {
         return displayedSkinParts;
     }
 
@@ -174,6 +146,9 @@ public class WrappedPacketInSettings extends WrappedPacket {
      * @return Is the skin part enabled
      */
     public boolean isDisplaySkinPartEnabled(DisplayedSkinPart part) {
+        if(displayedSkinParts.isEmpty()) {
+            displayedSkinParts = getDisplayedSkinPartsMap();
+        }
         //1.7.10, we will default the other skin parts to return false.
         if (!displayedSkinParts.containsKey(part)) {
             return false;

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

@@ -24,63 +24,50 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.steervehicle;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
 public class WrappedPacketInSteerVehicle extends WrappedPacket {
-    private static Class<?> packetClass;
-    private float side, forward;
-    private boolean jump, unmount;
     public WrappedPacketInSteerVehicle(Object packet) {
         super(packet);
     }
 
-    public static void load() {
-        packetClass = PacketTypeClasses.Client.STEER_VEHICLE;
-    }
-
-    @Override
-    protected void setup() {
-        this.side = readFloat(0);
-        this.forward = readFloat(1);
-
-        this.jump = readBoolean(0);
-        this.unmount = readBoolean(1);
-    }
-
     /**
      * Get the side value.
-     *
+     * <p>
      * If positive, they are moving to the left, if negative, they are moving to the right.
+     *
      * @return Side Value
      */
     public float getSideValue() {
-        return side;
+        return readFloat(0);
     }
 
     /**
      * Get the forward value.
-     *
+     * <p>
      * If positive, they are moving forward, if negative, they are moving backwards.
+     *
      * @return Forward Value
      */
     public float getForwardValue() {
-        return forward;
+        return readFloat(1);
     }
 
     /**
      * Is a Jump
+     *
      * @return Is Jump
      */
     public boolean isJump() {
-        return jump;
+        return readBoolean(0);
     }
 
     /**
      * Is an unmount
+     *
      * @return Is Unmounting
      */
     public boolean isUnmount() {
-        return unmount;
+        return readBoolean(1);
     }
 }

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

@@ -24,50 +24,37 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.transaction;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
 public final class WrappedPacketInTransaction extends WrappedPacket {
-    private static Class<?> packetClass;
-    private int windowId;
-    private short actionNumber;
-    private boolean accepted;
     public WrappedPacketInTransaction(final Object packet) {
         super(packet);
     }
 
-    public static void load() {
-        packetClass = PacketTypeClasses.Client.TRANSACTION;
-    }
-
-    @Override
-    protected void setup() {
-        this.windowId = readInt(0);
-        this.actionNumber = readShort(0);
-        this.accepted = readBoolean(0);
-    }
-
     /**
      * Get the window ID.
+     *
      * @return Window ID
      */
     public int getWindowId() {
-        return windowId;
+        return readInt(0);
     }
 
     /**
      * Get the action number.
+     *
      * @return Action number
      */
     public short getActionNumber() {
-        return actionNumber;
+        return readShort(0);
     }
 
     /**
      * Is transaction accepted.
+     *
      * @return Transaction Accepted
      */
     public boolean isAccepted() {
-        return accepted;
+        return readBoolean(0);
     }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/updatesign/WrappedPacketInUpdateSign.java

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.updatesign;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
@@ -34,8 +34,7 @@ public class WrappedPacketInUpdateSign extends WrappedPacket {
     private static boolean v_1_7_mode, strArrayMode;
     private static Class<?> blockPosClass, iChatBaseComponentClass;
 
-    private int x, y, z;
-    private String[] lines;
+    private Object blockPosObj;
 
     public static void load() {
         v_1_7_mode = Reflection.getField(PacketTypeClasses.Client.UPDATE_SIGN, int.class, 0) != null;
@@ -59,48 +58,61 @@ public class WrappedPacketInUpdateSign extends WrappedPacket {
         super(packet);
     }
 
-    @Override
-    protected void setup() {
-        if (v_1_7_mode) {
-            x = readInt(0);
-            y = readInt(1);
-            z = readInt(2);
-        } else {
-            Object blockPos = readObject(0, blockPosClass);
-            try {
-                x = Reflection.getField(blockPosClass, int.class, 0).getInt(packet);
-                y = Reflection.getField(blockPosClass, int.class, 1).getInt(packet);
-                z = Reflection.getField(blockPosClass, int.class, 2).getInt(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
+    public int getX() {
+        if(v_1_7_mode) {
+            return readInt(0);
+        }
+        else {
+            if(blockPosObj == null) {
+                blockPosObj = readObject(0, blockPosClass);
+                WrappedPacket blockPosWrapper = new WrappedPacket(blockPosObj);
+                return blockPosWrapper.readInt(0);
             }
         }
+        return 0;
+    }
+
+    public int getY() {
+        if(v_1_7_mode) {
+            return readInt(1);
+        }
+        else {
+            if(blockPosObj == null) {
+                blockPosObj = readObject(0, blockPosClass);
+                WrappedPacket blockPosWrapper = new WrappedPacket(blockPosObj);
+                return blockPosWrapper.readInt(1);
+            }
+        }
+        return 0;
+    }
+
+    public int getZ() {
+        if(v_1_7_mode) {
+            return readInt(2);
+        }
+        else {
+            if(blockPosObj == null) {
+                blockPosObj = readObject(0, blockPosClass);
+                WrappedPacket blockPosWrapper = new WrappedPacket(blockPosObj);
+                return blockPosWrapper.readInt(2);
+            }
+        }
+        return 0;
+    }
+
+    public String[] getTextLines() {
         if (strArrayMode) {
             //1.7.10 and the newest versions use this
-            lines = readStringArray(0);
+            return readStringArray(0);
         } else {
             //1.8 uses this for example
             Object[] iChatComponents = readObjectArray(0, iChatBaseComponentClass);
+            String[] lines = new String[iChatComponents.length];
             for (int i = 0; i < iChatComponents.length; i++) {
                 lines[i] = WrappedPacketOutChat.
                         toStringFromIChatBaseComponent(iChatComponents[i]);
             }
+            return lines;
         }
     }
-
-    public int getBlockPositionX() {
-        return x;
-    }
-
-    public int getBlockPositionY() {
-        return y;
-    }
-
-    public int getBlockPositionZ() {
-        return z;
-    }
-
-    public String[] getTextLines() {
-        return lines;
-    }
 }

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

@@ -30,18 +30,16 @@ import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;
 import org.bukkit.entity.Entity;
 
 public final class WrappedPacketInUseEntity extends WrappedPacket {
-    private static Class<?> useEntityClass;
     private static Class<?> enumEntityUseActionClass;
     private Entity entity;
-    private int entityID;
-    private EntityUseAction action;
+    private int entityID = -1;
     public WrappedPacketInUseEntity(final Object packet) {
         super(packet);
     }
 
     public static void load() {
         //System.out.println("USE ENTITY HAS BEEN LOADED BROOOIOII");
-        useEntityClass = NMSUtils.getNMSClassWithoutException("PacketPlayInUseEntity");
+        Class<?> useEntityClass = NMSUtils.getNMSClassWithoutException("PacketPlayInUseEntity");
         /*if(useEntityClass == null) {
             System.out.println("failed to init use entity wtfffff");
         }*/
@@ -53,15 +51,6 @@ public final class WrappedPacketInUseEntity extends WrappedPacket {
         }
     }
 
-    @Override
-    protected void setup() {
-        this.entityID = readInt(0);
-        if(enumEntityUseActionClass == null) {
-                System.out.println("cls is null");
-        }
-        final Object useActionEnum = readObject(0, enumEntityUseActionClass);
-        this.action = EntityUseAction.valueOf(useActionEnum.toString());
-    }
 
     /**
      * Lookup the associated entity by the ID that was sent in the packet.
@@ -71,7 +60,7 @@ public final class WrappedPacketInUseEntity extends WrappedPacket {
         if(entity != null) {
             return entity;
         }
-        return entity = NMSUtils.getEntityById(this.entityID);
+        return entity = NMSUtils.getEntityById(getEntityID());
     }
 
     /**
@@ -80,8 +69,13 @@ public final class WrappedPacketInUseEntity extends WrappedPacket {
      * you lookup the entity by yourself with this entity ID.
      * @return Entity ID
      */
-    public int getEntityId() {
-        return entityID;
+    public int getEntityID() {
+        if(entityID != -1) {
+            return entityID;
+        }
+        else {
+            return entityID = readInt(0);
+        }
     }
 
     /**
@@ -89,7 +83,8 @@ public final class WrappedPacketInUseEntity extends WrappedPacket {
      * @return Get EntityUseAction
      */
     public EntityUseAction getAction() {
-        return action;
+        final Object useActionEnum = readObject(0, enumEntityUseActionClass);
+        return EntityUseAction.valueOf(useActionEnum.toString());
     }
 
     public enum EntityUseAction {

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/windowclick/WrappedPacketInWindowClick.java

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.in.windowclick;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
@@ -103,6 +103,7 @@ public class WrappedPacketInWindowClick extends WrappedPacket {
 
         windowClickTypeCache.put(6, getArrayListOfWindowClickTypes(WindowClickType.DOUBLE_CLICK));
         isClickModePrimitive = Reflection.getField(packetClass, int.class, 3) != null;
+        invClickTypeClass = NMSUtils.getNMSClassWithoutException("InventoryClickType");
     }
 
     private static ArrayList<WindowClickType> getArrayListOfWindowClickTypes(WindowClickType... types) {
@@ -111,29 +112,12 @@ public class WrappedPacketInWindowClick extends WrappedPacket {
         return arrayList;
     }
 
-    @Override
-    protected void setup() {
-        this.id = readInt(0);
-        this.slot = readInt(1);
-        this.button = readInt(2);
-        this.actionNumber = readShort(0);
-        Object nmsItemStack = readObject(0, NMSUtils.nmsItemStackClass);
-        this.clickedItem = NMSUtils.toBukkitItemStack(nmsItemStack);
-        Object clickMode = readAnyObject(5);
-
-        if (isClickModePrimitive) {
-            mode = (int) clickMode;
-        } else {
-            mode = invClickTypeMapCache.get(clickMode.toString());
-        }
-    }
-
     /**
      * Get the Window ID.
      * @return Get Window ID
      */
     public int getWindowID() {
-        return id;
+        return readInt(0);
     }
 
     /**
@@ -141,7 +125,7 @@ public class WrappedPacketInWindowClick extends WrappedPacket {
      * @return Get Window Slot
      */
     public int getWindowSlot() {
-        return slot;
+        return readInt(1);
     }
 
     /**
@@ -149,7 +133,7 @@ public class WrappedPacketInWindowClick extends WrappedPacket {
      * @return Get Window Button
      */
     public int getWindowButton() {
-        return button;
+        return readInt(2);
     }
 
     /**
@@ -157,7 +141,7 @@ public class WrappedPacketInWindowClick extends WrappedPacket {
      * @return Get Action Number
      */
     public short getActionNumber() {
-        return actionNumber;
+        return readShort(0);
     }
 
     /**
@@ -189,7 +173,11 @@ public class WrappedPacketInWindowClick extends WrappedPacket {
      * @return Get Window Mode.
      */
     public int getMode() {
-        return mode;
+        if (isClickModePrimitive) {
+            return readInt(3);
+        } else {
+            return invClickTypeMapCache.get(readObject(5, invClickTypeClass).toString());
+        }
     }
 
     /**
@@ -197,7 +185,8 @@ public class WrappedPacketInWindowClick extends WrappedPacket {
      * @return Get Clicked ItemStack
      */
     public ItemStack getClickedItem() {
-        return clickedItem;
+        Object nmsItemStack = readObject(0, NMSUtils.nmsItemStackClass);
+        return NMSUtils.toBukkitItemStack(nmsItemStack);
     }
 
     public enum WindowClickType {

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

@@ -22,25 +22,24 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.packetwrappers.in.armanimation;
+package io.github.retrooper.packetevents.packetwrappers.login.in;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
-public final class WrappedPacketInArmAnimation extends WrappedPacket {
-    private static Class<?> packetClass;
-
-    public WrappedPacketInArmAnimation(Object packet) {
+public class WrappedPacketLoginHandshake extends WrappedPacket {
+    public WrappedPacketLoginHandshake(Object packet) {
         super(packet);
     }
 
-    public static void load() {
-        packetClass = PacketTypeClasses.Client.ARM_ANIMATION;
+    public int getProtocolVersion() {
+        return readInt(0);
     }
 
-    @Override
-    public void setup() {
-
+    public String getHostName() {
+        return readString(0);
     }
 
+    public int getPort() {
+        return readInt(1);
+    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/login/in/WrappedPacketLoginInCustomPayload.java

@@ -0,0 +1,42 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.login.in;
+
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+
+public class WrappedPacketLoginInCustomPayload extends WrappedPacket {
+    public WrappedPacketLoginInCustomPayload(Object packet) {
+        super(packet);
+    }
+
+
+    /* TODO wrappers
+     * net.minecraft.server.v1_16_R2.PacketLoginInCustomPayload inCP;
+     * net.minecraft.server.v1_16_R2.PacketLoginOutCustomPayload outCP;
+     * net.minecraft.server.v1_16_R2.PacketPlayOutLogin outLogin;
+     * Find out about the Status Response packet
+     */
+}
+

src/main/java/io/github/retrooper/packetevents/packetwrappers/login/in/WrappedPacketLoginInStart.java

@@ -0,0 +1,40 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.login.in;
+
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.gameprofile.GameProfileUtil;
+import io.github.retrooper.packetevents.utils.gameprofile.WrappedGameProfile;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+
+public class WrappedPacketLoginInStart extends WrappedPacket {
+    public WrappedPacketLoginInStart(Object packet) {
+        super(packet);
+    }
+
+    public WrappedGameProfile getGameProfile() {
+        return GameProfileUtil.getWrappedGameProfile(readObject(0, NMSUtils.gameProfileClass));
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/login/in/WrapppedPacketLoginInEncryptionBegin.java

@@ -22,20 +22,20 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.utils.vector;
+package io.github.retrooper.packetevents.packetwrappers.login.in;
 
-@Deprecated
-public final class Vector3d {
-    public double x, y, z;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
-    public Vector3d(final double x, final double y, final double z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
+public class WrapppedPacketLoginInEncryptionBegin extends WrappedPacket {
+    public WrapppedPacketLoginInEncryptionBegin(Object packet) {
+        super(packet);
     }
 
-    @Override
-    public String toString() {
-        return "X: " + x + ", Y: " + y + ", Z: " + z;
+    public byte[] getPublicKey() {
+        return readByteArray(0);
+    }
+
+    public byte[] getVerifyToken() {
+        return readByteArray(1);
     }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/login/out/WrappedPacketLoginDisconnect.java

@@ -0,0 +1,40 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.login.out;
+
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+
+public class WrappedPacketLoginDisconnect extends WrappedPacket {
+    public WrappedPacketLoginDisconnect(Object packet) {
+        super(packet);
+    }
+
+    public String getReason() {
+        Object iChatBaseComponent = readObject(0, NMSUtils.iChatBaseComponentClass);
+        return WrappedPacketOutChat.toStringFromIChatBaseComponent(iChatBaseComponent);
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/login/out/WrappedPacketLoginOutEncryptionBegin.java

@@ -0,0 +1,47 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.login.out;
+
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+
+import java.security.PublicKey;
+
+public class WrappedPacketLoginOutEncryptionBegin extends WrappedPacket {
+    public WrappedPacketLoginOutEncryptionBegin(Object packet) {
+        super(packet);
+    }
+
+    public String getEncodedString() {
+        return readString(0);
+    }
+
+    public PublicKey getPublicKey() {
+        return (PublicKey) readObject(1, PublicKey.class);
+    }
+
+    public byte[] getByteArray() {
+        return readByteArray(0);
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/login/out/WrappedPacketLoginOutSetCompression.java

@@ -0,0 +1,41 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.login.out;
+
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+
+//This packet does not exist on 1.7.10
+public class WrappedPacketLoginOutSetCompression extends WrappedPacket {
+    public WrappedPacketLoginOutSetCompression(Object packet) {
+        super(packet);
+    }
+
+    /**
+     * Maximum size of a packet before it can be compressed.
+     */
+    public int getThreshold() {
+        return readInt(0);
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/login/out/WrappedPacketLoginOutSuccess.java

@@ -0,0 +1,40 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.login.out;
+
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.gameprofile.GameProfileUtil;
+import io.github.retrooper.packetevents.utils.gameprofile.WrappedGameProfile;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+
+public class WrappedPacketLoginOutSuccess extends WrappedPacket {
+    public WrappedPacketLoginOutSuccess(Object packet) {
+        super(packet);
+    }
+
+    public WrappedGameProfile getGameProfile() {
+        return GameProfileUtil.getWrappedGameProfile(readObject(0, NMSUtils.gameProfileClass));
+    }
+}

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

@@ -24,6 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.abilities;
 
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 
@@ -50,13 +51,13 @@ final class PlayerAbilitiesUtils {
     public static Object getPlayerAbilities(final boolean isVulnerable, final boolean isFlying, final boolean allowFlight, final boolean canBuildInstantly,
                                             final float flySpeed, final float walkSpeed) throws IllegalAccessException, InvocationTargetException, InstantiationException {
         final Object instance = playerAbilitiesConstructor.newInstance();
-        Reflection.getField(playerAbilitiesClass, boolean.class, 0).setBoolean(instance, isVulnerable);
-        Reflection.getField(playerAbilitiesClass, boolean.class, 1).setBoolean(instance, isFlying);
-        Reflection.getField(playerAbilitiesClass, boolean.class, 2).setBoolean(instance, allowFlight);
-        Reflection.getField(playerAbilitiesClass, boolean.class, 3).setBoolean(instance, canBuildInstantly);
-
-        Reflection.getField(playerAbilitiesClass, float.class, 0).setFloat(instance, flySpeed);
-        Reflection.getField(playerAbilitiesClass, float.class, 1).setFloat(instance, walkSpeed);
+        WrappedPacket wrapper = new WrappedPacket(instance);
+        wrapper.writeBoolean(0, isVulnerable);
+        wrapper.writeBoolean(1, isFlying);
+        wrapper.writeBoolean(2, allowFlight);
+        wrapper.writeBoolean(3, canBuildInstantly);
+        wrapper.writeFloat(0, flySpeed);
+        wrapper.writeFloat(1, walkSpeed);
         return instance;
     }
 }

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

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.abilities;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
@@ -34,10 +34,13 @@ import java.lang.reflect.InvocationTargetException;
 public final class WrappedPacketOutAbilities extends WrappedPacket implements SendableWrapper {
     private static Class<?> packetClass;
     private static Constructor<?> packetConstructor;
+    private boolean isListening = false;
     private boolean vulnerable, flying, allowFlight, instantBuild;
     private float flySpeed, walkSpeed;
+
     public WrappedPacketOutAbilities(final Object packet) {
         super(packet);
+        isListening = true;
     }
 
     public WrappedPacketOutAbilities(final boolean isVulnerable, final boolean isFlying, final boolean allowFlight, final boolean canBuildInstantly,
@@ -61,63 +64,82 @@ public final class WrappedPacketOutAbilities extends WrappedPacket implements Se
         }
     }
 
-    @Override
-    protected void setup() {
-        this.vulnerable = readBoolean(0);
-        this.flying = readBoolean(1);
-        this.allowFlight = readBoolean(2);
-        this.instantBuild = readBoolean(3);
-
-        this.flySpeed = readFloat(0);
-        this.walkSpeed = readFloat(1);
-    }
-
     /**
      * Should the client be vulnerable?
+     *
      * @return Is Vulnerable
      */
     public boolean isVulnerable() {
-        return vulnerable;
+        if (isListening) {
+            return readBoolean(0);
+        } else {
+            return vulnerable;
+        }
     }
 
     /**
      * Should the client be flying?
+     *
      * @return Is Flying
      */
     public boolean isFlying() {
-        return flying;
+        if (isListening) {
+            return readBoolean(1);
+        } else {
+            return flying;
+        }
     }
 
     /**
      * Should the client be allowed to fly?
+     *
      * @return Is Allowed To Fly
      */
     public boolean isFlightAllowed() {
-        return allowFlight;
+        if (isListening) {
+            return readBoolean(2);
+        } else {
+            return allowFlight;
+        }
     }
 
     /**
      * Should the client be able to build instantly?
+     *
      * @return Is Allowed To Build Instantly
      */
     public boolean canInstantlyBuild() {
-        return instantBuild;
+        if (isListening) {
+            return readBoolean(3);
+        } else {
+            return instantBuild;
+        }
     }
 
     /**
      * Get the client's defined fly speed.
+     *
      * @return Get Fly Speed
      */
     public float getFlySpeed() {
-        return flySpeed;
+        if (isListening) {
+            return readFloat(0);
+        } else {
+            return flySpeed;
+        }
     }
 
     /**
      * Get the client's defined walk speed.
+     *
      * @return Get Walk Speed
      */
     public float getWalkSpeed() {
-        return walkSpeed;
+        if (isListening) {
+            return readFloat(1);
+        } else {
+            return walkSpeed;
+        }
     }
 
     @Override

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

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.animation;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
@@ -41,10 +41,13 @@ public final class WrappedPacketOutAnimation extends WrappedPacket implements Se
     private static final HashMap<Integer, EntityAnimationType> cachedAnimationIDS = new HashMap<Integer, EntityAnimationType>();
     private static final HashMap<EntityAnimationType, Integer> cachedAnimations = new HashMap<EntityAnimationType, Integer>();
     private Entity entity;
-    private int entityID;
+    private int entityID = -1;
     private EntityAnimationType type;
+    private boolean isListening = false;
+
     public WrappedPacketOutAnimation(final Object packet) {
         super(packet);
+        isListening = true;
     }
 
     public WrappedPacketOutAnimation(final Entity target, final EntityAnimationType type) {
@@ -82,37 +85,43 @@ public final class WrappedPacketOutAnimation extends WrappedPacket implements Se
         cachedAnimations.put(EntityAnimationType.MAGIC_CRITICAL_EFFECT, 5);
     }
 
-    @Override
-    protected void setup() {
-        this.entityID = readInt(0);
-        int animationID = readInt(1);
-        this.type = cachedAnimationIDS.get(animationID);
-    }
-
     /**
      * Lookup the associated entity by the ID that was sent in the packet.
+     *
      * @return Entity
      */
     public Entity getEntity() {
-        return NMSUtils.getEntityById(this.entityID);
+        if (entity != null) {
+            return entity;
+        }
+        return entity = NMSUtils.getEntityById(getEntityId());
     }
 
     /**
      * Get the ID of the entity.
      * If you do not want to use {@link #getEntity()},
      * you lookup the entity by yourself with this entity ID.
+     *
      * @return Entity ID
      */
     public int getEntityId() {
+        if (entityID == -1) {
+            entityID = readInt(0);
+        }
         return entityID;
     }
 
     /**
      * Get the entity animation type.
+     *
      * @return Get Entity Animation Type
      */
     public EntityAnimationType getAnimationType() {
-        return type;
+        if (isListening) {
+            return cachedAnimationIDS.get(readInt(1));
+        } else {
+            return type;
+        }
     }
 
     @Override

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

@@ -26,7 +26,7 @@ package io.github.retrooper.packetevents.packetwrappers.out.chat;
 
 import io.github.retrooper.packetevents.annotations.Beta;
 import io.github.retrooper.packetevents.annotations.NotNull;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
@@ -62,7 +62,7 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
     private String message;
     private ChatPosition chatPosition;
     private UUID uuid;
-
+    private boolean isListening = false;
 
     @Deprecated
     public WrappedPacketOutChat(String message) {
@@ -71,6 +71,7 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
 
     public WrappedPacketOutChat(final Object packet) {
         super(packet);
+        isListening = true;
     }
 
     public WrappedPacketOutChat(String message, UUID uuid) {
@@ -180,36 +181,6 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
         return null;
     }
 
-
-    @Override
-    protected void setup() {
-        try {
-            final Object iChatBaseObj = readObject(0, iChatBaseComponentClass);
-
-            final Object contentString = Reflection.getMethod(iChatBaseComponentClass, String.class, 0).invoke(iChatBaseObj);
-
-            this.message = contentString.toString();
-
-            byte chatPosInteger = 0;
-            switch (constructorMode) {
-                case 0:
-                    chatPosInteger = readByte(0);
-                    break;
-                case 1:
-                    chatPosInteger = (byte) readInt(0);
-                    break;
-                case 2:
-                case 3:
-                    Object chatTypeEnumInstance = readObject(0, chatMessageTypeEnum);
-                    chatPosInteger = cachedChatMessageTypeIntegers.get(chatTypeEnumInstance.toString());
-                    break;
-            }
-            this.chatPosition = cachedChatPositionIntegers.get(chatPosInteger);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-    }
-
     @Override
     public Object asNMSPacket() {
         int integerChatPos = cachedChatPositions.get(chatPosition);
@@ -267,7 +238,20 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
      * @return Get String Message
      */
     public String getMessage() {
-        return this.message;
+        if(isListening) {
+            final Object iChatBaseObj = readObject(0, iChatBaseComponentClass);
+
+            try {
+                Object contentString = Reflection.getMethod(iChatBaseComponentClass, String.class, 0).invoke(iChatBaseObj);
+                return contentString.toString();
+            } catch (IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+        else {
+            return message;
+        }
     }
 
     /**
@@ -277,11 +261,27 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
      * If an invalid chat position is sent, it will be defaulted it to CHAT.
      * @return ChatPosition
      */
-    @NotNull
     public ChatPosition getChatPosition() {
-        if(this.chatPosition == null) {
-            this.chatPosition = ChatPosition.CHAT;
+        if(isListening) {
+            byte chatPosInteger = 0;
+            switch (constructorMode) {
+                case 0:
+                    chatPosInteger = readByte(0);
+                    break;
+                case 1:
+                    chatPosInteger = (byte) readInt(0);
+                    break;
+                case 2:
+                case 3:
+                    Object chatTypeEnumInstance = readObject(0, chatMessageTypeEnum);
+                    chatPosInteger = cachedChatMessageTypeIntegers.get(chatTypeEnumInstance.toString());
+                    break;
+            }
+            return cachedChatPositionIntegers.get(chatPosInteger);
+        }
+        else {
+            return chatPosition;
         }
-        return this.chatPosition;
     }
+
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/custompayload/WrappedPacketOutCustomPayload.java

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.custompayload;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.bytebuf.ByteBufUtil;
@@ -46,6 +46,7 @@ public class WrappedPacketOutCustomPayload extends WrappedPacket implements Send
     private static int minecraftKeyIndexInClass;
 
     private static byte constructorMode = 0;
+    private boolean isListening = false;
 
     public static void load() {
         packetClass = PacketTypeClasses.Server.CUSTOM_PAYLOAD;
@@ -121,6 +122,7 @@ public class WrappedPacketOutCustomPayload extends WrappedPacket implements Send
 
     public WrappedPacketOutCustomPayload(Object packet) {
         super(packet);
+        isListening = true;
     }
 
     @Override
@@ -152,11 +154,42 @@ public class WrappedPacketOutCustomPayload extends WrappedPacket implements Send
     }
 
     public String getTag() {
-        return tag;
+        if(isListening) {
+            switch(constructorMode) {
+                case 0:
+                case 1:
+                    return readString(0);
+                case 2:
+                    Object minecraftKey = readObject(minecraftKeyIndexInClass, minecraftKeyClass);
+                    WrappedPacket minecraftKeyWrapper = new WrappedPacket(minecraftKey);
+                    return minecraftKeyWrapper.readString(1);
+            }
+        }
+        else {
+            return tag;
+        }
+        return null;
     }
 
     public byte[] getData() {
-        return data;
+        if(isListening) {
+            switch(constructorMode) {
+                case 0:
+                    return readByteArray(0);
+                case 1:
+                case 2:
+                    Object dataSerializer = readObject(0, packetDataSerializerClass);
+                    WrappedPacket byteBufWrapper = new WrappedPacket(dataSerializer);
+
+                    Object byteBuf = byteBufWrapper.readObject(0, byteBufClass);
+
+                    return ByteBufUtil.getBytes(byteBuf);
+            }
+        }
+        else {
+            return data;
+        }
+        return null;
     }
 
     @Override

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

@@ -24,27 +24,54 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.entity;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
-import io.github.retrooper.packetevents.utils.reflection.Reflection;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
 import org.bukkit.entity.Entity;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 
-public class WrappedPacketOutEntity extends WrappedPacket {
+public class WrappedPacketOutEntity extends WrappedPacket implements SendableWrapper {
     private static Class<?> packetClass;
     //Byte = 1.7.10->1.8.8, Int = 1.9->1.15.x, Short = 1.16.x
     private static byte mode = 0; //byte = 0, int = 1, short = 2
     private static double dXYZDivisor = 0.0;
+    private static int yawByteIndex = 0;
+    private static int pitchByteIndex = 1;
     private Entity entity;
+    private boolean isListening = false;
+    private static Constructor<?> entityPacketConstructor;
     private int entityID;
     private double deltaX, deltaY, deltaZ;
-    private byte yaw, pitch;
+    private byte pitch, yaw;
     private boolean onGround;
 
     public WrappedPacketOutEntity(Object packet) {
         super(packet);
+        isListening = true;
+    }
+
+    public WrappedPacketOutEntity(int entityID, double deltaX, double deltaY, double deltaZ,
+                                  byte pitch, byte yaw, boolean onGround) {
+        this.entityID = entityID;
+        this.deltaX = deltaX;
+        this.deltaY = deltaY;
+        this.deltaZ = deltaZ;
+        this.pitch = pitch;
+        this.yaw = yaw;
+        this.onGround = onGround;
+        //Get entity player then pass it into the packetplayoutnamedentityspawn!
+      //  net.minecraft.server.v1_7_R4.EntityPlayer cp = null;
+        //net.minecraft.server.v1_7_R4.PacketPlayOutNamedEntitySpawn es = new net.minecraft.server.v1_7_R4.PacketPlayOutNamedEntitySpawn(cp);
+    }
+
+    public WrappedPacketOutEntity(Entity entity, double deltaX, double deltaY, double deltaZ,
+                                  byte pitch, byte yaw, boolean onGround) {
+        this(entity.getEntityId(), deltaX, deltaY, deltaZ, pitch, yaw, onGround);
     }
 
     public static void load() {
@@ -54,6 +81,8 @@ public class WrappedPacketOutEntity extends WrappedPacket {
         assert dxField != null;
         if (dxField.equals(Reflection.getField(packetClass, byte.class, 0))) {
             mode = 0;
+            yawByteIndex = 3;
+            pitchByteIndex = 4;
         } else if (dxField.equals(Reflection.getField(packetClass, int.class, 1))) {
             mode = 1;
         } else if (dxField.equals(Reflection.getField(packetClass, short.class, 0))) {
@@ -65,40 +94,12 @@ public class WrappedPacketOutEntity extends WrappedPacket {
         } else {
             dXYZDivisor = 4096.0;
         }
-
-    }
-
-    @Override
-    protected void setup() {
-        this.entityID = readInt(0);
-        this.onGround = readBoolean(0);
-        int dX = 1, dY = 1, dZ = 1;
-        switch (mode) {
-            case 0:
-                dX = readByte(0);
-                dY = readByte(1);
-                dZ = readByte(2);
-                this.yaw = readByte(3);
-                this.pitch = readByte(4);
-                break;
-            case 1:
-                dX = readInt(1);
-                dY = readInt(2);
-                dZ = readInt(3);
-                this.yaw = readByte(0);
-                this.pitch = readByte(1);
-                break;
-            case 2:
-                dX = readShort(0);
-                dY = readShort(1);
-                dZ = readShort(2);
-                this.yaw = readByte(0);
-                this.pitch = readByte(1);
-                break;
+        try {
+            entityPacketConstructor = packetClass.getConstructor(int.class);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
         }
-        this.deltaX = dX / dXYZDivisor;
-        this.deltaY = dY / dXYZDivisor;
-        this.deltaZ = dZ / dXYZDivisor;
+
     }
 
     /**
@@ -107,7 +108,11 @@ public class WrappedPacketOutEntity extends WrappedPacket {
      * @return Get Byte Pitch
      */
     public byte getPitch() {
-        return pitch;
+        if (isListening) {
+            return readByte(pitchByteIndex);
+        } else {
+            return pitch;
+        }
     }
 
     /**
@@ -116,7 +121,11 @@ public class WrappedPacketOutEntity extends WrappedPacket {
      * @return Get Byte Yaw
      */
     public byte getYaw() {
-        return yaw;
+        if (isListening) {
+            return readByte(yawByteIndex);
+        } else {
+            return yaw;
+        }
     }
 
     /**
@@ -125,7 +134,19 @@ public class WrappedPacketOutEntity extends WrappedPacket {
      * @return Delta X
      */
     public double getDeltaX() {
-        return deltaX;
+        if (isListening) {
+            switch (mode) {
+                case 0:
+                    return readByte(0) / dXYZDivisor;
+                case 1:
+                    return readInt(1) / dXYZDivisor;
+                case 2:
+                    return readShort(0) / dXYZDivisor;
+            }
+        } else {
+            return deltaX;
+        }
+        return 0.0;
     }
 
     /**
@@ -134,7 +155,19 @@ public class WrappedPacketOutEntity extends WrappedPacket {
      * @return Delta Y
      */
     public double getDeltaY() {
-        return deltaY;
+        if (isListening) {
+            switch (mode) {
+                case 0:
+                    return readByte(1) / dXYZDivisor;
+                case 1:
+                    return readInt(2) / dXYZDivisor;
+                case 2:
+                    return readShort(1) / dXYZDivisor;
+            }
+        } else {
+            return deltaY;
+        }
+        return 0.0;
     }
 
     /**
@@ -143,7 +176,19 @@ public class WrappedPacketOutEntity extends WrappedPacket {
      * @return Delta Z
      */
     public double getDeltaZ() {
-        return deltaZ;
+        if (isListening) {
+            switch (mode) {
+                case 0:
+                    return readByte(2) / dXYZDivisor;
+                case 1:
+                    return readInt(3) / dXYZDivisor;
+                case 2:
+                    return readShort(2) / dXYZDivisor;
+            }
+        } else {
+            return deltaZ;
+        }
+        return 0.0;
     }
 
     /**
@@ -155,7 +200,7 @@ public class WrappedPacketOutEntity extends WrappedPacket {
         if (entity != null) {
             return entity;
         }
-        return entity = NMSUtils.getEntityById(this.entityID);
+        return entity = NMSUtils.getEntityById(getEntityId());
     }
 
     /**
@@ -166,7 +211,11 @@ public class WrappedPacketOutEntity extends WrappedPacket {
      * @return Entity ID
      */
     public int getEntityId() {
-        return entityID;
+        if (entityID != -1) {
+            return entityID;
+        } else {
+            return entityID = readInt(0);
+        }
     }
 
     /**
@@ -175,301 +224,42 @@ public class WrappedPacketOutEntity extends WrappedPacket {
      * @return On Ground
      */
     public boolean isOnGround() {
-        return onGround;
-    }
-
-    public static class WrappedPacketOutRelEntityMove extends WrappedPacket {
-        private int entityID;
-        private Entity entity;
-        private double deltaX, deltaY, deltaZ;
-        private boolean onGround;
-
-        public WrappedPacketOutRelEntityMove(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        protected void setup() {
-            int dX = 1, dY = 1, dZ = 1;
-            switch (mode) {
-                case 0:
-                    dX = readByte(0);
-                    dY = readByte(1);
-                    dZ = readByte(2);
-                    break;
-                case 1:
-                    dX = readInt(1);
-                    dY = readInt(2);
-                    dZ = readInt(3);
-                    break;
-                case 2:
-                    dX = readShort(0);
-                    dY = readShort(1);
-                    dZ = readShort(2);
-                    break;
-            }
-            deltaX = dX / dXYZDivisor;
-            deltaY = dY / dXYZDivisor;
-            deltaZ = dZ / dXYZDivisor;
-        }
-
-        /**
-         * Get the Delta X
-         *
-         * @return Delta X
-         */
-        public double getDeltaX() {
-            return deltaX;
-        }
-
-        /**
-         * Get the Delta Y
-         *
-         * @return Delta Y
-         */
-        public double getDeltaY() {
-            return deltaY;
-        }
-
-        /**
-         * Get the Delta Z
-         *
-         * @return Delta Z
-         */
-        public double getDeltaZ() {
-            return deltaZ;
-        }
-
-        /**
-         * Lookup the associated entity by the ID that was sent in the packet.
-         *
-         * @return Entity
-         */
-        public Entity getEntity() {
-            if (entity != null) {
-                return entity;
-            }
-            return entity = NMSUtils.getEntityById(this.entityID);
-        }
-
-        /**
-         * Get the ID of the entity.
-         * If you do not want to use {@link #getEntity()},
-         * you lookup the entity by yourself with this entity ID.
-         *
-         * @return Entity ID
-         */
-        public int getEntityId() {
-            return entityID;
-        }
-
-        /**
-         * Is the entity on the ground?
-         *
-         * @return On Ground
-         */
-        public boolean isOnGround() {
+        if (isListening) {
+            return readBoolean(0);
+        } else {
             return onGround;
         }
     }
 
-    public static class WrappedPacketOutRelEntityMoveLook extends WrappedPacket {
-        private int entityID;
-        private Entity entity;
-        private double deltaX, deltaY, deltaZ;
-        private byte yaw, pitch;
-        private boolean onGround;
-
-        public WrappedPacketOutRelEntityMoveLook(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        protected void setup() {
-            entityID = readInt(0);
-            onGround = readBoolean(0);
-            int dX = 1, dY = 1, dZ = 1;
-            switch (mode) {
+    @Override
+    public Object asNMSPacket() {
+        try {
+            Object packetInstance = entityPacketConstructor.newInstance(entityID);
+            WrappedPacket wrapper = new WrappedPacket(packetInstance);
+            switch(mode) {
                 case 0:
-                    dX = readByte(0);
-                    dY = readByte(1);
-                    dZ = readByte(2);
-                    yaw = readByte(3);
-                    pitch = readByte(4);
+                    wrapper.writeByte(0, (byte)(deltaX * dXYZDivisor));
+                    wrapper.writeByte(1, (byte)(deltaY * dXYZDivisor));
+                    wrapper.writeByte(2, (byte)(deltaZ * dXYZDivisor));
                     break;
                 case 1:
-                    dX = readInt(1);
-                    dY = readInt(2);
-                    dZ = readInt(3);
-                    yaw = readByte(0);
-                    pitch = readByte(1);
+                    wrapper.writeInt(1, (int)(deltaX * dXYZDivisor));
+                    wrapper.writeInt(2, (int)(deltaY * dXYZDivisor));
+                    wrapper.writeInt(3, (int)(deltaZ * dXYZDivisor));
                     break;
                 case 2:
-                    dX = readShort(0);
-                    dY = readShort(1);
-                    dZ = readShort(2);
-                    yaw = readByte(0);
-                    pitch = readByte(1);
+                    wrapper.writeShort(0, (short)(deltaX * dXYZDivisor));
+                    wrapper.writeShort(1, (short)(deltaY * dXYZDivisor));
+                    wrapper.writeShort(2, (short)(deltaZ * dXYZDivisor));
                     break;
             }
-            deltaX = dX / dXYZDivisor;
-            deltaY = dY / dXYZDivisor;
-            deltaZ = dZ / dXYZDivisor;
-        }
-
-        /**
-         * Get the pitch.
-         *
-         * @return Get Byte Pitch
-         */
-        public byte getPitch() {
-            return pitch;
-        }
-
-        /**
-         * Get the Yaw.
-         *
-         * @return Get Byte Yaw
-         */
-        public byte getYaw() {
-            return yaw;
-        }
-
-        /**
-         * Get the Delta X
-         *
-         * @return Delta X
-         */
-        public double getDeltaX() {
-            return deltaX;
-        }
-
-        /**
-         * Get the Delta Y
-         *
-         * @return Delta Y
-         */
-        public double getDeltaY() {
-            return deltaY;
-        }
-
-        /**
-         * Get the Delta Z
-         *
-         * @return Delta Z
-         */
-        public double getDeltaZ() {
-            return deltaZ;
-        }
-
-        /**
-         * Lookup the associated entity by the ID that was sent in the packet.
-         *
-         * @return Entity
-         */
-        public Entity getEntity() {
-            if (entity != null) {
-                return entity;
-            }
-            return entity = NMSUtils.getEntityById(this.entityID);
-        }
-
-        /**
-         * Get the ID of the entity.
-         * If you do not want to use {@link #getEntity()},
-         * you lookup the entity by yourself with this entity ID.
-         *
-         * @return Entity ID
-         */
-        public int getEntityId() {
-            return entityID;
-        }
-
-        /**
-         * Is the entity on the ground?
-         *
-         * @return On Ground
-         */
-        public boolean isOnGround() {
-            return onGround;
-        }
-    }
-
-    public static class WrappedPacketOutRelEntityLook extends WrappedPacket {
-        private int entityID;
-        private Entity entity;
-        private byte yaw, pitch;
-        private boolean onGround;
-
-        public WrappedPacketOutRelEntityLook(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        protected void setup() {
-            entityID = readInt(0);
-            onGround = readBoolean(0);
-            switch (mode) {
-                case 0:
-                    yaw = readByte(3);
-                    pitch = readByte(4);
-                    break;
-                case 1:
-                case 2:
-                    yaw = readByte(0);
-                    pitch = readByte(1);
-                    break;
-            }
-        }
-
-        /**
-         * Get the pitch.
-         *
-         * @return Get Byte Pitch
-         */
-        public byte getPitch() {
-            return pitch;
-        }
-
-        /**
-         * Get the Yaw.
-         *
-         * @return Get Byte Yaw
-         */
-        public byte getYaw() {
-            return yaw;
-        }
-
-        /**
-         * Is the entity on the ground?
-         *
-         * @return On Ground
-         */
-        public boolean isOnGround() {
-            return onGround;
-        }
-
-        /**
-         * Lookup the associated entity by the ID that was sent in the packet.
-         *
-         * @return Entity
-         */
-        public Entity getEntity() {
-            if (entity != null) {
-                return entity;
-            }
-            return entity = NMSUtils.getEntityById(this.entityID);
-        }
-
-        /**
-         * Get the ID of the entity.
-         * If you do not want to use {@link #getEntity()},
-         * you lookup the entity by yourself with this entity ID.
-         *
-         * @return Entity ID
-         */
-        public int getEntityId() {
-            return entityID;
+            wrapper.writeByte(yawByteIndex, yaw);
+            wrapper.writeByte(pitchByteIndex, pitch);
+            wrapper.writeBoolean(0, onGround);
+            return packetInstance;
+        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+            e.printStackTrace();
         }
+        return null;
     }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entitymetadata/WrappedPacketOutEntityMetadata.java

@@ -0,0 +1,44 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.out.entitymetadata;
+
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+
+public class WrappedPacketOutEntityMetadata extends WrappedPacket {
+    private boolean isListening = false;
+    private int entityID;
+    public WrappedPacketOutEntityMetadata(Object packet) {
+        super(packet);
+        isListening = true;
+    }
+
+    public int getEntityId() {
+        if (isListening) {
+            return readInt(0);
+        } else {
+            return entityID;
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entitystatus/WrappedPacketOutEntityStatus.java

@@ -0,0 +1,103 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.out.entitystatus;
+
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import org.bukkit.entity.Entity;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class WrappedPacketOutEntityStatus extends WrappedPacket implements SendableWrapper {
+    private static Constructor<?> packetConstructor;
+
+    public static void load() {
+        try {
+            packetConstructor =
+                    PacketTypeClasses.Server.ENTITY_STATUS.getConstructor(NMSUtils.nmsEntityClass, byte.class);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private Entity entity;
+    private byte status;
+    private int entityID = -1;
+
+    public WrappedPacketOutEntityStatus(Object packet) {
+        super(packet);
+    }
+
+    public WrappedPacketOutEntityStatus(Entity entity, byte status) {
+        this.entityID = entity.getEntityId();
+        this.entity = entity;
+        this.status = status;
+    }
+
+    public WrappedPacketOutEntityStatus(int entityID, byte status) {
+        this.entityID = entityID;
+        this.status = status;
+    }
+
+    public int getEntityId() {
+        if (packet == null) {
+            if (entityID != -1) {
+                return entityID;
+            }
+            return entityID = readInt(0);
+        } else {
+            return entityID;
+        }
+    }
+
+    public Entity getEntity() {
+        if (entity == null) {
+            return entity = NMSUtils.getEntityById(getEntityId());
+        }
+        return entity;
+    }
+
+    public byte getEntityStatus() {
+        if (packet == null) {
+            return status;
+        } else {
+            return readByte(0);
+        }
+    }
+
+    @Override
+    public Object asNMSPacket() {
+        try {
+            return packetConstructor.newInstance(NMSUtils.getNMSEntity(getEntity()), status);
+        } catch (InstantiationException | InvocationTargetException
+                | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entityteleport/WrappedPacketOutEntityTeleport.java

@@ -0,0 +1,219 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.out.entityteleport;
+
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class WrappedPacketOutEntityTeleport extends WrappedPacket implements SendableWrapper {
+    private static boolean legacyVersionMode = false;
+    private static boolean ultraLegacyVersionMode = false;
+    private boolean listeningMode = false;
+    private static final float rotationMultiplier = 256.0F / 360.0F;
+    private static Constructor<?> constructor;
+    private Entity entity = null;
+    private int entityID;
+    private double x, y, z;
+    private float yaw, pitch;
+    private boolean onGround;
+
+    public static void load() {
+        Class<?> packetClass = PacketTypeClasses.Server.ENTITY_TELEPORT;
+        try {
+            constructor = packetClass.getConstructor(int.class, int.class, int.class, int.class, byte.class, byte.class, boolean.class, boolean.class);
+            ultraLegacyVersionMode = true;
+            legacyVersionMode = true;
+        } catch (NoSuchMethodException e) {
+            try {
+                constructor = packetClass.getConstructor(int.class, int.class, int.class, int.class, byte.class, byte.class, boolean.class);
+                ultraLegacyVersionMode = false;
+                legacyVersionMode = true;
+            } catch (NoSuchMethodException e2) {
+                try {
+                    constructor = packetClass.getConstructor();
+                    ultraLegacyVersionMode = false;
+                    legacyVersionMode = false;
+                } catch (NoSuchMethodException e3) {
+                    e3.printStackTrace();
+                }
+            }
+
+        }
+    }
+
+    public WrappedPacketOutEntityTeleport(Object packet) {
+        super(packet);
+        listeningMode = true;
+    }
+
+    public WrappedPacketOutEntityTeleport(int entityID, Location loc, boolean onGround) {
+        this(entityID, loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch(), onGround);
+    }
+
+    public WrappedPacketOutEntityTeleport(int entityID, double x, double y, double z, float yaw, float pitch, boolean onGround) {
+        this.entityID = entityID;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.yaw = yaw;
+        this.pitch = pitch;
+        this.onGround = onGround;
+    }
+
+    public Entity getEntity() {
+        if(entity == null) {
+            entity = NMSUtils.getEntityById(getEntityId());
+        }
+        return entity;
+    }
+
+    public int getEntityId() {
+        if (listeningMode) {
+            if (entityID != -1) {
+                return readInt(0);
+            } else {
+                return entityID = readInt(0);
+            }
+        } else {
+            return entityID;
+        }
+    }
+
+    public double getX() {
+        if (!listeningMode) {
+            return x;
+        } else {
+            if (legacyVersionMode) {
+                return readInt(1) / 32.0D;
+            } else {
+                return readDouble(0);
+            }
+        }
+    }
+
+    public double getY() {
+        if (!listeningMode) {
+            return y;
+        } else {
+            if (legacyVersionMode) {
+                return readInt(2) / 32.0D;
+            } else {
+                return readDouble(1);
+            }
+        }
+    }
+
+    public double getZ() {
+        if (!listeningMode) {
+            return z;
+        } else {
+            if (legacyVersionMode) {
+                return readInt(3) / 32.0D;
+            } else {
+                return readDouble(2);
+            }
+        }
+    }
+
+    public float getYaw() {
+        if (!listeningMode) {
+            return yaw;
+        } else {
+            return (readByte(0) / rotationMultiplier);
+        }
+    }
+
+    public boolean isOnGround() {
+        if (listeningMode) {
+            return readBoolean(0);
+        } else {
+            return onGround;
+        }
+    }
+
+    @Override
+    public Object asNMSPacket() {
+        if (ultraLegacyVersionMode) {
+            //1.7.10
+            try {
+                return constructor.newInstance(entityID, floor(x * 32.0D), floor(y * 32.0D), floor(z * 32.0D),
+                        (byte) ((int) yaw * rotationMultiplier), (byte) (int) (pitch * rotationMultiplier), false, false);
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        } else if (legacyVersionMode) {
+            //1.8.x
+            try {
+                return constructor.newInstance(entityID, floor(x * 32.0D), floor(y * 32.0D), floor(z * 32.0D),
+                        (byte) ((int) yaw * rotationMultiplier), (byte) (int) (pitch * rotationMultiplier), false);
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        } else {
+            //newer versions
+            Object instance = null;
+            try {
+                instance = constructor.newInstance();
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+
+            WrappedPacket instanceWrapper = new WrappedPacket(instance);
+            instanceWrapper.writeInt(0, entityID);
+            instanceWrapper.writeDouble(0, x);
+            instanceWrapper.writeDouble(1, y);
+            instanceWrapper.writeDouble(2, z);
+
+            instanceWrapper.writeByte(0, (byte) (yaw * rotationMultiplier));
+            instanceWrapper.writeByte(1, (byte) (pitch * rotationMultiplier));
+            if (onGround) {
+                //default value is false, so we can save a reflection call
+                instanceWrapper.writeBoolean(0, true);
+            }
+            return instance;
+        }
+        return null;
+    }
+
+    public float getPitch() {
+        if (listeningMode) {
+            return pitch;
+        } else {
+            return (readByte(1) / rotationMultiplier);
+        }
+    }
+
+    private static int floor(double value) {
+        int i = (int) value;
+        return value < (double) i ? i - 1 : i;
+    }
+}

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

@@ -24,11 +24,11 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.entityvelocity;
 
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 import org.bukkit.entity.Entity;
 
 import java.lang.reflect.Constructor;
@@ -38,11 +38,14 @@ public final class WrappedPacketOutEntityVelocity extends WrappedPacket implemen
     private static Constructor<?> velocityConstructor, vec3dConstructor;
     private static Class<?> velocityClass, vec3dClass;
     private static boolean isVec3dPresent;
-    private int entityID;
+    private int entityID = -1;
     private double velocityX, velocityY, velocityZ;
     private Entity entity;
+    private boolean isListening = false;
+
     public WrappedPacketOutEntityVelocity(final Object packet) {
         super(packet);
+        isListening = true;
     }
 
     public WrappedPacketOutEntityVelocity(final Entity entity, final double velocityX, final double velocityY, final double velocityZ) {
@@ -91,64 +94,71 @@ public final class WrappedPacketOutEntityVelocity extends WrappedPacket implemen
         }
     }
 
-    @Override
-    protected void setup() {
-        //ENTITY ID
-        this.entityID = readInt(0);
-
-        int x = readInt(1);
-        int y = readInt(2);
-        int z = readInt(3);
-
-        //VELOCITY XYZ
-        this.velocityX = x / 8000.0D;
-        this.velocityY = y / 8000.0D;
-        this.velocityZ = z / 8000.0D;
-    }
-
     /**
      * Lookup the associated entity by the ID that was sent in the packet.
+     *
      * @return Entity
      */
     public Entity getEntity() {
-        if(entity != null) {
+        if (entity != null) {
             return entity;
         }
-        return entity = NMSUtils.getEntityById(this.entityID);
+        return entity = NMSUtils.getEntityById(getEntityId());
     }
 
     /**
      * Get the ID of the entity.
      * If you do not want to use {@link #getEntity()},
      * you lookup the entity by yourself with this entity ID.
+     *
      * @return Entity ID
      */
     public int getEntityId() {
-        return entityID;
+        if (entityID != -1) {
+            return entityID;
+        }
+        return entityID = readInt(0);
     }
 
     /**
      * Get the Velocity X
+     *
      * @return Get Velocity X
      */
     public double getVelocityX() {
-        return velocityX;
+        if (isListening) {
+            return readInt(1) / 8000.0D;
+        } else {
+            return velocityX;
+        }
     }
 
     /**
      * Get the Velocity Y
+     *
      * @return Get Velocity Y
      */
     public double getVelocityY() {
+        if(isListening) {
+        return readInt(2) / 8000.0D;
+    }
+    else {
         return velocityY;
+        }
     }
 
     /**
      * Get the Velocity Z
+     *
      * @return Get Velocity Z
      */
     public double getVelocityZ() {
+        if(isListening) {
+        return readInt(3) / 8000.0D;
+    }
+    else {
         return velocityZ;
+        }
     }
 
     @Override

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/experience/WrappedPacketOutExperience.java

@@ -0,0 +1,93 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.out.experience;
+
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class WrappedPacketOutExperience extends WrappedPacket implements SendableWrapper {
+    private static Constructor<?> packetConstructor;
+    public static void load() {
+        try {
+            packetConstructor = PacketTypeClasses.Server.EXPERIENCE.getConstructor(float.class,
+                    int.class, int.class);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private float expBar;
+    private int expLevel, totalExp;
+
+    public WrappedPacketOutExperience(Object packet) {
+        super(packet);
+    }
+
+    public WrappedPacketOutExperience(float experienceBar, int experienceLevel,
+                                      int totalExperience) {
+        this.expBar = experienceBar;
+        this.expLevel = experienceLevel;
+        this.totalExp = totalExperience;
+    }
+
+    public float getExperienceBar() {
+        if (packet == null) {
+            return expBar;
+        } else {
+            //constructor = float, int, int
+            return readFloat(0);
+        }
+    }
+
+    public int getExperienceLevel() {
+        if (packet == null) {
+            return expLevel;
+        } else {
+            return readInt(0);
+        }
+    }
+
+    public int getTotalExperience() {
+        if (packet == null) {
+            return totalExp;
+        } else {
+            return readInt(1);
+        }
+    }
+
+    @Override
+    public Object asNMSPacket() {
+        try {
+            return packetConstructor.newInstance(expBar, expLevel, totalExp);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/explosion/WrappedPacketOutExplosion.java

@@ -0,0 +1,199 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.packetwrappers.out.explosion;
+
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
+import io.github.retrooper.packetevents.utils.vector.Vector3i;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WrappedPacketOutExplosion extends WrappedPacket implements SendableWrapper {
+    private static Class<?> chunkPosClass, blockPosClass, vec3DClass;
+    private static Constructor<?> chunkPosConstructor, blockPosConstructor, packetConstructor, vec3dConstructor;
+
+    public static void load() {
+        chunkPosClass = NMSUtils.getNMSClassWithoutException("ChunkPosition");
+        blockPosClass = NMSUtils.getNMSClassWithoutException("BlockPosition");
+        Class<?> packetClass = NMSUtils.getNMSClassWithoutException("PacketPlayOutExplosion");
+        vec3DClass = NMSUtils.getNMSClassWithoutException("Vec3D");
+        try {
+            packetConstructor = packetClass.getConstructor(double.class, double.class, double.class, float.class, List.class, vec3DClass);
+            vec3dConstructor = vec3DClass.getDeclaredConstructor(double.class, double.class, double.class);
+            if (chunkPosClass != null) {
+                chunkPosConstructor = chunkPosClass.getConstructor(int.class, int.class, int.class);
+            }
+
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            if (blockPosClass != null) {
+                blockPosConstructor = blockPosClass.getConstructor(int.class, int.class, int.class);
+            }
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private boolean isListening = false;
+    private double x, y, z;
+    private float strength;
+    private List<Vector3i> records;
+    private float playerMotionX, playerMotionY, playerMotionZ;
+
+    public WrappedPacketOutExplosion(Object packet) {
+        super(packet);
+        isListening = true;
+    }
+
+    public WrappedPacketOutExplosion(double x, double y, double z, float strength, List<Vector3i> records,
+                                     float playerMotionX, float playerMotionY, float playerMotionZ) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.strength = strength;
+        this.records = records;
+        this.playerMotionX = playerMotionX;
+        this.playerMotionY = playerMotionY;
+        this.playerMotionZ = playerMotionZ;
+    }
+
+    public double getX() {
+        if (isListening) {
+            return readDouble(0);
+        } else {
+            return x;
+        }
+    }
+
+    public double getY() {
+        if (isListening) {
+            return readDouble(1);
+        } else {
+            return y;
+        }
+    }
+
+    public double getZ() {
+        if (isListening) {
+            return readDouble(2);
+        } else {
+            return z;
+        }
+    }
+
+    public float getStrength() {
+        if (isListening) {
+            return readFloat(0);
+        } else {
+            return strength;
+        }
+    }
+
+    public List<Vector3i> getRecords() {
+        if (isListening) {
+            List<Vector3i> recordsList = new ArrayList<>();
+            List<?> rawRecordsList = (List<?>) readObject(0, List.class);
+            if (rawRecordsList.isEmpty()) {
+                return new ArrayList<>();
+            }
+            for (Object position : rawRecordsList) {
+                WrappedPacket posWrapper = new WrappedPacket(position);
+                recordsList.add(new Vector3i(posWrapper.readInt(0), posWrapper.readInt(1), posWrapper.readInt(2)));
+            }
+            return recordsList;
+        } else {
+            return records;
+        }
+    }
+
+    public float getPlayerMotionX() {
+        if (isListening) {
+            return readFloat(1);
+        } else {
+            return playerMotionX;
+        }
+    }
+
+    public float getPlayerMotionY() {
+        if (isListening) {
+            return readFloat(2);
+        } else {
+            return playerMotionY;
+        }
+    }
+
+    public float getPlayerMotionZ() {
+        if (isListening) {
+            return readFloat(3);
+        } else {
+            return playerMotionZ;
+        }
+    }
+
+    @Override
+    public Object asNMSPacket() {
+        if (version.equals(ServerVersion.v_1_7_10)) {
+            List<Object> chunkPositions = new ArrayList<>();
+            for (Vector3i vec : records) {
+                try {
+                    chunkPositions.add(chunkPosConstructor.newInstance(vec.x, vec.y, vec.z));
+                } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                    e.printStackTrace();
+                }
+            }
+            try {
+                Object vec = vec3dConstructor.newInstance(playerMotionX, playerMotionY, playerMotionZ);
+                return packetConstructor.newInstance(x, y, z, strength, chunkPositions, vec);
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            List<Object> blockPositions = new ArrayList<>();
+            for (Vector3i vec : records) {
+                try {
+                    blockPositions.add(blockPosConstructor.newInstance(vec.x, vec.y, vec.z));
+                } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                    e.printStackTrace();
+                }
+            }
+            try {
+                Object vec = vec3dConstructor.newInstance(playerMotionX, playerMotionY, playerMotionZ);
+                return packetConstructor.newInstance(x, y, z, strength, blockPositions, vec);
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/gamestatechange/WrappedPacketOutGameStateChange.java

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.gamestatechange;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
@@ -45,9 +45,11 @@ public class WrappedPacketOutGameStateChange extends WrappedPacket implements Se
     private static boolean reasonIntMode;
     private static boolean valueFloatMode;
 
+    private boolean isListening = false;
+
     public static void load() {
         reasonClassType = SubclassUtil.getSubClass(PacketTypeClasses.Server.GAME_STATE_CHANGE, "a");
-        if(reasonClassType != null) {
+        if (reasonClassType != null) {
             try {
                 reasonClassConstructor = reasonClassType.getConstructor(int.class);
             } catch (NoSuchMethodException e) {
@@ -66,7 +68,7 @@ public class WrappedPacketOutGameStateChange extends WrappedPacket implements Se
                 //Just an older version(1.7.10/1.8.x or so)
                 valueClassType = double.class;
             }
-            if(reasonClassType == null) {
+            if (reasonClassType == null) {
                 reasonClassType = int.class;
             }
             packetConstructor = PacketTypeClasses.Server.GAME_STATE_CHANGE.getConstructor(reasonClassType, valueClassType);
@@ -81,6 +83,7 @@ public class WrappedPacketOutGameStateChange extends WrappedPacket implements Se
 
     public WrappedPacketOutGameStateChange(Object packet) {
         super(packet);
+        isListening = true;
     }
 
     public WrappedPacketOutGameStateChange(int reason, double value) {
@@ -88,36 +91,40 @@ public class WrappedPacketOutGameStateChange extends WrappedPacket implements Se
         this.value = value;
     }
 
-    public WrappedPacketOutGameStateChange(int reason, float value){
-        this(reason, (double)value);
-    }
-
-    @Override
-    protected void setup() {
-        if (reasonIntMode) {
-            reason = readInt(0);
-        } else {
-            //this packet is obfuscated quite strongly(1.16), so we must do this
-            Object reasonObject = readObject(12, reasonClassType);
-            try {
-                reason = Reflection.getField(reasonClassType, int.class, 0).getInt(reasonObject);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        if (valueFloatMode) {
-            value = readFloat(0);
-        } else {
-            value = readDouble(0);
-        }
+    public WrappedPacketOutGameStateChange(int reason, float value) {
+        this(reason, (double) value);
     }
 
     public int getReason() {
-        return reason;
+        if (isListening) {
+            if (reasonIntMode) {
+                return readInt(0);
+            } else {
+                //this packet is obfuscated quite strongly(1.16), so we must do this
+                Object reasonObject = readObject(12, reasonClassType);
+                try {
+                    return Reflection.getField(reasonClassType, int.class, 0).getInt(reasonObject);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            return reason;
+        }
+        return 0;
     }
 
     public double getValue() {
-        return reason;
+        if(isListening) {
+            if (valueFloatMode) {
+                return readFloat(0);
+            } else {
+                return readDouble(0);
+            }
+        }
+        else {
+            return value;
+        }
     }
 
     @Override

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/keepalive/WrappedPacketOutKeepAlive.java

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.keepalive;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
@@ -37,9 +37,11 @@ public class WrappedPacketOutKeepAlive extends WrappedPacket implements Sendable
     private static Constructor<?> keepAliveConstructor;
     private static boolean integerMode;
     private long id;
+    private boolean isListening = false;
 
     public WrappedPacketOutKeepAlive(Object packet) {
         super(packet);
+        isListening = true;
     }
 
     public WrappedPacketOutKeepAlive(long id) {
@@ -65,26 +67,24 @@ public class WrappedPacketOutKeepAlive extends WrappedPacket implements Sendable
         }
     }
 
-    @Override
-    protected void setup() {
-        if(integerMode) {
-            this.id = readInt(0);
-        }
-        else {
-            this.id = readLong(0);
-        }
-    }
-
     /**
      * Get the Keep Alive ID.
-     *
+     * <p>
      * You may cast this down to an int if you are on 1.7.10 - 1.12.2.
      * On 1.13.2 - 1.16.3 a long is sent.
      *
      * @return Get Keep Alive ID
      */
     public long getId() {
-        return id;
+        if (isListening) {
+            if (integerMode) {
+                return readInt(0);
+            } else {
+                return readLong(0);
+            }
+        } else {
+            return id;
+        }
     }
 
     @Override

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

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.kickdisconnect;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
@@ -37,9 +37,11 @@ public final class WrappedPacketOutKickDisconnect extends WrappedPacket implemen
     private static Class<?> packetClass, iChatBaseComponentClass;
     private static Constructor<?> kickDisconnectConstructor;
     private String kickMessage;
+    private boolean isListening = false;
 
     public WrappedPacketOutKickDisconnect(final Object packet) {
         super(packet);
+        isListening = true;
     }
 
     public WrappedPacketOutKickDisconnect(final String kickMessage) {
@@ -62,18 +64,18 @@ public final class WrappedPacketOutKickDisconnect extends WrappedPacket implemen
         }
     }
 
-    @Override
-    protected void setup() {
-        Object ichatbaseComponentoObject = readObject(0, iChatBaseComponentClass);
-        this.kickMessage = WrappedPacketOutChat.toStringFromIChatBaseComponent(ichatbaseComponentoObject);
-    }
-
     /**
      * Get the kick message.
+     *
      * @return Get Kick Message
      */
     public String getKickMessage() {
-        return kickMessage;
+        if (isListening) {
+            Object iChatBaseComponentObject = readObject(0, iChatBaseComponentClass);
+            return WrappedPacketOutChat.toStringFromIChatBaseComponent(iChatBaseComponentObject);
+        } else {
+            return kickMessage;
+        }
     }
 
     @Override

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/playerinfo/WrappedPacketOutPlayerInfo.java

@@ -1,116 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020 retrooper
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package io.github.retrooper.packetevents.packetwrappers.out.playerinfo;
-
-import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
-import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
-import org.bukkit.GameMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class WrappedPacketOutPlayerInfo extends WrappedPacket implements SendableWrapper {
-//TODO load this wrapper
-
-    private PlayerInfoAction action;
-    private List<PlayerInfoData> playerInfoDataList = new ArrayList<>();
-
-    private static byte mode = 0; //0 = 1.7.10
-
-    public static void load() {
-
-    }
-
-    public WrappedPacketOutPlayerInfo(Object packet) {
-        super(packet);
-    }
-
-    public WrappedPacketOutPlayerInfo(PlayerInfoAction action, Object gameProfile,
-                                      int ping, GameMode gameMode, String displayName) {
-        this.action = action;
-        playerInfoDataList.add(new PlayerInfoData(gameProfile, ping, gameMode, displayName));
-    }
-
-    @Override
-    protected void setup() {
-        switch (mode) {
-            case 0:
-                int actionInteger= readInt(0);
-                break;
-            case 1:
-                break;
-            case 2:
-                break;
-        }
-    }
-
-    @Override
-    public Object asNMSPacket() {
-        return null;
-    }
-
-    public PlayerInfoAction getAction() {
-        return action;
-    }
-
-    public List<PlayerInfoData> getPlayerInfoData() {
-        return playerInfoDataList;
-    }
-
-    public enum PlayerInfoAction {
-        ADD_PLAYER, UPDATE_GAME_MODE, UPDATE_LATENCY, UPDATE_DISPLAY_NAME, REMOVE_PLAYER;
-    }
-
-    public class PlayerInfoData {
-        private final int ping;
-        private final GameMode gameMode;
-        private final Object gameProfile;
-        private final String displayName;
-
-        public PlayerInfoData(Object gameProfile, int ping,
-                              GameMode gameMode, String displayName) {
-            this.ping = ping;
-            this.gameMode = gameMode;
-            this.gameProfile = gameProfile;
-            this.displayName = displayName;
-        }
-
-        public int getPing() {
-            return ping;
-        }
-
-        public GameMode getGameMode() {
-            return gameMode;
-        }
-
-        public Object getGameProfile() {
-            return gameProfile;
-        }
-
-        public String getDisplayName() {
-            return displayName;
-        }
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/position/WrappedPacketOutPosition.java

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.position;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
 public final class WrappedPacketOutPosition extends WrappedPacket {
@@ -35,8 +35,11 @@ public final class WrappedPacketOutPosition extends WrappedPacket {
     private float yaw;
     private float pitch;
 
+    private boolean isListening = false;
+
     public WrappedPacketOutPosition(Object packet) {
         super(packet);
+        isListening = true;
     }
 
     public static void load() {
@@ -59,7 +62,12 @@ public final class WrappedPacketOutPosition extends WrappedPacket {
      * @return Get X Position
      */
     public double getX() {
-        return x;
+        if(isListening) {
+            return readDouble(0);
+        }
+        else {
+            return x;
+        }
     }
 
     /**
@@ -67,7 +75,12 @@ public final class WrappedPacketOutPosition extends WrappedPacket {
      * @return Get Y Position
      */
     public double getY() {
-        return y;
+        if(isListening) {
+            return readDouble(1);
+        }
+        else {
+            return y;
+        }
     }
 
     /**
@@ -75,7 +88,12 @@ public final class WrappedPacketOutPosition extends WrappedPacket {
      * @return Get Z Position
      */
     public double getZ() {
-        return z;
+        if(isListening) {
+            return readDouble(2);
+        }
+        else {
+            return z;
+        }
     }
 
     /**
@@ -83,7 +101,12 @@ public final class WrappedPacketOutPosition extends WrappedPacket {
      * @return Get Yaw
      */
     public float getYaw() {
-        return yaw;
+        if(isListening) {
+            return readFloat(0);
+        }
+        else {
+            return yaw;
+        }
     }
 
     /**
@@ -91,6 +114,11 @@ public final class WrappedPacketOutPosition extends WrappedPacket {
      * @return Get Pitch
      */
     public float getPitch() {
-        return pitch;
+        if(isListening) {
+            return readFloat(1);
+        }
+        else {
+            return pitch;
+        }
     }
 }

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

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.transaction;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
@@ -37,8 +37,10 @@ public class WrappedPacketOutTransaction extends WrappedPacket implements Sendab
     private int windowId;
     private short actionNumber;
     private boolean accepted;
+    private boolean isListening = false;
     public WrappedPacketOutTransaction(final Object packet) {
         super(packet);
+        isListening = true;
     }
 
     public WrappedPacketOutTransaction(final int windowId, final short actionNumber, final boolean accepted) {
@@ -58,20 +60,17 @@ public class WrappedPacketOutTransaction extends WrappedPacket implements Sendab
         }
     }
 
-    @Override
-    protected void setup() {
-        this.windowId = readInt(0);
-        this.actionNumber = readShort(0);
-        this.accepted = readBoolean(0);
-
-    }
-
     /**
      * Get the Window ID.
      * @return Get Window ID
      */
     public int getWindowId() {
-        return windowId;
+        if(isListening) {
+            return readInt(0);
+        }
+        else {
+            return windowId;
+        }
     }
 
     /**
@@ -79,7 +78,12 @@ public class WrappedPacketOutTransaction extends WrappedPacket implements Sendab
      * @return Get Action Number
      */
     public short getActionNumber() {
-        return actionNumber;
+        if(isListening) {
+            return readShort(0);
+        }
+        else {
+            return actionNumber;
+        }
     }
 
     /**
@@ -87,7 +91,12 @@ public class WrappedPacketOutTransaction extends WrappedPacket implements Sendab
      * @return Is Accepted
      */
     public boolean isAccepted() {
-        return accepted;
+        if(isListening) {
+            return readBoolean(0);
+        }
+        else {
+            return accepted;
+        }
     }
 
     @Override

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

@@ -24,7 +24,7 @@
 
 package io.github.retrooper.packetevents.packetwrappers.out.updatehealth;
 
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.packettype.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
@@ -37,15 +37,18 @@ public final class WrappedPacketOutUpdateHealth extends WrappedPacket implements
     private static Constructor<?> packetConstructor;
     private float health, foodSaturation;
     private int food;
+    private boolean isListening = false;
+
     public WrappedPacketOutUpdateHealth(final Object packet) {
         super(packet);
+        isListening = true;
     }
 
     /**
      * See https://wiki.vg/Protocol#Update_Health
      *
-     * @param health 0 or less = dead, 20 = full HP
-     * @param food 0–20
+     * @param health         0 or less = dead, 20 = full HP
+     * @param food           0–20
      * @param foodSaturation Seems to vary from 0.0 to 5.0 in integer increments
      */
     public WrappedPacketOutUpdateHealth(final float health, final int food, final float foodSaturation) {
@@ -65,40 +68,44 @@ public final class WrappedPacketOutUpdateHealth extends WrappedPacket implements
         }
     }
 
-    @Override
-    protected void setup() {
-        try {
-            this.health = readFloat(0);
-            this.foodSaturation = readFloat(1);
-            this.food = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-    }
-
     /**
      * Get health value.
+     *
      * @return Get Health
      */
     public float getHealth() {
-        return health;
+        if (isListening) {
+            return readFloat(0);
+        } else {
+            return health;
+        }
     }
 
     /**
      * Get food saturation value.
+     *
      * @return Get Food Saturation
      */
     public float getFoodSaturation() {
-        return foodSaturation;
+        if (isListening) {
+            return readFloat(1);
+        } else {
+            return foodSaturation;
+        }
     }
 
     /**
      * Get food value.
+     *
      * @return Get Food
      */
     public int getFood() {
-        return food;
+        if(isListening) {
+            return readInt(0);
+        }
+        else {
+            return food;
+        }
     }
 
     @Override

src/main/java/io/github/retrooper/packetevents/packetwrappers/status/WrappedPacketStatusPing.java

@@ -22,13 +22,16 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.enums;
-@Deprecated
-public interface PacketEventPriority {
-    byte LOWEST = 0;
-    byte LOW = 1;
-    byte NORMAL = 2;
-    byte HIGH = 3;
-    byte HIGHEST = 4;
-    byte MONITOR = 5;
+package io.github.retrooper.packetevents.packetwrappers.status;
+
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+
+public class WrappedPacketStatusPing extends WrappedPacket {
+    public WrappedPacketStatusPing(Object packet) {
+        super(packet);
+    }
+
+    public long getPayload() {
+        return readLong(0);
+    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/status/WrappedPacketStatusPong.java

@@ -22,20 +22,16 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.utils.vector;
+package io.github.retrooper.packetevents.packetwrappers.status;
 
-@Deprecated
-public final class Vector3f {
-    public float x, y, z;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 
-    public Vector3f(final float x, final float y, final float z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
+public class WrappedPacketStatusPong extends WrappedPacket {
+    public WrappedPacketStatusPong(Object packet) {
+        super(packet);
     }
 
-    @Override
-    public String toString() {
-        return "X: " + x + ", Y: " + y + ", Z: " + z;
+    public long getPayload() {
+        return readLong(0);
     }
 }

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

@@ -24,176 +24,69 @@
 
 package io.github.retrooper.packetevents.settings;
 
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packettype.PacketType;
-
-import java.util.Random;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 
 public class PacketEventsSettings {
-
     private ServerVersion backupServerVersion = ServerVersion.v_1_7_10;
-    private String identifier = "";
-    private boolean autoResolveClientProtocolVersion = false;
-    private boolean uninjectAsync = true;
     private boolean injectAsync = true;
-    private boolean useProtocolLibIfAvailable = true;
+    private boolean ejectAsync = true;
+    private boolean useProtocolLibIfAvailable = false;
     private boolean checkForUpdates = true;
+    private boolean injectEarly = true;
 
-    /**
-     * If PacketEvents fails to detect your server version, it will use the recommended version
-     * @deprecated Use {@link #getBackupServerVersion()}
-     * @return Recommended version
-     */
-    @Deprecated
-    public ServerVersion getDefaultServerVersion() {
-        return this.backupServerVersion;
+    public PacketEventsSettings backupServerVersion(ServerVersion serverVersion) {
+        this.backupServerVersion = serverVersion;
+        return this;
     }
 
-    /**
-     * Set the default version
-     * @deprecated Use {@link #setBackupServerVersion(ServerVersion)}
-     * @param version ServerVersion
-     */
-    @Deprecated
-    public void setDefaultServerVersion(final ServerVersion version) {
-        this.backupServerVersion = version;
+
+    public PacketEventsSettings injectAsync(boolean injectAsync) {
+        this.injectAsync = injectAsync;
+        return this;
     }
 
-    public void setBackupServerVersion(ServerVersion version) {
-        this.backupServerVersion = version;
+    public PacketEventsSettings ejectAsync(boolean ejectAsync) {
+        this.ejectAsync = ejectAsync;
+        return this;
+    }
+
+    public PacketEventsSettings useProtocolLibIfAvailable(boolean useProtocolLibIfAvailable) {
+        this.useProtocolLibIfAvailable = useProtocolLibIfAvailable;
+        return this;
+    }
+
+    public PacketEventsSettings checkForUpdates(boolean checkForUpdates) {
+        this.checkForUpdates = checkForUpdates;
+        return this;
+    }
+
+
+    public PacketEventsSettings injectEarly(boolean injectEarly) {
+        this.injectEarly = injectEarly;
+        return this;
     }
 
     public ServerVersion getBackupServerVersion() {
         return backupServerVersion;
     }
 
-    /**
-     * The identifier is a unique string that is used to generate a player's handler name.
-     * Two plugins cannot have the same handler name.
-     * If you manually set the identifier using its setter '#setIdentifier(String)'.
-     * We will use that identifier to generate each player's handler name.
-     * If you do not set the identifier manually, we automatically generate one for you.
-     *
-     * @return stored identifier or new generated identifier
-     */
-    public String getIdentifier() {
-        if (this.identifier.isEmpty()) {
-            String alphabet = "abcdefghijklmnopqrstuvwxyz";
-            StringBuilder sb = new StringBuilder();
-            Random random = new Random();
-            while (sb.length() < 13) {
-                int index = (int) (random.nextFloat() * alphabet.length());
-                sb.append(alphabet.charAt(index));
-            }
-
-            this.identifier = sb.toString();
-        }
-        return this.identifier;
+    public boolean shouldInjectAsync() {
+        return injectAsync;
     }
 
-    /**
-     * Set a unique Identifier (Usually something that represents your plugin, For example: MyPluginPacketHandler)
-     * If another present plugin uses the same Identifier, It will cause incompatibilities.
-     *
-     * This function is now unneeded as PacketEvents generates a random identifier for you already.
-     * @param identifier Unique string
-     */
-    public void setIdentifier(final String identifier) {
-        this.identifier = identifier;
+    public boolean shouldEjectAsync() {
+        return ejectAsync;
     }
 
-    public boolean shouldAutoResolveClientProtocolVersion() {
-        return autoResolveClientProtocolVersion;
-    }
-
-    /**
-     * @deprecated Use {@link #shouldAutoResolveClientProtocolVersion()}
-     * @return
-     */
-    @Deprecated
-    public boolean doAutoResolveClientProtocolVersion() {
-        return autoResolveClientProtocolVersion;
-    }
-
-    /**
-     * @deprecated Use {@link #setShouldAutoResolveClientProtocolVersion(boolean)}
-     * @param autoResolveClientProtocolVersion
-     */
-    @Deprecated
-    public void setDoAutoResolveClientProtocolVersion(boolean autoResolveClientProtocolVersion) {
-        this.autoResolveClientProtocolVersion = autoResolveClientProtocolVersion;
-    }
-
-    /**
-     * If PacketEvents fails to detect a client's version
-     * (when ViaVersion, ProtocolLib or ProtocolSupport can't be found on the server),
-     * should it assume that the client is using the same version as the server?
-     * Returns ACCESS_FAILURE if this is set to FALSE(default value is false).
-     *
-     * @param val boolean
-     */
-    public void setShouldAutoResolveClientProtocolVersion(boolean val) {
-        this.autoResolveClientProtocolVersion = val;
-    }
-    
-    
-
-    /**
-     * Would you like PacketEvents to Uninject players Asynchronously?
-     * WARNING! This might make reloading unsupported
-     *
-     * @param uninjectAsync boolean
-     */
-    public void setUninjectAsync(boolean uninjectAsync) {
-        this.uninjectAsync = uninjectAsync;
-    }
-
-    public boolean isUninjectAsync() {
-        return this.uninjectAsync;
-    }
-
-    public boolean isInjectAsync() {
-        return this.injectAsync;
-    }
-
-    /**
-     * Would you like PacketEvents to Inject players Asynchronously?
-     * WARNING! This might make reloading unsupported
-     *
-     * @param injectAsync boolean
-     */
-    public void setInjectAsync(boolean injectAsync) {
-        this.injectAsync = injectAsync;
-    }
-
-    public boolean isUseProtocolLibIfAvailable() {
-        return this.useProtocolLibIfAvailable;
-    }
-
-    /**
-     * Would you like PacketEvents to make use of ProtocolLib if it is available?
-     * If yes, enable this, if not disable this.
-     * Having this on can help your plugin have compatibility
-     * with other plugins that might be using ProtocolLib.
-     * Especially if they or you are doing packet cancellations,
-     * PacketEvents passes the event priority to ProtocolLib.
-     *
-     * @param val boolean
-     */
-    public void setUseProtocolLibIfAvailable(boolean val) {
-        this.useProtocolLibIfAvailable = val;
+    public boolean shouldUseProtocolLibIfAvailable() {
+        return useProtocolLibIfAvailable;
     }
 
     public boolean shouldCheckForUpdates() {
         return checkForUpdates;
     }
 
-    /**
-     * Would you like PacketEvents to Check for Updates on startup?
-     *
-     * @param checkForUpdates boolean
-     */
-    public void setShouldCheckForUpdates(boolean checkForUpdates) {
-        this.checkForUpdates = checkForUpdates;
+    public boolean shouldInjectEarly() {
+        return injectEarly;
     }
-}
+}

src/main/java/io/github/retrooper/packetevents/updatechecker/UpdateChecker.java

@@ -0,0 +1,74 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.updatechecker;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.utils.server.PEVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+
+public class UpdateChecker {
+    public void handleUpdate() {
+        PEVersion localVersion = PacketEvents.getVersion();
+        try {
+            String line = readLatestVersion();
+            PEVersion newVersion = new PEVersion(line);
+            if (localVersion.isOlder(newVersion)) {
+                inform("[PacketEvents] There is an update available for the PacketEvents API! (" + newVersion.toString() + ")");
+            }
+            else if(localVersion.equals(newVersion)) {
+                inform("[PacketEvents] You are on the latest released version of PacketEvents. (" + newVersion.toString() + ")");
+            }
+            else if(localVersion.isNewer(newVersion)) {
+                inform("[PacketEvents] You are on a dev or pre released build of PacketEvents. Your build: (" + localVersion.toString() + ") | Last released build: (" + newVersion.toString() + ")");
+            }
+        } catch (IOException ignored) {
+            report("[PacketEvents] We failed to find the latest released version of PacketEvents. Your build: ("  + localVersion.toString() + ")");
+        }
+    }
+
+    private void inform(String message) {
+        Bukkit.getLogger().info(message);
+    }
+
+    private void report(String message) {
+        Bukkit.getLogger().info(ChatColor.DARK_RED + message);
+    }
+
+    private String readLatestVersion() throws IOException {
+        URLConnection connection = new URL("https://api.spigotmc.org/legacy/update.php?resource=80279").openConnection();
+        connection.addRequestProperty("User-Agent", "Mozilla/4.0");
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+
+        return reader.readLine();
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/bytebuf/ByteBufUtil.java

@@ -24,11 +24,11 @@
 
 package io.github.retrooper.packetevents.utils.bytebuf;
 
-import io.github.retrooper.packetevents.nettyhandler.NettyPacketHandler;
+import io.github.retrooper.packetevents.packetmanager.netty.NettyPacketManager;
 
 public class ByteBufUtil {
     public static Object copiedBuffer(byte[] bytes) {
-        if (NettyPacketHandler.v1_7_nettyMode) {
+        if (NettyPacketManager.v1_7_nettyMode) {
             return ByteBufUtil_7.copiedBuffer(bytes);
         } else {
             return ByteBufUtil_8.copiedBuffer(bytes);
@@ -36,7 +36,7 @@ public class ByteBufUtil {
     }
 
     public static byte[] getBytes(Object byteBuf) {
-        if(NettyPacketHandler.v1_7_nettyMode) {
+        if(NettyPacketManager.v1_7_nettyMode) {
             return ByteBufUtil_7.getBytes(byteBuf);
         }
         else {

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

@@ -25,8 +25,8 @@
 package io.github.retrooper.packetevents.utils.entityfinder;
 
 import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
@@ -65,33 +65,36 @@ public final class EntityFinderUtils {
         }
     }
 
-    /**
-     * Get an entity by their ID.
-     * @param id
-     * @return Entity
-     */
-    public static Entity getEntityById(final int id) {
+    public static Object getNMSEntityById(final int id) {
         for (final World world : Bukkit.getWorlds()) {
-            final Entity entity = getEntityByIdWithWorld(world, id);
+            final Object entity = getNMSEntityByIdWithWorld(world, id);
             if (entity != null) {
                 return entity;
             }
         }
-        return  null;
+        return null;
     }
 
     /**
-     * Get an entity by their ID, guaranteed to be in the specified world.
-     * @param world
+     * Get an entity by their ID.
+     *
      * @param id
      * @return Entity
      */
-    @Nullable
-    public static Entity getEntityByIdWithWorld(final World world, final int id) {
+    public static Entity getEntityById(final int id) {
+        Object nmsEntity = getNMSEntityById(id);
+        try {
+            return (Entity) getBukkitEntity.invoke(nmsEntity);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static Object getNMSEntityByIdWithWorld(final World world, final int id) {
         if (world == null) {
             return null;
-        }
-        else if(craftWorldClass == null) {
+        } else if (craftWorldClass == null) {
             throw new IllegalStateException("PacketEvents failed to locate the CraftWorld class.");
         }
         Object craftWorld = craftWorldClass.cast(world);
@@ -109,6 +112,19 @@ public final class EntityFinderUtils {
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
+        return nmsEntity;
+    }
+
+    /**
+     * Get an entity by their ID, guaranteed to be in the specified world.
+     *
+     * @param world
+     * @param id
+     * @return Entity
+     */
+    @Nullable
+    public static Entity getEntityByIdWithWorld(final World world, final int id) {
+        Object nmsEntity = getNMSEntityByIdWithWorld(world, id);
         if (nmsEntity == null) {
             return null;
         }
@@ -123,6 +139,7 @@ public final class EntityFinderUtils {
     /**
      * This is the name of the method that returns the NMS entity when you pass in its ID.
      * On 1.8-1.8.8 the function name is called 'a', on 1.7.10 and 1.9 and above the name is called 'getEntity'.
+     *
      * @return entity by ID method name
      */
     public static String getEntityByIDMethodName() {

src/main/java/io/github/retrooper/packetevents/utils/gameprofile/GameProfileUtil.java

@@ -24,17 +24,26 @@
 
 package io.github.retrooper.packetevents.utils.gameprofile;
 
-import io.github.retrooper.packetevents.nettyhandler.NettyPacketHandler;
+import io.github.retrooper.packetevents.packetmanager.netty.NettyPacketManager;
 
 import java.util.UUID;
 
 public class GameProfileUtil {
     public static Object getGameProfile(UUID uuid, String username) {
-        if(NettyPacketHandler.v1_7_nettyMode) {
+        if(NettyPacketManager.v1_7_nettyMode) {
             return GameProfileUtil_7.getGameProfile(uuid, username);
         }
         else {
             return GameProfileUtil_8.getGameProfile(uuid, username);
         }
     }
+
+    public static WrappedGameProfile getWrappedGameProfile(Object gameProfile) {
+        if(NettyPacketManager.v1_7_nettyMode) {
+            return GameProfileUtil_7.getWrappedGameProfile(gameProfile);
+        }
+        else {
+            return GameProfileUtil_8.getWrappedGameProfile(gameProfile);
+        }
+    }
 }

src/main/java/io/github/retrooper/packetevents/utils/gameprofile/GameProfileUtil_7.java

@@ -32,4 +32,9 @@ class GameProfileUtil_7 {
     public static Object getGameProfile(UUID uuid, String username) {
         return new GameProfile(uuid, username);
     }
+
+    public static WrappedGameProfile getWrappedGameProfile(Object gameProfile) {
+        GameProfile gp = (GameProfile) gameProfile;
+        return new WrappedGameProfile(gp.getId(), gp.getName(), gp.isLegacy());
+    }
 }

src/main/java/io/github/retrooper/packetevents/utils/gameprofile/GameProfileUtil_8.java

@@ -32,4 +32,9 @@ class GameProfileUtil_8 {
     public static Object getGameProfile(UUID uuid, String username) {
         return new GameProfile(uuid, username);
     }
+
+    public static WrappedGameProfile getWrappedGameProfile(Object gameProfile) {
+        GameProfile gp = (GameProfile)gameProfile;
+        return new WrappedGameProfile(gp.getId(), gp.getName(), gp.isLegacy());
+    }
 }

src/main/java/io/github/retrooper/packetevents/utils/gameprofile/WrappedGameProfile.java

@@ -0,0 +1,69 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.utils.gameprofile;
+
+import java.util.UUID;
+
+public class WrappedGameProfile {
+    public UUID id;
+    public String name;
+    public boolean legacy;
+
+    public WrappedGameProfile(UUID id, String name, boolean legacy) {
+        this.id = id;
+        this.name = name;
+        this.legacy = legacy;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public boolean isLegacy() {
+        return legacy;
+    }
+
+    public boolean isComplete() {
+        return id != null && !isBlank(name);
+    }
+
+    private boolean isBlank(CharSequence cs) {
+        int strLen;
+        if (cs != null && (strLen = cs.length()) != 0) {
+            for (int i = 0; i < strLen; ++i) {
+                if (!Character.isWhitespace(cs.charAt(i))) {
+                    return false;
+                }
+            }
+            return true;
+        } else {
+            return true;
+        }
+    }
+}

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

@@ -24,13 +24,12 @@
 
 package io.github.retrooper.packetevents.utils.nms;
 
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.nettyhandler.NettyPacketHandler;
-import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.entityfinder.EntityFinderUtils;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.github.retrooper.packetevents.utils.server.ServerVersion;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
@@ -48,11 +47,10 @@ public final class NMSUtils {
     private static final String nmsDir = ServerVersion.getNMSDirectory();
     private static final String obcDir = ServerVersion.getOBCDirectory();
     public static String nettyPrefix = "io.netty";
-    public static Class<?> minecraftServerClass, craftWorldClass, playerInteractManagerClass,
-            packetClass, entityPlayerClass, playerConnectionClass, craftServerClass,
+    public static Class<?> nmsEntityClass, minecraftServerClass, craftWorldClass, playerInteractManagerClass, entityPlayerClass, playerConnectionClass, craftServerClass,
             craftPlayerClass, serverConnectionClass, craftEntityClass,
-            craftItemStack, nmsItemStackClass, networkManagerClass, nettyChannelClass;
-    private static Method craftWorldGetHandle,getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
+            craftItemStack, nmsItemStackClass, networkManagerClass, nettyChannelClass, gameProfileClass, iChatBaseComponentClass;
+    private static Method craftWorldGetHandle, getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, asBukkitCopy;
     private static Field entityPlayerPingField, playerConnectionField;
 
     public static final HashMap<UUID, Object> channelCache = new HashMap<>();
@@ -70,12 +68,12 @@ public final class NMSUtils {
         }
         try {
             nettyChannelClass = getNettyClass("channel.Channel");
+            nmsEntityClass = getNMSClass("Entity");
             minecraftServerClass = getNMSClass("MinecraftServer");
             craftWorldClass = getOBCClass("CraftWorld");
             craftPlayerClass = getOBCClass("entity.CraftPlayer");
             craftServerClass = getOBCClass("CraftServer");
             entityPlayerClass = getNMSClass("EntityPlayer");
-            packetClass = getNMSClass("Packet");
             playerConnectionClass = getNMSClass("PlayerConnection");
             serverConnectionClass = getNMSClass("ServerConnection");
             craftEntityClass = getOBCClass("entity.CraftEntity");
@@ -83,6 +81,12 @@ public final class NMSUtils {
             nmsItemStackClass = getNMSClass("ItemStack");
             networkManagerClass = getNMSClass("NetworkManager");
             playerInteractManagerClass = getNMSClass("PlayerInteractManager");
+            try {
+                gameProfileClass = Class.forName("com.mojang.authlib.GameProfile");
+            } catch (ClassNotFoundException e) {
+                gameProfileClass = Class.forName("net.minecraft.util.com.mojang.authlib.GameProfile");
+            }
+            iChatBaseComponentClass = NMSUtils.getNMSClass("IChatBaseComponent");
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         }
@@ -92,7 +96,6 @@ public final class NMSUtils {
             getCraftWorldHandleMethod = craftWorldClass.getMethod("getHandle");
             getCraftPlayerHandle = craftPlayerClass.getMethod("getHandle");
             getCraftEntityHandle = craftEntityClass.getMethod("getHandle");
-            sendPacketMethod = playerConnectionClass.getMethod("sendPacket", packetClass);
             getServerConnection = minecraftServerClass.getMethod("getServerConnection");
             asBukkitCopy = craftItemStack.getMethod("asBukkitCopy", nmsItemStackClass);
             craftWorldGetHandle = craftWorldClass.getMethod("getHandle");
@@ -113,6 +116,19 @@ public final class NMSUtils {
         return Reflection.getMethod(minecraftServerClass, "getServer", 0).invoke(null);
     }
 
+    public static Object getMinecraftServerConnection() {
+        WrappedPacket wrapper = null;
+        try {
+            wrapper = new WrappedPacket(getMinecraftServerInstance());
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        if (wrapper == null) {
+            return null;
+        }
+        return wrapper.readObject(0, serverConnectionClass);
+    }
+
     public static double[] recentTPS() throws IllegalAccessException, InvocationTargetException {
         final Object minecraftServerObj = getMinecraftServerInstance();
         return (double[]) Reflection.getField(minecraftServerClass, double[].class, 0).get(minecraftServerObj);
@@ -149,6 +165,14 @@ public final class NMSUtils {
         return "f";
     }
 
+    public static Object getNMSEntityById(final int id) {
+        return EntityFinderUtils.getNMSEntityById(id);
+    }
+
+    public static Object getNMSEntityByIdWithWorld(final World world, final int id) {
+        return EntityFinderUtils.getNMSEntityByIdWithWorld(world, id);
+    }
+
     @Nullable
     public static Entity getEntityById(final int id) {
         return EntityFinderUtils.getEntityById(id);
@@ -192,29 +216,32 @@ public final class NMSUtils {
     }
 
     public static Object getNetworkManager(final Player player) {
-        try {
-            return Reflection.getField(playerConnectionClass, networkManagerClass, 0).get(getPlayerConnection(player));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
+        WrappedPacket wrapper = new WrappedPacket(getPlayerConnection(player));
+        return wrapper.readObject(0, networkManagerClass);
     }
 
     public static Object getChannel(final Player player) {
-        UUID uuid = player.getUniqueId();
-        if (!channelCache.containsKey(uuid)) {
-            channelCache.put(uuid, getChannelNoCache(player));
+        if (PacketEvents.getAPI().packetManager.tinyProtocol == null) {
+            UUID uuid = player.getUniqueId();
+            Object channel = channelCache.get(uuid);
+            if (channel == null) {
+                Object newChannel = getChannelNoCache(player);
+                channelCache.put(uuid, newChannel);
+                return newChannel;
+            }
+            return channel;
+        } else {
+            return PacketEvents.getAPI().packetManager.tinyProtocol.getChannel(player);
         }
-        return channelCache.get(uuid);
     }
 
     public static Object getChannelNoCache(final Player player) {
-        try {
-            return Reflection.getField(networkManagerClass, nettyChannelClass, 0).get(getNetworkManager(player));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+        if (PacketEvents.getAPI().packetManager.tinyProtocol == null) {
+            WrappedPacket wrapper = new WrappedPacket(getNetworkManager(player));
+            return wrapper.readObject(0, nettyChannelClass);
+        } else {
+            return PacketEvents.getAPI().packetManager.tinyProtocol.getChannel(player);
         }
-        return null;
     }
 
     public static int getPlayerPing(final Player player) {
@@ -241,17 +268,16 @@ public final class NMSUtils {
         WrappedPacket wrapper = new WrappedPacket(craftServer);
         return wrapper.readObject(0, minecraftServerClass);
     }
-    
+
     public static Object convertBukkitWorldToNMSWorld(World world) {
         Object craftWorld = craftWorldClass.cast(world);
 
-        Object worldServer = null;
         try {
-            worldServer = craftWorldGetHandle.invoke(craftWorld);
+            return craftWorldGetHandle.invoke(craftWorld);
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
-        return worldServer;
+        return null;
     }
 
     public static Object createNewEntityPlayer(Server server, World world, Object gameProfile) {
@@ -279,12 +305,4 @@ public final class NMSUtils {
         }
         return null;
     }
-
-    public static void sendSendableWrapper(final Player player, final SendableWrapper sendableWrapper) {
-        NMSUtils.sendNMSPacket(player, sendableWrapper.asNMSPacket());
-    }
-
-    public static void sendNMSPacket(final Player player, final Object nmsPacket) {
-        NettyPacketHandler.sendPacket(getChannel(player), nmsPacket);
-    }
 }

src/main/java/io/github/retrooper/packetevents/utils/player/ClientVersion.java

@@ -22,13 +22,10 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents.enums;
+package io.github.retrooper.packetevents.utils.player;
 
 import io.github.retrooper.packetevents.PacketEvents;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public enum ClientVersion {
     LOWER_THAN_SUPPORTED_VERSIONS(4),
     v_1_7_10(5),
@@ -64,7 +61,7 @@ public enum ClientVersion {
      */
     ANY_PRE_RELEASE_VERSION(0),
 
-    UNKNOWN(-1);
+    UNRESOLVED(-1);
 
     private final int protocolVersion;
 
@@ -98,19 +95,9 @@ public enum ClientVersion {
         return protocolVersion == target.getProtocolVersion();
     }
 
-    /**
-     * @deprecated Added for now just to have backwards compatibility.
-     * @param protocolVersion
-     * @return
-     */
-    @Deprecated
-    public static ClientVersion fromProtocolVersion(int protocolVersion) {
-        return getClientVersion(protocolVersion);
-    }
-
     public static ClientVersion getClientVersion(int protocolVersion) {
-        if(protocolVersion == -1 && PacketEvents.getAPI().getSettings().doAutoResolveClientProtocolVersion()) {
-            protocolVersion = PacketEvents.getAPI().getServerUtils().getVersion().toProtocolVersion();
+        if(protocolVersion == -1) {
+          return ClientVersion.UNRESOLVED;
         }
         for(ClientVersion version : ClientVersion.values()) {
             if(version.protocolVersion > protocolVersion) {
@@ -130,6 +117,6 @@ public enum ClientVersion {
                 && protocolVersion < highestSupportedProtocolVersion) {
             return ANY_PRE_RELEASE_VERSION;
         }
-        return UNKNOWN;
+        return UNRESOLVED;
     }
 }

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

@@ -25,8 +25,8 @@
 package io.github.retrooper.packetevents.utils.player;
 
 import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ClientVersion;
-import io.github.retrooper.packetevents.nettyhandler.NettyPacketHandler;
+import io.github.retrooper.packetevents.event.impl.PlayerEjectEvent;
+import io.github.retrooper.packetevents.packetmanager.netty.NettyPacketManager;
 import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
@@ -36,28 +36,43 @@ import java.util.HashMap;
 import java.util.UUID;
 
 public final class PlayerUtils {
+    public final HashMap<UUID, Short> playerPingMap = new HashMap<>();
+    public final HashMap<UUID, Short> playerSmoothedPingMap = new HashMap<>();
 
     /**
      * This map stores each player's client version.
      */
-    public final HashMap<UUID, ClientVersion> clientVersionsMap = new HashMap<UUID, ClientVersion>();
+    public final HashMap<Object, ClientVersion> clientVersionsMap = new HashMap<>();
 
     /**
-     * Get the player's ping.
+     * Use reflection to read the ping value NMS calculates for the player.
+     * NMS smooths the player ping.
      * @param player
-     * @return Get Player Ping
+     * @return Get NMS smoothed Player Ping
      */
-    public int getPing(final Player player) {
+    public int getNMSPing(final Player player) {
         return NMSUtils.getPlayerPing(player);
     }
 
     /**
-     * Get the client version by a UUID.
-     * @param uuid
-     * @return Get Client Version
+     * Use the ping PacketEvents calculates for the player. (Updates every incoming Keep Alive packet)
+     * @param player Player
+     * @return Get Ping
      */
-    public ClientVersion getClientVersion(final UUID uuid) {
-        return clientVersionsMap.get(uuid);
+    public short getPing(final Player player) {
+        return playerPingMap.getOrDefault(player.getUniqueId(), (short)0);
+    }
+
+    public short getSmoothedPing(final Player player) {
+        return playerSmoothedPingMap.getOrDefault(player.getUniqueId(), (short)0);
+    }
+
+    public short getPing(UUID uuid) {
+        return playerPingMap.getOrDefault(uuid, (short)0);
+    }
+
+    public short getSmoothedPing(UUID uuid) {
+        return playerSmoothedPingMap.getOrDefault(uuid, (short)0);
     }
 
     /**
@@ -66,16 +81,7 @@ public final class PlayerUtils {
      * @return Get Client Version
      */
     public ClientVersion getClientVersion(final Player player) {
-        return clientVersionsMap.get(player.getUniqueId());
-    }
-
-    /**
-     * Get the protocol version.
-     * @param player
-     * @return Get Protocol Version
-     */
-    public int getProtocolVersion(Player player) {
-        return VersionLookupUtils.getProtocolVersion(player);
+        return clientVersionsMap.get(NMSUtils.getChannel(player));
     }
 
     /**
@@ -85,37 +91,16 @@ public final class PlayerUtils {
      * @param player
      */
     public void injectPlayer(final Player player) {
-        if (PacketEvents.getSettings().isInjectAsync()) {
-            NettyPacketHandler.injectPlayerAsync(player);
-        } else {
-            NettyPacketHandler.injectPlayer(player);
-        }
-    }
-
-    /**
-     * Use {@link #ejectPlayer(Player)}
-     * @param player
-     */
-    @Deprecated
-    public void uninjectPlayer(final Player player) {
-        if (PacketEvents.getSettings().isUninjectAsync()) {
-            NettyPacketHandler.ejectPlayerAsync(player);
-        } else {
-            NettyPacketHandler.ejectPlayer(player);
-        }
+       PacketEvents.getAPI().packetManager.injectPlayer(player);
     }
 
     /**
      * Eject a player.
-     * (This also calls the {@link io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent})
+     * (This also calls the {@link PlayerEjectEvent})
      * @param player
      */
     public void ejectPlayer(final Player player) {
-        if (PacketEvents.getSettings().isUninjectAsync()) {
-            NettyPacketHandler.ejectPlayerAsync(player);
-        } else {
-            NettyPacketHandler.ejectPlayer(player);
-        }
+        PacketEvents.getAPI().packetManager.ejectPlayer(player);
     }
 
     /**
@@ -124,7 +109,7 @@ public final class PlayerUtils {
      * @param sendableWrapper
      */
     public void sendPacket(final Player player, final SendableWrapper sendableWrapper) {
-        NMSUtils.sendSendableWrapper(player, sendableWrapper);
+        PacketEvents.getAPI().packetManager.sendPacket(NMSUtils.getChannel(player), sendableWrapper.asNMSPacket());
     }
 
     /**
@@ -133,6 +118,6 @@ public final class PlayerUtils {
      * @param nmsPacket
      */
     public void sendNMSPacket(final Player player, Object nmsPacket) {
-        NMSUtils.sendNMSPacket(player, nmsPacket);
+        PacketEvents.getAPI().packetManager.sendPacket(NMSUtils.getChannel(player), nmsPacket);
     }
-}
+}

src/main/java/io/github/retrooper/packetevents/utils/protocollib/ProtocolLibListener.java

@@ -30,7 +30,7 @@ import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.annotations.PacketHandler;
+import io.github.retrooper.packetevents.event.annotation.PacketHandler;
 import io.github.retrooper.packetevents.event.priority.PacketEventPriority;
 import io.github.retrooper.packetevents.event.PacketListener;
 import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
@@ -38,7 +38,8 @@ import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 public class ProtocolLibListener {
@@ -69,9 +70,15 @@ public class ProtocolLibListener {
                             priority = ListenerPriority.NORMAL;
                             break;
                     }
+                    Set<PacketType> clientValues = new HashSet<>();
+                    for(PacketType type : PacketType.Play.Client.getInstance().values()) {
+                        if(type.isSupported()) {
+                            clientValues.add(type);
+                        }
+                    }
                     ProtocolLibrary.getProtocolManager().
                             addPacketListener(new PacketAdapter(PacketEvents.getPlugins().get(0),
-                                    priority, PacketType.Play.Client.getInstance().values()) {
+                                    priority, clientValues) {
                                 @Override
                                 public void onPacketReceiving(PacketEvent event) {
                                     event.setReadOnly(false);
@@ -107,9 +114,17 @@ public class ProtocolLibListener {
                             priority = ListenerPriority.NORMAL;
                             break;
                     }
+                    Set<PacketType> serverValues = new HashSet<>();
+                    for(PacketType serverType : PacketType.Play.Server.getInstance().values()) {
+                        if(serverType.isSupported()) {
+                            serverValues.add(serverType);
+                        }
+                    }
+
+
                     ProtocolLibrary.getProtocolManager().
                             addPacketListener(new PacketAdapter(PacketEvents.getPlugins().get(0),
-                                    priority, PacketType.Play.Server.getInstance().values()) {
+                                    priority, serverValues) {
                                 @Override
                                 public void onPacketSending(PacketEvent event) {
                                     event.setReadOnly(false);

src/main/java/io/github/retrooper/packetevents/utils/reflection/ClassUtil.java

@@ -25,14 +25,17 @@
 package io.github.retrooper.packetevents.utils.reflection;
 
 import java.util.HashMap;
+import java.util.Map;
 
 public class ClassUtil {
-    private static final HashMap<Class<?>, String> classSimpleNameCache = new HashMap<Class<?>, String>();
+    private static final Map<String, String> classSimpleNameCache = new HashMap<String, String>();
 
     public static String getClassSimpleName(Class<?> cls) {
-        if(!classSimpleNameCache.containsKey(cls)) {
-            classSimpleNameCache.put(cls, cls.getSimpleName());
+        String simpleClassName = classSimpleNameCache.get(cls.getName());
+        if(simpleClassName == null) {
+            String name = simpleClassName = cls.getSimpleName();
+            classSimpleNameCache.put(cls.getName(), name);
         }
-        return classSimpleNameCache.get(cls);
+        return simpleClassName;
     }
 }

src/main/java/io/github/retrooper/packetevents/utils/server/PEVersion.java

@@ -22,13 +22,12 @@
  * SOFTWARE.
  */
 
-package io.github.retrooper.packetevents;
+package io.github.retrooper.packetevents.utils.server;
 
-import java.util.ArrayList;
 import java.util.List;
 
 
-
+//I was lazy while making this class, I know
 public class PEVersion {
     private final int[] version = new int[4];
 
@@ -36,21 +35,9 @@ public class PEVersion {
         if (version.length > 4) {
             throw new IllegalArgumentException("You are not allowed to have more than 4 arguments!");
         } else if (version.length < 2) {
-            throw new IllegalArgumentException("You need atleast two arguments.");
-        }
-        int len = version.length;
-        if (len < 4) {
-            this.version[0] = version[0];
-            this.version[1] = version[1];
-            if (len == 3) {
-                this.version[2] = version[2];
-            } else {
-                this.version[2] = 0;
-                this.version[3] = 0;
-            }
-        } else {
-            System.arraycopy(version, 0, this.version, 0, version.length);
+            throw new IllegalArgumentException("You need at least two arguments.");
         }
+        System.arraycopy(version, 0, this.version, 0, version.length);
     }
 
     public PEVersion(String text) {
@@ -62,7 +49,8 @@ public class PEVersion {
         text += ".";
 
         int dotCount = 0;
-        for (char c : text.toCharArray()) {
+        char[] chars = text.toCharArray();
+        for (char c : chars) {
             if (c == '.') {
                 dotCount++;
             }
@@ -73,12 +61,12 @@ public class PEVersion {
         int[] version = new int[4];
 
         // String t = "1.2.3.4";
-        for (int i = 0; i < text.toCharArray().length; i++) {
-            char c = text.toCharArray()[i];
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
 
             if (c == '.') {
                 version[arrayIndex++] =
-                        Integer.parseInt(Character.toString(text.toCharArray()[i - 1]));
+                        Integer.parseInt(Character.toString(chars[i - 1]));
             }
         }
         return version;
@@ -110,26 +98,23 @@ public class PEVersion {
         return false;
     }
 
+    // TODO: Remove "AsByteArray"
     public final int[] getVersionAsByteArray() {
         return version;
     }
 
+    // TODO: Remove "AsByteArray"
     public final int[] getVersionAsByteArrayShortened() {
-        List<Integer> versionBoxed = new ArrayList<>();
-        if (version[3] == 0) {
-            versionBoxed.add(version[0]);
-            versionBoxed.add(version[1]);
-            versionBoxed.add(version[2]);
-
-            if (version[2] == 0) {
-                versionBoxed.clear();
-                versionBoxed.add(version[0]);
-                versionBoxed.add(version[1]);
-            }
-            return convertIntListToIntArray(versionBoxed);
-        } else {
-            return version;
+        int length = 2;
+        if(version[2] != 0) {
+         length++;   
         }
+        if(version[3] != 0) {
+         length++;   
+        }
+        int[] shortened = new int[length];
+        System.arraycopy(version, 0, shortened, 0, length);
+        return shortened;
     }
 
     private int[] convertIntListToIntArray(List<Integer> list) {
@@ -149,4 +134,4 @@ public class PEVersion {
         }
         return text.substring(1);
     }
-}
+}

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

@@ -24,14 +24,12 @@
 
 package io.github.retrooper.packetevents.utils.server;
 
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.enums.SystemOS;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import org.spigotmc.SpigotConfig;
 
 import java.lang.reflect.InvocationTargetException;
 
 public final class ServerUtils {
-
     /**
      * Get the server version.
      * @return Get Server Version
@@ -45,13 +43,12 @@ public final class ServerUtils {
      * @return Get Recent TPS
      */
     public double[] getRecentTPS() {
-        double[] tpsArray = new double[0];
         try {
-            tpsArray = NMSUtils.recentTPS();
+            return NMSUtils.recentTPS();
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
-        return tpsArray;
+        return new double[0];
     }
 
     /**
@@ -62,33 +59,6 @@ public final class ServerUtils {
         return getRecentTPS()[0];
     }
 
-    /**
-     * Use {@link #getTPS()}
-     * @return Get Current TPS
-     */
-    @Deprecated
-    public double getCurrentTPS() {
-        return getRecentTPS()[0];
-    }
-
-    /**
-     * Use {@link #getOperatingSystem()}
-     * @deprecated Method rename pending to next minor update.
-     * @return Operating system of the current machine
-     */
-    @Deprecated
-    public SystemOS getPlatform() {
-        return SystemOS.getOperatingSystem();
-    }
-
-    /**
-     * @deprecated Use {@link #getOS()}
-     */
-    @Deprecated
-    public SystemOS getOperatingSystem() {
-        return SystemOS.getOperatingSystem();
-    }
-
     /**
      * Get the operating system of the local machine
      * @return Get Operating System
@@ -96,4 +66,8 @@ public final class ServerUtils {
     public SystemOS getOS() {
         return SystemOS.getOperatingSystem();
     }
+
+    public boolean isBungeeCordEnabled() {
+        return SpigotConfig.bungee;
+    }
 }

src/main/java/io/github/retrooper/packetevents/utils/server/ServerVersion.java

@@ -0,0 +1,155 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 retrooper
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.retrooper.packetevents.utils.server;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import org.bukkit.Bukkit;
+
+/**
+ * @author retrooper
+ */
+public enum ServerVersion {
+
+    v_1_7_10((short) 5), v_1_8((short) 47), v_1_8_3((short) 47), v_1_8_4((short) 47), v_1_8_5((short) 47),
+	v_1_8_6((short) 47), v_1_8_7((short) 47), v_1_8_8((short) 47), v_1_9((short) 107), v_1_9_2((short) 109),
+	v_1_9_4((short) 110), v_1_10((short) 210), v_1_10_2((short) 210), v_1_11((short) 315), v_1_11_1((short) 316),
+	v_1_11_2((short) 316), v_1_12((short) 335), v_1_12_1((short) 338), v_1_12_2((short) 340), v_1_13((short) 393),
+	v_1_13_1((short) 401), v_1_13_2((short) 404), v_1_14((short) 477), v_1_14_1((short) 480), v_1_14_2((short) 485),
+	v_1_14_3((short) 490), v_1_14_4((short) 498), v_1_15((short) 573), v_1_15_1((short) 575), v_1_15_2((short) 578),
+	v_1_16((short) 735), v_1_16_1((short) 736), v_1_16_2((short) 751), v_1_16_3((short) 753), ERROR((short) -1), EMPTY((short) -1);
+
+	private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName()
+			.replace(".", ",").split(",")[3];
+	public static ServerVersion[] reversedValues = new ServerVersion[values().length];
+	private static ServerVersion cachedVersion;
+	private final short protocolId;
+
+	ServerVersion(short protocolId) {
+		this.protocolId = protocolId;
+	}
+	
+	public short getProtocolVersion() {
+		return protocolId;
+	}
+
+	private static ServerVersion getVersionNoCache() {
+		if (reversedValues[0] == null) {
+			reversedValues = ServerVersion.reverse(values());
+		}
+		for (final ServerVersion val : reversedValues) {
+			String valName = val.name().substring(2).replace("_", ".");
+			if (Bukkit.getBukkitVersion().contains(valName)) {
+				return val;
+			}
+		}
+		if(PacketEvents.getSettings().getBackupServerVersion() != null) {
+            return PacketEvents.getSettings().getBackupServerVersion();
+        }
+		return ERROR;
+	}
+
+	public static ServerVersion getVersion() {
+		if (cachedVersion == null) {
+			cachedVersion = getVersionNoCache();
+		}
+		return cachedVersion;
+	}
+
+	public static ServerVersion[] reverse(final ServerVersion[] arr) {
+		ServerVersion[] array = arr.clone();
+		if (array == null) {
+			return null;
+		}
+		int i = 0;
+		int j = array.length - 1;
+		ServerVersion tmp;
+		while (j > i) {
+			tmp = array[j];
+			array[j--] = array[i];
+			array[i++] = tmp;
+		}
+		return array;
+	}
+
+	public static String getNmsSuffix() {
+		return nmsVersionSuffix;
+	}
+
+	public static String getNMSDirectory() {
+		return "net.minecraft.server." + getNmsSuffix();
+	}
+
+	public static String getOBCDirectory() {
+		return "org.bukkit.craftbukkit." + getNmsSuffix();
+	}
+
+	/**
+	 * Returns if the current version is more up to date than the argument passed
+	 * version
+	 *
+	 * @param version The version to compare to the server's value.
+	 * @return True if the supplied version is lower, false if it is equal or higher
+	 *         than the server's version.
+	 */
+	public boolean isHigherThan(final ServerVersion version) {
+		return protocolId > version.protocolId;
+	}
+	
+	/**
+	 * Returns if the current version is more up to date than the argument passed
+	 * version
+	 *
+	 * @param version The version to compare to the server's value.
+	 * @return True if the supplied version is lower or equal, false if it is higher
+	 *         than the server's version.
+	 */
+	public boolean isAtLeast(final ServerVersion version) {
+		return protocolId >= version.protocolId;
+	}
+
+	/**
+	 * Returns if the current version is more older than the argument passed
+	 * version
+	 *
+	 * @param version The version to compare to the server's value.
+	 * @return True if the supplied version is higher, false if it is equal or lower
+	 *         than the server's version.
+	 */
+	public boolean isLowerThan(final ServerVersion version) {
+		return version.protocolId > protocolId;
+	}
+	
+	/**
+	 * Returns if the current version is more older than the argument passed
+	 * version
+	 *
+	 * @param version The version to compare to the server's value.
+	 * @return True if the supplied version is higher or equal, false if it is lower
+	 *         than the server's version.
+	 */
+	public boolean isAtMost(final ServerVersion version) {
+		return version.protocolId >= protocolId;
+	}
+}