From 137cd32783dec85c38e93555a729fc96f84278c8 Mon Sep 17 00:00:00 2001 From: Pugzy Date: Sun, 1 Sep 2019 14:19:59 +0100 Subject: [PATCH] Use Commons translation strings for menu interface stats --- .../src/main/i18n/templates/pgm/PGMUI.properties | 10 ---------- .../tc/oc/pgm/menu/gui/MainMenuInterface.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Commons/core/src/main/i18n/templates/pgm/PGMUI.properties b/Commons/core/src/main/i18n/templates/pgm/PGMUI.properties index d75a288a5..48c85b941 100644 --- a/Commons/core/src/main/i18n/templates/pgm/PGMUI.properties +++ b/Commons/core/src/main/i18n/templates/pgm/PGMUI.properties @@ -346,13 +346,3 @@ broadcast.alliancesNotAllowed = Creating alliances with other players is NOT all countdown.chestsRefill = Chests will refill in {0} countdown.glowingEffect = Glowing effect in {0} - -stats.ui.list = 's Stats -stats.ui.kills = Kills: -stats.ui.deaths = Deaths: -stats.ui.kd = KD: -stats.ui.kk = KK: -stats.ui.wools = Wools Placed: -stats.ui.cores = Cores Leaked: -stats.ui.monuments = Monuments Destroyed: -stats.ui.teamkills = TK: diff --git a/PGM/src/main/java/tc/oc/pgm/menu/gui/MainMenuInterface.java b/PGM/src/main/java/tc/oc/pgm/menu/gui/MainMenuInterface.java index d066086f3..af09b60cf 100644 --- a/PGM/src/main/java/tc/oc/pgm/menu/gui/MainMenuInterface.java +++ b/PGM/src/main/java/tc/oc/pgm/menu/gui/MainMenuInterface.java @@ -6,12 +6,12 @@ import tc.oc.commons.bukkit.chat.PlayerComponent; import tc.oc.commons.bukkit.gui.buttons.Button; import tc.oc.commons.bukkit.gui.interfaces.ChestInterface; +import tc.oc.commons.bukkit.localization.CommonsTranslations; import tc.oc.commons.bukkit.stats.StatsUtil; import tc.oc.commons.bukkit.tokens.TokenUtil; import tc.oc.commons.bukkit.util.Constants; import tc.oc.commons.bukkit.util.ItemCreator; import tc.oc.commons.core.chat.Component; -import tc.oc.pgm.PGMTranslations; import tc.oc.pgm.tokens.gui.MainTokenButton; import tc.oc.pgm.tokens.gui.MutationTokenInterface; import tc.oc.pgm.tokens.gui.TokenPurchaseInterface; @@ -41,13 +41,13 @@ public void updateButtons() { buttons.add(new Button( new ItemCreator(Material.GOLDEN_APPLE) .setData(1) - .setName(Constants.PREFIX + getPlayer().getDisplayName() + PGMTranslations.get().t("stats.ui.list", getPlayer())) - .addLore(ChatColor.AQUA + PGMTranslations.get().t("stats.ui.kills", getPlayer()) + ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("kills"))) - .addLore(ChatColor.AQUA + PGMTranslations.get().t("stats.ui.deaths", getPlayer()) + ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("deaths"))) - .addLore(ChatColor.AQUA + PGMTranslations.get().t("stats.ui.kd", getPlayer()) + ChatColor.BLUE + String.format("%.2f", stats.get("kd"))) - .addLore(ChatColor.AQUA + PGMTranslations.get().t("stats.ui.wools", getPlayer()) + ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("wool_placed"))) - .addLore(ChatColor.AQUA + PGMTranslations.get().t("stats.ui.cores", getPlayer()) + ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("cores_leaked"))) - .addLore(ChatColor.AQUA + PGMTranslations.get().t("stats.ui.monuments", getPlayer()) + ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("destroyables_destroyed"))) + .setName(CommonsTranslations.get().t("stats.list", getPlayer(), Constants.PREFIX + getPlayer().getDisplayName())) + .addLore(ChatColor.AQUA + CommonsTranslations.get().t("stats.kills", getPlayer(), ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("kills")))) + .addLore(ChatColor.AQUA + CommonsTranslations.get().t("stats.deaths", getPlayer(), ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("deaths")))) + .addLore(ChatColor.AQUA + CommonsTranslations.get().t("stats.kd", getPlayer(), ChatColor.BLUE + String.format("%.2f", stats.get("kd")))) + .addLore(ChatColor.AQUA + CommonsTranslations.get().t("stats.wools", getPlayer(), ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("wool_placed")))) + .addLore(ChatColor.AQUA + CommonsTranslations.get().t("stats.cores", getPlayer(), ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("cores_leaked")))) + .addLore(ChatColor.AQUA + CommonsTranslations.get().t("stats.monuments", getPlayer(), ChatColor.BLUE + String.format("%,d", (int)(double)stats.get("destroyables_destroyed")))) , 13)); buttons.add(new Button(