Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to use mc-dev rename revision 1

Browse Source
This commit is contained in:
Nathan Adams
2011-11-29 23:17:43 +00:00
parent 8665161eaa
commit 8fbe78a2c3
117 changed files with 907 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
View File

@@ -1,17 +1,16 @@
package org.bukkit.craftbukkit.inventory;
import net.minecraft.server.InventoryPlayer;
import net.minecraft.server.PlayerInventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
public class CraftInventoryPlayer extends CraftInventory implements PlayerInventory {
public CraftInventoryPlayer(net.minecraft.server.InventoryPlayer inventory) {
public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.inventory.PlayerInventory {
public CraftInventoryPlayer(net.minecraft.server.PlayerInventory inventory) {
super(inventory);
}
public InventoryPlayer getInventory() {
return (InventoryPlayer) inventory;
public PlayerInventory getInventory() {
return (PlayerInventory) inventory;
}
public int getSize() {

20
src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
View File

@@ -119,7 +119,7 @@ public class CraftItemStack extends ItemStack {
// Ignore damage if item is null
if (item != null) {
super.setDurability(durability);
item.b(durability);
item.setData(durability);
}
}
@@ -152,7 +152,7 @@ public class CraftItemStack extends ItemStack {
@Override
public int getEnchantmentLevel(Enchantment ench) {
return EnchantmentManager.b(ench.getId(), item);
return EnchantmentManager.getEnchantmentLevel(ench.getId(), item);
}
@Override
@@ -168,15 +168,15 @@ public class CraftItemStack extends ItemStack {
@Override
public Map<Enchantment, Integer> getEnchantments() {
Map<Enchantment, Integer> result = new HashMap<Enchantment, Integer>();
NBTTagList list = item.p();
NBTTagList list = item.getEnchantments();
if (list == null) {
return result;
}
for (int i = 0; i < list.d(); i++) {
short id = ((NBTTagCompound)list.a(i)).e("id");
short level = ((NBTTagCompound)list.a(i)).e("lvl");
for (int i = 0; i < list.size(); i++) {
short id = ((NBTTagCompound)list.get(i)).getShort("id");
short level = ((NBTTagCompound)list.get(i)).getShort("lvl");
result.put(Enchantment.getById(id), (int)level);
}
@@ -195,13 +195,13 @@ public class CraftItemStack extends ItemStack {
for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet()) {
NBTTagCompound subtag = new NBTTagCompound();
subtag.a("id", (short)entry.getKey().getId());
subtag.a("lvl", (short)(int)entry.getValue());
subtag.setShort("id", (short)entry.getKey().getId());
subtag.setShort("lvl", (short)(int)entry.getValue());
list.a(subtag);
list.add(subtag);
}
tag.a("ench", (NBTBase)list);
tag.set("ench", list);
}
public net.minecraft.server.ItemStack getHandle() {