Update commands.

Commands will now call correct GUI.
BentoBoxWorld · Sep 18, 2021 · bfc5cef · bfc5cef
1 parent d1f15ae
commit bfc5cef
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 25 deletions.
diff --git 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.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 boolean execute(User user, String label, List<String> args)
         // 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
@@ -8,7 +8,7 @@
 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 @@ else if (this.addon.getChallengesSettings().getUserGuiMode() == GuiMode.CURRENT_
 		}
 		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 @@ else if (this.addon.getChallengesSettings().getUserGuiMode() == GuiMode.GAMEMODE
 	/**
 	 * List with hooked GameMode addons.
 	 */
-	private List<GameModeAddon> gameModeAddons;
+	private final List<GameModeAddon> 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
@@ -5,7 +5,7 @@
 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 boolean execute(User user, String label, List<String> args)
         // 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
@@ -7,7 +7,7 @@
 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 boolean execute(User user, String label, List<String> args)
 		}
 		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 boolean execute(User user, String label, List<String> args)
 	/**
 	 * 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<GameModeAddon> gameModeAddons;
+	private final List<GameModeAddon> gameModeAddons;
 }