Team gui

pom.xml

@@ -217,7 +217,7 @@
             <version>3.11.1</version>
             <scope>test</scope>
         </dependency>
-        <!-- Spigot API -->
+         <!-- Spigot API -->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>

src/main/java/world/bentobox/bentobox/BentoBox.java

@@ -73,7 +73,6 @@ public class BentoBox extends JavaPlugin implements Listener {
     private AddonsManager addonsManager;
     private FlagsManager flagsManager;
     private IslandWorldManager islandWorldManager;
-    private RanksManager ranksManager;
     private BlueprintsManager blueprintsManager;
     private HooksManager hooksManager;
     private PlaceholdersManager placeholdersManager;
@@ -141,7 +140,6 @@ public void onEnable(){
             return;
         }
         islandsManager = new IslandsManager(this);
-        ranksManager = new RanksManager();
 
         // Start head getter
         headGetter = new HeadGetter(this);
@@ -429,9 +427,11 @@ public FlagsManager getFlagsManager() {
 
     /**
      * @return the ranksManager
+     * @deprecated Just use {@code RanksManager.getInstance()}
      */
+    @Deprecated(since = "2.0.0")
     public RanksManager getRanksManager() {
-        return ranksManager;
+        return RanksManager.getInstance();
     }
 
     /**
@@ -466,6 +466,7 @@ public boolean loadSettings() {
             return false;
         }
 
+        log("Saving default panels...");
         if (!Files.exists(Path.of(this.getDataFolder().getPath(), "panels", "island_creation_panel.yml"))) {
             log("Saving default island_creation_panel...");
             this.saveResource("panels/island_creation_panel.yml", false);
@@ -475,7 +476,6 @@ public boolean loadSettings() {
             log("Saving default language_panel...");
             this.saveResource("panels/language_panel.yml", false);
         }
-
         return true;
     }
 

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommand.java

@@ -83,10 +83,10 @@ public boolean canExecute(User user, String label, List<String> args) {
     @Override
     public boolean execute(User user, String label, List<String> args) {
         // Get rank
-        RanksManager rm = getPlugin().getRanksManager();
         User target = User.getInstance(targetUUID);
         int currentRank = island.getRank(target);
-        user.sendMessage("commands.admin.getrank.rank-is", TextVariables.RANK, user.getTranslation(rm.getRank(currentRank)),
+        user.sendMessage("commands.admin.getrank.rank-is", TextVariables.RANK,
+                user.getTranslation(RanksManager.getInstance().getRank(currentRank)),
                 TextVariables.NAME, getPlayers().getName(island.getOwner()));
         return true;
     }

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommand.java

@@ -24,7 +24,6 @@ public class AdminSetrankCommand extends CompositeCommand {
     private int rankValue;
     private @Nullable UUID targetUUID;
     private @Nullable UUID ownerUUID;
-    private RanksManager rm;
 
     public AdminSetrankCommand(CompositeCommand adminCommand) {
         super(adminCommand, "setrank");
@@ -36,7 +35,6 @@ public void setup() {
         setOnlyPlayer(false);
         setParametersHelp("commands.admin.setrank.parameters");
         setDescription("commands.admin.setrank.description");
-        rm = getPlugin().getRanksManager();
     }
 
     @Override
@@ -53,7 +51,7 @@ public boolean canExecute(User user, String label, List<String> args) {
             return false;
         }
         // Get rank
-        rankValue = rm.getRanks().entrySet().stream()
+        rankValue = RanksManager.getInstance().getRanks().entrySet().stream()
                 .filter(r -> user.getTranslation(r.getKey()).equalsIgnoreCase(args.get(1))).findFirst()
                 .map(Map.Entry::getValue).orElse(-999);
         if (rankValue < RanksManager.BANNED_RANK) {
@@ -121,8 +119,8 @@ public boolean execute(User user, String label, List<String> args) {
             ownerName = target.getName();
         }
         user.sendMessage("commands.admin.setrank.rank-set",
-                "[from]", user.getTranslation(rm.getRank(currentRank)),
-                "[to]", user.getTranslation(rm.getRank(rankValue)),
+                "[from]", user.getTranslation(RanksManager.getInstance().getRank(currentRank)), "[to]",
+                user.getTranslation(RanksManager.getInstance().getRank(rankValue)),
                 TextVariables.NAME, ownerName);
         return true;
     }
@@ -136,7 +134,7 @@ public Optional<List<String>> tabComplete(User user, String alias, List<String>
 
         // Return the ranks
         if (args.size() == 3) {
-            return Optional.of(getPlugin().getRanksManager().getRanks()
+            return Optional.of(RanksManager.getInstance().getRanks()
                     .entrySet().stream()
                     .filter(entry -> entry.getValue() > RanksManager.VISITOR_RANK)
                     .map(entry -> user.getTranslation(entry.getKey())).toList());

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommand.java

@@ -175,7 +175,7 @@ private boolean checkIslandSetting(User user, List<String> args) {
      * @return true if rank is valid
      */
     private boolean checkRank(User user, String string) {
-        for (Entry<String, Integer> en : getPlugin().getRanksManager().getRanks().entrySet()) {
+        for (Entry<String, Integer> en : RanksManager.getInstance().getRanks().entrySet()) {
             if (en.getValue() > RanksManager.BANNED_RANK && en.getValue() <= RanksManager.OWNER_RANK
                     && string.equalsIgnoreCase(ChatColor.stripColor(user.getTranslation(en.getKey())))) {
                 // We have a winner
@@ -277,8 +277,7 @@ public Optional<List<String>> tabComplete(User user, String alias, List<String>
         } else if (args.size() == 4) {
             // Get flag in previous argument
             options = getPlugin().getFlagsManager().getFlag(args.get(2).toUpperCase(Locale.ENGLISH)).map(f -> switch (f.getType()) {
-            case PROTECTION -> getPlugin().getRanksManager()
-            .getRanks().entrySet().stream()
+            case PROTECTION -> RanksManager.getInstance().getRanks().entrySet().stream()
             .filter(en -> en.getValue() > RanksManager.BANNED_RANK && en.getValue() <= RanksManager.OWNER_RANK)
             .map(Entry::getKey)
             .map(user::getTranslation).toList();

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java

@@ -118,12 +118,10 @@ public boolean execute(User user, String label, List<String> args) {
 
     private Location getSpot(World world) {
         Island island = getIslands().getIsland(world, targetUUID);
-        if (island != null && island.getSpawnPoint(world.getEnvironment()) != null) {
-            // Return the defined spawn point
-            return island.getSpawnPoint(world.getEnvironment());
+        if (island == null) {
+            return null;
         }
-        // Return the default island protection center
-        return island.getProtectionCenter().toVector().toLocation(world);
+        return island.getSpawnPoint(world.getEnvironment()) != null ? island.getSpawnPoint(world.getEnvironment()) : island.getProtectionCenter().toVector().toLocation(world);
     }
 
     @Override

src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java

@@ -17,6 +17,7 @@
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
 
 public class IslandBanCommand extends CompositeCommand {
@@ -55,7 +56,7 @@ public boolean canExecute(User user, String label, List<String> args) {
         int rank = island.getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK,
-                    user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
+                    user.getTranslation(RanksManager.getInstance().getRank(rank)));
             return false;
         }
         // Get target player

src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommand.java

@@ -8,6 +8,7 @@
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.RanksManager;
 
 public class IslandBanlistCommand extends CompositeCommand {
 
@@ -40,7 +41,8 @@ public boolean canExecute(User user, String label, List<String> args) {
         island = getIslands().getIsland(getWorld(), user.getUniqueId());
         int rank = Objects.requireNonNull(island).getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
-            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK, user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
+            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK,
+                    user.getTranslation(RanksManager.getInstance().getRank(rank)));
             return false;
         }
         return true;

src/main/java/world/bentobox/bentobox/api/commands/island/IslandDeletehomeCommand.java

@@ -57,7 +57,7 @@ public boolean canExecute(User user, String label, List<String> args) {
         int rank = Objects.requireNonNull(island).getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.insufficient-rank",
-                    TextVariables.RANK, user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
+                    TextVariables.RANK, user.getTranslation(RanksManager.getInstance().getRank(rank)));
             return false;
         }
 

src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java

@@ -16,6 +16,7 @@
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -60,7 +61,7 @@ public boolean canExecute(User user, String label, List<String> args) {
         int rank = Objects.requireNonNull(island).getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK,
-                    user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
+                    user.getTranslation(RanksManager.getInstance().getRank(rank)));
             return false;
         }
         // Get target player

src/main/java/world/bentobox/bentobox/api/commands/island/IslandRenamehomeCommand.java

@@ -65,7 +65,8 @@ public boolean canExecute(User user, String label, List<String> args) {
         // check command permission
         int rank = Objects.requireNonNull(island).getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
-            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK, user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
+            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK,
+                    user.getTranslation(RanksManager.getInstance().getRank(rank)));
             return false;
         }
 

src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetnameCommand.java

@@ -7,6 +7,7 @@
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.RanksManager;
 
 
 /**
@@ -41,7 +42,7 @@ public boolean canExecute(User user, String label, List<String> args)
         int rank = Objects.requireNonNull(island).getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.insufficient-rank",
-                TextVariables.RANK, user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
+                    TextVariables.RANK, user.getTranslation(RanksManager.getInstance().getRank(rank)));
             return false;
         }
 

src/main/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommand.java

@@ -46,7 +46,8 @@ public boolean canExecute(User user, String label, List<String> args) {
 
         int rank = Objects.requireNonNull(island).getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
-            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK, user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
+            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK,
+                    user.getTranslation(RanksManager.getInstance().getRank(rank)));
             return false;
         }
 

src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java

@@ -10,6 +10,7 @@
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.RanksManager;
 
 
 /**
@@ -51,7 +52,8 @@ public boolean canExecute(User user, String label, List<String> args)
         // Check command rank.
         int rank = Objects.requireNonNull(island).getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
-            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK, user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
+            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK,
+                    user.getTranslation(RanksManager.getInstance().getRank(rank)));
             return false;
         }
 

src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java

@@ -13,6 +13,7 @@
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -54,7 +55,8 @@ public boolean canExecute(User user, String label, List<String> args) {
         Island island = getIslands().getIsland(getWorld(), user);
         int rank = Objects.requireNonNull(island).getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
-            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK, user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
+            user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK,
+                    user.getTranslation(RanksManager.getInstance().getRank(rank)));
             return false;
         }
         // Get target player

src/main/java/world/bentobox/bentobox/api/commands/island/team/InviteNamePrompt.java

@@ -0,0 +1,53 @@
+package world.bentobox.bentobox.api.commands.island.team;
+
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.conversations.ConversationContext;
+import org.bukkit.conversations.Prompt;
+import org.bukkit.conversations.StringPrompt;
+import org.eclipse.jdt.annotation.NonNull;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.user.User;
+
+/**
+ * Invites a player by search
+ * @author tastybento
+ *
+ */
+public class InviteNamePrompt extends StringPrompt {
+
+    @NonNull
+    private final User user;
+    @NonNull
+    private final IslandTeamInviteCommand itic;
+
+    public InviteNamePrompt(@NonNull User user, IslandTeamInviteCommand islandTeamInviteCommand) {
+        this.user = user;
+        this.itic = islandTeamInviteCommand;
+    }
+
+    @Override
+    @NonNull
+    public String getPromptText(@NonNull ConversationContext context) {
+        return user.getTranslation("commands.island.team.invite.gui.enter-name");
+    }
+
+    @Override
+    public Prompt acceptInput(@NonNull ConversationContext context, String input) {
+        // TODO remove this and pass the options back to the GUI
+        if (itic.canExecute(user, itic.getLabel(), List.of(input))) {
+            if (itic.execute(user, itic.getLabel(), List.of(input))) {
+                return Prompt.END_OF_CONVERSATION;
+            }
+        }
+        // Set the search item to what was entered
+        itic.setSearchName(input);
+        // Return to the GUI but give a second for the error to show
+        // TODO: return the failed input and display the options in the GUI.
+        Bukkit.getScheduler().runTaskLater(BentoBox.getInstance(), () -> itic.build(user), 20L);
+        return Prompt.END_OF_CONVERSATION;
+    }
+
+}