KnarCraft/MiniGames
1
0
Fork 0
mirror of https://github.com/SunNetservers/MiniGames.git synced 2025-07-19 14:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adds a new item to allow arena re-tries

Browse Source 
Prevents a NumberFormatException if the record number is invalid
Updates Spigot to 1.20
This commit is contained in:
Kristian Knarvik
2023-06-12 23:17:48 +02:00
parent 38839c0287
commit 57b3b85fbc
12 changed files with 97 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/net/knarcraft/minigames/gui/ArenaGUI.java
View File

@ -21,18 +21,29 @@ import java.util.List;
*/
public abstract class ArenaGUI extends AbstractGUI {
protected final ArenaPlayerRegistry<?> playerRegistry;
/**
* Instantiates a new arena gui
*
* @param inventorySize <p>The size of the GUI's inventory</p>
* @param inventoryName <p>The name of the inventory</p>
* @param playerRegistry <p>The player registry used for this GUI</p>
* @param inventorySize <p>The size of the GUI's inventory</p>
* @param inventoryName <p>The name of the inventory</p>
*/
public ArenaGUI(int inventorySize, String inventoryName, ArenaPlayerRegistry<?> playerRegistry) {
public ArenaGUI(int inventorySize, String inventoryName) {
super(inventorySize, inventoryName, null);
this.playerRegistry = playerRegistry;
}
/**
* Gets an item describing a retry arena action
*
* @return <p>An arena restart item</p>
*/
protected ItemStack getRestartItem() {
PlayerHeadGUIItemFactory restartItemFactory = new PlayerHeadGUIItemFactory();
restartItemFactory.useSkin("e23b225ed0443c4eec7cf30a034490485904e6eb3d53ef2ab9e39c73bdf22c30");
List<String> loreLines = getLoreLines();
loreLines.add(ChatColor.GRAY + "Use this item to retry the arena");
restartItemFactory.setName(ChatColor.BLUE + "Retry arena");
restartItemFactory.setLore(loreLines);
return restartItemFactory.build();
}
/**
@ -108,7 +119,7 @@ public abstract class ArenaGUI extends AbstractGUI {
*
* @return <p>The leave action</p>
*/
protected GUIAction getLeaveAction() {
public static GUIAction getLeaveAction() {
return (player) -> {
ArenaSession session = MiniGames.getInstance().getSession(player.getUniqueId());
if (session != null) {
@ -117,12 +128,27 @@ public abstract class ArenaGUI extends AbstractGUI {
};
}
/**
* Gets the action to run when triggering the restart action
*
* @return <p>The action for triggering a session restart</p>
*/
public static GUIAction getRestartAction() {
return (player -> {
ArenaSession session = MiniGames.getInstance().getSession(player.getUniqueId());
if (session != null) {
session.reset();
}
});
}
/**
* Gets the action to run when triggering the toggle players action
*
* @param playerRegistry <p>The registry containing relevant players</p>
* @return <p>The action for triggering player visibility</p>
*/
protected GUIAction getTogglePlayersAction() {
public GUIAction getTogglePlayersAction(ArenaPlayerRegistry<?> playerRegistry) {
return (player) -> {
PlayerVisibilityManager visibilityManager = MiniGames.getInstance().getPlayerVisibilityManager();
visibilityManager.toggleHidePlayers(playerRegistry, player);

6
src/main/java/net/knarcraft/minigames/gui/DropperGUI.java
View File

@ -14,16 +14,18 @@ public class DropperGUI extends ArenaGUI {
* @param player <p>The player the GUI is created for</p>
*/
public DropperGUI(Player player) {
super(9, "Dropper", MiniGames.getInstance().getDropperArenaPlayerRegistry());
super(9, "Dropper");
if (MiniGames.getInstance().getPlayerVisibilityManager().isHidingPlayers(player)) {
setItem(0, getTogglePlayersItemEnabled());
} else {
setItem(0, getTogglePlayersItemDisabled());
}
setItem(2, getLeaveItem());
setItem(4, getRestartItem());
setAnyClickAction(0, getTogglePlayersAction());
setAnyClickAction(0, getTogglePlayersAction(MiniGames.getInstance().getDropperArenaPlayerRegistry()));
setAnyClickAction(2, getLeaveAction());
setAnyClickAction(4, getRestartAction());
}
}

4
src/main/java/net/knarcraft/minigames/gui/MiniGamesGUI.java
View File

@ -14,14 +14,14 @@ public class MiniGamesGUI extends ArenaGUI {
* @param player <p>The player the GUI is created for</p>
*/
public MiniGamesGUI(Player player) {
super(9, "MiniGames", null);
super(9, "MiniGames");
if (MiniGames.getInstance().getPlayerVisibilityManager().isHidingPlayers(player)) {
setItem(0, getTogglePlayersItemEnabled());
} else {
setItem(0, getTogglePlayersItemDisabled());
}
setAnyClickAction(0, getTogglePlayersAction());
setAnyClickAction(0, getTogglePlayersAction(null));
}
}

8
src/main/java/net/knarcraft/minigames/gui/ParkourGUI.java
View File

@ -23,7 +23,7 @@ public class ParkourGUI extends ArenaGUI {
* @param player <p>The player the GUI is created for</p>
*/
public ParkourGUI(Player player) {
super(9, "Parkour", MiniGames.getInstance().getParkourArenaPlayerRegistry());
super(9, "Parkour");
if (MiniGames.getInstance().getPlayerVisibilityManager().isHidingPlayers(player)) {
setItem(0, getTogglePlayersItemEnabled());
} else {
@ -31,10 +31,12 @@ public class ParkourGUI extends ArenaGUI {
}
setItem(2, getGiveUpItem());
setItem(4, getLeaveItem());
setItem(6, getRestartItem());
setAnyClickAction(0, getTogglePlayersAction());
setAnyClickAction(0, getTogglePlayersAction(MiniGames.getInstance().getParkourArenaPlayerRegistry()));
setAnyClickAction(2, getGiveUpAction());
setAnyClickAction(4, getLeaveAction());
setAnyClickAction(6, getRestartAction());
}
/**
@ -57,7 +59,7 @@ public class ParkourGUI extends ArenaGUI {
*
* @return <p>The give up action</p>
*/
private GUIAction getGiveUpAction() {
public static GUIAction getGiveUpAction() {
return (player) -> {
ArenaSession session = MiniGames.getInstance().getSession(player.getUniqueId());
if (session instanceof ParkourArenaSession) {