From 9e035a7cf47f6b903b97873c35f498bec955da85 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 3 Dec 2015 23:58:04 +0000 Subject: [PATCH] Made the Zoom text in Rune and Mana Infusion pages more clear. Also added a "SHIFT to stop animation" tidbit to Rune and Petal pages. --- .../lexicon/page/PageManaInfusionRecipe.java | 2 +- .../common/lexicon/page/PagePetalRecipe.java | 17 ++++++++++++++++- .../common/lexicon/page/PageRuneRecipe.java | 13 ++++++++----- .../resources/assets/botania/lang/en_US.lang | 4 +++- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index bdb94278d..bb6c3ded1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -115,7 +115,7 @@ public class PageManaInfusionRecipe extends PageRecipe { hoveringOverDrop = true; font.drawString(dropString, dx, dy, 0x77000000); - font.drawString(ratioString, x + 100 - font.getStringWidth(ratioString), y + 5, 0x99000000); + font.drawString(ratioString, x + 50 - font.getStringWidth(ratioString) / 2, y + 15, 0x99000000); font.setUnicodeFlag(unicode); GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index b3822be5c..ece68e3b0 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -15,10 +15,12 @@ import java.util.Arrays; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -97,7 +99,20 @@ public class PagePetalRecipe extends PageRecipe { @SideOnly(Side.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { - // NO-OP + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + int x = gui.getLeft() + gui.getWidth() / 2 - 50; + int y = gui.getTop() + 120; + + boolean unicode = font.getUnicodeFlag(); + font.setUnicodeFlag(true); + String stopStr = StatCollector.translateToLocal("botaniamisc.shiftToStopSpin"); + font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000); + font.setUnicodeFlag(unicode); + + GL11.glDisable(GL11.GL_BLEND); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 7633ed9f2..74ff9943f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -49,11 +49,11 @@ public class PageRuneRecipe extends PagePetalRecipe { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); String manaUsage = StatCollector.translateToLocal("botaniamisc.manaUsage"); - font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 115, 0x66000000); + font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 110, 0x66000000); int ratio = 10; int x = gui.getLeft() + gui.getWidth() / 2 - 50; - int y = gui.getTop() + 125; + int y = gui.getTop() + 120; if(mx > x + 1 && mx <= x + 101 && my > y - 14 && my <= y + 11) ratio = 1; @@ -61,11 +61,14 @@ public class PageRuneRecipe extends PagePetalRecipe { HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaUsage(), TilePool.MAX_MANA / ratio); String ratioString = String.format(StatCollector.translateToLocal("botaniamisc.ratio"), ratio); - + String stopStr = StatCollector.translateToLocal("botaniamisc.shiftToStopSpin"); + boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); - font.drawString(ratioString, x + 100 - font.getStringWidth(ratioString), y + 5, 0x99000000); - font.setUnicodeFlag(unicode); GL11.glDisable(GL11.GL_BLEND); + font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000); + font.drawString(ratioString, x + 50 - font.getStringWidth(ratioString) / 2, y + 5, 0x99000000); + font.setUnicodeFlag(unicode); + GL11.glDisable(GL11.GL_BLEND); } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 843cbdf60..d67e6509a 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -47,7 +47,7 @@ botaniamisc.bookmark=Bookmark #%s botaniamisc.clickToSee=Click to read botaniamisc.shiftToRemove=Shift-click to remove botaniamisc.clickToAdd=Add Bookmark -botaniamisc.ratio=Zoom: %sx +botaniamisc.ratio=%sx Zoom (hover to zoom out) botaniamisc.bottleTooltip=It has an acquired taste botaniamisc.coarseDirt0=Coarse Dirt, grass botaniamisc.coarseDirt1=won't grow on it @@ -145,6 +145,8 @@ botaniamisc.changes5=&fLeft Click&7 to dismiss this botaniamisc.badArena=As hard as you try, the Beacon will not accept your sacrifice. You believe the ritual grounds might be improper. It might be a good idea to check for obstructions on the nearby area or large gaps on the floor. botaniamisc.tutorialText=Ingame botaniamisc.tutorialVideo=Video +botaniamisc.shiftToStopSpin=(SHIFT to stop animation) +botaniamisc.noVideo=Video will be back soon. Sorry :( # NEI INTEGRATION botania.nei.brewery=Botanical Brewery