Merge remote-tracking branch 'origin/master'

* ...getPlayerUtilities().getPlayerPing(player); deprecated, use getPing(player);

* ServerTickEvent deprecated and it's Bukkit task too, will be removed in the next VersionLookupUtils
* PacketEvents.getAPI().getSettings().setDefaultServerVersion(version); added
Settings the default version will let PacketEvents use the default version if PacketEvents fails to detect your server version.
No idea why this happens in mSpigot, but yea.

README.md

@@ -2,11 +2,6 @@
 
 A lightweight spigot packetlistener & packetsender coded by retrooper.
 
-## Credit
-
-PacketEvents forked [Atlas](https://github.com/funkemunky/Atlas)' [Packet](https://github.com/funkemunky/Atlas/blob/master/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/tinyprotocol/api/Packet.java) class.
-
-[Find our forked version](https://github.com/retrooper/packetevents/blob/master/src/main/java/io/github/retrooper/packetevents/packet/PacketType.java)
 ## About
 
 This packetlistener is **only** supported on spigot servers and has been tested to work on these spigot forks: PaperSpigot, Tuinity

pom.xml

@@ -6,14 +6,13 @@
 
     <groupId>io.github.retrooper</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.3.9</version>
+    <version>1.4.1</version>
     <packaging>jar</packaging>
     <name>packetevents</name>
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-
     <build>
         <defaultGoal>clean package</defaultGoal>
         <plugins>

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

@@ -6,6 +6,7 @@ import io.github.retrooper.packetevents.event.impl.BukkitMoveEvent;
 import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
 import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
 import io.github.retrooper.packetevents.event.impl.ServerTickEvent;
+import io.github.retrooper.packetevents.packet.PacketType;
 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
@@ -22,21 +23,23 @@ public final class PacketEvents implements PacketListener, Listener {
     private static int currentTick;
     private static Plugin plugin;
     private static boolean hasLoaded;
+
     /**
      * Call this before start(), this is also very heavy
      */
     public static void load() {
         PacketTypeClasses.Client.load();
+        PacketTypeClasses.Server.load();
         hasLoaded = true;
     }
 
     /**
-     * Starts the server tick task and initiates the TinyProtocolHandler
+     * Starts the server tick task and registers what is needed to be registered
      *
      * @param plugin
      */
     public static void start(final Plugin plugin) {
-        if(!hasLoaded) {
+        if (!hasLoaded) {
             load();
         }
         if (!hasRegistered) {
@@ -49,7 +52,7 @@ public final class PacketEvents implements PacketListener, Listener {
             final Runnable tickRunnable = new Runnable() {
                 @Override
                 public void run() {
-                    getAPI().getEventManager().callEvent(new ServerTickEvent(currentTick++, PacketEvents.getAPI().currentPreciseMillis()));
+                    getAPI().getEventManager().callEvent(new ServerTickEvent(currentTick++, PacketEvents.getAPI().currentMillis()));
                 }
             };
             getAPI().setServerTickTask(Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, tickRunnable, 0L, 1L));
@@ -66,6 +69,9 @@ public final class PacketEvents implements PacketListener, Listener {
             getAPI().getServerTickTask().cancel();
         }
         getAPI().getEventManager().unregisterAllListeners();
+
+        PacketType.Client.packetIds.clear();
+        PacketType.Server.packetIds.clear();
     }
 
     public static PacketEventsAPI getAPI() {
@@ -95,7 +101,7 @@ public final class PacketEvents implements PacketListener, Listener {
      */
     @PacketHandler
     public void onInject(final PlayerInjectEvent e) {
-        getAPI().getPlayerUtilities().clientVersionsMap.put(e.getPlayer().getUniqueId(), e.getClientVersion());
+        getAPI().getPlayerUtilities().setClientVersion(e.getPlayer(), e.getClientVersion());
     }
 
     @PacketHandler
@@ -109,6 +115,7 @@ public final class PacketEvents implements PacketListener, Listener {
 
     @EventHandler
     public void onQuit(final PlayerQuitEvent e) {
+        getAPI().getPlayerUtilities().clearClientVersion(e.getPlayer());
         getAPI().getPlayerUtilities().uninjectPlayer(e.getPlayer());
     }
 

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

@@ -1,12 +1,16 @@
 package io.github.retrooper.packetevents;
 
 import io.github.retrooper.packetevents.event.manager.EventManager;
+import io.github.retrooper.packetevents.settings.Settings;
+import io.github.retrooper.packetevents.utils.api.PlayerUtils;
+import io.github.retrooper.packetevents.utils.api.ServerUtils;
 import org.bukkit.scheduler.BukkitTask;
 
 public final class PacketEventsAPI {
     private final EventManager eventManager = new EventManager();
     private final PlayerUtils playerUtils = new PlayerUtils();
     private final ServerUtils serverUtils = new ServerUtils();
+    private final Settings settings = new Settings();
 
     private BukkitTask serverTickTask;
 
@@ -67,6 +71,7 @@ public final class PacketEventsAPI {
      *
      * @return server tick task
      */
+    @Deprecated
     public BukkitTask getServerTickTask() {
         return serverTickTask;
     }
@@ -76,9 +81,14 @@ public final class PacketEventsAPI {
      *
      * @param task
      */
+    @Deprecated
     public void setServerTickTask(final BukkitTask task) {
         this.serverTickTask = task;
     }
 
+    public Settings getSettings() {
+        return settings;
+    }
+
 
 }

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

@@ -1,5 +1,6 @@
 package io.github.retrooper.packetevents.enums;
 
+import io.github.retrooper.packetevents.PacketEvents;
 import org.bukkit.Bukkit;
 
 /**
@@ -24,6 +25,9 @@ public enum ServerVersion {
                 return val;
             }
         }
+        if (PacketEvents.getAPI().getSettings().getDefaultServerVersion() != null) {
+            return PacketEvents.getAPI().getSettings().getDefaultServerVersion();
+        }
         return ERROR;
     }
 
@@ -34,6 +38,7 @@ public enum ServerVersion {
         return cachedVersion;
     }
 
+
     private static ServerVersion[] reverse(final ServerVersion[] arr) {
         ServerVersion[] array = arr.clone();
         if (array == null) {
@@ -57,7 +62,7 @@ public enum ServerVersion {
     }
 
     public static String getNMSDirectory() {
-        return "net.minecraft.server." + nmsVersionSuffix;
+        return "net.minecraft.server." + getNmsSuffix();
     }
 
     public static String getOBCDirectory() {

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

@@ -2,7 +2,6 @@ package io.github.retrooper.packetevents.event.impl;
 
 import io.github.retrooper.packetevents.event.PacketEvent;
 import io.github.retrooper.packetevents.packet.PacketType;
-import io.github.retrooper.packetevents.packet.PacketTypeClasses;
 import org.bukkit.entity.Player;
 
 public final class PacketReceiveEvent extends PacketEvent {
@@ -55,13 +54,15 @@ public final class PacketReceiveEvent extends PacketEvent {
 
     /**
      * Get the ID of the packet
+     *
      * @return packet id
      */
     public int getPacketId() {
-        if(PacketTypeClasses.Client.ARM_ANIMATION == null) {
-            System.out.println("why is arm null");
+        Integer id = PacketType.Client.packetIds.get(getNMSPacketClass());
+        if (id == null) {
+            return -1;
         }
-        return PacketType.Client.packetIds.get(getNMSPacketClass());
+        return id;
     }
 
     /**

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

@@ -27,6 +27,19 @@ public final class PacketSendEvent extends PacketEvent {
         return this.name;
     }
 
+    /**
+     * Get the ID of the packet
+     *
+     * @return packet id
+     */
+    public int getPacketId() {
+        Integer id =
+                PacketType.Server.packetIds.get(getNMSPacketClass());
+        if (id == null) {
+            return -1;
+        }
+        return id;
+    }
 
     /**
      * Get the NMS packet object

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

@@ -2,7 +2,7 @@ package io.github.retrooper.packetevents.event.impl;
 
 import io.github.retrooper.packetevents.enums.ClientVersion;
 import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.utils.api.VersionLookupUtils;
+import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
 import org.bukkit.entity.Player;
 
 public final class PlayerInjectEvent extends PacketEvent {

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

@@ -3,6 +3,7 @@ package io.github.retrooper.packetevents.event.impl;
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.PacketEvent;
 
+@Deprecated
 public final class ServerTickEvent extends PacketEvent {
     private final int tick;
     private final double tps;

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

@@ -72,10 +72,22 @@ public final class EventManager {
         }
     }
 
+    public void registerListeners(final PacketListener... listeners) {
+        for (final PacketListener listener : listeners) {
+            registerListener(listener);
+        }
+    }
+
     public void unregisterListener(final PacketListener e) {
         registeredMethods.remove(e);
     }
 
+    public void unregisterListeners(final PacketListener... listeners) {
+        for (final PacketListener listener : listeners) {
+            unregisterListener(listener);
+        }
+    }
+
     public void unregisterAllListeners() {
         registeredMethods.clear();
     }

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

@@ -1,17 +1,8 @@
 package io.github.retrooper.packetevents.example;
 
 import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.annotations.PacketHandler;
-import io.github.retrooper.packetevents.event.PacketListener;
-import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.packet.PacketType;
-import io.github.retrooper.packetevents.packetwrappers.in.useentity.WrappedPacketInUseEntity;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import static io.github.retrooper.packetevents.PacketEvents.getAPI;
-
 public class MainExample extends JavaPlugin {
 
     @Override
@@ -22,8 +13,8 @@ public class MainExample extends JavaPlugin {
     @Override
     public void onEnable() {
         PacketEvents.start(this);
-        getAPI().getServerTickTask().cancel();
-
+        //If packeteventa cannot detect your server version, it will use the recommended version
+        // getAPI().getSettings().setDefaultServerVersion(ServerVersion.v_1_7_10);
     }
 
     @Override

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

@@ -1,7 +1,6 @@
 package io.github.retrooper.packetevents.handler;
 
 import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
 import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
 import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;

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

@@ -10,24 +10,29 @@ public class PacketType {
         public static class Util {
             public static boolean isInstanceOfFlying(final int packetId) {
                 return packetId == FLYING
-                        || packetId == POSITION || packetId == POSITION_LOOK || packetId == LOOK;
+                        || packetId == POSITION
+                        || packetId == POSITION_LOOK
+                        || packetId == LOOK;
             }
         }
+
         public static final Map<Class<?>, Integer> packetIds = new HashMap<Class<?>, Integer>();
 
         public static final int TELEPORT_ACCEPT = 0,
-                TILE_NBT_QUERY = 1,
-                DIFFICULTY_CHANGE = 2,
-                CHAT = 3,
-                CLIENT_COMMAND = 4,
-                SETTINGS = 5,
-        TAB_COMPLETE = 6, TRANSACTION = 7, ENCHANT_ITEM =8,
-                WINDOW_CLICK = 9, CLOSE_WINDOW =10, CUSTOM_PAYLOAD = 11,
-                B_EDIT = 12, ENTITY_NBT_QUERY = 13, USE_ENTITY = 14, JIGSAW_GENERATE = 15, KEEP_ALIVE= 16, DIFFICULTY_LOCK = 17,
-        POSITION = 18, POSITION_LOOK = 19, LOOK = 20, FLYING = 21, VEHICLE_MOVE = 22, BOAT_MOVE = 23, PICK_ITEM = 24, AUTO_RECIPE = 25, ABILITIES = 26, BLOCK_DIG = 27, ENTITY_ACTION = 28, STEER_VEHICLE = 29, RECIPE_DISPLAYED = 30, ITEM_NAME = 31, RESOURCE_PACK_STATUS = 32, ADVANCEMENTS = 33, TR_SEL = 34, BEACON = 35, HELD_ITEM_SLOT = 36, SET_COMMAND_BLOCK = 37,
-                SET_COMMAND_MINECART = 38, SET_CREATIVE_SLOT = 39, SET_JIGSAW = 40, STRUCT = 41, UPDATE_SIGN = 42, ARM_ANIMATION = 43, SPECTATE = 44, USE_ITEM = 45, BLOCK_PLACE = 46;
+                TILE_NBT_QUERY = 1, DIFFICULTY_CHANGE = 2, CHAT = 3, CLIENT_COMMAND = 4,
+                SETTINGS = 5, TAB_COMPLETE = 6, TRANSACTION = 7, ENCHANT_ITEM = 8,
+                WINDOW_CLICK = 9, CLOSE_WINDOW = 10, CUSTOM_PAYLOAD = 11, B_EDIT = 12,
+                ENTITY_NBT_QUERY = 13, USE_ENTITY = 14, JIGSAW_GENERATE = 15, KEEP_ALIVE = 16,
+                DIFFICULTY_LOCK = 17, POSITION = 18, POSITION_LOOK = 19, LOOK = 20,
+                FLYING = 21, VEHICLE_MOVE = 22, BOAT_MOVE = 23, PICK_ITEM = 24,
+                AUTO_RECIPE = 25, ABILITIES = 26, BLOCK_DIG = 27, ENTITY_ACTION = 28,
+                STEER_VEHICLE = 29, RECIPE_DISPLAYED = 30, ITEM_NAME = 31, RESOURCE_PACK_STATUS = 32,
+                ADVANCEMENTS = 33, TR_SEL = 34, BEACON = 35, HELD_ITEM_SLOT = 36,
+                SET_COMMAND_BLOCK = 37, SET_COMMAND_MINECART = 38, SET_CREATIVE_SLOT = 39, SET_JIGSAW = 40,
+                STRUCT = 41, UPDATE_SIGN = 42, ARM_ANIMATION = 43, SPECTATE = 44,
+                USE_ITEM = 45, BLOCK_PLACE = 46;
 
-        public static void init(){
+        public static void init() {
             packetIds.put(PacketTypeClasses.Client.TELEPORT_ACCEPT, TELEPORT_ACCEPT);
             packetIds.put(PacketTypeClasses.Client.TILE_NBT_QUERY, TILE_NBT_QUERY);
             packetIds.put(PacketTypeClasses.Client.DIFFICULTY_CHANGE, DIFFICULTY_CHANGE);
@@ -77,4 +82,130 @@ public class PacketType {
             packetIds.put(PacketTypeClasses.Client.BLOCK_PLACE, BLOCK_PLACE);
         }
     }
+
+    public static class Server {
+        public static final Map<Class<?>, Integer> packetIds = new HashMap<Class<?>, Integer>();
+        public static int SPAWN_ENTITY = 0, SPAWN_ENTITY_EXPERIENCE_ORB = 1, SPAWN_ENTITY_WEATHER = 2, SPAWN_ENTITY_LIVING = 3,
+                SPAWN_ENTITY_PAINTING = 4, SPAWN_ENTITY_SPAWN = 5, ANIMATION = 6, STATISTIC = 7,
+                BLOCK_BREAK = 8, BLOCK_BREAK_ANIMATION = 9, TILE_ENTITY_DATA = 10, BLOCK_ACTION = 11,
+                BLOCK_CHANGE = 12, BOSS = 13, SERVER_DIFFICULTY = 14, CHAT = 15, MULTI_BLOCK_CHANGE = 16,
+                TAB_COMPLETE = 17, COMMANDS = 18, TRANSACTION = 19, CLOSE_WINDOW = 20,
+                WINDOW_ITEMS = 21, WINDOW_DATA = 22, SET_SLOT = 23, SET_COOLDOWN = 24,
+                CUSTOM_PAYLOAD = 25, CUSTOM_SOUND_EFFECT = 26, KICK_DISCONNECT = 27, ENTITY_STATUS = 28,
+                EXPLOSION = 29, UNLOAD_CHUNK = 30, GAME_STATE_CHANGE = 31, OPEN_WINDOW_HORSE = 32,
+                KEEP_ALIVE = 33, MAP_CHUNK = 34, WORLD_EVENT = 35, WORLD_PARTICLES = 36,
+                LIGHT_UPDATE = 37, LOGIN = 38, MAP = 39, OPEN_WINDOW_MERCHANT = 40,
+                REL_ENTITY_MOVE = 41, REL_ENTITY_MOVE_LOOK = 42, ENTITY_LOOK = 43, ENTITY = 44,
+                VEHICLE_MOVE = 45, OPEN_BOOK = 46, OPEN_WINDOW = 47, OPEN_SIGN_EDITOR = 48,
+                AUTO_RECIPE = 49, ABILITIES = 50, COMBAT_EVENT = 51, PLAYER_INFO = 52,
+                LOOK_AT = 53, POSITION = 54, RECIPES = 55, ENTITY_DESTROY = 56,
+                REMOVE_ENTITY_EFFECT = 57, RESOURCE_PACK_SEND = 58, RESPAWN = 59, ENTITY_HEAD_ROTATION = 60,
+                SELECT_ADVANCEMENT_TAB = 61, WORLD_BORDER = 62, CAMERA = 63, HELD_ITEM_SLOT = 64,
+                VIEW_CENTRE = 65, VIEW_DISTANCE = 66, SCOREBOARD_DISPLAY_OBJECTIVE = 67, ENTITY_METADATA = 68,
+                ATTACH_ENTITY = 69, ENTITY_VELOCITY = 70, ENTITY_EQUIPMENT = 71, EXPERIENCE = 72,
+                UPDATE_HEALTH = 73, SCOREBOARD_OBJECTIVE = 74, MOUNT = 75, SCOREBOARD_TEAM = 76,
+                SCOREBOARD_SCORE = 77, SPAWN_POSITION = 78, UPDATE_TIME = 79, TITLE = 80,
+                ENTITY_SOUND = 81, NAMED_SOUND_EFFECT = 82, STOP_SOUND = 83, PLAYER_LIST_HEADER_FOOTER = 84,
+                NBT_QUERY = 85, COLLECT = 86, ENTITY_TELEPORT = 87, ADVANCEMENTS = 88, UPDATE_ATTRIBUTES = 89,
+                ENTITY_EFFECT = 90, RECIPE_UPDATE = 91, TAGS = 92, MAP_CHUNK_BULK = 93;
+
+        public static void init() {
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY, SPAWN_ENTITY);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_EXPERIENCE_ORB, SPAWN_ENTITY_EXPERIENCE_ORB);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_WEATHER, SPAWN_ENTITY_WEATHER);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_LIVING, SPAWN_ENTITY_LIVING);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_PAINTING, SPAWN_ENTITY_PAINTING);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_SPAWN, SPAWN_ENTITY_SPAWN);
+            packetIds.put(PacketTypeClasses.Server.ANIMATION, ANIMATION);
+            packetIds.put(PacketTypeClasses.Server.STATISTIC, STATISTIC);
+            packetIds.put(PacketTypeClasses.Server.BLOCK_BREAK, BLOCK_BREAK);
+            packetIds.put(PacketTypeClasses.Server.BLOCK_BREAK_ANIMATION, BLOCK_BREAK_ANIMATION);
+            packetIds.put(PacketTypeClasses.Server.TILE_ENTITY_DATA, TILE_ENTITY_DATA);
+            packetIds.put(PacketTypeClasses.Server.BLOCK_ACTION, BLOCK_ACTION);
+            packetIds.put(PacketTypeClasses.Server.BLOCK_CHANGE, BLOCK_CHANGE);
+            packetIds.put(PacketTypeClasses.Server.BOSS, BOSS);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY, SPAWN_ENTITY);
+            packetIds.put(PacketTypeClasses.Server.SERVER_DIFFICULTY, SERVER_DIFFICULTY);
+            packetIds.put(PacketTypeClasses.Server.CHAT, CHAT);
+            packetIds.put(PacketTypeClasses.Server.MULTI_BLOCK_CHANGE, MULTI_BLOCK_CHANGE);
+            packetIds.put(PacketTypeClasses.Server.TAB_COMPLETE, TAB_COMPLETE);
+            packetIds.put(PacketTypeClasses.Server.COMMANDS, COMMANDS);
+            packetIds.put(PacketTypeClasses.Server.TRANSACTION, TRANSACTION);
+            packetIds.put(PacketTypeClasses.Server.CLOSE_WINDOW, CLOSE_WINDOW);
+            packetIds.put(PacketTypeClasses.Server.WINDOW_ITEMS, WINDOW_ITEMS);
+            packetIds.put(PacketTypeClasses.Server.WINDOW_DATA, WINDOW_DATA);
+            packetIds.put(PacketTypeClasses.Server.SET_SLOT, SET_SLOT);
+            packetIds.put(PacketTypeClasses.Server.CUSTOM_PAYLOAD, CUSTOM_PAYLOAD);
+            packetIds.put(PacketTypeClasses.Server.CUSTOM_SOUND_EFFECT, CUSTOM_SOUND_EFFECT);
+            packetIds.put(PacketTypeClasses.Server.KICK_DISCONNECT, KICK_DISCONNECT);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_STATUS, ENTITY_STATUS);
+            packetIds.put(PacketTypeClasses.Server.EXPLOSION, EXPLOSION);
+            packetIds.put(PacketTypeClasses.Server.UNLOAD_CHUNK, UNLOAD_CHUNK);
+            packetIds.put(PacketTypeClasses.Server.GAME_STATE_CHANGE, GAME_STATE_CHANGE);
+            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW_HORSE, OPEN_WINDOW_HORSE);
+            packetIds.put(PacketTypeClasses.Server.KEEP_ALIVE, KEEP_ALIVE);
+            packetIds.put(PacketTypeClasses.Server.MAP_CHUNK, MAP_CHUNK);
+            packetIds.put(PacketTypeClasses.Server.WORLD_EVENT, SPAWN_ENTITY);
+            packetIds.put(PacketTypeClasses.Server.WORLD_PARTICLES, WORLD_PARTICLES);
+            packetIds.put(PacketTypeClasses.Server.LIGHT_UPDATE, LIGHT_UPDATE);
+            packetIds.put(PacketTypeClasses.Server.LOGIN, LOGIN);
+            packetIds.put(PacketTypeClasses.Server.MAP, MAP);
+            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW_MERCHANT, OPEN_WINDOW_MERCHANT);
+            packetIds.put(PacketTypeClasses.Server.REL_ENTITY_MOVE, REL_ENTITY_MOVE);
+            packetIds.put(PacketTypeClasses.Server.REL_ENTITY_MOVE_LOOK, REL_ENTITY_MOVE_LOOK);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_LOOK, ENTITY_LOOK);
+            packetIds.put(PacketTypeClasses.Server.ENTITY, ENTITY);
+            packetIds.put(PacketTypeClasses.Server.VEHICLE_MOVE, VEHICLE_MOVE);
+            packetIds.put(PacketTypeClasses.Server.OPEN_BOOK, OPEN_BOOK);
+            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW, OPEN_WINDOW);
+            packetIds.put(PacketTypeClasses.Server.OPEN_SIGN_EDITOR, OPEN_SIGN_EDITOR);
+            packetIds.put(PacketTypeClasses.Server.AUTO_RECIPE, AUTO_RECIPE);
+            packetIds.put(PacketTypeClasses.Server.ABILITIES, ABILITIES);
+            packetIds.put(PacketTypeClasses.Server.COMBAT_EVENT, COMBAT_EVENT);
+            packetIds.put(PacketTypeClasses.Server.PLAYER_INFO, PLAYER_INFO);
+            packetIds.put(PacketTypeClasses.Server.LOOK_AT, LOOK_AT);
+            packetIds.put(PacketTypeClasses.Server.POSITION, POSITION);
+            packetIds.put(PacketTypeClasses.Server.RECIPES, RECIPES);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_DESTROY, ENTITY_DESTROY);
+            packetIds.put(PacketTypeClasses.Server.REMOVE_ENTITY_EFFECT, REMOVE_ENTITY_EFFECT);
+            packetIds.put(PacketTypeClasses.Server.RESOURCE_PACK_SEND, RESOURCE_PACK_SEND);
+            packetIds.put(PacketTypeClasses.Server.RESPAWN, RESPAWN);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_HEAD_ROTATION, ENTITY_HEAD_ROTATION);
+            packetIds.put(PacketTypeClasses.Server.SELECT_ADVANCEMENT_TAB, SELECT_ADVANCEMENT_TAB);
+            packetIds.put(PacketTypeClasses.Server.WORLD_BORDER, WORLD_BORDER);
+            packetIds.put(PacketTypeClasses.Server.CAMERA, CAMERA);
+            packetIds.put(PacketTypeClasses.Server.HELD_ITEM_SLOT, HELD_ITEM_SLOT);
+            packetIds.put(PacketTypeClasses.Server.VIEW_CENTRE, VIEW_CENTRE);
+            packetIds.put(PacketTypeClasses.Server.VIEW_DISTANCE, VIEW_DISTANCE);
+            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_DISPLAY_OBJECTIVE, SCOREBOARD_DISPLAY_OBJECTIVE);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_METADATA, ENTITY_METADATA);
+            packetIds.put(PacketTypeClasses.Server.ATTACH_ENTITY, ATTACH_ENTITY);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_VELOCITY, ENTITY_VELOCITY);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_EQUIPMENT, ENTITY_EQUIPMENT);
+            packetIds.put(PacketTypeClasses.Server.EXPERIENCE, EXPERIENCE);
+            packetIds.put(PacketTypeClasses.Server.UPDATE_HEALTH, UPDATE_HEALTH);
+            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_OBJECTIVE, SCOREBOARD_OBJECTIVE);
+            packetIds.put(PacketTypeClasses.Server.MOUNT, MOUNT);
+            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_TEAM, SCOREBOARD_TEAM);
+            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_SCORE, SCOREBOARD_SCORE);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_POSITION, SPAWN_POSITION);
+            packetIds.put(PacketTypeClasses.Server.UPDATE_TIME, UPDATE_TIME);
+            packetIds.put(PacketTypeClasses.Server.TITLE, TITLE);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_SOUND, ENTITY_SOUND);
+            packetIds.put(PacketTypeClasses.Server.NAMED_SOUND_EFFECT, NAMED_SOUND_EFFECT);
+            packetIds.put(PacketTypeClasses.Server.STOP_SOUND, STOP_SOUND);
+            packetIds.put(PacketTypeClasses.Server.PLAYER_LIST_HEADER_FOOTER, PLAYER_LIST_HEADER_FOOTER);
+            packetIds.put(PacketTypeClasses.Server.NBT_QUERY, NBT_QUERY);
+            packetIds.put(PacketTypeClasses.Server.COLLECT, COLLECT);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_TELEPORT, ENTITY_TELEPORT);
+            packetIds.put(PacketTypeClasses.Server.ADVANCEMENTS, ADVANCEMENTS);
+            packetIds.put(PacketTypeClasses.Server.UPDATE_ATTRIBUTES, UPDATE_ATTRIBUTES);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_EFFECT, ENTITY_EFFECT);
+            packetIds.put(PacketTypeClasses.Server.RECIPE_UPDATE, RECIPE_UPDATE);
+            packetIds.put(PacketTypeClasses.Server.TAGS, TAGS);
+            packetIds.put(PacketTypeClasses.Server.MAP_CHUNK_BULK, MAP_CHUNK_BULK);
+        }
+    }
+
+
 }

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

@@ -11,9 +11,9 @@ public class PacketTypeClasses {
                 WINDOW_CLICK, STEER_VEHICLE, CUSTOM_PAYLOAD, ARM_ANIMATION,
                 BLOCK_PLACE, USE_ITEM, ABILITIES, HELD_ITEM_SLOT,
                 CLOSE_WINDOW, TAB_COMPLETE, CHAT, SET_CREATIVE_SLOT,
-                KEEP_ALIVE,  SETTINGS , ENCHANT_ITEM, TELEPORT_ACCEPT,
+                KEEP_ALIVE, SETTINGS, ENCHANT_ITEM, TELEPORT_ACCEPT,
                 TILE_NBT_QUERY, DIFFICULTY_CHANGE, B_EDIT, ENTITY_NBT_QUERY,
-                JIGSAW_GENERATE, DIFFICULTY_LOCK, VEHICLE_MOVE, BOAT_MOVE,PICK_ITEM,
+                JIGSAW_GENERATE, DIFFICULTY_LOCK, VEHICLE_MOVE, BOAT_MOVE, PICK_ITEM,
                 AUTO_RECIPE, RECIPE_DISPLAYED, ITEM_NAME, RESOURCE_PACK_STATUS,
                 ADVANCEMENTS, TR_SEL, BEACON, SET_COMMAND_BLOCK,
                 SET_COMMAND_MINECART, SET_JIGSAW, STRUCT, UPDATE_SIGN, SPECTATE;
@@ -29,11 +29,11 @@ public class PacketTypeClasses {
             } catch (ClassNotFoundException e) {
                 POSITION = Reflection.getSubClass(FLYING, c + "Position");
                 POSITION_LOOK = Reflection.getSubClass(FLYING, c + "PositionLook");
-                LOOK = Reflection.getSubClass(FLYING,  c +"Look");
+                LOOK = Reflection.getSubClass(FLYING, c + "Look");
             }
 
             try {
-                SETTINGS = NMSUtils.getNMSClass(c +"Settings");
+                SETTINGS = NMSUtils.getNMSClass(c + "Settings");
                 ENCHANT_ITEM = NMSUtils.getNMSClass(c + "EnchantItem");
 
                 CLIENT_COMMAND = NMSUtils.getNMSClass(c + "ClientCommand");
@@ -97,6 +97,138 @@ public class PacketTypeClasses {
 
             PacketType.Client.init();
         }
+
+    }
+
+    public static class Server {
+        private static final String s = "PacketPlayOut";
+        public static Class<?> SPAWN_ENTITY, SPAWN_ENTITY_EXPERIENCE_ORB, SPAWN_ENTITY_WEATHER, SPAWN_ENTITY_LIVING,
+                SPAWN_ENTITY_PAINTING, SPAWN_ENTITY_SPAWN, ANIMATION, STATISTIC,
+                BLOCK_BREAK, BLOCK_BREAK_ANIMATION, TILE_ENTITY_DATA, BLOCK_ACTION,
+                BLOCK_CHANGE, BOSS, SERVER_DIFFICULTY, CHAT, MULTI_BLOCK_CHANGE,
+                TAB_COMPLETE, COMMANDS, TRANSACTION, CLOSE_WINDOW,
+                WINDOW_ITEMS, WINDOW_DATA, SET_SLOT, SET_COOLDOWN,
+                CUSTOM_PAYLOAD, CUSTOM_SOUND_EFFECT, KICK_DISCONNECT, ENTITY_STATUS,
+                EXPLOSION, UNLOAD_CHUNK, GAME_STATE_CHANGE, OPEN_WINDOW_HORSE,
+                KEEP_ALIVE, MAP_CHUNK, WORLD_EVENT, WORLD_PARTICLES,
+                LIGHT_UPDATE, LOGIN, MAP, OPEN_WINDOW_MERCHANT,
+                REL_ENTITY_MOVE, REL_ENTITY_MOVE_LOOK, ENTITY_LOOK, ENTITY,
+                VEHICLE_MOVE, OPEN_BOOK, OPEN_WINDOW, OPEN_SIGN_EDITOR,
+                AUTO_RECIPE, ABILITIES, COMBAT_EVENT, PLAYER_INFO,
+                LOOK_AT, POSITION, RECIPES, ENTITY_DESTROY,
+                REMOVE_ENTITY_EFFECT, RESOURCE_PACK_SEND, RESPAWN, ENTITY_HEAD_ROTATION,
+                SELECT_ADVANCEMENT_TAB, WORLD_BORDER, CAMERA, HELD_ITEM_SLOT,
+                VIEW_CENTRE, VIEW_DISTANCE, SCOREBOARD_DISPLAY_OBJECTIVE, ENTITY_METADATA,
+                ATTACH_ENTITY, ENTITY_VELOCITY, ENTITY_EQUIPMENT, EXPERIENCE,
+                UPDATE_HEALTH, SCOREBOARD_OBJECTIVE, MOUNT, SCOREBOARD_TEAM,
+                SCOREBOARD_SCORE, SPAWN_POSITION, UPDATE_TIME, TITLE,
+                ENTITY_SOUND, NAMED_SOUND_EFFECT, STOP_SOUND, PLAYER_LIST_HEADER_FOOTER,
+                NBT_QUERY, COLLECT, ENTITY_TELEPORT, ADVANCEMENTS, UPDATE_ATTRIBUTES,
+                ENTITY_EFFECT, RECIPE_UPDATE, TAGS, MAP_CHUNK_BULK;
+
+        public static void load() {
+            SPAWN_ENTITY = NMSUtils.getNMSClassWithoutException(s + "SpawnEntity");
+            SPAWN_ENTITY_EXPERIENCE_ORB = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityExperienceOrb");
+            SPAWN_ENTITY_WEATHER = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityWeather");
+            SPAWN_ENTITY_LIVING = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityLiving");
+            SPAWN_ENTITY_PAINTING = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityPainting");
+            SPAWN_ENTITY_SPAWN = NMSUtils.getNMSClassWithoutException(s + "SpawnEntitySpawn");
+            ANIMATION = NMSUtils.getNMSClassWithoutException(s + "Animation");
+            STATISTIC = NMSUtils.getNMSClassWithoutException(s + "Statistic");
+            BLOCK_BREAK = NMSUtils.getNMSClassWithoutException(s + "BlockBreak");
+            BLOCK_BREAK_ANIMATION = NMSUtils.getNMSClassWithoutException(s + "BlockBreakAnimation");
+            TILE_ENTITY_DATA = NMSUtils.getNMSClassWithoutException(s + "TileEntityData");
+            BLOCK_ACTION = NMSUtils.getNMSClassWithoutException(s + "BlockAction");
+            BLOCK_CHANGE = NMSUtils.getNMSClassWithoutException(s + "BlockChange");
+            BOSS = NMSUtils.getNMSClassWithoutException(s + "Boss");
+            SERVER_DIFFICULTY = NMSUtils.getNMSClassWithoutException(s + "ServerDifficulty");
+            CHAT = NMSUtils.getNMSClassWithoutException(s + "Chat");
+            MULTI_BLOCK_CHANGE = NMSUtils.getNMSClassWithoutException(s + "MultiBlockChange");
+            TAB_COMPLETE = NMSUtils.getNMSClassWithoutException(s + "TabComplete");
+            COMMANDS = NMSUtils.getNMSClassWithoutException(s + "Commands");
+            TRANSACTION = NMSUtils.getNMSClassWithoutException(s + "Transaction");
+            CLOSE_WINDOW = NMSUtils.getNMSClassWithoutException(s + "CloseWindow");
+            WINDOW_ITEMS = NMSUtils.getNMSClassWithoutException(s + "WindowItems");
+            WINDOW_DATA = NMSUtils.getNMSClassWithoutException(s + "WindowData");
+            SET_SLOT = NMSUtils.getNMSClassWithoutException(s + "SetSlot");
+            SET_COOLDOWN = NMSUtils.getNMSClassWithoutException(s + "SetCooldown");
+            CUSTOM_PAYLOAD = NMSUtils.getNMSClassWithoutException(s + "CustomPayload");
+            CUSTOM_SOUND_EFFECT = NMSUtils.getNMSClassWithoutException(s + "CustomSoundEffect");
+            KICK_DISCONNECT = NMSUtils.getNMSClassWithoutException(s + "KickDisconnect");
+            ENTITY_STATUS = NMSUtils.getNMSClassWithoutException(s + "EntityStatus");
+            EXPLOSION = NMSUtils.getNMSClassWithoutException(s + "Explosion");
+            UNLOAD_CHUNK = NMSUtils.getNMSClassWithoutException(s + "UnloadChunk");
+            GAME_STATE_CHANGE = NMSUtils.getNMSClassWithoutException(s + "GameStateChange");
+            OPEN_WINDOW_HORSE = NMSUtils.getNMSClassWithoutException(s + "OpenWindowHorse");
+            KEEP_ALIVE = NMSUtils.getNMSClassWithoutException(s + "KeepAlive");
+            MAP_CHUNK = NMSUtils.getNMSClassWithoutException(s + "MapChunk");
+            WORLD_EVENT = NMSUtils.getNMSClassWithoutException(s + "WorldEvent");
+            WORLD_PARTICLES = NMSUtils.getNMSClassWithoutException(s + "WorldParticles");
+            LIGHT_UPDATE = NMSUtils.getNMSClassWithoutException(s + "LightUpdate");
+            LOGIN = NMSUtils.getNMSClassWithoutException(s + "Login");
+            MAP = NMSUtils.getNMSClassWithoutException(s + "Map");
+            OPEN_WINDOW_MERCHANT = NMSUtils.getNMSClassWithoutException(s + "OpenWindowMerchant");
+            ENTITY = NMSUtils.getNMSClassWithoutException(s + "Entity");
+            REL_ENTITY_MOVE = Reflection.getSubClass(ENTITY, s + "RelEntityMove");
+            REL_ENTITY_MOVE_LOOK = Reflection.getSubClass(ENTITY, s + "RelEntityMoveLook");
+            ENTITY_LOOK = Reflection.getSubClass(ENTITY, s + "EntityLook");
+            if (REL_ENTITY_MOVE == null) {
+                //is not a subclass and should be accessed normally
+                REL_ENTITY_MOVE = NMSUtils.getNMSClassWithoutException(s + "RelEntityMove");
+                REL_ENTITY_MOVE_LOOK = NMSUtils.getNMSClassWithoutException(s + "RelEntityMoveLook");
+                ENTITY_LOOK = NMSUtils.getNMSClassWithoutException(s + "RelEntityLook");
+            }
+            VEHICLE_MOVE = NMSUtils.getNMSClassWithoutException(s + "VehicleMove");
+            OPEN_BOOK = NMSUtils.getNMSClassWithoutException(s + "OpenBook");
+            OPEN_WINDOW = NMSUtils.getNMSClassWithoutException(s + "OpenWindow");
+            OPEN_SIGN_EDITOR = NMSUtils.getNMSClassWithoutException(s + "OpenSignEditor");
+            AUTO_RECIPE = NMSUtils.getNMSClassWithoutException(s + "AutoRecipe");
+            ABILITIES = NMSUtils.getNMSClassWithoutException(s + "Abilities");
+            COMBAT_EVENT = NMSUtils.getNMSClassWithoutException(s + "CombatEvent");
+            PLAYER_INFO = NMSUtils.getNMSClassWithoutException(s + "PlayerInfo");
+            LOOK_AT = NMSUtils.getNMSClassWithoutException(s + "LookAt");
+            POSITION = NMSUtils.getNMSClassWithoutException(s + "Position");
+            RECIPES = NMSUtils.getNMSClassWithoutException(s + "Recipes");
+            ENTITY_DESTROY = NMSUtils.getNMSClassWithoutException(s + "EntityDestroy");
+            REMOVE_ENTITY_EFFECT = NMSUtils.getNMSClassWithoutException(s + "RemoveEntityEffect");
+            RESOURCE_PACK_SEND = NMSUtils.getNMSClassWithoutException(s + "ResourcePackSend");
+            RESPAWN = NMSUtils.getNMSClassWithoutException(s + "Respawn");
+            ENTITY_HEAD_ROTATION = NMSUtils.getNMSClassWithoutException(s + "EntityHeadRotation");
+            SELECT_ADVANCEMENT_TAB = NMSUtils.getNMSClassWithoutException(s + "SelectAdvancementTab");
+            WORLD_BORDER = NMSUtils.getNMSClassWithoutException(s + "WorldBorder");
+            CAMERA = NMSUtils.getNMSClassWithoutException(s + "Camera");
+            HELD_ITEM_SLOT = NMSUtils.getNMSClassWithoutException(s + "HeldItemSlot");
+            VIEW_CENTRE = NMSUtils.getNMSClassWithoutException(s + "ViewCentre");
+            VIEW_DISTANCE = NMSUtils.getNMSClassWithoutException(s + "ViewDistance");
+            SCOREBOARD_DISPLAY_OBJECTIVE = NMSUtils.getNMSClassWithoutException(s + "ScoreboardDisplayObjective");
+            ENTITY_METADATA = NMSUtils.getNMSClassWithoutException(s + "EntityMetadata");
+            ATTACH_ENTITY = NMSUtils.getNMSClassWithoutException(s + "AttachEntity");
+            ENTITY_VELOCITY = NMSUtils.getNMSClassWithoutException(s + "EntityVelocity");
+            ENTITY_EQUIPMENT = NMSUtils.getNMSClassWithoutException(s + "EntityEquipment");
+            EXPERIENCE = NMSUtils.getNMSClassWithoutException(s + "Experience");
+            UPDATE_HEALTH = NMSUtils.getNMSClassWithoutException(s + "UpdateHealth");
+            SCOREBOARD_OBJECTIVE = NMSUtils.getNMSClassWithoutException(s + "ScoreboardObjective");
+            MOUNT = NMSUtils.getNMSClassWithoutException(s + "Mount");
+            SCOREBOARD_TEAM = NMSUtils.getNMSClassWithoutException(s + "ScoreboardTeam");
+            SCOREBOARD_SCORE = NMSUtils.getNMSClassWithoutException(s + "ScoreboardScore");
+            SPAWN_POSITION = NMSUtils.getNMSClassWithoutException(s + "SpawnPosition");
+            UPDATE_TIME = NMSUtils.getNMSClassWithoutException(s + "UpdateTime");
+            TITLE = NMSUtils.getNMSClassWithoutException(s + "Title");
+            ENTITY_SOUND = NMSUtils.getNMSClassWithoutException(s + "EntitySound");
+            NAMED_SOUND_EFFECT = NMSUtils.getNMSClassWithoutException(s + "NamedSoundEffect");
+            STOP_SOUND = NMSUtils.getNMSClassWithoutException(s + "StopSound");
+            PLAYER_LIST_HEADER_FOOTER = NMSUtils.getNMSClassWithoutException(s + "PlayerListHeaderFooter");
+            NBT_QUERY = NMSUtils.getNMSClassWithoutException(s + "NBTQuery");
+            COLLECT = NMSUtils.getNMSClassWithoutException(s + "Collect");
+            ENTITY_TELEPORT = NMSUtils.getNMSClassWithoutException(s + "EntityTeleport");
+            ADVANCEMENTS = NMSUtils.getNMSClassWithoutException(s + "Advancements");
+            UPDATE_ATTRIBUTES = NMSUtils.getNMSClassWithoutException(s + "UpdateAttributes");
+            ENTITY_EFFECT = NMSUtils.getNMSClassWithoutException(s + "EntityEffect");
+            RECIPE_UPDATE = NMSUtils.getNMSClassWithoutException(s + "RecipeUpdate");
+            TAGS = NMSUtils.getNMSClassWithoutException(s + "Tags");
+            MAP_CHUNK_BULK = NMSUtils.getNMSClassWithoutException(s + "MapChunkBulk");
+            PacketType.Server.init();
+        }
     }
 
 }

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

@@ -1,178 +0,0 @@
-package io.github.retrooper.packetevents.packet;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-@Deprecated
-public final class PacketTypeNames {
-    private static final ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();
-
-
-    public static final class Util {
-        private static Class<?> packetPlayInFlying, packetPlayInPosition, packetPlayInPositionLook, packetPlayInLook, packetPlayInUseEntity;
-
-        static {
-            try {
-                //Only exists in 1.7->1.8.8 & 1.16 protocol
-                packetPlayInFlying = NMSUtils.getNMSClass(Client.FLYING);
-            } catch (ClassNotFoundException e) {
-                //That is fine, they are on 1.9->1.15.2
-            }
-            try {
-                packetPlayInPosition = NMSUtils.getNMSClass(Client.POSITION);
-                packetPlayInPositionLook = NMSUtils.getNMSClass(Client.POSITION_LOOK);
-                packetPlayInLook = NMSUtils.getNMSClass(Client.LOOK);
-
-            } catch (ClassNotFoundException e) {
-                packetPlayInPosition = Reflection.getSubClass(packetPlayInFlying, Client.POSITION);
-                packetPlayInPositionLook = Reflection.getSubClass(packetPlayInFlying, Client.POSITION_LOOK);
-                packetPlayInLook = Reflection.getSubClass(packetPlayInFlying, Client.LOOK);
-            }
-
-            try {
-                packetPlayInUseEntity = NMSUtils.getNMSClass(Client.USE_ENTITY);
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
-        }
-
-        /**
-         * Is this NMS packet an instance of the "PacketPlayInFlying" packet?
-         * Supports 1.9->1.15.2 too!
-         *
-         * @param nmsPacket
-         * @return If the nms packet provided is an instanceof the "PacketPlayInFlying" packet in the 1.8 protocol & 1.16 protocol!
-         */
-        public static boolean isInstanceOfFlyingPacket(final Object nmsPacket) {
-            //1.7->1.8.8
-            if (packetPlayInFlying != null) {
-                return packetPlayInFlying.isInstance(nmsPacket);
-            } else {
-                //1.9->1.15.2
-                return isInstanceOfPositionOrPositionLook(nmsPacket) || isInstanceOfPositionLookPacket(nmsPacket);
-            }
-        }
-
-        /**
-         * Is this NMS packet an instance of the "PacketPlayInPosition" packet?
-         *
-         * @param nmsPacket
-         * @return nmsPacket instanceof PacketPlayInPosition
-         */
-        public static boolean isInstanceOfPositionPacket(final Object nmsPacket) {
-            return packetPlayInPosition.isInstance(nmsPacket);
-        }
-
-        /**
-         * Is this NMS packet an instance of the "PacketPlayInPositionLook" packet?
-         *
-         * @param nmsPacket
-         * @return nmsPacket instanceof PacketPlayInPositionLook
-         */
-        public static boolean isInstanceOfPositionLookPacket(final Object nmsPacket) {
-            return packetPlayInPositionLook.isInstance(nmsPacket);
-        }
-
-        /**
-         * Is this NMS Packet an instanceof the "PacketPlayInPosition" or "PacketPlayInPositionLook"
-         *
-         * @param nmsPacket
-         * @return nmsPacket instanceof PacketPlayInPosition || nmsPacket instanceof PacketPlayInPositionLook
-         */
-        public static boolean isInstanceOfPositionOrPositionLook(final Object nmsPacket) {
-            return isInstanceOfPositionPacket(nmsPacket) || isInstanceOfPositionLookPacket(nmsPacket);
-        }
-
-        /**
-         * Is this NMS Packet an instance of the "PacketPlayInLook" packet?
-         *
-         * @param nmsPacket
-         * @return nmsPacket instanceof PacketPlayInLook
-         */
-        public static boolean isInstanceOfLook(final Object nmsPacket) {
-            return packetPlayInLook.isInstance(nmsPacket);
-        }
-
-        public static boolean isInstanceOfUseEntity(final Object nmsPacket) {
-            return packetPlayInUseEntity.isInstance(nmsPacket);
-        }
-    }
-
-    public static final class Client {
-        private static final String c = "PacketPlayIn";
-        /*
-         * Only exists in 1.7.10->1.8.8 & 1.16+
-         */
-        public static final String FLYING = c + "Flying";
-
-
-        public static final String POSITION = c + "Position";
-
-        public static final String POSITION_LOOK = c + "PositionLook";
-
-        public static final String LOOK = c + "Look";
-        public static final String CLIENT_COMMAND = c + "ClientCommand";
-
-        public static final String TRANSACTION = c + "Transaction";
-        public static final String BLOCK_DIG = c + "BlockDig";
-        public static final String ENTITY_ACTION = c + "EntityAction";
-        public static final String USE_ENTITY = c + "UseEntity";
-        public static final String WINDOW_CLICK = c + "WindowClick";
-        public static final String STEER_VEHICLE = c + "SteerVehicle";
-        public static final String CUSTOM_PAYLOAD = c + "CustomPayload";
-        public static final String ARM_ANIMATION = c + "ArmAnimation";
-        /**
-         * The packet name of the block place depending on your server version, "PacketPlayInBlockPlace" or "PacketPlayInUseItem"
-         */
-        public static final String BLOCK_PLACE = c + ((ServerVersion.getVersion().isHigherThan(ServerVersion.v_1_8_8)) ? "UseItem" : "BlockPlace");
-
-        public static final String ABILITIES = c + "Abilities";
-        public static final String HELD_ITEM_SLOT = c + "HeldItemSlot";
-        public static final String CLOSE_WINDOW = c + "CloseWindow";
-        public static final String TAB_COMPLETE = c + "TabComplete";
-        public static final String CHAT = c + "Chat";
-        public static final String SET_CREATIVE_SLOT = c + "SetCreativeSlot";
-
-        public static final String KEEP_ALIVE = c + "KeepAlive";
-    }
-
-    public static final class Server {
-        private static final String s = "PacketPlayOut";
-
-        public static final String ANIMATION = s + "Animation";
-        public static final String KEEP_ALIVE = s + "KeepAlive";
-        public static final String CHAT = s + "Chat";
-        public static final String POSITION = s + "Position";
-        public static final String TRANSACTION = s + "Transaction";
-        public static final String NAMED_ENTITY_SPAWN = s + "NamedEntitySpawn";
-        public static final String SPAWN_ENTITY_LIVING = s + "SpawnEntityLiving";
-        public static final String SPAWN_ENTITY = s + "SpawnEntity";
-        public static final String CUSTOM_PAYLOAD = s + "CustomPayload";
-        public static final String ABILITIES = s + "Abilities";
-        public static final String ENTITY_METADATA = s + "EntityMetadata";
-        public static final String ENTITY_VELOCITY = s + "EntityVelocity";
-        public static final String ENTITY_DESTROY = s + "EntityDestroy";
-        public static final String ENTITY_HEAD_ROTATION = s + "EntityHeadRotation";
-        public static final String BLOCK_CHANGE = s + "BlockChange";
-        public static final String CLOSE_WINDOW = s + "CloseWindow";
-        public static final String HELD_ITEM_SLOT = s + "HeldItemSlot";
-        public static final String TAB_COMPLETE = s + "TabComplete";
-        public static final String RESPAWN = s + "Respawn";
-        public static final String WORLD_PARTICLES = s + "WorldParticles";
-        public static final String COMMANDS = s + "Commands";
-        public static final String OPEN_WINDOW = s + "OpenWindow";
-        public static final String LOGIN = s + "Login";
-        public static final String SERVER_DIFFICULTY = s + "ServerDifficulty";
-    }
-
-    public static final class Login {
-        public static final String HANDSHAKE = "PacketHandshakingInSetProtocol";
-        public static final String PING = "PacketStatusInPing";
-        public static final String START = "PacketStatusInStart";
-        public static final String SUCCESS = "PacketLoginOutSuccess";
-        public static final String ENCRYPTION_BEGIN_IN = "PacketLoginInEncryptionBegin";
-        public static final String ENCRYPTION_BEGIN_OUT = "PacketLoginOutEncryptionBegin";
-    }
-
-}

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

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

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

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

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

@@ -1,5 +1,6 @@
 package io.github.retrooper.packetevents.utils;
 
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.annotations.Nullable;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
@@ -15,18 +16,24 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 public final class NMSUtils {
-    private static final ServerVersion version = ServerVersion.getVersion();
-    public static final String nettyPrefix = version.isLowerThan(ServerVersion.v_1_8) ? "net.minecraft.util.io.netty" : "io.netty";
+    private static final ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();
+    public static String nettyPrefix;
     private static final String nmsDir = ServerVersion.getNMSDirectory();
     private static final String obcDir = ServerVersion.getOBCDirectory();
     public static Class<?> minecraftServerClass, craftWorldsClass,
             packetClass, entityPlayerClass, playerConnectionClass,
             craftPlayerClass, serverConnectionClass, craftEntityClass,
             craftItemStack, nmsItemStackClass, networkManagerClass, nettyChannelClass;
-    private static Method getServerMethod, getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
-    private static Field recentTPSField, entityPlayerPingField, playerConnectionField;
+    private static Method getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
+    private static Field entityPlayerPingField, playerConnectionField;
 
     static {
+        try {
+            nettyPrefix = "io.netty";
+            Class.forName("io.netty.channel.Channel");
+        } catch (ClassNotFoundException e) {
+            nettyPrefix = "net.minecraft.util.io.netty";
+        }
         try {
             nettyChannelClass = getNettyClass("channel.Channel");
             minecraftServerClass = getNMSClass("MinecraftServer");
@@ -46,7 +53,6 @@ public final class NMSUtils {
 
         //METHODS
         try {
-            getServerMethod = minecraftServerClass.getMethod("getServer");
             getCraftWorldHandleMethod = craftWorldsClass.getMethod("getHandle");
             getCraftPlayerHandle = craftPlayerClass.getMethod("getHandle");
             getCraftEntityHandle = craftEntityClass.getMethod("getHandle");
@@ -59,7 +65,6 @@ public final class NMSUtils {
 
 
         try {
-            recentTPSField = minecraftServerClass.getField("recentTps");
             entityPlayerPingField = entityPlayerClass.getField("ping");
             playerConnectionField = entityPlayerClass.getField("playerConnection");
         } catch (NoSuchFieldException e) {
@@ -68,13 +73,12 @@ public final class NMSUtils {
     }
 
     public static Object getMinecraftServerInstance() throws InvocationTargetException, IllegalAccessException {
-        return getServerMethod.invoke(null);
+        return Reflection.getMethod(minecraftServerClass, "getServer", 0).invoke(null);
     }
 
     public static double[] recentTPS() throws IllegalAccessException, InvocationTargetException {
         final Object minecraftServerObj = getMinecraftServerInstance();
-        double[] recentTPS = (double[]) recentTPSField.get(minecraftServerObj);
-        return recentTPS;
+        return (double[]) Reflection.getField(minecraftServerClass, double[].class, 0).get(minecraftServerObj);
     }
 
     public static Class<?> getNMSClass(String name) throws ClassNotFoundException {

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

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents;
+package io.github.retrooper.packetevents.utils.api;
 
 import io.github.retrooper.packetevents.enums.ClientVersion;
 import io.github.retrooper.packetevents.handler.NettyPacketHandler;
@@ -9,10 +9,21 @@ import org.bukkit.entity.Player;
 import java.util.HashMap;
 import java.util.UUID;
 
-public class PlayerUtils {
-    protected final HashMap<UUID, ClientVersion> clientVersionsMap = new HashMap<UUID, ClientVersion>();
+public final class PlayerUtils {
+    private final HashMap<UUID, ClientVersion> clientVersionsMap = new HashMap<UUID, ClientVersion>();
 
+    /**
+     * Use {@link #getPing(Player)}
+     *
+     * @param player
+     * @return
+     */
+    @Deprecated
     public int getPlayerPing(final Player player) {
+        return getPing(player);
+    }
+
+    public int getPing(final Player player) {
         return NMSUtils.getPlayerPing(player);
     }
 
@@ -24,6 +35,22 @@ public class PlayerUtils {
         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);
     }

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

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents;
+package io.github.retrooper.packetevents.utils.api;
 
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.enums.SystemOS;
@@ -6,7 +6,7 @@ import io.github.retrooper.packetevents.utils.NMSUtils;
 
 import java.lang.reflect.InvocationTargetException;
 
-public class ServerUtils {
+public final class ServerUtils {
     public ServerVersion getServerVersion() {
         return ServerVersion.getVersion();
     }

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

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;
 
 import com.comphenix.protocol.ProtocolLibrary;
 import org.bukkit.entity.Player;

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

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

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

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;
 
 import org.bukkit.entity.Player;
 import protocolsupport.api.ProtocolSupportAPI;

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

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

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

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;
 
 import org.bukkit.entity.Player;
 

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

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;
 
 import org.bukkit.entity.Player;
 import us.myles.ViaVersion.api.Via;

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

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;