Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-12-27 19:47:35 +01:00
Code Issues Projects Releases Wiki Activity

Update enchantmens, fixes #26. Bump version number

Browse Source
This commit is contained in:
HappyPikachu 2017-07-05 02:11:06 -04:00
parent e0e6222bb0
commit acfc5c4bc6
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>me.blackvein.quests</groupId> <groupId>me.blackvein.quests</groupId>
<artifactId>quests</artifactId> <artifactId>quests</artifactId>
<version>2.8.7</version> <version>2.8.8</version>
<name>quests</name> <name>quests</name>
<url>https://github.com/FlyingPikachu/Quests/</url> <url>https://github.com/FlyingPikachu/Quests/</url>
<packaging>jar</packaging> <packaging>jar</packaging>

2
src/main/java/me/blackvein/quests/Quester.java
View File

@ -1595,7 +1595,7 @@ public class Quester {
public static String enchantmentString(Enchantment e) { public static String enchantmentString(Enchantment e) {
if (Lang.get("ENCHANTMENT_" + e.getName()).equals("NULL")) { if (Lang.get("ENCHANTMENT_" + e.getName()).equals("NULL")) {
Bukkit.getLogger().warning(e.getName() + " was not found in Lang.yml, please ask the developer to " + "update the file or simply add an entry for the enchantment"); Bukkit.getLogger().warning(e.getName() + " was not found in Lang.yml, please ask the developer to " + "update the file or simply add an entry for the enchantment");
return "ENCHANTMENT_" + e.getName(); return e.getName().toLowerCase().replaceAll("_", " ");
} }
return (Lang.get("ENCHANTMENT_" + e.getName())); return (Lang.get("ENCHANTMENT_" + e.getName()));
} }

2
src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java
View File

@ -310,7 +310,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
for (Enchantment e : Enchantment.values()) { for (Enchantment e : Enchantment.values()) {
text += ChatColor.GREEN + Quester.prettyEnchantmentString(e) + ", "; text += ChatColor.GREEN + Quester.prettyEnchantmentString(e) + ", ";
} }
text = text.substring(0, text.length() - 1); text = text.substring(0, text.length() - 2);
return text + "\n" + ChatColor.YELLOW + Lang.get("itemCreateEnterEnch"); return text + "\n" + ChatColor.YELLOW + Lang.get("itemCreateEnterEnch");
} }

3
src/main/java/me/blackvein/quests/util/Lang.java
View File

@ -840,6 +840,7 @@ public class Lang {
langMap.put("ENCHANTMENT_ARROW_FIRE", "Flame"); langMap.put("ENCHANTMENT_ARROW_FIRE", "Flame");
langMap.put("ENCHANTMENT_ARROW_INFINITE", "Infinity"); langMap.put("ENCHANTMENT_ARROW_INFINITE", "Infinity");
langMap.put("ENCHANTMENT_ARROW_KNOCKBACK", "Punch"); langMap.put("ENCHANTMENT_ARROW_KNOCKBACK", "Punch");
langMap.put("ENCHANTMENT_BINDING_CURSE", "BindingCurse");
langMap.put("ENCHANTMENT_DAMAGE_ALL", "Sharpness"); langMap.put("ENCHANTMENT_DAMAGE_ALL", "Sharpness");
langMap.put("ENCHANTMENT_DAMAGE_ARTHROPODS", "BaneOfArthropods"); langMap.put("ENCHANTMENT_DAMAGE_ARTHROPODS", "BaneOfArthropods");
langMap.put("ENCHANTMENT_DEPTH_STRIDER", "DepthStrider"); langMap.put("ENCHANTMENT_DEPTH_STRIDER", "DepthStrider");
@ -861,7 +862,9 @@ public class Lang {
langMap.put("ENCHANTMENT_PROTECTION_FIRE", "FireProtection"); langMap.put("ENCHANTMENT_PROTECTION_FIRE", "FireProtection");
langMap.put("ENCHANTMENT_PROTECTION_PROJECTILE", "ProjectileProtection"); langMap.put("ENCHANTMENT_PROTECTION_PROJECTILE", "ProjectileProtection");
langMap.put("ENCHANTMENT_SILK_TOUCH", "SilkTouch"); langMap.put("ENCHANTMENT_SILK_TOUCH", "SilkTouch");
langMap.put("ENCHANTMENT_SWEEPING", "Sweeping");
langMap.put("ENCHANTMENT_THORNS", "Thorns"); langMap.put("ENCHANTMENT_THORNS", "Thorns");
langMap.put("ENCHANTMENT_VANISHING_CURSE", "VanishingCurse");
langMap.put("ENCHANTMENT_WATER_WORKER", "AquaAffinity"); langMap.put("ENCHANTMENT_WATER_WORKER", "AquaAffinity");
// Colors // Colors
langMap.put("COLOR_BLACK", "Black"); langMap.put("COLOR_BLACK", "Black");