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

Shift clicking patterns in the Pattern Grid now puts the patterns in the pattern slot, fixes #1142

Browse Source
This commit is contained in:
raoulvdberge
2017-04-22 14:31:12 +02:00
parent 032071a44c
commit 6afde22f14
2 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -15,6 +15,7 @@
- Fixed Fluid Grid not formatting large quantities correctly (raoulvdberge) - Fixed Fluid Grid not formatting large quantities correctly (raoulvdberge)
- Small performance improvement: only sort the storages when needed (raoulvdberge) - Small performance improvement: only sort the storages when needed (raoulvdberge)
- Display progress bar on JEI recipes for the Solderer (raoulvdberge) - Display progress bar on JEI recipes for the Solderer (raoulvdberge)
- Shift clicking patterns in the Pattern Grid now puts the patterns in the pattern slot (raoulvdberge)
### 1.4.2 ### 1.4.2
- Updated Forge to 2261 (raoulvdberge) - Updated Forge to 2261 (raoulvdberge)

54
src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java
View File

@@ -43,13 +43,18 @@ public class ContainerGrid extends ContainerBase {
this.inventorySlots.clear(); this.inventorySlots.clear();
this.inventoryItemStacks.clear(); this.inventoryItemStacks.clear();
int headerAndSlots = getTabDelta() + display.getHeader() + (display.getVisibleRows() * 18);
if (grid.getType() != GridType.FLUID) { if (grid.getType() != GridType.FLUID) {
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotItemHandler(grid.getFilter(), i, 204, 6 + (18 * i) + getTabDelta())); addSlotToContainer(new SlotItemHandler(grid.getFilter(), i, 204, 6 + (18 * i) + getTabDelta()));
} }
} }
int headerAndSlots = getTabDelta() + display.getHeader() + (display.getVisibleRows() * 18); if (grid.getType() == GridType.PATTERN) {
addSlotToContainer(new SlotItemHandler(((NetworkNodeGrid) grid).getPatterns(), 0, 152, headerAndSlots + 4));
addSlotToContainer(new SlotOutput(((NetworkNodeGrid) grid).getPatterns(), 1, 152, headerAndSlots + 40));
}
addPlayerInventory(8, display.getYPlayerInventory()); addPlayerInventory(8, display.getYPlayerInventory());
@@ -85,9 +90,6 @@ public class ContainerGrid extends ContainerBase {
} }
addSlotToContainer(patternResultSlot = new SlotDisabled(grid.getCraftingResult(), 0, 112 + 4, headerAndSlots + 22)); addSlotToContainer(patternResultSlot = new SlotDisabled(grid.getCraftingResult(), 0, 112 + 4, headerAndSlots + 22));
addSlotToContainer(new SlotItemHandler(((NetworkNodeGrid) grid).getPatterns(), 0, 152, headerAndSlots + 4));
addSlotToContainer(new SlotOutput(((NetworkNodeGrid) grid).getPatterns(), 1, 152, headerAndSlots + 40));
} }
} }
@@ -136,7 +138,7 @@ public class ContainerGrid extends ContainerBase {
sendCraftingSlots(); sendCraftingSlots();
detectAndSendChanges(); detectAndSendChanges();
} else if (slot != patternResultSlot && !(slot instanceof SlotFilterLegacy) && grid.getNetwork() != null) { } else if (slot != patternResultSlot && !(slot instanceof SlotFilterLegacy)) {
ItemStack stack = slot.getStack(); ItemStack stack = slot.getStack();
if (grid.getType() != GridType.FLUID && stack.getItem() == RSItems.FILTER) { if (grid.getType() != GridType.FLUID && stack.getItem() == RSItems.FILTER) {
@@ -146,7 +148,29 @@ public class ContainerGrid extends ContainerBase {
// Move to player inventory instead // Move to player inventory instead
if (slotIndex < 4) { if (slotIndex < 4) {
startIndex = 4; startIndex = 4;
endIndex = 4 + (9 * 4);
if (grid.getType() == GridType.PATTERN) {
startIndex += 2; // Skip the pattern slots
}
endIndex = startIndex + (9 * 4);
}
if (mergeItemStack(stack, startIndex, endIndex, false)) {
slot.onSlotChanged();
detectAndSendChanges();
return ItemStack.EMPTY;
}
} else if (grid.getType() == GridType.PATTERN && stack.getItem() == RSItems.PATTERN) {
int startIndex = 4;
int endIndex = startIndex + 1;
// Move to player inventory instead
if (slotIndex == 4) {
startIndex = endIndex;
endIndex = startIndex + (9 * 4);
} }
if (mergeItemStack(stack, startIndex, endIndex, false)) { if (mergeItemStack(stack, startIndex, endIndex, false)) {
@@ -158,16 +182,18 @@ public class ContainerGrid extends ContainerBase {
} }
} }
IItemGridHandler itemHandler = grid.getNetwork().getItemGridHandler(); if (grid.getNetwork() != null) {
IFluidGridHandler fluidHandler = grid.getNetwork().getFluidGridHandler(); IItemGridHandler itemHandler = grid.getNetwork().getItemGridHandler();
IFluidGridHandler fluidHandler = grid.getNetwork().getFluidGridHandler();
if (grid.getType() != GridType.FLUID && itemHandler != null) { if (grid.getType() != GridType.FLUID && itemHandler != null) {
slot.putStack(RSUtils.transformNullToEmpty(itemHandler.onInsert((EntityPlayerMP) player, stack))); slot.putStack(RSUtils.transformNullToEmpty(itemHandler.onInsert((EntityPlayerMP) player, stack)));
} else if (grid.getType() == GridType.FLUID && fluidHandler != null) { } else if (grid.getType() == GridType.FLUID && fluidHandler != null) {
slot.putStack(RSUtils.transformNullToEmpty(fluidHandler.onInsert((EntityPlayerMP) player, stack))); slot.putStack(RSUtils.transformNullToEmpty(fluidHandler.onInsert((EntityPlayerMP) player, stack)));
}
detectAndSendChanges();
} }
detectAndSendChanges();
} }
} }
} }