GUIの外をクリックしたときの処理を追加+WindowBorderをpage処理に移動

Author: miyabi033

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>dev.felnull</groupId>
   <artifactId>BetterGUI</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <packaging>jar</packaging>
 
   <name>BetterGUI</name>

src/main/java/dev/felnull/bettergui/core/GUIItem.java

@@ -26,8 +26,6 @@ public void onShiftLeftClick(InventoryClickEvent e){}
     public void onDropClick(InventoryClickEvent e){}
     public void onControlDropClick(InventoryClickEvent e){}
     public void onOffhandClick(InventoryClickEvent e){}
-    public void onWindowBorderRightClick(InventoryClickEvent e){}
-    public void onWindowBorderLeftClick(InventoryClickEvent e){}
     public void onNumberClick(InventoryClickEvent e){}
     public void onCreativeClick(InventoryClickEvent e){}
 

src/main/java/dev/felnull/bettergui/core/GUIPage.java

@@ -4,6 +4,7 @@
 import dev.felnull.bettergui.listener.GUIClickListener;
 import org.bukkit.Bukkit;
 import org.bukkit.event.HandlerList;
+import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
@@ -48,4 +49,14 @@ public ItemStack getItemStack(int slot){
     public void close(){
         HandlerList.unregisterAll(listener);
     }
+
+    public void onWindowBorderRightClick(InventoryClickEvent e){}
+
+    public void onWindowBorderLeftClick(InventoryClickEvent e){}
+
+    public void onOutsideWindowRightClick(InventoryClickEvent e){}
+
+    public void onOutsideWindowLeftClick(InventoryClickEvent e){}
+
+    public void onOutsideWindowClick(InventoryClickEvent e){}
 }

src/main/java/dev/felnull/bettergui/listener/GUIClickListener.java

@@ -42,12 +42,6 @@ public void onClick(InventoryClickEvent e){
                 case SHIFT_LEFT:
                     item.onShiftLeftClick(e);
                     break;
-                case WINDOW_BORDER_RIGHT:
-                    item.onWindowBorderRightClick(e);
-                    break;
-                case WINDOW_BORDER_LEFT:
-                    item.onWindowBorderLeftClick(e);
-                    break;
                 case DROP:
                     item.onDropClick(e);
                     break;
@@ -64,8 +58,30 @@ public void onClick(InventoryClickEvent e){
                     item.onCreativeClick(e);
                     break;
             }
-            e.setCancelled(true);
+            switch (e.getClick()){
+                case WINDOW_BORDER_RIGHT:
+                    page.onWindowBorderRightClick(e);
+                    break;
+                case WINDOW_BORDER_LEFT:
+                    page.onWindowBorderLeftClick(e);
+                    break;
+                case RIGHT:
+                    if(e.getSlot() == -999){
+                        page.onOutsideWindowClick(e);
+                        page.onOutsideWindowRightClick(e);
+                    }
+                    break;
+                case LEFT:
+                    if(e.getSlot() == -999){
+                        page.onOutsideWindowClick(e);
+                        page.onOutsideWindowLeftClick(e);
+                    }
+                    break;
+            }
+
         }
+
+        e.setCancelled(true);
     }
 
     @EventHandler