diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 77c243747..db309755a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -29,6 +29,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lexicon.page.PageText; // Hacky way to render 3D lexicon, will be reevaluated in the future. public class RenderLexicon { @@ -36,6 +37,17 @@ public class RenderLexicon { private final ModelBook model = new ModelBook(); private final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); + private final String[] QUOTES = new String[] { + "\"Neat!\" - Direwolf20", + "\"It's pretty ledge.\" - Haighyorkie", + "\"I don't really like it.\" - CrustyMustard", + "\"It's a very thinky mod.\" - AdamG3691", + "\"You must craft the tiny potato.\" - TheFractangle", + "\"Vazkii did a thing.\" - cpw" + }; + + int quote = -1; + @SubscribeEvent public void renderItem(RenderSpecificHandEvent evt) { Minecraft mc = Minecraft.getMinecraft(); @@ -101,42 +113,39 @@ public class RenderLexicon { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.3F, -0.21F, -0.07F); GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); - boolean bevo = mc.thePlayer.getName().equalsIgnoreCase("BevoLJ"); - boolean saice = mc.thePlayer.getName().equalsIgnoreCase("saice"); String title = ModItems.lexicon.getItemStackDisplayName(null); String origTitle = title; if(stack != null) title = stack.getDisplayName(); - if(title.equals(origTitle) && bevo) - title = I18n.format("item.botania:lexicon.bevo"); - if(title.equals(origTitle) && saice) - title = I18n.format("item.botania:lexicon.saice"); font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); + GlStateManager.translate(0F, 10F, 0F); GlStateManager.scale(0.6F, 0.6F, 0.6F); font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), 0, 0, 0xA07100); + + if(quote == -1) + quote = mc.theWorld.rand.nextInt(QUOTES.length); + + String quoteStr = QUOTES[quote]; + + GlStateManager.translate(-5F, 3F, 0F); + PageText.renderText(0, 0, 140, 100, 0, false, 0x79ff92, quoteStr); + GlStateManager.color(1F, 1F, 1F); - GlStateManager.translate(0F, 15F, 0F); + GlStateManager.translate(2F, 98F, 0F); font.drawString(I18n.format("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 10F, 0F); - font.drawString(I18n.format("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.format("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); - GlStateManager.translate(0F, 50F, 0F); - font.drawString(I18n.format("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); + GlStateManager.translate(0F, -30F, 0F); - GlStateManager.translate(0F, 10F, 0F); - font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.format("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); - - if(bevo || saice) { - GlStateManager.translate(0F, 10F, 0F); - font.drawString(I18n.format("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); - } - - GlStateManager.color(1F, 1F, 1F); + String authorTitle = I18n.format("botaniamisc.lexiconcover2"); + int len = font.getStringWidth(authorTitle); + font.drawString(authorTitle, 62 - len / 2, 0, 0xD69700); } GlStateManager.popMatrix(); 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 8e1a07533..ca96d1f6f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -320,7 +320,7 @@ public class GuiLexicon extends GuiScreen { boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); - PageText.renderText(x + 5, y - 3, 92, 120, 0, noteDisplay); + PageText.renderText(x + 5, y - 3, 92, 120, 0, true, 0, noteDisplay); fontRendererObj.setUnicodeFlag(unicode); } 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 3d9b7d44d..12c2355d5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -40,18 +40,19 @@ public class PageText extends LexiconPage { } public static void renderText(int x, int y, int width, int height, String unlocalizedText) { - renderText(x, y, width, height, 10, unlocalizedText); + renderText(x, y, width, height, 10, true, 0, unlocalizedText); } @SideOnly(Side.CLIENT) - public static void renderText(int x, int y, int width, int height, int paragraphSize, String unlocalizedText) { + public static void renderText(int x, int y, int width, int height, int paragraphSize, boolean useUnicode, int color, String unlocalizedText) { x += 2; y += 10; width -= 4; FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); - font.setUnicodeFlag(true); + if(useUnicode) + font.setUnicodeFlag(true); String text = I18n.format(unlocalizedText).replaceAll("&", "\u00a7"); String[] textEntries = text.split("
"); @@ -106,7 +107,7 @@ public class PageText extends LexiconPage { compensationSpaces--; extra++; } - font.drawString(s, xi, y, 0); + font.drawString(s, xi, y, color); xi += font.getStringWidth(s) + spacing + extra; } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 64ee20e69..a704dc024 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -43,12 +43,9 @@ botaniamisc.toolRank=%s&7 Rank botaniamisc.edition=%s Edition # ^ Leave this empty for no edition display botaniamisc.devEdition=Writer's -botaniamisc.lexiconcover0=A manual by Lizbeth -botaniamisc.lexiconcover1="Vazkii" Whitewood -botaniamisc.lexiconcover2=The official guide for -botaniamisc.lexiconcover3=all your Botania needs! -botaniamisc.lexiconcover4=Edited by BevoLJ -botaniamisc.lexiconcover5=Edited by Saice +botaniamisc.lexiconcover0=The official guide for +botaniamisc.lexiconcover1=all your Botania needs! +botaniamisc.lexiconcover2=A Book by Vazkii botaniamisc.shiftinfo=Hold &bSHIFT&7 for more info botaniamisc.knowledgeTypesSingular=Contains %s School of Knowledge botaniamisc.knowledgeTypesPlural=Contains %s Schools of Knowledge diff --git a/src/main/resources/assets/botania/textures/model/lexica.png b/src/main/resources/assets/botania/textures/model/lexica.png index 0e4d26dd1..8948e1203 100644 Binary files a/src/main/resources/assets/botania/textures/model/lexica.png and b/src/main/resources/assets/botania/textures/model/lexica.png differ