From 4450eaaf8ccc7dc4452787da30f746defb305798 Mon Sep 17 00:00:00 2001 From: aroooo Date: Fri, 4 Nov 2022 17:19:44 +0100 Subject: [PATCH] fix: display object instead of foreign key --- .../java/net/artelnatif/nicko/i18n/I18N.java | 4 +-- .../net/artelnatif/nicko/i18n/I18NDict.java | 36 +++++++------------ 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18N.java b/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18N.java index 0bb7f9b..0ff0885 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18N.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18N.java @@ -28,10 +28,10 @@ public class I18N { public static String translate(Player player, I18NDict key, Object... arguments) { try { - formatter.applyPattern(getBundle(player).getString(key.getKey())); + formatter.applyPattern(getBundle(player).getString(key.key())); return NickoBukkit.getInstance().getNickoConfig().getPrefix() + formatter.format(arguments); } catch (Exception e) { - return NickoBukkit.getInstance().getNickoConfig().getPrefix() + key; + return NickoBukkit.getInstance().getNickoConfig().getPrefix() + key.key(); } } } diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java b/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java index d10f3a2..1e344fb 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java @@ -1,31 +1,21 @@ package net.artelnatif.nicko.i18n; -public class I18NDict { - private String key; - - public I18NDict(String key) { - this.key = key; - } - +public record I18NDict(String key) { public static class Event { - public static final I18NDict UNDISGUISE_SUCCESS = new I18NDict("undisguise.success"); - public static final I18NDict UNDISGUISE_FAIL = new I18NDict("undisguise.fail"); - public static final I18NDict UNDISGUISE_NOTACTIVE = new I18NDict("undisguise.notactive"); - public static final I18NDict DISGUISE_SUCCESS = new I18NDict("disguise.success"); - public static final I18NDict DISGUISE_FAIL = new I18NDict("disguise.fail"); - public static final I18NDict PREVIOUS_SKIN_APPLIED = new I18NDict("previous_skin_applied.success"); - public static final I18NDict PREVIOUS_SKIN_APPLY_FAIL = new I18NDict("previous_skin_applied.fail"); + public static final I18NDict UNDISGUISE_SUCCESS = new I18NDict("event.undisguise.success"); + public static final I18NDict UNDISGUISE_FAIL = new I18NDict("event.undisguise.fail"); + public static final I18NDict UNDISGUISE_NOTACTIVE = new I18NDict("event.undisguise.notactive"); + public static final I18NDict DISGUISE_SUCCESS = new I18NDict("event.disguise.success"); + public static final I18NDict DISGUISE_FAIL = new I18NDict("event.disguise.fail"); + public static final I18NDict PREVIOUS_SKIN_APPLIED = new I18NDict("event.previous_skin_applied.success"); + public static final I18NDict PREVIOUS_SKIN_APPLY_FAIL = new I18NDict("event.previous_skin_applied.fail"); } public static class Error { - public static final I18NDict SKIN_FAIL_MOJANG = new I18NDict("couldnt_get_skin_from_mojang"); - public static final I18NDict SKIN_FAIL_CACHE = new I18NDict("couldnt_get_skin_from_cache"); - public static final I18NDict NAME_FAIL_MOJANG = new I18NDict("couldnt_get_name_from_mojang"); - public static final I18NDict INVALID_USERNAME = new I18NDict("invalid_username"); - public static final I18NDict UNEXPECTED_ERROR = new I18NDict("generic"); - } - - public String getKey() { - return key; + public static final I18NDict SKIN_FAIL_MOJANG = new I18NDict("error.couldnt_get_skin_from_mojang"); + public static final I18NDict SKIN_FAIL_CACHE = new I18NDict("error.couldnt_get_skin_from_cache"); + public static final I18NDict NAME_FAIL_MOJANG = new I18NDict("error.couldnt_get_name_from_mojang"); + public static final I18NDict INVALID_USERNAME = new I18NDict("error.invalid_username"); + public static final I18NDict UNEXPECTED_ERROR = new I18NDict("error.generic"); } }