v1.3.3

Author: xap3y

README.md

@@ -8,4 +8,4 @@ A simple GUI library for Minecraft plugins. This library is written in Kotlin an
 
 For installation instructions and usage examples, visit:
 
-## https://xagui.xap3y.space
+## https://xagui.xap3y.eu

pom.xml

@@ -6,9 +6,9 @@
 
     <groupId>eu.xap3y</groupId>
     <artifactId>xagui</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <packaging>jar</packaging>
-    <url>https://xagui.xap3y.space</url>
+    <url>https://xagui.xap3y.eu</url>
     <name>XaGui</name>
 
     <properties>
@@ -37,13 +37,13 @@
         </license>
     </licenses>
 
-    <description>LightWeight minecraft GUI library</description>
+    <description>LightWeight Minecraft GUI library</description>
     <developers>
         <developer>
             <id>xap3y</id>
             <name>Martin</name>
             <email>xap3y@mail.ru</email>
-            <url>https://xap3y.fun</url>
+            <url>https://xap3y.eu</url>
         </developer>
     </developers>
 
@@ -154,5 +154,11 @@
             <version>1.18.32</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.cryptomorin</groupId>
+            <artifactId>XSeries</artifactId>
+            <version>13.6.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/eu/xap3y/xagui/XaGui.java

@@ -3,9 +3,12 @@
 import eu.xap3y.xagui.adapter.Legacy;
 import eu.xap3y.xagui.interfaces.GuiButtonInterface;
 import eu.xap3y.xagui.interfaces.GuiMenuInterface;
+import eu.xap3y.xagui.interfaces.listeners.GuiCloseInterface;
+import eu.xap3y.xagui.interfaces.listeners.GuiOpenInterface;
 import eu.xap3y.xagui.listeners.MenuListener;
 import eu.xap3y.xagui.models.GuiButton;
 import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -21,6 +24,8 @@ public class XaGui {
 
     private final JavaPlugin plugin;
 
+    private final String VERSION = "1.3.3";
+
     @Getter
     private static boolean isPaper = false;
 
@@ -34,7 +39,7 @@ public class XaGui {
 
     public XaGui(@NotNull JavaPlugin plugin) {
         this.plugin = plugin;
-        plugin.getServer().getConsoleSender().sendMessage("Registering XaGui..");
+        plugin.getServer().getConsoleSender().sendMessage("Registering XaGui v" + VERSION + "..");
         plugin.getServer().getPluginManager().registerEvents(new MenuListener(plugin), plugin);
 
         try {
@@ -55,6 +60,8 @@ public XaGui(@NotNull JavaPlugin plugin) {
             Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
             isFolia = true;
         } catch (ClassNotFoundException ignored) {}
+
+        plugin.getServer().getConsoleSender().sendMessage("XaGui registered successfully!");
     }
 
     /**
@@ -113,6 +120,24 @@ public void setBorderItem(ItemStack item) {
         borderFiller = item;
     }
 
+    /**
+     * Set a handler invoked when any xagui inventory is closed.
+     *
+     * @param closeAction close handler
+     */
+    public void setOnClose(GuiCloseInterface closeAction) {
+        onCloseAction = closeAction;
+    }
+
+    /**
+     * Set a handler invoked when any xagui inventory is opened.
+     *
+     * @param openAction open handler
+     */
+    public void setOnOpen(GuiOpenInterface openAction) {
+        this.onOpenAction = openAction;
+    }
+
     /**
      * Get all open menus
      *
@@ -204,14 +229,28 @@ public void setClickSound(Sound sound) {
     @Getter
     private static ItemStack borderFiller = Legacy.createBorderFiller();
 
+    @Getter
+    private static GuiCloseInterface onCloseAction = null;
+
+    @Getter
+    private static GuiOpenInterface onOpenAction = null;
+
     @Getter
     private static GuiButtonInterface closeButton = new GuiButton(
             new ItemStack(Material.BARRIER)
     ).setName("&cClose").withListener(e -> {
         e.getWhoClicked().closeInventory();
         if (closeButtonSound != null) {
             Player p = (Player) e.getWhoClicked();
-            p.playSound(p, closeButtonSound != null ? closeButtonSound : Sound.BLOCK_ENDER_CHEST_CLOSE, .5f, 1f);
+            try {
+                p.playSound(p, closeButtonSound != null ? closeButtonSound : Sound.BLOCK_ENDER_CHEST_CLOSE, .5f, 1f);
+            } catch (NoSuchFieldError | NoSuchMethodError | Exception ignored) {
+                try { // 1.8.8 fallback
+                    p.playSound(p.getLocation(), closeButtonSound != null ? closeButtonSound : Sound.BLOCK_ENDER_CHEST_CLOSE, .5f, 1f);
+                } catch (NoSuchFieldError | NoSuchMethodError | Exception ignored2) {
+                    // IGNORE
+                }
+            }
         }
     });
 

src/main/java/eu/xap3y/xagui/listeners/MenuListener.java

@@ -108,6 +108,10 @@ public void onInventoryClose(InventoryCloseEvent e) {
 
         XaGui.removeOpenMenu(e.getPlayer().getUniqueId());
 
+        if (XaGui.getOnCloseAction() != null) {
+            XaGui.getOnCloseAction().onClose(e);
+        }
+
         if (clickedInventory.onCloseAction != null) {
             clickedInventory.onCloseAction.onClose(e);
         }
@@ -124,7 +128,19 @@ public void onInventoryOpen(InventoryOpenEvent e) {
 
         if (clickedInventory.getOpenSound() != null) {
             Player player = (Player) e.getPlayer();
-            player.playSound(player, clickedInventory.getOpenSound(), clickedInventory.getOpenSoundVolume(), 1f);
+            try {
+                player.playSound(player, clickedInventory.getOpenSound(), clickedInventory.getOpenSoundVolume(), 1f);
+            } catch (NoSuchFieldError | NoSuchMethodError | Exception ignored) {
+                try { // 1.8.8 fallback
+                    player.playSound(player.getLocation(), clickedInventory.getOpenSound(), clickedInventory.getOpenSoundVolume(), 1f);
+                } catch (NoSuchFieldError | NoSuchMethodError | Exception ignored2) {
+                    // IGNORE
+                }
+            }
+        }
+
+        if (XaGui.getOnOpenAction() != null) {
+            XaGui.getOnOpenAction().onOpen(e);
         }
 
         if (clickedInventory.onOpenAction != null) {

src/main/java/eu/xap3y/xagui/models/GuiButton.java

@@ -1,5 +1,6 @@
 package eu.xap3y.xagui.models;
 
+import com.cryptomorin.xseries.XMaterial;
 import eu.xap3y.xagui.XaGui;
 import eu.xap3y.xagui.adapter.PaperAdapter;
 import eu.xap3y.xagui.interfaces.GuiButtonInterface;
@@ -84,6 +85,15 @@ public GuiButton(Material material) {
         this(new ItemStack(material));
     }
 
+    /**
+     * Create a new GuiButton with a XMaterial (amount 1).
+     *
+     * @param xmaterial the material to use
+     */
+    public GuiButton(XMaterial xmaterial) {
+        this(new ItemStack(xmaterial.get()));
+    }
+
     /**
      * Get the material type of this button's icon.
      *
@@ -473,7 +483,15 @@ public void callRedirect(Player p) {
                 menu.open(p);
             }
             if (XaGui.getRedirectSound() != null) {
-                p.playSound(p, XaGui.getRedirectSound(), 1f, 1f);
+                try {
+                    p.playSound(p, XaGui.getRedirectSound(), 1f, 1f);
+                } catch (Exception ignored) {
+                    try {
+                        p.playSound(p.getLocation(), XaGui.getRedirectSound(), 1f, 1f);
+                    } catch (Exception ignored2) {
+                        // IGNORE
+                    }
+                }
             }
         }
     }