From cb09052e015839c1091e8f076d1af7043a240bbe Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 25 Jul 2015 17:29:36 +0100 Subject: [PATCH] Fixed Esc not working in entry pages. --- .../botania/client/gui/lexicon/GuiLexiconEntry.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index deff77cba..80eb85c29 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -195,7 +195,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa @Override public void updateScreen() { super.updateScreen(); - + LexiconPage page = entry.pages.get(this.page); page.updateScreen(this); @@ -306,11 +306,14 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa @Override protected void keyTyped(char par1, int par2) { handleNoteKey(par1, par2); - + LexiconPage page = entry.pages.get(this.page); page.onKeyPressed(par1, par2); - if(par2 == 203 || par2 == 200 || par2 == 201) // Left, Up, Page Up + if(par2 == 1) { + mc.displayGuiScreen((GuiScreen)null); + mc.setIngameFocus(); + } else if(par2 == 203 || par2 == 200 || par2 == 201) // Left, Up, Page Up prevPage(); else if(par2 == 205 || par2 == 208 || par2 == 209) // Right, Down Page Down nextPage(); @@ -344,7 +347,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa updateNote(); } } - + void updateNote() { String key = getNotesKey(); if(!notes.containsKey(key)) @@ -402,7 +405,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa gui.setTitle(); return gui; } - + @Override public String getNotesKey() { return "entry_" + entry.unlocalizedName + "_" + page;