Hook new Panels with Commands.

BentoBoxWorld · Jan 6, 2019 · 639544b · 639544b
1 parent da6bcec
commit 639544b
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 23 deletions.
diff --git a/src/main/java/world/bentobox/addons/biomes/commands/admin/AddBiomeCommand.java b/src/main/java/world/bentobox/addons/biomes/commands/admin/AddBiomeCommand.java
@@ -8,7 +8,7 @@
 
 import world.bentobox.addons.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.addons.biomes.objects.BiomesObject;
-import world.bentobox.addons.biomes.panel.BiomesPanel;
+import world.bentobox.addons.biomes.panel.admin.AdminBiomeEditPanel;
 import world.bentobox.addons.biomes.utils.Utils;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
@@ -43,12 +43,12 @@ public boolean execute(User user, String label, List<String> args)
 		if (user.isPlayer() && args.isEmpty())
 		{
 			// Shows BiomesPanel in Edit mode.
-			new BiomesPanel(this.addon,
-				user,
-				new BiomesObject(),
+			new AdminBiomeEditPanel(this.addon,
 				this.getWorld(),
-				"",
-				BiomesPanel.Mode.EDIT);
+				user,
+				null,
+				this.getTopLabel(),
+				this.getPermissionPrefix()).build();
 
 			return true;
 		}

diff --git a/src/main/java/world/bentobox/addons/biomes/commands/admin/AdminCommand.java b/src/main/java/world/bentobox/addons/biomes/commands/admin/AdminCommand.java
@@ -4,7 +4,7 @@
 import java.util.List;
 
 import world.bentobox.addons.biomes.BiomesAddon;
-import world.bentobox.addons.biomes.panel.AdminMainPanel;
+import world.bentobox.addons.biomes.panel.admin.AdminMainPanel;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminReloadCommand;
 import world.bentobox.bentobox.api.user.User;
@@ -52,7 +52,11 @@ public boolean execute(User user, String label, List<String> args)
 		if (user.isPlayer())
 		{
 			// Create GUI
-			new AdminMainPanel(this.addon, this.getWorld(), user);
+			new AdminMainPanel(this.addon,
+				this.getWorld(),
+				user,
+				this.getTopLabel(),
+				this.getPermissionPrefix()).build();
 			return true;
 		}
 		else

diff --git a/src/main/java/world/bentobox/addons/biomes/commands/admin/EditBiomeCommand.java b/src/main/java/world/bentobox/addons/biomes/commands/admin/EditBiomeCommand.java
@@ -10,7 +10,7 @@
 
 import world.bentobox.addons.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.addons.biomes.objects.BiomesObject;
-import world.bentobox.addons.biomes.panel.BiomesPanel;
+import world.bentobox.addons.biomes.panel.admin.AdminBiomeListPanel;
 import world.bentobox.addons.biomes.utils.Utils;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
@@ -43,7 +43,12 @@ public boolean execute(User user, String label, List<String> args)
 		if (user.isPlayer() && args.isEmpty())
 		{
 			// Shows BiomesPanel in Edit mode.
-			new BiomesPanel(this.addon, user, user, this.getWorld(), "", BiomesPanel.Mode.EDIT);
+			new AdminBiomeListPanel(this.addon,
+				this.getWorld(),
+				user,
+				true,
+				this.getTopLabel(),
+				this.getPermissionPrefix()).build();
 			return true;
 		}
 		else if (args.isEmpty())

diff --git a/src/main/java/world/bentobox/addons/biomes/commands/admin/SetBiomeCommand.java b/src/main/java/world/bentobox/addons/biomes/commands/admin/SetBiomeCommand.java
@@ -8,7 +8,7 @@
 
 import world.bentobox.addons.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.addons.biomes.objects.BiomesObject;
-import world.bentobox.addons.biomes.panel.AdminUserPanel;
+import world.bentobox.addons.biomes.panel.admin.AdminUserListPanel;
 import world.bentobox.addons.biomes.tasks.BiomeUpdateHelper;
 import world.bentobox.addons.biomes.utils.Utils.UpdateMode;
 import world.bentobox.bentobox.api.addons.Addon;
@@ -42,7 +42,11 @@ public boolean execute(User user, String label, List<String> args)
 		if (user.isPlayer() && args.isEmpty())
 		{
 			// Shows admin panel
-			new AdminUserPanel(this.addon, this.getWorld(), user, false);
+			new AdminUserListPanel(this.addon,
+				this.getWorld(),
+				user,
+				this.getTopLabel(),
+				this.getPermissionPrefix()).build();
 			return true;
 		}
 		else if (args.isEmpty())
@@ -79,9 +83,10 @@ else if (args.isEmpty())
 				if (helper.canChangeBiome())
 				{
 					helper.updateIslandBiome();
+					return true;
 				}
 
-				return true;
+				return false;
 			}
 		}
 	}

diff --git a/src/main/java/world/bentobox/addons/biomes/commands/admin/SettingsCommand.java b/src/main/java/world/bentobox/addons/biomes/commands/admin/SettingsCommand.java
@@ -6,7 +6,7 @@
 import java.util.Optional;
 
 import world.bentobox.addons.biomes.commands.ExpandedCompositeCommand;
-import world.bentobox.addons.biomes.panel.AdminSettingsPanel;
+import world.bentobox.addons.biomes.panel.admin.AdminSettingsPanel;
 import world.bentobox.addons.biomes.utils.Utils;
 import world.bentobox.addons.biomes.utils.Utils.UpdateMode;
 import world.bentobox.bentobox.api.addons.Addon;
@@ -40,7 +40,11 @@ public boolean execute(User user, String label, List<String> args)
 		if (user.isPlayer() && args.isEmpty())
 		{
 			// Shows admin panel
-			new AdminSettingsPanel(this.addon, this.getWorld(), user, false);
+			new AdminSettingsPanel(this.addon,
+				this.getWorld(),
+				user,
+				this.getTopLabel(),
+				this.getPermissionPrefix()).build();
 			return true;
 		}
 		else if (args.isEmpty())

diff --git a/src/main/java/world/bentobox/addons/biomes/commands/user/BiomesCommand.java b/src/main/java/world/bentobox/addons/biomes/commands/user/BiomesCommand.java
@@ -4,7 +4,7 @@
 import java.util.List;
 
 import world.bentobox.addons.biomes.BiomesAddon;
-import world.bentobox.addons.biomes.panel.BiomesPanel;
+import world.bentobox.addons.biomes.panel.user.ChangeBiomePanel;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 
@@ -40,13 +40,12 @@ public boolean execute(User user, String string, List<String> args)
 		// Open up the biomes GUI
 		if (user.isPlayer())
 		{
-			new BiomesPanel(
-				this.addon,
-				user,
-				user,
+			new ChangeBiomePanel(this.addon,
 				this.getWorld(),
-				this.getPermissionPrefix(),
-				BiomesPanel.Mode.PLAYER);
+				user,
+				null,
+				this.getTopLabel(),
+				this.getPermissionPrefix()).build();
 
 			return true;
 		}

diff --git a/src/main/java/world/bentobox/addons/biomes/commands/user/BiomesSetCommand.java b/src/main/java/world/bentobox/addons/biomes/commands/user/BiomesSetCommand.java
@@ -64,9 +64,11 @@ public boolean execute(User user, String label, List<String> args)
 			if (helper.canChangeBiome())
 			{
 				helper.updateIslandBiome();
+
+				return true;
 			}
 
-			return true;
+			return false;
 		}
 	}