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

Fixed Factory shift-click support

Browse source
This commit is contained in:
Aidan Brady 2013-11-25 18:44:52 -05:00
parent e2e7274cd6
commit c2c4c4f93f
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java
View file

@ -84,7 +84,7 @@ public class ContainerAdvancedElectricMachine extends Container
{
if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3)
{
if (!mergeItemStack(slotStack, 3, 4, false))
if(!mergeItemStack(slotStack, 3, 4, false))
{
return null;
}
@ -96,11 +96,11 @@ public class ContainerAdvancedElectricMachine extends Container
}
}
}
else if(tileEntity.getFuelTicks(slotStack) > 0 || (tileEntity instanceof TileEntityPurificationChamber && slotStack.getItem() instanceof IStorageTank))
else if(tileEntity.getFuelTicks(slotStack) > 0)
{
if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3)
{
if (!mergeItemStack(slotStack, 1, 2, false))
if(!mergeItemStack(slotStack, 1, 2, false))
{
return null;
}

21
common/mekanism/common/inventory/container/ContainerFactory.java
View file

@ -163,6 +163,22 @@ public class ContainerFactory extends Container
}
}
}
else if(RecipeType.values()[tileEntity.recipeType].getFuelTicks(slotStack) > 0)
{
if(slotID > tileEntity.inventory.length-1)
{
if(!mergeItemStack(slotStack, 4, 5, false))
{
return null;
}
}
else {
if(!mergeItemStack(slotStack, tileEntity.inventory.length, inventorySlots.size(), true))
{
return null;
}
}
}
else if(RecipeType.values()[tileEntity.recipeType].getCopiedOutput(slotStack, false) != null)
{
if(!isInputSlot(slotID))
@ -245,7 +261,10 @@ public class ContainerFactory extends Container
{
if(itemStack.getItemDamage() == MachineType.ENERGIZED_SMELTER.meta ||
itemStack.getItemDamage() == MachineType.ENRICHMENT_CHAMBER.meta ||
itemStack.getItemDamage() == MachineType.CRUSHER.meta)
itemStack.getItemDamage() == MachineType.CRUSHER.meta ||
itemStack.getItemDamage() == MachineType.OSMIUM_COMPRESSOR.meta ||
itemStack.getItemDamage() == MachineType.COMBINER.meta ||
itemStack.getItemDamage() == MachineType.PURIFICATION_CHAMBER.meta)
{
return true;
}