diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 23fd4c61c..9356d4cb0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -335,6 +335,7 @@ public final class HUDHandler { FontRenderer font = mc.fontRenderer; boolean draw = false; String drawStr = ""; + String secondLine = ""; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -348,6 +349,7 @@ public final class HUDHandler { font = mc.standardGalacticFontRenderer; drawStr = StatCollector.translateToLocal(entry.getUnlocalizedName()); + secondLine = EnumChatFormatting.ITALIC + StatCollector.translateToLocal(entry.getTagline()); draw = true; } } @@ -370,12 +372,20 @@ public final class HUDHandler { if(draw) { if(!mc.thePlayer.isSneaking()) { drawStr = "?"; + secondLine = ""; font = mc.fontRenderer; } RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModItems.lexicon), sx, sy); GL11.glDisable(GL11.GL_LIGHTING); font.drawStringWithShadow(drawStr, sx + 10, sy + 8, 0xFFFFFFFF); + font.drawStringWithShadow(secondLine, sx + 10, sy + 18, 0xFFAAAAAA); + + if(!mc.thePlayer.isSneaking()) { + GL11.glScalef(0.5F, 0.5F, 1F); + mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF); + GL11.glScalef(2F, 2F, 1F); + } } GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index 7307eef07..e00303637 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -108,7 +108,7 @@ public final class PersistentVariableHelper { firstLoad = cmp.hasKey(TAG_FIRST_LOAD) ? cmp.getBoolean(TAG_FIRST_LOAD) : firstLoad; if(firstLoad) { - GuiLexicon.currentOpenLexicon = new GuiLexiconEntry(LexiconData.welcome, new GuiLexicon()); + GuiLexicon.currentOpenLexicon = new GuiLexiconEntry(LexiconData.welcome, new GuiLexiconEntry(LexiconData.tutorial, new GuiLexicon())); lastBotaniaVersion = LibMisc.VERSION; } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index bf135175c..c4d0069a5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -175,7 +175,22 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { if(isShiftKeyDown()) { if(currentButton != null) infoTime = Math.min(animationTime, infoTime + timeDelta); - } else infoTime = Math.max(0, infoTime - timeDelta); + } else { + infoTime = Math.max(0, infoTime - timeDelta); + + if(currentButton != null && infoTime == 0) { + int x = par1 + 10; + int y = par2; + + x = currentButton.xPosition - 20; + y = currentButton.yPosition; + + mc.fontRenderer.drawStringWithShadow("?", x, y, 0xFFFFFF); + GL11.glScalef(0.5F, 0.5F, 1F); + mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF); + GL11.glScalef(2F, 2F, 1F); + } + } if(currentButton != null && infoTime > 0) { float fract = infoTime / animationTime; @@ -201,8 +216,8 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, paper, 14, -28); RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, paper, 14, -28); - List stacks = currentEntry.getDisplayedRecipes(); + if(stacks.size() > 0) { int spaceForEach = Math.min(18, (width - 30) / stacks.size()); for(int i = 0; i < stacks.size(); i++) { @@ -214,8 +229,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); GL11.glPopMatrix(); - setHoveredButton(null); } + + setHoveredButton(null); } @Override diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index db145d695..f76d5405c 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1914,16 +1914,13 @@ botania.page.welcome4=&oWith the help of this book, your dreams will become a re botania.page.welcome5=&oIt holds the secrets of the elves, who have long ago fled from this world, as well as possible clues to the origins of the very world itself. For anyone with a basic knowledge of redstone and the creativity to put it to use, this book offers answers to nearly every problem known to man, without the need to use foreign schools of magic or machinery. botania.page.welcome6=&oThis book contains instructions on how to perform nearly every task that one could ever need, with only the use of what's in it, and available in the world of Minecraft, assuming you're up to the task of putting them together in ingenious ways.
Try it out, you'll be amazed at what you can do without outside interference. botania.page.welcome7=&oThe school of botany does not solely apply to those with a knack for complex thought processes.
Introduction to the art is simple, and the rewards are vast. A wide range of magical accessories and instruments allow for empowering of one who decides to study the various options therein. -botania.page.welcome8=&oDear reader, I welcome you to the realm of Botania.&r
- Written by &nGideon Seymour&r, guest writer. (Adapted for use) +botania.page.welcome8=&oDear reader, I welcome you to the realm of Botania.&r
- Written by &nGideon Seymour&r, guest writer. (Adapted for use)

&oClick the "Back" arrow at the bottom to leave this entry # -- TUTORIAL OF THE BASICS botania.entry.tutorial=A Tutorial of the Basics +botania.tagline.tutorial=Get set up quickly botania.page.tutorial0=While one could just go through the various entries in the book at their leisure, there's also a tutorial of sorts available. Clicking the buttons below will guide you through the basic concepts of Botania.
You can pick between an ingame guided tour of this book, or a short(-ish) video. -# -- AN INTRODUCTORY CLIP -botania.entry.introVideo=An Introductory Clip -botania.page.introVideo0=For those readers who are not quite readers, a short video guide covering the basics of Botania is also available. It's to keep in note that this guide acts as an aid and not a substitution for the contents of the &1Lexica Botania&0. - # -- GARDEN OF GLASS botania.entry.gardenOfGlass=Garden of Glass botania.tagline.gardenOfGlass=Your new challenge @@ -2955,7 +2952,7 @@ botania.page.glassPick1=Trapped inside with food # -- ROD OF DIVINING botania.entry.diviningRod=Rod of the Plentiful Mantle -botania.tagline.divingRod=A rod to find ores +botania.tagline.diviningRod=A rod to find ores botania.page.diviningRod0=The &1Rod of the Plentiful Mantle&0 has the ability to divine in a decently large radius around the user to find any ores. These will shine for a little bit, allowing their location.
This process, obviously, requires a decent amount of &4Mana&0 from the user's inventory. botania.page.diviningRod1=inb4 ee3 @@ -3574,7 +3571,7 @@ botania.page.elvenLore7=&oThe collapse of the Bifrost broke any interaction betw # - MISCLANEOUS # -- UNSTABLE CUBE botania.entry.unstableBlocks=Unstable Cubes -botania.tagline.unstableCubes=Fancy accent blocks +botania.tagline.unstableBlocks=Fancy accent blocks botania.page.unstableBlocks0=Fiddling with highly powerful &4Mana&0 infused objects has lead to the creation of these strange cubes. They seem to emit some visual radiation in the form of colorful lightning, but it doesn't seem like it has any effects other than visual appeal. botania.page.unstableBlocks1=They look fancy botania.page.unstableBlocks2=And they come in all 16 colors