Merge pull request #7 from xap3y/dev

0.4
xap3y · Jul 4, 2024 · 8c256a1 · 8c256a1
2 parents e20b766 + b499887
commit 8c256a1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -104,5 +104,10 @@
             <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.cryptomorin</groupId>
+            <artifactId>XSeries</artifactId>
+            <version>11.2.0</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/kotlin/eu/xap3y/xagui/GuiMenu.kt b/src/main/kotlin/eu/xap3y/xagui/GuiMenu.kt
@@ -2,6 +2,7 @@
 
 package eu.xap3y.xagui
 
+import com.cryptomorin.xseries.XMaterial
 import eu.xap3y.xagui.exceptions.PageOutOfBoundException
 import eu.xap3y.xagui.exceptions.RowsOutOfBoundException
 import eu.xap3y.xagui.exceptions.SlotOutOfBoundException
@@ -490,7 +491,7 @@ class GuiMenu(private val plugin: JavaPlugin, private val title: String, private
      * @param slots The slots to fill
      */
     override fun fillSlots(slots: Set<Int>) {
-        fillSlots(currentOpenedPage, slots, ItemStack(Material.GRAY_STAINED_GLASS_PANE).apply { itemMeta = itemMeta.apply { setDisplayName(" ") }})
+        fillSlots(currentOpenedPage, slots, ItemStack(XMaterial.GRAY_STAINED_GLASS_PANE.parseMaterial() ?: Material.AIR).apply { itemMeta = itemMeta.apply { setDisplayName(" ") }})
     }
 
     /**
@@ -508,7 +509,7 @@ class GuiMenu(private val plugin: JavaPlugin, private val title: String, private
      * @param slots The slots to fill
      */
     override fun fillSlots(page: Int, slots: Set<Int>) {
-        fillSlots(page, slots, ItemStack(Material.GRAY_STAINED_GLASS_PANE).apply { itemMeta = itemMeta.apply { setDisplayName(" ") }} )
+        fillSlots(page, slots, ItemStack(XMaterial.GRAY_STAINED_GLASS_PANE.parseMaterial() ?: Material.AIR).apply { itemMeta = itemMeta.apply { setDisplayName(" ") }} )
     }
 
     /**
@@ -561,7 +562,7 @@ class GuiMenu(private val plugin: JavaPlugin, private val title: String, private
     @Throws(RowsOutOfBoundException::class)
     fun fillBorder(rows: Int) {
         if (rows > this.rows || rows < 1) throw RowsOutOfBoundException()
-        fillBorder(rows, ItemStack(Material.GRAY_STAINED_GLASS_PANE).apply { itemMeta = itemMeta.apply { setDisplayName(" ") }} )
+        fillBorder(rows, ItemStack(XMaterial.GRAY_STAINED_GLASS_PANE.parseMaterial() ?: Material.AIR).apply { itemMeta = itemMeta.apply { setDisplayName(" ") }} )
     }
     //private val inv: Inventory = Bukkit.createInventory(this, getSize(), getName())
 }