Even more inventory changes

This commit is contained in:
aidancbrady committed 2017-03-29 01:33:04 -04:00
1 parent 01ab160ff9
commit afd3525a4b
52 files changed
+498 -537

No files matched your search

@@ -62,7 +62,7 @@ public class ContainerAdvancedElectricMachine extends Container
@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slotID)
{
ItemStack stack = null;
ItemStack stack = ItemStack.EMPTY;
Slot currentSlot = (Slot)inventorySlots.get(slotID);
if(currentSlot != null && currentSlot.getHasStack())
@@ -74,7 +74,7 @@ public class ContainerAdvancedElectricMachine extends Container
{
if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true))
{
return null;
return ItemStack.EMPTY;
}
}
else if(ChargeUtils.canBeDischarged(slotStack))
@@ -83,13 +83,13 @@ public class ContainerAdvancedElectricMachine extends Container
{
if(!mergeItemStack(slotStack, 3, 4, false))
{
return null;
return ItemStack.EMPTY;
}
}
else {
if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true))
{
return null;
return ItemStack.EMPTY;
}
}
}
@@ -99,13 +99,13 @@ public class ContainerAdvancedElectricMachine extends Container
{
if(!mergeItemStack(slotStack, 1, 2, false))
{
return null;
return ItemStack.EMPTY;
}
}
else {
if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true))
{
return null;
return ItemStack.EMPTY;
}
}
}
@@ -115,13 +115,13 @@ public class ContainerAdvancedElectricMachine extends Container
{
if(!mergeItemStack(slotStack, 0, 1, false))
{
return null;
return ItemStack.EMPTY;
}
}
else {
if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true))
{
return null;
return ItemStack.EMPTY;
}
}
}
@@ -130,27 +130,27 @@ public class ContainerAdvancedElectricMachine extends Container
{
if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false))
{
return null;
return ItemStack.EMPTY;
}
}
else if(slotID > 30)
{
if(!mergeItemStack(slotStack, 4, 30, false))
{
return null;
return ItemStack.EMPTY;
}
}
else {
if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true))
{
return null;
return ItemStack.EMPTY;
}
}
}
if(slotStack.getCount() == 0)
{
currentSlot.putStack((ItemStack)null);
currentSlot.putStack(ItemStack.EMPTY);
}
else {
currentSlot.onSlotChanged();
@@ -158,7 +158,7 @@ public class ContainerAdvancedElectricMachine extends Container
if(slotStack.getCount() == stack.getCount())
{
return null;
return ItemStack.EMPTY;
}
currentSlot.onTake(player, slotStack);