support for even more versions + run command

Author: hyperdefined

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>lecterncrashfix</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
     <packaging>jar</packaging>
 
     <name>LecternCrashFix</name>

src/main/java/lol/hyper/lecterncrashfix/LecternCrashFix.java

@@ -7,22 +7,32 @@
 import com.comphenix.protocol.events.PacketEvent;
 import lol.hyper.lecterncrashfix.wrapper.WrapperPlayClientWindowClick;
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.File;
 import java.util.logging.Logger;
 
 public final class LecternCrashFix extends JavaPlugin {
 
     private final Logger logger = this.getLogger();
+    final int CONFIG_VERSION = 1;
+    private final File configFile = new File(this.getDataFolder(), "config.yml");
+    public FileConfiguration config;
 
     @Override
     public void onEnable() {
-        String bukkitPackageName = Bukkit.getServer().getClass().getPackage().getName();
-        String bukkitVersion = bukkitPackageName.substring(bukkitPackageName.lastIndexOf(".") + 1);
-        int ver = Integer.parseInt(bukkitVersion.split("_")[1]);
+        if (!configFile.exists()) {
+            this.saveResource("config.yml", true);
+        }
+        config = YamlConfiguration.loadConfiguration(configFile);
+        if (config.getInt("config-version") != CONFIG_VERSION) {
+            logger.warning("Your config file is outdated! Please regenerate the config.");
+        }
 
         ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(this, ListenerPriority.HIGHEST, PacketType.Play.Client.WINDOW_CLICK) {
             @Override
@@ -31,16 +41,37 @@ public void onPacketReceiving(PacketEvent event) {
                     return;
                 }
 
-                WrapperPlayClientWindowClick packet = new WrapperPlayClientWindowClick(event.getPacket(), ver);
+                WrapperPlayClientWindowClick packet = new WrapperPlayClientWindowClick(event.getPacket());
                 Player player = event.getPlayer();
                 InventoryView inv = player.getOpenInventory();
                 if (inv.getType() == InventoryType.LECTERN) {
                     if (packet.getShift() == WrapperPlayClientWindowClick.InventoryClickType.QUICK_MOVE) {
                         event.setCancelled(true);
                         logger.warning(player.getName() + " tried to illegally click a slot in a lectern! Location: " + player.getLocation());
+                        if (config.getBoolean("run-command")) {
+                            runCommand(player);
+                        }
                     }
                 }
             }
         });
     }
+
+    private void runCommand(Player player) {
+        String command = config.getString("command");
+        if (command == null || command.isEmpty()) {
+            return;
+        }
+        if (command.contains("%player%")) {
+            command = command.replace("%player%", player.getName());
+        }
+        if (command.contains("%uuid%")) {
+            command = command.replace("%uuid%", player.getUniqueId().toString());
+        }
+        if (command.contains("%location%")) {
+            command = command.replace("%location%", player.getLocation().toString());
+        }
+        String finalCommand = command;
+        Bukkit.getScheduler().runTaskLater(this, ()-> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), finalCommand), 20);
+    }
 }

src/main/java/lol/hyper/lecterncrashfix/wrapper/WrapperPlayClientWindowClick.java

@@ -25,17 +25,14 @@
 
 public class WrapperPlayClientWindowClick extends AbstractPacket {
     public static final PacketType TYPE = PacketType.Play.Client.WINDOW_CLICK;
-    private final int VERSION;
 
-    public WrapperPlayClientWindowClick(int version) {
+    public WrapperPlayClientWindowClick() {
         super(new PacketContainer(TYPE), TYPE);
-        VERSION = version;
         handle.getModifier().writeDefaults();
     }
 
-    public WrapperPlayClientWindowClick(PacketContainer packet, int version) {
+    public WrapperPlayClientWindowClick(PacketContainer packet) {
         super(packet, TYPE);
-        VERSION = version;
     }
 
     /**
@@ -138,15 +135,18 @@ public void setClickedItem(ItemStack value) {
     }
 
     public InventoryClickType getShift() {
-        // index changes here because versions use different ones idk
-        int index = 0;
-        if (VERSION == 16) {
-            index = 5;
+        InventoryClickType inventoryClickType = null;
+        // cycle through the packet
+        // see if any data matches a click type
+        // this should help with older versions
+        for (int i = 0; i < 6; i++) {
+            try {
+                inventoryClickType = handle.getEnumModifier(InventoryClickType.class, i).read(0);
+            } catch (Exception ignored) {
+                // ignore any exceptions here
+            }
         }
-        if (VERSION >= 17) {
-            index = 4;
-        }
-        return handle.getEnumModifier(InventoryClickType.class, index).read(0);
+        return inventoryClickType;
     }
 
     public void setShift(InventoryClickType value) {

src/main/resources/config.yml

@@ -0,0 +1,10 @@
+# Run a command when a player tries to do the exploit.
+run-command: true
+
+# Command to run.
+# %player%
+# %location%
+# %uuid%
+command: "ban %player%"
+
+config-version: 1

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: LecternCrashFix
 version: '${project.version}'
 main: lol.hyper.lecterncrashfix.LecternCrashFix
-api-version: 1.16
+api-version: 1.14
 depend: [ProtocolLib]