Team Status in scoreboard

Author: boiscljo

gradle.properties

@@ -1,4 +1,4 @@
-SBA_VERSION=1.5.7-dev24
+SBA_VERSION=1.5.7-dev25
 
 PAPER_LEGACY_VERSION=1.16.5
 BEDWARS_VERSION=0.2.23

plugin/src/main/java/io/github/pronze/sba/config/SBAConfig.java

@@ -359,6 +359,42 @@ public void loadDefaults() {
         }
     }
 
+    public TeamStatusConfig teamStatus() {
+        return new TeamStatusConfig();
+    }
+
+    public class TeamStatusConfig {
+        /*
+         * .section("team-status")
+         * .key("target-destroyed").defValue("§c\u2717")
+         * .key("target-exists").defValue("§a\u2713")
+         * .key("alive").defValue("%color% %team% §a\u2713 §8%you%")
+         * .key("destroyed").defValue("%color% %team% §a§f%players%§8 %you%")
+         * .key("eliminated").defValue("%color% %team% §c\u2718 %you%")
+         * .back()
+         */
+
+        public String targetDestroyed() {
+            return getString("team-status.target-destroyed", "§c\u2717");
+        }
+
+        public String targetExists() {
+            return getString("team-status.target-exists", "§a\u2713");
+        }
+
+        public String alive() {
+            return getString("team-status.alive", "%color% %team% §a\u2713 §8%you%");
+        }
+
+        public String destroyed() {
+            return getString("team-status.destroyed", "%color% %team% §a§f%players%§8 %you%");
+        }
+
+        public String eliminated() {
+            return getString("team-status.eliminated", "%color% %team% §c\u2718 %you%");
+        }
+    }
+
     public boolean replaceStoreWithNpc() {
         return node("replace-stores-with-npc").getBoolean(true);
     }
@@ -367,16 +403,18 @@ public boolean replaceStoreWithCitizen() {
         return node("replace-stores-with-citizen").getBoolean(false)
                 && Bukkit.getPluginManager().isPluginEnabled("Citizens");
     }
-    public ExperimentalConfig experimental()
-    {
+
+    public ExperimentalConfig experimental() {
         return new ExperimentalConfig();
     }
-    //"fake-spectator"
-    public class ExperimentalConfig{
+
+    // "fake-spectator"
+    public class ExperimentalConfig {
         public boolean fakeSpectator() {
             return getBoolean("experimental.fake-spectator", false);
         }
     }
+
     public UpgradeConfig upgrades() {
         return new UpgradeConfig();
     }
@@ -560,7 +598,7 @@ public void upgrade() {
 
             saveFile("languages/language_en.yml");
             ServiceManager.get(FirstStartConfigReplacer.class).updateBedWarsConfig();
-            SBAUtil.reloadPlugin(Main.getInstance(),null);
+            SBAUtil.reloadPlugin(Main.getInstance(), null);
         } catch (Exception ex) {
             ex.printStackTrace();
         }

plugin/src/main/java/io/github/pronze/sba/visuals/GameScoreboardManager.java

@@ -50,7 +50,7 @@ public GameScoreboardManager(Arena arena) {
                     .get(MessageKeys.SCOREBOARD_LINES_DEFAULT)
                     .toStringList());
         }
-        if(SBAConfig.getInstance().getBoolean("game-scoreboard.enabled", true))
+        if (SBAConfig.getInstance().getBoolean("game-scoreboard.enabled", true))
             game.getConnectedPlayers().forEach(this::createScoreboard);
     }
 
@@ -97,7 +97,8 @@ public void destroy() {
         scoreboardMap.values().forEach(Scoreboard::destroy);
         scoreboardMap.clear();
         if (updateTask != null) {
-            if (Bukkit.getScheduler().isCurrentlyRunning(updateTask.getTaskId()) || Bukkit.getScheduler().isQueued(updateTask.getTaskId())) {
+            if (Bukkit.getScheduler().isCurrentlyRunning(updateTask.getTaskId())
+                    || Bukkit.getScheduler().isQueued(updateTask.getTaskId())) {
                 updateTask.cancel();
             }
         }
@@ -168,8 +169,8 @@ public List<String> process(Player player, Scoreboard board) {
                             .replace("%game%", game.getName())
                             .replace("%date%", DateUtils.getFormattedDate())
                             .replace("%team_bed_status%", teamStatus == null ? "" : teamStatus)
-                            .replace("%tier_task%",generatorTask.getNextTierName())
-                            .replace("%tier_time%",generatorTask.getTimeLeftForNextEvent())
+                            .replace("%tier_task%", generatorTask.getNextTierName())
+                            .replace("%tier_time%", generatorTask.getTimeLeftForNextEvent())
                             .replace("%tier%", generatorTask.getNextTierName()
                                     .replace("-", " ") + " in §a" + generatorTask.getTimeLeftForNextEvent());
 
@@ -179,35 +180,33 @@ public List<String> process(Player player, Scoreboard board) {
     }
 
     private String getTeamBedStatus(RunningTeam team) {
-        return team.isDead() ?
-                SBAConfig.getInstance().node("team-status", "target-destroyed").getString("§c\u2717") :
-                SBAConfig.getInstance().node("team-status", "target-exists").getString("§a\u2713");
+        return team.isDead() ? SBAConfig.getInstance().node("team-status", "target-destroyed").getString("§c\u2717")
+                : SBAConfig.getInstance().node("team-status", "target-exists").getString("§a\u2713");
     }
 
     private String getTeamStatusFormat(RunningTeam team) {
-        String alive = SBAConfig
-                .getInstance()
-                .node("team-status", "alive")
-                .getString("%color% %team% §a\u2713 §8%you%");
+        String alive = SBAConfig.getInstance().teamStatus().alive();
 
-        String destroyed = SBAConfig
-                .getInstance()
-                .node("team-status", "destroyed")
-                .getString("%color% %team% §a§f%players%§8 %you%");
+        String destroyed = SBAConfig.getInstance().teamStatus().destroyed();
 
-        String status = team.isTargetBlockExists() ? alive : destroyed;
+        String eliminated = SBAConfig.getInstance().teamStatus().eliminated();
+
+        String status = team.isTargetBlockExists() ? alive
+                : (team.getConnectedPlayers().size() > 0) ? destroyed : eliminated;
 
         String formattedTeam = TeamColor
-                .valueOf(team.getColor().name())
-                .chatColor
+                .valueOf(team.getColor().name()).chatColor
                 .toString()
                 + team.getName().charAt(0);
 
-        return status
+        status = status
                 .replace("%bed_status%", getTeamBedStatus(team))
                 .replace("%color%", formattedTeam)
-                .replace("%team%", ChatColor.WHITE + team.getName() + ":")
-                .replace("%players%", ChatColor.GREEN.toString() + team.getConnectedPlayers().size());
+                .replace("%team%", ChatColor.WHITE + team.getName() + ":");
+        int teamSize = team.getConnectedPlayers().size();
+        status = status.replace("%players%", ChatColor.GREEN.toString() + teamSize);
+
+        return status;
     }
 
     private String getTeamStatusFormat(Team team) {