Added SCOREBOARD_DISPLAY in config.yml

Added Placeholders for *current* usage of players for external plugins without knowing the specific arena

Author: Tigerpanzer02

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/arena/managers/PluginScoreboardManager.java

@@ -53,6 +53,9 @@ public PluginScoreboardManager(PluginArena arena) {
 
   @Override
   public void createScoreboard(IUser user) {
+    if(!arena.getPlugin().getConfigPreferences().getOption("SCOREBOARD_DISPLAY")) {
+      return;
+    }
     Player player = user.getPlayer();
 
     FastBoard board = new FastBoard(player) {

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/placeholder/PlaceholderManager.java

@@ -42,7 +42,7 @@ public class PlaceholderManager {
 
   public PlaceholderManager(PluginMain plugin) {
     this.plugin = plugin;
-    if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
+    if(Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
       plugin.getDebugger().debug(plugin.getPluginMessagePrefix() + "Hooking into PlaceholderAPI");
       new PAPIPlaceholders(plugin);
     }
@@ -139,28 +139,143 @@ public String getValue(IPluginArena arena) {
         return Integer.toString(arena.getTimer());
       }
     });
+    registerPlaceholder(new Placeholder("timer_pretty", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.PLACEHOLDER_API) {
+      @Override
+      public String getValue(Player player, IPluginArena arena) {
+        return convertSecondsToTime(arena.getTimer());
+      }
+
+      @Override
+      public String getValue(IPluginArena arena) {
+        return convertSecondsToTime(arena.getTimer());
+      }
+
+      public String convertSecondsToTime(int oldseconds) {
+        int hours = oldseconds / 3600;
+        int minutes = (oldseconds % 3600) / 60;
+        int seconds = oldseconds % 60;
+        if(hours > 0) {
+          return String.format("%02d:%02d:%02d", hours, minutes, seconds);
+        } else if(minutes > 0) {
+          return String.format("%02d:%02d", minutes, seconds);
+        } else {
+          return String.format("%02d", seconds);
+        }
+      }
+    });
     registerPlaceholder(new Placeholder("user_kit", Placeholder.PlaceholderExecutor.ALL) {
       @Override
       public String getValue(Player player) {
-        if (!plugin.getConfigPreferences().getOption("KITS")) {
+        if(!plugin.getConfigPreferences().getOption("KITS")) {
           return null;
         }
         return plugin.getUserManager().getUser(player).getKit().getName();
       }
 
       @Override
       public String getValue(Player player, IPluginArena arena) {
-        if (!plugin.getConfigPreferences().getOption("KITS")) {
+        if(!plugin.getConfigPreferences().getOption("KITS")) {
           return null;
         }
         return plugin.getUserManager().getUser(player).getKit().getName();
       }
     });
+    
+    
+    //get player specific details
+    registerPlaceholder(new Placeholder("current_arena_id", Placeholder.PlaceholderType.GLOBAL, Placeholder.PlaceholderExecutor.PLACEHOLDER_API) {
+      @Override
+      public String getValue(Player player) {
+        IPluginArena playerArena = plugin.getArenaRegistry().getArena(player);
+        return playerArena != null ? playerArena.getId() : "";
+      }
+
+      @Override
+      public String getValue() {
+        return "";
+      }
+    });
+    registerPlaceholder(new Placeholder("arena_current_state", Placeholder.PlaceholderType.GLOBAL, Placeholder.PlaceholderExecutor.PLACEHOLDER_API) {
+      @Override
+      public String getValue(Player player) {
+        IPluginArena playerArena = plugin.getArenaRegistry().getArena(player);
+        if(playerArena != null) {
+          return playerArena.getArenaState().toString().toLowerCase();
+        }
+        return "";
+      }
+
+      @Override
+      public String getValue() {
+        return "";
+      }
+    });
+    registerPlaceholder(new Placeholder("arena_current_name", Placeholder.PlaceholderType.GLOBAL, Placeholder.PlaceholderExecutor.PLACEHOLDER_API) {
+      @Override
+      public String getValue(Player player) {
+        IPluginArena playerArena = plugin.getArenaRegistry().getArena(player);
+        if(playerArena != null) {
+          return playerArena.getMapName();
+        }
+        return "";
+      }
+
+      @Override
+      public String getValue() {
+        return "";
+      }
+    });
+    registerPlaceholder(new Placeholder("arena_current_players", Placeholder.PlaceholderType.GLOBAL, Placeholder.PlaceholderExecutor.PLACEHOLDER_API) {
+      @Override
+      public String getValue(Player player) {
+        IPluginArena playerArena = plugin.getArenaRegistry().getArena(player);
+        if(playerArena != null) {
+          return Integer.toString(playerArena.getPlayers().size());
+        }
+        return "";
+      }
+
+      @Override
+      public String getValue() {
+        return "";
+      }
+    });
+    registerPlaceholder(new Placeholder("arena_current_max_players", Placeholder.PlaceholderType.GLOBAL, Placeholder.PlaceholderExecutor.PLACEHOLDER_API) {
+      @Override
+      public String getValue(Player player) {
+        IPluginArena playerArena = plugin.getArenaRegistry().getArena(player);
+        if(playerArena != null) {
+          return Integer.toString(playerArena.getMaximumPlayers());
+        }
+        return "";
+      }
+
+      @Override
+      public String getValue() {
+        return "";
+      }
+    });
+    registerPlaceholder(new Placeholder("arena_current_timer", Placeholder.PlaceholderType.GLOBAL, Placeholder.PlaceholderExecutor.PLACEHOLDER_API) {
+      @Override
+      public String getValue(Player player) {
+        IPluginArena playerArena = plugin.getArenaRegistry().getArena(player);
+        if(playerArena != null) {
+          return Integer.toString(playerArena.getTimer());
+        }
+        return "";
+      }
+
+      @Override
+      public String getValue() {
+        return "";
+      }
+    });
+
 
   }
 
   public void registerPlaceholder(Placeholder placeholder) {
-    switch (placeholder.getPlaceholderExecutor()) {
+    switch(placeholder.getPlaceholderExecutor()) {
       case PLACEHOLDER_API:
         registeredPAPIPlaceholders.add(placeholder);
         break;

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/preferences/ConfigOption.java

@@ -38,6 +38,7 @@ public class ConfigOption implements IConfigOption {
     options.put("DEBUG", new ConfigOption("Debug", false, true));
     options.put("DEV_DEBUG", new ConfigOption("Developer-Mode", false, true));
     options.put("BOSSBAR", new ConfigOption("Bossbar.Display", true, true));
+    options.put("SCOREBOARD_DISPLAY", new ConfigOption("Scoreboard.Display", true, true));
     options.put("BUNGEEMODE", new ConfigOption("Bungee-Mode", false, true));
     options.put("INVENTORY_MANAGER", new ConfigOption("Inventory-Manager", true, true));
     options.put("BLOCKED_LEAVE_COMMAND", new ConfigOption("Block.In-Game.Leave", false, true));

MiniGamesBox Classic/src/main/resources/config.yml

@@ -23,6 +23,9 @@ Bossbar:
   # Interval in seconds between messages
   Interval: 10
 
+# Should we display the scoreboard ingame?
+Scoreboard:
+  Display: true
 
 # Should we hook into bungeecord? (If you wanna use arena per server option)
 # This option will let you access bungee.yml and its options.
@@ -210,4 +213,4 @@ Update-Notifier:
 # You edited it, huh? Next time hurt yourself!
 Do-Not-Edit:
   File-Version: 1
-  Core-Version: 6
+  Core-Version: 7