From f2990fee091e218e3bb582e00a6a51c8f627aac9 Mon Sep 17 00:00:00 2001 From: bluefireoly Date: Mon, 19 Oct 2020 01:43:26 +0200 Subject: [PATCH] Removed gui from getItemStack method of GUI elements GUI elements now get the gui type on another way (if needed) --- .../kotlin/net/axay/kspigot/inventory/InventoryGUIElements.kt | 2 +- .../net/axay/kspigot/inventory/elements/InventoryGUIButton.kt | 2 +- .../axay/kspigot/inventory/elements/InventoryGUIPlaceholder.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUIElements.kt b/src/main/kotlin/net/axay/kspigot/inventory/InventoryGUIElements.kt index 6d03c569..da06e632 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 { abstract class InventoryGUIElement : InventoryGUISlot() { - abstract fun getItemStack(gui: InventoryGUI<*>, slot: Int): ItemStack + abstract fun getItemStack(slot: Int): ItemStack final override fun onClick(clickEvent: InventoryGUIClickEvent) { 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 311940a5..f8015f3d 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( val action: (InventoryGUIClickEvent) -> Unit, ) : InventoryGUIElement() { - override fun getItemStack(gui: InventoryGUI<*>, slot: Int) = icon + override fun getItemStack(slot: Int) = icon override fun onClickElement(clickEvent: InventoryGUIClickEvent) { 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 14358e54..bd93aa64 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( private val icon: ItemStack ) : InventoryGUIElement() { - override fun getItemStack(gui: InventoryGUI<*>, slot: Int) = icon + override fun getItemStack(slot: Int) = icon override fun onClickElement(clickEvent: InventoryGUIClickEvent) { clickEvent.bukkitEvent.isCancelled = true