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 d33987cdb..a1f778256 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -35,10 +35,13 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.proxy.ClientProxy; +import vazkii.botania.client.gui.GuiBotaniaConfig; import vazkii.botania.client.gui.lexicon.button.GuiButtonBookmark; import vazkii.botania.client.gui.lexicon.button.GuiButtonCategory; import vazkii.botania.client.gui.lexicon.button.GuiButtonHistory; import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; +import vazkii.botania.client.gui.lexicon.button.GuiButtonLexicon; +import vazkii.botania.client.gui.lexicon.button.GuiButtonOptions; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.SheddingHandler; import vazkii.botania.common.item.ItemLexicon; @@ -50,7 +53,7 @@ public class GuiLexicon extends GuiScreen { public static ItemStack stackUsed; private static final int[] KONAMI_CODE = { 200, 200, 208, 208, 203, 205, 203, 205, 48, 30 }; - + public static final int BOOKMARK_START = 1337; public static final int MAX_BOOKMARK_COUNT = 8; public static List bookmarks = new ArrayList(); @@ -121,6 +124,9 @@ public class GuiLexicon extends GuiScreen { } } populateBookmarks(); + if(isMainPage()) + buttonList.add(new GuiButtonOptions(-1, left, top)); + } @Override @@ -222,7 +228,7 @@ public class GuiLexicon extends GuiScreen { fontRendererObj.drawSplitString(String.format(StatCollector.translateToLocal("botania.gui.lexicon.header"), ItemLexicon.getEdition()), left + 18, top + 12, 110, 0); fontRendererObj.setUnicodeFlag(unicode); } - + boolean isMainPage() { return true; } @@ -239,7 +245,8 @@ public class GuiLexicon extends GuiScreen { mc.displayGuiScreen(new GuiLexiconIndex(category)); ClientTickHandler.notifyPageChange(); - } + } else if(par1GuiButton.id == -1) + mc.displayGuiScreen(new GuiBotaniaConfig(this)); } public void handleBookmark(GuiButton par1GuiButton) { @@ -333,7 +340,7 @@ public class GuiLexicon extends GuiScreen { GuiLexicon gui = isAdd ? null : bookmarks.get(i); buttonList.add(new GuiButtonBookmark(BOOKMARK_START + i, left + 138, top + 18 + 14 * i, gui == null ? this : gui, gui == null ? "+" : gui.getTitle())); } - + if(isMainPage()) buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, StatCollector.translateToLocal("botaniamisc.history"), this)); } @@ -419,11 +426,11 @@ public class GuiLexicon extends GuiScreen { return true; return BotaniaAPI.getAllCategories().contains(indexGui.category); } - + GuiLexiconEntry entryGui = (GuiLexiconEntry) gui; if(!BotaniaAPI.getAllEntries().contains(entryGui.entry)) return false; - + return entryGui.page < entryGui.entry.pages.size(); } } 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 38cc668d9..7543d1c3d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -27,6 +27,7 @@ import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.gui.GuiBotaniaConfig; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java new file mode 100644 index 000000000..caec83f86 --- /dev/null +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -0,0 +1,49 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 6, 2015, 1:14:05 PM (GMT)] + */ +package vazkii.botania.client.gui.lexicon.button; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.gui.lexicon.GuiLexicon; + +public class GuiButtonOptions extends GuiButtonLexicon { + + public GuiButtonOptions(int id, int x, int y) { + super(id, x, y, 11, 11, ""); + } + + @Override + public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(field_146123_n); + + par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); + GL11.glColor4f(1F, 1F, 1F, 1F); + drawTexturedModalRect(xPosition, yPosition, k == 2 ? 110 : 99, 180, 11, 11); + + List tooltip = new ArrayList(); + for(int i = 0; i < 3; i++) + tooltip.add((i == 0 ? EnumChatFormatting.RED : EnumChatFormatting.GRAY) + StatCollector.translateToLocal("botaniamisc.lexiconOptions" + i)); + + int tooltipY = (tooltip.size() - 1) * 10; + if(k == 2) + RenderHelper.renderTooltip(par2, par3 + tooltipY, tooltip); + } + +} diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 679fd9bc0..9f7eb8e91 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -90,6 +90,9 @@ botaniamisc.viewOnline=View Online botaniamisc.history=History botaniamisc.historyLong=Lookup History botaniamisc.historyDesc=See the last entries visited +botaniamisc.lexiconOptions0=Botania Options +botaniamisc.lexiconOptions1=Configure Botania from ingame +botaniamisc.lexiconOptions2=Some options might need a game restart # NEI INTEGRATION botania.nei.brewery=Botanical Brewery diff --git a/src/main/resources/assets/botania/textures/gui/lexicon.png b/src/main/resources/assets/botania/textures/gui/lexicon.png index e32a8f56d..0cb26f31e 100644 Binary files a/src/main/resources/assets/botania/textures/gui/lexicon.png and b/src/main/resources/assets/botania/textures/gui/lexicon.png differ