mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-16 18:54:45 +00:00
Merge remote-tracking branch 'slprime/extend_subset_widget' into dev
# Conflicts: # src/main/java/codechicken/nei/ItemPanel.java # src/main/java/codechicken/nei/guihook/GuiContainerManager.java
This commit is contained in:
16 files changed
+905
-673
No files matched your search
@@ -2585,6 +2585,21 @@ public class BookmarkPanel extends PanelWidget {
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean contains(int px, int py) {
|
||||
|
||||
if (new Rectangle4i(pagePrev.x + pagePrev.w, pagePrev.y, pageNext.x - (pagePrev.x + pagePrev.w), pagePrev.h)
|
||||
.contains(px, py)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (((BookmarkGrid) grid).getHoveredRowIndex(true) != -1) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return super.contains(px, py);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
|
||||
List<String> currenttip) {
|
||||
|
||||
Reference in new issue
Block a user