dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to shift clicking

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-17 20:23:41 +02:00
parent f64cb60f5f
commit 2eae68e8b4
10 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/refinedstorage/container/ContainerConstructor.java
View File

@@ -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)) {

4
src/main/java/refinedstorage/container/ContainerCrafter.java
View File

@@ -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)) {

2
src/main/java/refinedstorage/container/ContainerDestructor.java
View File

@@ -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)) {

4
src/main/java/refinedstorage/container/ContainerDiskDrive.java
View File

@@ -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)) {

2
src/main/java/refinedstorage/container/ContainerExporter.java
View File

@@ -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)) {

2
src/main/java/refinedstorage/container/ContainerImporter.java
View File

@@ -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)) {

4
src/main/java/refinedstorage/container/ContainerInterface.java
View File

@@ -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)) {

4
src/main/java/refinedstorage/container/ContainerProcessingPatternEncoder.java
View File

@@ -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)) {

8
src/main/java/refinedstorage/container/ContainerSolderer.java
View File

@@ -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

4
src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java
View File

@@ -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)) {