All is working,

1.3.9 releasing soon ane about to post on spigotmc

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.retrooper</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.3.8</version>
+    <version>1.3.9</version>
     <packaging>jar</packaging>
     <name>packetevents</name>
     <properties>
@@ -74,6 +74,7 @@
             <version>1.7.10</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.github.spigot</groupId>
             <artifactId>1.8.8</artifactId>

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

@@ -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.PacketTypeClasses;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -20,6 +21,14 @@ public final class PacketEvents implements PacketListener, Listener {
     private static boolean hasRegistered;
     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();
+        hasLoaded = true;
+    }
 
     /**
      * Starts the server tick task and initiates the TinyProtocolHandler
@@ -27,6 +36,9 @@ public final class PacketEvents implements PacketListener, Listener {
      * @param plugin
      */
     public static void start(final Plugin plugin) {
+        if(!hasLoaded) {
+            load();
+        }
         if (!hasRegistered) {
             //Register Bukkit and PacketListener
             getAPI().getEventManager().registerListener(getInstance());

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

@@ -15,6 +15,7 @@ public final class PacketEventsAPI {
      * Preciser than #currentMillis()
      * Expensive
      * Returns crazy values when you change system time
+     *
      * @return {@link System#nanoTime()} / 1000000(1 million)
      */
     public long currentPreciseMillis() {
@@ -35,6 +36,7 @@ public final class PacketEventsAPI {
 
     /**
      * Get all utilities to do with the player
+     *
      * @return Player Utilities
      */
     public PlayerUtils getPlayerUtilities() {
@@ -43,6 +45,7 @@ public final class PacketEventsAPI {
 
     /**
      * Get all utilities to do with the server
+     *
      * @return Server Utilities
      */
     public ServerUtils getServerUtilities() {
@@ -52,6 +55,7 @@ public final class PacketEventsAPI {
     /**
      * Get the event manager
      * Used to call events, register and unregister listeners
+     *
      * @return PacketEvents' event manager
      */
     public EventManager getEventManager() {
@@ -60,6 +64,7 @@ public final class PacketEventsAPI {
 
     /**
      * Get the server tick task, called **asynchronously** every tick
+     *
      * @return server tick task
      */
     public BukkitTask getServerTickTask() {
@@ -68,6 +73,7 @@ public final class PacketEventsAPI {
 
     /**
      * Modify the server tick task object
+     *
      * @param task
      */
     public void setServerTickTask(final BukkitTask task) {

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

@@ -25,7 +25,7 @@ public class ServerUtils {
         return getRecentServerTPS()[0];
     }
 
-    public SystemOS getPlatform(){
+    public SystemOS getPlatform() {
         return SystemOS.getOperatingSystem();
     }
 }

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

@@ -1,6 +1,7 @@
 package io.github.retrooper.packetevents.annotations;
 
 import io.github.retrooper.packetevents.annotations.data.EventSynchronization;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

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

@@ -28,7 +28,7 @@ public enum ServerVersion {
     }
 
     public static ServerVersion getVersion() {
-        if(cachedVersion == null) {
+        if (cachedVersion == null) {
             cachedVersion = getVers();
         }
         return cachedVersion;

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

@@ -8,7 +8,7 @@ public enum SystemOS {
     private static SystemOS getOS() {
         final String os = System.getProperty("os.name");
         for (final String osName : getOperatingSystemNames()) {
-            if(os.toLowerCase().contains(osName.toLowerCase())) {
+            if (os.toLowerCase().contains(osName.toLowerCase())) {
                 return SystemOS.valueOf(osName);
             }
         }
@@ -16,7 +16,7 @@ public enum SystemOS {
     }
 
     public static SystemOS getOperatingSystem() {
-        if(value == null) {
+        if (value == null) {
             value = getOS();
         }
         return value;

src/main/java/io/github/retrooper/packetevents/enums/minecraft/PlayerDigType.java

@@ -16,6 +16,8 @@ public enum PlayerDigType {
 
     SWAP_HELD_ITEMS,
 
+    SWAP_ITEM_WITH_OFFHAND,
+
     WRONG_PACKET;
 
     public static PlayerDigType get(final int i) {

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

@@ -4,13 +4,9 @@ package io.github.retrooper.packetevents.event;
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 
-/**
- * Incoming and sent packets are called asynchronously,
- * recommended to avoid non thread safe bukkit operations
- */
 public class PacketEvent {
     protected static ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();
-    protected long timestamp = PacketEvents.getAPI().currentPreciseMillis();
+    private long timestamp = PacketEvents.getAPI().currentMillis();
 
     /**
      * Timestamp of the packet
@@ -20,4 +16,8 @@ public class PacketEvent {
     public long getTimestamp() {
         return timestamp;
     }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
 }

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

@@ -1,6 +1,8 @@
 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 {
@@ -44,12 +46,24 @@ public final class PacketReceiveEvent extends PacketEvent {
 
     /**
      * Get the class of the NMS packet object
+     *
      * @return packet object class
      */
     public Class<?> getNMSPacketClass() {
         return getNMSPacket().getClass();
     }
 
+    /**
+     * 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");
+        }
+        return PacketType.Client.packetIds.get(getNMSPacketClass());
+    }
+
     /**
      * Returns if the packet has been cancelled
      *

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

@@ -1,6 +1,7 @@
 package io.github.retrooper.packetevents.event.impl;
 
 import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.packet.PacketType;
 import org.bukkit.entity.Player;
 
 
@@ -38,6 +39,7 @@ public final class PacketSendEvent extends PacketEvent {
 
     /**
      * Get the class of the NMS packet object
+     *
      * @return packet object class
      */
     public Class<?> getNMSPacketClass() {

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

@@ -9,7 +9,7 @@ public final class ServerTickEvent extends PacketEvent {
 
     public ServerTickEvent(final int tick, final long timestamp) {
         this.tick = tick;
-        this.timestamp = timestamp;
+        setTimestamp(timestamp);
         this.tps = PacketEvents.getAPI().getServerUtilities().getCurrentServerTPS();
     }
 
@@ -19,10 +19,6 @@ public final class ServerTickEvent extends PacketEvent {
     }
 
 
-    public long getTimestamp() {
-        return timestamp;
-    }
-
     public int getCurrentTick() {
         return tick;
     }

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

@@ -22,6 +22,7 @@ public final class EventManager {
     public EventManager(final int threadCount) {
         executorService = Executors.newFixedThreadPool(threadCount);
     }
+
     public EventManager() {
         this(Runtime.getRuntime().availableProcessors());
     }

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

@@ -1,23 +1,33 @@
 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
+    public void onLoad() {
+        PacketEvents.load();
+    }
+
     @Override
     public void onEnable() {
         PacketEvents.start(this);
-
-
         getAPI().getServerTickTask().cancel();
+
     }
 
     @Override
     public void onDisable() {
         PacketEvents.stop();
     }
-
 }

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

@@ -12,13 +12,21 @@ import java.util.concurrent.Future;
 
 public class NettyPacketHandler {
     public static final String handlerName = "packet_handler";
-    private static final ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();
+    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 (version.isLowerThan(ServerVersion.v_1_8)) {
+            if (v1_7_nettyMode) {
                 NettyPacketHandler_7.injectPlayer(player);
             } else {
                 NettyPacketHandler_8.injectPlayer(player);
@@ -30,7 +38,7 @@ public class NettyPacketHandler {
         final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
         PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
         if (!uninjectEvent.isCancelled()) {
-            if (version.isLowerThan(ServerVersion.v_1_8)) {
+            if (v1_7_nettyMode) {
                 return NettyPacketHandler_7.uninjectPlayer(player);
             } else {
                 return NettyPacketHandler_8.uninjectPlayer(player);

src/main/java/io/github/retrooper/packetevents/mojang/GameProfile.java

@@ -1,84 +0,0 @@
-package io.github.retrooper.packetevents.mojang;
-
-import com.mojang.authlib.properties.PropertyMap;
-
-import java.util.UUID;
-
-public final class GameProfile {
-    private final UUID id;
-    private final String name;
-    private final PropertyMap properties = new PropertyMap();
-    private boolean legacy;
-
-    public GameProfile(UUID id, String name) {
-        if (id == null && name.isEmpty()) {
-            throw new IllegalArgumentException("Name and ID cannot both be blank");
-        } else {
-            this.id = id;
-            this.name = name;
-        }
-    }
-
-    public UUID getId() {
-        return this.id;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public PropertyMap getProperties() {
-        return this.properties;
-    }
-
-    public boolean isComplete() {
-        return this.id != null && !getName().isEmpty();
-    }
-
-
-    public boolean isLegacy() {
-        return this.legacy;
-    }
-
-    public boolean equals(com.mojang.authlib.GameProfile profile) {
-        if (profile != null) {
-            return profile.getId() != null && getId() != null && profile.getId() == getId()
-                    && profile.getName() != null && getName() != null && profile.getName().equals(getName());
-        }
-        return false;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        } else if (o != null && this.getClass() == o.getClass()) {
-            GameProfile that = (GameProfile) o;
-            if (this.id != null) {
-                if (!this.id.equals(that.id)) {
-                    return false;
-                }
-            } else if (that.id != null) {
-                return false;
-            }
-
-            if (this.name != null) {
-                return this.name.equals(that.name);
-            } else return that.name == null;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        int result = this.id != null ? this.id.hashCode() : 0;
-        result = 31 * result + (this.name != null ? this.name.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "id: " + id + ", name: " + name + ", legacy: " + legacy;
-    }
-}

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

@@ -1,178 +1,80 @@
 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;
+import java.util.HashMap;
+import java.util.Map;
 
-public final class PacketType {
-    private static final ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();
+public class PacketType {
 
 
-    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();
+    public static class Client {
+        public static class Util {
+            public static boolean isInstanceOfFlying(final int packetId) {
+                return packetId == FLYING
+                        || packetId == POSITION || packetId == POSITION_LOOK || packetId == LOOK;
             }
         }
+        public static final Map<Class<?>, Integer> packetIds = new HashMap<Class<?>, Integer>();
 
-        /**
-         * 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);
-            }
-        }
+        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;
 
-        /**
-         * 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 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);
+            packetIds.put(PacketTypeClasses.Client.CHAT, CHAT);
+            packetIds.put(PacketTypeClasses.Client.CLIENT_COMMAND, CLIENT_COMMAND);
+            packetIds.put(PacketTypeClasses.Client.SETTINGS, SETTINGS);
+            packetIds.put(PacketTypeClasses.Client.TAB_COMPLETE, TAB_COMPLETE);
+            packetIds.put(PacketTypeClasses.Client.TRANSACTION, TRANSACTION);
+            packetIds.put(PacketTypeClasses.Client.ENCHANT_ITEM, ENCHANT_ITEM);
+            packetIds.put(PacketTypeClasses.Client.WINDOW_CLICK, WINDOW_CLICK);
+            packetIds.put(PacketTypeClasses.Client.CLOSE_WINDOW, CLOSE_WINDOW);
+            packetIds.put(PacketTypeClasses.Client.CUSTOM_PAYLOAD, CUSTOM_PAYLOAD);
+            packetIds.put(PacketTypeClasses.Client.B_EDIT, B_EDIT);
+            packetIds.put(PacketTypeClasses.Client.ENTITY_NBT_QUERY, ENTITY_NBT_QUERY);
+            packetIds.put(PacketTypeClasses.Client.USE_ENTITY, USE_ENTITY);
+            packetIds.put(PacketTypeClasses.Client.JIGSAW_GENERATE, JIGSAW_GENERATE);
+            packetIds.put(PacketTypeClasses.Client.KEEP_ALIVE, KEEP_ALIVE);
+            packetIds.put(PacketTypeClasses.Client.DIFFICULTY_LOCK, DIFFICULTY_LOCK);
+            packetIds.put(PacketTypeClasses.Client.POSITION, POSITION);
+            packetIds.put(PacketTypeClasses.Client.POSITION_LOOK, POSITION_LOOK);
+            packetIds.put(PacketTypeClasses.Client.LOOK, LOOK);
+            packetIds.put(PacketTypeClasses.Client.FLYING, FLYING);
+            packetIds.put(PacketTypeClasses.Client.VEHICLE_MOVE, VEHICLE_MOVE);
+            packetIds.put(PacketTypeClasses.Client.BOAT_MOVE, BOAT_MOVE);
+            packetIds.put(PacketTypeClasses.Client.PICK_ITEM, PICK_ITEM);
+            packetIds.put(PacketTypeClasses.Client.AUTO_RECIPE, AUTO_RECIPE);
+            packetIds.put(PacketTypeClasses.Client.ABILITIES, ABILITIES);
+            packetIds.put(PacketTypeClasses.Client.BLOCK_DIG, BLOCK_DIG);
+            packetIds.put(PacketTypeClasses.Client.ENTITY_ACTION, ENTITY_ACTION);
+            packetIds.put(PacketTypeClasses.Client.STEER_VEHICLE, STEER_VEHICLE);
+            packetIds.put(PacketTypeClasses.Client.RECIPE_DISPLAYED, RECIPE_DISPLAYED);
+            packetIds.put(PacketTypeClasses.Client.ITEM_NAME, ITEM_NAME);
+            packetIds.put(PacketTypeClasses.Client.RESOURCE_PACK_STATUS, RESOURCE_PACK_STATUS);
+            packetIds.put(PacketTypeClasses.Client.ADVANCEMENTS, ADVANCEMENTS);
+            packetIds.put(PacketTypeClasses.Client.TR_SEL, TR_SEL);
+            packetIds.put(PacketTypeClasses.Client.BEACON, BEACON);
+            packetIds.put(PacketTypeClasses.Client.HELD_ITEM_SLOT, HELD_ITEM_SLOT);
+            packetIds.put(PacketTypeClasses.Client.SET_COMMAND_BLOCK, SET_COMMAND_BLOCK);
+            packetIds.put(PacketTypeClasses.Client.SET_COMMAND_MINECART, SET_COMMAND_MINECART);
+            packetIds.put(PacketTypeClasses.Client.SET_CREATIVE_SLOT, SET_CREATIVE_SLOT);
+            packetIds.put(PacketTypeClasses.Client.SET_JIGSAW, SET_JIGSAW);
+            packetIds.put(PacketTypeClasses.Client.STRUCT, STRUCT);
+            packetIds.put(PacketTypeClasses.Client.UPDATE_SIGN, UPDATE_SIGN);
+            packetIds.put(PacketTypeClasses.Client.ARM_ANIMATION, ARM_ANIMATION);
+            packetIds.put(PacketTypeClasses.Client.SPECTATE, SPECTATE);
+            packetIds.put(PacketTypeClasses.Client.USE_ITEM, USE_ITEM);
+            packetIds.put(PacketTypeClasses.Client.BLOCK_PLACE, BLOCK_PLACE);
         }
     }
-
-    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/packet/PacketTypeClasses.java

@@ -1,26 +1,40 @@
 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;
 
 public class PacketTypeClasses {
     public static class Client {
-        private static String c = "PacketPlayIn";
-
-        @Nullable
-        public static final Class<?> FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying");
-
         public static Class<?> POSITION, POSITION_LOOK, LOOK, CLIENT_COMMAND,
                 TRANSACTION, BLOCK_DIG, ENTITY_ACTION, USE_ENTITY,
                 WINDOW_CLICK, STEER_VEHICLE, CUSTOM_PAYLOAD, ARM_ANIMATION,
-                BLOCK_PLACE, ABILITIES, HELD_ITEM_SLOT, CLOSE_WINDOW,
-                TAB_COMPLETE, CHAT, SET_CREATIVE_SLOT, KEEP_ALIVE;
+                BLOCK_PLACE, USE_ITEM, ABILITIES, HELD_ITEM_SLOT,
+                CLOSE_WINDOW, TAB_COMPLETE, CHAT, SET_CREATIVE_SLOT,
+                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,
+                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;
+        private static final String c = "PacketPlayIn";
+        @Nullable
+        public static final Class<?> FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying");
 
-        static {
+        public static void load() {
             try {
                 POSITION = NMSUtils.getNMSClass(c + "Position");
                 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");
+            }
+
+            try {
+                SETTINGS = NMSUtils.getNMSClass(c +"Settings");
+                ENCHANT_ITEM = NMSUtils.getNMSClass(c + "EnchantItem");
 
                 CLIENT_COMMAND = NMSUtils.getNMSClass(c + "ClientCommand");
                 TRANSACTION = NMSUtils.getNMSClass(c + "Transaction");
@@ -38,10 +52,50 @@ public class PacketTypeClasses {
                 CHAT = NMSUtils.getNMSClass(c + "Chat");
                 SET_CREATIVE_SLOT = NMSUtils.getNMSClass(c + "SetCreativeSlot");
                 KEEP_ALIVE = NMSUtils.getNMSClass(c + "KeepAlive");
+                UPDATE_SIGN = NMSUtils.getNMSClassWithoutException(c + "UpdateSign");
+
+                TELEPORT_ACCEPT = NMSUtils.getNMSClassWithoutException(c + "TeleportAccept");
+                TILE_NBT_QUERY = NMSUtils.getNMSClassWithoutException(c + "TileNBTQuery");
+                DIFFICULTY_CHANGE = NMSUtils.getNMSClassWithoutException(c + "DifficultyChange");
+                B_EDIT = NMSUtils.getNMSClassWithoutException(c + "BEdit");
+                ENTITY_NBT_QUERY = NMSUtils.getNMSClassWithoutException(c + "EntityNBTQuery");
+                JIGSAW_GENERATE = NMSUtils.getNMSClassWithoutException(c + "JigsawGenerate");
+                DIFFICULTY_LOCK = NMSUtils.getNMSClassWithoutException(c + "DifficultyLock");
+                VEHICLE_MOVE = NMSUtils.getNMSClassWithoutException(c + "VehicleMove");
+                BOAT_MOVE = NMSUtils.getNMSClassWithoutException(c + "BoatMove");
+                PICK_ITEM = NMSUtils.getNMSClassWithoutException(c + "PickItem");
+                AUTO_RECIPE = NMSUtils.getNMSClassWithoutException(c + "AutoRecipe");
+                RECIPE_DISPLAYED = NMSUtils.getNMSClassWithoutException(c + "RecipeDisplayed");
+                ITEM_NAME = NMSUtils.getNMSClassWithoutException(c + "ItemName");
+                //1.8+
+                RESOURCE_PACK_STATUS = NMSUtils.getNMSClassWithoutException(c + "ResourcePackStatus");
+
+                ADVANCEMENTS = NMSUtils.getNMSClassWithoutException(c + "Advancements");
+                TR_SEL = NMSUtils.getNMSClassWithoutException(c + "TrSel");
+                BEACON = NMSUtils.getNMSClassWithoutException(c + "Beacon");
+                SET_COMMAND_BLOCK = NMSUtils.getNMSClassWithoutException(c + "SetCommandBlock");
+                SET_COMMAND_MINECART = NMSUtils.getNMSClassWithoutException(c + "SetCommandMinecart");
+                SET_JIGSAW = NMSUtils.getNMSClassWithoutException(c + "SetJigsaw");
+                STRUCT = NMSUtils.getNMSClassWithoutException(c + "Struct");
+                SPECTATE = NMSUtils.getNMSClassWithoutException(c + "Spectate");
             } catch (ClassNotFoundException e) {
                 e.printStackTrace();
             }
             //Block place
+            try {
+                BLOCK_PLACE = NMSUtils.getNMSClass(c + "BlockPlace");
+            } catch (ClassNotFoundException e) {
+                //They are just on a newer version
+                try {
+                    USE_ITEM = NMSUtils.getNMSClass(c + "UseItem");
+                } catch (ClassNotFoundException e2) {
+                    e.printStackTrace();
+                    e2.printStackTrace();
+                }
+            }
+
+
+            PacketType.Client.init();
         }
     }
 

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

@@ -0,0 +1,178 @@
+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/api/WrappedPacket.java

@@ -3,10 +3,6 @@ package io.github.retrooper.packetevents.packetwrappers.api;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import org.bukkit.entity.Player;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 public class WrappedPacket {
     protected static ServerVersion version = ServerVersion.getVersion();
     protected final Player player;

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

@@ -5,6 +5,16 @@ import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 
 public class WrappedPacketInSteerVehicle extends WrappedPacket {
+    private static Class<?> packetClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayInSteerVehicle");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
     private float side, forward;
     private boolean jump, unmount;
 
@@ -24,10 +34,12 @@ public class WrappedPacketInSteerVehicle extends WrappedPacket {
             e.printStackTrace();
         }
     }
+
     //Positive side value means left, negative means right
     public float getSideValue() {
         return side;
     }
+
     //Positive forward value means forward, negative is backwards
     public float getForwardValue() {
         return forward;
@@ -40,14 +52,4 @@ public class WrappedPacketInSteerVehicle extends WrappedPacket {
     public boolean isUnmount() {
         return unmount;
     }
-
-    private static Class<?> packetClass;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayInSteerVehicle");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
 }