diff --git a/src/main/java/os/arcadiadevs/playerservers/hubcore/PSHubCore.java b/src/main/java/os/arcadiadevs/playerservers/hubcore/PSHubCore.java index bb8ca72..0c5d740 100644 --- a/src/main/java/os/arcadiadevs/playerservers/hubcore/PSHubCore.java +++ b/src/main/java/os/arcadiadevs/playerservers/hubcore/PSHubCore.java @@ -64,6 +64,7 @@ public class PSHubCore extends JavaPlugin { Bukkit.getPluginManager().registerEvents(new HubEvents(), this); Objects.requireNonNull(getCommand("servers")).setExecutor(new CommandManager()); + Objects.requireNonNull(getCommand("pmenu")).setExecutor(new CommandManager()); // Initialize SpiGUI spiGUI = new SpiGUI(this); diff --git a/src/main/java/os/arcadiadevs/playerservers/hubcore/commands/CommandManager.java b/src/main/java/os/arcadiadevs/playerservers/hubcore/commands/CommandManager.java index 54fecd0..57a4bf5 100644 --- a/src/main/java/os/arcadiadevs/playerservers/hubcore/commands/CommandManager.java +++ b/src/main/java/os/arcadiadevs/playerservers/hubcore/commands/CommandManager.java @@ -13,18 +13,42 @@ public class CommandManager implements CommandExecutor { @SuppressWarnings("NullableProblems") @Override public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) { - if (commandSender instanceof Player) { - if (!PSHubCore.getInstance().getConfig().getBoolean("gui.selector.item.enabled")) { - commandSender.sendMessage(ChatUtil.translate("&9PlayerServers> &7Oops, gui isn't enabled in config file!")); - return true; - } - if (PSHubCore.getInstance().getConfig().getBoolean("gui.selector.item.enabled")) { - if (command.getName().equalsIgnoreCase("servers") || command.getName().equalsIgnoreCase("menu") || command.getName().equalsIgnoreCase("opengui")) { - Player player = (Player) commandSender; + + if (!(commandSender instanceof Player)) { + return true; + } + + final Player player = (Player) commandSender; + + if (!PSHubCore.getInstance().getConfig().getBoolean("gui.selector.item.enabled")) { + commandSender.sendMessage(ChatUtil.translate("&9PlayerServers> &7Oops, selector isn't enabled in config file!")); + return true; + } + + if (!PSHubCore.getInstance().getConfig().getBoolean("gui.player-menu.item.enabled")) { + commandSender.sendMessage(ChatUtil.translate("&9PlayerServers> &7Oops, player-menu isn't enabled in config file!")); + return true; + } + + if (PSHubCore.getInstance().getConfig().getBoolean("gui.selector.item.enabled")) { + switch (command.getName()) { + case ("servers"): + GUIUtils.openSelector(player); + case ("menu"): + GUIUtils.openSelector(player); + case ("opengui"): GUIUtils.openSelector(player); - } } } + if (PSHubCore.getInstance().getConfig().getBoolean("gui.player-menu.item.enabled")) { + switch (command.getName()) { + case ("playermenu"): + GUIUtils.openMenu(player); + case ("pmenu"): + GUIUtils.openMenu(player); + } + } + return true; } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 9f0d1de..4bbbcb2 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -11,4 +11,9 @@ commands: description: Opens up server selector GUI aliases: - menu - - opengui \ No newline at end of file + - opengui + playermenu: + usage: /playermenu + description: Opens up player-menu GUI + aliases: + - pmenu \ No newline at end of file