Skip to content

Commit

Permalink
Fixed unused, Knapsack, and Canister slots
Browse files Browse the repository at this point in the history
  • Loading branch information
unleashurgeek committed Dec 10, 2013
1 parent daa2368 commit 0413812
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/tconstruct/inventory/ArmorExtendedContainer.java
Expand Up @@ -16,13 +16,13 @@ public ArmorExtendedContainer(InventoryPlayer inventoryplayer, ArmorExtended arm
invPlayer = inventoryplayer;
this.armor = armor;

this.addSlotToContainer(new Slot(armor, 0, 80, 17));
this.addSlotToContainer(new Slot(armor, 1, 80, 35));
this.addSlotToContainer(new Slot(armor, 2, 116, 17));
this.addSlotToContainer(new Slot(armor, 3, 116, 35));
this.addSlotToContainer(new Slot(armor, 4, 152, 17));
this.addSlotToContainer(new Slot(armor, 5, 152, 35));
this.addSlotToContainer(new Slot(armor, 6, 152, 53));
this.addSlotToContainer(new SlotUnused(armor, 0, 80, 17));
this.addSlotToContainer(new SlotUnused(armor, 1, 80, 35));
this.addSlotToContainer(new SlotKnapsack(armor, 2, 116, 17));
this.addSlotToContainer(new SlotUnused(armor, 3, 116, 35));
this.addSlotToContainer(new SlotUnused(armor, 4, 152, 17));
this.addSlotToContainer(new SlotUnused(armor, 5, 152, 35));
this.addSlotToContainer(new SlotCanister(armor, 6, 152, 53));

/* Player inventory */
for (int playerArmor = 0; playerArmor < 4; ++playerArmor)
Expand Down
34 changes: 34 additions & 0 deletions src/tconstruct/inventory/SlotCanister.java
@@ -0,0 +1,34 @@
package tconstruct.inventory;

import tconstruct.items.armor.HeartCanister;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Item;

public class SlotCanister extends Slot
{
public SlotCanister(IInventory par2IInventory, int par3, int par4, int par5)
{
super(par2IInventory, par3, par4, par5);
this.parent = container;
}

/**
* Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case
* of armor slots)
*/
public int getSlotStackLimit ()
{
return 10;
}

/**
* Check if the stack is a valid item for this slot. Always true beside for the armor slots.
*/
public boolean isItemValid (ItemStack par1ItemStack)
{
Item item = (par1ItemStack == null ? null : par1ItemStack.getItem());
return item != null && (item instanceof HeartCanister);
}
}
34 changes: 34 additions & 0 deletions src/tconstruct/inventory/SlotKnapsack.java
@@ -0,0 +1,34 @@
package tconstruct.inventory;

import tconstruct.items.armor.Knapsack;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Item;

public class SlotKnapsack extends Slot
{
public SlotKnapsack(IInventory par2IInventory, int par3, int par4, int par5)
{
super(par2IInventory, par3, par4, par5);
this.parent = container;
}

/**
* Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case
* of armor slots)
*/
public int getSlotStackLimit ()
{
return 1;
}

/**
* Check if the stack is a valid item for this slot. Always true beside for the armor slots.
*/
public boolean isItemValid (ItemStack par1ItemStack)
{
Item item = (par1ItemStack == null ? null : par1ItemStack.getItem());
return item != null && (item instanceof Knapsack);
}
}
30 changes: 30 additions & 0 deletions src/tconstruct/inventory/SlotUnused.java
@@ -0,0 +1,30 @@
package tconstruct.inventory;

import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;

public class SlotUnused extends Slot
{
public SlotUnused(IInventory par2IInventory, int par3, int par4, int par5)
{
super(par2IInventory, par3, par4, par5);
}

/**
* Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case
* of armor slots)
*/
public int getSlotStackLimit ()
{
return 0;
}

/**
* Check if the stack is a valid item for this slot. Always true beside for the armor slots.
*/
public boolean isItemValid (ItemStack par1ItemStack)
{
return false;
}
}

0 comments on commit 0413812

Please sign in to comment.