star/KSpigot
1
0
Fork 0
Code Pull Requests Packages Activity

Now passing the slot to the getItemStack method of a GUI element

Browse Source
This commit is contained in:
bluefireoly
2020-10-18 23:32:19 +02:00
parent b3abcadfab
commit d092708df2
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/net/axay/kspigot/inventory/InventoryGUI.kt
View File

@@ -116,10 +116,10 @@ class InventoryGUIShared<T : ForInventory>(
if (invSlot != null) { if (invSlot != null) {
val offsetSlot = invSlot.add(offsetHorizontally, offsetVertically).realSlotIn(dimensions) val offsetSlot = invSlot.add(offsetHorizontally, offsetVertically).realSlotIn(dimensions)
if (offsetSlot != null) if (offsetSlot != null)
bukkitInventory.setItem(offsetSlot, slot.getItemStack(this)) bukkitInventory.setItem(offsetSlot, slot.getItemStack(this, offsetSlot))
} }
} else { } else {
bukkitInventory.setItem(it.key, slot.getItemStack(this)) bukkitInventory.setItem(it.key, slot.getItemStack(this, it.key))
} }
} }

2
src/main/kotlin/net/axay/kspigot/inventory/InventoryGUIElements.kt
View File

@@ -10,7 +10,7 @@ abstract class InventoryGUISlot<T : ForInventory> {
abstract class InventoryGUIElement<T : ForInventory> : InventoryGUISlot<T>() { 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>) { final override fun onClick(clickEvent: InventoryGUIClickEvent<T>) {
clickEvent.gui.data.generalOnClick?.invoke(clickEvent) clickEvent.gui.data.generalOnClick?.invoke(clickEvent)

2
src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIButton.kt
View File

@@ -8,7 +8,7 @@ open class InventoryGUIButton<T : ForInventory>(
val action: (InventoryGUIClickEvent<T>) -> Unit, val action: (InventoryGUIClickEvent<T>) -> Unit,
) : InventoryGUIElement<T>() { ) : InventoryGUIElement<T>() {
override fun getItemStack(gui: InventoryGUI<*>) = icon override fun getItemStack(gui: InventoryGUI<*>, slot: Int) = icon
override fun onClickElement(clickEvent: InventoryGUIClickEvent<T>) { override fun onClickElement(clickEvent: InventoryGUIClickEvent<T>) {
clickEvent.bukkitEvent.isCancelled = true clickEvent.bukkitEvent.isCancelled = true

2
src/main/kotlin/net/axay/kspigot/inventory/elements/InventoryGUIPlaceholder.kt
View File

@@ -7,7 +7,7 @@ class InventoryGUIPlaceholder<T : ForInventory>(
private val icon: ItemStack private val icon: ItemStack
) : InventoryGUIElement<T>() { ) : InventoryGUIElement<T>() {
override fun getItemStack(gui: InventoryGUI<*>) = icon override fun getItemStack(gui: InventoryGUI<*>, slot: Int) = icon
override fun onClickElement(clickEvent: InventoryGUIClickEvent<T>) { override fun onClickElement(clickEvent: InventoryGUIClickEvent<T>) {
clickEvent.bukkitEvent.isCancelled = true clickEvent.bukkitEvent.isCancelled = true