add simple status command

src/main/java/me/roinujnosde/titansbattle/commands/TBCommands.java

@@ -2,7 +2,17 @@
 
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.CommandHelp;
-import co.aikar.commands.annotation.*;
+import co.aikar.commands.annotation.CatchUnknown;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Default;
+import co.aikar.commands.annotation.Dependency;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Optional;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Values;
 import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 import me.roinujnosde.titansbattle.BaseGameConfiguration;
 import me.roinujnosde.titansbattle.TitansBattle;
@@ -188,4 +198,24 @@ public void watch(Player sender, Game game, @Optional ArenaConfiguration arena)
         SoundUtils.playSound(SoundUtils.Type.WATCH, plugin.getConfig(), sender);
     }
 
+    @Subcommand("%status|status")
+    @CommandPermission("titansbattle.status")
+    @Conditions("happening")
+    @Description("{@@command.description.status}")
+    public void status(Player sender) {
+        plugin.debug(String.format("%s used /tb status", sender.getName()));
+        java.util.Optional<Game> currentGame = gameManager.getCurrentGame();
+        if (!currentGame.isPresent()) {
+            sender.sendMessage(plugin.getLang("not-starting-or-started"));
+            return;
+        }
+
+        Game game = currentGame.get();
+        if (game.getConfig().isGroupMode()) {
+            sender.sendMessage(plugin.getLang("game_status_group", game, Helper.buildStringFrom(game.getGroupParticipants())));
+        } else {
+            sender.sendMessage(plugin.getLang("game_status", game, game.getParticipants().size()));
+        }
+    }
+
 }

src/main/java/me/roinujnosde/titansbattle/managers/GroupManager.java

@@ -30,7 +30,7 @@ public abstract class GroupManager {
     protected final Function<String, GroupData> idToData;
     protected final TitansBattle plugin;
 
-    public GroupManager(@NotNull TitansBattle plugin) {
+    protected GroupManager(@NotNull TitansBattle plugin) {
         this.plugin = plugin;
         this.idToData = plugin.getDatabaseManager()::getGroupData;
     }
@@ -76,7 +76,9 @@ public Set<Warrior> getWarriors(@NotNull final Group group) {
      * @return the built String
      */
     public @NotNull String buildStringFrom(@NotNull Collection<Group> groups) {
-        return Helper.buildStringFrom(groups.stream().filter(Objects::nonNull).map(Group::getName)
+        return Helper.buildStringFrom(groups.stream()
+                .filter(Objects::nonNull)
+                .map(Group::getName)
                 .collect(Collectors.toList()));
     }
 

src/main/java/me/roinujnosde/titansbattle/managers/SimpleClansGroupManager.java

@@ -50,6 +50,9 @@ public boolean sameGroup(@NotNull UUID player1, @NotNull UUID player2) {
 
     @Override
     public @NotNull String buildStringFrom(@NotNull Collection<Group> groups) {
-        return Helper.buildStringFrom(groups.stream().map(Group::getId).collect(Collectors.toList()));
+        return Helper.buildStringFrom(groups.stream()
+                .map(Group::getId)
+                .map(String::toUpperCase)
+                .collect(Collectors.toList()));
     }
 }

src/main/java/me/roinujnosde/titansbattle/types/GameConfiguration.java

@@ -53,11 +53,6 @@ public GameConfiguration(@NotNull Map<String, Object> data) {
         ConfigUtils.deserialize(this, data);
     }
 
-    @Override
-    public Map<String, Object> serialize() {
-        return ConfigUtils.serialize(this);
-    }
-
     /**
      * The name of the class responsible for managing this game
      *
@@ -91,14 +86,6 @@ public Integer getMinimumPlayers() {
         return Math.max(2, minimumPlayers);
     }
 
-    public Integer getPreparationTime() {
-        return preparationTime;
-    }
-
-    public Integer getExpirationTime() {
-        return expirationTime;
-    }
-
     public Integer getAnnouncementGameInfoInterval() {
         return announcementGameInfoInterval;
     }

src/main/java/me/roinujnosde/titansbattle/utils/Helper.java

@@ -4,6 +4,7 @@
 import me.roinujnosde.titansbattle.dao.ConfigurationDao;
 import me.roinujnosde.titansbattle.games.Game;
 import me.roinujnosde.titansbattle.types.GameConfiguration;
+import me.roinujnosde.titansbattle.types.Group;
 import me.roinujnosde.titansbattle.types.Warrior;
 import me.roinujnosde.titansbattle.types.Winners;
 import org.bukkit.Bukkit;
@@ -16,7 +17,14 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 public class Helper {
@@ -322,6 +330,17 @@ public static boolean isWinnerQuitMessageEnabled(Player player) {
         return sb.toString();
     }
 
+    public static @NotNull String buildStringFrom(@NotNull Map<Group, Integer> groupIntegerMap) {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<Group, Integer> entry : groupIntegerMap.entrySet()) {
+            sb.append(entry.getKey().getId().toUpperCase())
+                    .append("(")
+                    .append(entry.getValue())
+                    .append(") ");
+        }
+        return sb.toString();
+    }
+
     /**
      * Gets a String filled with the specified quantity of spaces
      *

src/main/resources/config.yml

@@ -51,6 +51,7 @@ commands:
     info: "info"
     setwinner: "setwinner"
     config: "config"
+    status: "status"
 
 #Sounds used in games, to disable one leave it ""
 sounds:

src/main/resources/language-en.yml

@@ -23,6 +23,7 @@ command.description.challenge.create: "Creates a challenge config file"
 command.description.challenge.setdestination: "Sets a destination for a challenge"
 command.description.challenge.setkit: "Sets your inventory as the kit for a challenge"
 command.description.setwinner: "Sets a player as the winner"
+command.description.status: "Shows the game status"
 objective: "&a» Objective: &cKill all your opponents to win!"
 item_not_allowed: "&c» You can't join the game with this item: {0}"
 challenge_item_not_allowed: "&c» You can't join the challenge with this item: {0}"
@@ -119,6 +120,8 @@ game_info: "!!broadcast&b» There are {0} players and {1} groups participating!
 game_info_duels: "!!broadcast&b» Current duel:\n  &f{0} &bx &f{1}"
 game_info_next_duels: "\n&bNext duels:\n{2}"
 game_info_duels_line: "  &b{0}. &f{1} &bx &f{2}\n"
+game_status: "&b» Game Status: {0} players alive"
+game_status_group: "&b» Game Status: {0}"
 player_joined: "&b» {0} has joined the game!"
 items_to_receive: "&b» You still have {0} item stacks to receive, clear your inventory and do not disconnect!"
 clear-your-inventory: "&b» Clear your inventory before you join this game!"

src/main/resources/plugin.yml

@@ -38,6 +38,7 @@ permissions:
       titansbattle.challenge.group: true
       titansbattle.challenge.player: true
       titansbattle.challenge.accept: true
+      titansbattle.status: true
   titansbattle.challenge.accept:
     default: false
   titansbattle.challenge.player:
@@ -76,3 +77,5 @@ permissions:
     default: false
   titansbattle.setwinner:
     default: false
+  titansbattle.status:
+    default: false