Updated to 1.3.6

* Forgot to uninject on quit

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.retrooper</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <packaging>jar</packaging>
     <name>packetevents</name>
     <properties>
@@ -64,137 +64,38 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.14.1</artifactId>
-            <version>1.14.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.15.1</artifactId>
-            <version>1.15.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.14.3</artifactId>
-            <version>1.14.3</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.14.2</artifactId>
-            <version>1.14.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.15</artifactId>
-            <version>1.15</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.15.2</artifactId>
-            <version>1.15.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.13.2</artifactId>
-            <version>1.13.2</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.github.spigot</groupId>
             <artifactId>1.7.10</artifactId>
             <version>1.7.10</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.8</artifactId>
-            <version>1.8</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.8.3</artifactId>
-            <version>1.8.3</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.github.spigot</groupId>
             <artifactId>1.8.8</artifactId>
             <version>1.8.8</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.9</artifactId>
-            <version>1.9</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.9.4</artifactId>
-            <version>1.9.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.10.2</artifactId>
-            <version>1.10.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.11.1</artifactId>
-            <version>1.11.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.11.2</artifactId>
-            <version>1.11.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.12.1</artifactId>
-            <version>1.12.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.12.2</artifactId>
-            <version>1.12.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.13</artifactId>
-            <version>1.13</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.14</artifactId>
-            <version>1.14</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>us.myles</groupId>
             <artifactId>viaversion</artifactId>
             <version>3.0.1</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.github.ProtocolSupport</groupId>
             <artifactId>ProtocolSupport</artifactId>
             <version>4fdd683</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.50.Final</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

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

@@ -9,8 +9,6 @@ import io.github.retrooper.packetevents.event.PacketListener;
 import io.github.retrooper.packetevents.event.impl.*;
 import io.github.retrooper.packetevents.event.manager.EventManager;
 import io.github.retrooper.packetevents.handler.NettyPacketHandler;
-import io.github.retrooper.packetevents.packet.Packet;
-import io.github.retrooper.packetevents.packet.PacketType;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import org.bukkit.Bukkit;
@@ -19,6 +17,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitTask;
 
@@ -193,12 +192,7 @@ public final class PacketEvents implements PacketListener, Listener {
      * @param player
      */
     public static void injectPlayer(final Player player) {
-        final PlayerInjectEvent injectEvent = new PlayerInjectEvent(player);
-        PacketEvents.getEventManager().callEvent(injectEvent);
-        if (!injectEvent.isCancelled()) {
-            PacketEvents.getEventManager().callEvent(new PostPlayerInjectEvent(player));
-            NettyPacketHandler.injectPlayer(player);
-        }
+        NettyPacketHandler.injectPlayer(player);
     }
 
     /**
@@ -207,22 +201,9 @@ public final class PacketEvents implements PacketListener, Listener {
      * @param player
      */
     public static void uninjectPlayer(final Player player) {
-        final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
-        PacketEvents.getEventManager().callEvent(uninjectEvent);
-        if(!uninjectEvent.isCancelled()) {
-            NettyPacketHandler.uninjectPlayer(player);
-        }
+        NettyPacketHandler.uninjectPlayer(player);
     }
 
-    /**
-     * Returns whether we have injected the player
-     *
-     * @param player
-     * @return hasInjected
-     */
-    public static boolean hasInjected(final Player player) {
-        return NettyPacketHandler.hasInjected(player);
-    }
 
     /**
      * Send a wrapped sendable packet to a player
@@ -262,10 +243,12 @@ public final class PacketEvents implements PacketListener, Listener {
 
     @EventHandler
     public void onJoin(final PlayerJoinEvent e) {
-        if (!hasInjected(e.getPlayer())) {
-            injectPlayer(e.getPlayer());
+        injectPlayer(e.getPlayer());
+    }
 
-        }
+    @EventHandler
+    public void onQuit(final PlayerQuitEvent e) {
+        uninjectPlayer(e.getPlayer());
     }
 
     @EventHandler

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

@@ -5,7 +5,7 @@ import org.bukkit.Bukkit;
 
 
 public enum ServerVersion {
-    v_1_7_10, v_1_8, v_1_8_3, v_1_8_8, v_1_9, v_1_9_4, v_1_10, v_1_11, v_1_12, v_1_13, v_1_13_2, v_1_14, v_1_15,
+    v_1_7_10, v_1_8, v_1_8_3, v_1_8_8, v_1_9, v_1_9_4, v_1_10, v_1_11, v_1_12, v_1_13, v_1_13_2, v_1_14, v_1_15, v_1_16,
     ERROR;
 
 

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

@@ -3,7 +3,7 @@ package io.github.retrooper.packetevents.example;
 import io.github.retrooper.packetevents.PacketEvents;
 import org.bukkit.plugin.java.JavaPlugin;
 
-public class MainExample extends JavaPlugin {
+public class MainExample extends JavaPlugin  {
 
     @Override
     public void onEnable() {
@@ -16,6 +16,4 @@ public class MainExample extends JavaPlugin {
     public void onDisable() {
         PacketEvents.stop();
     }
-
-
-}
+}

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

@@ -2,34 +2,32 @@ 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.*;
 import org.bukkit.entity.Player;
 
-import java.util.HashSet;
-import java.util.UUID;
 import java.util.concurrent.Future;
 
 public class NettyPacketHandler {
-    public static final String handlerName = "packet_handler";
+    public static final String handlerName = "PacketListener";
     private static final ServerVersion version = PacketEvents.getServerVersion();
 
-    public static final HashSet<UUID> injectedSet = new HashSet<UUID>();
-
     public static void injectPlayer(final Player player) {
-        if (!hasInjected(player)) {
+        final PlayerInjectEvent injectEvent = new PlayerInjectEvent(player);
+        PacketEvents.getEventManager().callEvent(injectEvent);
+        if (!injectEvent.isCancelled()) {
             if (version.isLowerThan(ServerVersion.v_1_8)) {
                 NettyPacketHandler_7.injectPlayer(player);
             } else {
                 NettyPacketHandler_8.injectPlayer(player);
             }
-            injectedSet.add(player.getUniqueId());
+            PacketEvents.getEventManager().callEvent(new PostPlayerInjectEvent(player));
         }
     }
 
     public static Future<?> uninjectPlayer(final Player player) {
-        if (hasInjected(player)) {
-            injectedSet.remove(player.getUniqueId());
+        final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
+        PacketEvents.getEventManager().callEvent(uninjectEvent);
+        if (!uninjectEvent.isCancelled()) {
             if (version.isLowerThan(ServerVersion.v_1_8)) {
                 return NettyPacketHandler_7.uninjectPlayer(player);
             } else {
@@ -39,10 +37,6 @@ public class NettyPacketHandler {
         return null;
     }
 
-    public static boolean hasInjected(final Player player) {
-        return injectedSet.contains(player.getUniqueId());
-    }
-
     public static Object read(final Player receiver, final Object packet) {
         final String packetName = packet.getClass().getSimpleName();
         final PacketSendEvent packetSendEvent = new PacketSendEvent(receiver, packetName, packet);

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

@@ -1,5 +1,7 @@
 package io.github.retrooper.packetevents.handler;
 
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import io.netty.channel.*;
 import org.bukkit.entity.Player;
@@ -7,11 +9,12 @@ import org.bukkit.entity.Player;
 import java.util.concurrent.Future;
 
 final class NettyPacketHandler_8 {
+    private static final ServerVersion version = PacketEvents.getServerVersion();
     public static void injectPlayer(final Player player) {
         final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
             @Override
             public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Object packet = NettyPacketHandler.read(player, msg);
+                Object packet = NettyPacketHandler.write(player, msg);
                 if(packet == null) {
                     return;
                 }
@@ -20,7 +23,7 @@ final class NettyPacketHandler_8 {
 
             @Override
             public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-                Object packet = NettyPacketHandler.write(player, msg);
+                Object packet = NettyPacketHandler.read(player, msg);
                 if(packet == null) {
                     return;
                 }

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

@@ -1,19 +1,17 @@
 package io.github.retrooper.packetevents.mojang;
 
 import com.mojang.authlib.properties.PropertyMap;
-import org.bukkit.craftbukkit.libs.org.apache.commons.lang3.StringUtils;
-import org.bukkit.craftbukkit.libs.org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.UUID;
 
-public class GameProfile {
+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 && StringUtils.isBlank(name)) {
+        if (id == null && name.isEmpty()) {
             throw new IllegalArgumentException("Name and ID cannot both be blank");
         } else {
             this.id = id;
@@ -34,10 +32,15 @@ public class GameProfile {
     }
 
     public boolean isComplete() {
-        return this.id != null && StringUtils.isNotBlank(this.getName());
+        return this.id != null && !getName().isEmpty();
     }
 
-    public boolean equalsMojangGameProfile(com.mojang.authlib.GameProfile profile) {
+
+    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());
@@ -45,6 +48,7 @@ public class GameProfile {
         return false;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
@@ -66,17 +70,15 @@ public class GameProfile {
         }
     }
 
+    @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 (new ToStringBuilder(this)).append("id", this.id).append("name", this.name).append("properties", this.properties).append("legacy", this.legacy).toString();
-    }
-
-    public boolean isLegacy() {
-        return this.legacy;
+        return "id: " + id + ", name: " + name + ", legacy: " + legacy;
     }
 }

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

@@ -1,9 +1,11 @@
 package io.github.retrooper.packetevents.packet;
 
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 
 public final class PacketType {
+    private static final ServerVersion version = PacketEvents.getServerVersion();
 
 
     public static final class Util {
@@ -12,7 +14,7 @@ public final class PacketType {
          * 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!
+         * @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
@@ -72,16 +74,32 @@ public final class PacketType {
 
         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+
+                //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);
-                packetPlayInUseEntity = NMSUtils.getNMSClass(Client.USE_ENTITY);
+                    packetPlayInPosition = NMSUtils.getNMSClass(Client.POSITION);
+                    packetPlayInPositionLook = NMSUtils.getNMSClass(Client.POSITION_LOOK);
+                    packetPlayInLook = NMSUtils.getNMSClass(Client.LOOK);
+
             } catch (ClassNotFoundException e) {
+                for (final Class<?> cls : packetPlayInFlying.getDeclaredClasses()) {
+                    if (cls.getSimpleName().equals(Client.POSITION)) {
+                        packetPlayInPosition = cls;
+                    } else if (cls.getSimpleName().equals(Client.POSITION_LOOK)) {
+                        packetPlayInPositionLook = cls;
+                    } else if (cls.getSimpleName().equals(Client.LOOK)) {
+                        packetPlayInLook = cls;
+                    }
+                }
+            }
+
+            try {
+                packetPlayInUseEntity = NMSUtils.getNMSClass(Client.USE_ENTITY);
+            }
+            catch(ClassNotFoundException e) {
                 e.printStackTrace();
             }
         }
@@ -122,7 +140,6 @@ public final class PacketType {
         public static final String SET_CREATIVE_SLOT = c + "SetCreativeSlot";
 
         public static final String KEEP_ALIVE = c + "KeepAlive";
-
     }
 
     public static final class Server {

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

@@ -7,27 +7,36 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.HashSet;
 
 final class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
-    private static Class<?> blockPlaceClass_1_9;
     private Block block;
 
+    private static Method getTargetBlockMethod;
+
     public WrappedPacketInBlockPlace_1_9(final Player player, final Object packet) {
         super(player, packet);
     }
 
     protected static void initStatic() {
         try {
-            blockPlaceClass_1_9 = NMSUtils.getNMSClass("PacketPlayInUseItem");
-        } catch (ClassNotFoundException e) {
+            getTargetBlockMethod = Player.class.getMethod("getTargetBlock", HashSet.class, int.class);
+        } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
     }
 
     @Override
     protected void setup() {
-        this.block = getPlayer().getTargetBlock((HashSet<Material>) null, 3);
+        try {
+            this.block = (Block) getTargetBlockMethod.invoke(getPlayer(), null, 3);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
 
     }
 

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

@@ -8,8 +8,7 @@ import org.bukkit.entity.Entity;
 import java.lang.reflect.Field;
 
 public final class WrappedPacketInUseEntity extends WrappedPacket {
-    private static Class<?> useEntityClass;
-    private static Class<?> entityClass;
+    private static Class<?> useEntityClass, entityClass;
     private static final Field[] fields = new Field[2];
 
     static {

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

@@ -6,7 +6,7 @@ import io.github.retrooper.packetevents.utils.NMSUtils;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-public final class PlayerAbilitiesUtils {
+final class PlayerAbilitiesUtils {
 
     public static Class<?> playerAbilitiesClass;