Shift clicking solderer upgrades go in the upgrade slot first

This commit is contained in:
Raoul Van den Berge
2016-07-18 01:49:00 +02:00
parent 4df7f00e11
commit 28b28cc0d0

View File

@@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.items.SlotItemHandler; import net.minecraftforge.items.SlotItemHandler;
import refinedstorage.RefinedStorageItems;
import refinedstorage.container.slot.SlotOutput; import refinedstorage.container.slot.SlotOutput;
import refinedstorage.tile.TileSolderer; import refinedstorage.tile.TileSolderer;
@@ -46,8 +47,12 @@ public class ContainerSolderer extends ContainerBase {
if (!mergeItemStack(stack, 4 + 4, inventorySlots.size(), false)) { if (!mergeItemStack(stack, 4 + 4, inventorySlots.size(), false)) {
return null; return null;
} }
} else if (!mergeItemStack(stack, 0, 3, false)) { // 0 - 3 because we can't shift click to output slot } else {
return null; if (stack.getItem() != RefinedStorageItems.UPGRADE || !mergeItemStack(stack, 4, 4 + 4, false)) {
if (!mergeItemStack(stack, 0, 3, false)) { // 0 - 3 because we can't shift click to output slot
return null;
}
}
} }
if (stack.stackSize == 0) { if (stack.stackSize == 0) {