From 201f1d04015b0a027adf2f375fb7c0358e132b7d Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 20 Jan 2014 15:28:45 +0000 Subject: [PATCH] Some Lexicon GUI tweaks, both visual and functional. --- MODSRC/vazkii/botania/client/gui/GuiLexicon.java | 6 +++++- MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java | 2 +- .../botania/client/gui/button/GuiButtonInvisible.java | 2 +- MODSRC/vazkii/botania/common/network/GuiHandler.java | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java b/MODSRC/vazkii/botania/client/gui/GuiLexicon.java index 36e983764..339500db5 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java +++ b/MODSRC/vazkii/botania/client/gui/GuiLexicon.java @@ -28,6 +28,8 @@ import vazkii.botania.common.item.ModItems; public class GuiLexicon extends GuiScreen { + public static GuiLexicon currentOpenLexicon = new GuiLexicon(); + public static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_LEXICON); int guiWidth = 146; @@ -37,6 +39,8 @@ public class GuiLexicon extends GuiScreen { @Override public void initGui() { super.initGui(); + currentOpenLexicon = this; + left = width / 2 - guiWidth / 2; top = height / 2 - guiHeight / 2; @@ -98,7 +102,7 @@ public class GuiLexicon extends GuiScreen { GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i); LexiconCategory category = i_ >= categoryList.size() ? null : categoryList.get(i_); if(category != null) - button.displayString = " " + StatCollector.translateToLocal(category.getUnlocalizedName()); + button.displayString = StatCollector.translateToLocal(category.getUnlocalizedName()); else button.displayString = ""; } } diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java b/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java index f5360c4bd..5ab8b3f78 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java +++ b/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java @@ -54,7 +54,7 @@ public class GuiLexiconIndex extends GuiLexicon { GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i); LexiconEntry entry = i >= entryList.size() ? null : entryList.get(i); if(entry != null) - button.displayString = " " + StatCollector.translateToLocal(entry.getUnlocalizedName()); + button.displayString = StatCollector.translateToLocal(entry.getUnlocalizedName()); else button.displayString = ""; } } diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonInvisible.java b/MODSRC/vazkii/botania/client/gui/button/GuiButtonInvisible.java index f0356d16d..7bcd5fcc4 100644 --- a/MODSRC/vazkii/botania/client/gui/button/GuiButtonInvisible.java +++ b/MODSRC/vazkii/botania/client/gui/button/GuiButtonInvisible.java @@ -28,7 +28,7 @@ public class GuiButtonInvisible extends GuiButton { boolean unicode = par1Minecraft.fontRenderer.getUnicodeFlag(); par1Minecraft.fontRenderer.setUnicodeFlag(true); - par1Minecraft.fontRenderer.drawString((k == 2 ? EnumChatFormatting.BOLD : "") + displayString, xPosition/* + (k == 2 ? 5 : 0)*/, yPosition + (height - 8) / 2, 0); + par1Minecraft.fontRenderer.drawString(displayString, xPosition + (k == 2 ? 5 : 0), yPosition + (height - 8) / 2, 0); par1Minecraft.fontRenderer.setUnicodeFlag(unicode); } diff --git a/MODSRC/vazkii/botania/common/network/GuiHandler.java b/MODSRC/vazkii/botania/common/network/GuiHandler.java index 1c9a50a93..f9e172cd8 100644 --- a/MODSRC/vazkii/botania/common/network/GuiHandler.java +++ b/MODSRC/vazkii/botania/common/network/GuiHandler.java @@ -28,7 +28,7 @@ public class GuiHandler implements IGuiHandler { public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { switch(ID) { case LibGuiIDs.LEXICON : - return new GuiLexicon(); + return GuiLexicon.currentOpenLexicon; } return null;