Update for Minecraft 1.8

1 files changed, 29 insertions, 19 deletions

diff --git a/src/main/java/net/minecraft/server/InventoryPlayer.java b/src/main/java/net/minecraft/server/InventoryPlayer.java
index f25e699b..fecaa40d 100644
--- a/src/main/java/net/minecraft/server/InventoryPlayer.java
+++ b/src/main/java/net/minecraft/server/InventoryPlayer.java
@@ -27,11 +27,11 @@ public class InventoryPlayer implements IInventory {
         return this.itemInHandIndex < 9 && this.itemInHandIndex >= 0 ? this.items[this.itemInHandIndex] : null;
     }
 
-    public static int e() {
+    public static int g() {
         return 9;
     }
 
-    private int d(int i) {
+    private int e(int i) {
         for (int j = 0; j < this.items.length; ++j) {
             if (this.items[j] != null && this.items[j].id == i) {
                 return j;
@@ -67,7 +67,7 @@ public class InventoryPlayer implements IInventory {
     }
     // CraftBukkit end
 
-    private int k() {
+    private int m() {
         for (int i = 0; i < this.items.length; ++i) {
             if (this.items[i] == null) {
                 return i;
@@ -83,7 +83,7 @@ public class InventoryPlayer implements IInventory {
         int k = this.firstPartial(itemstack);
 
         if (k < 0) {
-            k = this.k();
+            k = this.m();
         }
 
         if (k < 0) {
@@ -114,7 +114,7 @@ public class InventoryPlayer implements IInventory {
         }
     }
 
-    public void f() {
+    public void h() {
         for (int i = 0; i < this.items.length; ++i) {
             if (this.items[i] != null) {
                 this.items[i].a(this.d.world, this.d, i, this.itemInHandIndex == i);
@@ -123,7 +123,7 @@ public class InventoryPlayer implements IInventory {
     }
 
     public boolean b(int i) {
-        int j = this.d(i);
+        int j = this.e(i);
 
         if (j < 0) {
             return false;
@@ -136,11 +136,17 @@ public class InventoryPlayer implements IInventory {
         }
     }
 
+    public boolean c(int i) {
+        int j = this.e(i);
+
+        return j >= 0;
+    }
+
     public boolean pickup(ItemStack itemstack) {
         int i;
 
         if (itemstack.f()) {
-            i = this.k();
+            i = this.m();
             if (i >= 0) {
                 this.items[i] = ItemStack.b(itemstack);
                 this.items[i].b = 5;
@@ -216,7 +222,7 @@ public class InventoryPlayer implements IInventory {
             if (this.items[i] != null) {
                 nbttagcompound = new NBTTagCompound();
                 nbttagcompound.a("Slot", (byte) i);
-                this.items[i].a(nbttagcompound);
+                this.items[i].b(nbttagcompound);
                 nbttaglist.a((NBTBase) nbttagcompound);
             }
         }
@@ -225,7 +231,7 @@ public class InventoryPlayer implements IInventory {
             if (this.armor[i] != null) {
                 nbttagcompound = new NBTTagCompound();
                 nbttagcompound.a("Slot", (byte) (i + 100));
-                this.armor[i].a(nbttagcompound);
+                this.armor[i].b(nbttagcompound);
                 nbttaglist.a((NBTBase) nbttagcompound);
             }
         }
@@ -240,9 +246,9 @@ public class InventoryPlayer implements IInventory {
         for (int i = 0; i < nbttaglist.c(); ++i) {
             NBTTagCompound nbttagcompound = (NBTTagCompound) nbttaglist.a(i);
             int j = nbttagcompound.c("Slot") & 255;
-            ItemStack itemstack = new ItemStack(nbttagcompound);
+            ItemStack itemstack = ItemStack.a(nbttagcompound);
 
-            if (itemstack.getItem() != null) {
+            if (itemstack != null) {
                 if (j >= 0 && j < this.items.length) {
                     this.items[j] = itemstack;
                 }
@@ -284,7 +290,7 @@ public class InventoryPlayer implements IInventory {
     }
 
     public boolean b(Block block) {
-        if (block.material.i()) {
+        if (block.material.k()) {
             return true;
         } else {
             ItemStack itemstack = this.getItem(this.itemInHandIndex);
@@ -293,7 +299,7 @@ public class InventoryPlayer implements IInventory {
         }
     }
 
-    public int g() {
+    public int i() {
         int i = 0;
         int j = 0;
         int k = 0;
@@ -306,7 +312,7 @@ public class InventoryPlayer implements IInventory {
 
                 j += k1;
                 k += i1;
-                int l1 = ((ItemArmor) this.armor[l].getItem()).bl;
+                int l1 = ((ItemArmor) this.armor[l].getItem()).bu;
 
                 i += l1;
             }
@@ -319,7 +325,7 @@ public class InventoryPlayer implements IInventory {
         }
     }
 
-    public void c(int i) {
+    public void d(int i) {
         for (int j = 0; j < this.armor.length; ++j) {
             if (this.armor[j] != null && this.armor[j].getItem() instanceof ItemArmor) {
                 this.armor[j].damage(i, this.d);
@@ -331,7 +337,7 @@ public class InventoryPlayer implements IInventory {
         }
     }
 
-    public void h() {
+    public void j() {
         int i;
 
         for (i = 0; i < this.items.length; ++i) {
@@ -358,12 +364,12 @@ public class InventoryPlayer implements IInventory {
         this.d.a(itemstack);
     }
 
-    public ItemStack j() {
+    public ItemStack l() {
         return this.f;
     }
 
-    public boolean a_(EntityHuman entityhuman) {
-        return this.d.dead ? false : entityhuman.g(this.d) <= 64.0D;
+    public boolean a(EntityHuman entityhuman) {
+        return this.d.dead ? false : entityhuman.h(this.d) <= 64.0D;
     }
 
     public boolean c(ItemStack itemstack) {
@@ -383,4 +389,8 @@ public class InventoryPlayer implements IInventory {
 
         return false;
     }
+
+    public void e() {}
+
+    public void t_() {}
 }