use reflection hacks to dodge bugs with inventory event

argh, spigot/java

Author: mcmonkey4eva

src/main/java/org/mcmonkey/sentinel/SentinelEventHandler.java

@@ -19,6 +19,7 @@
 import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.projectiles.ProjectileSource;
+import org.mcmonkey.sentinel.utilities.SentinelNMSHelper;
 import org.mcmonkey.sentinel.utilities.VelocityTracker;
 
 import java.util.ArrayList;
@@ -419,7 +420,7 @@ public void onPlayerMovesInRange(PlayerMoveEvent event) {
      */
     @EventHandler
     public void onInvClose(InventoryCloseEvent event) {
-        String invTitle = SentinelUtilities.getInventoryTitle(event);
+        String invTitle = SentinelNMSHelper.getInventoryTitle(event);
         if (invTitle.startsWith(InvPrefix)) {
             int id = Integer.parseInt(invTitle.substring(InvPrefix.length()));
             NPC npc = CitizensAPI.getNPCRegistry().getById(id);

src/main/java/org/mcmonkey/sentinel/SentinelUtilities.java

@@ -4,12 +4,9 @@
 import net.citizensnpcs.api.ai.EntityTarget;
 import net.citizensnpcs.api.npc.NPC;
 import org.bukkit.*;
-import org.bukkit.block.Block;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffectType;
@@ -53,23 +50,6 @@ public static int getMaxWorldHeight(World world) {
         return world.getMaxHeight();
     }
 
-    /**
-     * Gets the title of an inventory in an InventoryCloseEvent (compensates for code change between Spigot versions).
-     */
-    public static String getInventoryTitle(InventoryCloseEvent event) {
-        if (SentinelVersionCompat.v1_10) {
-            return event.getView().getTitle();
-        }
-        try {
-            Object inventory = event.getInventory();
-            return (String) inventory.getClass().getMethod("getTitle").invoke(inventory);
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
     /**
      * Gets the velocity for an entity. Uses a special tracker for players (since velocity doesn't network properly).
      */

src/main/java/org/mcmonkey/sentinel/utilities/SentinelNMSHelper.java

@@ -4,6 +4,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Enderman;
 import org.bukkit.entity.IronGolem;
+import org.bukkit.event.inventory.InventoryEvent;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Field;
@@ -19,8 +20,14 @@ public class SentinelNMSHelper {
 
     private static boolean nmsWorks = true, endermanValid = false;
 
+    public static MethodHandle INVENTORYCLOSEEVENT_GETVIEW, INVENTORYVIEW_GETTITLE;
+
     public static void init() {
         try {
+            if (SentinelVersionCompat.v1_10) {
+                INVENTORYCLOSEEVENT_GETVIEW = NMS.getMethodHandle(InventoryEvent.class, "getView", true);
+                INVENTORYVIEW_GETTITLE = NMS.getMethodHandle(INVENTORYCLOSEEVENT_GETVIEW.type().returnType(), "getTitle", true);
+            }
             if (!SentinelVersionCompat.v1_12) {
                 nmsWorks = false;
                 return;
@@ -133,4 +140,26 @@ public static void setEndermanAngry(Enderman entity, boolean angry) {
             endermanValid = false;
         }
     }
+
+
+    /**
+     * Gets the title of an inventory in an InventoryEvent (compensates for code change between Spigot versions).
+     */
+    public static String getInventoryTitle(InventoryEvent event) {
+        try {
+            if (SentinelVersionCompat.v1_10) {
+                // Note: these methods are visible, but specific signatures change between versions, so reflection is only reliable inter-version option
+                Object view = INVENTORYCLOSEEVENT_GETVIEW.invoke(event);
+                return (String) INVENTORYVIEW_GETTITLE.invoke(view);
+            }
+            else {
+                Object inventory = event.getInventory();
+                return (String) inventory.getClass().getMethod("getTitle").invoke(inventory);
+            }
+        }
+        catch (Throwable ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
 }