All is working,

1.3.9 releasing soon ane about to post on spigotmc
retrooper · Jul 3, 2020 · b2654e1 · b2654e1
1 parent e2cfdda
commit b2654e1
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 101 deletions.
diff --git a/pom.xml b/pom.xml
@@ -74,6 +74,7 @@
             <version>1.7.10</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.github.spigot</groupId>
             <artifactId>1.8.8</artifactId>

diff --git a/src/main/java/io/github/retrooper/packetevents/PacketEvents.java b/src/main/java/io/github/retrooper/packetevents/PacketEvents.java
@@ -6,6 +6,7 @@
 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,13 +21,24 @@ 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
      *
      * @param plugin
      */
     public static void start(final Plugin plugin) {
+        if(!hasLoaded) {
+            load();
+        }
         if (!hasRegistered) {
             //Register Bukkit and PacketListener
             getAPI().getEventManager().registerListener(getInstance());

diff --git a/src/main/java/io/github/retrooper/packetevents/example/MainExample.java b/src/main/java/io/github/retrooper/packetevents/example/MainExample.java
@@ -5,31 +5,29 @@
 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 implements PacketListener {
+public class MainExample extends JavaPlugin {
+
+    @Override
+    public void onLoad() {
+        PacketEvents.load();
+    }
 
     @Override
     public void onEnable() {
         PacketEvents.start(this);
-
-
         getAPI().getServerTickTask().cancel();
 
-        getAPI().getEventManager().registerListener(this);
     }
 
     @Override
     public void onDisable() {
         PacketEvents.stop();
     }
-
-    @PacketHandler
-    public void onReceive(PacketReceiveEvent e) {
-        if(e.getPacketId() == PacketType.Client.ARM_ANIMATION) {
-            e.getPlayer().sendMessage("you swung your arm");
-        }
-    }
 }
diff --git a/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler.java b/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler.java
@@ -12,13 +12,21 @@
 
 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 static Future<?> uninjectPlayer(final Player player) {
         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);

diff --git a/src/main/java/io/github/retrooper/packetevents/mojang/GameProfile.java b/src/main/java/io/github/retrooper/packetevents/mojang/GameProfile.java
diff --git a/src/main/java/io/github/retrooper/packetevents/packet/PacketType.java b/src/main/java/io/github/retrooper/packetevents/packet/PacketType.java
@@ -7,6 +7,12 @@ public class PacketType {
 
 
     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>();
 
         public static final int TELEPORT_ACCEPT = 0,
@@ -69,7 +75,6 @@ public static void init(){
             packetIds.put(PacketTypeClasses.Client.SPECTATE, SPECTATE);
             packetIds.put(PacketTypeClasses.Client.USE_ITEM, USE_ITEM);
             packetIds.put(PacketTypeClasses.Client.BLOCK_PLACE, BLOCK_PLACE);
-
         }
     }
 }
diff --git a/src/main/java/io/github/retrooper/packetevents/packet/PacketTypeClasses.java b/src/main/java/io/github/retrooper/packetevents/packet/PacketTypeClasses.java
@@ -21,8 +21,9 @@ public static class Client {
         @Nullable
         public static final Class<?> FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying");
 
-        static {
-            try {POSITION = NMSUtils.getNMSClass(c + "Position");
+        public static void load() {
+            try {
+                POSITION = NMSUtils.getNMSClass(c + "Position");
                 POSITION_LOOK = NMSUtils.getNMSClass(c + "PositionLook");
                 LOOK = NMSUtils.getNMSClass(c + "Look");
             } catch (ClassNotFoundException e) {