tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Made sure transporters check strict inventory stack limits, fixed the AE2 interaction

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-17 15:30:40 -04:00
parent c991e12bea
commit 2749adcc06
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/mekanism/common/content/transporter/TransporterManager.java
View file

@ -132,7 +132,7 @@ public class TransporterManager
testInv[i] = toInsert; testInv[i] = toInsert;
return; return;
} }
else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize()) else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inv.getInventoryStackLimit())
{ {
if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize())
{ {
@ -188,7 +188,7 @@ public class TransporterManager
testInv[slotID] = toInsert; testInv[slotID] = toInsert;
return; return;
} }
else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize()) else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inv.getInventoryStackLimit())
{ {
if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize())
{ {
@ -288,7 +288,7 @@ public class TransporterManager
{ {
return null; return null;
} }
else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize()) else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit())
{ {
if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize())
{ {
@ -326,7 +326,7 @@ public class TransporterManager
{ {
return null; return null;
} }
else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize()) else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit())
{ {
if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize())
{ {

8
src/main/java/mekanism/common/util/InventoryUtils.java
View file

@ -95,7 +95,7 @@ public final class InventoryUtils
inventory.setInventorySlotContents(i, toInsert); inventory.setInventorySlotContents(i, toInsert);
return null; return null;
} }
else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize()) else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit())
{ {
if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize())
{ {
@ -151,7 +151,7 @@ public final class InventoryUtils
inventory.setInventorySlotContents(slotID, toInsert); inventory.setInventorySlotContents(slotID, toInsert);
return null; return null;
} }
else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize()) else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit())
{ {
if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize())
{ {
@ -398,7 +398,7 @@ public final class InventoryUtils
{ {
return true; return true;
} }
else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize()) else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit())
{ {
if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize())
{ {
@ -444,7 +444,7 @@ public final class InventoryUtils
{ {
return true; return true;
} }
else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize()) else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit())
{ {
if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize())
{ {