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

Fixed not being able to use JEI R and U keys on Grid with tabs, fixes #1499

Browse Source
This commit is contained in:
raoulvdberge
2017-10-29 22:29:31 +01:00
parent fbdc0f4752
commit 15681b6ba4
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -335,6 +335,10 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
return inBounds(7, 19 + getTabHeight(), 162, 18 * getVisibleRows(), mouseX, mouseY);
}
public int getSlotNumber() {
return slotNumber;
}
private boolean isOverClear(int mouseX, int mouseY) {
int y = getTabHeight() + getHeader() + (getVisibleRows() * 18) + 4;
@@ -400,7 +404,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
drawItem(otx + 6, ty + 9 - (!selected ? 3 : 0), tab.getIcon());
if (inBounds(tx, ty, ContainerGrid.TAB_WIDTH, ContainerGrid.TAB_HEIGHT, mouseX, mouseY)) {
if (inBounds(tx, ty, ContainerGrid.TAB_WIDTH, ContainerGrid.TAB_HEIGHT - (selected ? 2 : 7), mouseX, mouseY)) {
tabHovering = index;
}
}

12
src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiHandlerGrid.java
View File

@@ -26,17 +26,7 @@ public class GuiHandlerGrid implements IAdvancedGuiHandler<GuiGrid> {
mouseY -= gui.getGuiTop();
if (gui.getScrollbar() != null && !gui.getSearchField().isFocused() && gui.isOverSlotArea(mouseX, mouseY)) {
mouseX -= 7;
mouseY -= 19;
int x = mouseX / 18;
int y = mouseY / 18;
y += gui.getScrollbar().getOffset();
int slot = y * 9 + x;
return slot >= 0 && slot < GuiGrid.STACKS.size() ? GuiGrid.STACKS.get(slot).getIngredient() : null;
return gui.getSlotNumber() >= 0 && gui.getSlotNumber() < GuiGrid.STACKS.size() ? GuiGrid.STACKS.get(gui.getSlotNumber()).getIngredient() : null;
}
return null;