Update to 1.4.0

Author: Krasjet

build.gradle

@@ -10,7 +10,7 @@ apply plugin: 'maven-publish'
 
 group = 'com.meowj'
 archivesBaseName = 'LangUtils'
-version = '1.3.0-1.7.10'
+version = '1.4.0-1.7.10'
 
 final def EULA_ACCEPT = true
 

src/main/java/com/meowj/langutils/LangUtils.java

@@ -9,6 +9,7 @@
  */
 package com.meowj.langutils;
 
+import com.meowj.langutils.lang.LanguageRegistry;
 import com.meowj.langutils.lang.convert.EnumLang;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -32,13 +33,19 @@ public void onEnable() {
             isCauldron = true;
             warn("This API is not designed for Cauldron/KCauldron server, but it should work without problems for VANILLA items/entities. Again, you cannot use this API with items/entities in mods.");
         }
+
+        saveResource("lang/README.txt", false);
+
+        // Init default lang
         try {
             final long startTime = System.currentTimeMillis();
             EnumLang.init();
             info("Language Utils has been enabled." + "(" + (System.currentTimeMillis() - startTime) + "ms)");
         } catch (IOException e) {
             e.printStackTrace();
         }
+
+        LanguageRegistry.INSTANCE = new LanguageRegistry();
     }
 
     @Override
@@ -65,6 +72,11 @@ public void warn(String msg) {
         getLogger().log(Level.WARNING, msg);
     }
 
+    /**
+     * Return true if Cauldron environment is detected
+     *
+     * @return true if Cauldron environment is detected
+     */
     public boolean isCauldron() {
         return isCauldron;
     }

src/main/java/com/meowj/langutils/lang/LanguageHelper.java

@@ -64,8 +64,6 @@ public static String getItemDisplayName(ItemStack item, Player player) {
      * @return The localized name. if the item doesn't have a localized name, this method will return the unlocalized name of it.
      */
     public static String getItemName(ItemStack item, String locale) {
-        Map<String, String> map = EnumLang.get(locale).getMap();
-
         // Potion & SpawnEgg & Player Skull
         if (item.getType() == Material.POTION && item.getDurability() != 0)
             return EnumPotionEffect.getLocalizedName(item, locale);
@@ -309,10 +307,11 @@ public static String getEnchantmentDisplayName(Map.Entry<Enchantment, Integer> e
      *
      * @param unlocalizedName The unlocalized field.
      * @param locale          The language to be translated to.
-     * @return The localized field. If the localized field doesn't exist, it will return the unlocalized name.
+     * @return The localized field. If the localized field doesn't exist, it will first look up the English map. If the entry still doesn't exist, then return the unlocalized name.
      */
     public static String translateToLocal(String unlocalizedName, String locale) {
         Map<String, String> map = EnumLang.get(locale).getMap();
-        return map.containsKey(unlocalizedName) ? map.get(unlocalizedName) : unlocalizedName;
+        return map.containsKey(unlocalizedName) ? map.get(unlocalizedName) :
+                (EnumLang.EN_US.getMap().containsKey(unlocalizedName) ? EnumLang.EN_US.getMap().get(unlocalizedName) : unlocalizedName);
     }
 }

src/main/java/com/meowj/langutils/lang/LanguageRegistry.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2015 Jerrell Fang
+ *
+ * This project is Open Source and distributed under The MIT License (MIT)
+ * (http://opensource.org/licenses/MIT)
+ *
+ * You should have received a copy of the The MIT License along with
+ * this project.   If not, see <http://opensource.org/licenses/MIT>.
+ */
+
+package com.meowj.langutils.lang;
+
+import com.meowj.langutils.lang.convert.EnumLang;
+
+/**
+ * Created by Meow J on 8/11/2015.
+ * <p>
+ * Customize the language entry
+ *
+ * @author Meow J
+ */
+public class LanguageRegistry {
+
+    public static LanguageRegistry INSTANCE;
+
+    /**
+     * Add or replace a language entry
+     *
+     * @param lang            The language of the entry
+     * @param unlocalizedName The unlocalized name of the entry
+     * @param localizedName   The localized name of the entry
+     * @return the previous value of the entry, or null if the entry is newly added.
+     */
+    public String registerEntry(EnumLang lang, String unlocalizedName, String localizedName) {
+        return lang.getMap().put(unlocalizedName, localizedName);
+    }
+
+}

src/main/java/com/meowj/langutils/lang/convert/EnumEnchantment.java

@@ -50,20 +50,15 @@ public enum EnumEnchantment {
     LUCK(Enchantment.LUCK, "enchantment.lootBonusFishing"),
     LURE(Enchantment.LURE, "enchantment.fishingSpeed");
 
-    /**
-     * @return The {@link Enchantment} of the enchantment.
-     */
-    public Enchantment getEnchantment() {
-        return enchantment;
-    }
+    private static final Map<Enchantment, EnumEnchantment> lookup = new HashMap<Enchantment, EnumEnchantment>();
 
-    /**
-     * @return The unlocalized name of the enchantment.
-     */
-    public String getUnlocalizedName() {
-        return unlocalizedName;
+    static {
+        for (EnumEnchantment enchantment : EnumSet.allOf(EnumEnchantment.class))
+            lookup.put(enchantment.enchantment, enchantment);
     }
 
+    private Enchantment enchantment;
+    private String unlocalizedName;
 
     /**
      * Create an index of enchantments.
@@ -80,13 +75,6 @@ public String getUnlocalizedName() {
         this.unlocalizedName = unlocalizedName;
     }
 
-    private static final Map<Enchantment, EnumEnchantment> lookup = new HashMap<Enchantment, EnumEnchantment>();
-
-    static {
-        for (EnumEnchantment enchantment : EnumSet.allOf(EnumEnchantment.class))
-            lookup.put(enchantment.enchantment, enchantment);
-    }
-
     /**
      * Get the index of an enchantment based on {@link EnumEnchantment}.
      *
@@ -97,6 +85,17 @@ public static EnumEnchantment get(Enchantment enchantment) {
         return lookup.containsKey(enchantment) ? lookup.get(enchantment) : null;
     }
 
-    private Enchantment enchantment;
-    private String unlocalizedName;
+    /**
+     * @return The {@link Enchantment} of the enchantment.
+     */
+    public Enchantment getEnchantment() {
+        return enchantment;
+    }
+
+    /**
+     * @return The unlocalized name of the enchantment.
+     */
+    public String getUnlocalizedName() {
+        return unlocalizedName;
+    }
 }

src/main/java/com/meowj/langutils/lang/convert/EnumEnchantmentLevel.java

@@ -34,6 +34,16 @@ public enum EnumEnchantmentLevel {
     LEVEL9(9, "enchantment.level.9"),
     LEVEL10(10, "enchantment.level.10"),;
 
+    private static final Map<Integer, EnumEnchantmentLevel> lookup = new HashMap<Integer, EnumEnchantmentLevel>();
+
+    static {
+        for (EnumEnchantmentLevel level : EnumSet.allOf(EnumEnchantmentLevel.class))
+            lookup.put(level.getLevel(), level);
+    }
+
+    private int level;
+    private String unlocalizedName;
+
     /**
      * Create an index of enchantments.
      */
@@ -42,6 +52,14 @@ public enum EnumEnchantmentLevel {
         this.unlocalizedName = unlocalizedName;
     }
 
+    /**
+     * @param level Enchantment level.
+     * @return The index of a level.
+     */
+    public static EnumEnchantmentLevel get(Integer level) {
+        return lookup.containsKey(level) ? lookup.get(level) : null;
+    }
+
     /**
      * @return Enchantment level
      */
@@ -55,22 +73,4 @@ public int getLevel() {
     public String getUnlocalizedName() {
         return unlocalizedName;
     }
-
-    private static final Map<Integer, EnumEnchantmentLevel> lookup = new HashMap<Integer, EnumEnchantmentLevel>();
-
-    static {
-        for (EnumEnchantmentLevel level : EnumSet.allOf(EnumEnchantmentLevel.class))
-            lookup.put(level.getLevel(), level);
-    }
-
-    /**
-     * @param level Enchantment level.
-     * @return The index of a level.
-     */
-    public static EnumEnchantmentLevel get(Integer level) {
-        return lookup.containsKey(level) ? lookup.get(level) : null;
-    }
-
-    private int level;
-    private String unlocalizedName;
 }

src/main/java/com/meowj/langutils/lang/convert/EnumEntity.java

@@ -70,21 +70,21 @@ public enum EnumEntity {
     MINECART(EntityType.MINECART, "entity.Minecart.name"),
     BOAT(EntityType.BOAT, "entity.Boat.name");
 
-    public String getUnlocalizedName() {
-        return unlocalizedName;
-    }
-
-    public EntityType getType() {
-        return type;
-    }
-
     private static final Map<EntityType, EnumEntity> lookup = new HashMap<EntityType, EnumEntity>();
 
     static {
         for (EnumEntity entity : EnumSet.allOf(EnumEntity.class))
             lookup.put(entity.getType(), entity);
     }
 
+    private EntityType type;
+    private String unlocalizedName;
+
+    EnumEntity(EntityType type, String unlocalizedName) {
+        this.type = type;
+        this.unlocalizedName = unlocalizedName;
+    }
+
     /**
      * @param entityType The Entity type.
      * @return The index of an entity based on entity type
@@ -107,12 +107,12 @@ public static String getSpawnEggName(ItemStack egg, String locale) {
                 : LanguageHelper.translateToLocal("item.monsterPlacer.name", locale);
     }
 
-    EnumEntity(EntityType type, String unlocalizedName) {
-        this.type = type;
-        this.unlocalizedName = unlocalizedName;
+    public String getUnlocalizedName() {
+        return unlocalizedName;
     }
 
-    private EntityType type;
-    private String unlocalizedName;
+    public EntityType getType() {
+        return type;
+    }
 
 }

src/main/java/com/meowj/langutils/lang/convert/EnumItem.java

@@ -531,30 +531,16 @@ public enum EnumItem {
     GOLD_HORSE_ARMOR(Material.GOLD_BARDING, "item.horsearmorgold.name"),
     DIAMOND_HORSE_ARMOR(Material.DIAMOND_BARDING, "item.horsearmordiamond.name");
 
-    private Material material;
-    private int metadata;
-    private String unlocalizedName;
-
-    /**
-     * @return The unlocalized name of the item.
-     */
-    public String getUnlocalizedName() {
-        return unlocalizedName;
-    }
+    private static final Map<ItemEntry, EnumItem> lookup = new HashMap<ItemEntry, EnumItem>();
 
-    /**
-     * @return The metadata(damage value, durability) of the item.
-     */
-    public int getMetadata() {
-        return metadata;
+    static {
+        for (EnumItem item : EnumSet.allOf(EnumItem.class))
+            lookup.put(new ItemEntry(item.material, item.getMetadata()), item);
     }
 
-    /**
-     * @return The {@link Material} of the item.
-     */
-    public Material getMaterial() {
-        return material;
-    }
+    private Material material;
+    private int metadata;
+    private String unlocalizedName;
 
     /**
      * Create an index of an item
@@ -569,14 +555,6 @@ public Material getMaterial() {
         this(material, 0, unlocalizedName);
     }
 
-
-    private static final Map<ItemEntry, EnumItem> lookup = new HashMap<ItemEntry, EnumItem>();
-
-    static {
-        for (EnumItem item : EnumSet.allOf(EnumItem.class))
-            lookup.put(new ItemEntry(item.material, item.getMetadata()), item);
-    }
-
     /**
      * Get the index of an item based on {@link ItemEntry}.
      *
@@ -595,4 +573,25 @@ public static String getPlayerSkullName(ItemStack skull, String locale) {
                     meta.getOwner());
         } else return LanguageHelper.translateToLocal("item.skull.char.name", locale);
     }
+
+    /**
+     * @return The unlocalized name of the item.
+     */
+    public String getUnlocalizedName() {
+        return unlocalizedName;
+    }
+
+    /**
+     * @return The metadata(damage value, durability) of the item.
+     */
+    public int getMetadata() {
+        return metadata;
+    }
+
+    /**
+     * @return The {@link Material} of the item.
+     */
+    public Material getMaterial() {
+        return material;
+    }
 }