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

Fixed shift clicking upgrades into Interface making upgrades go to import slots

Browse Source
This commit is contained in:
raoulvdberge
2018-07-15 21:28:06 +02:00
parent e766e8a7c8
commit 19483d9d9a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -41,6 +41,7 @@ NOTE: Worlds that used Refined Storage 1.5.x are fully compatible with Refined S
- Fixed JEI recipe transferring in Pattern Grid allowing non-processing recipes in processing mode and vice-versa (raoulvdberge) - Fixed JEI recipe transferring in Pattern Grid allowing non-processing recipes in processing mode and vice-versa (raoulvdberge)
- Fixed using Interfaces for minimum stock levels failing when requester is also an Interface (raoulvdberge) - Fixed using Interfaces for minimum stock levels failing when requester is also an Interface (raoulvdberge)
- Fixed ItemZoom incompatibility in Grid (raoulvdberge) - Fixed ItemZoom incompatibility in Grid (raoulvdberge)
- Fixed shift clicking upgrades into Interface making upgrades go to import slots (raoulvdberge)
- Prevent accidental Grid scrollbar click after clicking JEI recipe transfer button (raoulvdberge) - Prevent accidental Grid scrollbar click after clicking JEI recipe transfer button (raoulvdberge)
- Added a missing config option for Crafter Manager energy usage (raoulvdberge) - Added a missing config option for Crafter Manager energy usage (raoulvdberge)
- Added support for Disk Drive / Storage Block storage and capacity to OC integration (zangai) - Added support for Disk Drive / Storage Block storage and capacity to OC integration (zangai)

8
src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java
View File

@@ -40,12 +40,14 @@ public class ContainerInterface extends ContainerBase {
if (slot.getHasStack()) { if (slot.getHasStack()) {
stack = slot.getStack(); stack = slot.getStack();
if (index < 9) { if (index < 9 || (index >= 9 + 9 + 9 && index < 9 + 9 + 9 + 4)) {
if (!mergeItemStack(stack, 9 + 9 + 9 + 4, inventorySlots.size(), false)) { if (!mergeItemStack(stack, 9 + 9 + 9 + 4, inventorySlots.size(), false)) {
return ItemStack.EMPTY; return ItemStack.EMPTY;
} }
} else if (!mergeItemStack(stack, 0, 9, false)) { } else if (!mergeItemStack(stack, 9 + 9 + 9, 9 + 9 + 9 + 4, false)) {
return ItemStack.EMPTY; if (!mergeItemStack(stack, 0, 9, false)) {
return ItemStack.EMPTY;
}
} }
if (stack.getCount() == 0) { if (stack.getCount() == 0) {