From d092708df236750b29e64b14354e6138b306d380 Mon Sep 17 00:00:00 2001
From: bluefireoly <bluefireolymp@gmail.com>
Date: Sun, 18 Oct 2020 23:32:19 +0200
Subject: [PATCH] Now passing the slot to the getItemStack method of a GUI
 element

---
 src/main/kotlin/net/axay/kspigot/inventory/InventoryGUI.kt    | 4 ++--
 .../kotlin/net/axay/kspigot/inventory/InventoryGUIElements.kt | 2 +-
 .../net/axay/kspigot/inventory/elements/InventoryGUIButton.kt | 2 +-
 .../kspigot/inventory/elements/InventoryGUIPlaceholder.kt     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUI.kt b/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUI.kt
index 00a8b72a..636fa034 100644
--- a/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUI.kt
+++ b/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUI.kt
@@ -116,10 +116,10 @@ class InventoryGUIShared<T : ForInventory>(
                         if (invSlot != null) {
                             val offsetSlot = invSlot.add(offsetHorizontally, offsetVertically).realSlotIn(dimensions)
                             if (offsetSlot != null)
-                                bukkitInventory.setItem(offsetSlot, slot.getItemStack(this))
+                                bukkitInventory.setItem(offsetSlot, slot.getItemStack(this, offsetSlot))
                         }
                     } else {
-                        bukkitInventory.setItem(it.key, slot.getItemStack(this))
+                        bukkitInventory.setItem(it.key, slot.getItemStack(this, it.key))
                     }
 
                 }
diff --git a/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUIElements.kt b/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUIElements.kt
index 1d2c9cfa..6d03c569 100644
--- a/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUIElements.kt
+++ b/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUIElements.kt
@@ -10,7 +10,7 @@ abstract class InventoryGUISlot<T : ForInventory> {
 
 abstract class InventoryGUIElement<T : ForInventory> : InventoryGUISlot<T>() {
 
-    abstract fun getItemStack(gui: InventoryGUI<*>): ItemStack
+    abstract fun getItemStack(gui: InventoryGUI<*>, slot: Int): ItemStack
 
     final override fun onClick(clickEvent: InventoryGUIClickEvent<T>) {
         clickEvent.gui.data.generalOnClick?.invoke(clickEvent)
diff --git a/src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIButton.kt b/src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIButton.kt
index 4b2ebb85..311940a5 100644
--- a/src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIButton.kt
+++ b/src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIButton.kt
@@ -8,7 +8,7 @@ open class InventoryGUIButton<T : ForInventory>(
     val action: (InventoryGUIClickEvent<T>) -> Unit,
 ) : InventoryGUIElement<T>() {
 
-    override fun getItemStack(gui: InventoryGUI<*>) = icon
+    override fun getItemStack(gui: InventoryGUI<*>, slot: Int) = icon
 
     override fun onClickElement(clickEvent: InventoryGUIClickEvent<T>) {
         clickEvent.bukkitEvent.isCancelled = true
diff --git a/src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIPlaceholder.kt b/src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIPlaceholder.kt
index aae530b1..14358e54 100644
--- a/src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIPlaceholder.kt
+++ b/src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIPlaceholder.kt
@@ -7,7 +7,7 @@ class InventoryGUIPlaceholder<T : ForInventory>(
     private val icon: ItemStack
 ) : InventoryGUIElement<T>() {
 
-    override fun getItemStack(gui: InventoryGUI<*>) = icon
+    override fun getItemStack(gui: InventoryGUI<*>, slot: Int) = icon
 
     override fun onClickElement(clickEvent: InventoryGUIClickEvent<T>) {
         clickEvent.bukkitEvent.isCancelled = true