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

Fixed crash with GUI when toggling the Grid size quickly, fixes #1440

Browse Source
This commit is contained in:
raoulvdberge
2017-09-02 14:21:11 +02:00
parent 78cd47a619
commit 6745ea8ff3
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -6,6 +6,7 @@
- Fixed network not disconnecting when Controller is broken (raoulvdberge) - Fixed network not disconnecting when Controller is broken (raoulvdberge)
- Fixed bug where when multiple Fortune Upgrades are inserted, it chooses the first Fortune Upgrade instead of the highest one (raoulvdberge) - Fixed bug where when multiple Fortune Upgrades are inserted, it chooses the first Fortune Upgrade instead of the highest one (raoulvdberge)
- Fixed some translations having too big "Craft" text (raoulvdberge) - Fixed some translations having too big "Craft" text (raoulvdberge)
- Fixed crash with GUI when toggling the Grid size quickly (raoulvdberge)
- The Fortune Upgrade doesn't use NBT anymore to store the fortune level (raoulvdberge) - The Fortune Upgrade doesn't use NBT anymore to store the fortune level (raoulvdberge)
- Pressing SHIFT over an item in the Grid will no longer display the full unformatted count, instead, use CTRL + SHIFT and it will be displayed in the tooltip (raoulvdberge) - Pressing SHIFT over an item in the Grid will no longer display the full unformatted count, instead, use CTRL + SHIFT and it will be displayed in the tooltip (raoulvdberge)

8
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
View File

@@ -162,7 +162,9 @@ public abstract class GuiBase extends GuiContainer {
String sideButtonTooltip = null; String sideButtonTooltip = null;
for (GuiButton button : buttonList) { for (int i = 0; i < buttonList.size(); ++i) {
GuiButton button = buttonList.get(i);
if (button instanceof SideButton && ((SideButton) button).isHovered()) { if (button instanceof SideButton && ((SideButton) button).isHovered()) {
sideButtonTooltip = ((SideButton) button).getTooltip(); sideButtonTooltip = ((SideButton) button).getTooltip();
} }
@@ -327,10 +329,6 @@ public abstract class GuiBase extends GuiContainer {
GlStateManager.enableLighting(); GlStateManager.enableLighting();
} }
public void drawTooltip(int x, int y, List<String> lines) {
drawTooltip(ItemStack.EMPTY, x, y, lines);
}
public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) { public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) {
drawTexturedModalRect(x, y, textureX, textureY, width, height); drawTexturedModalRect(x, y, textureX, textureY, width, height);
} }