From bfc5cefd693b653ccced3546e94e30082773b9db Mon Sep 17 00:00:00 2001 From: BONNe Date: Sat, 18 Sep 2021 13:00:31 +0300 Subject: [PATCH] Update commands. Commands will now call correct GUI. --- .../challenges/commands/ChallengesCommand.java | 13 +++++++------ .../challenges/commands/ChallengesUserCommand.java | 14 ++++++-------- .../challenges/commands/admin/Challenges.java | 6 +++--- .../commands/admin/ChallengesAdminCommand.java | 14 ++++++-------- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/main/java/world/bentobox/challenges/commands/ChallengesCommand.java b/src/main/java/world/bentobox/challenges/commands/ChallengesCommand.java index 7012c9b..1be0ad8 100644 --- a/src/main/java/world/bentobox/challenges/commands/ChallengesCommand.java +++ b/src/main/java/world/bentobox/challenges/commands/ChallengesCommand.java @@ -6,7 +6,7 @@ import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; import world.bentobox.challenges.ChallengesAddon; -import world.bentobox.challenges.panel.user.ChallengesGUI; +import world.bentobox.challenges.panel.user.ChallengesPanel; public class ChallengesCommand extends CompositeCommand @@ -70,11 +70,12 @@ public class ChallengesCommand extends CompositeCommand // Open up the challenges GUI if (user.isPlayer()) { - new ChallengesGUI((ChallengesAddon) this.getAddon(), - this.getWorld(), - user, - this.getTopLabel(), - this.getPermissionPrefix()).build(); + ChallengesPanel.open(this.getAddon(), + this.getWorld(), + user, + this.getTopLabel(), + this.getPermissionPrefix()); + return true; } // Show help diff --git a/src/main/java/world/bentobox/challenges/commands/ChallengesUserCommand.java b/src/main/java/world/bentobox/challenges/commands/ChallengesUserCommand.java index 4c90d22..547fd28 100644 --- a/src/main/java/world/bentobox/challenges/commands/ChallengesUserCommand.java +++ b/src/main/java/world/bentobox/challenges/commands/ChallengesUserCommand.java @@ -8,7 +8,7 @@ import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; import world.bentobox.challenges.ChallengesAddon; import world.bentobox.challenges.config.SettingsUtils.GuiMode; -import world.bentobox.challenges.panel.GameModesGUI; +import world.bentobox.challenges.panel.user.GameModePanel; /** @@ -75,13 +75,11 @@ public class ChallengesUserCommand extends CompositeCommand } else if (this.addon.getChallengesSettings().getUserGuiMode() == GuiMode.GAMEMODE_LIST) { - new GameModesGUI(this.addon, + GameModePanel.open(this.addon, this.getWorld(), user, - this.getTopLabel(), - this.getPermissionPrefix(), - false, - this.gameModeAddons).build(); + this.gameModeAddons, + false); return true; } @@ -97,10 +95,10 @@ public class ChallengesUserCommand extends CompositeCommand /** * List with hooked GameMode addons. */ - private List gameModeAddons; + private final List gameModeAddons; /** * Challenges addon for easier operations. */ - private ChallengesAddon addon; + private final ChallengesAddon addon; } diff --git a/src/main/java/world/bentobox/challenges/commands/admin/Challenges.java b/src/main/java/world/bentobox/challenges/commands/admin/Challenges.java index 1567503..510d2f4 100644 --- a/src/main/java/world/bentobox/challenges/commands/admin/Challenges.java +++ b/src/main/java/world/bentobox/challenges/commands/admin/Challenges.java @@ -5,7 +5,7 @@ import java.util.List; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; import world.bentobox.challenges.ChallengesAddon; -import world.bentobox.challenges.panel.admin.AdminGUI; +import world.bentobox.challenges.panel.admin.AdminPanel; public class Challenges extends CompositeCommand @@ -55,11 +55,11 @@ public class Challenges extends CompositeCommand // Open up the admin challenges GUI if (user.isPlayer()) { - new AdminGUI((ChallengesAddon) this.getAddon(), + AdminPanel.open(this.getAddon(), this.getWorld(), user, this.getTopLabel(), - this.getPermissionPrefix()).build(); + this.getPermissionPrefix()); return true; } diff --git a/src/main/java/world/bentobox/challenges/commands/admin/ChallengesAdminCommand.java b/src/main/java/world/bentobox/challenges/commands/admin/ChallengesAdminCommand.java index 3137d8c..8d324a6 100644 --- a/src/main/java/world/bentobox/challenges/commands/admin/ChallengesAdminCommand.java +++ b/src/main/java/world/bentobox/challenges/commands/admin/ChallengesAdminCommand.java @@ -7,7 +7,7 @@ import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; import world.bentobox.challenges.ChallengesAddon; -import world.bentobox.challenges.panel.GameModesGUI; +import world.bentobox.challenges.panel.user.GameModePanel; /** @@ -58,13 +58,11 @@ public class ChallengesAdminCommand extends CompositeCommand } else { - new GameModesGUI(this.addon, + GameModePanel.open(this.addon, this.getWorld(), user, - this.getTopLabel(), - this.getPermissionPrefix(), - true, - this.gameModeAddons).build(); + this.gameModeAddons, + true); } return true; @@ -78,10 +76,10 @@ public class ChallengesAdminCommand extends CompositeCommand /** * This variable stores challenges addon. */ - private ChallengesAddon addon; + private final ChallengesAddon addon; /** * This variable stores List with game modes where challenges addon are hooked in. */ - private List gameModeAddons; + private final List gameModeAddons; }