From 880eed3e4fcbcdc67cfe3c0033b59ebef9e1b247 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 24 Jul 2015 16:41:20 +0100 Subject: [PATCH] Handle paragraphs in notes properly. --- .../vazkii/botania/client/gui/lexicon/GuiLexicon.java | 6 ++---- .../java/vazkii/botania/common/lexicon/page/PageText.java | 8 ++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 18989b6ee..c195790a6 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -265,9 +265,7 @@ public class GuiLexicon extends GuiScreen { boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); - PageText.renderText(x + 5, y - 3, 92, 120, noteDisplay); - - //fontRendererObj.drawSplitString(noteDisplay, x + 7, y + 7, 92, 0); + PageText.renderText(x + 5, y - 3, 92, 120, 0, noteDisplay); fontRendererObj.setUnicodeFlag(unicode); } @@ -534,7 +532,7 @@ public class GuiLexicon extends GuiScreen { note = ""; else { if(note.endsWith("
")) - note = note.substring(0, note.length() - 5); + note = note.substring(0, note.length() - 4); else note = note.substring(0, note.length() - 1); } changed = true; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index f9acbae17..f7b99c2bb 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -41,8 +41,12 @@ public class PageText extends LexiconPage { renderText(x, y, width, gui.getHeight(), getUnlocalizedName()); } - @SideOnly(Side.CLIENT) public static void renderText(int x, int y, int width, int height, String unlocalizedText) { + renderText(x, y, width, height, 10, unlocalizedText); + } + + @SideOnly(Side.CLIENT) + public static void renderText(int x, int y, int width, int height, int paragraphSize, String unlocalizedText) { x += 2; y += 10; width -= 4; @@ -108,7 +112,7 @@ public class PageText extends LexiconPage { xi += font.getStringWidth(s) + spacing + extra; } - y += 10; + y += words.isEmpty() ? paragraphSize : 10; i++; }