From 911dead52f5d3e88447d6eabce054d7db3720980 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Jun 2014 16:51:46 +0100 Subject: [PATCH] Fixed the inventory key not closing the Lexica Botania guis. Closes #115 --- MODSRC/vazkii/botania/client/gui/GuiLexicon.java | 10 ++++++++++ MODSRC/vazkii/botania/client/gui/GuiLexiconEntry.java | 2 +- MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java b/MODSRC/vazkii/botania/client/gui/GuiLexicon.java index d9e8efd2e..e9915a9e3 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java +++ b/MODSRC/vazkii/botania/client/gui/GuiLexicon.java @@ -229,5 +229,15 @@ public class GuiLexicon extends GuiScreen { buttonList.add(new GuiButtonBookmark(BOOKMARK_START + i, left + 138, top + 18 + 14 * i, gui == null ? this : gui, gui == null ? "+" : gui.getTitle())); } } + + @Override + protected void keyTyped(char par1, int par2) { + if(mc.gameSettings.keyBindInventory.getKeyCode() == par2) { + mc.displayGuiScreen(null); + mc.setIngameFocus(); + } + + super.keyTyped(par1, par2); + } } diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexiconEntry.java b/MODSRC/vazkii/botania/client/gui/GuiLexiconEntry.java index 040c9964a..2d149a179 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexiconEntry.java +++ b/MODSRC/vazkii/botania/client/gui/GuiLexiconEntry.java @@ -201,7 +201,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa @Override protected void keyTyped(char par1, int par2) { if(par2 == 203 || par2 == 200 || par2 == 201) // Left, Up, Page Up - prevPage(); + prevPage(); else if(par2 == 205 || par2 == 208 || par2 == 209) // Right, Down Page Down nextPage(); else if(par2 == 14) // Backspace diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java b/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java index 1ea177778..48f434e87 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java +++ b/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java @@ -172,7 +172,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { @Override protected void keyTyped(char par1, int par2) { if(par2 == 203 || par2 == 200 || par2 == 201) // Left, Up, Page Up - prevPage(); + prevPage(); else if(par2 == 205 || par2 == 208 || par2 == 209) // Right, Down Page Down nextPage(); else if(par2 == 14) // Backspace