From 181df31696ad853914720c65c78185186b521fe0 Mon Sep 17 00:00:00 2001
From: Len <40720638+destro174@users.noreply.github.com>
Date: Sat, 10 Feb 2024 22:48:16 +0100
Subject: [PATCH] Remove IslandMembersCommand and move it to the IslandGUI.java

---
 .../commands/island/IslandCommand.java        |  1 -
 .../commands/island/IslandMembers.java        | 32 -------------------
 .../cometskyblock/island/gui/IslandGUI.java   |  5 +++
 3 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandMembers.java

diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java
index 314a628..5c36371 100644
--- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java
+++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java
@@ -21,7 +21,6 @@ public class IslandCommand extends PlayerSubCommand {
         registerSubCommand(new IslandAccept(plugin));
         registerSubCommand(new IslandDeny(plugin));
         registerSubCommand(new IslandLeave(plugin));
-        registerSubCommand(new IslandMembers(plugin)); // TODO -- Add IslandMembersCommand
         registerSubCommand(new IslandLevel(plugin)); // TODO -- Add IslandLevelCommand
 //        registerSubCommand(new IslandTop(plugin)); // TODO -- Add IslandTopCommand
         registerSubCommand(new IslandOptions(plugin)); // TODO -- Add IslandOptionsCommand
diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandMembers.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandMembers.java
deleted file mode 100644
index d486ad2..0000000
--- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandMembers.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.alttd.cometskyblock.commands.island;
-
-import com.alttd.cometskyblock.CometSkyBlockPlugin;
-import com.alttd.cometskyblock.commands.PlayerSubCommand;
-import com.alttd.cometskyblock.island.Island;
-import com.alttd.cometskyblock.island.IslandPlayer;
-import com.alttd.cometskyblock.island.gui.MembersGUI;
-import org.bukkit.entity.Player;
-
-public class IslandMembers extends PlayerSubCommand {
-
-    public IslandMembers(CometSkyBlockPlugin plugin) {
-        super(plugin, "members");
-    }
-
-    @Override
-    public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) {
-        if (islandPlayer.islandId() == 0) {
-            // You need an island to be able to do this
-            return true;
-        }
-
-        Island island = Island.getIsland(islandPlayer.islandUUID());
-        if (island == null) {
-            // "Could not load your island. Contact an administrator"
-            return true;
-        }
-
-        new MembersGUI(island).open(player);
-        return true;
-    }
-}
diff --git a/plugin/src/main/java/com/alttd/cometskyblock/island/gui/IslandGUI.java b/plugin/src/main/java/com/alttd/cometskyblock/island/gui/IslandGUI.java
index 9839228..8a7ae86 100644
--- a/plugin/src/main/java/com/alttd/cometskyblock/island/gui/IslandGUI.java
+++ b/plugin/src/main/java/com/alttd/cometskyblock/island/gui/IslandGUI.java
@@ -42,6 +42,11 @@ public class IslandGUI extends GUIInventory {
             player.closeInventory();
             new SettingsGUI(island).open(player);
         }));
+
+        addButton(16, createMenuButton(Material.PLAYER_HEAD, "Island Members!", new ArrayList<>(), event -> {
+            player.closeInventory();
+            new MembersGUI(island).open(player);;
+        }));
         super.decorate(player);
     }