Fix shulker boxes being able to be stored in shulker boxes (Fixes #56)

Author: Mikedeejay2

src/main/java/com/mikedeejay2/simplestack/listeners/InventoryMoveItemListener.java

@@ -3,6 +3,10 @@
 import com.mikedeejay2.simplestack.Simplestack;
 import com.mikedeejay2.simplestack.util.CancelUtils;
 import com.mikedeejay2.simplestack.util.MoveUtils;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
@@ -36,6 +40,14 @@ public void inventoryMoveItemEvent(InventoryMoveItemEvent event)
         Inventory toInv = event.getDestination();
         InventoryType invType = toInv.getType();
         if(invType == InventoryType.BREWING) return;
+        if(toInv.getLocation() != null && item.getType().toString().endsWith("SHULKER_BOX"))
+        {
+            Location location = toInv.getLocation();
+            World world = location.getWorld();
+            Block block = world.getBlockAt(location);
+            Material blockType = block.getType();
+            if(blockType.toString().endsWith("SHULKER_BOX")) return;
+        }
 
         boolean cancel = CancelUtils.cancelStackCheck(plugin, item);
         if(cancel) return;

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

@@ -51,7 +51,7 @@ public void stackEvent(InventoryClickEvent event)
 
         boolean cancel1 = CancelUtils.cancelStackCheck(plugin, itemPickUp);
         boolean cancel2 = CancelUtils.cancelStackCheck(plugin, itemPutDown);
-        boolean cancel3 = CancelUtils.cancelGUICheck(plugin, topInv);
+        boolean cancel3 = CancelUtils.cancelGUICheck(plugin, topInv, itemPutDown);
         if((cancel1 && cancel2) || event.isCancelled() || cancel3)
         {
             return;

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

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

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

@@ -3,7 +3,10 @@
 import com.mikedeejay2.simplestack.Simplestack;
 import com.mikedeejay2.simplestack.config.Config;
 import com.mikedeejay2.simplestack.config.ListMode;
+import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.*;
 
@@ -116,11 +119,19 @@ 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)
+    public static boolean cancelGUICheck(Simplestack plugin, Inventory inv, ItemStack cursorItem)
     {
         if(inv == null) return true;
         if(plugin.getMCVersion()[1] >= 16 && inv instanceof SmithingInventory) return false;
         if(inv.getLocation() == null) return true;
+        if(cursorItem.getType().toString().endsWith("SHULKER_BOX"))
+        {
+            Location location = inv.getLocation();
+            World world = location.getWorld();
+            Block block = world.getBlockAt(location);
+            Material blockType = block.getType();
+            if(blockType.toString().endsWith("SHULKER_BOX")) return true;
+        }
         return false;
     }
 }

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

@@ -2,7 +2,10 @@
 
 import com.mikedeejay2.mikedeejay2lib.util.item.ItemComparison;
 import com.mikedeejay2.simplestack.Simplestack;
+import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.*;
@@ -362,6 +365,18 @@ else if(toInv instanceof BeaconInventory)
             toInv.setItem(0, itemInSlot);
             return;
         }
+        else if(itemInSlot.getType().toString().endsWith("SHULKER_BOX") && toInv.getLocation() != null)
+        {
+            Location location = toInv.getLocation();
+            World world = location.getWorld();
+            Block block = world.getBlockAt(location);
+            Material blockMat = block.getType();
+            if(blockMat.toString().endsWith("SHULKER_BOX"))
+            {
+                ClickUtils.shiftClickSameInv(plugin, itemInSlot, event, bottomInv);
+                return;
+            }
+        }
 
 
         if(reverseHotbar)