Merge pull request #5 from minoneer/protocol-lib

Add support for book creation in creative via optional ProtocolLib

Author: minoneer

pom.xml

@@ -125,12 +125,31 @@
             <artifactId>annotations</artifactId>
             <version>20.1.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>4.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.spigotmc</groupId>
+                    <artifactId>spigot</artifactId>
+                </exclusion>
+                 <exclusion>
+                    <groupId>org.spigotmc</groupId>
+                    <artifactId>spigot-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <repositories>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+        </repository>
     </repositories>
 </project>

src/main/java/me/minoneer/bukkit/bookexploit/BookExploitFix.java

@@ -24,6 +24,8 @@ public void onEnable() {
 
         registerEvents(config, filter);
 
+        enableProtocolLib(config, filter);
+
         getLogger().log(Level.INFO, "{0} by minoneer activated", getDescription().getFullName());
     }
 
@@ -42,6 +44,15 @@ private void registerEvents(final ConfigHandler config, final BookFilter filter)
         Bukkit.getPluginManager().registerEvents(listener, this);
     }
 
+    private void enableProtocolLib(ConfigHandler config, BookFilter filter) {
+        if (getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
+            getLogger().info("Found ProtocolLib, enabling advanced protection features.");
+            ProtocolLibHook.activate(this, filter, config, getLogger());
+        } else {
+            getLogger().warning("Missing ProtocolLib dependency, some protections are not available.");
+        }
+    }
+
     @Nullable
     public static String limitLoggingString(@Nullable final String input) {
         if (input == null) {

src/main/java/me/minoneer/bukkit/bookexploit/ProtocolLibHook.java

@@ -0,0 +1,43 @@
+package me.minoneer.bukkit.bookexploit;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.ProtocolManager;
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.events.PacketEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.Plugin;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public final class ProtocolLibHook {
+
+    public static void activate(
+            final Plugin plugin,
+            final BookFilter bookFilter,
+            final ConfigHandler config,
+            final Logger logger
+    ) {
+        if (!config.isOnCreation()) {
+            return;
+        }
+        ProtocolManager manager = ProtocolLibrary.getProtocolManager();
+        manager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.LOW,
+                PacketType.Play.Client.SET_CREATIVE_SLOT
+        ) {
+            @Override
+            public void onPacketReceiving(PacketEvent event) {
+                ItemStack item = event.getPacket().getItemModifier().readSafely(0);
+                ItemStack filteredItem = bookFilter.filterBook(item);
+                if (filteredItem != null) {
+                    event.setCancelled(true);
+                    event.getPlayer().updateInventory();
+                    logger.log(Level.WARNING, "Player {0} {1} tried to create a book with illegal click events!",
+                            new Object[]{event.getPlayer().getName(), event.getPlayer().getUniqueId()});
+                }
+            }
+        });
+    }
+}

src/main/resources/plugin.yml

@@ -5,8 +5,9 @@ author: minoneer
 description: ${project.description}
 website: '${project.url}'
 api-version: 1.13
+softdepend: [ ProtocolLib ]
 commands:
   filter:
-    aliases: [bookfilter, filterbook]
+    aliases: [ bookfilter, filterbook ]
     usage: /<command>
     permission: bookfilter.filter