Ench i18n support!

Former-commit-id: 7231a6c

Author: Ghost-chu

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.maxgamer</groupId>
 	<artifactId>QuickShop</artifactId>
-	<version>Reremake 1.1.1</version>
+	<version>Reremake 1.1.2</version>
 	<!-- Fuck version -->
 	<licenses>
 		<license>

src/main/java/org/maxgamer/quickshop/Util/MsgUtil.java

@@ -108,6 +108,7 @@ public static String getItemi18n(String ItemBukkitName) {
 		try {
 		Itemname_i18n = itemi18n.getString("itemi18n."+ItemBukkitName).trim().replaceAll(" ", "_");
 		}catch (Exception e) {
+			e.printStackTrace();
 			Itemname_i18n = null;
 		}
 		if(ItemBukkitName==null) {
@@ -125,6 +126,8 @@ public static String getItemi18n(String ItemBukkitName) {
 			return Itemname_i18n;
 		}
 	}
+	
+	
 	public static void loadEnchi18n() {
 		plugin.getLogger().info("Starting loading Enchantment i18n...");
 		File enchi18nFile = new File(plugin.getDataFolder(), "enchi18n.yml");
@@ -133,17 +136,17 @@ public static void loadEnchi18n() {
 			plugin.saveResource("enchi18n.yml", true);
 		}
 		// Store it
-	    YamlConfiguration enchi18n = YamlConfiguration.loadConfiguration(enchi18nFile);
+	    enchi18n = YamlConfiguration.loadConfiguration(enchi18nFile);
 		enchi18n.options().copyDefaults(true);
 		YamlConfiguration enchi18nYAML = YamlConfiguration.loadConfiguration(new InputStreamReader(plugin.getResource("enchi18n.yml")));
 		enchi18n.setDefaults(enchi18nYAML);
 		Util.parseColours(enchi18n);
 		Enchantment[] enchsi18n = Enchantment.values();
 		for (Enchantment ench : enchsi18n) {
-			String enchname = enchi18n.getString("enchi18n."+ench.getKey().toString().toUpperCase(Locale.ROOT).trim().replaceAll(" ", "_").replaceAll(":", "-"));
+			String enchname = enchi18n.getString("enchi18n."+ench.getKey().getKey().toString().trim());
 			if(enchname==null || enchname.equals("")) {
-				plugin.getLogger().info("Found new ench ["+ench.getKey().toString().toUpperCase(Locale.ROOT).trim().replaceAll(" ", "_").replaceAll(":", "-")+"] ,add it in config...");
-				enchi18n.set("enchi18n."+ench.getKey().toString().toUpperCase(Locale.ROOT).trim().replaceAll(" ", "_"),ench.getKey().toString().toUpperCase(Locale.ROOT).trim().replaceAll(" ", "_").replaceAll(":", "-"));
+				plugin.getLogger().info("Found new ench ["+ench.getKey().getKey().toString()+"] ,add it in config...");
+				enchi18n.set("enchi18n."+ench.getKey().getKey().toString().trim(),ench.getKey().getKey().toString().trim());
 			}
 		}
 		try {
@@ -159,15 +162,16 @@ public static String getEnchi18n(Enchantment key) {
 		if(key==null) {
 			return "ERROR";
 		}
-		String EnchString = key.getKey().toString().toUpperCase(Locale.ROOT).trim().replaceAll(" ", "_").replaceAll(":", "-");
+		String EnchString = key.getKey().getKey().toString().trim();
 		String Ench_i18n = null;
 		try {
-			Ench_i18n = enchi18n.getString("enchi18n."+EnchString).trim().replaceAll(" ", "_").replaceAll(":", "-");
+			Ench_i18n = enchi18n.getString("enchi18n."+EnchString);
 		}catch (Exception e) {
+			e.printStackTrace();
 			Ench_i18n = null;
 		}
 		if(Ench_i18n==null) {
-			return  key.getKey().toString().toUpperCase(Locale.ROOT).trim().replaceAll(" ", "_").replaceAll(":", "-");
+			return EnchString;
 		}else {
 			return Ench_i18n;
 		}

src/main/resources/enchi18n.yml

@@ -1,35 +0,0 @@
-enchi18n:
-  MINECRAFT-FIRE_PROTECTION: FIRE_PROTECTION
-  MINECRAFT-SHARPNESS: SHARPNESS
-  MINECRAFT-FLAME: FLAME
-  MINECRAFT-AQUA_AFFINITY: AQUA_AFFINITY
-  MINECRAFT-PUNCH: PUNCH
-  MINECRAFT-LOYALTY: LOYALTY
-  MINECRAFT-DEPTH_STRIDER: DEPTH_STRIDER
-  MINECRAFT-VANISHING_CURSE: VANISHING_CURSE
-  MINECRAFT-UNBREAKING: UNBREAKING
-  MINECRAFT-KNOCKBACK: KNOCKBACK
-  MINECRAFT-LUCK_OF_THE_SEA: LUCK_OF_THE_SEA
-  MINECRAFT-BINDING_CURSE: BINDING_CURSE
-  MINECRAFT-FORTUNE: FORTUNE
-  MINECRAFT-PROTECTION: PROTECTION
-  MINECRAFT-EFFICIENCY: EFFICIENCY
-  MINECRAFT-MENDING: MENDING
-  MINECRAFT-FROST_WALKER: FROST_WALKER
-  MINECRAFT-LURE: LURE
-  MINECRAFT-LOOTING: LOOTING
-  MINECRAFT-BLAST_PROTECTION: BLAST_PROTECTION
-  MINECRAFT-SMITE: SMITE
-  MINECRAFT-FIRE_ASPECT: FIRE_ASPECT
-  MINECRAFT-CHANNELING: CHANNELING
-  MINECRAFT-SWEEPING: SWEEPING
-  MINECRAFT-THORNS: THORNS
-  MINECRAFT-BANE_OF_ARTHROPODS: BANE_OF_ARTHROPODS
-  MINECRAFT-RESPIRATION: RESPIRATION
-  MINECRAFT-RIPTIDE: RIPTIDE
-  MINECRAFT-SILK_TOUCH: SILK_TOUCH
-  MINECRAFT-PROJECTILE_PROTECTION: PROJECTILE_PROTECTION
-  MINECRAFT-IMPALING: IMPALING
-  MINECRAFT-FEATHER_FALLING: FEATHER_FALLING
-  MINECRAFT-POWER: POWER
-  MINECRAFT-INFINITY: INFINITY