From 35c962b80b64a090261ed9b4ed6e37528a58626f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 21 Sep 2016 02:14:10 +0100 Subject: [PATCH] Some quotes and stuff --- .../client/core/handler/RenderLexicon.java | 47 +++++++++++------- .../client/gui/lexicon/GuiLexicon.java | 2 +- .../botania/common/lexicon/page/PageText.java | 9 ++-- .../resources/assets/botania/lang/en_US.lang | 9 ++-- .../assets/botania/textures/model/lexica.png | Bin 19004 -> 19417 bytes 5 files changed, 37 insertions(+), 30 deletions(-) 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 0e4d26dd1d74b34361fbe059efcd00498c70902e..8948e120392d571da40317f560f23800db243985 100644 GIT binary patch delta 3746 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 S9{?Nx0L>e^8kGdQ$o~T`VWhbL