Support managing teams by player id and name

Sadly vanilla scoreboard teams are still managed by player username

Author: booky10

src/main/java/dev/booky/cloudchat/CloudChatApi.java

@@ -5,27 +5,59 @@
 import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.Scoreboard;
 
+import java.util.UUID;
+
 public interface CloudChatApi {
 
     default Scoreboard getVanillaScoreboard() {
         return Bukkit.getScoreboardManager().getMainScoreboard();
     }
 
+    // creation
+
     default boolean createTeam(Player player) {
         return this.createTeam(this.getVanillaScoreboard(), player);
     }
 
-    boolean createTeam(Scoreboard scoreboard, Player player);
+    default boolean createTeam(Scoreboard scoreboard, Player player) {
+        return this.createTeam(scoreboard, player.getUniqueId(), player.getName());
+    }
+
+    default boolean createTeam(UUID playerId, String username) {
+        return this.createTeam(this.getVanillaScoreboard(), playerId, username);
+    }
+
+    boolean createTeam(Scoreboard scoreboard, UUID playerId, String username);
+
+    // removal
 
     default boolean removeTeam(Player player) {
         return this.removeTeam(this.getVanillaScoreboard(), player);
     }
 
-    boolean removeTeam(Scoreboard scoreboard, Player player);
+    default boolean removeTeam(Scoreboard scoreboard, Player player) {
+        return this.removeTeam(scoreboard, player.getUniqueId(), player.getName());
+    }
+
+    default boolean removeTeam(UUID playerId, String username) {
+        return this.removeTeam(this.getVanillaScoreboard(), playerId, username);
+    }
+
+    boolean removeTeam(Scoreboard scoreboard, UUID playerId, String username);
+
+    // updates
 
     default boolean updateTeam(Player player) {
         return this.updateTeam(this.getVanillaScoreboard(), player);
     }
 
-    boolean updateTeam(Scoreboard scoreboard, Player player);
+    default boolean updateTeam(Scoreboard scoreboard, Player player) {
+        return this.updateTeam(scoreboard, player.getUniqueId(), player.getName());
+    }
+
+    default boolean updateTeam(UUID playerId, String username) {
+        return this.updateTeam(this.getVanillaScoreboard(), playerId, username);
+    }
+
+    boolean updateTeam(Scoreboard scoreboard, UUID playerId, String username);
 }

src/main/java/dev/booky/cloudchat/CloudChatManager.java

@@ -15,17 +15,18 @@
 import org.bukkit.scoreboard.Team;
 
 import java.text.DecimalFormat;
+import java.util.UUID;
 
 class CloudChatManager implements CloudChatApi {
 
     private static final DecimalFormat FORMAT = new DecimalFormat("0000");
     private static final Component SEPARATOR = Component.text(" \u25cf ", NamedTextColor.DARK_GRAY);
 
     @Override
-    public boolean createTeam(Scoreboard scoreboard, Player player) {
+    public boolean createTeam(Scoreboard scoreboard, UUID playerId, String username) {
         LuckPerms luckperms = LuckPermsProvider.get();
 
-        User user = luckperms.getUserManager().getUser(player.getUniqueId());
+        User user = luckperms.getUserManager().getUser(playerId);
         if (user == null) {
             return false;
         }
@@ -38,18 +39,18 @@ public boolean createTeam(Scoreboard scoreboard, Player player) {
         String teamName = FORMAT.format(9999 - group.getWeight().orElse(0))
                 + RandomStringUtils.randomAlphanumeric(16 - 4);
 
-        Team team = scoreboard.getPlayerTeam(player);
+        Team team = scoreboard.getEntryTeam(username);
         if (team == null) {
             team = scoreboard.registerNewTeam(teamName);
-            team.addPlayer(player);
+            team.addEntry(username);
         }
         this.updateTeam(user, team);
         return true;
     }
 
     @Override
-    public boolean removeTeam(Scoreboard scoreboard, Player player) {
-        Team team = scoreboard.getPlayerTeam(player);
+    public boolean removeTeam(Scoreboard scoreboard, UUID playerId, String username) {
+        Team team = scoreboard.getEntryTeam(username);
         if (team == null) {
             return false;
         }
@@ -58,18 +59,14 @@ public boolean removeTeam(Scoreboard scoreboard, Player player) {
     }
 
     @Override
-    public boolean updateTeam(Scoreboard scoreboard, Player player) {
-        if (!player.isOnline()) {
-            return false;
-        }
-
+    public boolean updateTeam(Scoreboard scoreboard, UUID playerId, String username) {
         LuckPerms luckperms = LuckPermsProvider.get();
-        User user = luckperms.getUserManager().getUser(player.getUniqueId());
+        User user = luckperms.getUserManager().getUser(playerId);
         if (user == null) {
             return false;
         }
 
-        Team team = scoreboard.getPlayerTeam(player);
+        Team team = scoreboard.getEntryTeam(username);
         if (team != null) {
             this.updateTeam(user, team);
             return true;