Skip to content

execute extra items commands as player instead of console #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nandi0813 merged 2 commits into from
Apr 20, 2026
Merged

execute extra items commands as player instead of console #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac4e89a
execute extra items commands as player instead of console
Yow-sef Apr 19, 2026
26913a3
Added support for 36 arenas in the setup gui instead of 27
Yow-sef Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSummaryGui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ArenaSummaryGui extends GUI {
private static final String STATUS_ENABLED = GUIFile.getString("GUIS.SETUP.ARENA.ARENA-MANAGER.ICONS.ARENA-ICON.STATUS-NAMES.ENABLED");
private static final String STATUS_DISABLED = GUIFile.getString("GUIS.SETUP.ARENA.ARENA-MANAGER.ICONS.ARENA-ICON.STATUS-NAMES.DISABLED");

private final int spaces = 27;
private final int spaces = 36;
private final Map<Integer, Map<Integer, DisplayArena>> slots = new HashMap<>();
// private final Map<ItemStack, DisplayArena> icons = new HashMap<>();
private final Map<Player, Integer> backToPage = new HashMap<>();
Expand Down Expand Up @@ -62,18 +62,18 @@ public void build() {
// Re-use existing inventory object if present, otherwise create a fresh one
Inventory inv = gui.containsKey(page)
? gui.get(page)
: InventoryUtil.createInventory(GUIFile.getString("GUIS.SETUP.ARENA.ARENA-MANAGER.TITLE").replace("%page%", String.valueOf(page)), 5);
: InventoryUtil.createInventory(GUIFile.getString("GUIS.SETUP.ARENA.ARENA-MANAGER.TITLE").replace("%page%", String.valueOf(page)), 6);
newGui.put(page, inv);

inv.clear();

// Frame
for (int i : new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 36, 37, 38, 39, 40, 41, 42, 43, 44})
for (int i : new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 45, 46, 47, 48, 49, 50, 51, 52, 53})
inv.setItem(i, GUIManager.getFILLER_ITEM());

// Arena icons
Map<Integer, DisplayArena> pageSlots = new HashMap<>();
for (Map.Entry<DisplayArena, ItemStack> entry : getPageItems(displayIcons, page).entrySet()) {
for (Map.Entry<DisplayArena, ItemStack> entry : getPageItems(displayIcons, page, spaces).entrySet()) {
int slot = inv.firstEmpty();
if (slot != -1 && slot < inv.getSize()) {
inv.setItem(slot, entry.getValue());
Expand All @@ -88,15 +88,15 @@ public void build() {
left = GUIFile.getGuiItem("GUIS.SETUP.ARENA.ARENA-MANAGER.ICONS.PAGE-LEFT").replace("%page%", String.valueOf(page - 1)).get();
else
left = GUIFile.getGuiItem("GUIS.SETUP.ARENA.ARENA-MANAGER.ICONS.BACK-TO").get();
inv.setItem(36, left);
inv.setItem(45, left);

// Right navigation
ItemStack right;
if (PageUtil.isPageValid(displayIcons.size(), page + 1, spaces))
right = GUIFile.getGuiItem("GUIS.SETUP.ARENA.ARENA-MANAGER.ICONS.PAGE-RIGHT").replace("%page%", String.valueOf(page + 1)).get();
else
right = GUIManager.getFILLER_ITEM();
inv.setItem(44, right);
inv.setItem(53, right);
}
}

Expand Down Expand Up @@ -145,8 +145,8 @@ public void handleClickEvent(InventoryClickEvent e) {
if (inventory.getSize() > slot && e.getCurrentItem() != null) {
int page = inGuiPlayers.get(player);

if (slot == 36 || slot == 44) {
if (slot == 36) {
if (slot == 45 || slot == 53) {
if (slot == 45) {
if (page == 1) {
GUIManager.getInstance().searchGUI(GUIType.Setup_Hub).open(player);
} else {
Expand Down Expand Up @@ -216,11 +216,11 @@ private static ItemStack getArenaItem(Arena arena) {
return guiItem.get();
}

private static Map<DisplayArena, ItemStack> getPageItems(Map<DisplayArena, ItemStack> items, int page) {
private static Map<DisplayArena, ItemStack> getPageItems(Map<DisplayArena, ItemStack> items, int page, int spaces) {
Map<DisplayArena, ItemStack> sortedItems = sortByValue(items);

int upperBound = page * 27;
int lowerBound = upperBound - 27;
int upperBound = page * spaces;
int lowerBound = upperBound - spaces;

// IMPORTANT: Use LinkedHashMap to preserve the sorted order!
Map<DisplayArena, ItemStack> newItems = new LinkedHashMap<>();
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/ExtraInvItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package dev.nandi0813.practice.manager.inventory.inventoryitem;

import dev.nandi0813.practice.manager.inventory.InventoryManager;
import dev.nandi0813.practice.manager.server.ServerManager;
import org.bukkit.entity.Player;

public class ExtraInvItem extends InvItem {
Expand All @@ -26,7 +25,7 @@ public void handleClickEvent(Player player) {
command = command.substring(1);
}

ServerManager.runConsoleCommand(command.replace("%player%", player.getName()));
player.performCommand(command.replace("%player%", player.getName()));
}

}