From ff22f5addf774a51511b750d4ce8a2185d16a641 Mon Sep 17 00:00:00 2001 From: ineanto Date: Thu, 28 Dec 2023 21:07:12 +0100 Subject: [PATCH] fix(i18n): update calls --- src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java | 1 + src/main/java/xyz/ineanto/nicko/command/NickoCommand.java | 2 +- .../nicko/gui/items/admin/cache/InvalidateCacheItem.java | 2 +- .../xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java | 4 ++-- .../java/xyz/ineanto/nicko/gui/items/home/ResetItem.java | 6 +++--- .../nicko/gui/items/settings/LanguageCyclingItem.java | 2 +- .../nicko/gui/items/settings/RandomSkinCyclingItem.java | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java b/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java index 3d9553f..e52ad99 100644 --- a/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java +++ b/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java @@ -130,6 +130,7 @@ public class AnvilManager { private ItemStack getLeftItem(boolean skin) { final ItemStack item = new ItemStack(Material.PAPER); final ItemMeta meta = item.getItemMeta(); + // TODO (Ineanto, 12/28/23): Translate this if (meta != null) meta.displayName(Component.text("New " + (skin ? "skin" : "name") + "...")); item.setItemMeta(meta); return item; diff --git a/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java b/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java index 1ac6bf2..40ffbbf 100644 --- a/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java +++ b/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java @@ -17,7 +17,7 @@ public class NickoCommand implements CommandExecutor { new HomeGUI(player).open(); } else { final I18N i18N = new I18N(player); - player.sendMessage(i18N.translateString(I18NDict.Error.PERMISSION)); + player.sendMessage(i18N.translate(I18NDict.Error.PERMISSION, true)); } return false; } diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateCacheItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateCacheItem.java index 14eddb3..16d2592 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateCacheItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateCacheItem.java @@ -27,7 +27,7 @@ public class InvalidateCacheItem { final Player player = click.getPlayer(); final I18N i18n = new I18N(player); - player.sendMessage(i18n.translateString(I18NDict.Event.Admin.Cache.INVALIDATE_CACHE)); + player.sendMessage(i18n.translate(I18NDict.Event.Admin.Cache.INVALIDATE_CACHE, true)); NickoBukkit.getInstance().getMojangAPI().getSkinCache().invalidateAll(); return true; } diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java index 16d6675..9a3e27e 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java @@ -40,9 +40,9 @@ public class RandomSkinItem { final AppearanceManager appearanceManager = new AppearanceManager(player); if (!appearanceManager.updatePlayer(true, false).isError()) { - player.sendMessage(i18n.translateString(I18NDict.Event.Appearance.Set.OK)); + player.sendMessage(i18n.translate(I18NDict.Event.Appearance.Set.OK, true)); } else { - player.sendMessage(i18n.translateString(I18NDict.Event.Appearance.Set.ERROR)); + player.sendMessage(i18n.translate(I18NDict.Event.Appearance.Set.ERROR, true)); } }); return true; diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java index 4ee2bad..b328a52 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java @@ -30,16 +30,16 @@ public class ResetItem { final Optional optionalProfile = NickoProfile.get(player); optionalProfile.ifPresent(profile -> { if (!profile.hasData()) { - player.sendMessage(i18n.translateString(I18NDict.Event.Appearance.Remove.MISSING)); + player.sendMessage(i18n.translate(I18NDict.Event.Appearance.Remove.MISSING, true)); event.getEvent().getView().close(); return; } final AppearanceManager appearanceManager = new AppearanceManager(player); if (!appearanceManager.reset().isError()) { - player.sendMessage(i18n.translateString(I18NDict.Event.Appearance.Remove.OK)); + player.sendMessage(i18n.translate(I18NDict.Event.Appearance.Remove.OK, true)); } else { - player.sendMessage(i18n.translateString(I18NDict.Event.Appearance.Remove.ERROR)); + player.sendMessage(i18n.translate(I18NDict.Event.Appearance.Remove.ERROR, true)); } }); return true; diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/settings/LanguageCyclingItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/settings/LanguageCyclingItem.java index 71bb94d..9c691ec 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/settings/LanguageCyclingItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/settings/LanguageCyclingItem.java @@ -47,7 +47,7 @@ public class LanguageCyclingItem { nickoProfile.setLocale(Locale.values()[integer]); player.getOpenInventory().close(); if (dataStore.updateCache(player.getUniqueId(), nickoProfile).isError()) { - player.sendMessage(i18n.translateString(I18NDict.Event.Settings.ERROR)); + player.sendMessage(i18n.translate(I18NDict.Event.Settings.ERROR, true)); } else { new SettingsGUI(player).open(); } diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/settings/RandomSkinCyclingItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/settings/RandomSkinCyclingItem.java index 0a2be42..af62565 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/settings/RandomSkinCyclingItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/settings/RandomSkinCyclingItem.java @@ -43,7 +43,7 @@ public class RandomSkinCyclingItem { observer.playSound(player, Sound.UI_BUTTON_CLICK, 1f, 0.707107f); // 0.707107 ~= C nickoProfile.setRandomSkin(integer != 1); if (dataStore.updateCache(player.getUniqueId(), nickoProfile).isError()) { - player.sendMessage(i18n.translateString(I18NDict.Event.Settings.ERROR)); + player.sendMessage(i18n.translate(I18NDict.Event.Settings.ERROR, true)); player.getOpenInventory().close(); } }, localeOrdinal, providers);