Bukkit now has its own GetLocale() method

Krasjet · Krasjet · commit 76bc4546aac9 · 2017-06-09T01:39:18.000+08:00
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 Language Utils
-=================
+==============
 
 [![Gitter](https://badges.gitter.im/MascusJeoraly/LanguageUtils.svg)](https://gitter.im/MascusJeoraly/LanguageUtils?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://snap-ci.com/MascusJeoraly/LanguageUtils/branch/master/build_image)](https://snap-ci.com/MascusJeoraly/LanguageUtils/branch/master)
 
-A Bukkit/Spigot API offering the ability to get the name of **vanilla** items, entities, enchantments, and enchantment levels. 
+A Bukkit/Spigot API offering the ability to get the name of **vanilla** items, entities, enchantments, and enchantment levels.
 
-The major version of this API supports 1.11.2. If you are using 1.7.10, 1.8.9, 1.9.4, or 1.10.2, please download `1.4.0` version for 1.7.10(with suffix `-1.7.10`) or `1.4.0` for 1.8.9(no suffix), `1.5.x` for 1.9.4, or `1.6.x` for 1.10.2 accordingly.
+The major version of this API supports 1.12. If you are using 1.7.10, 1.8.9, 1.9.4, 1.10.2, or 1.11.2, please download `1.4.0` version for 1.7.10(with suffix `-1.7.10`) or `1.4.0` for 1.8.9(no suffix), `1.5.x` for 1.9.4, or `1.6.x` for 1.10.2, `1.8.x` for 1.11.2 accordingly.
 
 Loading language files may cost 100-300 ms, but it should be fine to wait, and you can even disable the loading of any language.
 
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'maven-publish'
 
 group = 'com.meowj'
 archivesBaseName = 'LangUtils'
-version = '1.8.1'
+version = '1.9'
 
 final def BUKKIT_VERSION = '1.12-R0.1-SNAPSHOT'
 
diff --git a/src/main/java/com/meowj/langutils/lang/convert/EnumEntity.java b/src/main/java/com/meowj/langutils/lang/convert/EnumEntity.java
@@ -10,7 +10,6 @@
 
 package com.meowj.langutils.lang.convert;
 
-import com.meowj.langutils.LangUtils;
 import com.meowj.langutils.lang.LanguageHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.EntityType;
@@ -93,8 +92,8 @@ public enum EnumEntity {
     ZOMBIE_HORSE(EntityType.ZOMBIE_HORSE, "entity.ZombieHorse.name"),
     DONKEY(EntityType.DONKEY, "entity.Donkey.name"),
     MULE(EntityType.MULE, "entity.Mule.name"),
-	PARROT(EntityType.PARROT, "entity.Parrot.name"),
-	ILLUSIONER(EntityType.ILLUSIONER, "entity.IllusionIllager.name");
+    PARROT(EntityType.PARROT, "entity.Parrot.name"),
+    ILLUSIONER(EntityType.ILLUSIONER, "entity.IllusionIllager.name");
     // Some entity subtypes are not included
 
     private static final Map<EntityType, EnumEntity> lookup = new HashMap<EntityType, EnumEntity>();
diff --git a/src/main/java/com/meowj/langutils/lang/convert/EnumItem.java b/src/main/java/com/meowj/langutils/lang/convert/EnumItem.java
@@ -720,7 +720,7 @@ public enum EnumItem {
     ORANGE_CONCRETE_POWDER(Material.CONCRETE_POWDER, 1, "tile.concretePowder.orange.name"),
     WHITE_CONCRETE_POWDER(Material.CONCRETE_POWDER, "tile.concretePowder.white.name"),
     KNOWLEDGE_BOOK(Material.KNOWLEDGE_BOOK, "item.knowledgeBook.name");
-	
+
     private static final Map<ItemEntry, EnumItem> lookup = new HashMap<ItemEntry, EnumItem>();
 
     static {
diff --git a/src/main/java/com/meowj/langutils/locale/LocaleHelper.java b/src/main/java/com/meowj/langutils/locale/LocaleHelper.java
@@ -31,15 +31,6 @@ public class LocaleHelper {
      * @return the language of the player(in Java locale format)
      */
     public static String getPlayerLanguage(Player player) {
-        try {
-            Object handle = player.getClass().getDeclaredMethod("getHandle").invoke(player, (Object[]) null);
-            Field f = handle.getClass().getDeclaredField("locale");
-            f.setAccessible(true);
-            return (String) f.get(handle);
-        } catch (Exception e) {
-            LangUtils.plugin.warn("Cannot find the locale of " + player.getName() + ", please check your server environment.");
-            e.printStackTrace();
-            return LangUtils.plugin.config.getString("FallbackLanguage");
-        }
+        return player.getLocale();
     }
 }
diff --git a/src/main/resources/lang/README.txt b/src/main/resources/lang/README.txt
@@ -9,99 +9,100 @@ DIAMOND_CHEST=Diamond Chest
 -------------------------------------------------------------------------------------------
 
 Valid language file names:
-af_ZA.lang
-ar_SA.lang
-ast_ES.lang
-az_AZ.lang
-be_BY.lang
-bg_BG.lang
-br_FR.lang
-ca_ES.lang
-cs_CZ.lang
-cy_GB.lang
-da_DK.lang
-de_AT.lang
-de_DE.lang
-el_GR.lang
-en_AU.lang
-en_CA.lang
-en_GB.lang
-en_NZ.lang
-en_PT.lang
-en_UD.lang
-en_US.lang
-eo_UY.lang
-es_AR.lang
-es_ES.lang
-es_MX.lang
-es_UY.lang
-es_VE.lang
-et_EE.lang
-eu_ES.lang
-fa_IR.lang
-fi_FI.lang
-fil_PH.lang
-fo_FO.lang
-fr_CA.lang
-fr_FR.lang
-fy_NL.lang
-ga_IE.lang
-gd_GB.lang
-gl_ES.lang
-gv_IM.lang
-haw_US.lang
-he_IL.lang
-hi_IN.lang
-hr_HR.lang
-hu_HU.lang
-hy_AM.lang
-id_ID.lang
-is_IS.lang
-it_IT.lang
-ja_JP.lang
-jbo_EN.lang
-ka_GE.lang
-ko_KR.lang
-ksh_DE.lang
-kw_GB.lang
-la_LA.lang
-lb_LU.lang
-li_LI.lang
-lol_US.lang
-lt_LT.lang
-lv_LV.lang
-mi_NZ.lang
-mk_MK.lang
-mn_MN.lang
-ms_MY.lang
-mt_MT.lang
-nds_DE.lang
-nl_NL.lang
-nn_NO.lang
-no_NO.lang
-oc_FR.lang
-pl_PL.lang
-pt_BR.lang
-pt_PT.lang
-qya_AA.lang
-ro_RO.lang
-ru_RU.lang
-se_NO.lang
-sk_SK.lang
-sl_SI.lang
-so_SO.lang
-sq_AL.lang
-sr_SP.lang
-sv_SE.lang
+af_za.lang
+ar_sa.lang
+ast_es.lang
+az_az.lang
+be_by.lang
+bg_bg.lang
+br_fr.lang
+ca_es.lang
+cs_cz.lang
+cy_gb.lang
+da_dk.lang
+de_at.lang
+de_de.lang
+el_gr.lang
+en_au.lang
+en_ca.lang
+en_gb.lang
+en_nz.lang
+en_pt.lang
+en_ud.lang
+en_us.lang
+eo_uy.lang
+es_ar.lang
+es_es.lang
+es_mx.lang
+es_uy.lang
+es_ve.lang
+et_ee.lang
+eu_es.lang
+fa_ir.lang
+fi_fi.lang
+fil_ph.lang
+fo_fo.lang
+fr_ca.lang
+fr_fr.lang
+fy_nl.lang
+ga_ie.lang
+gd_gb.lang
+gl_es.lang
+gv_im.lang
+haw_us.lang
+he_il.lang
+hi_in.lang
+hr_hr.lang
+hu_hu.lang
+hy_am.lang
+id_id.lang
+io_ido.lang
+is_is.lang
+it_it.lang
+ja_jp.lang
+jbo_en.lang
+ka_ge.lang
+ko_kr.lang
+ksh_de.lang
+kw_gb.lang
+la_la.lang
+lb_lu.lang
+li_li.lang
+lol_us.lang
+lt_lt.lang
+lv_lv.lang
+mi_nz.lang
+mk_mk.lang
+mn_mn.lang
+ms_my.lang
+mt_mt.lang
+nds_de.lang
+nl_nl.lang
+nn_no.lang
+no_no.lang
+oc_fr.lang
+pl_pl.lang
+pt_br.lang
+pt_pt.lang
+qya_aa.lang
+ro_ro.lang
+ru_ru.lang
+se_no.lang
+sk_sk.lang
+sl_si.lang
+so_so.lang
+sq_al.lang
+sr_sp.lang
+sv_se.lang
 swg_de.lang
-th_TH.lang
-tlh_AA.lang
-tr_TR.lang
-tzl_TZL.lang
-uk_UA.lang
-val_ES.lang
-vi_VN.lang
-zh_CN.lang
-zh_TW.lang
+th_th.lang
+tlh_aa.lang
+tr_tr.lang
+tzl_tzl.lang
+uk_ua.lang
+val_es.lang
+vi_vn.lang
+zh_cn.lang
+zh_tw.lang
 
 Priority: Plugin-added entries > User-added entries > Native entries
diff --git a/tools/en_us.lang b/tools/en_us.lang
