Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

More GUI improvements, improving Slot API

Browse Source
This commit is contained in:
Auxilor
2022-09-29 16:15:19 +01:00
parent 3d35a91314
commit 97adae7b32
5 changed files with 126 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt
View File

@@ -1,7 +1,6 @@
package com.willfp.eco.internal.spigot.gui
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.gui.slot.CustomSlot
import com.willfp.eco.core.gui.slot.Slot
import com.willfp.eco.internal.gui.menu.EcoMenu
import com.willfp.eco.internal.gui.menu.MenuHandler
@@ -18,10 +17,30 @@ import org.bukkit.event.inventory.InventoryCloseEvent
import org.bukkit.event.player.PlayerItemHeldEvent
class GUIListener(private val plugin: EcoPlugin) : Listener {
private fun Slot.handle(event: InventoryClickEvent, menu: EcoMenu) {
when (this) {
is EcoSlot -> this.handleInventoryClick(event, menu)
is CustomSlot -> this.delegate.handle(event, menu)
// Prevents StackOverflow exceptions with poorly implemented custom slots.
private val depthLimit = 32
private fun Slot.handle(
player: Player,
event: InventoryClickEvent,
menu: EcoMenu,
depth: Int = 0
) {
// Always cancel on first depth to prevent bugs with custom slot implementations.
if (depth == 0) {
event.isCancelled = true
}
if (depth >= depthLimit) {
return
}
val delegate = this.getRealSlot(player, menu)
if (delegate is EcoSlot) {
delegate.handleInventoryClick(event, menu)
} else {
delegate.handle(player, event, menu, depth + 1)
}
}
@@ -35,7 +54,7 @@ class GUIListener(private val plugin: EcoPlugin) : Listener {
val (row, column) = MenuUtils.convertSlotToRowColumn(event.slot)
menu.getSlot(row, column, player, menu).handle(event, menu)
menu.getSlot(row, column, player, menu).handle(player, event, menu)
plugin.scheduler.run { rendered.render() }
}