1.6.8 STABLE release

* WrappedPacketInUpdateSign issue fixed for versions > than 1.8.8
* WrappedPacket#readObjectArray() bug fix and for all other ones
2020-09-16 20:00:10 +02:00 · 2020-09-16 19:16:21 +02:00 · 2020-09-16 18:14:51 +02:00 · 2020-09-16 17:51:17 +02:00 · 2020-09-16 17:33:23 +02:00 · 2020-09-16 16:58:40 +02:00
115 changed files with 5017 additions and 1902 deletions
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="packetevents" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="packetevents" target="8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-  </component>
-</project>
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="viaversion-repo" />
-      <option name="name" value="viaversion-repo" />
-      <option name="url" value="https://repo.viaversion.com" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jitpack.io" />
-      <option name="name" value="jitpack.io" />
-      <option name="url" value="https://jitpack.io" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="spigot-repo" />
-      <option name="name" value="spigot-repo" />
-      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="funkemunky-releases" />
-      <option name="name" value="funkemunky-releases" />
-      <option name="url" value="https://nexus.funkemunky.cc/content/repositories/releases/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="dmulloy2-repo" />
-      <option name="name" value="dmulloy2-repo" />
-      <option name="url" value="https://repo.dmulloy2.net/nexus/repository/public/" />
-    </remote-repository>
-  </component>
-</project>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
-    </list>
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="13" project-jdk-type="JavaSDK" />
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/packetevents.iml" filepath="$PROJECT_DIR$/packetevents.iml" />
-    </modules>
-  </component>
-</project>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
@@ -1,6 +1,6 @@
-# packetevents by retrooper
+# packetevents 

-A lightweight spigot packetlistener & packetsender coded by retrooper.
+A spigot packet API with some nice utlities.

 ## About

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/.idea/libraries" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.github.spigot:1.8.8:1.8.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.github.spigot:1.7.10:1.7.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.protocol:ProtocolLib:4.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.executors:BukkitExecutors:1.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-common:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-bukkit:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-bukkit-legacy:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-bungee:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-fabric:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-sponge:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-sponge-legacy:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-velocity:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.ProtocolSupport:ProtocolSupport:4fdd683" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: it.unimi.dsi:fastutil:8.2.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:17.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.8.8-R0.1-SNAPSHOT" level="project" />
-  </component>
-</module>
@@ -6,7 +6,7 @@

    <groupId>io.github.retrooper</groupId>
    <artifactId>packetevents</artifactId>
-    <version>1.6.2</version>
+    <version>1.6.8</version>

    <!-- You can build the project with this: "mvn clean compile assembly:single" -->
    <build>
@@ -115,12 +115,5 @@
            <version>1.8.8-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
-
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
    </dependencies>
 </project>
@@ -1,50 +1,77 @@
-/**
+/*
+ * 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;

-import io.github.retrooper.packetevents.api.PacketEventsAPI;
 import io.github.retrooper.packetevents.enums.ClientVersion;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.event.PacketListener;
 import io.github.retrooper.packetevents.event.impl.BukkitMoveEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.settings.PacketEventsSettings;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import io.github.retrooper.packetevents.utils.nms_entityfinder.EntityFinderUtils;
+import io.github.retrooper.packetevents.utils.entityfinder.EntityFinderUtils;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 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.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;

-public final class PacketEvents implements PacketListener, Listener {
+import java.lang.reflect.Field;
+import java.util.ArrayList;

+public final class PacketEvents implements Listener {
    private static final PacketEventsAPI packetEventsAPI = new PacketEventsAPI();
    private static final PacketEvents instance = new PacketEvents();
-    private static final PacketEventsSettings settings = new PacketEventsSettings();
-    private static Plugin plugin;
-    private static boolean hasLoaded, hasStarted;
+    private static final ArrayList<Plugin> plugins = new ArrayList<Plugin>(1);
+    private static boolean loaded, initialized, isBungee;

    /**
-     * Call this before start()
-     *
-     * Recommended on your onLoad() Bukkit Method
+     * This loads the PacketEvents API.
+     * <p>
+     * ServerVersion:
+     * In this method we detect and cache the server version.
+     * <p>
+     * NMSUtils:
+     * We setup some NMS utilities.
+     * <p>
+     * Packet ID System:
+     * All the packet classes we will be needing are cached in a Map with an integer ID.
+     * <p>
+     * Version Lookup Utils:
+     * We setup the client protocol version system.
+     * We check if ViaVersion, ProtocolSupport or ProtocolLib is present.
+     * <p>
+     * Wrappers:
+     * All PacketEvents' wrappers are setup and do all loading they need to do.
     */
    public static void load() {
-        //SERVER VERSION LOADING
-
-        //Server Version loading
-        ServerVersion.load();
-
        ServerVersion version = ServerVersion.getVersion();
        WrappedPacket.version = version;
        PacketEvent.version = version;
@@ -58,90 +85,134 @@ public final class PacketEvents implements PacketListener, Listener {

        EntityFinderUtils.load();

-        WrappedPacket.loadAllWrappers();
-
-        VersionLookupUtils.load();
        ClientVersion.prepareLookUp();
-        hasLoaded = true;
+
+        WrappedPacket.loadAllWrappers();
+        loaded = true;
    }

    /**
-     * Loads PacketEvents if you haven't already, Sets everything up, injects all players
-     * @param pl Plugin instance
+     * Initiates PacketEvents
+     * <p>
+     * Loading:
+     * Loads PacketEvents if you haven't already.
+     * <p>
+     * Registering:
+     * Registers this class as a Bukkit listener to inject/eject players.
+     *
+     * @param pl JavaPlugin instance
     */
-    public static void start(final Plugin pl) {
-        if (!hasLoaded) {
+    public static void init(final Plugin pl) {
+        if (!loaded) {
            load();
        }
-        if (!hasStarted) {
-            plugin = pl;
-            //Register Bukkit and PacketListener
-            getAPI().getEventManager().registerListener(instance);
-
-            Bukkit.getPluginManager().registerEvents(instance, plugin);
+        if (!initialized) {
+            plugins.add(pl);
+            //Register Bukkit listener
+            Bukkit.getPluginManager().registerEvents(instance, plugins.get(0));

            for (final Player p : Bukkit.getOnlinePlayers()) {
                getAPI().getPlayerUtils().injectPlayer(p);
            }
-            hasStarted = true;
+            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;
+            }
        }
    }

    /**
-     * Stop all tasks and unregisters all PacketEvents' listeners
+     * 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);
+    }
+
+    /**
+     *
     */
    public static void stop() {
-        if (hasStarted) {
+        if (initialized) {
            for (final Player p : Bukkit.getOnlinePlayers()) {
-                getAPI().getPlayerUtils().uninjectPlayer(p);
+                getAPI().getPlayerUtils().ejectPlayer(p);
            }
            getAPI().getEventManager().unregisterAllListeners();

-            PacketType.Client.packetIds.clear();
-            PacketType.Server.packetIds.clear();
+            initialized = false;
        }
    }

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

+    @Deprecated
    public static boolean hasStarted() {
-        return hasStarted;
+        return initialized;
+    }
+
+    public static boolean isInitialized() {
+        return initialized;
    }

    public static PacketEventsAPI getAPI() {
        return packetEventsAPI;
    }

+    @Deprecated
    public static Plugin getPlugin() {
-        return plugin;
+        return plugins.get(0);
+    }
+
+    public static ArrayList<Plugin> getPlugins() {
+        return plugins;
    }

    public static String getHandlerName(final String name) {
-        return "pe-" + settings.getIdentifier() + "-" + name;
+        return "pe-" + PacketEvents.getAPI().getSettings().getIdentifier() + "-" + name;
    }

    public static PacketEventsSettings getSettings() {
-        return settings;
+        return PacketEvents.getAPI().getSettings();
    }

-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    @EventHandler
    public void onJoin(final PlayerJoinEvent e) {
-        getAPI().getPlayerUtils().injectPlayer(e.getPlayer());
-        getAPI().getPlayerUtils().setClientVersion(e.getPlayer(), ClientVersion.fromProtocolVersion((short) VersionLookupUtils.getProtocolVersion(e.getPlayer())));
+        if (!VersionLookupUtils.hasLoaded()) {
+            VersionLookupUtils.load();
+        }
+        //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.ACCESS_FAILURE);
+        } else {
+            ClientVersion version = ClientVersion.fromProtocolVersion(VersionLookupUtils.getProtocolVersion(e.getPlayer()));
+            PacketEvents.getAPI().getPlayerUtils().clientVersionsMap.put(e.getPlayer().getUniqueId(), version);
+            PacketEvents.getAPI().getPlayerUtils().injectPlayer(e.getPlayer());
+        }
    }

-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    @EventHandler
    public void onQuit(final PlayerQuitEvent e) {
-        getAPI().getPlayerUtils().clearClientVersion(e.getPlayer());
-        getAPI().getPlayerUtils().uninjectPlayer(e.getPlayer());
+        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);
-        getAPI().getEventManager().callEvent(moveEvent);
+        PacketEvents.getAPI().getEventManager().callEvent(moveEvent);
        e.setCancelled(moveEvent.isCancelled());
    }
+
 }
@@ -0,0 +1,111 @@
+/*
+ * 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;
+
+import io.github.retrooper.packetevents.event.manager.EventManager;
+import io.github.retrooper.packetevents.settings.PacketEventsSettings;
+import io.github.retrooper.packetevents.utils.player.PlayerUtils;
+import io.github.retrooper.packetevents.utils.server.ServerUtils;
+
+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();
+    }
+
+    /**
+     * Get all utilities to do with the player
+     *
+     * @return Player Utilities
+     */
+    public PlayerUtils getPlayerUtils() {
+        return playerUtils;
+    }
+
+    /**
+     * Get all utilities to do with the server
+     *
+     * @return Server Utilities
+     */
+    public ServerUtils getServerUtils() {
+        return serverUtils;
+    }
+
+
+    /**
+     * Get the event manager
+     * Used to call events, register and unregister listeners
+     *
+     * @return PacketEvents' event manager
+     */
+    public EventManager getEventManager() {
+        return eventManager;
+    }
+
+    /**
+     * 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;
+    }
+*/
+}
@@ -1,5 +1,25 @@
 /*
+ * 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.annotations;
@@ -1,6 +1,27 @@
-/**
+/*
+ * 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.annotations;


@@ -9,7 +30,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

 /**
- * Is for sure not null.
+ * Guaranteed to not be null.
 */
@Documented
@Retention(RetentionPolicy.RUNTIME)
@@ -1,6 +1,27 @@
-/**
+/*
+ * 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.annotations;


@@ -9,7 +30,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

 /**
- * Could be null.
+ * Possible that it is null.
 */
@Documented
@Retention(RetentionPolicy.RUNTIME)
@@ -1,9 +1,32 @@
-/**
+/*
+ * 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.annotations;

 import io.github.retrooper.packetevents.enums.EventSynchronization;
+import io.github.retrooper.packetevents.enums.PacketEventPriority;
+import org.bukkit.event.EventHandler;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -12,10 +35,10 @@ import java.lang.annotation.Target;

@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
-/**
- * Just like Bukkit's @EventHandler, but for PacketEvents' custom event system.
- * Make sure your class implements the PacketListener interface, and is registered when annotating your method with this annotation!
- */
+
 public @interface PacketHandler {
+    @Deprecated
    EventSynchronization synchronization() default EventSynchronization.NORMAL;
+
+    byte priority() default PacketEventPriority.NORMAL;
 }
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.api;
-
-import io.github.retrooper.packetevents.event.manager.EventManager;
-import io.github.retrooper.packetevents.utils.api.PlayerUtils;
-import io.github.retrooper.packetevents.utils.api.ServerUtils;
-
-public final class PacketEventsAPI {
-    private final EventManager eventManager = new EventManager();
-    private final PlayerUtils playerUtils = new PlayerUtils();
-    private final ServerUtils serverUtils = new ServerUtils();
-
-    /**
-     * Not thread safe
-     * Preciser than #currentMillis()
-     * Expensive
-     * Returns crazy values when you change system time
-     *
-     * @return {@link System#nanoTime()} / 1000000(1 million)
-     */
-    public long currentPreciseMillis() {
-        return System.nanoTime() / 1000000;
-    }
-
-    /**
-     * Thread safe
-     * Less precise compared to #currentPreciseMillis()
-     * Cheap
-     * Doesn't break when system time is changed
-     *
-     * @return {@link System#currentTimeMillis()}
-     */
-    public long currentMillis() {
-        return System.currentTimeMillis();
-    }
-
-    /**
-     * Get all utilities to do with the player
-     *
-     * @return Player Utilities
-     */
-    public PlayerUtils getPlayerUtils() {
-        return playerUtils;
-    }
-
-    /**
-     * Get all utilities to do with the server
-     *
-     * @return Server Utilities
-     */
-    public ServerUtils getServerUtils() {
-        return serverUtils;
-    }
-
-
-    /**
-     * Get the event manager
-     * Used to call events, register and unregister listeners
-     *
-     * @return PacketEvents' event manager
-     */
-    public EventManager getEventManager() {
-        return eventManager;
-    }
-}
@@ -1,6 +1,27 @@
-/**
+/*
+ * 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;
@@ -65,7 +86,7 @@ public enum ClientVersion {
        VERSION_LOOKUP.put(737, v_1_16_2);
    }

-    public static ClientVersion fromProtocolVersion(short protocolVersion) {
+    public static ClientVersion fromProtocolVersion(int protocolVersion) {
        if (protocolVersion == -1 && PacketEvents.getSettings().doAutoResolveClientProtocolVersion()) {
            protocolVersion = ServerVersion.getVersion().toProtocolVersion();
        }
@@ -1,6 +1,27 @@
-/**
+/*
+ * 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;

 public enum Direction {
@@ -1,8 +1,30 @@
-/**
+/*
+ * 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;

+@Deprecated
 public enum EventSynchronization {
    NORMAL, FORCE_SYNC, FORCE_ASYNC
 }
@@ -0,0 +1,34 @@
+/*
+ * 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;
+@Deprecated
+public interface PacketEventPriority {
+    byte LOWEST = 0;
+    byte LOW = 1;
+    byte NORMAL = 2;
+    byte HIGH = 3;
+    byte HIGHEST = 4;
+    byte MONITOR = 5;
+}
@@ -1,10 +1,32 @@
-/**
+/*
+ * 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
@@ -18,22 +40,22 @@ public enum ServerVersion {
    v_1_16_2, ERROR, EMPTY;

    private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
-    public static ServerVersion[] reversedValues;
+    public static ServerVersion[] reversedValues = new ServerVersion[values().length];
    private static ServerVersion cachedVersion;

-    public static void load() {
-        reversedValues = ServerVersion.reverse(values());
-    }
-
    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;
-            } else if (PacketEvents.getSettings().getDefaultServerVersion() != null) {
-                return PacketEvents.getSettings().getDefaultServerVersion();
            }
        }
+        if(PacketEvents.getSettings().getDefaultServerVersion() != null) {
+            return PacketEvents.getSettings().getDefaultServerVersion();
+        }
        return ERROR;
    }

@@ -1,6 +1,27 @@
-/**
+/*
+ * 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;

 public enum SystemOS {
@@ -0,0 +1,56 @@
+/*
+ * 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;
+
+/**
+ * This indicates that it is possible to cancel an event,
+ * which should result in cancelling the planned action.
+ */
+public interface CancellableEvent {
+
+    /**
+     * Has the event been cancelled?
+     * @return is event cancelled
+     */
+    boolean isCancelled();
+
+    /**
+     * Cancel or proceed with the event.
+     * @param val
+     */
+    void setCancelled(boolean val);
+
+    /**
+     * Cancel the event.
+     * You can achieve the same result by just using {@link #setCancelled(boolean)}
+     */
+    void cancel();
+
+    /**
+     * Uncancel the event.
+     * You can achieve the same result by just using {@link #setCancelled(boolean)}
+     */
+    void uncancel();
+}
@@ -1,11 +1,35 @@
-/**
+/*
+ * 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;


 import io.github.retrooper.packetevents.enums.ServerVersion;

+/**
+ * An event in the PacketEvents EventManager system.
+ */
 public abstract class PacketEvent {
    public static ServerVersion version;
    private long timestamp = System.currentTimeMillis();
@@ -22,6 +46,4 @@ public abstract class PacketEvent {
    public void setTimestamp(long timestamp) {
        this.timestamp = timestamp;
    }
-
-    public abstract boolean isAsyncByDefault();
-}
+}
@@ -1,7 +1,32 @@
-/**
+/*
+ * 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;

+/**
+ * A Packet listener.
+ * Implement this interface in your listeners.
+ */
 public interface PacketListener {
 }
@@ -1,14 +1,15 @@
-/**
- * Copyright (c) 2020 retrooper
- */
 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;

-public final class BukkitMoveEvent extends PacketEvent {
+//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;
@@ -37,20 +38,23 @@ public final class BukkitMoveEvent extends PacketEvent {
        return to;
    }

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

+    @Override
    public void setCancelled(final boolean val) {
        this.cancelled = val;
    }

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

    @Override
-    public boolean isAsyncByDefault() {
-        return false;
+    public void uncancel() {
+        this.cancelled = false;
    }
 }
@@ -1,13 +1,38 @@
-/**
+/*
+ * 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.CancellableEvent;
 import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
+import io.github.retrooper.packetevents.packettype.PacketType;
 import org.bukkit.entity.Player;

-public final class PacketReceiveEvent extends PacketEvent {
+/**
+ * This event is called each time a packet is received from a client.
+ */
+public final class PacketReceiveEvent extends PacketEvent implements CancellableEvent {
    private final Player player;
    private final Object packet;
    private boolean cancelled;
@@ -18,8 +43,7 @@ public final class PacketReceiveEvent extends PacketEvent {
    }

    /**
-     * Get the player sending the packet
-     *
+     * Get the packet sender
     * @return player
     */
    public Player getPlayer() {
@@ -28,8 +52,8 @@ public final class PacketReceiveEvent extends PacketEvent {

    /**
     * Get the packet's name (NMS packet class simple name).
-     * @deprecated It is recommended not to use this, it is an expensive method to call.
     * @return Name of the packet
+     * @deprecated It is recommended not to use this.
     */
    @Deprecated
    public String getPacketName() {
@@ -37,8 +61,7 @@ public final class PacketReceiveEvent extends PacketEvent {
    }

    /**
-     * Get the NMS packet object
-     *
+     * Get the raw packet object
     * @return packet object
     */
    public Object getNMSPacket() {
@@ -47,8 +70,7 @@ public final class PacketReceiveEvent extends PacketEvent {

    /**
     * Get the class of the NMS packet object
-     * Deprecated, as it is useless, rather use getNMSPacket().getClass()
-     *
+     * @deprecated It is useless, rather use getNMSPacket().getClass()
     * @return packet object class
     */
    @Deprecated
@@ -58,33 +80,30 @@ public final class PacketReceiveEvent extends PacketEvent {

    /**
     * Get the ID of the packet
-     *
     * @return packet id
     */
    public byte getPacketId() {
        return PacketType.Client.packetIds.getOrDefault(packet.getClass(), (byte) -1);
    }

-    /**
-     * Returns if the packet has been cancelled
-     *
-     * @return cancelled
-     */
+    @Override
+    public void cancel() {
+        this.cancelled = true;
+    }
+
+    @Override
+    public void uncancel() {
+        this.cancelled = false;
+    }
+
+    @Override
    public boolean isCancelled() {
        return cancelled;
    }

-    /**
-     * Cancel the packet
-     *
-     * @param cancelled boolean
-     */
+    @Override
    public void setCancelled(boolean cancelled) {
        this.cancelled = cancelled;
    }

-    @Override
-    public boolean isAsyncByDefault() {
-        return true;
-    }
 }
@@ -1,14 +1,38 @@
-/**
+/*
+ * 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.CancellableEvent;
 import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
+import io.github.retrooper.packetevents.packettype.PacketType;
 import org.bukkit.entity.Player;

-
-public final class PacketSendEvent extends PacketEvent {
+/**
+ * This event is called each time the server sends a packet to the client.
+ */
+public final class PacketSendEvent extends PacketEvent implements CancellableEvent {
    private final Player player;
    private final Object packet;
    private boolean cancelled;
@@ -63,17 +87,22 @@ public final class PacketSendEvent extends PacketEvent {
        return packet.getClass();
    }

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

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

    @Override
-    public boolean isAsyncByDefault() {
-        return true;
+    public void cancel() {
+        this.cancelled = true;
    }
+
+    @Override
+    public void uncancel() { this.cancelled = false;}
 }

@@ -1,37 +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.event.impl;

+import io.github.retrooper.packetevents.event.CancellableEvent;
 import io.github.retrooper.packetevents.event.PacketEvent;
 import org.bukkit.entity.Player;

-public final class PlayerInjectEvent extends PacketEvent {
+/**
+ * This event is called each time you inject a player.
+ */
+public final class PlayerInjectEvent extends PacketEvent implements CancellableEvent {
    private final Player player;
+    private final boolean async;
    private boolean cancelled;

    public PlayerInjectEvent(final Player player) {
-        this.player = player;
+        this(player, false);
    }

+    public PlayerInjectEvent(final Player player, boolean isAsync) {
+        this.player= player;
+        this.async = isAsync;
+    }
+
+    @Override
    public boolean isCancelled() {
        return cancelled;
    }

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

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

+    @Override
+    public void uncancel() {this.cancelled = false; }
+
    public Player getPlayer() {
        return player;
    }

-    @Override
-    public boolean isAsyncByDefault() {
-        return false;
+    public boolean isAsync() {
+        return async;
    }
+
 }
@@ -1,58 +1,73 @@
-/**
+/*
+ * 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.CancellableEvent;
 import io.github.retrooper.packetevents.event.PacketEvent;
 import org.bukkit.entity.Player;

-public final class PlayerUninjectEvent extends PacketEvent {
+/**
+ * This event is called each time you eject a player.
+ */
+public final class PlayerUninjectEvent extends PacketEvent implements CancellableEvent {
    private final Player player;
-    private final boolean sync;
+    private final boolean async;
    private boolean cancelled;

-    @Deprecated
-    public PlayerUninjectEvent(final Player player, @Deprecated final boolean sync) {
+    public PlayerUninjectEvent(final Player player, final boolean isAsync) {
        this.player = player;
-        this.sync = sync;
+        this.async = isAsync;
    }

    public PlayerUninjectEvent(final Player player) {
-        this.player = player;
-        this.sync = true;
+        this(player, false);
    }

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

+    @Override
+    public void uncancel() {this.cancelled = false; }
+
+    @Override
    public boolean isCancelled() {
        return this.cancelled;
    }

+    @Override
    public void setCancelled(final boolean val) {
        this.cancelled = val;
    }

-    /**
-     * Whether the uninjection was called synchronously or asynchronously.
-     * The event is still called synchronously.
-     * By default all uninjections are called aynchronously in this build.
-     *
-     * @return If the uninjection was done async or sync
-     * @deprecated because it is unneeded
-     */
-    @Deprecated
-    public boolean isSync() {
-        return sync;
-    }
-
    public Player getPlayer() {
        return player;
    }

-    @Override
-    public boolean isAsyncByDefault() {
-        return false;
+    public boolean isAsync() {
+        return async;
    }
 }
@@ -1,33 +1,59 @@
-/**
+/*
+ * 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.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.PacketEvent;
 import io.github.retrooper.packetevents.event.PacketListener;
+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;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;

 public final class EventManager {
-    private final HashMap<PacketListener, List<Method>> registeredMethods = new HashMap<PacketListener, List<Method>>();
+    private final ConcurrentHashMap<PacketListener, ConcurrentLinkedQueue<Method>> registeredMethods = new ConcurrentHashMap<>();

    public void callEvent(final PacketEvent e) {
        for (final PacketListener listener : registeredMethods.keySet()) {
-            //Annotated methods
-            final List<Method> methods = registeredMethods.get(listener);
-            for (final Method method : methods) {
-                final Class<?> parameterType = method.getParameterTypes()[0];
+            ConcurrentLinkedQueue<Method> methods = registeredMethods.get(listener);
+            final boolean[] isCancelled = {false};
+            final byte[] eventPriority = {PacketEventPriority.LOWEST};
+            for (Method method : methods) {
+                Class<?> parameterType = method.getParameterTypes()[0];
                if (parameterType.equals(PacketEvent.class)
                        || parameterType.isInstance(e)) {
-                    final PacketHandler annotation = method.getAnnotation(PacketHandler.class);
-                    final Runnable invokeMethod = new Runnable() {
+
+                    PacketHandler annotation = method.getAnnotation(PacketHandler.class);
+                    Runnable invokeMethod = new Runnable() {
                        @Override
                        public void run() {
                            try {
@@ -35,9 +61,15 @@ public final class EventManager {
                            } 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);
@@ -51,23 +83,40 @@ public final class EventManager {
                            } 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;
+                        cancellableEvent.setCancelled(isCancelled[0]);
+                    }
                }
            }
        }
    }

-    public void registerListener(final PacketListener e) {
-        final List<Method> methods = new ArrayList<Method>();
-        for (final Method m : e.getClass().getMethods()) {
+    public void registerListener(final PacketListener listener) {
+        final ConcurrentLinkedQueue<Method> methods = new ConcurrentLinkedQueue<>();
+        for (final Method m : listener.getClass().getDeclaredMethods()) {
            if (m.isAnnotationPresent(PacketHandler.class)
                    && m.getParameterTypes().length == 1) {
                methods.add(m);
            }
        }
+
        if (!methods.isEmpty()) {
-            registeredMethods.put(e, methods);
+            if (ProtocolLibUtils.isAvailable()
+                    && PacketEvents.getAPI().getSettings().isUseProtocolLibIfAvailable()) {
+                ProtocolLibListener.registerProtocolLibListener(listener, methods);
+            } else {
+                registeredMethods.put(listener, methods);
+            }
        }
    }

@@ -0,0 +1,34 @@
+/*
+ * 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.priority;
+
+public interface PacketEventPriority {
+    byte LOWEST = 0;
+    byte LOW = 1;
+    byte NORMAL = 2;
+    byte HIGH = 3;
+    byte HIGHEST = 4;
+    byte MONITOR = 5;
+}
@@ -1,18 +1,38 @@
-/**
+/*
+ * 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.example;

 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.annotations.PacketHandler;
-import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.event.PacketListener;
 import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
-import io.github.retrooper.packetevents.packetwrappers.in.useentity.WrappedPacketInUseEntity;
-import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.packetwrappers.in.updatesign.WrappedPacketInUpdateSign;
+import io.github.retrooper.packetevents.packetwrappers.out.entityvelocity.WrappedPacketOutEntityVelocity;
 import org.bukkit.plugin.java.JavaPlugin;
+
 public class MainExample extends JavaPlugin implements PacketListener {

    @Override
@@ -22,19 +42,17 @@ public class MainExample extends JavaPlugin implements PacketListener {

    @Override
    public void onEnable() {
+        //Deprecated, as it is no longer needed.
+        /*
+         *
+         * PacketEvents will generate a random identifier for you if you do not set one
+         * before initializing PacketEvents
+         *
+         */

-        PacketEvents.getSettings().setDefaultServerVersion(ServerVersion.v_1_7_10);
+        PacketEvents.getSettings().setIdentifier("official_api");

-        //ClientVersion cannot be resolved, it is the same as the server's.
-        //The clientversion can only not be resolved if
-        // ViaVersion, ProtocolSuppport, or ProtocolLib isn't present.
-        //ClientVersion might be resolvable if the server version is 1.7.10.
-        PacketEvents.getSettings().setDoAutoResolveClientProtocolVersion(true);
-
-        //Deprecated, as it is no longer needed
-        //PacketEvents.getSettings().setIdentifier("packetevents_api");
-
-        PacketEvents.start(this);
+        PacketEvents.init(this);
        PacketEvents.getAPI().getEventManager().registerListener(this);
    }

@@ -42,5 +60,4 @@ public class MainExample extends JavaPlugin implements PacketListener {
    public void onDisable() {
        PacketEvents.stop();
    }
-
 }
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.handler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.Future;
-
-public class NettyPacketHandler {
-    private static boolean v1_7_nettyMode = false;
-
-    static {
-        try {
-            Class.forName("io.netty.channel.Channel");
-        } catch (ClassNotFoundException e) {
-            v1_7_nettyMode = true;
-        }
-    }
-
-    public static void injectPlayer(final Player player) {
-        final PlayerInjectEvent injectEvent = new PlayerInjectEvent(player);
-        PacketEvents.getAPI().getEventManager().callEvent(injectEvent);
-        if (!injectEvent.isCancelled()) {
-            if (v1_7_nettyMode) {
-                NettyPacketHandler_7.injectPlayer(player);
-            } else {
-                NettyPacketHandler_8.injectPlayer(player);
-            }
-        }
-    }
-
-    public static Future<?> uninjectPlayerAsync(final Player player) {
-        try {
-            final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
-            PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
-            if (!uninjectEvent.isCancelled()) {
-                if (v1_7_nettyMode) {
-                    return NettyPacketHandler_7.uninjectPlayerAsync(player);
-                } else {
-                    return NettyPacketHandler_8.uninjectPlayerAsync(player);
-                }
-            }
-        } catch (Exception ignored) {
-
-        }
-        return null;
-    }
-
-    public static void uninjectPlayer(final Player player) {
-        try {
-            final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
-            PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
-            if (!uninjectEvent.isCancelled()) {
-                if (v1_7_nettyMode) {
-                    NettyPacketHandler_7.uninjectPlayer(player);
-                } else {
-                    NettyPacketHandler_8.uninjectPlayer(player);
-                }
-            }
-        } catch (Exception ex) {
-            //Failed, but that is alright
-        }
-    }
-
-    public static Object write(final Player sender, final Object packet) {
-        final PacketSendEvent packetSendEvent = new PacketSendEvent(sender, packet);
-        PacketEvents.getAPI().getEventManager().callEvent(packetSendEvent);
-        if (!packetSendEvent.isCancelled()) {
-            return packet;
-        }
-        return null;
-    }
-
-    public static Object read(final Player receiver, final Object packet) {
-        final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(receiver, packet);
-        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent);
-        if (!packetReceiveEvent.isCancelled()) {
-            return packet;
-        }
-        return null;
-    }
-}
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.handler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import net.minecraft.util.io.netty.channel.*;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.Future;
-
-final class NettyPacketHandler_7 {
-
-    public static void injectPlayer(final Player player) {
-        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
-            @Override
-            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Object packet = NettyPacketHandler.read(player, msg);
-                if (packet == null) {
-                    return;
-                }
-                super.channelRead(ctx, msg);
-            }
-
-            @Override
-            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-                Object packet = NettyPacketHandler.write(player, msg);
-                if (packet == null) {
-                    return;
-                }
-                super.write(ctx, msg, promise);
-            }
-        };
-        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
-        pipeline.addBefore("packet_handler", PacketEvents.getHandlerName(player.getName()), channelDuplexHandler);
-    }
-
-    public static void uninjectPlayer(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-    }
-
-    public static Future<?> uninjectPlayerAsync(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        return channel.eventLoop().submit(() -> {
-            channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-        });
-    }
-}
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.handler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import io.netty.channel.*;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.Future;
-
-final class NettyPacketHandler_8 {
-
-    public static void injectPlayer(final Player player) {
-        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
-            @Override
-            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Object packet = NettyPacketHandler.read(player, msg);
-                if (packet == null) {
-                    return;
-                }
-                super.channelRead(ctx, msg);
-            }
-
-            @Override
-            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-                Object packet = NettyPacketHandler.write(player, msg);
-                if (packet == null) {
-                    return;
-                }
-                super.write(ctx, msg, promise);
-            }
-        };
-        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
-        pipeline.addBefore("packet_handler", PacketEvents.getHandlerName(player.getName()), channelDuplexHandler);
-    }
-
-    public static void uninjectPlayer(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-    }
-
-    public static Future<?> uninjectPlayerAsync(final Player player) {
-        final Channel channel = (Channel) NMSUtils.getChannel(player);
-        return channel.eventLoop().submit(() -> {
-            channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
-        });
-    }
-}
@@ -0,0 +1,181 @@
+/*
+ * 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 org.bukkit.entity.Player;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+public class NettyPacketHandler {
+    private 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) {
+        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) {
+        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) {
+        return 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) {
+
+            }
+        });
+    }
+
+    /**
+     * 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);
+        }
+    }
+}
@@ -0,0 +1,80 @@
+/*
+ * 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.utils.nms.NMSUtils;
+import net.minecraft.util.io.netty.channel.Channel;
+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.entity.Player;
+
+final class NettyPacketHandler_7 {
+
+    /**
+     * Inject a player using 1.7.10's netty import location
+     * @param player
+     */
+    public static void injectPlayer(final Player player) {
+        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
+            @Override
+            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                Object packet = NettyPacketHandler.read(player, msg);
+                if (packet == null) {
+                    return;
+                }
+                super.channelRead(ctx, msg);
+            }
+
+            @Override
+            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+                Object packet = NettyPacketHandler.write(player, msg);
+                if (packet == null) {
+                    return;
+                }
+                super.write(ctx, msg, promise);
+            }
+        };
+        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
+        pipeline.addBefore("packet_handler", PacketEvents.getHandlerName(player.getName()), channelDuplexHandler);
+    }
+
+    /**
+     * Eject a player using 1.7.10 netty import location.
+     * @param player
+     */
+    public static void ejectPlayer(final Player player) {
+         Channel channel = (Channel) NMSUtils.getChannel(player);
+        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
+        NMSUtils.channelCache.remove(player.getUniqueId());
+    }
+
+    public static void sendPacket(Object rawChannel, Object packet) {
+        Channel channel = (Channel)rawChannel;
+        channel.pipeline().writeAndFlush(packet);
+    }
+}
@@ -0,0 +1,79 @@
+/*
+ * 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.utils.nms.NMSUtils;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import org.bukkit.entity.Player;
+
+final class NettyPacketHandler_8 {
+    /**
+     * Inject a player with 1.8+ netty import location.
+     * @param player
+     */
+    public static void injectPlayer(final Player player) {
+        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
+            @Override
+            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                Object packet = NettyPacketHandler.read(player, msg);
+                if (packet == null) {
+                    return;
+                }
+                super.channelRead(ctx, msg);
+            }
+
+            @Override
+            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+                Object packet = NettyPacketHandler.write(player, msg);
+                if (packet == null) {
+                    return;
+                }
+                super.write(ctx, msg, promise);
+            }
+        };
+        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
+        pipeline.addBefore("packet_handler", PacketEvents.getHandlerName(player.getName()), channelDuplexHandler);
+    }
+
+    /**
+     * Eject a player with 1.8+ netty import location.
+     * @param player
+     */
+    public static void ejectPlayer(final Player player) {
+        final Channel channel = (Channel) NMSUtils.getChannel(player);
+        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
+        NMSUtils.channelCache.remove(player.getUniqueId());
+    }
+
+    public static void sendPacket(Object rawChannel, Object packet) {
+        Channel channel = (Channel)rawChannel;
+        channel.pipeline().writeAndFlush(packet);
+    }
+}
@@ -1,19 +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.packet;

-import io.github.retrooper.packetevents.annotations.Nullable;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+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 Client {
        private static final String c = "PacketPlayIn";
-        @Nullable
-        public static Class<?> FLYING;
-
-        public static Class<?> POSITION, POSITION_LOOK, LOOK, CLIENT_COMMAND,
+        public static Class<?> FLYING, POSITION, POSITION_LOOK, LOOK, CLIENT_COMMAND,
                TRANSACTION, BLOCK_DIG, ENTITY_ACTION, USE_ENTITY,
                WINDOW_CLICK, STEER_VEHICLE, CUSTOM_PAYLOAD, ARM_ANIMATION,
                BLOCK_PLACE, USE_ITEM, ABILITIES, HELD_ITEM_SLOT,
@@ -25,6 +43,9 @@ public class PacketTypeClasses {
                ADVANCEMENTS, TR_SEL, BEACON, SET_COMMAND_BLOCK,
                SET_COMMAND_MINECART, SET_JIGSAW, STRUCT, UPDATE_SIGN, SPECTATE;

+        /**
+         * Initiate all server-bound packet classes.
+         */
        public static void load() {
            FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying");
            try {
@@ -32,9 +53,9 @@ public class PacketTypeClasses {
                POSITION_LOOK = NMSUtils.getNMSClass(c + "PositionLook");
                LOOK = NMSUtils.getNMSClass(c + "Look");
            } catch (ClassNotFoundException e) {
-                POSITION = Reflection.getSubClass(FLYING, c + "Position");
-                POSITION_LOOK = Reflection.getSubClass(FLYING, c + "PositionLook");
-                LOOK = Reflection.getSubClass(FLYING, c + "Look");
+                POSITION = SubclassUtil.getSubClass(FLYING, c + "Position");
+                POSITION_LOOK = SubclassUtil.getSubClass(FLYING, c + "PositionLook");
+                LOOK = SubclassUtil.getSubClass(FLYING, c + "Look");
            }

            try {
@@ -129,6 +150,9 @@ public class PacketTypeClasses {
                NBT_QUERY, COLLECT, ENTITY_TELEPORT, ADVANCEMENTS, UPDATE_ATTRIBUTES,
                ENTITY_EFFECT, RECIPE_UPDATE, TAGS, MAP_CHUNK_BULK;

+        /**
+         * Initiate all client-bound packet classes.
+         */
        public static void load() {
            SPAWN_ENTITY = NMSUtils.getNMSClassWithoutException(s + "SpawnEntity");
            SPAWN_ENTITY_EXPERIENCE_ORB = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityExperienceOrb");
@@ -172,9 +196,9 @@ public class PacketTypeClasses {
            MAP = NMSUtils.getNMSClassWithoutException(s + "Map");
            OPEN_WINDOW_MERCHANT = NMSUtils.getNMSClassWithoutException(s + "OpenWindowMerchant");
            ENTITY = NMSUtils.getNMSClassWithoutException(s + "Entity");
-            REL_ENTITY_MOVE = Reflection.getSubClass(ENTITY, s + "RelEntityMove");
-            REL_ENTITY_MOVE_LOOK = Reflection.getSubClass(ENTITY, s + "RelEntityMoveLook");
-            ENTITY_LOOK = Reflection.getSubClass(ENTITY, s + "EntityLook");
+            REL_ENTITY_MOVE = SubclassUtil.getSubClass(ENTITY, s + "RelEntityMove");
+            REL_ENTITY_MOVE_LOOK = SubclassUtil.getSubClass(ENTITY, s + "RelEntityMoveLook");
+            ENTITY_LOOK = SubclassUtil.getSubClass(ENTITY, s + "EntityLook");
            if (REL_ENTITY_MOVE == null) {
                //is not a subclass and should be accessed normally
                REL_ENTITY_MOVE = NMSUtils.getNMSClassWithoutException(s + "RelEntityMove");
@@ -1,13 +1,35 @@
-/**
+/*
+ * 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.packet;
+
+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 Client {
        public static final Map<Class<?>, Byte> packetIds = new HashMap<Class<?>, Byte>();
        public static final byte TELEPORT_ACCEPT = 0,
@@ -75,18 +97,23 @@ public class PacketType {
        }

        public static class Util {
-            public static boolean isInstanceOfFlying(final byte packetId) {
-                return packetId == FLYING
-                        || packetId == POSITION
-                        || packetId == POSITION_LOOK
-                        || packetId == LOOK;
+            /**
+             * Is the packet an instance of the PacketPlayInFlying packet?
+             * @param packetID
+             * @return packetID == FLYING or POSITION or POSITION_LOOK or LOOK
+             */
+            public static boolean isInstanceOfFlying(final byte packetID) {
+                return packetID == FLYING
+                        || packetID == POSITION
+                        || packetID == POSITION_LOOK
+                        || packetID == LOOK;
            }
        }
    }

    public static class Server {
        public static final Map<Class<?>, Byte> packetIds = new HashMap<Class<?>, Byte>();
-        public static byte SPAWN_ENTITY = 0, SPAWN_ENTITY_EXPERIENCE_ORB = 1, SPAWN_ENTITY_WEATHER = 2, SPAWN_ENTITY_LIVING = 3,
+        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,
                BLOCK_CHANGE = 12, BOSS = 13, SERVER_DIFFICULTY = 14, CHAT = 15, MULTI_BLOCK_CHANGE = 16,
@@ -136,6 +163,7 @@ public class PacketType {
            packetIds.put(PacketTypeClasses.Server.WINDOW_ITEMS, WINDOW_ITEMS);
            packetIds.put(PacketTypeClasses.Server.WINDOW_DATA, WINDOW_DATA);
            packetIds.put(PacketTypeClasses.Server.SET_SLOT, SET_SLOT);
+            packetIds.put(PacketTypeClasses.Server.SET_COOLDOWN, SET_COOLDOWN);
            packetIds.put(PacketTypeClasses.Server.CUSTOM_PAYLOAD, CUSTOM_PAYLOAD);
            packetIds.put(PacketTypeClasses.Server.CUSTOM_SOUND_EFFECT, CUSTOM_SOUND_EFFECT);
            packetIds.put(PacketTypeClasses.Server.KICK_DISCONNECT, KICK_DISCONNECT);
@@ -146,6 +174,7 @@ public class PacketType {
            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW_HORSE, OPEN_WINDOW_HORSE);
            packetIds.put(PacketTypeClasses.Server.KEEP_ALIVE, KEEP_ALIVE);
            packetIds.put(PacketTypeClasses.Server.MAP_CHUNK, MAP_CHUNK);
+            packetIds.put(PacketTypeClasses.Server.WORLD_EVENT, WORLD_EVENT);
            packetIds.put(PacketTypeClasses.Server.WORLD_EVENT, SPAWN_ENTITY);
            packetIds.put(PacketTypeClasses.Server.WORLD_PARTICLES, WORLD_PARTICLES);
            packetIds.put(PacketTypeClasses.Server.LIGHT_UPDATE, LIGHT_UPDATE);
@@ -208,9 +237,14 @@ public class PacketType {
        }

        public static class Util {
-            public static boolean isInstanceOfEntity(final byte packetId) {
-                return packetId == ENTITY || packetId == REL_ENTITY_MOVE ||
-                        packetId == REL_ENTITY_MOVE_LOOK || packetId == ENTITY_LOOK;
+            /**
+             * 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
+             */
+            public static boolean isInstanceOfEntity(final byte packetID) {
+                return packetID == ENTITY || packetID == REL_ENTITY_MOVE ||
+                        packetID == REL_ENTITY_MOVE_LOOK || packetID == ENTITY_LOOK;
            }
        }
    }
@@ -1,8 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.packetwrappers;
-
-public interface Sendable {
-    Object asNMSPacket();
-}
@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+/**
+ * This interface indicates that a packet wrapper supports being sent to a client.
+ */
+public interface SendableWrapper {
+    Object asNMSPacket();
+}
@@ -0,0 +1,357 @@
+/*
+ * 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;
+
+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.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;
+import io.github.retrooper.packetevents.packetwrappers.out.abilities.WrappedPacketOutAbilities;
+import io.github.retrooper.packetevents.packetwrappers.out.animation.WrappedPacketOutAnimation;
+import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
+import io.github.retrooper.packetevents.packetwrappers.out.entity.WrappedPacketOutEntity;
+import io.github.retrooper.packetevents.packetwrappers.out.entityvelocity.WrappedPacketOutEntityVelocity;
+import io.github.retrooper.packetevents.packetwrappers.out.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 org.bukkit.entity.Player;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class WrappedPacket implements WrapperPacketReader {
+    protected final List<Field> fields = new ArrayList<>();
+    public static ServerVersion version;
+    protected final Player player;
+    protected Object packet;
+    private Class<?> packetClass;
+
+    public WrappedPacket() {
+        this(null);
+    }
+
+    public WrappedPacket(final Object packet) {
+        this(null, packet);
+    }
+
+    public WrappedPacket(final Player player, final Object packet) {
+        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;
+        }
+        for (Field f : packetClass.getDeclaredFields()) {
+            f.setAccessible(true);
+            fields.add(f);
+        }
+        this.player = player;
+        this.packet = packet;
+        setup();
+    }
+
+    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();
+
+        //CLIENTBOUND
+        WrappedPacketOutAbilities.load();
+        WrappedPacketOutAnimation.load();
+        WrappedPacketOutChat.load();
+        WrappedPacketOutEntity.load();
+        WrappedPacketOutEntityVelocity.load();
+        WrappedPacketOutKeepAlive.load();
+        WrappedPacketOutKickDisconnect.load();
+        WrappedPacketOutPosition.load();
+        WrappedPacketOutTransaction.load();
+        WrappedPacketOutUpdateHealth.load();
+        WrappedPacketOutGameStateChange.load();
+        //WrappedPacketOutCustomPayload.load();
+    }
+
+    protected void setup() {
+
+    }
+
+    @Override
+    public boolean readBoolean(int index) {
+        return (boolean) readObject(index, boolean.class);
+    }
+
+    @Override
+    public byte readByte(int index) {
+        return (byte) readObject(index, byte.class);
+    }
+
+    @Override
+    public short readShort(int index) {
+        return (short) readObject(index, short.class);
+    }
+
+    @Override
+    public int readInt(int index) {
+        return (int) readObject(index, int.class);
+    }
+
+    @Override
+    public long readLong(int index) {
+        return (long) readObject(index, long.class);
+    }
+
+    @Override
+    public float readFloat(int index) {
+        return (float) readObject(index, float.class);
+    }
+
+    @Override
+    public double readDouble(int index) {
+        return (double) readObject(index, double.class);
+    }
+
+    @Override
+    public boolean[] readBooleanArray(int index) {
+        int currentIndex = 0;
+        for(Field f : fields) {
+            if (boolean[].class.isAssignableFrom(f.getType())) {
+                if(index == currentIndex++) {
+                    try {
+                        return (boolean[]) f.get(packet);
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return new boolean[0];
+    }
+
+    @Override
+    public byte[] readByteArray(int index) {
+        int currentIndex = 0;
+        for(Field f : fields) {
+            if (byte[].class.isAssignableFrom(f.getType())) {
+                if(index == currentIndex++) {
+                    try {
+                        return (byte[]) f.get(packet);
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return new byte[0];
+    }
+
+    @Override
+    public short[] readShortArray(int index) {
+        int currentIndex = 0;
+        for(Field f : fields) {
+            if (short[].class.isAssignableFrom(f.getType())) {
+                if(index == currentIndex++) {
+                    try {
+                        return (short[]) f.get(packet);
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return new short[0];
+    }
+
+    @Override
+    public int[] readIntArray(int index) {
+        int currentIndex = 0;
+        for(Field f : fields) {
+            if (int[].class.isAssignableFrom(f.getType())) {
+                if(index == currentIndex++) {
+                    try {
+                        return (int[]) f.get(packet);
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return new int[0];
+    }
+
+    @Override
+    public long[] readLongArray(int index) {
+        int currentIndex = 0;
+        for(Field f : fields) {
+            if (long[].class.isAssignableFrom(f.getType())) {
+                if(index == currentIndex++) {
+                    try {
+                        return (long[]) f.get(packet);
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return new long[0];
+    }
+
+    @Override
+    public float[] readFloatArray(int index) {
+        int currentIndex = 0;
+        for(Field f : fields) {
+            if (float.class.isAssignableFrom(f.getType())) {
+                if(index == currentIndex++) {
+                    try {
+                        return (float[]) f.get(packet);
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return new float[0];
+    }
+
+    @Override
+    public double[] readDoubleArray(int index) {
+        int currentIndex = 0;
+        for(Field f : fields) {
+            if (double[].class.isAssignableFrom(f.getType())) {
+                if(index == currentIndex++) {
+                    try {
+                        return (double[]) f.get(packet);
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return new double[0];
+    }
+
+    @Override
+    public String[] readStringArray(int index) {
+        Object[] array = readObjectArray(index, String[].class);
+        int len = array.length;
+        String[] stringArray = new String[len];
+        for(int i = 0; i < len; i++) {
+            stringArray[i] = array[i].toString();
+        }
+        return stringArray;
+    }
+
+    @Override
+    public Object[] readObjectArray(int index, Class<?> type) {
+        int currentIndex = 0;
+        for(Field f : fields) {
+            if (type.isAssignableFrom(f.getType())) {
+                if(index == currentIndex++) {
+                    try {
+                        return (Object[]) f.get(packet);
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return new Object[0];
+    }
+
+    @Override
+    public Object readObject(int index, Class<?> type) {
+        int currentIndex = 0;
+        for (Field f : fields) {
+            if (type.isAssignableFrom(f.getType())) {
+                if (index == currentIndex++) {
+                    try {
+                        return f.get(packet);
+                    } catch (Exception exception) {
+                        exception.printStackTrace();
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Object readAnyObject(int index) {
+        int currentIndex = 0;
+        for (Field f : fields) {
+            if (index == currentIndex++) {
+                try {
+                    return f.get(packet);
+                } catch (Exception exception) {
+                    exception.printStackTrace();
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String readString(int index) {
+        return readObject(index, String.class).toString();
+    }
+}
@@ -0,0 +1,66 @@
+/*
+ * 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 WrapperPacketReader {
+
+    boolean readBoolean(int index);
+
+    byte readByte(int index);
+
+    short readShort(int index);
+
+    int readInt(int index);
+
+    long readLong(int index);
+
+    float readFloat(int index);
+
+    double readDouble(int index);
+
+    boolean[] readBooleanArray(int index);
+
+    byte[] readByteArray(int index);
+
+    short[] readShortArray(int index);
+
+    int[] readIntArray(int index);
+
+    long[] readLongArray(int index);
+
+    float[] readFloatArray(int index);
+
+    double[] readDoubleArray(int index);
+
+    String[] readStringArray(int index);
+
+    Object[] readObjectArray(int index, Class<?> type);
+
+    Object readObject(int index, Class<?> type);
+
+    Object readAnyObject(int index);
+
+    String readString(int index);
+}
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.packetwrappers.api;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.in.abilities.WrappedPacketInAbilities;
-import io.github.retrooper.packetevents.packetwrappers.in.armanimation.WrappedPacketInArmAnimation;
-import io.github.retrooper.packetevents.packetwrappers.in.blockdig.WrappedPacketInBlockDig;
-import io.github.retrooper.packetevents.packetwrappers.in.blockplace.WrappedPacketInBlockPlace;
-import io.github.retrooper.packetevents.packetwrappers.in.chat.WrappedPacketInChat;
-import io.github.retrooper.packetevents.packetwrappers.in.clientcommand.WrappedPacketInClientCommand;
-import io.github.retrooper.packetevents.packetwrappers.in.custompayload.WrappedPacketInCustomPayload;
-import io.github.retrooper.packetevents.packetwrappers.in.entityaction.WrappedPacketInEntityAction;
-import io.github.retrooper.packetevents.packetwrappers.in.flying.WrappedPacketInFlying;
-import io.github.retrooper.packetevents.packetwrappers.in.helditemslot.WrappedPacketInHeldItemSlot;
-import io.github.retrooper.packetevents.packetwrappers.in.keepalive.WrappedPacketInKeepAlive;
-import io.github.retrooper.packetevents.packetwrappers.in.settings.WrappedPacketInSettings;
-import io.github.retrooper.packetevents.packetwrappers.in.steervehicle.WrappedPacketInSteerVehicle;
-import io.github.retrooper.packetevents.packetwrappers.in.transaction.WrappedPacketInTransaction;
-import io.github.retrooper.packetevents.packetwrappers.in.useentity.WrappedPacketInUseEntity;
-import io.github.retrooper.packetevents.packetwrappers.in.windowclick.WrappedPacketInWindowClick;
-import io.github.retrooper.packetevents.packetwrappers.out.abilities.WrappedPacketOutAbilities;
-import io.github.retrooper.packetevents.packetwrappers.out.animation.WrappedPacketOutAnimation;
-import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
-import io.github.retrooper.packetevents.packetwrappers.out.entity.WrappedPacketOutEntity;
-import io.github.retrooper.packetevents.packetwrappers.out.entityvelocity.WrappedPacketOutEntityVelocity;
-import io.github.retrooper.packetevents.packetwrappers.out.keepalive.WrappedPacketOutKeepAlive;
-import io.github.retrooper.packetevents.packetwrappers.out.kickdisconnect.WrappedPacketOutKickDisconnect;
-import io.github.retrooper.packetevents.packetwrappers.out.position.WrappedPacketOutPosition;
-import io.github.retrooper.packetevents.packetwrappers.out.transaction.WrappedPacketOutTransaction;
-import io.github.retrooper.packetevents.packetwrappers.out.updatehealth.WrappedPacketOutUpdateHealth;
-import org.bukkit.entity.Player;
-
-public class WrappedPacket {
-    public static ServerVersion version = null;
-    protected final Player player;
-    protected Object packet;
-
-    public WrappedPacket() {
-        this.player = null;
-        this.packet = null;
-    }
-
-    public WrappedPacket(final Object packet) {
-        this.player = null;
-        if (packet == null) return;
-        this.packet = packet;
-        try {
-            setup();
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public WrappedPacket(final Player player, final Object packet) {
-        this.player = player;
-        if (packet == null) return;
-        this.packet = packet;
-        try {
-            setup();
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void loadAllWrappers() {
-        //SERVER BOUND
-        WrappedPacketInAbilities.load();
-        WrappedPacketInArmAnimation.load();
-        WrappedPacketInBlockDig.load();
-        WrappedPacketInBlockPlace.load();
-        WrappedPacketInChat.load();
-        WrappedPacketInClientCommand.load();
-        WrappedPacketInCustomPayload.load();
-        WrappedPacketInEntityAction.load();
-        WrappedPacketInFlying.load();
-        WrappedPacketInHeldItemSlot.load();
-        WrappedPacketInKeepAlive.load();
-        WrappedPacketInSettings.load();
-        WrappedPacketInSteerVehicle.load();
-        WrappedPacketInTransaction.load();
-        WrappedPacketInUseEntity.load();
-        WrappedPacketInWindowClick.load();
-
-        //CLIENTBOUND
-        WrappedPacketOutAbilities.load();
-        WrappedPacketOutAnimation.load();
-        WrappedPacketOutChat.load();
-        WrappedPacketOutEntity.load();
-        WrappedPacketOutEntityVelocity.load();
-        WrappedPacketOutKeepAlive.load();
-        WrappedPacketOutKickDisconnect.load();
-        WrappedPacketOutPosition.load();
-        WrappedPacketOutTransaction.load();
-        WrappedPacketOutUpdateHealth.load();
-    }
-
-    protected void setup() {
-
-    }
-
-}
@@ -1,15 +1,36 @@
-/**
+/*
+ * 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.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.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;

 public final class WrappedPacketInAbilities extends WrappedPacket {
-    private static Class<?> abilitiesClass;
    private static boolean isMoreThanOneBoolPresent;
    private boolean isVulnerable;
    private boolean isFlying;
@@ -17,30 +38,26 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
    private boolean instantBuild;
    private float flySpeed;
    private float walkSpeed;
+
    public WrappedPacketInAbilities(Object packet) {
        super(packet);
    }

    public static void load() {
-        abilitiesClass = PacketTypeClasses.Client.ABILITIES;
-        isMoreThanOneBoolPresent = Reflection.getField(abilitiesClass, boolean.class, 1) != null;
+        isMoreThanOneBoolPresent = Reflection.getField(PacketTypeClasses.Client.ABILITIES, boolean.class, 1) != null;
    }

    @Override
    protected void setup() {
-        try {
-            if (isMoreThanOneBoolPresent) {
-                this.isVulnerable = Reflection.getField(abilitiesClass, boolean.class, 0).getBoolean(packet);
-                this.isFlying = Reflection.getField(abilitiesClass, boolean.class, 1).getBoolean(packet);
-                this.allowFly = Reflection.getField(abilitiesClass, boolean.class, 2).getBoolean(packet);
-                this.instantBuild = Reflection.getField(abilitiesClass, boolean.class, 3).getBoolean(packet);
-                this.flySpeed = Reflection.getField(abilitiesClass, float.class, 0).getFloat(packet);
-                this.walkSpeed = Reflection.getField(abilitiesClass, float.class, 1).getFloat(packet);
-            } else {
-                this.isFlying = Reflection.getField(abilitiesClass, boolean.class, 0).getBoolean(packet);
-            }
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+        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);
        }
    }

@@ -55,6 +72,7 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
        return isVulnerable;
    }

+    @NotNull
    public boolean isFlying() {
        return isFlying;
    }
@@ -1,12 +1,32 @@
-/**
+/*
+ * 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.in.armanimation;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;

-@Deprecated
 public final class WrappedPacketInArmAnimation extends WrappedPacket {
    private static Class<?> packetClass;

@@ -1,14 +1,36 @@
-/**
+/*
+ * 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.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.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+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 {
@@ -38,7 +60,7 @@ public final class WrappedPacketInBlockDig extends WrappedPacket {
                digTypeClass = NMSUtils.getNMSClass("EnumPlayerDigType");
            } catch (ClassNotFoundException e) {
                //It is probably a subclass
-                digTypeClass = Reflection.getSubClass(blockDigClass, "EnumPlayerDigType");
+                digTypeClass = SubclassUtil.getSubClass(blockDigClass, "EnumPlayerDigType");
            }
        }
    }
@@ -51,24 +73,24 @@ public final class WrappedPacketInBlockDig extends WrappedPacket {
        //1.7.10
        try {
            if (isVersionLowerThan_v_1_8) {
-                enumDigType = PlayerDigType.values()[(Reflection.getField(blockDigClass, int.class, 4).getInt(packet))];
-                x = Reflection.getField(blockDigClass, int.class, 0).getInt(packet);
-                y = Reflection.getField(blockDigClass, int.class, 1).getInt(packet);
-                z = Reflection.getField(blockDigClass, int.class, 2).getInt(packet);
+                enumDigType = PlayerDigType.values()[(readInt(4))];
+                x = readInt(0);
+                y = readInt(1);
+                z = readInt(2);
                enumDirection = null;
            } else {
                //1.8+
-                final Object blockPosObj = Reflection.getField(blockDigClass, blockPositionClass, 0).get(packet);
-                final Object enumDirectionObj = Reflection.getField(blockDigClass, enumDirectionClass, 0).get(packet);
-                final Object digTypeObj = Reflection.getField(blockDigClass, digTypeClass, 0).get(packet);
+                final Object blockPosObj = readObject(0, blockPositionClass);
+                final Object enumDirectionObj = readObject(0, enumDirectionClass);
+                final Object digTypeObj = readObject(0, digTypeClass);

-                Class<?> blockPosSuper = blockPositionClass;
-                x = Reflection.getField(blockPosSuper, int.class, 0).getInt(blockPosObj);
-                y = Reflection.getField(blockPosSuper, int.class, 1).getInt(blockPosObj);
-                z = Reflection.getField(blockPosSuper, int.class, 2).getInt(blockPosObj);
+                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);

-                enumDirection = Direction.valueOf(((Enum) enumDirectionObj).name());
-                enumDigType = PlayerDigType.valueOf(((Enum) digTypeObj).name());
+                //.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();
@@ -82,36 +104,65 @@ public final class WrappedPacketInBlockDig extends WrappedPacket {
        this.digType = enumDigType;
    }

+    /**
+     * Get X position of the block
+     * @return Block Position X
+     */
+    public int getBlockPositionX() {
+        return blockPosition.x;
+    }
+
+    /**
+     * Get Y position of the block
+     * @return Block Position Y
+     */
+    public int getBlockPositionY() {
+        return blockPosition.y;
+    }
+
+    /**
+     * 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;
    }

+    /**
+     * Get the direction
+     * Is Direction.NULL on 1.7.10 FOR NOW
+     * @return Direction
+     */
    public Direction getDirection() {
        return direction;
    }

+    /**
+     * Get the PlayerDigType enum sent in this packet.
+     * @return Dig Type
+     */
    public PlayerDigType getDigType() {
        return digType;
    }

    public enum PlayerDigType {
-
        START_DESTROY_BLOCK,
-
        ABORT_DESTROY_BLOCK,
-
        STOP_DESTROY_BLOCK,
-
        DROP_ALL_ITEMS,
-
        DROP_ITEM,
-
        RELEASE_USE_ITEM,
-
        SWAP_HELD_ITEMS,
-
        SWAP_ITEM_WITH_OFFHAND,
-
        WRONG_PACKET
    }

@@ -1,11 +1,32 @@
-/**
+/*
+ * 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.in.blockplace;

 import io.github.retrooper.packetevents.annotations.Nullable;
 import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.vector.Vector3i;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -55,14 +76,51 @@ public final class WrappedPacketInBlockPlace extends WrappedPacket {
        this.itemStack = itemStack;
    }

+    /**
+     * Get the player that placed the block
+     * @return Block placer
+     */
    public Player getPlayer() {
        return this.player;
    }

+    /**
+     * Get X position of the block
+     * @return Block Position X
+     */
+    public int getBlockPositionX() {
+        return blockPosition.x;
+    }
+
+    /**
+     * Get Y position of the block
+     * @return Block Position Y
+     */
+    public int getBlockPositionY() {
+        return blockPosition.y;
+    }
+
+    /**
+     * 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;
    }

+    /**
+     * The ItemStack of the placed block.
+     * @return ItemStack
+     */
    @Nullable
    public ItemStack getItemStack() {
        return itemStack;
@@ -1,9 +1,30 @@
-/**
+/*
+ * 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.in.blockplace;

-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+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;
@@ -1,12 +1,33 @@
-/**
+/*
+ * 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.in.blockplace;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.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 org.bukkit.inventory.ItemStack;

@@ -41,7 +62,7 @@ final class WrappedPacketInBlockPlace_1_8 extends WrappedPacket {
            this.blockPosition.z = (int) Reflection.getMethod(blockPositionSuperClass, "getZ", 0).invoke(nmsBlockPos);


-            this.itemStack = NMSUtils.toBukkitItemStack(Reflection.getField(blockPlaceClass, NMSUtils.nmsItemStackClass, 0).get(packet));
+            this.itemStack = NMSUtils.toBukkitItemStack(readObject(0, NMSUtils.nmsItemStackClass));
        } catch (IllegalAccessException | InvocationTargetException e) {
            e.printStackTrace();
        }
@@ -1,10 +1,31 @@
-/**
+/*
+ * 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.in.blockplace;


-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.BlockIteratorUtils;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -1,11 +1,31 @@
-/**
+/*
+ * 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.in.chat;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;

 public final class WrappedPacketInChat extends WrappedPacket {
    private static Class<?> chatPacketClass;
@@ -21,14 +41,13 @@ public final class WrappedPacketInChat extends WrappedPacket {

    @Override
    protected void setup() {
-        try {
-            final Object obj = Reflection.getField(chatPacketClass, String.class, 0).get(packet);
-            this.message = obj.toString();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        this.message = readString(0);
    }

+    /**
+     * Get the message.
+     * @return Chat Message
+     */
    public String getMessage() {
        return message;
    }
@@ -1,22 +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.packetwrappers.in.clientcommand;

-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.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;

-//TODO: Test on 1.9, 1.10, 1.11, 1.13, 1.14
 public final class WrappedPacketInClientCommand extends WrappedPacket {
    private static Class<?> packetClass;
-    @Nullable
    private static Class<?> enumClientCommandClass;
-
-    private static boolean isLowerThan_v_1_8;
    private ClientCommand clientCommand;

    public WrappedPacketInClientCommand(Object packet) {
@@ -26,28 +41,25 @@ public final class WrappedPacketInClientCommand extends WrappedPacket {
    public static void load() {
        packetClass = PacketTypeClasses.Client.CLIENT_COMMAND;

-        isLowerThan_v_1_8 = version.isLowerThan(ServerVersion.v_1_8);
        try {
-            if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-                enumClientCommandClass = Reflection.getSubClass(packetClass, "EnumClientCommand");
-            } else {
-                enumClientCommandClass = NMSUtils.getNMSClass("EnumClientCommand");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
+            enumClientCommandClass = NMSUtils.getNMSClass("EnumClientCommand");
+        } catch (ClassNotFoundException e) {
+            //Probably a subclass
+            enumClientCommandClass = SubclassUtil.getSubClass(packetClass, "EnumClientCommand");
        }
    }

    @Override
    public void setup() {
-        try {
-            Object enumObj = Reflection.getField(packetClass, enumClientCommandClass, 0).get(packet);
-            this.clientCommand = ClientCommand.valueOf(enumObj.toString());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        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;
    }
@@ -1,13 +1,34 @@
-/**
+/*
+ * 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.in.custompayload;

 import io.github.retrooper.packetevents.annotations.Nullable;
 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;

 import java.lang.reflect.Field;

@@ -33,19 +54,15 @@ public final class WrappedPacketInCustomPayload extends WrappedPacket {
            //Only on 1.13+
            nmsMinecraftKey = NMSUtils.getNMSClass("MinecraftKey");
        } catch (ClassNotFoundException e) {
-            //Its okay, this means they are on versions 1.7.10 ~ 1.12.2
+            //Its okay, this means they are on versions 1.7.10 - 1.12.2
        }
    }

    @Override
    public void setup() {
        if (!strPresentInIndex0) {
-            try {
-                this.minecraftKey = Reflection.getField(packetClass, nmsMinecraftKey, 0).get(packet);
-                this.dataSerializer = Reflection.getField(packetClass, nmsPacketDataSerializer, 0).get(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
+            this.minecraftKey = readObject(0, nmsMinecraftKey);
+            this.dataSerializer = readObject(0, nmsPacketDataSerializer);

        } else {
            Field dataSerializerField = Reflection.getField(packetClass, nmsPacketDataSerializer, 0);
@@ -62,14 +79,27 @@ public final class WrappedPacketInCustomPayload extends WrappedPacket {
        }
    }

+    /**
+     * Get the data
+     * @return String data
+     */
    public String getData() {
        return data;
    }

+    /**
+     * Get the minecraft key
+     * @return Minecraft Key object
+     */
    public Object getMinecraftKey() {
        return minecraftKey;
    }

+
+    /**
+     * Get the data serializer
+     * @return Data Serializer object
+     */
    @Nullable
    public Object getDataSerializer() {
        return dataSerializer;
@@ -1,14 +1,34 @@
-/**
+/*
+ * 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.in.entityaction;

 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.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;
 import org.bukkit.entity.Entity;

 import java.util.HashMap;
@@ -24,15 +44,16 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
    private int entityId;
    private PlayerAction action;
    private int jumpBoost;
+
    public WrappedPacketInEntityAction(final Object packet) {
        super(packet);
    }

    public static void load() {
-        entityActionClass = PacketTypeClasses.Client.ENTITY_ACTION;
+        entityActionClass = NMSUtils.getNMSClassWithoutException("PacketPlayInEntityAction");
        isLowerThan_v_1_8 = version.isLowerThan(ServerVersion.v_1_8);
-        if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-            enumPlayerActionClass = Reflection.getSubClass(entityActionClass, "EnumPlayerAction");
+        if (!isLowerThan_v_1_8) {
+            enumPlayerActionClass = SubclassUtil.getSubClass(entityActionClass, "EnumPlayerAction");
        }
        //All the already existing values
        for (PlayerAction val : PlayerAction.values()) {
@@ -55,45 +76,66 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {

    @Override
    protected void setup() {
-        try {
-            final int entityId = Reflection.getField(entityActionClass, int.class, 0).getInt(packet);
-            final int jumpBoost;
-            if (isLowerThan_v_1_8) {
-                jumpBoost = Reflection.getField(entityActionClass, int.class, 2).getInt(packet);
-            } else {
-                jumpBoost = Reflection.getField(entityActionClass, int.class, 1).getInt(packet);
-            }
-
-            //1.7.10
-            if (isLowerThan_v_1_8) {
-                int animationIndex = Reflection.getField(entityActionClass, int.class, 1).getInt(packet); // TODO: += if packetdataserializer.version < 16
-                this.action = cachedPlayerActionIDs.get(animationIndex);
-            } else {
-                final Object enumObj = Reflection.getField(entityActionClass, enumPlayerActionClass, 0).get(packet);
-                final String enumName = enumObj.toString();
-                this.action = cachedPlayerActionNames.get(enumName);
-            }
-
-
-            this.entityId = entityId;
-            this.jumpBoost = jumpBoost;
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+        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.
+     *
+     * @return Entity
+     */
    public Entity getEntity() {
-        return NMSUtils.getEntityById(this.entityId);
+        if(entity == null) {
+            return entity = NMSUtils.getEntityById(this.entityId);
+        }
+        return entity;
    }

+    /**
+     * 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;
    }

+    /**
+     * Get the player action.
+     *
+     * @return Player Action
+     */
    public PlayerAction getAction() {
        return action;
    }

+    /**
+     * Get the jump boost integer.
+     *
+     * @return Jump Boost
+     */
    public int getJumpBoost() {
        return jumpBoost;
    }
@@ -1,23 +1,43 @@
-/**
+/*
+ * 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.in.flying;


 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;

 public class WrappedPacketInFlying extends WrappedPacket {
    private static Class<?> flyingClass;
-    protected double x;
-    protected double y;
-    protected double z;
-    protected float yaw;
-    protected float pitch;
-    protected boolean onGround;
-    protected boolean isPosition;
-    protected boolean isLook;
+    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);
    }
@@ -28,45 +48,40 @@ public class WrappedPacketInFlying extends WrappedPacket {

    @Override
    protected void setup() {
-        try {
-            //x, y, z, yaw pitch, onGround, isPosition, isLook
-            this.x = Reflection.getField(flyingClass, double.class, 0).getDouble(packet);
-            this.y = Reflection.getField(flyingClass, double.class, 1).getDouble(packet);
-            this.z = Reflection.getField(flyingClass, double.class, 2).getDouble(packet);
+        x = readDouble(0);
+        y = readDouble(1);
+        z = readDouble(2);

-            this.yaw = Reflection.getField(flyingClass, float.class, 0).getFloat(packet);
-            this.pitch = Reflection.getField(flyingClass, float.class, 1).getFloat(packet);
+        yaw = readFloat(0);
+        pitch = readFloat(1);

-            this.onGround = Reflection.getField(flyingClass, boolean.class, 0).getBoolean(packet);
+        onGround = readBoolean(0);

-            this.isPosition = Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
-            this.isLook = Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        isPosition = readBoolean(1);
+        isLook = readBoolean(2);
    }

-    public final double getX() {
+    public double getX() {
        return x;
    }

-    public final double getY() {
+    public double getY() {
        return y;
    }

-    public final double getZ() {
+    public double getZ() {
        return z;
    }

-    public final float getYaw() {
+    public float getYaw() {
        return yaw;
    }

-    public final float getPitch() {
+    public float getPitch() {
        return pitch;
    }

-    public final boolean isOnGround() {
+    public boolean isOnGround() {
        return onGround;
    }

@@ -78,82 +93,4 @@ public class WrappedPacketInFlying extends WrappedPacket {
        return isLook;
    }

-    public static class WrappedPacketInPosition extends WrappedPacketInFlying {
-
-        public WrappedPacketInPosition(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        protected void setup() {
-            try {
-                this.x = Reflection.getField(flyingClass, double.class, 0).getDouble(packet);
-                this.y = Reflection.getField(flyingClass, double.class, 1).getDouble(packet);
-                this.z = Reflection.getField(flyingClass, double.class, 2).getDouble(packet);
-
-                this.yaw = Reflection.getField(flyingClass, float.class, 0).getFloat(packet);
-                this.pitch = Reflection.getField(flyingClass, float.class, 1).getFloat(packet);
-
-                this.onGround = Reflection.getField(flyingClass, boolean.class, 0).getBoolean(packet);
-
-                this.isPosition = Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
-                this.isLook = Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static class WrappedPacketInPosition_Look extends WrappedPacketInFlying {
-
-        public WrappedPacketInPosition_Look(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        protected void setup() {
-            try {
-                this.x = Reflection.getField(flyingClass, double.class, 0).getDouble(packet);
-                this.y = Reflection.getField(flyingClass, double.class, 1).getDouble(packet);
-                this.z = Reflection.getField(flyingClass, double.class, 2).getDouble(packet);
-
-                this.yaw = Reflection.getField(flyingClass, float.class, 0).getFloat(packet);
-                this.pitch = Reflection.getField(flyingClass, float.class, 1).getFloat(packet);
-
-                this.onGround = Reflection.getField(flyingClass, boolean.class, 0).getBoolean(packet);
-
-                this.isPosition = Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
-                this.isLook = Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static class WrappedPacketInLook extends WrappedPacketInFlying {
-
-        public WrappedPacketInLook(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        protected void setup() {
-            try {
-                this.x = Reflection.getField(flyingClass, double.class, 0).getDouble(packet);
-                this.y = Reflection.getField(flyingClass, double.class, 1).getDouble(packet);
-                this.z = Reflection.getField(flyingClass, double.class, 2).getDouble(packet);
-
-                this.yaw = Reflection.getField(flyingClass, float.class, 0).getFloat(packet);
-                this.pitch = Reflection.getField(flyingClass, float.class, 1).getFloat(packet);
-
-                this.onGround = Reflection.getField(flyingClass, boolean.class, 0).getBoolean(packet);
-
-                this.isPosition = Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
-                this.isLook = Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
 }
@@ -1,11 +1,31 @@
-/**
+/*
+ * 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.in.helditemslot;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;

 public final class WrappedPacketInHeldItemSlot extends WrappedPacket {
    private static Class<?> packetClass;
@@ -22,12 +42,16 @@ public final class WrappedPacketInHeldItemSlot extends WrappedPacket {
    @Override
    public void setup() {
        try {
-            itemInHandIndex = Reflection.getField(packetClass, int.class, 0).getInt(packet);
+            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;
    }
@@ -1,11 +1,32 @@
-/**
+/*
+ * 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.in.keepalive;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;

 public final class WrappedPacketInKeepAlive extends WrappedPacket {
    private static Class<?> packetClass;
@@ -24,25 +45,18 @@ public final class WrappedPacketInKeepAlive extends WrappedPacket {
    @Override
    protected void setup() {
        if (!integerPresentInIndex0) {
-            try {
-                this.id = Reflection.getField(packetClass, long.class, 0).getLong(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
+            this.id = readLong(0);
        } else {
-            try {
-                this.id = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
+            this.id = readInt(0);
        }
    }

    /**
-     * Optionally Cast this long to an integer if you are using 1.7.10 -&gt; 1.12.2!
-     * In 1.13.2 -&gt; 1.16.1 a long is sent
+     * Get the ID response from the client.
     *
-     * @return response is
+     * 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 response ID
     */
    public long getId() {
        return id;
@@ -1,14 +1,35 @@
-/**
+/*
+ * 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.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.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.reflection.SubclassUtil;

 import java.util.HashMap;

@@ -18,10 +39,11 @@ public class WrappedPacketInSettings extends WrappedPacket {

    private static boolean isLowerThan_v_1_8;
    private String locale;
-    private byte viewDistance;
+    private int viewDistance;
    private ChatVisibility chatVisibility;
    private boolean chatColors;
    private HashMap<DisplayedSkinPart, Boolean> displayedSkinParts;
+
    public WrappedPacketInSettings(final Object packet) {
        super(packet);
    }
@@ -36,7 +58,8 @@ public class WrappedPacketInSettings extends WrappedPacket {
        } catch (ClassNotFoundException e) {
            Class<?> entityHumanClass = NMSUtils.getNMSClassWithoutException("EntityHuman");
            //They are just on an outdated version
-            chatVisibilityEnumClass = Reflection.getSubClass(entityHumanClass, "EnumChatVisibility");
+            assert entityHumanClass != null;
+            chatVisibilityEnumClass = SubclassUtil.getSubClass(entityHumanClass, "EnumChatVisibility");
        }
    }

@@ -48,12 +71,12 @@ public class WrappedPacketInSettings extends WrappedPacket {
    protected void setup() {
        try {
            //LOCALE
-            this.locale = Reflection.getField(packetClass, String.class, 0).get(packet).toString();
+            this.locale = readString(0);
            //VIEW DISTANCE
-            this.viewDistance = (byte) Reflection.getField(packetClass, int.class, 0).getInt(packet);
+            this.viewDistance = readInt(0);

            //CHAT VISIBILITY
-            Object chatVisibilityEnumObject = Reflection.getField(packetClass, chatVisibilityEnumClass, 0).get(packet);
+            Object chatVisibilityEnumObject = readObject(0, chatVisibilityEnumClass);
            String enumValueAsString = chatVisibilityEnumObject.toString();
            if (enumValueAsString.equals("FULL")) {
                chatVisibility = ChatVisibility.ENABLED;
@@ -64,18 +87,18 @@ public class WrappedPacketInSettings extends WrappedPacket {
            }

            //CHAT COLORS
-            this.chatColors = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
+            this.chatColors = readBoolean(0);

            //DISPLAYED SKIN PARTS
            this.displayedSkinParts = new HashMap<DisplayedSkinPart, Boolean>();

            if (isLowerThan_v_1_8) {
                //in 1.7.10 only the cape display skin part is sent
-                boolean capeEnabled = Reflection.getField(packetClass, boolean.class, 1).getBoolean(packet);
+                boolean capeEnabled = readBoolean(1);
                displayedSkinParts.put(DisplayedSkinPart.CAPE, capeEnabled);
            } else {
                //in 1.8, all the skin parts are sent
-                int skinPartFlags = Reflection.getField(packetClass, int.class, 1).getInt(packet);
+                int skinPartFlags = readInt(1);
                displayedSkinParts.put(DisplayedSkinPart.CAPE, (skinPartFlags & 0x01) != 0);
                displayedSkinParts.put(DisplayedSkinPart.JACKET, (skinPartFlags & 0x02) != 0);
                displayedSkinParts.put(DisplayedSkinPart.LEFT_SLEEVE, (skinPartFlags & 0x04) != 0);
@@ -91,28 +114,50 @@ public class WrappedPacketInSettings extends WrappedPacket {

    }

+    /**
+     * Get language client setting
+     *
+     * @return String Locale
+     */
    public String getLocale() {
        return locale;
    }

-    public byte getViewDistance() {
+    /**
+     * 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 associating skin parts with whether or not they are enabled.
+     * @return A map with a Skin Parts as a key, and a boolean as a value.
     */
    @Nullable
    public HashMap<DisplayedSkinPart, Boolean> getDisplayedSkinPartsMap() {
@@ -120,11 +165,13 @@ public class WrappedPacketInSettings extends WrappedPacket {
    }

    /**
+     * Is the skin part enabled.
+     * <p>
     * On 1.7.10, some skin parts will default to 'false' as 1.7.10
     * only sends the 'cape' skin part.
     *
     * @param part The skin part to check the status of.
-     * @return True if the specified skin part is enabled, otherwise false.
+     * @return Is the skin part enabled
     */
    public boolean isDisplaySkinPartEnabled(DisplayedSkinPart part) {
        //1.7.10, we will default the other skin parts to return false.
@@ -134,10 +181,16 @@ public class WrappedPacketInSettings extends WrappedPacket {
        return displayedSkinParts.get(part);
    }

+    /**
+     * Enum for the client chat visibility setting
+     */
    public enum ChatVisibility {
        ENABLED, COMMANDS_ONLY, HIDDEN
    }

+    /**
+     * Enum for the client displayed skin parts settings
+     */
    public enum DisplayedSkinPart {
        CAPE, JACKET, LEFT_SLEEVE, RIGHT_SLEEVE, LEFT_PANTS, RIGHT_PANTS, HAT
    }
@@ -1,11 +1,31 @@
-/**
+/*
+ * 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.in.steervehicle;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;

 public class WrappedPacketInSteerVehicle extends WrappedPacket {
    private static Class<?> packetClass;
@@ -21,31 +41,45 @@ public class WrappedPacketInSteerVehicle extends WrappedPacket {

    @Override
    protected void setup() {
-        try {
-            this.side = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-            this.forward = Reflection.getField(packetClass, float.class, 1).getFloat(packet);
+        this.side = readFloat(0);
+        this.forward = readFloat(1);

-            this.jump = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-            this.unmount = Reflection.getField(packetClass, boolean.class, 1).getBoolean(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        this.jump = readBoolean(0);
+        this.unmount = readBoolean(1);
    }

-    //Positive side value means left, negative means right
+    /**
+     * Get the side value.
+     *
+     * If positive, they are moving to the left, if negative, they are moving to the right.
+     * @return Side Value
+     */
    public float getSideValue() {
        return side;
    }

-    //Positive forward value means forward, negative is backwards
+    /**
+     * Get the forward value.
+     *
+     * If positive, they are moving forward, if negative, they are moving backwards.
+     * @return Forward Value
+     */
    public float getForwardValue() {
        return forward;
    }

+    /**
+     * Is a Jump
+     * @return Is Jump
+     */
    public boolean isJump() {
        return jump;
    }

+    /**
+     * Is an unmount
+     * @return Is Unmounting
+     */
    public boolean isUnmount() {
        return unmount;
    }
@@ -1,11 +1,31 @@
-/**
+/*
+ * 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.in.transaction;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;

 public final class WrappedPacketInTransaction extends WrappedPacket {
    private static Class<?> packetClass;
@@ -22,24 +42,31 @@ public final class WrappedPacketInTransaction extends WrappedPacket {

    @Override
    protected void setup() {
-        try {
-            this.windowId = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-            this.actionNumber = Reflection.getField(packetClass, short.class, 0).getShort(packet);
-            this.accepted = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
+        this.windowId = readInt(0);
+        this.actionNumber = readShort(0);
+        this.accepted = readBoolean(0);
    }

+    /**
+     * Get the window ID.
+     * @return Window ID
+     */
    public int getWindowId() {
        return windowId;
    }

+    /**
+     * Get the action number.
+     * @return Action number
+     */
    public short getActionNumber() {
        return actionNumber;
    }

+    /**
+     * Is transaction accepted.
+     * @return Transaction Accepted
+     */
    public boolean isAccepted() {
        return accepted;
    }
@@ -0,0 +1,106 @@
+/*
+ * 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.in.updatesign;
+
+import io.github.retrooper.packetevents.packet.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;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+
+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;
+
+    public static void load() {
+        v_1_7_mode = Reflection.getField(PacketTypeClasses.Client.UPDATE_SIGN, int.class, 0) != null;
+        strArrayMode = Reflection.getField(PacketTypeClasses.Client.UPDATE_SIGN, String[].class, 0) != null;
+
+        try {
+            blockPosClass = NMSUtils.getNMSClass("BlockPosition");
+        } catch (ClassNotFoundException e) {
+            if (!v_1_7_mode) {
+                e.printStackTrace();
+            }
+        }
+        try {
+            iChatBaseComponentClass = NMSUtils.getNMSClass("IChatBaseComponent");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public WrappedPacketInUpdateSign(Object packet) {
+        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();
+            }
+        }
+        if (strArrayMode) {
+            //1.7.10 and the newest versions use this
+            lines = readStringArray(0);
+        } else {
+            //1.8 uses this for example
+            Object[] iChatComponents = readObjectArray(0, iChatBaseComponentClass);
+            for (int i = 0; i < iChatComponents.length; i++) {
+                lines[i] = WrappedPacketOutChat.
+                        toStringFromIChatBaseComponent(iChatComponents[i]);
+            }
+        }
+    }
+
+    public int getBlockPositionX() {
+        return x;
+    }
+
+    public int getBlockPositionY() {
+        return y;
+    }
+
+    public int getBlockPositionZ() {
+        return z;
+    }
+
+    public String[] getTextLines() {
+        return lines;
+    }
+}
@@ -1,53 +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.in.useentity;

-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+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 int entityId;
+    private Entity entity;
+    private int entityID;
    private EntityUseAction action;
    public WrappedPacketInUseEntity(final Object packet) {
        super(packet);
    }

    public static void load() {
-        useEntityClass = PacketTypeClasses.Client.USE_ENTITY;
-
+        //System.out.println("USE ENTITY HAS BEEN LOADED BROOOIOII");
+        useEntityClass = NMSUtils.getNMSClassWithoutException("PacketPlayInUseEntity");
+        /*if(useEntityClass == null) {
+            System.out.println("failed to init use entity wtfffff");
+        }*/
        try {
            enumEntityUseActionClass = NMSUtils.getNMSClass("EnumEntityUseAction");
        } catch (ClassNotFoundException e) {
            //That is fine, it is probably a subclass
-            enumEntityUseActionClass = Reflection.getSubClass(useEntityClass, "EnumEntityUseAction");
+            enumEntityUseActionClass = SubclassUtil.getSubClass(useEntityClass, "EnumEntityUseAction");
        }
    }

    @Override
    protected void setup() {
-        try {
-            this.entityId = Reflection.getField(useEntityClass, int.class, 0).getInt(packet);
-            final Object useActionEnum = Reflection.getField(useEntityClass, enumEntityUseActionClass, 0).get(packet);
-            this.action = EntityUseAction.valueOf(useActionEnum.toString());
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+        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.
+     * @return Entity
+     */
    public Entity getEntity() {
-        return NMSUtils.getEntityById(this.entityId);
+        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;
+        return entityID;
    }

+    /**
+     * Get the associated action.
+     * @return Get EntityUseAction
+     */
    public EntityUseAction getAction() {
        return action;
    }
@@ -1,13 +1,33 @@
-/**
+/*
+ * 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.in.windowclick;

-import io.github.retrooper.packetevents.annotations.Nullable;
 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 import org.bukkit.inventory.ItemStack;

 import java.util.ArrayList;
@@ -93,42 +113,57 @@ public class WrappedPacketInWindowClick extends WrappedPacket {

    @Override
    protected void setup() {
-        try {
-            this.id = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-            this.slot = Reflection.getField(packetClass, int.class, 1).getInt(packet);
-            this.button = Reflection.getField(packetClass, int.class, 2).getInt(packet);
-            this.actionNumber = Reflection.getField(packetClass, short.class, 0).getShort(packet);
-            Object nmsItemStack = Reflection.getField(packetClass, NMSUtils.nmsItemStackClass, 0).get(packet);
-            this.clickedItem = NMSUtils.toBukkitItemStack(nmsItemStack);
-            Object clickMode = Reflection.getField(packetClass, 5).get(packet);
+        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());
-            }
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+        if (isClickModePrimitive) {
+            mode = (int) clickMode;
+        } else {
+            mode = invClickTypeMapCache.get(clickMode.toString());
        }
    }

+    /**
+     * Get the Window ID.
+     * @return Get Window ID
+     */
    public int getWindowID() {
        return id;
    }

+    /**
+     * Get the Window slot.
+     * @return Get Window Slot
+     */
    public int getWindowSlot() {
        return slot;
    }

+    /**
+     * Get the Window button.
+     * @return Get Window Button
+     */
    public int getWindowButton() {
        return button;
    }

+    /**
+     * Get the action number.
+     * @return Get Action Number
+     */
    public short getActionNumber() {
        return actionNumber;
    }

-    @Nullable
+    /**
+     * Get the window click type.
+     * @return Get Window Click Type
+     */
    public WindowClickType getWindowClickType() {
        if (windowClickTypeCache.get(mode) == null) {
            return WindowClickType.UNKNOWN;
@@ -149,10 +184,18 @@ public class WrappedPacketInWindowClick extends WrappedPacket {
        return windowClickTypeCache.get(mode).get(button);
    }

+    /**
+     * Get the Window mode.
+     * @return Get Window Mode.
+     */
    public int getMode() {
        return mode;
    }

+    /**
+     * Get the clicked item.
+     * @return Get Clicked ItemStack
+     */
    public ItemStack getClickedItem() {
        return clickedItem;
    }
@@ -1,10 +1,31 @@
-/**
+/*
+ * 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.abilities;

-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;

 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -1,17 +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.packetwrappers.out.abilities;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;

 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

-public final class WrappedPacketOutAbilities extends WrappedPacket implements Sendable {
+public final class WrappedPacketOutAbilities extends WrappedPacket implements SendableWrapper {
    private static Class<?> packetClass;
    private static Constructor<?> packetConstructor;
    private boolean vulnerable, flying, allowFlight, instantBuild;
@@ -43,40 +63,59 @@ public final class WrappedPacketOutAbilities extends WrappedPacket implements Se

    @Override
    protected void setup() {
-        try {
-            this.vulnerable = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-            this.flying = Reflection.getField(packetClass, boolean.class, 1).getBoolean(packet);
-            this.allowFlight = Reflection.getField(packetClass, boolean.class, 2).getBoolean(packet);
-            this.instantBuild = Reflection.getField(packetClass, boolean.class, 3).getBoolean(packet);
-
-            this.flySpeed = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-            this.walkSpeed = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        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;
    }

+    /**
+     * Should the client be flying?
+     * @return Is Flying
+     */
    public boolean isFlying() {
        return flying;
    }

+    /**
+     * Should the client be allowed to fly?
+     * @return Is Allowed To Fly
+     */
    public boolean isFlightAllowed() {
        return allowFlight;
    }

+    /**
+     * Should the client be able to build instantly?
+     * @return Is Allowed To Build Instantly
+     */
    public boolean canInstantlyBuild() {
        return instantBuild;
    }

+    /**
+     * Get the client's defined fly speed.
+     * @return Get Fly Speed
+     */
    public float getFlySpeed() {
        return flySpeed;
    }

+    /**
+     * Get the client's defined walk speed.
+     * @return Get Walk Speed
+     */
    public float getWalkSpeed() {
        return walkSpeed;
    }
@@ -1,20 +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.out.animation;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import 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;
 import java.util.HashMap;

-public final class WrappedPacketOutAnimation extends WrappedPacket implements Sendable {
+public final class WrappedPacketOutAnimation extends WrappedPacket implements SendableWrapper {
    private static Class<?> animationClass, nmsEntityClass;
    private static Constructor<?> animationConstructor;

@@ -64,26 +84,33 @@ public final class WrappedPacketOutAnimation extends WrappedPacket implements Se

    @Override
    protected void setup() {
-        try {
-            //a - ID
-            //b - TYPE
-            this.entityID = Reflection.getField(animationClass, int.class, 0).getInt(packet);
-            int animationID = Reflection.getField(animationClass, int.class, 1).getInt(packet);
-            this.type = cachedAnimationIDS.get(animationID);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
+        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);
    }

+    /**
+     * 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 this.entityID;
+        return entityID;
    }

+    /**
+     * Get the entity animation type.
+     * @return Get Entity Animation Type
+     */
    public EntityAnimationType getAnimationType() {
        return type;
    }
@@ -1,14 +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.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.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import 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.SubclassUtil;

 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -20,7 +43,7 @@ import java.util.UUID;
 * This wrapper MIGHT not be stable
 */
@Beta
-public final class WrappedPacketOutChat extends WrappedPacket implements Sendable {
+public final class WrappedPacketOutChat extends WrappedPacket implements SendableWrapper {
    private static Constructor<?> chatClassConstructor;
    private static Class<?> packetClass, iChatBaseComponentClass, chatSerializerClass, chatMessageTypeEnum;
    private static Method chatMessageTypeCreatorMethod;
@@ -40,6 +63,12 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
    private ChatPosition chatPosition;
    private UUID uuid;

+
+    @Deprecated
+    public WrappedPacketOutChat(String message) {
+        this(message, null);
+    }
+
    public WrappedPacketOutChat(final Object packet) {
        super(packet);
    }
@@ -49,7 +78,6 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
    }

    public WrappedPacketOutChat(String message, ChatPosition chatPosition, UUID uuid) {
-        super();
        this.uuid = uuid;
        this.message = message;
        this.chatPosition = chatPosition;
@@ -73,7 +101,7 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
            chatSerializerClass = NMSUtils.getNMSClass("ChatSerializer");
        } catch (ClassNotFoundException e) {
            //That is fine, it is probably a subclass
-            chatSerializerClass = Reflection.getSubClass(iChatBaseComponentClass, "ChatSerializer");
+            chatSerializerClass = SubclassUtil.getSubClass(iChatBaseComponentClass, "ChatSerializer");
        }


@@ -131,7 +159,7 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
    }

    public static String fromStringToJSON(String message) {
-        return "{\"text\": \"" + "use entity action name: " + message + "\"}";
+        return "{\"text\": \"" + message + "\"}";
    }

    public static String toStringFromIChatBaseComponent(Object obj) {
@@ -156,7 +184,7 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
    @Override
    protected void setup() {
        try {
-            final Object iChatBaseObj = Reflection.getField(packetClass, iChatBaseComponentClass, 0).get(packet);
+            final Object iChatBaseObj = readObject(0, iChatBaseComponentClass);

            final Object contentString = Reflection.getMethod(iChatBaseComponentClass, String.class, 0).invoke(iChatBaseObj);

@@ -165,14 +193,14 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
            byte chatPosInteger = 0;
            switch (constructorMode) {
                case 0:
-                    chatPosInteger = Reflection.getField(packetClass, byte.class, 0).getByte(packet);
+                    chatPosInteger = readByte(0);
                    break;
                case 1:
-                    chatPosInteger = (byte) Reflection.getField(packetClass, int.class, 0).getInt(packet);
+                    chatPosInteger = (byte) readInt(0);
                    break;
                case 2:
                case 3:
-                    Object chatTypeEnumInstance = Reflection.getField(packetClass, chatMessageTypeEnum, 0).get(packet);
+                    Object chatTypeEnumInstance = readObject(0, chatMessageTypeEnum);
                    chatPosInteger = cachedChatMessageTypeIntegers.get(chatTypeEnumInstance.toString());
                    break;
            }
@@ -234,10 +262,22 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
        return null;
    }

+    /**
+     * Get the message.
+     * @return Get String Message
+     */
    public String getMessage() {
        return this.message;
    }

+    /**
+     * Get the chat position.
+     *
+     * On 1.7.10, Only CHAT and SYSTEM_MESSAGE exist.
+     * 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;
@@ -0,0 +1,167 @@
+/*
+ * 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.custompayload;
+
+import io.github.retrooper.packetevents.packet.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 java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+class WrappedPacketOutCustomPayload extends WrappedPacket implements SendableWrapper {
+//TODO load the outcustompayload wrapper
+
+    private static Class<?> packetClass;
+    private static Constructor<?> constructor;
+    private static Constructor<?> packetDataSerializerConstructor;
+    private static Constructor<?> minecraftKeyConstructor;
+    private static Class<?> byteBufClass;
+    private static Class<?> unpooledClass;
+    private static Class<?> packetDataSerializerClass;
+    private static Class<?> minecraftKeyClass;
+
+    private static byte constructorMode = 1;
+
+    public static void load() {
+        packetClass = PacketTypeClasses.Server.CUSTOM_PAYLOAD;
+        packetDataSerializerClass = NMSUtils.getNMSClassWithoutException("PacketDataSerializer");
+        minecraftKeyClass = NMSUtils.getNMSClassWithoutException("MinecraftKey");
+
+        try {
+            unpooledClass = NMSUtils.getNettyClass("buffer.Unpooled");
+            byteBufClass = NMSUtils.getNettyClass("buffer.ByteBuf");
+        } catch (ClassNotFoundException e) {
+
+        }
+        try {
+            packetDataSerializerConstructor = packetDataSerializerClass.getConstructor(NMSUtils.getNettyClass("ByteBuf"));
+        } catch (NullPointerException e) {
+            //Nothing
+        } catch (NoSuchMethodException | ClassNotFoundException e) {
+            //also nothing
+        }
+
+        try {
+            minecraftKeyConstructor = minecraftKeyClass.getConstructor(String.class);
+        } catch (NoSuchMethodException e) {
+            //Nothing
+        }
+
+        //Constructors:
+
+        //String, byte[]
+
+        //String, PacketDataSerializer
+
+        //MinecraftKey, PacketDataSerializer
+        try {
+            //1.7 constructor
+            constructor = packetClass.getConstructor(String.class, byte[].class);
+            constructorMode = 0;
+        } catch (NoSuchMethodException e) {
+            //That's fine, just a newer version
+            try {
+                constructor = packetClass.getConstructor(String.class, packetDataSerializerClass);
+                constructorMode = 1;
+            } catch (NoSuchMethodException e2) {
+                //That's fine, just an even newer version
+                try {
+                    constructor = packetClass.getConstructor(minecraftKeyClass, packetDataSerializerClass);
+                    constructorMode = 2;
+                } catch (NoSuchMethodException e3) {
+                    throw new IllegalStateException("PacketEvents is unable to resolve the PacketPlayOutCustomPayload constructor.");
+                }
+            }
+        }
+    }
+
+    private String tag;
+    private byte[] data;
+
+    public WrappedPacketOutCustomPayload(String tag, byte[] data) {
+        this.tag = tag;
+        this.data = data;
+    }
+
+
+    /*    public WrappedPacketOutCustomPayload(Object packet) {
+            super(packet);
+        }
+
+        @Override
+        protected void setup() {
+
+        }
+    */
+    public String getTag() {
+        return tag;
+    }
+
+    public byte[] getData() {
+        return data;
+    }
+
+    @Override
+    public Object asNMSPacket() {
+        Object byteBufObject = null;
+        try {
+            byteBufObject = Reflection.getMethod(unpooledClass, "copiedBuffer", 0).invoke(null, data);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        switch (constructorMode) {
+            case 0:
+                try {
+                    return constructor.newInstance(tag, data);
+                } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                break;
+            case 1:
+                try {
+                    Object dataSerializer = packetDataSerializerConstructor.newInstance(byteBufObject);
+                    return constructor.newInstance(tag, dataSerializer);
+                } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                break;
+            case 2:
+
+                try {
+                    Object minecraftKey = minecraftKeyConstructor.newInstance(tag);
+                    Object dataSerializer = packetDataSerializerConstructor.newInstance(byteBufObject);
+                    return constructor.newInstance(minecraftKey, dataSerializer);
+                } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                break;
+        }
+        return null;
+    }
+}
@@ -1,12 +1,33 @@
-/**
+/*
+ * 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.entity;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 import org.bukkit.entity.Entity;

 import java.lang.reflect.Field;
@@ -16,10 +37,12 @@ public class WrappedPacketOutEntity extends WrappedPacket {
    //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 Entity entity;
    private int entityID;
    private double deltaX, deltaY, deltaZ;
    private byte yaw, pitch;
    private boolean onGround;
+
    public WrappedPacketOutEntity(Object packet) {
        super(packet);
    }
@@ -47,70 +70,406 @@ public class WrappedPacketOutEntity extends WrappedPacket {

    @Override
    protected void setup() {
-        try {
-            this.entityID = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-            this.onGround = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-            int dX = 1, dY = 1, dZ = 1;
-            switch (mode) {
-                case 0:
-                    dX = Reflection.getField(packetClass, byte.class, 0).getByte(packet);
-                    dY = Reflection.getField(packetClass, byte.class, 1).getByte(packet);
-                    dZ = Reflection.getField(packetClass, byte.class, 2).getByte(packet);
-                    this.yaw = Reflection.getField(packetClass, byte.class, 3).getByte(packet);
-                    this.pitch = Reflection.getField(packetClass, byte.class, 4).getByte(packet);
-                    break;
-                case 1:
-                    dX = Reflection.getField(packetClass, int.class, 1).getInt(packet);
-                    dY = Reflection.getField(packetClass, int.class, 2).getInt(packet);
-                    dZ = Reflection.getField(packetClass, int.class, 3).getInt(packet);
-                    this.yaw = Reflection.getField(packetClass, byte.class, 0).getByte(packet);
-                    this.pitch = Reflection.getField(packetClass, byte.class, 1).getByte(packet);
-                    break;
-                case 2:
-                    dX = Reflection.getField(packetClass, short.class, 0).getShort(packet);
-                    dY = Reflection.getField(packetClass, short.class, 1).getShort(packet);
-                    dZ = Reflection.getField(packetClass, short.class, 2).getShort(packet);
-                    this.yaw = Reflection.getField(packetClass, byte.class, 0).getByte(packet);
-                    this.pitch = Reflection.getField(packetClass, byte.class, 1).getByte(packet);
-                    break;
-            }
-            this.deltaX = dX / dXYZDivisor;
-            this.deltaY = dY / dXYZDivisor;
-            this.deltaZ = dZ / dXYZDivisor;
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+        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;
        }
+        this.deltaX = dX / dXYZDivisor;
+        this.deltaY = dY / dXYZDivisor;
+        this.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;
    }

-    public double getDeltaZ() {
-        return deltaZ;
-    }
-
-    public double getDeltaY() {
-        return deltaY;
-    }
-
+    /**
+     * Get the Delta X
+     *
+     * @return Delta X
+     */
    public double getDeltaX() {
        return deltaX;
    }

-    public Entity getEntity() {
-        return NMSUtils.getEntityById(entityID);
+    /**
+     * 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 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() {
+            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) {
+                case 0:
+                    dX = readByte(0);
+                    dY = readByte(1);
+                    dZ = readByte(2);
+                    yaw = readByte(3);
+                    pitch = readByte(4);
+                    break;
+                case 1:
+                    dX = readInt(1);
+                    dY = readInt(2);
+                    dZ = readInt(3);
+                    yaw = readByte(0);
+                    pitch = readByte(1);
+                    break;
+                case 2:
+                    dX = readShort(0);
+                    dY = readShort(1);
+                    dZ = readShort(2);
+                    yaw = readByte(0);
+                    pitch = readByte(1);
+                    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;
+        }
+    }
 }
@@ -1,24 +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.entityvelocity;

 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import 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 final class WrappedPacketOutEntityVelocity extends WrappedPacket implements Sendable {
+public final class WrappedPacketOutEntityVelocity extends WrappedPacket implements SendableWrapper {
    private static Constructor<?> velocityConstructor, vec3dConstructor;
    private static Class<?> velocityClass, vec3dClass;
    private static boolean isVec3dPresent;
-    private int entityId;
+    private int entityID;
    private double velocityX, velocityY, velocityZ;
    private Entity entity;
    public WrappedPacketOutEntityVelocity(final Object packet) {
@@ -26,14 +46,20 @@ public final class WrappedPacketOutEntityVelocity extends WrappedPacket implemen
    }

    public WrappedPacketOutEntityVelocity(final Entity entity, final double velocityX, final double velocityY, final double velocityZ) {
-        super();
-        this.entityId = entity.getEntityId();
+        this.entityID = entity.getEntityId();
        this.entity = entity;
        this.velocityX = velocityX;
        this.velocityY = velocityY;
        this.velocityZ = velocityZ;
    }

+    public WrappedPacketOutEntityVelocity(int entityID, double velX, double velY, double velZ) {
+        this.entityID = entityID;
+        this.velocityX = velX;
+        this.velocityY = velY;
+        this.velocityZ = velZ;
+    }
+
    /**
     * Velocity Constructor parameter types:
     * 1.7.10 -&gt; 1.13.2 use int, double, double, double style,
@@ -67,43 +93,60 @@ public final class WrappedPacketOutEntityVelocity extends WrappedPacket implemen

    @Override
    protected void setup() {
-        try {
-            //ENTITY ID
-            this.entityId = Reflection.getField(velocityClass, int.class, 0).getInt(packet);
+        //ENTITY ID
+        this.entityID = readInt(0);

-            int x = Reflection.getField(velocityClass, int.class, 1).getInt(packet);
-            int y = Reflection.getField(velocityClass, int.class, 2).getInt(packet);
-            int z = Reflection.getField(velocityClass, int.class, 3).getInt(packet);
+        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;
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public int getEntityId() {
-        return entityId;
+        //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) {
-            return NMSUtils.getEntityById(this.entityId);
-        } else {
+        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;
+    }
+
+    /**
+     * Get the Velocity X
+     * @return Get Velocity X
+     */
    public double getVelocityX() {
        return velocityX;
    }

+    /**
+     * Get the Velocity Y
+     * @return Get Velocity Y
+     */
    public double getVelocityY() {
        return velocityY;
    }

+    /**
+     * Get the Velocity Z
+     * @return Get Velocity Z
+     */
    public double getVelocityZ() {
        return velocityZ;
    }
@@ -112,13 +155,13 @@ public final class WrappedPacketOutEntityVelocity extends WrappedPacket implemen
    public Object asNMSPacket() {
        if (!isVec3dPresent) {
            try {
-                return velocityConstructor.newInstance(entityId, velocityX, velocityY, velocityZ);
+                return velocityConstructor.newInstance(entityID, velocityX, velocityY, velocityZ);
            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
                e.printStackTrace();
            }
        } else {
            try {
-                return velocityConstructor.newInstance(entityId, vec3dConstructor.newInstance(velocityX, velocityY, velocityZ));
+                return velocityConstructor.newInstance(entityID, vec3dConstructor.newInstance(velocityX, velocityY, velocityZ));
            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
                e.printStackTrace();
            }
@@ -0,0 +1,154 @@
+/*
+ * 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.gamestatechange;
+
+import io.github.retrooper.packetevents.packet.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.reflection.SubclassUtil;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class WrappedPacketOutGameStateChange extends WrappedPacket implements SendableWrapper {
+    private int reason;
+    private double value;
+
+    private static Constructor<?> packetConstructor, reasonClassConstructor;
+    private static Class<?> reasonClassType;
+
+    private static boolean reasonIntMode;
+    private static boolean valueFloatMode;
+
+    public static void load() {
+        reasonClassType = SubclassUtil.getSubClass(PacketTypeClasses.Server.GAME_STATE_CHANGE, "a");
+        if(reasonClassType != null) {
+            try {
+                reasonClassConstructor = reasonClassType.getConstructor(int.class);
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            }
+
+        }
+        reasonIntMode = reasonClassType == null;
+        valueFloatMode = Reflection.getField(PacketTypeClasses.Server.GAME_STATE_CHANGE, double.class, 0) == null;
+
+        try {
+            Class<?> valueClassType;
+            if (valueFloatMode) {
+                valueClassType = float.class;
+            } else {
+                //Just an older version(1.7.10/1.8.x or so)
+                valueClassType = double.class;
+            }
+            if(reasonClassType == null) {
+                reasonClassType = int.class;
+            }
+            packetConstructor = PacketTypeClasses.Server.GAME_STATE_CHANGE.getConstructor(reasonClassType, valueClassType);
+            reasonClassType = null;
+        } catch (NullPointerException e) {
+            Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "PacketEvents failed to find the constructor for the outbound Game state packet wrapper.");
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public WrappedPacketOutGameStateChange(Object packet) {
+        super(packet);
+    }
+
+    public WrappedPacketOutGameStateChange(int reason, double value) {
+        this.reason = reason;
+        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 int getReason() {
+        return reason;
+    }
+
+    public double getValue() {
+        return reason;
+    }
+
+    @Override
+    public Object asNMSPacket() {
+        if (reasonClassType == null) {
+            try {
+                if (valueFloatMode) {
+                    return packetConstructor.newInstance(reason, (float) value);
+                } else {
+                    return packetConstructor.newInstance(reason, value);
+                }
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        } else {
+            Object reasonObject = null;
+            try {
+                reasonObject = reasonClassConstructor.newInstance(reason);
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+            try {
+                if (valueFloatMode) {
+                    return packetConstructor.newInstance(reasonObject, (float) value);
+                } else {
+                    return packetConstructor.newInstance(reasonObject, value);
+                }
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+}
@@ -1,17 +1,38 @@
-/**
+/*
+ * 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.keepalive;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;

 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

-public class WrappedPacketOutKeepAlive extends WrappedPacket implements Sendable {
+public class WrappedPacketOutKeepAlive extends WrappedPacket implements SendableWrapper {
    private static Class<?> packetClass;
    private static Constructor<?> keepAliveConstructor;
    private static boolean integerMode;
@@ -46,26 +67,21 @@ public class WrappedPacketOutKeepAlive extends WrappedPacket implements Sendable

    @Override
    protected void setup() {
-        if (!integerMode) {
-            try {
-                this.id = Reflection.getField(packetClass, long.class, 0).getLong(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        } else {
-            try {
-                this.id = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
+        if(integerMode) {
+            this.id = readInt(0);
+        }
+        else {
+            this.id = readLong(0);
        }
    }

    /**
-     * You can cast this long to an integer if you are using 1.7.10 -&gt; 1.12.2!
-     * In 1.13.2 -&gt; 1.16.2 a long is sent
+     * Get the Keep Alive ID.
     *
-     * @return Keep Alive ID
+     * 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;
@@ -1,19 +1,39 @@
-/**
+/*
+ * 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.kickdisconnect;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;

 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

-public final class WrappedPacketOutKickDisconnect extends WrappedPacket implements Sendable {
+public final class WrappedPacketOutKickDisconnect extends WrappedPacket implements SendableWrapper {
    private static Class<?> packetClass, iChatBaseComponentClass;
    private static Constructor<?> kickDisconnectConstructor;
    private String kickMessage;
@@ -44,13 +64,14 @@ public final class WrappedPacketOutKickDisconnect extends WrappedPacket implemen

    @Override
    protected void setup() {
-        try {
-            this.kickMessage = WrappedPacketOutChat.toStringFromIChatBaseComponent(Reflection.getField(packetClass, iChatBaseComponentClass, 0).get(packet));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        Object ichatbaseComponentoObject = readObject(0, iChatBaseComponentClass);
+        this.kickMessage = WrappedPacketOutChat.toStringFromIChatBaseComponent(ichatbaseComponentoObject);
    }

+    /**
+     * Get the kick message.
+     * @return Get Kick Message
+     */
    public String getKickMessage() {
        return kickMessage;
    }
@@ -58,7 +79,7 @@ public final class WrappedPacketOutKickDisconnect extends WrappedPacket implemen
    @Override
    public Object asNMSPacket() {
        try {
-            return kickDisconnectConstructor.newInstance(WrappedPacketOutChat.toIChatBaseComponent("{\"text\": \"" + kickMessage + "\"}"));
+            return kickDisconnectConstructor.newInstance(WrappedPacketOutChat.toIChatBaseComponent(WrappedPacketOutChat.fromStringToJSON(kickMessage)));
        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
            e.printStackTrace();
        }
@@ -1,11 +1,31 @@
-/**
+/*
+ * 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.position;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;

 public final class WrappedPacketOutPosition extends WrappedPacket {
    private static Class<?> packetClass;
@@ -26,34 +46,50 @@ public final class WrappedPacketOutPosition extends WrappedPacket {
    @Override
    protected void setup() {
        //TODO boolean onGround and flags
-        try {
-            this.x = Reflection.getField(packetClass, double.class, 0).getDouble(packet);
-            this.y = Reflection.getField(packetClass, double.class, 1).getDouble(packet);
-            this.z = Reflection.getField(packetClass, double.class, 2).getDouble(packet);
+        this.x = readDouble(0);
+        this.y = readDouble(1);
+        this.z = readDouble(2);

-            this.yaw = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-            this.pitch = Reflection.getField(packetClass, float.class, 1).getFloat(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        this.yaw = readFloat(0);
+        this.pitch = readFloat(1);
    }

+    /**
+     * Get the X position.
+     * @return Get X Position
+     */
    public double getX() {
        return x;
    }

+    /**
+     * Get the Y position.
+     * @return Get Y Position
+     */
    public double getY() {
        return y;
    }

+    /**
+     * Get the Z position.
+     * @return Get Z Position
+     */
    public double getZ() {
        return z;
    }

+    /**
+     * Get the Yaw.
+     * @return Get Yaw
+     */
    public float getYaw() {
        return yaw;
    }

+    /**
+     * Get the Pitch,
+     * @return Get Pitch
+     */
    public float getPitch() {
        return pitch;
    }
@@ -1,17 +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.packetwrappers.out.transaction;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;

 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

-public class WrappedPacketOutTransaction extends WrappedPacket implements Sendable {
+public class WrappedPacketOutTransaction extends WrappedPacket implements SendableWrapper {
    private static Class<?> packetClass;
    private static Constructor<?> packetConstructor;
    private int windowId;
@@ -40,24 +60,32 @@ public class WrappedPacketOutTransaction extends WrappedPacket implements Sendab

    @Override
    protected void setup() {
-        try {
-            this.windowId = Reflection.getField(packetClass, int.class, 0).getInt(packet);
-            this.actionNumber = Reflection.getField(packetClass, short.class, 0).getShort(packet);
-            this.accepted = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        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;
    }

+    /**
+     * Get the action number.
+     * @return Get Action Number
+     */
    public short getActionNumber() {
        return actionNumber;
    }

+    /**
+     * Has the transaction packet been accepted?
+     * @return Is Accepted
+     */
    public boolean isAccepted() {
        return accepted;
    }
@@ -1,17 +1,38 @@
-/**
+/*
+ * 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.updatehealth;

 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;

 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

-public final class WrappedPacketOutUpdateHealth extends WrappedPacket implements Sendable {
+public final class WrappedPacketOutUpdateHealth extends WrappedPacket implements SendableWrapper {
    private static Class<?> packetClass;
    private static Constructor<?> packetConstructor;
    private float health, foodSaturation;
@@ -47,8 +68,8 @@ public final class WrappedPacketOutUpdateHealth extends WrappedPacket implements
    @Override
    protected void setup() {
        try {
-            this.health = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
-            this.foodSaturation = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
+            this.health = readFloat(0);
+            this.foodSaturation = readFloat(1);
            this.food = Reflection.getField(packetClass, int.class, 0).getInt(packet);
        } catch (IllegalAccessException e) {
            e.printStackTrace();
@@ -56,14 +77,26 @@ public final class WrappedPacketOutUpdateHealth extends WrappedPacket implements

    }

+    /**
+     * Get health value.
+     * @return Get Health
+     */
    public float getHealth() {
        return health;
    }

+    /**
+     * Get food saturation value.
+     * @return Get Food Saturation
+     */
    public float getFoodSaturation() {
        return foodSaturation;
    }

+    /**
+     * Get food value.
+     * @return Get Food
+     */
    public int getFood() {
        return food;
    }
@@ -1,192 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.reflectionutils;
-
-
-import io.github.retrooper.packetevents.reflectionutils.fielddata.FieldWithIndex;
-import io.github.retrooper.packetevents.reflectionutils.fielddata.FieldWithName;
-import io.github.retrooper.packetevents.reflectionutils.fielddata.FieldWithTypeAndIndex;
-import io.github.retrooper.packetevents.reflectionutils.methoddata.MethodWithIndexAndParams;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashMap;
-
-/**
- * @author retrooper
- */
-public final class Reflection {
-    private static final HashMap<Class<?>, Field[]> cachedFields = new HashMap<Class<?>, Field[]>();
-    private static final HashMap<Class<?>, Method[]> cachedMethods = new HashMap<Class<?>, Method[]>();
-    private static final HashMap<Class<?>, Class<?>[]> cachedSubclasses = new HashMap<Class<?>, Class<?>[]>();
-
-
-    //FIELDS
-    private static final HashMap<FieldWithName, Field> fieldWithNameHashMap = new HashMap<FieldWithName, Field>();
-    private static final HashMap<FieldWithTypeAndIndex, Field> fieldWithTypeAndIndexHashMap = new HashMap<FieldWithTypeAndIndex, Field>();
-    private static final HashMap<FieldWithIndex, Field> fieldWithIndexHashMap = new HashMap<FieldWithIndex, Field>();
-    private static final HashMap<MethodWithIndexAndParams, Method> methodWithIndexAndParamsHashMap = new HashMap<MethodWithIndexAndParams, Method>();
-
-    public static Field[] getFields(final Class<?> cls) {
-        if (cachedFields.containsKey(cls)) {
-            return cachedFields.get(cls);
-        } else {
-            final Field[] fields = cls.getDeclaredFields();
-            for (final Field f : fields) {
-                f.setAccessible(true);
-            }
-            cachedFields.put(cls, fields);
-            return fields;
-        }
-    }
-
-    public static Field getField(final Class<?> cls, final String name) {
-        final FieldWithName fwn = new FieldWithName(cls, name);
-        if (!fieldWithNameHashMap.containsKey(fwn)) {
-            for (final Field f : getFields(cls)) {
-                if (f.getName().equals(name)) {
-                    fieldWithNameHashMap.put(fwn, f);
-                    return f;
-                }
-            }
-        } else {
-            return fieldWithNameHashMap.get(fwn);
-        }
-        return null;
-    }
-
-    public static Field getField(final Class<?> cls, final Class<?> dataType, final int index) {
-        final FieldWithTypeAndIndex fwtai = new FieldWithTypeAndIndex(cls, dataType, index);
-        if (!fieldWithTypeAndIndexHashMap.containsKey(fwtai)) {
-            int i = 0;
-            for (final Field f : getFields(cls)) {
-                if (f.getType().equals(dataType)) {
-                    if (i++ == index) {
-                        fieldWithTypeAndIndexHashMap.put(fwtai, f);
-                        return f;
-                    }
-                }
-            }
-        } else {
-            return fieldWithTypeAndIndexHashMap.get(fwtai);
-        }
-        return null;
-    }
-
-    public static Field getField(final Class<?> cls, final int index) {
-        final FieldWithIndex fwi = new FieldWithIndex(cls, index);
-        if (!fieldWithIndexHashMap.containsKey(fwi)) {
-            final Field[] fields = getFields(cls);
-            if (fields.length <= index) {
-                return null;
-            }
-            final Field field = fields[index];
-            fieldWithIndexHashMap.put(fwi, field);
-            return field;
-        } else {
-            return fieldWithIndexHashMap.get(fwi);
-        }
-    }
-
-    //METHODS
-    public static Method[] getMethods(final Class<?> cls) {
-        if (cachedMethods.containsKey(cls)) {
-            return cachedMethods.get(cls);
-        } else {
-            final Method[] methods = cls.getDeclaredMethods();
-            for (final Method m : methods) {
-                m.setAccessible(true);
-            }
-            cachedMethods.put(cls, methods);
-            return methods;
-        }
-    }
-
-    public static Method getMethod(final Class<?> cls, final int index, final Class<?>... params) {
-        final MethodWithIndexAndParams mwiap = new MethodWithIndexAndParams(cls, index, params);
-        if (!methodWithIndexAndParamsHashMap.containsKey(mwiap)) {
-            int i = 0;
-            for (final Method m : getMethods(cls)) {
-                if (Arrays.equals(m.getParameterTypes(), params) && index == i++) {
-                    return m;
-                }
-            }
-        } else {
-            return methodWithIndexAndParamsHashMap.get(mwiap);
-        }
-        return null;
-    }
-
-    //THE REST LATER
-
-    public static Method getMethod(final Class<?> cls, final String name, Class<?> returning, Class<?>... params) {
-        for (final Method m : getMethods(cls)) {
-            if (m.getName().equals(name) && Arrays.equals(m.getParameterTypes(), params) && m.getReturnType().equals(returning)) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    public static Method getMethod(final Class<?> cls, final String name, final int index) {
-        int i = 0;
-        for (final Method m : getMethods(cls)) {
-            if (m.getName().equals(name) && index == i++) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    public static Method getMethod(final Class<?> cls, final Class<?> returning, final int index) {
-        int i = 0;
-        for (final Method m : getMethods(cls)) {
-            if (m.getReturnType().equals(returning) && index == i++) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    public static Method getMethod(final Class<?> cls, final String name, final Class<?> returning) {
-        int i = 0;
-        for (final Method m : getMethods(cls)) {
-            if (m.getName().equals(name) && m.getReturnType().equals(returning)) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    public static Class<?>[] getSubClasses(final Class<?> cls) {
-        if (cachedSubclasses.containsKey(cls)) {
-            return cachedSubclasses.get(cls);
-        } else {
-            final Class<?>[] subclasses = cls.getDeclaredClasses();
-            cachedSubclasses.put(cls, subclasses);
-            return subclasses;
-        }
-    }
-
-    public static Class<?> getSubClass(final Class<?> cls, final String name) {
-        for (final Class<?> subclass : getSubClasses(cls)) {
-            if (subclass.getSimpleName().equals(name)) {
-                return subclass;
-            }
-        }
-        return null;
-    }
-
-    public static Class<?> getSubClass(final Class<?> cls, final int index) {
-        final Class<?>[] subclasses = getSubClasses(cls);
-        for (int i = 0; i < index + 1; i++) {
-            final Class<?> c = subclasses[i];
-            if (i == index) {
-                return c;
-            }
-        }
-        return null;
-    }
-}
@@ -1,39 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.reflectionutils.fielddata;
-
-import java.util.Objects;
-
-public class FieldWithIndex {
-    private final Class<?> cls;
-    private final int index;
-
-    public FieldWithIndex(Class<?> cls, int index) {
-        this.cls = cls;
-        this.index = index;
-    }
-
-    public Class<?> getCls() {
-        return cls;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        FieldWithIndex that = (FieldWithIndex) o;
-        return index == that.index &&
-                Objects.equals(cls, that.cls);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(cls, index);
-    }
-
-}
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.reflectionutils.fielddata;
-
-import java.util.Objects;
-
-public class FieldWithName {
-
-    private final Class<?> cls;
-    private final String name;
-
-    public FieldWithName(Class<?> cls, String name) {
-        this.cls = cls;
-        this.name = name;
-    }
-
-    public Class<?> getCls() {
-        return cls;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        FieldWithName that = (FieldWithName) o;
-        return name.equals(that.name) &&
-                Objects.equals(cls, that.cls);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(cls, name);
-    }
-
-}
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.reflectionutils.fielddata;
-
-import java.util.Objects;
-
-public class FieldWithTypeAndIndex {
-    private final Class<?> cls, type;
-    private final int index;
-
-    public FieldWithTypeAndIndex(Class<?> cls, Class<?> type, int index) {
-        this.cls = cls;
-        this.type = type;
-        this.index = index;
-    }
-
-    public Class<?> getCls() {
-        return cls;
-    }
-
-    public Class<?> getType() {
-        return type;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        FieldWithTypeAndIndex that = (FieldWithTypeAndIndex) o;
-        return index == that.index &&
-                Objects.equals(cls, that.cls) &&
-                Objects.equals(type, that.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(cls, type, index);
-    }
-
-}
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.reflectionutils.methoddata;
-
-import java.util.Objects;
-
-public class MethodWithIndexAndParams {
-    private final Class<?> cls;
-    private final int index;
-    private final Class<?>[] params;
-
-    public MethodWithIndexAndParams(Class<?> cls, int index, Class<?>[] params) {
-        this.cls = cls;
-        this.index = index;
-        this.params = params;
-    }
-
-    public Class<?> getCls() {
-        return cls;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public Class<?>[] getParams() {
-        return params;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        MethodWithIndexAndParams that = (MethodWithIndexAndParams) o;
-        return index == that.index &&
-                Objects.equals(cls, that.cls) &&
-                Objects.equals(params, that.params);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(cls, params, index);
-    }
-
-}
@@ -1,6 +1,27 @@
-/**
+/*
+ * 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.settings;

 import io.github.retrooper.packetevents.enums.ServerVersion;
@@ -9,10 +30,13 @@ import java.util.Random;

 public class PacketEventsSettings {

-    private ServerVersion defaultServerVersion;
+    private ServerVersion defaultServerVersion = ServerVersion.v_1_7_10;
    private String identifier = "";
-    private boolean autoResolveClientProtocolVersion;
-    private boolean uninjectAsync = false;
+    private boolean autoResolveClientProtocolVersion = false;
+    private boolean uninjectAsync = true;
+    private boolean injectAsync = true;
+    private boolean useProtocolLibIfAvailable = true;
+    private boolean checkForUpdates = true;

    /**
     * If PacketEvents fails to detect your server version, it will use the recommended version
@@ -38,6 +62,7 @@ public class PacketEventsSettings {
     * 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() {
@@ -63,7 +88,6 @@ public class PacketEventsSettings {
     * @deprecated This method is deprecated as you no longer need to set an identifier,
     * a unique identifier is already automatically generated for you.
     */
-    @Deprecated
    public void setIdentifier(final String identifier) {
        this.identifier = identifier;
    }
@@ -77,6 +101,7 @@ public class PacketEventsSettings {
     * (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 autoResolveClientProtocolVersion boolean
     */
    public void setDoAutoResolveClientProtocolVersion(boolean autoResolveClientProtocolVersion) {
@@ -96,4 +121,44 @@ public class PacketEventsSettings {
    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 void setShouldCheckForUpdates(boolean val) {
+        this.checkForUpdates = val;
+    }
+
+    public boolean shouldCheckForUpdates() {
+        return checkForUpdates;
+    }*/
 }
@@ -1,6 +1,27 @@
-/**
+/*
+ * 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;

 import org.bukkit.Location;
@@ -1,73 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.utils.api;
-
-import io.github.retrooper.packetevents.enums.ClientVersion;
-import io.github.retrooper.packetevents.handler.NettyPacketHandler;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.settings.PacketEventsSettings;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
-import org.bukkit.entity.Player;
-
-import java.util.HashMap;
-import java.util.UUID;
-
-public final class PlayerUtils {
-
-    private final HashMap<UUID, ClientVersion> clientVersionsMap = new HashMap<UUID, ClientVersion>();
-    private final PacketEventsSettings settings = new PacketEventsSettings();
-
-    public int getPing(final Player player) {
-        return NMSUtils.getPlayerPing(player);
-    }
-
-    public ClientVersion getClientVersion(final UUID uuid) {
-        return clientVersionsMap.get(uuid);
-    }
-
-    public int getProtocolVersion(Player player) {
-        return VersionLookupUtils.getProtocolVersion(player);
-    }
-
-    public ClientVersion getClientVersion(final Player player) {
-        return getClientVersion(player.getUniqueId());
-    }
-
-    public void setClientVersion(final UUID uuid, final ClientVersion version) {
-        clientVersionsMap.put(uuid, version);
-    }
-
-    public void setClientVersion(final Player player, final ClientVersion version) {
-        setClientVersion(player.getUniqueId(), version);
-    }
-
-    public void clearClientVersion(final UUID uuid) {
-        clientVersionsMap.remove(uuid);
-    }
-
-    public void clearClientVersion(final Player player) {
-        clearClientVersion(player.getUniqueId());
-    }
-
-    public void injectPlayer(final Player player) {
-        NettyPacketHandler.injectPlayer(player);
-    }
-
-    public void uninjectPlayer(final Player player) {
-        if (settings.isUninjectAsync()) {
-            NettyPacketHandler.uninjectPlayerAsync(player);
-        } else {
-            NettyPacketHandler.uninjectPlayer(player);
-        }
-    }
-
-    public void sendPacket(final Player player, final Sendable sendable) {
-        NMSUtils.sendSendableWrapper(player, sendable);
-    }
-
-    public void sendNMSPacket(final Player player, Object nmsPacket) {
-        NMSUtils.sendNMSPacket(player, nmsPacket);
-    }
-}
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2020 retrooper
- */
-package io.github.retrooper.packetevents.utils.api;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.enums.SystemOS;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-import java.lang.reflect.InvocationTargetException;
-
-public final class ServerUtils {
-
-    public ServerVersion getVersion() {
-        return ServerVersion.getVersion();
-    }
-
-    public double[] getRecentTPS() {
-        double[] tpsArray = new double[0];
-        try {
-            tpsArray = NMSUtils.recentTPS();
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return tpsArray;
-    }
-
-    public double getCurrentTPS() {
-        return getRecentTPS()[0];
-    }
-
-    public SystemOS getPlatform() {
-        return SystemOS.getOperatingSystem();
-    }
-}
@@ -1,11 +1,32 @@
-/**
+/*
+ * 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.nms_entityfinder;
+
+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.NMSUtils;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
@@ -44,6 +65,11 @@ public final class EntityFinderUtils {
        }
    }

+    /**
+     * Get an entity by their ID.
+     * @param id
+     * @return Entity
+     */
    public static Entity getEntityById(final int id) {
        for (final World world : Bukkit.getWorlds()) {
            final Entity entity = getEntityByIdWithWorld(world, id);
@@ -51,17 +77,22 @@ public final class EntityFinderUtils {
                return entity;
            }
        }
-        return null;
+        return  null;
    }

+    /**
+     * 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) {
        if (world == null) {
            return null;
        }
        else if(craftWorldClass == null) {
-            System.out.println("Craft World class is null wtf");
-            return null;
+            throw new IllegalStateException("PacketEvents failed to locate the CraftWorld class.");
        }
        Object craftWorld = craftWorldClass.cast(world);

@@ -1,13 +1,35 @@
-/**
+/*
+ * 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;
+
+package io.github.retrooper.packetevents.utils.nms;

 import io.github.retrooper.packetevents.annotations.Nullable;
 import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.nms_entityfinder.EntityFinderUtils;
+import io.github.retrooper.packetevents.nettyhandler.NettyPacketHandler;
+import io.github.retrooper.packetevents.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.utils.reflection.Reflection;
+import io.github.retrooper.packetevents.utils.entityfinder.EntityFinderUtils;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -16,12 +38,14 @@ import org.bukkit.inventory.ItemStack;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.UUID;

 public final class NMSUtils {
    public static ServerVersion version;
    private static final String nmsDir = ServerVersion.getNMSDirectory();
    private static final String obcDir = ServerVersion.getOBCDirectory();
-    public static String nettyPrefix;
+    public static String nettyPrefix = "io.netty";
    public static Class<?> minecraftServerClass, craftWorldsClass,
            packetClass, entityPlayerClass, playerConnectionClass,
            craftPlayerClass, serverConnectionClass, craftEntityClass,
@@ -29,12 +53,18 @@ public final class NMSUtils {
    private static Method getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
    private static Field entityPlayerPingField, playerConnectionField;

+    public static final HashMap<UUID, Object> channelCache = new HashMap<UUID, Object>();
+
    public static void load() {
        try {
-            nettyPrefix = "io.netty";
-            Class.forName("io.netty.channel.Channel");
+            Class.forName(nettyPrefix + ".channel.Channel");
        } catch (ClassNotFoundException e) {
            nettyPrefix = "net.minecraft.util.io.netty";
+            try {
+                Class.forName(nettyPrefix + ".channel.Channel");
+            } catch (ClassNotFoundException e2) {
+                throw new IllegalStateException("PacketEvents failed to locate Netty's location.");
+            }
        }
        try {
            nettyChannelClass = getNettyClass("channel.Channel");
@@ -105,10 +135,12 @@ public final class NMSUtils {
    }

    public static String getChannelFutureListFieldName() {
-        if (version.isLowerThan(ServerVersion.v_1_8))
+        if (version.isLowerThan(ServerVersion.v_1_8)) {
            return "e";
-        if (version.isLowerThan(ServerVersion.v_1_13))
+        }
+        if (version.isLowerThan(ServerVersion.v_1_13)) {
            return "g";
+        }
        return "f";
    }

@@ -164,12 +196,16 @@ public final class NMSUtils {
    }

    public static Object getChannel(final Player player) {
-        try {
-            return Reflection.getField(networkManagerClass, nettyChannelClass, 0).get(getNetworkManager(player));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+        UUID uuid = player.getUniqueId();
+        if(!channelCache.containsKey(uuid)) {
+            try {
+                Object channel = Reflection.getField(networkManagerClass, nettyChannelClass, 0).get(getNetworkManager(player));
+                channelCache.put(uuid, channel);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
        }
-        return null;
+        return channelCache.get(uuid);
    }

    public static int getPlayerPing(final Player player) {
@@ -191,28 +227,11 @@ public final class NMSUtils {
        return null;
    }

-    public static void sendSendableWrapper(final Player player, final Sendable sendable) {
-        NMSUtils.sendNMSPacket(player, sendable.asNMSPacket());
+    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) {
-        Object entityPlayer = getEntityPlayer(player);
-        Object playerConnection = null;
-        try {
-            playerConnection = playerConnectionField.get(entityPlayer);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            sendPacketMethod.invoke(playerConnection, nmsPacket);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    public static String getServerConnectionFieldName() {
-        return "p";
+        NettyPacketHandler.sendPacket(getChannel(player), nmsPacket);
    }
 }
@@ -0,0 +1,138 @@
+/*
+ * 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.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.packetwrappers.SendableWrapper;
+import io.github.retrooper.packetevents.utils.nms.NMSUtils;
+import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
+import org.bukkit.entity.Player;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+public final class PlayerUtils {
+
+    /**
+     * This map stores each player's client version.
+     */
+    public final HashMap<UUID, ClientVersion> clientVersionsMap = new HashMap<UUID, ClientVersion>();
+
+    /**
+     * Get the player's ping.
+     * @param player
+     * @return Get Player Ping
+     */
+    public int getPing(final Player player) {
+        return NMSUtils.getPlayerPing(player);
+    }
+
+    /**
+     * Get the client version by a UUID.
+     * @param uuid
+     * @return Get Client Version
+     */
+    public ClientVersion getClientVersion(final UUID uuid) {
+        return clientVersionsMap.get(uuid);
+    }
+
+    /**
+     * Get the client version by a player object.
+     * @param player
+     * @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);
+    }
+
+    /**
+     * Inject a player.
+     *
+     * (This also calls the {@link io.github.retrooper.packetevents.event.impl.PlayerInjectEvent})
+     * @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);
+        }
+    }
+
+    /**
+     * Eject a player.
+     * (This also calls the {@link io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent})
+     * @param player
+     */
+    public void ejectPlayer(final Player player) {
+        if (PacketEvents.getSettings().isUninjectAsync()) {
+            NettyPacketHandler.ejectPlayerAsync(player);
+        } else {
+            NettyPacketHandler.ejectPlayer(player);
+        }
+    }
+
+    /**
+     * Send a {@link SendableWrapper} wrapper to a player.
+     * @param player
+     * @param sendableWrapper
+     */
+    public void sendPacket(final Player player, final SendableWrapper sendableWrapper) {
+        NMSUtils.sendSendableWrapper(player, sendableWrapper);
+    }
+
+    /**
+     * Send a raw NMS packet to a player.
+     * @param player
+     * @param nmsPacket
+     */
+    public void sendNMSPacket(final Player player, Object nmsPacket) {
+        NMSUtils.sendNMSPacket(player, nmsPacket);
+    }
+}
@@ -0,0 +1,34 @@
+/*
+ * 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.protocollib;
+
+import com.comphenix.protocol.ProtocolLibrary;
+import org.bukkit.entity.Player;
+
+class ProtocolLibAPIAccessor {
+    public static int getProtocolVersion(final Player player) {
+        return ProtocolLibrary.getProtocolManager().getProtocolVersion(player);
+    }
+}
@@ -0,0 +1,131 @@
+/*
+ * 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.protocollib;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+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.priority.PacketEventPriority;
+import io.github.retrooper.packetevents.event.PacketListener;
+import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
+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.concurrent.ConcurrentLinkedQueue;
+
+public class ProtocolLibListener {
+
+    public static void registerProtocolLibListener(PacketListener listener, ConcurrentLinkedQueue<Method> methods) {
+        if (ProtocolLibUtils.isAvailable()) {
+            for (Method m : methods) {
+                if (m.getParameterTypes()[0].equals(PacketReceiveEvent.class)) {
+                    PacketHandler annotation = m.getAnnotation(PacketHandler.class);
+                    ListenerPriority priority;
+                    switch (annotation.priority()) {
+                        case PacketEventPriority.LOWEST:
+                            priority = ListenerPriority.LOWEST;
+                            break;
+                        case PacketEventPriority.LOW:
+                            priority = ListenerPriority.LOW;
+                            break;
+                        case PacketEventPriority.HIGH:
+                            priority = ListenerPriority.HIGH;
+                            break;
+                        case PacketEventPriority.HIGHEST:
+                            priority = ListenerPriority.HIGHEST;
+                            break; 
+                        case PacketEventPriority.MONITOR:
+                            priority = ListenerPriority.MONITOR;
+                            break;
+                        default:
+                            priority = ListenerPriority.NORMAL;
+                            break;
+                    }
+                    ProtocolLibrary.getProtocolManager().
+                            addPacketListener(new PacketAdapter(PacketEvents.getPlugins().get(0),
+                                    priority, PacketType.Play.Client.getInstance().values()) {
+                                @Override
+                                public void onPacketReceiving(PacketEvent event) {
+                                    event.setReadOnly(false);
+                                    PacketReceiveEvent receiveEvent = new PacketReceiveEvent(event.getPlayer(), event.getPacket().getHandle());
+                                    try {
+                                        m.invoke(listener, receiveEvent);
+                                    } catch (IllegalAccessException | InvocationTargetException e) {
+                                        e.printStackTrace();
+                                    }
+                                    event.setCancelled(receiveEvent.isCancelled());
+                                }
+                            });
+                } else if (m.getParameterTypes()[0].equals(PacketSendEvent.class)) {
+                    PacketHandler annotation = m.getAnnotation(PacketHandler.class);
+                    ListenerPriority priority;
+                    switch (annotation.priority()) {
+                        case PacketEventPriority.LOWEST:
+                            priority = ListenerPriority.LOWEST;
+                            break;
+                        case PacketEventPriority.LOW:
+                            priority = ListenerPriority.LOW;
+                            break;
+                        case PacketEventPriority.HIGH:
+                            priority = ListenerPriority.HIGH;
+                            break;
+                        case PacketEventPriority.HIGHEST:
+                            priority = ListenerPriority.HIGHEST;
+                            break;
+                        case PacketEventPriority.MONITOR:
+                            priority = ListenerPriority.MONITOR;
+                            break;
+                        default:
+                            priority = ListenerPriority.NORMAL;
+                            break;
+                    }
+                    ProtocolLibrary.getProtocolManager().
+                            addPacketListener(new PacketAdapter(PacketEvents.getPlugins().get(0),
+                                    priority, PacketType.Play.Server.getInstance().values()) {
+                                @Override
+                                public void onPacketSending(PacketEvent event) {
+                                    event.setReadOnly(false);
+                                    PacketSendEvent sendEvent = new PacketSendEvent(event.getPlayer(), event.getPacket().getHandle());
+                                    try {
+                                        m.invoke(listener, sendEvent);
+                                    } catch (IllegalAccessException | InvocationTargetException e) {
+                                        e.printStackTrace();
+                                    }
+                                    event.setCancelled(sendEvent.isCancelled());
+                                }
+                            });
+                }
+            }
+        }
+    }
+
+
+}
@@ -0,0 +1,38 @@
+/*
+ * 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.protocollib;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class ProtocolLibUtils {
+    public static boolean isAvailable() {
+        return Bukkit.getPluginManager().isPluginEnabled("ProtocolLib");
+    }
+
+    public static int getProtocolVersion(final Player player) {
+        return ProtocolLibAPIAccessor.getProtocolVersion(player);
+    }
+}
@@ -0,0 +1,34 @@
+/*
+ * 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.protocolsupport;
+
+import org.bukkit.entity.Player;
+import protocolsupport.api.ProtocolSupportAPI;
+
+class ProtocolSupportAPIAccessor {
+    public static int getProtocolVersion(final Player player) {
+        return ProtocolSupportAPI.getProtocolVersion(player).getId();
+    }
+}
@@ -0,0 +1,38 @@
+/*
+ * 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.protocolsupport;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class ProtocolSupportUtils {
+    public static boolean isAvailable() {
+        return Bukkit.getPluginManager().isPluginEnabled("ProtocolSupport");
+    }
+
+    public static int getProtocolVersion(final Player player) {
+        return ProtocolSupportAPIAccessor.getProtocolVersion(player);
+    }
+}
@@ -0,0 +1,38 @@
+/*
+ * 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.reflection;
+
+import java.util.HashMap;
+
+public class ClassUtil {
+    private static final HashMap<Class<?>, String> classSimpleNameCache = new HashMap<Class<?>, String>();
+
+    public static String getClassSimpleName(Class<?> cls) {
+        if(!classSimpleNameCache.containsKey(cls)) {
+            classSimpleNameCache.put(cls, cls.getSimpleName());
+        }
+        return classSimpleNameCache.get(cls);
+    }
+}
@@ -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.utils.reflection;
+
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+public final class Reflection {
+
+    //FIELDS
+    public static Field[] getFields(Class<?> cls) {
+        Field[] declaredFields = cls.getDeclaredFields();
+        for (Field f : declaredFields) {
+            f.setAccessible(true);
+        }
+        return declaredFields;
+    }
+
+    public static Field getField(final Class<?> cls, final String name) {
+        for (final Field f : getFields(cls)) {
+            if (f.getName().equals(name)) {
+                return f;
+            }
+        }
+        return null;
+    }
+
+    public static Field getField(final Class<?> cls, final Class<?> dataType, final int index) {
+        int currentIndex = 0;
+        for (final Field f : getFields(cls)) {
+            if (f.getType().equals(dataType)) {
+                if (currentIndex++ == index) {
+                    return f;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static Field getField(final Class<?> cls, final int index) {
+        return getFields(cls)[index];
+    }
+
+    //METHODS
+    public static Method[] getMethods(final Class<?> cls) {
+        Method[] declaredMethods = cls.getDeclaredMethods();
+        for (Method m : declaredMethods) {
+            m.setAccessible(true);
+        }
+        return declaredMethods;
+    }
+
+    public static Method getMethod(final Class<?> cls, final int index, final Class<?>... params) {
+        int currentIndex = 0;
+        for (final Method m : getMethods(cls)) {
+            if (Arrays.equals(m.getParameterTypes(), params) && index == currentIndex++) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    public static Method getMethod(final Class<?> cls, final String name, Class<?> returning, Class<?>... params) {
+        for (final Method m : getMethods(cls)) {
+            if (m.getName().equals(name) && Arrays.equals(m.getParameterTypes(), params) && m.getReturnType().equals(returning)) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    public static Method getMethod(final Class<?> cls, final String name, final int index) {
+        int currentIndex = 0;
+        for (final Method m : getMethods(cls)) {
+            if (m.getName().equals(name) && index == currentIndex++) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    public static Method getMethod(final Class<?> cls, final Class<?> returning, final int index) {
+        int currentIndex = 0;
+        for (final Method m : getMethods(cls)) {
+            if (m.getReturnType().equals(returning) && index == currentIndex++) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    public static Method getMethod(final Class<?> cls, final String name, final Class<?> returning) {
+        for (final Method m : getMethods(cls)) {
+            if (m.getName().equals(name) && m.getReturnType().equals(returning)) {
+                return m;
+            }
+        }
+        return null;
+    }
+}
@@ -0,0 +1,60 @@
+/*
+ * 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.reflection;
+
+import java.lang.annotation.Annotation;
+
+public class SubclassUtil {
+    public static Class<?> getSubClass(Class<?> cls, String name) {
+        for (Class<?> subClass : cls.getDeclaredClasses()) {
+            if (ClassUtil.getClassSimpleName(subClass).equals(name)) {
+                return subClass;
+            }
+        }
+        return null;
+    }
+
+    public static Class<?> getSubClass(Class<?> cls, int index) {
+        int currentIndex = 0;
+        for (Class<?> subClass : cls.getDeclaredClasses()) {
+            if (index == currentIndex++) {
+                return subClass;
+            }
+        }
+        return null;
+    }
+
+    public static Class<?> getSubClass(Class<?> cls, Annotation annotation, int index) {
+        int currentIndex = 0;
+        for(Class<?> subClass : cls.getDeclaredClasses()) {
+            if(subClass.getAnnotation(annotation.getClass()) != null) {
+                if(index == currentIndex++) {
+                    return subClass;
+                }
+            }
+        }
+        return null;
+    }
+}
Author	SHA1	Message	Date
retrooper	9347e7a133	1.6.8 STABLE release	2020-09-16 20:00:10 +02:00
retrooper	33ed5ff904	* WrappedPacketInUpdateSign issue fixed for versions > than 1.8.8 * WrappedPacket#readObjectArray() bug fix and for all other ones	2020-09-16 19:16:21 +02:00
retrooper	291994d388	* WrappedPacketInUpdateSign created, UNTESTED	2020-09-16 18:14:51 +02:00
retrooper	f6ea9675bf	* clearing the cached channel after the player is uninjected.	2020-09-16 17:51:17 +02:00
retrooper	cc303f56a4	* a few API class movements. * PacketEvents.getAPI().getPlayerUtils().sendPacket(Player, SendableWrapper) optimized, we no longer use reflection to send packets and we cache the channel.	2020-09-16 17:33:23 +02:00
retrooper	290bd0a8fe	* nullpointer exception fixed for versions older than 1.16 in WrappedPacketOutGameStateChange	2020-09-16 16:58:40 +02:00
retrooper	a8573cc8e1	* game state change nullpointer exception for 1.16 fixed	2020-09-16 16:10:53 +02:00
retrooper	814bd941c0	* outbound game state change wrapper should be working for 1.16 now, I'm about to test it	2020-09-16 15:18:32 +02:00
retrooper	d3f6d32848	gamestate wrapper unfinished, need to get the value from the integer for 1.16 * todo: finish outbound game state change wrapper, outbound custompayload, outbound entitymetadata, fix alleged 1.16 performance issues	2020-09-15 23:14:24 +02:00
retrooper	5e1b82ea8a	*game state wrapper attempt, UNTESTED	2020-09-15 18:00:58 +02:00
retrooper	e49cae5d67	* added the setting to disable packetevents from using the ProtocolLib API if it is available, (PacketEvents.getAPI().getSettings().setUseProtocolLibIfAvailable(boolean), default value = true) * PacketEvents.getAPI().getSettings().isInjectAsync() & PacketEvents.getAPI().getSettings().isUninjectAsync() are NOW set to true by default	2020-09-15 16:46:51 +02:00
retrooper	8168bb2085	Update README.md	2020-09-13 11:57:55 +02:00
retrooper	621a7c98b9	Merge pull request #38 from LIWKK/patch-5 Removed debugs	2020-09-13 11:09:22 +02:00
retrooper	28da2aafc4	Merge pull request #39 from LIWKK/patch-4 Remove debugs	2020-09-13 11:08:33 +02:00
Johannes	e89e6fac28	Removed debugs	2020-09-13 12:06:50 +03:00
Johannes	a5e067af9e	Remove debugs	2020-09-13 12:05:56 +03:00
retrooper	04de7fd5ea	Merge pull request #37 from funkemunky/feature/reflection-caching Optimized reflection, fixed WrappedPacketInFlying error	2020-09-13 06:54:10 +02:00
Dawson Hessler	815428f35b	reverting version change	2020-09-13 00:43:59 -04:00
Dawson Hessler	833f569150	Optimized reflection, fixed WrappedPacketInFlying error	2020-09-13 00:43:08 -04:00
retrooper	6b227d55aa	Update WrappedPacket.java	2020-09-13 00:05:11 +02:00
retrooper	57a6c26c07	attempt to fix all errors when accessing fields	2020-09-12 23:53:14 +02:00
retrooper	b2da168f6a	attempt to fix fields not being found	2020-09-12 23:41:55 +02:00
retrooper	4c1e14af57	subclass util bug fixed omg	2020-09-12 23:28:56 +02:00
retrooper	5f9e82617f	Update WrappedPacketInUseEntity.java	2020-09-12 23:24:50 +02:00
retrooper	9868facdde	debug added cos idk why its failing	2020-09-12 22:51:24 +02:00
retrooper	d45f8bddac	packet class for use entity null fix attempt	2020-09-12 22:21:12 +02:00
retrooper	e4b086e7e5	packet class null fix attempt	2020-09-12 22:20:07 +02:00
retrooper	7afe3c63cd	fix packettype import for packetsendevent	2020-09-12 22:08:18 +02:00
retrooper	5103acf414	fix packettype import for packetreceiveevent	2020-09-12 22:07:52 +02:00
retrooper	70b763b5a3	Merge remote-tracking branch 'origin/master' into master	2020-09-12 20:53:39 +02:00
retrooper	e1370b803f	removed old packettype class	2020-09-12 20:53:15 +02:00
retrooper	ac3ca0ddf7	Update WrappedPacketInUseEntity.java	2020-09-12 20:31:29 +02:00
retrooper	15bec5525a	nms import removed	2020-09-12 18:21:03 +02:00
retrooper	0e8dcb6a40	nms import removed	2020-09-12 18:18:49 +02:00
retrooper	836efcfa03	forgot to load the updated PacketType class, and not only the deprecated one	2020-09-12 18:12:43 +02:00
retrooper	774e6decf3	debug added to see why it fails at line 94	2020-09-12 18:03:54 +02:00
retrooper	839265e0b9	removed unnecessary import of NMS	2020-09-12 17:45:28 +02:00
retrooper	32c94c85f1	attempting to debug, if the getter isn't found	2020-09-12 17:43:04 +02:00
retrooper	a36df67f6f	NPE in sent outbound wrapped packets FIXED	2020-09-12 17:29:27 +02:00
retrooper	cdb46f476c	fixed a compilation error a fee fields weren’t initialized in the default constructor	2020-09-12 04:11:35 +02:00
retrooper	96e5e7393e	Merge pull request #36 from LIWKK/patch-3 Fix error	2020-09-12 04:02:29 +02:00
Johannes	130001a44c	Fix error	2020-09-11 22:47:34 +03:00
retrooper	1328ea81e8	1.6.8 might release tomorrow	2020-09-11 19:36:29 +02:00
retrooper	a42153cff9	1.6.8 pre?	2020-09-11 19:13:17 +02:00
retrooper	79929f5700	temp data files to check if another pe instance exists, might not work	2020-09-11 16:16:45 +02:00
retrooper	8c3726c165	1.6.7 release * TODO for 1.6.8: - WrappedPacketOutCustomPayload should be finished - WrappedPacketOutEntityMetadata should be made Both wrappers are planned to support sending to players.	2020-09-10 19:44:32 +02:00
retrooper	51a58f79a5	now thread safe event priority system, contains example code, outbound custompayload wrapper is now loaded(not guaranteed to work)	2020-09-10 19:34:04 +02:00
retrooper	8691304925	WrappedPacketOutCustomPayload added, untested tho	2020-09-10 18:15:33 +02:00
retrooper	9fef95d96e	CHANGELOG: Note, this build contains debugs and example code * creating wrappers is much easier and cleaner now with new functions * all wrappers cleaned up * walk speed returning the fly speed FIXED * wrappedpacketoutchat.fromStringToJSON() debug removed * wrappedpacketoutkickdisconnect constructor now requires a json string, * food saturation in wrappedpacketoutupdatehealth was equal to health value by accident * WrappedPacketOutEntity has subclasses, like rel entity move, ect... * WrappedPacketInFlying subclasses no longer extend the WrappedPacketInFlying, they are now just static classes inside it, this will mean they won't contain all functions like WrappedPacketInFlying does, you can use them to save memory? micro optimization tho XD	2020-09-10 16:19:32 +02:00
retrooper	4d42a23510	1.6.6.1 RELEASE, * Bug where packetevents won't enable if ProtocolLib isn't present FIXED	2020-09-09 20:38:31 +02:00
retrooper	787df36fe0	1.6.6 STABLE RELEASE	2020-09-09 19:48:26 +02:00
retrooper	a59ea40e12	1.6.6 update, protocollib listening packets supported, event priority system added(also compatible with ProtocolLib)	2020-09-09 19:47:06 +02:00
retrooper	fdb3a23acc	protocollib event priority system working, btw this commit contains debugs	2020-09-09 19:18:07 +02:00
retrooper	60d24ac3c1	A few bugs fixed with event priority system, about to test with protocollib	2020-09-09 18:49:50 +02:00
retrooper	7634540bd7	Merge remote-tracking branch 'origin/master' into master # Conflicts: # src/main/java/io/github/retrooper/packetevents/example/MainExample.java	2020-09-09 17:59:18 +02:00
retrooper	0a475e4242	1.6.6 PRE, working on event priority system, eventsynchronization is deprecated	2020-09-09 17:57:50 +02:00
retrooper	ff3b66b22e	1.6.5 release for SPIGOTMC rebuild(removed debugs), and a deprecation: PacketEvents#hasStarted is deprecated, use PacketEvents#isInitialized	2020-09-09 15:57:17 +02:00
Retrooper	8be5f5bfa6	1.6.5 stable release * debugs removed	2020-09-03 16:41:36 +08:00
retrooper	8d887335e2	Merge pull request #35 from undersquire/patch-8 Update PacketType.java	2020-09-03 07:42:48 +02:00
undersquire	553f429a53	Update PacketType.java Fixes issues with switch statements?	2020-09-02 19:02:42 -07:00
retrooper	a4a8b36665	bug fix, BUT CONTAINS DEBUGS. Performance issues should be fixed now.	2020-09-02 18:44:29 +02:00
retrooper	49d46b79df	performance issues fixed for packetevents, all packets called on a new single threaded executor	2020-09-02 18:19:18 +02:00
retrooper	08a2b92bcf	ClientVersion always ClientVersion.ACCESS_FAILURE FIXED! PacketEvents supports client version checking on 1.7.10. ClientVersion checking now works ONLY if you are on 1.7.10 spigot/paperspigot, OR have ViaVersion present, or have ProtocolSupport present or have ProtocolLib present.	2020-09-02 18:13:13 +02:00
retrooper	f32dafc3ee	PacketEvents FULLY documented, for the javadoc.	2020-09-02 17:16:40 +02:00
retrooper	84e391ffc8	1.6.5 pre with debugs	2020-09-02 16:26:55 +02:00
retrooper	26a369af89	test.txt removed	2020-09-02 15:06:03 +02:00
retrooper	56c752b487	test.txt	2020-09-02 15:05:41 +02:00
retrooper	890fcadac2	.idea readded	2020-09-02 15:05:07 +02:00
retrooper	27f09f6627	empty .idea?	2020-09-02 15:04:25 +02:00
Retrooper	e5b89271ee	getting server version failure fix	2020-09-02 03:42:40 +08:00
Retrooper	48ef0e7852	clientcommand enum not found fix	2020-09-02 03:00:00 +08:00
retrooper	192851b03f	Merge pull request #34 from LIWKK/patch-2 Remove debug	2020-09-01 17:46:15 +02:00
Johannes	dd30876e70	Remove debug	2020-09-01 18:44:04 +03:00
retrooper	ce2603549b	1.6.3 release, * LICENSE and copyright holder added in each file. If you are making a closed source product, all you need to do is make sure you aren't obfuscating my files. * BukkitMoveEvent deprecated, you may copy the event and recreate it on your end in your project, BukkitMoveEvent will most likely be removed in the next minor update. * CancellableEvent interface added, implemented in all built in events as they are all cancellable. * Asynchronous injecting and uninjecting is no longer done on the Netty threads, it is now done using java's Executor Service's threadpool * GitHub Wiki API usage Guide has been rewritten, should finished done today or in a few days	2020-09-01 16:53:31 +02:00
retrooper	c645124e55	Merge branch 'master' of https://github.com/retrooper/packetevents into master	2020-09-01 16:16:11 +02:00
retrooper	3c3a00b7bb	Merge pull request #33 from NikV2/master New features	2020-08-30 17:01:12 +02:00
Nik	d34e152b98	commit	2020-08-30 17:52:37 +03:00
retrooper	3f85f4998b	1.6.1 release STABLE	2020-08-28 18:13:23 +02:00