Updated: PacketEvents to replace ProtocolLib

This makes the packet handling code easier to maintain.

This also fixes an issue where inventory items would be invisible, which
was caused by WINDOW_ITEMS setting null or continuing when it should
have set the unmodified item stack back to the slot.

This whole system is mostly kept for compatibility with old configs.

Author: WizardCM

modules/RoyalCommands/pom.xml

@@ -256,9 +256,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>net.dmulloy2</groupId>
-            <artifactId>ProtocolLib</artifactId>
-            <version>5.4.0</version>
+            <groupId>com.github.retrooper</groupId>
+            <artifactId>packetevents-spigot</artifactId>
+            <version>2.9.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/Config.java

@@ -70,7 +70,7 @@ public class Config {
     public static boolean useAdminMotd;
     public static boolean useCustomDeath;
     public static boolean useFirstJoinMotd;
-    public static boolean useProtocolLib;
+    public static boolean usePacketevents;
     public static boolean useVNP;
     public static boolean useWelcome;
     public static boolean useWhitelist;
@@ -245,8 +245,8 @@ public void reloadConfiguration() {
         updateOldUserdata = c.getBoolean("userdata.update_old", true);
         useAdminMotd = c.getBoolean("motd.options.use_first_join_motd", true);
         useCustomDeath = c.getBoolean("deathmessages.enabled", true);
+        usePacketevents = c.getBoolean("items.spawn.tag.plugins.packetevents", true);
         useFirstJoinMotd = c.getBoolean("motd.options.use_first_join_motd", true);
-        useProtocolLib = c.getBoolean("items.spawn.tag.plugins.protocollib", true);
         useVNP = c.getBoolean("plugins.use_vanish", true);
         useWelcome = c.getBoolean("messages.options.enable_welcome_message", true);
         useWhitelist = c.getBoolean("whitelist.enabled", false);

modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/RoyalCommands.java

@@ -5,6 +5,7 @@
  */
 package org.royaldev.royalcommands;
 
+import com.github.retrooper.packetevents.PacketEvents;
 import com.google.common.base.Charsets;
 import com.griefcraft.lwc.LWCPlugin;
 import org.mvplugins.multiverse.core.MultiverseCore;
@@ -13,6 +14,8 @@
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.regions.RegionQuery;
+
+import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
@@ -94,7 +97,7 @@ public class RoyalCommands extends JavaPlugin {
     private VanishPlugin vp = null;
     private WorldGuardPlugin wg = null;
     private LWCPlugin lwc = null;
-	public PlaceholderAPIPlugin pa = null;
+    public PlaceholderAPIPlugin pa = null;
     private ProtocolListener pl = null;
 
     /**
@@ -406,6 +409,20 @@ public void loadConfiguration() {
         }
     }
 
+    @Override
+    public void onLoad() {
+
+        //-- packetevents --//
+
+        final Plugin pePlugin = this.getServer().getPluginManager().getPlugin("packetevents");
+        // If packetevents exists, load it, even if our config file tells us not to use it later
+        if (pePlugin != null && pePlugin.isEnabled()) {
+            PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this));
+            PacketEvents.getAPI().load();
+        }
+
+    }
+
     @Override
     public void onDisable() {
 
@@ -424,7 +441,7 @@ public void onDisable() {
         Configuration.saveAllConfigurations();
         this.getLogger().info("Userdata saved.");
 
-        //-- ProtocolLib --//
+        //-- packetevents --//
 
         if (this.pl != null) this.pl.uninitialize();
 
@@ -511,10 +528,10 @@ public void onEnable() {
         pm.registerEvents(new InventoryGUIEventListener(), this);
         pm.registerEvents(new DeathListener(this), this);
 
-        //-- ProtocolLib things --//
+        //-- packetevents things --//
 
-        final Plugin plPlugin = this.getServer().getPluginManager().getPlugin("ProtocolLib");
-        if (Config.useProtocolLib && plPlugin != null && plPlugin.isEnabled()) {
+        final Plugin pePlugin = this.getServer().getPluginManager().getPlugin("packetevents");
+        if (Config.usePacketevents && pePlugin != null && pePlugin.isEnabled()) {
             this.pl = new ProtocolListener(this);
             this.pl.initialize();
         }