diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-09-02 18:11:54 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-09-02 18:11:54 +0100 |
commit | c2893788e79bc6501e3aefae5daa2775d4f95e17 (patch) | |
tree | bccb9859b32cf7d898ee80039967354d2fd51492 /Essentials | |
parent | 0b8a6c45c6d4d65c2132034d36d47da175344c99 (diff) | |
parent | 2049e630fb95c51d4d35042aed349aefb6d1c998 (diff) | |
download | Essentials-c2893788e79bc6501e3aefae5daa2775d4f95e17.tar Essentials-c2893788e79bc6501e3aefae5daa2775d4f95e17.tar.gz Essentials-c2893788e79bc6501e3aefae5daa2775d4f95e17.tar.lz Essentials-c2893788e79bc6501e3aefae5daa2775d4f95e17.tar.xz Essentials-c2893788e79bc6501e3aefae5daa2775d4f95e17.zip |
Merge branch '2.9' of github.com:essentials/Essentials into 2.9
Diffstat (limited to 'Essentials')
-rw-r--r-- | Essentials/src/com/earth2me/essentials/Enchantments.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Enchantments.java b/Essentials/src/com/earth2me/essentials/Enchantments.java index c1fa33553..b77c1a06f 100644 --- a/Essentials/src/com/earth2me/essentials/Enchantments.java +++ b/Essentials/src/com/earth2me/essentials/Enchantments.java @@ -20,58 +20,71 @@ public class Enchantments ENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL); ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL); ENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL); + ENCHANTMENTS.put("dal", Enchantment.DAMAGE_ALL); ENCHANTMENTS.put("arthropodsdamage", Enchantment.DAMAGE_ARTHROPODS); ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS); ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS); ENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS); ENCHANTMENTS.put("arthropod", Enchantment.DAMAGE_ARTHROPODS); + ENCHANTMENTS.put("dar", Enchantment.DAMAGE_ARTHROPODS); ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD); ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD); + ENCHANTMENTS.put("du", Enchantment.DAMAGE_UNDEAD); ENCHANTMENTS.put("digspeed", Enchantment.DIG_SPEED); ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED); ENCHANTMENTS.put("minespeed", Enchantment.DIG_SPEED); ENCHANTMENTS.put("cutspeed", Enchantment.DIG_SPEED); + ENCHANTMENTS.put("ds", Enchantment.DIG_SPEED); ENCHANTMENTS.put("durability", Enchantment.DURABILITY); ENCHANTMENTS.put("dura", Enchantment.DURABILITY); ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY); + ENCHANTMENTS.put("d", Enchantment.DURABILITY); ENCHANTMENTS.put("fireaspect", Enchantment.FIRE_ASPECT); ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT); ENCHANTMENTS.put("meleefire", Enchantment.FIRE_ASPECT); ENCHANTMENTS.put("meleeflame", Enchantment.FIRE_ASPECT); + ENCHANTMENTS.put("fa", Enchantment.FIRE_ASPECT); ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK); + ENCHANTMENTS.put("k", Enchantment.KNOCKBACK); ENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS); ENCHANTMENTS.put("fortune", Enchantment.LOOT_BONUS_BLOCKS); + ENCHANTMENTS.put("lbb", Enchantment.LOOT_BONUS_BLOCKS); ENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS); ENCHANTMENTS.put("mobloot", Enchantment.LOOT_BONUS_MOBS); ENCHANTMENTS.put("looting", Enchantment.LOOT_BONUS_MOBS); + ENCHANTMENTS.put("lbm", Enchantment.LOOT_BONUS_MOBS); ENCHANTMENTS.put("oxygen", Enchantment.OXYGEN); ENCHANTMENTS.put("respiration", Enchantment.OXYGEN); ENCHANTMENTS.put("breathing", Enchantment.OXYGEN); ENCHANTMENTS.put("breath", Enchantment.OXYGEN); + ENCHANTMENTS.put("o", Enchantment.OXYGEN); ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL); ENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL); ENCHANTMENTS.put("protect", Enchantment.PROTECTION_ENVIRONMENTAL); + ENCHANTMENTS.put("p", Enchantment.PROTECTION_ENVIRONMENTAL); ENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS); ENCHANTMENTS.put("explosionprotection", Enchantment.PROTECTION_EXPLOSIONS); ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS); ENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS); ENCHANTMENTS.put("blastprotect", Enchantment.PROTECTION_EXPLOSIONS); + ENCHANTMENTS.put("pe", Enchantment.PROTECTION_EXPLOSIONS); ENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL); ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL); ENCHANTMENTS.put("featherfall", Enchantment.PROTECTION_FALL); ENCHANTMENTS.put("featherfalling", Enchantment.PROTECTION_FALL); + ENCHANTMENTS.put("pfa", Enchantment.PROTECTION_FALL); ENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE); ENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE); @@ -79,28 +92,35 @@ public class Enchantments ENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE); ENCHANTMENTS.put("fireprot", Enchantment.PROTECTION_FIRE); ENCHANTMENTS.put("flameprot", Enchantment.PROTECTION_FIRE); + ENCHANTMENTS.put("pf", Enchantment.PROTECTION_FIRE); ENCHANTMENTS.put("projectileprotection", Enchantment.PROTECTION_PROJECTILE); ENCHANTMENTS.put("projprot", Enchantment.PROTECTION_PROJECTILE); + ENCHANTMENTS.put("pp", Enchantment.PROTECTION_PROJECTILE); ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH); ENCHANTMENTS.put("softtouch", Enchantment.SILK_TOUCH); + ENCHANTMENTS.put("st", Enchantment.SILK_TOUCH); ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER); ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER); + ENCHANTMENTS.put("ww", Enchantment.WATER_WORKER); ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE); ENCHANTMENTS.put("flame", Enchantment.ARROW_FIRE); ENCHANTMENTS.put("flamearrow", Enchantment.ARROW_FIRE); + ENCHANTMENTS.put("af", Enchantment.ARROW_FIRE); ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE); ENCHANTMENTS.put("power", Enchantment.ARROW_DAMAGE); ENCHANTMENTS.put("arrowpower", Enchantment.ARROW_DAMAGE); + ENCHANTMENTS.put("ad", Enchantment.ARROW_DAMAGE); ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK); ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK); ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK); ENCHANTMENTS.put("arrowpunch", Enchantment.ARROW_KNOCKBACK); + ENCHANTMENTS.put("ak", Enchantment.ARROW_KNOCKBACK); ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE); ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE); @@ -108,6 +128,7 @@ public class Enchantments ENCHANTMENTS.put("infinite", Enchantment.ARROW_INFINITE); ENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE); ENCHANTMENTS.put("unlimitedarrows", Enchantment.ARROW_INFINITE); + ENCHANTMENTS.put("ai", Enchantment.ARROW_INFINITE); } public static Enchantment getByName(String name) { |