diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-29 23:17:43 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-30 21:46:19 +0000 |
commit | 8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792 (patch) | |
tree | cc229f65097c54cfcd769f686c43efa1dacc8d2f /src/main/java/net/minecraft/server/EnchantmentManager.java | |
parent | 8665161eaa0160467ce33598c13f1aed4b549a4d (diff) | |
download | craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.gz craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.lz craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.xz craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.zip |
Updated to use mc-dev rename revision 1
Diffstat (limited to 'src/main/java/net/minecraft/server/EnchantmentManager.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EnchantmentManager.java | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java index 1a170621..123a5d63 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -10,23 +10,23 @@ import java.util.Random; public class EnchantmentManager { private static final Random random = new Random(); - private static final EnchantmentModifier1 b = new EnchantmentModifier1((EmptyClass3) null); - private static final EnchantmentModifier2 c = new EnchantmentModifier2((EmptyClass3) null); + private static final EnchantmentModifierProtection b = new EnchantmentModifierProtection((EmptyClass3) null); + private static final EnchantmentModifierDamage c = new EnchantmentModifierDamage((EmptyClass3) null); public EnchantmentManager() {} - public static int b(int i, ItemStack itemstack) { // CraftBukkit - priv to pub + public static int getEnchantmentLevel(int i, ItemStack itemstack) { // CraftBukkit - priv to pub if (itemstack == null) { return 0; } else { - NBTTagList nbttaglist = itemstack.p(); + NBTTagList nbttaglist = itemstack.getEnchantments(); if (nbttaglist == null) { return 0; } else { - for (int j = 0; j < nbttaglist.d(); ++j) { - short short1 = ((NBTTagCompound) nbttaglist.a(j)).e("id"); - short short2 = ((NBTTagCompound) nbttaglist.a(j)).e("lvl"); + for (int j = 0; j < nbttaglist.size(); ++j) { + short short1 = ((NBTTagCompound) nbttaglist.get(j)).getShort("id"); + short short2 = ((NBTTagCompound) nbttaglist.get(j)).getShort("lvl"); if (short1 == i) { return short2; @@ -38,14 +38,14 @@ public class EnchantmentManager { } } - private static int a(int i, ItemStack[] aitemstack) { + private static int getEnchantmentLevel(int i, ItemStack[] aitemstack) { int j = 0; ItemStack[] aitemstack1 = aitemstack; int k = aitemstack.length; for (int l = 0; l < k; ++l) { ItemStack itemstack = aitemstack1[l]; - int i1 = b(i, itemstack); + int i1 = getEnchantmentLevel(i, itemstack); if (i1 > j) { j = i1; @@ -57,12 +57,12 @@ public class EnchantmentManager { private static void a(EnchantmentModifier enchantmentmodifier, ItemStack itemstack) { if (itemstack != null) { - NBTTagList nbttaglist = itemstack.p(); + NBTTagList nbttaglist = itemstack.getEnchantments(); if (nbttaglist != null) { - for (int i = 0; i < nbttaglist.d(); ++i) { - short short1 = ((NBTTagCompound) nbttaglist.a(i)).e("id"); - short short2 = ((NBTTagCompound) nbttaglist.a(i)).e("lvl"); + for (int i = 0; i < nbttaglist.size(); ++i) { + short short1 = ((NBTTagCompound) nbttaglist.get(i)).getShort("id"); + short short2 = ((NBTTagCompound) nbttaglist.get(i)).getShort("lvl"); if (Enchantment.byId[short1] != null) { enchantmentmodifier.a(Enchantment.byId[short1], short2); @@ -83,10 +83,10 @@ public class EnchantmentManager { } } - public static int a(InventoryPlayer inventoryplayer, DamageSource damagesource) { + public static int a(PlayerInventory playerinventory, DamageSource damagesource) { b.a = 0; b.b = damagesource; - a((EnchantmentModifier) b, inventoryplayer.armor); + a((EnchantmentModifier) b, playerinventory.armor); if (b.a > 25) { b.a = 25; } @@ -94,47 +94,47 @@ public class EnchantmentManager { return (b.a + 1 >> 1) + random.nextInt((b.a >> 1) + 1); } - public static int a(InventoryPlayer inventoryplayer, EntityLiving entityliving) { + public static int a(PlayerInventory playerinventory, EntityLiving entityliving) { c.a = 0; c.b = entityliving; - a((EnchantmentModifier) c, inventoryplayer.getItemInHand()); + a((EnchantmentModifier) c, playerinventory.getItemInHand()); return c.a > 0 ? 1 + random.nextInt(c.a) : 0; } - public static int b(InventoryPlayer inventoryplayer, EntityLiving entityliving) { - return b(Enchantment.KNOCKBACK.id, inventoryplayer.getItemInHand()); + public static int getKnockbackEnchantmentLevel(PlayerInventory playerinventory, EntityLiving entityliving) { + return getEnchantmentLevel(Enchantment.KNOCKBACK.id, playerinventory.getItemInHand()); } - public static int c(InventoryPlayer inventoryplayer, EntityLiving entityliving) { - return b(Enchantment.FIRE_ASPECT.id, inventoryplayer.getItemInHand()); + public static int getFireAspectEnchantmentLevel(PlayerInventory playerinventory, EntityLiving entityliving) { + return getEnchantmentLevel(Enchantment.FIRE_ASPECT.id, playerinventory.getItemInHand()); } - public static int a(InventoryPlayer inventoryplayer) { - return a(Enchantment.OXYGEN.id, inventoryplayer.armor); + public static int getOxygenEnchantmentLevel(PlayerInventory playerinventory) { + return getEnchantmentLevel(Enchantment.OXYGEN.id, playerinventory.armor); } - public static int b(InventoryPlayer inventoryplayer) { - return b(Enchantment.DIG_SPEED.id, inventoryplayer.getItemInHand()); + public static int getDigSpeedEnchantmentLevel(PlayerInventory playerinventory) { + return getEnchantmentLevel(Enchantment.DIG_SPEED.id, playerinventory.getItemInHand()); } - public static int c(InventoryPlayer inventoryplayer) { - return b(Enchantment.DURABILITY.id, inventoryplayer.getItemInHand()); + public static int getDurabilityEnchantmentLevel(PlayerInventory playerinventory) { + return getEnchantmentLevel(Enchantment.DURABILITY.id, playerinventory.getItemInHand()); } - public static boolean d(InventoryPlayer inventoryplayer) { - return b(Enchantment.SILK_TOUCH.id, inventoryplayer.getItemInHand()) > 0; + public static boolean hasSilkTouchEnchantment(PlayerInventory playerinventory) { + return getEnchantmentLevel(Enchantment.SILK_TOUCH.id, playerinventory.getItemInHand()) > 0; } - public static int e(InventoryPlayer inventoryplayer) { - return b(Enchantment.LOOT_BONUS_BLOCKS.id, inventoryplayer.getItemInHand()); + public static int getBonusBlockLootEnchantmentLevel(PlayerInventory playerinventory) { + return getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS.id, playerinventory.getItemInHand()); } - public static int f(InventoryPlayer inventoryplayer) { - return b(Enchantment.LOOT_BONUS_MOBS.id, inventoryplayer.getItemInHand()); + public static int getBonusMonsterLootEnchantmentLevel(PlayerInventory playerinventory) { + return getEnchantmentLevel(Enchantment.LOOT_BONUS_MOBS.id, playerinventory.getItemInHand()); } - public static boolean g(InventoryPlayer inventoryplayer) { - return a(Enchantment.WATER_WORKER.id, inventoryplayer.armor) > 0; + public static boolean hasWaterWorkerEnchantment(PlayerInventory playerinventory) { + return getEnchantmentLevel(Enchantment.WATER_WORKER.id, playerinventory.armor) > 0; } public static int a(Random random, int i, int j, ItemStack itemstack) { @@ -170,11 +170,11 @@ public class EnchantmentManager { Map map = a(l, itemstack); if (map != null && !map.isEmpty()) { - WeightedRandomChoiceEnchantment weightedrandomchoiceenchantment = (WeightedRandomChoiceEnchantment) WeightedRandom.a(random, map.values()); + EnchantmentInstance enchantmentinstance = (EnchantmentInstance) WeightedRandom.a(random, map.values()); - if (weightedrandomchoiceenchantment != null) { + if (enchantmentinstance != null) { arraylist = new ArrayList(); - arraylist.add(weightedrandomchoiceenchantment); + arraylist.add(enchantmentinstance); for (int i1 = l >> 1; random.nextInt(50) <= i1; i1 >>= 1) { Iterator iterator = map.keySet().iterator(); @@ -186,9 +186,9 @@ public class EnchantmentManager { while (true) { if (iterator1.hasNext()) { - WeightedRandomChoiceEnchantment weightedrandomchoiceenchantment1 = (WeightedRandomChoiceEnchantment) iterator1.next(); + EnchantmentInstance enchantmentinstance1 = (EnchantmentInstance) iterator1.next(); - if (weightedrandomchoiceenchantment1.a.a(Enchantment.byId[integer.intValue()])) { + if (enchantmentinstance1.a.a(Enchantment.byId[integer.intValue()])) { continue; } @@ -203,9 +203,9 @@ public class EnchantmentManager { } if (!map.isEmpty()) { - WeightedRandomChoiceEnchantment weightedrandomchoiceenchantment2 = (WeightedRandomChoiceEnchantment) WeightedRandom.a(random, map.values()); + EnchantmentInstance enchantmentinstance2 = (EnchantmentInstance) WeightedRandom.a(random, map.values()); - arraylist.add(weightedrandomchoiceenchantment2); + arraylist.add(enchantmentinstance2); } } } @@ -224,14 +224,14 @@ public class EnchantmentManager { for (int k = 0; k < j; ++k) { Enchantment enchantment = aenchantment[k]; - if (enchantment != null && enchantment.slot.a(item)) { + if (enchantment != null && enchantment.slot.canEnchant(item)) { for (int l = enchantment.getStartLevel(); l <= enchantment.getMaxLevel(); ++l) { if (i >= enchantment.a(l) && i <= enchantment.b(l)) { if (hashmap == null) { hashmap = new HashMap(); } - hashmap.put(Integer.valueOf(enchantment.id), new WeightedRandomChoiceEnchantment(enchantment, l)); + hashmap.put(Integer.valueOf(enchantment.id), new EnchantmentInstance(enchantment, l)); } } } |