diff --git a/src/main/java/com/meowj/langutils/LangUtils.java b/src/main/java/com/meowj/langutils/LangUtils.java index bca3f31..ef2cc0d 100644 --- a/src/main/java/com/meowj/langutils/LangUtils.java +++ b/src/main/java/com/meowj/langutils/LangUtils.java @@ -14,7 +14,6 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.plugin.java.JavaPlugin; -import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; @@ -40,8 +39,9 @@ public void onEnable() { } config.addDefault("FallbackLanguage", "en_us"); - List defaultLang = new ArrayList(); + List defaultLang = new ArrayList<>(); defaultLang.add("en_us"); + defaultLang.add("zh_cn"); config.addDefault("LoadLanguage", defaultLang); config.options().copyDefaults(true); saveConfig(); diff --git a/src/main/java/com/meowj/langutils/lang/LanguageRegistry.java b/src/main/java/com/meowj/langutils/lang/LanguageRegistry.java index 12050e4..c80e19c 100644 --- a/src/main/java/com/meowj/langutils/lang/LanguageRegistry.java +++ b/src/main/java/com/meowj/langutils/lang/LanguageRegistry.java @@ -34,5 +34,4 @@ public class LanguageRegistry { public String registerEntry(EnumLang lang, String unlocalizedName, String localizedName) { return lang.getMap().put(unlocalizedName, localizedName); } - } diff --git a/src/main/java/com/meowj/langutils/lang/convert/EnumLang.java b/src/main/java/com/meowj/langutils/lang/convert/EnumLang.java index 98f7ceb..de6579d 100644 --- a/src/main/java/com/meowj/langutils/lang/convert/EnumLang.java +++ b/src/main/java/com/meowj/langutils/lang/convert/EnumLang.java @@ -179,7 +179,7 @@ public static EnumLang get(String locale) { public static void init() { for (EnumLang enumLang : EnumLang.values()) { if (!LangUtils.plugin.config.getStringList("LoadLanguage").contains("all") && !LangUtils.plugin.config.getStringList("LoadLanguage").contains(enumLang.getLocale())) { - LangUtils.plugin.info("Skipped " + enumLang.getLocale()); + LangUtils.plugin.getLogger().fine("Skipped " + enumLang.getLocale()); continue; } try { diff --git a/src/main/java/com/meowj/langutils/locale/LocaleHelper.java b/src/main/java/com/meowj/langutils/locale/LocaleHelper.java index 773aece..791de42 100644 --- a/src/main/java/com/meowj/langutils/locale/LocaleHelper.java +++ b/src/main/java/com/meowj/langutils/locale/LocaleHelper.java @@ -195,14 +195,22 @@ public static void toPlainText(StringBuilder builder, BaseComponent baseComponen public static String toLegacyText(BaseComponent component, String locale) { StringBuilder builder = new StringBuilder(); - toLegacyText(builder, component, locale); + if (component instanceof TranslatableComponent) { + toLegacyText(builder, (TranslatableComponent) component, locale); + } else { + toLegacyText(builder, component, locale); + } return builder.toString(); } public static String toPlainText(BaseComponent component, String locale) { StringBuilder builder = new StringBuilder(); - toPlainText(builder, component, locale); + if (component instanceof TranslatableComponent) { + toPlainText(builder, (TranslatableComponent) component, locale); + } else { + toPlainText(builder, component, locale); + } return builder.toString(); } }