diff --git a/MODSRC/vazkii/botania/api/LexiconEntry.java b/MODSRC/vazkii/botania/api/LexiconEntry.java index 9255a3d84..68e44aa71 100644 --- a/MODSRC/vazkii/botania/api/LexiconEntry.java +++ b/MODSRC/vazkii/botania/api/LexiconEntry.java @@ -31,6 +31,10 @@ public class LexiconEntry { this.unlocalizedName = unlocalizedName; } + public String getUnlocalizedName() { + return unlocalizedName; + } + /** * Sets what pages you want this entry to have. */ diff --git a/MODSRC/vazkii/botania/api/page/LexiconPage.java b/MODSRC/vazkii/botania/api/page/LexiconPage.java index 71dc1e1bd..6dd7998bb 100644 --- a/MODSRC/vazkii/botania/api/page/LexiconPage.java +++ b/MODSRC/vazkii/botania/api/page/LexiconPage.java @@ -15,7 +15,7 @@ import vazkii.botania.api.internal.IGuiLexiconEntry; public abstract class LexiconPage { - private final String unlocalizedName; + public String unlocalizedName; public LexiconPage(String unlocalizedName) { this.unlocalizedName = unlocalizedName; diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java b/MODSRC/vazkii/botania/client/gui/GuiLexicon.java index 5f8da4750..24a173ee0 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java +++ b/MODSRC/vazkii/botania/client/gui/GuiLexicon.java @@ -13,6 +13,7 @@ package vazkii.botania.client.gui; import java.util.List; +import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -39,8 +40,8 @@ public class GuiLexicon extends GuiScreen { left = width / 2 - guiWidth / 2; top = height / 2 - guiHeight / 2; + buttonList.clear(); if(isIndex()) { - buttonList.clear(); int x = 18; for(int i = 0; i < 12; i++) { int y = 16 + i * 12; @@ -57,12 +58,26 @@ public class GuiLexicon extends GuiScreen { drawTexturedModalRect(left, top, 0, 0, guiWidth, guiHeight); drawCenteredString(fontRenderer, getTitle(), left + guiWidth / 2, top - 12, 0x00FF00); + drawHeader(); + + super.drawScreen(par1, par2, par3); + } + + void drawHeader() { boolean unicode = fontRenderer.getUnicodeFlag(); fontRenderer.setUnicodeFlag(true); fontRenderer.drawSplitString(StatCollector.translateToLocal("botania.gui.lexicon.header"), left + 15, top + 20, 110, 0); fontRenderer.setUnicodeFlag(unicode); - - super.drawScreen(par1, par2, par3); + } + + @Override + protected void actionPerformed(GuiButton par1GuiButton) { + int i = par1GuiButton.id - 3; + List categoryList = BotaniaAPI.getAllCategories(); + LexiconCategory category = i >= categoryList.size() ? null : categoryList.get(i); + + if(category != null) + mc.displayGuiScreen(new GuiLexiconIndex(category)); } String getTitle() { diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java b/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java index a809dca3b..2a35b3d8e 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java +++ b/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java @@ -11,11 +11,50 @@ */ package vazkii.botania.client.gui; +import java.util.List; + +import net.minecraft.util.StatCollector; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.LexiconCategory; +import vazkii.botania.api.LexiconEntry; +import vazkii.botania.client.gui.button.GuiButtonBack; +import vazkii.botania.client.gui.button.GuiButtonInvisible; + public class GuiLexiconIndex extends GuiLexicon { + LexiconCategory category; + String title; + + public GuiLexiconIndex(LexiconCategory category) { + this.category = category; + title = StatCollector.translateToLocal(category.getUnlocalizedName()); + } + @Override - public void drawScreen(int par1, int par2, float par3) { - super.drawScreen(par1, par2, par3); + void drawHeader() { + // NO-OP } + @Override + String getTitle() { + return title; + } + + @Override + public void initGui() { + super.initGui(); + buttonList.add(new GuiButtonBack(12, left + guiWidth / 2 - 8, top + guiHeight + 2)); + } + + @Override + void populateIndex() { + List entryList = category.entries; + for(int i = 0; i < 12; i++) { + GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i); + LexiconEntry entry = i >= entryList.size() ? null : entryList.get(i); + if(entry != null) + button.displayString = " " + StatCollector.translateToLocal(entry.getUnlocalizedName()); + else button.displayString = ""; + } + } } diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java b/MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java new file mode 100644 index 000000000..de4c3125c --- /dev/null +++ b/MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java @@ -0,0 +1,33 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 14, 2014, 9:54:21 PM (GMT)] + */ +package vazkii.botania.client.gui.button; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.client.gui.GuiLexicon; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; + +public class GuiButtonBack extends GuiButton { + + public GuiButtonBack(int par1, int par2, int par3) { + super(par1, par2, par3, 18, 9, ""); + } + + @Override + public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); + GL11.glColor4f(1F, 1F, 1F, 1F); + drawTexturedModalRect(xPosition, yPosition, 36, 180, 18, 9); + } + +} diff --git a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java index 1a4fea7aa..170e8793a 100644 --- a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -13,7 +13,7 @@ package vazkii.botania.common.core.handler; import vazkii.botania.api.internal.IInternalMethodHandler; import vazkii.botania.api.page.LexiconPage; -import vazkii.botania.common.page.PageText; +import vazkii.botania.common.lexicon.page.PageText; public class InternalMethodHandler implements IInternalMethodHandler { diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index 090eeeec6..fb5d250bc 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -17,8 +17,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; -import vazkii.botania.common.page.LexiconData; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; diff --git a/MODSRC/vazkii/botania/common/lexicon/BLexiconEntry.java b/MODSRC/vazkii/botania/common/lexicon/BLexiconEntry.java new file mode 100644 index 000000000..dba0de263 --- /dev/null +++ b/MODSRC/vazkii/botania/common/lexicon/BLexiconEntry.java @@ -0,0 +1,39 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 14, 2014, 9:47:21 PM (GMT)] + */ +package vazkii.botania.common.lexicon; + +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.LexiconCategory; +import vazkii.botania.api.LexiconEntry; +import vazkii.botania.api.page.LexiconPage; + +public class BLexiconEntry extends LexiconEntry { + + public BLexiconEntry(String unlocalizedName, LexiconCategory category) { + super(unlocalizedName); + BotaniaAPI.addEntry(this, category); + } + + @Override + public void setLexiconPages(LexiconPage... pages) { + for(LexiconPage page : pages) + page.unlocalizedName = "botania.page." + getUnlocalizedName() + page.unlocalizedName; + + super.setLexiconPages(pages); + } + + @Override + public String getUnlocalizedName() { + return "botania.entry." + super.getUnlocalizedName(); + } + +} diff --git a/MODSRC/vazkii/botania/common/page/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java similarity index 69% rename from MODSRC/vazkii/botania/common/page/LexiconData.java rename to MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 32adbdef6..6c6ce6fc8 100644 --- a/MODSRC/vazkii/botania/common/page/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -9,10 +9,12 @@ * * File Created @ [Jan 14, 2014, 9:12:15 PM (GMT)] */ -package vazkii.botania.common.page; +package vazkii.botania.common.lexicon; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.LexiconCategory; +import vazkii.botania.api.LexiconEntry; +import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; public final class LexiconData { @@ -32,7 +34,27 @@ public final class LexiconData { BotaniaAPI.addCategory(categoryTools = new LexiconCategory(LibLexicon.CATEGORY_TOOLS)); BotaniaAPI.addCategory(categoryMisc = new LexiconCategory(LibLexicon.CATEGORY_MISC)); + LexiconEntry entry; + // BASICS ENTRIES + entry = new BLexiconEntry("world", categoryBasics); + entry.setLexiconPages(new PageText("0"), new PageText("1")); + + entry = new BLexiconEntry("basicConcepts", categoryBasics); + entry.setLexiconPages(new PageText("0")); + + entry = new BLexiconEntry("gettingStarted", categoryBasics); + entry.setLexiconPages(new PageText("0")); + + // ENERGY ENTRIES + + // FLOWERS ENTRIES + + // DEVICES ENTRIES + + // TOOLS ENTRIES + + // MISC ENTRIES } } diff --git a/MODSRC/vazkii/botania/common/page/PageText.java b/MODSRC/vazkii/botania/common/lexicon/page/PageText.java similarity index 94% rename from MODSRC/vazkii/botania/common/page/PageText.java rename to MODSRC/vazkii/botania/common/lexicon/page/PageText.java index fb2dcbef6..3156f1e39 100644 --- a/MODSRC/vazkii/botania/common/page/PageText.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageText.java @@ -9,7 +9,7 @@ * * File Created @ [Jan 14, 2014, 6:45:33 PM (GMT)] */ -package vazkii.botania.common.page; +package vazkii.botania.common.lexicon.page; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.page.LexiconPage; diff --git a/MODSRC/vazkii/botania/common/network/GuiHandler.java b/MODSRC/vazkii/botania/common/network/GuiHandler.java index de47d10f0..688afbeff 100644 --- a/MODSRC/vazkii/botania/common/network/GuiHandler.java +++ b/MODSRC/vazkii/botania/common/network/GuiHandler.java @@ -11,10 +11,10 @@ */ package vazkii.botania.common.network; -import vazkii.botania.client.gui.GuiLexiconIndex; -import vazkii.botania.common.lib.LibGuiIDs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import vazkii.botania.client.gui.GuiLexicon; +import vazkii.botania.common.lib.LibGuiIDs; import cpw.mods.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { @@ -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 GuiLexiconIndex(); + return new GuiLexicon(); } return null; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 7f6ec2137..dc968c14f 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -15,4 +15,9 @@ botania.category.energy=Energy and Mana botania.category.flowers=Magical Flora botania.category.devices=Natural Apparatus botania.category.tools=Mystical Instruments -botania.category.misc=Miscellaneous \ No newline at end of file +botania.category.misc=Miscellaneous + +# LEXICON ENTRIES +botania.entry.world=The World +botania.entry.basicConcepts=Basic Concepts +botania.entry.gettingStarted=Getting Started \ No newline at end of file