Fix grindstone and villager not dropping XP

(Fix villager trading via resuming vanilla move on the result slot)

Author: Mikedeejay2

src/main/java/com/mikedeejay2/simplestack/listeners/player/InventoryClickListener.java

@@ -58,8 +58,9 @@ public void stackEvent(InventoryClickEvent event)
 
         boolean cancel1 = CancelUtils.cancelStackCheck(plugin, itemPickUp);
         boolean cancel2 = CancelUtils.cancelStackCheck(plugin, itemPutDown);
-        boolean cancel3 = CancelUtils.cancelGUICheck(plugin, topInv, itemPutDown);
-        if((cancel1 && cancel2) || event.isCancelled() || cancel3)
+        boolean cancel3 = CancelUtils.cancelGUICheck(topInv, itemPutDown);
+        boolean cancel4 = CancelUtils.cancelItemClick(clickedInv, itemPutDown, slot);
+        if((cancel1 && cancel2) || event.isCancelled() || cancel3 || cancel4)
         {
             return;
         }

src/main/java/com/mikedeejay2/simplestack/listeners/player/InventoryDragListener.java

@@ -52,7 +52,7 @@ public void inventoryDragEvent(InventoryDragEvent event)
 
         ItemStack cursor = event.getOldCursor();
         if(CancelUtils.cancelStackCheck(plugin, cursor)) return;
-        if(CancelUtils.cancelGUICheck(plugin, event.getInventory(), cursor)) return;
+        if(CancelUtils.cancelGUICheck(event.getInventory(), cursor)) return;
         GameMode gameMode = player.getGameMode();
         if(gameMode == GameMode.SURVIVAL || gameMode == GameMode.ADVENTURE)
         {

src/main/java/com/mikedeejay2/simplestack/util/CancelUtils.java

@@ -130,22 +130,29 @@ public static boolean cancelMoveCheck(Simplestack plugin, ItemStack item, Invent
      * @param inv Inventory to check
      * @return If inventory should be cancelled
      */
-    public static boolean cancelGUICheck(Simplestack plugin, Inventory inv, ItemStack cursorItem)
+    public static boolean cancelGUICheck(Inventory inv, ItemStack cursorItem)
     {
         if(inv == null) return true;
         if(MinecraftVersion.getVersionShort() >= 16 && inv instanceof SmithingInventory) return false;
-        if(inv instanceof MerchantInventory) return true;
         if(ShulkerBoxes.isShulkerBox(cursorItem.getType()) && inv.getLocation() != null)
         {
             Location location = inv.getLocation();
             World world = location.getWorld();
             Block block = world.getBlockAt(location);
             Material blockType = block.getType();
-            if(ShulkerBoxes.isShulkerBox(blockType)) return true;
+            return ShulkerBoxes.isShulkerBox(blockType);
         }
         return false;
     }
 
+    public static boolean cancelItemClick(Inventory clickedInv, ItemStack cursorItem, int slot)
+    {
+        if(clickedInv instanceof PlayerInventory) return false;
+        if(MinecraftVersion.getVersionShort() >= 14 && clickedInv instanceof GrindstoneInventory) return true;
+        if(clickedInv instanceof MerchantInventory && slot == 2) return true;
+        return false;
+    }
+
     public static boolean cancelCurseOfBinding(InventoryClickEvent event)
     {
         if(event.getWhoClicked().getGameMode() == GameMode.CREATIVE) return false;