From 19b99743fce118ec0fdc3b9a662ab4b2659ab0d5 Mon Sep 17 00:00:00 2001 From: Steffion Date: Mon, 26 Aug 2013 16:12:04 +0200 Subject: [PATCH] + Added ability to change the scoreboard contents. --- .../Steffion/BlockHunt/Managers/ConfigC.java | 4 +++ .../Steffion/BlockHunt/ScoreboardHandler.java | 29 ++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/nl/Steffion/BlockHunt/Managers/ConfigC.java b/src/nl/Steffion/BlockHunt/Managers/ConfigC.java index 2037dfc..2d35675 100644 --- a/src/nl/Steffion/BlockHunt/Managers/ConfigC.java +++ b/src/nl/Steffion/BlockHunt/Managers/ConfigC.java @@ -50,6 +50,10 @@ public enum ConfigC { "%A%players%%N/%A%maxplayers%", "%EIngame: %A%timeleft%" }, W.config), + scoreboard_timeleft ("%ATime left:", W.config), + scoreboard_seekers ("%NSeekers:", W.config), + scoreboard_hiders ("%NHiders:", W.config), + log_Enabled ("%N%name%&a&k + %N%version% is now Enabled. Made by %A%autors%%N.", W.messages), log_Disabled ("%N%name%&c&k - %N%version% is now Disabled. Made by %A%autors%%N.", diff --git a/src/nl/Steffion/BlockHunt/ScoreboardHandler.java b/src/nl/Steffion/BlockHunt/ScoreboardHandler.java index 851e790..38c9809 100644 --- a/src/nl/Steffion/BlockHunt/ScoreboardHandler.java +++ b/src/nl/Steffion/BlockHunt/ScoreboardHandler.java @@ -1,6 +1,7 @@ package nl.Steffion.BlockHunt; import nl.Steffion.BlockHunt.Arena.ArenaState; +import nl.Steffion.BlockHunt.Managers.ConfigC; import nl.Steffion.BlockHunt.Managers.MessageM; import org.bukkit.Bukkit; @@ -21,14 +22,18 @@ public class ScoreboardHandler { Objective object = board.registerNewObjective(arena.arenaName, "dummy"); object.setDisplaySlot(DisplaySlot.SIDEBAR); object.setDisplayName(MessageM.replaceAll(MessageM.CType.TAG())); - Score timeleft = object.getScore(Bukkit.getOfflinePlayer(MessageM - .replaceAll("%ATime left:"))); + Score timeleft = object + .getScore(Bukkit.getOfflinePlayer(MessageM + .replaceAll((String) W.config + .get(ConfigC.scoreboard_timeleft)))); timeleft.setScore(arena.timer); - Score seekers = object.getScore(Bukkit.getOfflinePlayer(MessageM - .replaceAll("%NSeekers:"))); + Score seekers = object + .getScore(Bukkit.getOfflinePlayer(MessageM + .replaceAll((String) W.config + .get(ConfigC.scoreboard_seekers)))); seekers.setScore(arena.seekers.size()); Score hiders = object.getScore(Bukkit.getOfflinePlayer(MessageM - .replaceAll("%NHiders:"))); + .replaceAll((String) W.config.get(ConfigC.scoreboard_hiders)))); hiders.setScore(arena.playersInArena.size() - arena.seekers.size()); if (arena.gameState == ArenaState.INGAME) { for (Player pl : arena.playersInArena) { @@ -46,14 +51,18 @@ public class ScoreboardHandler { Scoreboard board = arena.scoreboard; Objective object = board.getObjective(DisplaySlot.SIDEBAR); object.setDisplayName(MessageM.replaceAll(MessageM.CType.TAG())); - Score timeleft = object.getScore(Bukkit.getOfflinePlayer(MessageM - .replaceAll("%ATime left:"))); + Score timeleft = object + .getScore(Bukkit.getOfflinePlayer(MessageM + .replaceAll((String) W.config + .get(ConfigC.scoreboard_timeleft)))); timeleft.setScore(arena.timer); - Score seekers = object.getScore(Bukkit.getOfflinePlayer(MessageM - .replaceAll("%NSeekers:"))); + Score seekers = object + .getScore(Bukkit.getOfflinePlayer(MessageM + .replaceAll((String) W.config + .get(ConfigC.scoreboard_seekers)))); seekers.setScore(arena.seekers.size()); Score hiders = object.getScore(Bukkit.getOfflinePlayer(MessageM - .replaceAll("%NHiders:"))); + .replaceAll((String) W.config.get(ConfigC.scoreboard_hiders)))); hiders.setScore(arena.playersInArena.size() - arena.seekers.size()); if (arena.gameState == ArenaState.INGAME) { for (Player pl : arena.playersInArena) {