diff --git a/src/main/java/refinedstorage/container/ContainerConstructor.java b/src/main/java/refinedstorage/container/ContainerConstructor.java index c0751fc7a..93894e402 100755 --- a/src/main/java/refinedstorage/container/ContainerConstructor.java +++ b/src/main/java/refinedstorage/container/ContainerConstructor.java @@ -27,10 +27,10 @@ public class ContainerConstructor extends ContainerBase { Slot slot = getSlot(index); if (slot != null && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 4) { - if (!mergeItemStack(stack, 4 + 1, inventorySlots.size(), false)) { + if (!mergeItemStack(stack, 4, inventorySlots.size(), false)) { return null; } } else if (!mergeItemStack(stack, 0, 4, false)) { diff --git a/src/main/java/refinedstorage/container/ContainerCrafter.java b/src/main/java/refinedstorage/container/ContainerCrafter.java index 15e4f6e33..f46c54dfb 100755 --- a/src/main/java/refinedstorage/container/ContainerCrafter.java +++ b/src/main/java/refinedstorage/container/ContainerCrafter.java @@ -28,10 +28,10 @@ public class ContainerCrafter extends ContainerStorage { Slot slot = getSlot(index); if (slot != null && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 9 + 4) { - if (!mergeItemStack(stack, 9 + 4 + 1, inventorySlots.size(), false)) { + if (!mergeItemStack(stack, 9 + 4, inventorySlots.size(), false)) { return null; } } else if (!mergeItemStack(stack, 0, 9 + 4, false)) { diff --git a/src/main/java/refinedstorage/container/ContainerDestructor.java b/src/main/java/refinedstorage/container/ContainerDestructor.java index 189622719..1bce4b602 100755 --- a/src/main/java/refinedstorage/container/ContainerDestructor.java +++ b/src/main/java/refinedstorage/container/ContainerDestructor.java @@ -29,7 +29,7 @@ public class ContainerDestructor extends ContainerBase { Slot slot = getSlot(index); if (slot != null && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 4) { if (!mergeItemStack(stack, 4 + 9, inventorySlots.size(), false)) { diff --git a/src/main/java/refinedstorage/container/ContainerDiskDrive.java b/src/main/java/refinedstorage/container/ContainerDiskDrive.java index 415ef13dd..e3e421cb5 100755 --- a/src/main/java/refinedstorage/container/ContainerDiskDrive.java +++ b/src/main/java/refinedstorage/container/ContainerDiskDrive.java @@ -28,10 +28,10 @@ public class ContainerDiskDrive extends ContainerStorage { Slot slot = getSlot(index); if (slot != null && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 8) { - if (!mergeItemStack(stack, 8 + 9 + 1, inventorySlots.size(), false)) { + if (!mergeItemStack(stack, 8 + 9, inventorySlots.size(), false)) { return null; } } else if (!mergeItemStack(stack, 0, 8, false)) { diff --git a/src/main/java/refinedstorage/container/ContainerExporter.java b/src/main/java/refinedstorage/container/ContainerExporter.java index abf00f2d4..7ff6f990c 100755 --- a/src/main/java/refinedstorage/container/ContainerExporter.java +++ b/src/main/java/refinedstorage/container/ContainerExporter.java @@ -29,7 +29,7 @@ public class ContainerExporter extends ContainerBase { Slot slot = getSlot(index); if (slot != null && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 4) { if (!mergeItemStack(stack, 4 + 9, inventorySlots.size(), false)) { diff --git a/src/main/java/refinedstorage/container/ContainerImporter.java b/src/main/java/refinedstorage/container/ContainerImporter.java index 6dc9faba5..c21727668 100755 --- a/src/main/java/refinedstorage/container/ContainerImporter.java +++ b/src/main/java/refinedstorage/container/ContainerImporter.java @@ -29,7 +29,7 @@ public class ContainerImporter extends ContainerBase { Slot slot = getSlot(index); if (slot != null && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 4) { if (!mergeItemStack(stack, 4 + 9, inventorySlots.size(), false)) { diff --git a/src/main/java/refinedstorage/container/ContainerInterface.java b/src/main/java/refinedstorage/container/ContainerInterface.java index 368e8ad40..e1dad439e 100755 --- a/src/main/java/refinedstorage/container/ContainerInterface.java +++ b/src/main/java/refinedstorage/container/ContainerInterface.java @@ -38,10 +38,10 @@ public class ContainerInterface extends ContainerBase { Slot slot = getSlot(index); if (slot != null && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 9) { - if (!mergeItemStack(stack, 9 + 9 + 9 + 4 + 1, inventorySlots.size(), true)) { + if (!mergeItemStack(stack, 9 + 9 + 9 + 4, inventorySlots.size(), false)) { return null; } } else if (!mergeItemStack(stack, 0, 9, false)) { diff --git a/src/main/java/refinedstorage/container/ContainerProcessingPatternEncoder.java b/src/main/java/refinedstorage/container/ContainerProcessingPatternEncoder.java index 6e310c10b..9541dac20 100755 --- a/src/main/java/refinedstorage/container/ContainerProcessingPatternEncoder.java +++ b/src/main/java/refinedstorage/container/ContainerProcessingPatternEncoder.java @@ -46,10 +46,10 @@ public class ContainerProcessingPatternEncoder extends ContainerBase { Slot slot = getSlot(index); if (slot != null && !(slot instanceof SlotSpecimen) && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 2) { - if (!mergeItemStack(stack, 2 + 18 + 1, inventorySlots.size(), false)) { + if (!mergeItemStack(stack, 2 + 18, inventorySlots.size(), false)) { return null; } } else if (!mergeItemStack(stack, 0, 1, false)) { diff --git a/src/main/java/refinedstorage/container/ContainerSolderer.java b/src/main/java/refinedstorage/container/ContainerSolderer.java index ca059f684..ce594ce1d 100755 --- a/src/main/java/refinedstorage/container/ContainerSolderer.java +++ b/src/main/java/refinedstorage/container/ContainerSolderer.java @@ -36,10 +36,14 @@ public class ContainerSolderer extends ContainerBase { Slot slot = getSlot(index); if (slot != null && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 4) { - if (!mergeItemStack(stack, 4 + 1, inventorySlots.size(), true)) { + if (!mergeItemStack(stack, 4 + 4, inventorySlots.size(), false)) { + return null; + } + } else if (index < 4 + 4) { + if (!mergeItemStack(stack, 4 + 4, inventorySlots.size(), false)) { return null; } } else if (!mergeItemStack(stack, 0, 3, false)) { // 0 - 3 because we can't shift click to output slot diff --git a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java index c43fe49f3..729b6eeed 100755 --- a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java +++ b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java @@ -24,10 +24,10 @@ public class ContainerWirelessTransmitter extends ContainerBase { Slot slot = getSlot(index); if (slot != null && slot.getHasStack()) { - stack = slot.getStack().copy(); + stack = slot.getStack(); if (index < 4) { - if (!mergeItemStack(stack, 4 + 1, inventorySlots.size(), false)) { + if (!mergeItemStack(stack, 4, inventorySlots.size(), false)) { return null; } } else if (!mergeItemStack(stack, 0, 4, false)) {