diff --git a/eco-api/src/main/java/com/willfp/eco/core/gui/menu/Menu.java b/eco-api/src/main/java/com/willfp/eco/core/gui/menu/Menu.java index 279334b3..4956879d 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/gui/menu/Menu.java +++ b/eco-api/src/main/java/com/willfp/eco/core/gui/menu/Menu.java @@ -63,11 +63,29 @@ public interface Menu { * @param player The player * @param menu The menu. * @return The slot. + * @deprecated Menu shouldn't be a parameter. */ - default Slot getSlot(int row, - int column, - @NotNull Player player, - @NotNull Menu menu) { + @Deprecated(since = "6.46.0", forRemoval = true) + default Slot getSlot(final int row, + final int column, + @NotNull final Player player, + @NotNull final Menu menu) { + return this.getSlot(row, column, player); + } + + /** + * Get a slot at a given row and column. + *
+ * Defaults to static slot if no reactive slot exists. + * + * @param row The row. + * @param column The column. + * @param player The player + * @return The slot. + */ + default Slot getSlot(final int row, + final int column, + @NotNull final Player player) { return this.getSlot(row, column); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/gui/page/Page.java b/eco-api/src/main/java/com/willfp/eco/core/gui/page/Page.java index 03b63a9c..49d87b98 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/gui/page/Page.java +++ b/eco-api/src/main/java/com/willfp/eco/core/gui/page/Page.java @@ -83,7 +83,7 @@ public final class Page implements GUIComponent { delegate = Eco.get().blendMenuState(page, menu); } - return page.getSlot(row, column, player, delegate); + return page.getSlot(row, column, player); } @Override diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/EcoMenu.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/EcoMenu.kt index 17dea71f..dbd9221b 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/EcoMenu.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/EcoMenu.kt @@ -39,7 +39,7 @@ class EcoMenu( override fun getSlot(row: Int, column: Int): Slot = getPossiblyReactiveSlot(row, column, null) - override fun getSlot(row: Int, column: Int, player: Player, menu: Menu): Slot = + override fun getSlot(row: Int, column: Int, player: Player): Slot = getPossiblyReactiveSlot(row, column, player) override fun open(player: Player): Inventory { diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/RenderedInventory.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/RenderedInventory.kt index 95451923..f9cbcf23 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/RenderedInventory.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/RenderedInventory.kt @@ -39,7 +39,7 @@ class RenderedInventory( val position = GUIPosition(row, column) val bukkit = MenuUtils.rowColumnToSlot(row, column, menu.columns) - val slot = menu.getSlot(row, column, player, menu) + val slot = menu.getSlot(row, column, player) val renderedItem = slot.getItemStack(player) if (slot.isCaptive(player, menu)) { @@ -86,7 +86,7 @@ class RenderedInventory( for (column in (1..menu.columns)) { val bukkit = MenuUtils.rowColumnToSlot(row, column, menu.columns) - val slot = menu.getSlot(row, column, player, menu) + val slot = menu.getSlot(row, column, player) val renderedItem = slot.getItemStack(player) if (!slot.isCaptive(player, menu)) { @@ -104,7 +104,7 @@ class RenderedInventory( for (column in (1..menu.columns)) { val bukkit = MenuUtils.rowColumnToSlot(row, column, menu.columns) - val slot = menu.getSlot(row, column, player, menu) + val slot = menu.getSlot(row, column, player) if (slot.isCaptive(player, menu)) { inventory.setItem(bukkit, slot.getItemStack(player)) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt index c8bdfbf0..a09dd2ae 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt @@ -70,7 +70,7 @@ class GUIListener(private val plugin: EcoPlugin) : Listener { val (row, column) = MenuUtils.convertSlotToRowColumn(event.slot, menu.columns) - menu.getSlot(row, column, player, menu).handle(player, event, menu) + menu.getSlot(row, column, player).handle(player, event, menu) } @EventHandler( @@ -93,7 +93,7 @@ class GUIListener(private val plugin: EcoPlugin) : Listener { val (row, column) = MenuUtils.convertSlotToRowColumn(inv.firstEmpty(), menu.columns) - val slot = menu.getSlot(row, column, player, menu) + val slot = menu.getSlot(row, column, player) if (!slot.isCaptive(player, menu)) { event.isCancelled = true