lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Everything else except sigils

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-01-01 22:26:42 -08:00
parent 128b3d29b0
commit 51e10eaad2
46 changed files with 289 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java
View file

@ -59,7 +59,7 @@ public class ContainerHolding extends Container
{
super.onContainerClosed(entityPlayer);
if (!entityPlayer.worldObj.isRemote)
if (!entityPlayer.getEntityWorld().isRemote)
{
saveInventory(entityPlayer);
}
@ -70,7 +70,7 @@ public class ContainerHolding extends Container
{
super.detectAndSendChanges();
if (!player.worldObj.isRemote)
if (!player.getEntityWorld().isRemote)
{
saveInventory(player);
}
@ -79,8 +79,8 @@ public class ContainerHolding extends Container
@Override
public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex)
{
ItemStack stack = null;
Slot slotObject = (Slot) inventorySlots.get(slotIndex);
ItemStack stack = ItemStack.EMPTY;
Slot slotObject = inventorySlots.get(slotIndex);
int slots = inventorySlots.size();
if (slotObject != null && slotObject.getHasStack())
@ -94,11 +94,11 @@ public class ContainerHolding extends Container
{
if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize, slots, false))
{
return null;
return ItemStack.EMPTY;
}
} else if (!this.mergeItemStack(stackInSlot, 0, ItemSigilHolding.inventorySize, false))
{
return null;
return ItemStack.EMPTY;
}
} else if (stack.getItem() instanceof ItemSigilHolding)
{
@ -106,28 +106,28 @@ public class ContainerHolding extends Container
{
if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), inventorySlots.size(), false))
{
return null;
return ItemStack.EMPTY;
}
} else if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize, ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), false))
{
return null;
return ItemStack.EMPTY;
}
}
if (stackInSlot.stackSize == 0)
if (stackInSlot.isEmpty())
{
slotObject.putStack(null);
slotObject.putStack(ItemStack.EMPTY);
} else
{
slotObject.onSlotChanged();
}
if (stackInSlot.stackSize == stack.stackSize)
if (stackInSlot.getCount() == stack.getCount())
{
return null;
return ItemStack.EMPTY;
}
slotObject.onPickupFromSlot(player, stackInSlot);
slotObject.onTake(player, stackInSlot);
}
return stack;

2
src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java
View file

@ -40,7 +40,7 @@ public class InventoryHolding extends ItemInventory
{
ItemStack itemStack = entityPlayer.inventory.getStackInSlot(i);
if (itemStack != null && Utils.hasUUID(itemStack))
if (!itemStack.isEmpty() && Utils.hasUUID(itemStack))
{
if (itemStack.getTagCompound().getLong(Constants.NBT.MOST_SIG) == parentStackUUID.getMostSignificantBits() && itemStack.getTagCompound().getLong(Constants.NBT.LEAST_SIG) == parentStackUUID.getLeastSignificantBits())
{

25
src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java
View file

@ -62,7 +62,7 @@ public class ItemInventory implements IInventory
if (j >= 0 && j < inventory.length)
{
inventory[j] = ItemStack.loadItemStackFromNBT(data);
inventory[j] = new ItemStack(data);
}
}
}
@ -123,22 +123,22 @@ public class ItemInventory implements IInventory
@Override
public ItemStack decrStackSize(int index, int count)
{
if (inventory[index] != null)
if (!inventory[index].isEmpty())
{
// if (!worldObj.isRemote)
// worldObj.markBlockForUpdate(this.pos);
if (inventory[index].stackSize <= count)
if (inventory[index].getCount() <= count)
{
ItemStack itemStack = inventory[index];
inventory[index] = null;
inventory[index] = ItemStack.EMPTY;
markDirty();
return itemStack;
}
ItemStack itemStack = inventory[index].splitStack(count);
if (inventory[index].stackSize == 0)
inventory[index] = null;
if (inventory[index].isEmpty())
inventory[index] = ItemStack.EMPTY;
markDirty();
return itemStack;
@ -153,7 +153,7 @@ public class ItemInventory implements IInventory
if (inventory[slot] != null)
{
ItemStack itemStack = inventory[slot];
setInventorySlotContents(slot, null);
setInventorySlotContents(slot, ItemStack.EMPTY);
return itemStack;
}
return null;
@ -163,8 +163,8 @@ public class ItemInventory implements IInventory
public void setInventorySlotContents(int slot, ItemStack stack)
{
inventory[slot] = stack;
if (stack != null && stack.stackSize > getInventoryStackLimit())
stack.stackSize = getInventoryStackLimit();
if (stack.getCount() > getInventoryStackLimit())
stack.setCount(getInventoryStackLimit());
markDirty();
// if (!worldObj.isRemote)
// worldObj.markBlockForUpdate(this.pos);
@ -177,7 +177,7 @@ public class ItemInventory implements IInventory
}
@Override
public boolean isUseableByPlayer(EntityPlayer player)
public boolean isUsableByPlayer(EntityPlayer player)
{
return true;
}
@ -251,6 +251,11 @@ public class ItemInventory implements IInventory
}
}
@Override
public boolean isEmpty() {
return false;
}
public boolean canInventoryBeManipulated()
{
return masterStack != null;