Merge branch 'development' into 1.8 (hopefully I didn't miss anything)

Conflicts:
	src/main/java/mekanism/client/gui/GuiGasTank.java
	src/main/java/mekanism/client/gui/GuiPortableTeleporter.java
	src/main/java/mekanism/client/gui/GuiTeleporter.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
This commit is contained in:
Aidan C. Brady committed 2014-09-27 14:40:25 -04:00
commit 9bf4baab49
19 files changed
+980 -136

No files matched your search

@@ -95,7 +95,7 @@ public final class InventoryUtils
inventory.setInventorySlotContents(i, toInsert);
return null;
}
else if(inSlot.isItemEqual(toInsert) && inSlot.stackSize < inSlot.getMaxStackSize())
else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize())
{
if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize())
{
@@ -151,7 +151,7 @@ public final class InventoryUtils
inventory.setInventorySlotContents(slotID, toInsert);
return null;
}
else if(inSlot.isItemEqual(toInsert) && inSlot.stackSize < inSlot.getMaxStackSize())
else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize())
{
if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize())
{
@@ -182,7 +182,11 @@ public final class InventoryUtils
return toInsert;
}
public static InvStack takeTopItem(IInventory inventory, int side)
public static boolean areItemsStackable(ItemStack toInsert, ItemStack inSlot) {
return inSlot.isItemEqual(toInsert) && ItemStack.areItemStackTagsEqual(inSlot, toInsert);
}
public static InvStack takeTopItem(IInventory inventory, int side)
{
inventory = checkChestInv(inventory);
@@ -394,7 +398,7 @@ public final class InventoryUtils
{
return true;
}
else if(inSlot.isItemEqual(itemStack) && inSlot.stackSize < inSlot.getMaxStackSize())
else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize())
{
if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize())
{
@@ -440,7 +444,7 @@ public final class InventoryUtils
{
return true;
}
else if(inSlot.isItemEqual(itemStack) && inSlot.stackSize < inSlot.getMaxStackSize())
else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize())
{
if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize())
{