Skip to content

Improve duel menus #175

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
Devlrxxh merged 2 commits into from
Feb 22, 2026
Merged

Improve duel menus #175

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
013d2de
Improve duel menus
mallusrgreatv2 Feb 20, 2026
5517501
revert to getLeaderName()
mallusrgreatv2 Feb 20, 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
6 changes: 3 additions & 3 deletions Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MenusLocale.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ public enum MenusLocale implements IDataAccessor {
"&fKit: &b<kit>",
"",
"&a&lClick to watch match!"),
DUEL_TITLE("DUEL.TITLE", DataType.STRING, "&7Select Kit"),
DUEL_TITLE("DUEL.TITLE", DataType.STRING, "<b><yellow>Select Kit</b> <dark_gray>| <white><target>"),
DUEL_SIZE("DUEL.SIZE", DataType.INT, "36"),
DUEL_FILTER("DUEL.FILTER-TYPE", "FILL, BORDER, NONE", DataType.STRING, "FILL"),
DUEL_ITEM_NAME("DUEL.ITEM.NAME", DataType.STRING, "&b<kit>"),
DUEL_LORE("DUEL.LORE", DataType.STRING_LIST,
"",
"&a&lClick to select kit!"),
ROUNDS_TITLE("ROUNDS.TITLE", DataType.STRING, "&7Select Rounds amount"),
ROUNDS_TITLE("ROUNDS.TITLE", DataType.STRING, "<b><yellow>Select Rounds Amount</b> <dark_gray>| <white><target>"),
ROUNDS_SIZE("ROUNDS.SIZE", DataType.INT, "27"),
ROUNDS_STARTING_SLOT("DUEL.STARTING-SLOT", DataType.INT, "10"),
ROUNDS_FILTER("ROUNDS.FILTER-TYPE", "FILL, BORDER, NONE", DataType.STRING, "FILL"),
Expand All @@ -100,7 +100,7 @@ public enum MenusLocale implements IDataAccessor {
"&a&lClick to select rounds amount!"),
ROUNDS_LIST("ROUNDS.AMOUNT", "Change the amount of rounds available", DataType.STRING,
"1, 3, 5, 6, 10, 15, 20"),
ARENA_TITLE("ARENA.TITLE", DataType.STRING, "Select an arena"),
ARENA_TITLE("ARENA.TITLE", DataType.STRING, "<b><yellow>Select Arena</b> <dark_gray>| <white><target>"),
ARENA_FILTER("ARENA.FILTER-TYPE", DataType.STRING, "FILL"),
ARENA_SIZE("ARENA.SIZE", DataType.INT, "27"),
ARENA_LIST_STARTING_SLOT("ARENA.LIST.STARTING-SLOT", DataType.INT, "1"),
Expand Down
1 change: 0 additions & 1 deletion Plugin/src/main/java/dev/lrxh/neptune/feature/hotbar/impl/ItemAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import dev.lrxh.neptune.game.match.menu.MatchSpectateTeleportMenu;
import dev.lrxh.neptune.profile.data.ProfileState;
import dev.lrxh.neptune.profile.impl.Profile;
import dev.lrxh.neptune.utils.CC;
import dev.lrxh.neptune.utils.PlayerUtil;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
Expand Down
10 changes: 7 additions & 3 deletions Plugin/src/main/java/dev/lrxh/neptune/feature/party/Party.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,17 @@ public Party(UUID leader, int max, Neptune plugin) {
setupPlayer(leader, false);
}

public String getLeaderName() {
public Player getLeaderPlayer() {
Player player = Bukkit.getPlayer(leader);
if (player == null) {
users.remove(leader);
return "";
return null;
}

return player;
}
public String getLeaderName() {
Player player = getLeaderPlayer();
if (player == null) return "";
return player.getName();
}

Expand Down
2 changes: 1 addition & 1 deletion Plugin/src/main/java/dev/lrxh/neptune/feature/party/menu/buttons/events/PartyDuelButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public PartyDuelButton(int slot, Party targetParty) {

@Override
public void onClick(ClickType type, Player player) {
new KitSelectMenu(targetParty.getLeader(), true).open(player);
new KitSelectMenu(targetParty.getLeaderPlayer(), true).open(player);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion Plugin/src/main/java/dev/lrxh/neptune/game/duel/command/DuelCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void duel(@Sender Player player, Player target) {
return;
}

new KitSelectMenu(target.getUniqueId(), userProfile.getState().equals(ProfileState.IN_PARTY)).open(player);
new KitSelectMenu(target, userProfile.getState().equals(ProfileState.IN_PARTY)).open(player);
}

@Command(name = "accept-uuid", desc = "", usage = "<uuid>", hidden = true)
Expand Down
7 changes: 3 additions & 4 deletions Plugin/src/main/java/dev/lrxh/neptune/game/duel/menu/ArenaSelectMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;

public class ArenaSelectMenu extends Menu {
private final Kit kit;
private final UUID receiver;
private final Player receiver;
private final int round;

public ArenaSelectMenu(Kit kit, UUID receiver, int round) {
super(MenusLocale.ARENA_TITLE.getString(), MenusLocale.ARENA_SIZE.getInt(), Filter.valueOf(MenusLocale.ARENA_FILTER.getString()));
public ArenaSelectMenu(Kit kit, Player receiver, int round) {
super(MenusLocale.ARENA_TITLE.getString().replaceAll("<target>", receiver.getName()), MenusLocale.ARENA_SIZE.getInt(), Filter.valueOf(MenusLocale.ARENA_FILTER.getString()));
this.kit = kit;
this.receiver = receiver;
this.round = round;
Expand Down
11 changes: 6 additions & 5 deletions Plugin/src/main/java/dev/lrxh/neptune/game/duel/menu/KitSelectButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;

import java.util.UUID;

public class KitSelectButton extends Button {
private final Kit kit;
private final UUID receiver;
private final Player receiver;
private final boolean party;

public KitSelectButton(int slot, Kit kit, UUID receiver, boolean party) {
public KitSelectButton(int slot, Kit kit, Player receiver, boolean party) {
super(slot);
this.kit = kit;
this.receiver = receiver;
Expand Down Expand Up @@ -51,7 +49,10 @@ public void onClick(ClickType type, Player player) {
Bukkit.getScheduler().runTask(Neptune.get(), () -> player.closeInventory());
});
} else {
new RoundsSelectMenu(kit, receiver).open(player);
String[] roundsList = MenusLocale.ROUNDS_LIST.getString().replace(" ", "").split(",");
if (roundsList.length == 1)
new RoundSelectButton(0, kit, receiver, Integer.parseInt(roundsList[0])).onClick(ClickType.LEFT, player);
else new RoundsSelectMenu(kit, receiver).open(player);
}
}
}
7 changes: 3 additions & 4 deletions Plugin/src/main/java/dev/lrxh/neptune/game/duel/menu/KitSelectMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

public class KitSelectMenu extends Menu {
private final UUID receiver;
private final Player receiver;
private final boolean party;

public KitSelectMenu(UUID receiver, boolean party) {
super(MenusLocale.DUEL_TITLE.getString(), MenusLocale.DUEL_SIZE.getInt(), Filter.valueOf(MenusLocale.DUEL_FILTER.getString()));
public KitSelectMenu(Player receiver, boolean party) {
super(MenusLocale.DUEL_TITLE.getString().replaceAll("<target>", receiver.getName()), MenusLocale.DUEL_SIZE.getInt(), Filter.valueOf(MenusLocale.DUEL_FILTER.getString()));
this.receiver = receiver;
this.party = party;
}
Expand Down
6 changes: 2 additions & 4 deletions Plugin/src/main/java/dev/lrxh/neptune/game/duel/menu/RoundSelectButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;

import java.util.UUID;

public class RoundSelectButton extends Button {
private final Kit kit;
private final UUID receiver;
private final Player receiver;
private final int round;

public RoundSelectButton(int slot, Kit kit, UUID receiver, int round) {
public RoundSelectButton(int slot, Kit kit, Player receiver, int round) {
super(slot);
this.kit = kit;
this.receiver = receiver;
Expand Down
7 changes: 3 additions & 4 deletions Plugin/src/main/java/dev/lrxh/neptune/game/duel/menu/RoundsSelectMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

public class RoundsSelectMenu extends Menu {
private final Kit kit;
private final UUID receiver;
private final Player receiver;

public RoundsSelectMenu(Kit kit, UUID receiver) {
super(MenusLocale.ROUNDS_TITLE.getString(), MenusLocale.ROUNDS_SIZE.getInt(), Filter.valueOf(MenusLocale.ROUNDS_FILTER.getString()));
public RoundsSelectMenu(Kit kit, Player receiver) {
super(MenusLocale.ROUNDS_TITLE.getString().replaceAll("<target>", receiver.getName()), MenusLocale.ROUNDS_SIZE.getInt(), Filter.valueOf(MenusLocale.ROUNDS_FILTER.getString()));
this.kit = kit;
this.receiver = receiver;
}
Expand Down