Skip to content

Commit 1a9cba9

Browse files
authored
Add lunge to /enchant (#6534)
Fixes #6521
1 parent 24b7285 commit 1a9cba9

1 file changed

Lines changed: 27 additions & 19 deletions

File tree

Essentials/src/main/java/com/earth2me/essentials/Enchantments.java

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@ public final class Enchantments {
1717

1818
static {
1919
final Enchantment SHARPNESS = RegistryUtil.valueOf(Enchantment.class, "DAMAGE_ALL", "SHARPNESS");
20-
20+
2121
ENCHANTMENTS.put("alldamage", SHARPNESS);
2222
ALIASENCHANTMENTS.put("alldmg", SHARPNESS);
2323
ENCHANTMENTS.put("sharpness", SHARPNESS);
2424
ALIASENCHANTMENTS.put("sharp", SHARPNESS);
2525
ALIASENCHANTMENTS.put("dal", SHARPNESS);
26-
26+
2727
final Enchantment BANE_OF_ARTHROPODS = RegistryUtil.valueOf(Enchantment.class, "DAMAGE_ARTHROPODS", "BANE_OF_ARTHROPODS");
2828

2929
ENCHANTMENTS.put("ardmg", BANE_OF_ARTHROPODS);
3030
ENCHANTMENTS.put("baneofarthropods", BANE_OF_ARTHROPODS);
3131
ALIASENCHANTMENTS.put("baneofarthropod", BANE_OF_ARTHROPODS);
3232
ALIASENCHANTMENTS.put("arthropod", BANE_OF_ARTHROPODS);
3333
ALIASENCHANTMENTS.put("dar", BANE_OF_ARTHROPODS);
34-
34+
3535
final Enchantment SMITE = RegistryUtil.valueOf(Enchantment.class, "DAMAGE_UNDEAD", "SMITE");
3636

3737
ENCHANTMENTS.put("undeaddamage", SMITE);
3838
ENCHANTMENTS.put("smite", SMITE);
3939
ALIASENCHANTMENTS.put("du", SMITE);
40-
40+
4141
final Enchantment EFFICIENCY = RegistryUtil.valueOf(Enchantment.class, "DIG_SPEED", "EFFICIENCY");
4242

4343
ENCHANTMENTS.put("digspeed", EFFICIENCY);
@@ -46,7 +46,7 @@ public final class Enchantments {
4646
ALIASENCHANTMENTS.put("cutspeed", EFFICIENCY);
4747
ALIASENCHANTMENTS.put("ds", EFFICIENCY);
4848
ALIASENCHANTMENTS.put("eff", EFFICIENCY);
49-
49+
5050
final Enchantment UNBREAKING = RegistryUtil.valueOf(Enchantment.class, "DURABILITY", "UNBREAKING");
5151

5252
ENCHANTMENTS.put("durability", UNBREAKING);
@@ -70,36 +70,36 @@ public final class Enchantments {
7070
ALIASENCHANTMENTS.put("kback", Enchantment.KNOCKBACK);
7171
ALIASENCHANTMENTS.put("kb", Enchantment.KNOCKBACK);
7272
ALIASENCHANTMENTS.put("k", Enchantment.KNOCKBACK);
73-
73+
7474
final Enchantment FORTUNE = RegistryUtil.valueOf(Enchantment.class, "LOOT_BONUS_BLOCKS", "FORTUNE");
7575

7676
ALIASENCHANTMENTS.put("blockslootbonus", FORTUNE);
7777
ENCHANTMENTS.put("fortune", FORTUNE);
7878
ALIASENCHANTMENTS.put("fort", FORTUNE);
7979
ALIASENCHANTMENTS.put("lbb", FORTUNE);
80-
80+
8181
final Enchantment LOOTING = RegistryUtil.valueOf(Enchantment.class, "LOOT_BONUS_MOBS", "LOOTING");
8282

8383
ALIASENCHANTMENTS.put("mobslootbonus", LOOTING);
8484
ENCHANTMENTS.put("mobloot", LOOTING);
8585
ENCHANTMENTS.put("looting", LOOTING);
8686
ALIASENCHANTMENTS.put("lbm", LOOTING);
87-
87+
8888
final Enchantment RESPIRATION = RegistryUtil.valueOf(Enchantment.class, "OXYGEN", "RESPIRATION");
8989

9090
ALIASENCHANTMENTS.put("oxygen", RESPIRATION);
9191
ENCHANTMENTS.put("respiration", RESPIRATION);
9292
ALIASENCHANTMENTS.put("breathing", RESPIRATION);
9393
ENCHANTMENTS.put("breath", RESPIRATION);
9494
ALIASENCHANTMENTS.put("o", RESPIRATION);
95-
95+
9696
final Enchantment PROTECTION = RegistryUtil.valueOf(Enchantment.class, "PROTECTION_ENVIRONMENTAL", "PROTECTION");
9797

9898
ENCHANTMENTS.put("protection", PROTECTION);
9999
ALIASENCHANTMENTS.put("prot", PROTECTION);
100100
ENCHANTMENTS.put("protect", PROTECTION);
101101
ALIASENCHANTMENTS.put("p", PROTECTION);
102-
102+
103103
final Enchantment BLAST_PROTECTION = RegistryUtil.valueOf(Enchantment.class, "PROTECTION_EXPLOSIONS", "BLAST_PROTECTION");
104104

105105
ALIASENCHANTMENTS.put("explosionsprotection", BLAST_PROTECTION);
@@ -110,15 +110,15 @@ public final class Enchantments {
110110
ALIASENCHANTMENTS.put("bprotect", BLAST_PROTECTION);
111111
ENCHANTMENTS.put("blastprotect", BLAST_PROTECTION);
112112
ALIASENCHANTMENTS.put("pe", BLAST_PROTECTION);
113-
113+
114114
final Enchantment FEATHER_FALLING = RegistryUtil.valueOf(Enchantment.class, "PROTECTION_FALL", "FEATHER_FALLING");
115115

116116
ALIASENCHANTMENTS.put("fallprotection", FEATHER_FALLING);
117117
ENCHANTMENTS.put("fallprot", FEATHER_FALLING);
118118
ENCHANTMENTS.put("featherfall", FEATHER_FALLING);
119119
ALIASENCHANTMENTS.put("featherfalling", FEATHER_FALLING);
120120
ALIASENCHANTMENTS.put("pfa", FEATHER_FALLING);
121-
121+
122122
final Enchantment FIRE_PROTECTION = RegistryUtil.valueOf(Enchantment.class, "PROTECTION_FIRE", "FIRE_PROTECTION");
123123

124124
ALIASENCHANTMENTS.put("fireprotection", FIRE_PROTECTION);
@@ -128,7 +128,7 @@ public final class Enchantments {
128128
ENCHANTMENTS.put("fireprot", FIRE_PROTECTION);
129129
ALIASENCHANTMENTS.put("flameprot", FIRE_PROTECTION);
130130
ALIASENCHANTMENTS.put("pf", FIRE_PROTECTION);
131-
131+
132132
final Enchantment PROJECTILE_PROTECTION = RegistryUtil.valueOf(Enchantment.class, "PROTECTION_PROJECTILE", "PROJECTILE_PROTECTION");
133133

134134
ENCHANTMENTS.put("projectileprotection", PROJECTILE_PROTECTION);
@@ -138,36 +138,36 @@ public final class Enchantments {
138138
ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
139139
ALIASENCHANTMENTS.put("softtouch", Enchantment.SILK_TOUCH);
140140
ALIASENCHANTMENTS.put("st", Enchantment.SILK_TOUCH);
141-
141+
142142
final Enchantment AQUA_AFFINITY = RegistryUtil.valueOf(Enchantment.class, "WATER_WORKER", "AQUA_AFFINITY");
143143

144144
ENCHANTMENTS.put("waterworker", AQUA_AFFINITY);
145145
ENCHANTMENTS.put("aquaaffinity", AQUA_AFFINITY);
146146
ALIASENCHANTMENTS.put("watermine", AQUA_AFFINITY);
147147
ALIASENCHANTMENTS.put("ww", AQUA_AFFINITY);
148-
148+
149149
final Enchantment FLAME = RegistryUtil.valueOf(Enchantment.class, "ARROW_FIRE", "FLAME");
150150

151151
ALIASENCHANTMENTS.put("firearrow", FLAME);
152152
ENCHANTMENTS.put("flame", FLAME);
153153
ENCHANTMENTS.put("flamearrow", FLAME);
154154
ALIASENCHANTMENTS.put("af", FLAME);
155-
155+
156156
final Enchantment POWER = RegistryUtil.valueOf(Enchantment.class, "ARROW_DAMAGE", "POWER");
157157

158158
ENCHANTMENTS.put("arrowdamage", POWER);
159159
ENCHANTMENTS.put("power", POWER);
160160
ALIASENCHANTMENTS.put("arrowpower", POWER);
161161
ALIASENCHANTMENTS.put("ad", POWER);
162-
162+
163163
final Enchantment PUNCH = RegistryUtil.valueOf(Enchantment.class, "ARROW_KNOCKBACK", "PUNCH");
164164

165165
ENCHANTMENTS.put("arrowknockback", PUNCH);
166166
ALIASENCHANTMENTS.put("arrowkb", PUNCH);
167167
ENCHANTMENTS.put("punch", PUNCH);
168168
ALIASENCHANTMENTS.put("arrowpunch", PUNCH);
169169
ALIASENCHANTMENTS.put("ak", PUNCH);
170-
170+
171171
final Enchantment INFINITY = RegistryUtil.valueOf(Enchantment.class, "ARROW_INFINITE", "INFINITY");
172172

173173
ALIASENCHANTMENTS.put("infinitearrows", INFINITY);
@@ -177,7 +177,7 @@ public final class Enchantments {
177177
ALIASENCHANTMENTS.put("unlimited", INFINITY);
178178
ALIASENCHANTMENTS.put("unlimitedarrows", INFINITY);
179179
ALIASENCHANTMENTS.put("ai", INFINITY);
180-
180+
181181
final Enchantment LUCK_OF_THE_SEA = RegistryUtil.valueOf(Enchantment.class, "LUCK", "LUCK_OF_THE_SEA");
182182

183183
ENCHANTMENTS.put("luck", LUCK_OF_THE_SEA);
@@ -321,6 +321,14 @@ public final class Enchantments {
321321
} catch (final IllegalArgumentException ignored) {
322322
}
323323

324+
try { // 1.21.11
325+
final Enchantment lunge = Enchantment.getByName("LUNGE");
326+
if (lunge != null) {
327+
ENCHANTMENTS.put("lunge", lunge);
328+
}
329+
} catch (final IllegalArgumentException ignored) {
330+
}
331+
324332
try {
325333
final Class<?> namespacedKeyClass = Class.forName("org.bukkit.NamespacedKey");
326334
final Class<?> enchantmentClass = Class.forName("org.bukkit.enchantments.Enchantment");

0 commit comments

Comments
 (0)