From cafed58c0eee7473ba219ac07c6ce961db5587c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20Dasc=C4=83lu?= Date: Fri, 18 Aug 2023 21:07:42 +0200 Subject: [PATCH] wip --- .../bedwars/api/language/Messages.java | 43 ++++++++++++----- .../andrei1058/bedwars/language/Romanian.java | 47 +++++++++++-------- .../andrei1058/bedwars/sidebar/BwSidebar.java | 24 +++++----- 3 files changed, 71 insertions(+), 43 deletions(-) diff --git a/bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java b/bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java index cb636d061..b20ab53b3 100644 --- a/bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java +++ b/bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java @@ -185,10 +185,6 @@ public class Messages { public static String FORMATTING_SCOREBOARD_DATE = "format-sb-date"; public static String FORMATTING_SCOREBOARD_TEAM_GENERIC = "format-sb-team-generic"; public static String FORMATTING_SCOREBOARD_HEALTH = "format-sb-health"; - public static String FORMATTING_SCOREBOARD_TAB_PREFIX_STARTING = "format-sb-tab-prefix.starting"; - public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_STARTING = "format-sb-tab-suffix.starting"; - public static String FORMATTING_SCOREBOARD_TAB_PREFIX_PLAYING = "format-sb-tab-prefix.playing"; - public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_PLAYING = "format-sb-tab-suffix.playing"; // TAB public static String FORMATTING_SB_TAB_BASE = "format-tab"; @@ -206,15 +202,24 @@ public class Messages { public static String FORMATTING_SB_TAB_WAITING_SUFFIX = FORMATTING_SB_TAB_BASE+".waiting.player.suffix"; // TAB STARTING - // todo implement me public static String FORMATTING_SB_TAB_STARTING_HEADER = FORMATTING_SB_TAB_BASE+".starting.player.header"; - // todo implement me public static String FORMATTING_SB_TAB_STARTING_FOOTER = FORMATTING_SB_TAB_BASE+".starting.player.footer"; - // todo implement me public static String FORMATTING_SB_TAB_STARTING_PREFIX = FORMATTING_SB_TAB_BASE+".starting.player.prefix"; - // todo implement me public static String FORMATTING_SB_TAB_STARTING_SUFFIX = FORMATTING_SB_TAB_BASE+".starting.player.suffix"; + // TAB PLAYING + public static String FORMATTING_SB_TAB_PLAYING_HEADER = FORMATTING_SB_TAB_BASE+".playing.player.header"; + public static String FORMATTING_SB_TAB_PLAYING_FOOTER = FORMATTING_SB_TAB_BASE+".playing.player.footer"; + public static String FORMATTING_SB_TAB_PLAYING_PREFIX = FORMATTING_SB_TAB_BASE+".playing.player.prefix"; + public static String FORMATTING_SB_TAB_PLAYING_SUFFIX = FORMATTING_SB_TAB_BASE+".playing.player.suffix"; + + // TAB PLAYING + public static String FORMATTING_SB_TAB_RESTARTING_HEADER = FORMATTING_SB_TAB_BASE+".restarting.player.header"; + public static String FORMATTING_SB_TAB_RESTARTING_FOOTER = FORMATTING_SB_TAB_BASE+".restarting.player.footer"; + public static String FORMATTING_SB_TAB_RESTARTING_PREFIX = FORMATTING_SB_TAB_BASE+".restarting.player.prefix"; + public static String FORMATTING_SB_TAB_RESTARTING_SUFFIX = FORMATTING_SB_TAB_BASE+".restarting.player.suffix"; + + // todo public static String FORMATTING_SB_TAB_WAITING_HEADER_SPEC = FORMATTING_SB_TAB_BASE+".waiting.spectator.header"; public static String FORMATTING_SB_TAB_WAITING_FOOTER_SPEC = FORMATTING_SB_TAB_BASE+".waiting.spectator.footer"; @@ -225,7 +230,7 @@ public class Messages { @Deprecated(forRemoval = true) public static String FORMATTING_SIDEBAR_TAB_HEADER_STARTING = "format-sb-tab-header.starting"; @Deprecated(forRemoval = true) - public static String FORMATTING_SIDEBAR_TAB_HEADER_PLAYING = "format-sb-tab-header.playing"; + public static String FORMATTING_SIDEBAR_TAB_HEADER_PLAYING = FORMATTING_SB_TAB_PLAYING_HEADER; @Deprecated(forRemoval = true) public static String FORMATTING_SIDEBAR_TAB_HEADER_RESTARTING = "format-sb-tab-header.restarting"; @Deprecated(forRemoval = true) @@ -233,20 +238,34 @@ public class Messages { @Deprecated(forRemoval = true) public static String FORMATTING_SIDEBAR_TAB_FOOTER_STARTING = "format-sb-tab-footer.starting"; @Deprecated(forRemoval = true) - public static String FORMATTING_SIDEBAR_TAB_FOOTER_PLAYING = "format-sb-tab-footer.playing"; + public static String FORMATTING_SIDEBAR_TAB_FOOTER_PLAYING = FORMATTING_SB_TAB_PLAYING_FOOTER; @Deprecated(forRemoval = true) public static String FORMATTING_SIDEBAR_TAB_FOOTER_RESTARTING = "format-sb-tab-footer.restarting"; @Deprecated(forRemoval = true) public static String FORMATTING_SIDEBAR_TAB_FOOTER_SPECTATOR = "format-sb-tab-footer.spectator"; - @Deprecated + @Deprecated(forRemoval = true) public static String FORMATTING_SCOREBOARD_TAB_PREFIX_PRESTARTING = "format-sb-tab-prefix.restarting"; + @Deprecated(forRemoval = true) public static String FORMATTING_SCOREBOARD_TAB_PREFIX_RESTARTING = "format-sb-tab-prefix.restarting"; - @Deprecated + @Deprecated(forRemoval = true) public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_PRESTARTING = "format-sb-tab-suffix.restarting"; + @Deprecated(forRemoval = true) public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_RESTARTING = "format-sb-tab-suffix.restarting"; + @Deprecated(forRemoval = true) public static String FORMATTING_SCOREBOARD_TAB_PREFIX_SPECTATOR = "format-sb-tab-prefix.spectator"; + @Deprecated(forRemoval = true) public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_SPECTATOR = "format-sb-tab-suffix.spectator"; + @Deprecated(forRemoval = true) + public static String FORMATTING_SCOREBOARD_TAB_PREFIX_STARTING = "format-sb-tab-prefix.starting"; + @Deprecated(forRemoval = true) + public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_STARTING = "format-sb-tab-suffix.starting"; + @Deprecated(forRemoval = true) + public static String FORMATTING_SCOREBOARD_TAB_PREFIX_PLAYING = "format-sb-tab-prefix.playing"; + @Deprecated(forRemoval = true) + public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_PLAYING = "format-sb-tab-suffix.playing"; + + public static String FORMATTING_SPECTATOR_TEAM = "format-spectator-team"; @Deprecated public static String FORMATTING_SPECTATOR_COLOR = "format-spectator-color"; diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Romanian.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Romanian.java index 960d7177d..26e867b8f 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Romanian.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Romanian.java @@ -54,21 +54,41 @@ public Romanian() { yml.addDefault(Messages.FORMATTING_SB_TAB_LOBBY_HEADER, List.of("", "&a{serverIp}", "")); yml.addDefault(Messages.FORMATTING_SB_TAB_LOBBY_FOOTER, List.of("", "&fJoci alaturi de {on} jucatori", "Powered by BedWars1058,&a{serverIp}", "")); + yml.addDefault(Messages.FORMATTING_SB_TAB_LOBBY_PREFIX, List.of("{vPrefix}")); + yml.addDefault(Messages.FORMATTING_SB_TAB_LOBBY_SUFFIX, List.of(" {level}")); + yml.addDefault(Messages.FORMATTING_SB_TAB_WAITING_HEADER, List.of("", "&a{serverIp}", "")); yml.addDefault(Messages.FORMATTING_SB_TAB_WAITING_FOOTER, List.of("", "Se asteapta jucatori,Se asteapta jucatori.,Se asteapta jucatori.., Se asteapta Jucatori...", "&f{on}&a/&f{max}", "", "&a{serverIp}", "&fPowered by BedWars1058", "")); + yml.addDefault(Messages.FORMATTING_SB_TAB_WAITING_PREFIX, List.of("{vPrefix}")); + yml.addDefault(Messages.FORMATTING_SB_TAB_WAITING_SUFFIX, List.of(" {level}")); yml.addDefault(Messages.FORMATTING_SB_TAB_STARTING_HEADER, List.of("", "&a{serverIp}", "&7{date}","&7Harta: &f{map} &7Mod: &f{group}" ,"")); yml.addDefault(Messages.FORMATTING_SB_TAB_STARTING_FOOTER, List.of("", "&fJocul incepe in &a{time} &fsecunde,&fJocul incepe in &a{time} &fsecunde.,&fJocul incepe in &a{time} &fsecunde..,&fJocul incepe in &a{time} &fsecunde..", "&f{on}&a/&f{max}", "", "&a{serverIp}", "&fPowered by BedWars1058", "")); - // todo implement me - yml.addDefault(Messages.FORMATTING_SIDEBAR_TAB_HEADER_PLAYING, List.of("", "&a{serverIp}", "&7{date}","&7Harta: &f{map} &7Mod: &f{group}", "", "{nextEvent} in {time}" ,"")); - yml.addDefault(Messages.FORMATTING_SIDEBAR_TAB_FOOTER_PLAYING, List.of("", "&fJoci in echipa {PlayerTeamColor}{PlayerTeamName}", "&a{serverIp}", "&fPowered by BedWars1058", "")); -// todo implement me - yml.addDefault(Messages.FORMATTING_SIDEBAR_TAB_HEADER_RESTARTING, List.of("", "&a{serverIp}", "&7{date}","&7Harta: &f{map} &7Mod: &f{group}" ,"")); - yml.addDefault(Messages.FORMATTING_SIDEBAR_TAB_FOOTER_RESTARTING, List.of("", "&fAi fost in echipa {PlayerTeamColor}{PlayerTeamName}", "&fMultumim ca ai jucat la noi {player}!", "&a{serverIp}", "&fPowered by BedWars1058", "")); -// todo implement me + yml.addDefault(Messages.FORMATTING_SB_TAB_STARTING_PREFIX, List.of("{vPrefix} ")); + yml.addDefault(Messages.FORMATTING_SB_TAB_STARTING_SUFFIX, List.of(" {level}")); + + yml.addDefault(Messages.FORMATTING_SB_TAB_PLAYING_HEADER, List.of("", "&a{serverIp}", "&7{date}","&7Harta: &f{map} &7Mod: &f{group}", "", "{nextEvent} in {time}" ,"")); + yml.addDefault(Messages.FORMATTING_SB_TAB_PLAYING_FOOTER, List.of("", "&fJoci in echipa {PlayerTeamColor}{PlayerTeamName}", "&a{serverIp}", "&fPowered by BedWars1058", "")); + yml.addDefault(Messages.FORMATTING_SB_TAB_PLAYING_PREFIX, Arrays.asList("{team} ","{team} ","{team} ","{team} ","{team} ", "{team} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}")); + yml.addDefault(Messages.FORMATTING_SB_TAB_PLAYING_SUFFIX, List.of(" {level}")); + + yml.addDefault(Messages.FORMATTING_SB_TAB_RESTARTING_HEADER, List.of("", "&a{serverIp}", "&7{date}","&7Harta: &f{map} &7Mod: &f{group}" ,"")); + yml.addDefault(Messages.FORMATTING_SB_TAB_RESTARTING_FOOTER, List.of("", "&fAi fost in echipa {PlayerTeamColor}{PlayerTeamName}", "&fMultumim ca ai jucat la noi {player}!", "&a{serverIp}", "&fPowered by BedWars1058", "")); + yml.addDefault(Messages.FORMATTING_SB_TAB_RESTARTING_PREFIX, Arrays.asList("{team} ","{team} ","{team} ","{team} ","{team} ", "{team} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}")); + yml.addDefault(Messages.FORMATTING_SB_TAB_RESTARTING_SUFFIX, List.of(" {level}")); + + // todo implement me\ yml.addDefault(Messages.FORMATTING_SIDEBAR_TAB_HEADER_SPECTATOR, "&9{serverIp}"); yml.addDefault(Messages.FORMATTING_SIDEBAR_TAB_FOOTER_SPECTATOR, "&9{serverIp}"); + + + + yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_PREFIX_SPECTATOR, "&7"); + yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_SUFFIX_SPECTATOR, ""); + + + yml.options().copyDefaults(true); yml.addDefault(Messages.COMMAND_MAIN, Arrays.asList("", "&2▪ &7/" + mainCmd + " stats", "&2▪ &7/" + mainCmd + " join &o", "&2▪ &7/" + mainCmd + " leave", "&2▪ &7/" + mainCmd + " lang", "&2▪ &7/" + mainCmd + " gui", "&2▪ &7/" + mainCmd + " start &3(vip)")); yml.addDefault(Messages.COMMAND_JOIN_DENIED_IS_FULL, "{prefix}&cArena este plina!\n&aAi putea lua in considerare donarea pentru mai multe facilitati. &7&o(click)"); @@ -195,18 +215,7 @@ public Romanian() { yml.addDefault(Messages.FORMATTING_CHAT_SPECTATOR, "{level}{vPrefix}&7[SPECTATOR] {player}{vSuffix}: {message}"); yml.addDefault(Messages.FORMATTING_SCOREBOARD_HEALTH, Arrays.asList("&c❤", "&aViață")); yml.addDefault(Messages.FORMATTING_SPECTATOR_TEAM, "SPECT"); - yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_PREFIX_SPECTATOR, "&7"); - yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_SUFFIX_SPECTATOR, ""); - yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_PREFIX_RESTARTING, Arrays.asList("{teamColor}&l{teamLetter} &r{teamColor}", "{team} ", "{vPrefix} {teamColor}")); - yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_SUFFIX_RESTARTING, new ArrayList<>()); - yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_PREFIX_PLAYING, Arrays.asList("{teamColor}&l{teamLetter} &r{teamColor}", "{team} ", "{vPrefix} {teamColor}&l{teamLetter} &r{teamColor}")); - yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_SUFFIX_PLAYING, new ArrayList<>()); - yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_PREFIX_STARTING, List.of("{vPrefix} ")); - yml.addDefault(Messages.FORMATTING_SCOREBOARD_TAB_SUFFIX_STARTING, new ArrayList<>()); - yml.addDefault(Messages.FORMATTING_SB_TAB_WAITING_PREFIX, List.of("{vPrefix}")); - yml.addDefault(Messages.FORMATTING_SB_TAB_WAITING_SUFFIX, List.of(" {level}")); - yml.addDefault(Messages.FORMATTING_SB_TAB_LOBBY_PREFIX, List.of("{vPrefix}")); - yml.addDefault(Messages.FORMATTING_SB_TAB_LOBBY_SUFFIX, List.of(" {level}")); + yml.addDefault(Messages.FORMATTING_SCOREBOARD_DATE, "dd/MM/yy"); yml.addDefault(Messages.FORMATTING_SCOREBOARD_TEAM_GENERIC, "{TeamColor}{TeamLetter}&f {TeamName}: {TeamStatus}"); yml.addDefault(Messages.FORMATTING_SCOREBOARD_TEAM_ELIMINATED, "&c&l✘"); diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/BwSidebar.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/BwSidebar.java index 156079ca8..32f48c43f 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/BwSidebar.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/BwSidebar.java @@ -478,8 +478,8 @@ public void giveUpdateTabFormat(@NotNull Player player, boolean skipStateCheck) suffix = getTabText(Messages.FORMATTING_SB_TAB_WAITING_SUFFIX, player, null); break; case starting: - prefix = getTabText(Messages.FORMATTING_SCOREBOARD_TAB_PREFIX_STARTING, player, null); - suffix = getTabText(Messages.FORMATTING_SCOREBOARD_TAB_SUFFIX_STARTING, player, null); + prefix = getTabText(Messages.FORMATTING_SB_TAB_STARTING_PREFIX, player, null); + suffix = getTabText(Messages.FORMATTING_SB_TAB_STARTING_SUFFIX, player, null); break; case restarting: ITeam team = arena.getTeam(player); @@ -495,8 +495,8 @@ public void giveUpdateTabFormat(@NotNull Player player, boolean skipStateCheck) replacements.put("{teamColor}", null == team ? "" : team.getColor().chat().toString()); - prefix = getTabText(Messages.FORMATTING_SCOREBOARD_TAB_PREFIX_RESTARTING, player, replacements); - suffix = getTabText(Messages.FORMATTING_SCOREBOARD_TAB_SUFFIX_RESTARTING, player, replacements); + prefix = getTabText(Messages.FORMATTING_SB_TAB_RESTARTING_PREFIX, player, replacements); + suffix = getTabText(Messages.FORMATTING_SB_TAB_RESTARTING_SUFFIX, player, replacements); break; default: throw new IllegalStateException("Unhandled game status!"); @@ -548,8 +548,8 @@ public void giveUpdateTabFormat(@NotNull Player player, boolean skipStateCheck) replacements.put("{teamLetter}", team.getColor().chat() + (displayName.substring(0, 1))); replacements.put("{teamColor}", team.getColor().chat().toString()); - prefix = getTabText(Messages.FORMATTING_SCOREBOARD_TAB_PREFIX_PLAYING, player, replacements); - suffix = getTabText(Messages.FORMATTING_SCOREBOARD_TAB_SUFFIX_PLAYING, player, replacements); + prefix = getTabText(Messages.FORMATTING_SB_TAB_PLAYING_PREFIX, player, replacements); + suffix = getTabText(Messages.FORMATTING_SB_TAB_PLAYING_SUFFIX, player, replacements); teamTab = handle.playerTabCreate(tabName, null, prefix, suffix, PlayerTab.PushingRule.PUSH_OTHER_TEAMS); tabList.put(tabName, teamTab); @@ -598,16 +598,16 @@ private void assignTabHeaderFooter() { footerPath = Messages.FORMATTING_SB_TAB_WAITING_FOOTER; break; case starting: - headerPath = Messages.FORMATTING_SIDEBAR_TAB_HEADER_STARTING; - footerPath = Messages.FORMATTING_SIDEBAR_TAB_FOOTER_STARTING; + headerPath = Messages.FORMATTING_SB_TAB_STARTING_HEADER; + footerPath = Messages.FORMATTING_SB_TAB_STARTING_FOOTER; break; case playing: - headerPath = Messages.FORMATTING_SIDEBAR_TAB_HEADER_PLAYING; - footerPath = Messages.FORMATTING_SIDEBAR_TAB_FOOTER_PLAYING; + headerPath = Messages.FORMATTING_SB_TAB_PLAYING_HEADER; + footerPath = Messages.FORMATTING_SB_TAB_PLAYING_FOOTER; break; case restarting: - headerPath = Messages.FORMATTING_SIDEBAR_TAB_HEADER_RESTARTING; - footerPath = Messages.FORMATTING_SIDEBAR_TAB_FOOTER_RESTARTING; + headerPath = Messages.FORMATTING_SB_TAB_RESTARTING_PREFIX; + footerPath = Messages.FORMATTING_SB_TAB_RESTARTING_SUFFIX; break; default: throw new IllegalStateException("Unhandled arena status");