Added more materials, broke something in the tool table.

3 files changed, 19 insertions, 13 deletions

diff --git a/src/main/java/lance5057/tDefense/armor/items/straps/ItemStraps.java b/src/main/java/lance5057/tDefense/armor/items/straps/ItemStraps.java
index 84f7d69..a236fc0 100644
--- a/src/main/java/lance5057/tDefense/armor/items/straps/ItemStraps.java
+++ b/src/main/java/lance5057/tDefense/armor/items/straps/ItemStraps.java
@@ -29,16 +29,16 @@ public class ItemStraps extends ItemArmor
 	}
    
     	@Override
-	public ActionResult<ItemStack> onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand)
+	public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn)
 	{
-		if (!world.isRemote)
+		if (!worldIn.isRemote)
 		{
 			// If player not sneaking, open the inventory gui
-			if (!player.isSneaking()) {
-				player.openGui(TinkersDefense.instance, TinkersDefense.GUI_STRAPS_INV, world, 0, 0, 0);
+			if (!playerIn.isSneaking()) {
+				playerIn.openGui(TinkersDefense.instance, TinkersDefense.GUI_STRAPS_INV, worldIn, 0, 0, 0);
 			}
 		}
 		
-		return new ActionResult(EnumActionResult.PASS, itemStack);
+		return new ActionResult(EnumActionResult.PASS, playerIn.getHeldItem(handIn));
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/armor/items/straps/ItemStrapsInv.java b/src/main/java/lance5057/tDefense/armor/items/straps/ItemStrapsInv.java
index fc71353..95b8036 100644
--- a/src/main/java/lance5057/tDefense/armor/items/straps/ItemStrapsInv.java
+++ b/src/main/java/lance5057/tDefense/armor/items/straps/ItemStrapsInv.java
@@ -49,7 +49,7 @@ public class ItemStrapsInv implements IInventory {
 			// Just double-checking that the saved slot index is within our
 			// inventory array bounds
 			if (slot >= 0 && slot < getSizeInventory()) {
-				inventory[slot] = ItemStack.loadItemStackFromNBT(item);
+				inventory[slot] = new ItemStack(item);
 			}
 		}
 	}
@@ -111,7 +111,7 @@ public class ItemStrapsInv implements IInventory {
 	public ItemStack decrStackSize(int index, int count) {
 		ItemStack stack = getStackInSlot(index);
 		if (stack != null) {
-			if (stack.stackSize > count) {
+			if (stack.getCount() > count) {
 				stack = stack.splitStack(count);
 				// Don't forget this line or your inventory will not be saved!
 				markDirty();
@@ -135,8 +135,8 @@ public class ItemStrapsInv implements IInventory {
 	public void setInventorySlotContents(int index, ItemStack stack) {
 		inventory[index] = stack;
 
-		if (stack != null && stack.stackSize > getInventoryStackLimit()) {
-			stack.stackSize = getInventoryStackLimit();
+		if (stack != null && stack.getCount() > getInventoryStackLimit()) {
+			stack.setCount(getInventoryStackLimit());
 		}
 
 		// Don't forget this line or your inventory will not be saved!
@@ -151,7 +151,7 @@ public class ItemStrapsInv implements IInventory {
 	@Override
 	public void markDirty() {
 		for (int i = 0; i < getSizeInventory(); ++i) {
-			if (getStackInSlot(i) != null && getStackInSlot(i).stackSize == 0) {
+			if (getStackInSlot(i) != null && getStackInSlot(i).getCount() == 0) {
 				inventory[i] = null;
 			}
 		}
@@ -203,4 +203,10 @@ public class ItemStrapsInv implements IInventory {
 		// TODO Auto-generated method stub
 
 	}
+
+	@Override
+	public boolean isEmpty() {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/items/straps/StrapsContainer.java b/src/main/java/lance5057/tDefense/armor/items/straps/StrapsContainer.java
index 96a2aed..e4c59c4 100644
--- a/src/main/java/lance5057/tDefense/armor/items/straps/StrapsContainer.java
+++ b/src/main/java/lance5057/tDefense/armor/items/straps/StrapsContainer.java
@@ -161,7 +161,7 @@ public class StrapsContainer extends Container
 				}
 			}
 
-			if (itemstack1.stackSize == 0)
+			if (itemstack1.getItemDamage() == 0)
 			{
 				slot.putStack((ItemStack) null);
 			}
@@ -170,12 +170,12 @@ public class StrapsContainer extends Container
 				slot.onSlotChanged();
 			}
 
-			if (itemstack1.stackSize == itemstack.stackSize)
+			if (itemstack1.getItemDamage() == itemstack.getItemDamage())
 			{
 				return null;
 			}
 
-			slot.onPickupFromSlot(par1EntityPlayer, itemstack1);
+			slot.onTake(par1EntityPlayer, itemstack1);
 		}
 
 		return itemstack;