Update CraftBukkit to Minecraft 1.4.6

This commit is contained in:
feildmaster
2012-12-19 22:03:52 -06:00
parent 9f1bf124ee
commit 23b6764374
115 changed files with 1930 additions and 1426 deletions

View File

@@ -1,9 +1,12 @@
package net.minecraft.server;
import java.util.ArrayList;
public abstract class Enchantment {
// CraftBukkit - update CraftEnchant.getName(i) if this changes
public static final Enchantment[] byId = new Enchantment[256];
public static final Enchantment[] c;
public static final Enchantment PROTECTION_ENVIRONMENTAL = new EnchantmentProtection(0, 10, 0);
public static final Enchantment PROTECTION_FIRE = new EnchantmentProtection(1, 5, 1);
public static final Enchantment PROTECTION_FALL = new EnchantmentProtection(2, 5, 2);
@@ -11,6 +14,7 @@ public abstract class Enchantment {
public static final Enchantment PROTECTION_PROJECTILE = new EnchantmentProtection(4, 5, 4);
public static final Enchantment OXYGEN = new EnchantmentOxygen(5, 2);
public static final Enchantment WATER_WORKER = new EnchantmentWaterWorker(6, 2);
public static final Enchantment THORNS = new EnchantmentThorns(7, 1);
public static final Enchantment DAMAGE_ALL = new EnchantmentWeaponDamage(16, 10, 0);
public static final Enchantment DAMAGE_UNDEAD = new EnchantmentWeaponDamage(17, 5, 1);
public static final Enchantment DAMAGE_ARTHROPODS = new EnchantmentWeaponDamage(18, 5, 2);
@@ -89,4 +93,25 @@ public abstract class Enchantment {
return s + " " + LocaleI18n.get("enchantment.level." + i);
}
public boolean canEnchant(ItemStack itemstack) {
return this.slot.canEnchant(itemstack.getItem());
}
static {
ArrayList arraylist = new ArrayList();
Enchantment[] aenchantment = byId;
int i = aenchantment.length;
for (int j = 0; j < i; ++j) {
Enchantment enchantment = aenchantment[j];
if (enchantment != null) {
arraylist.add(enchantment);
}
}
c = (Enchantment[]) arraylist.toArray(new Enchantment[0]);
}
}