diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index e09ebfcb9..76ffd5e1f 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -79,6 +79,10 @@ public class LexiconEntry implements Comparable { return unlocalizedName; } + public String getTagline() { + return null; // Override this if you want a tagline. You probably do + } + @SideOnly(Side.CLIENT) public boolean isVisible() { return true; @@ -119,6 +123,33 @@ public class LexiconEntry implements Comparable { return (priority ? 0 : 1) + StatCollector.translateToLocal(getUnlocalizedName()); } + public List getDisplayedRecipes() { + ArrayList list = new ArrayList(); + for(LexiconPage page : pages) { + List l = page.getDisplayedRecipes(); + + if(l != null) { + ArrayList itemsAddedThisPage = new ArrayList(); + + for(ItemStack s : l) { + addItem: { + for(ItemStack s1 : itemsAddedThisPage) + if(s1.getItem() == s.getItem()) + break addItem; + for(ItemStack s1 : list) + if(s1.isItemEqual(s) && ItemStack.areItemStackTagsEqual(s1, s)) + break addItem; + + itemsAddedThisPage.add(s); + list.add(s); + } + } + } + } + + return list; + } + @Override public int compareTo(LexiconEntry o) { return getNameForSorting().compareTo(o.getNameForSorting()); diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index e0982e7ac..20e097af9 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -10,7 +10,11 @@ */ package vazkii.botania.api.lexicon; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.gui.GuiButton; +import net.minecraft.item.ItemStack; import vazkii.botania.api.internal.IGuiLexiconEntry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -90,6 +94,14 @@ public abstract class LexiconPage { public void onPageAdded(LexiconEntry entry, int index) { // NO-OP } + + /** + * Shows the list of recipes present in this page for display in the category + * page. Can return null for an entry with no recipes. + */ + public List getDisplayedRecipes() { + return null; + } public String getUnlocalizedName() { return unlocalizedName; diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 2817f4759..8e04316ab 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,3 @@ -@API(owner = "Botania", apiVersion = "65", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "66", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; - 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 372bcd496..2543062a9 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -144,7 +144,7 @@ public class GuiLexicon extends GuiScreen { int x = 18; for(int i = 0; i < 12; i++) { int y = 16 + i * 12; - buttonList.add(new GuiButtonInvisible(this, i, left + x, top + y, 110, 10, "")); + buttonList.add(new GuiButtonInvisible((GuiLexiconIndex) this, i, left + x, top + y, 110, 10, "")); } populateIndex(); } else if(isCategoryIndex()) { @@ -290,6 +290,10 @@ public class GuiLexicon extends GuiScreen { } public void drawBookmark(int x, int y, String s, boolean drawLeft) { + drawBookmark(x, y, s, drawLeft, 0x111111); + } + + public void drawBookmark(int x, int y, String s, boolean drawLeft, int color) { // This function is called from the buttons so I can't use fontRendererObj FontRenderer font = Minecraft.getMinecraft().fontRenderer; boolean unicode = font.getUnicodeFlag(); @@ -311,7 +315,7 @@ public class GuiLexicon extends GuiScreen { for(int i = 0; i < l + 6; i++) drawTexturedModalRect(x - l / 2 - 3 + i, y - 1, 60, 180, 1, 11); - font.drawString(s, x - l / 2 + fontOff, y, 0x111111, false); + font.drawString(s, x - l / 2 + fontOff, y, color, false); font.setUnicodeFlag(unicode); } 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 7833f73e5..bf135175c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -14,14 +14,19 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; @@ -46,7 +51,11 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { GuiButton leftButton, rightButton, backButton; GuiLexicon parent; GuiTextField searchField; - + + GuiButton currentButton; + LexiconEntry currentEntry; + float infoTime; + List entriesToDisplay = new ArrayList(); public GuiLexiconIndex() { @@ -137,6 +146,13 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } else button.displayString = ""; } } + + public void setHoveredButton(GuiButtonInvisible b) { + if(b == null) + currentEntry = null; + else currentEntry = entriesToDisplay.get(b.id + page * 12); + currentButton = b; + } @Override public void drawScreen(int par1, int par2, float par3) { @@ -154,6 +170,52 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { mc.fontRenderer.drawString(s, left + 120 - mc.fontRenderer.getStringWidth(s), top + guiHeight - 18, 0x666666); mc.fontRenderer.setUnicodeFlag(unicode); } + + float animationTime = 4F; + if(isShiftKeyDown()) { + if(currentButton != null) + infoTime = Math.min(animationTime, infoTime + timeDelta); + } else infoTime = Math.max(0, infoTime - timeDelta); + + if(currentButton != null && infoTime > 0) { + float fract = infoTime / animationTime; + + int x = currentButton.xPosition; + int y = currentButton.yPosition; + String s = StatCollector.translateToLocal(currentEntry.getTagline()); + boolean unicode = mc.fontRenderer.getUnicodeFlag(); + mc.fontRenderer.setUnicodeFlag(true); + int width = mc.fontRenderer.getStringWidth(s); + + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, 0); + GL11.glScalef(fract, 1F, 1F); + Gui.drawRect(12, -30, width + 20, -2, 0x44000000); + Gui.drawRect(10, -32, width + 22, -2, 0x44000000); + drawBookmark(width / 2 + 16, -8, s, true, 0xFFFFFF); + mc.fontRenderer.setUnicodeFlag(unicode); + + net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + ItemStack paper = new ItemStack(Items.paper, currentEntry.pages.size()); + + 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++) { + ItemStack stack = stacks.get(i); + RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 38 + spaceForEach * i, -28); + } + } + + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); + + GL11.glPopMatrix(); + setHoveredButton(null); + } } @Override @@ -369,3 +431,4 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { return "category_" + (category == null ? "lexindex" : category.unlocalizedName); } } + diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 61619b135..6a2ee2df4 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -20,16 +20,16 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.FontHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; +import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; import vazkii.botania.common.lib.LibMisc; public class GuiButtonInvisible extends GuiButtonLexicon { - GuiLexicon gui; + GuiLexiconIndex gui; public ItemStack displayStack = null; float timeHover = 0; - public GuiButtonInvisible(GuiLexicon gui, int par1, int par2, int par3, int par4, int par5, String par6Str) { + public GuiButtonInvisible(GuiLexiconIndex gui, int par1, int par2, int par3, int par4, int par5, String par6Str) { super(par1, par2, par3, par4, par5, par6Str); this.gui = gui; } @@ -40,10 +40,11 @@ public class GuiButtonInvisible extends GuiButtonLexicon { field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(field_146123_n); boolean showStack = displayStack != null && !displayString.isEmpty(); - - if(!displayString.isEmpty() && k == 2) + + if(!displayString.isEmpty() && k == 2) { timeHover = Math.min(5, timeHover + gui.timeDelta); - else timeHover = Math.max(0, timeHover - gui.timeDelta); + gui.setHoveredButton(this); + } else timeHover = Math.max(0, timeHover - gui.timeDelta); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java index dd00fa99a..e52897171 100644 --- a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java @@ -40,6 +40,11 @@ public class BLexiconEntry extends LexiconEntry { public String getUnlocalizedName() { return "botania.entry." + super.getUnlocalizedName(); } + + @Override + public String getTagline() { + return "botania.tagline." + super.getUnlocalizedName(); + } public String getLazyUnlocalizedName() { return super.getUnlocalizedName(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 6edf24884..47cb7e845 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -96,6 +96,13 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { renderItem(gui, xPos, yPos, stack1, false); } + @Override + public List getDisplayedRecipes() { + ArrayList list = new ArrayList(); + list.add(recipe.getOutput(new ItemStack(ModItems.vial))); + return list; + } + @Override public void setSecondUnlocalizedName(String name) { text = name; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 6f316fcd5..27db99c80 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -177,4 +177,13 @@ public class PageCraftingRecipe extends PageRecipe { renderItemAtGridPos(gui, 2, 0, recipe.getRecipeOutput(), false); } + + @Override + public List getDisplayedRecipes() { + ArrayList list = new ArrayList(); + for(IRecipe r : recipes) + list.add(r.getRecipeOutput()); + + return list; + } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 1d2061990..4960c9e2a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -1,5 +1,6 @@ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -107,5 +108,14 @@ public class PageElvenRecipe extends PageRecipe { } ++ticksElapsed; } + + @Override + public List getDisplayedRecipes() { + ArrayList list = new ArrayList(); + for(RecipeElvenTrade r : recipes) + list.add(r.getOutput()); + + return list; + } } 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 76dd9f8aa..ecea44194 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -147,4 +148,13 @@ public class PageManaInfusionRecipe extends PageRecipe { ++ticksElapsed; } + @Override + public List getDisplayedRecipes() { + ArrayList list = new ArrayList(); + for(RecipeManaInfusion r : recipes) + list.add(r.getOutput()); + + return list; + } + } 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 40e48cd4c..4dda8cbc2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -25,6 +26,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; @@ -94,6 +96,8 @@ public class PagePetalRecipe extends PageRecipe { return new ItemStack(ModBlocks.altar); } + + @SideOnly(Side.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { // NO-OP @@ -110,5 +114,14 @@ public class PagePetalRecipe extends PageRecipe { } ++ticksElapsed; } - + + @Override + public List getDisplayedRecipes() { + ArrayList list = new ArrayList(); + for(T r : recipes) + list.add(r.getOutput()); + + return list; + } + } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 9914fc988..7ba683c6d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -145,4 +145,11 @@ public class PageShedding extends PageEntity { GL11.glDisable(GL11.GL_LIGHTING); } + @Override + public List getDisplayedRecipes() { + ArrayList list = new ArrayList(); + list.add(shedStack); + return list; + } + } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java index 941797f3a..c23f15a0e 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -10,6 +10,9 @@ */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -84,5 +87,12 @@ public class PageTerrasteel extends PageRecipe { public void onPageAdded(LexiconEntry entry, int index) { LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 4), entry, index); } + + @Override + public List getDisplayedRecipes() { + ArrayList list = new ArrayList(); + list.add(new ItemStack(ModItems.manaResource, 1, 4)); + return super.getDisplayedRecipes(); + } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index b7e227669..3bce597ba 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1916,12 +1916,10 @@ botania.page.welcome8=&oDear reader, I welcome you to the realm of Botania.&r
The protection and regenerability of the armor works alongside the Goggles' abilities, but the &4Vis&0 discount is lost. botania.page.tcIntegration2=Helmets of Revealing (works with any Botania helm) @@ -3736,11 +3734,11 @@ botania.page.tcIntegration6b=The official frowny face # -- BUILDCRAFT INTEGRATION botania.entry.bcIntegration=Buildcraft Integration -botania.entry.bcIntegration=Gates for interaction with Botania +botania.tagline.bcIntegration=Gates for interaction with Botania botania.page.bcIntegration0=Recent advances in piping technology have allowed &1Gates&0 to get a feel of the &4Mana&0 around them. A &1Gate&0 can now sense whether a &4Mana&0 container is empty, full or if it contains any mana.
&1Gates&0 can also use the &1Mana Detector&0 trigger to detect if a mana is passing by the pipe block. In addition, they can also sense when a &1Runic Altar&0 is ready to create runes. # -- BANNER ADDITIONS botania.entry.banners=Banner Additions -botania.entry.banners=Lots of new banner patterns +botania.tagline.banners=Lots of new banner patterns botania.page.banners0=In the presence of the &1Banners&0 from the future, &1Botania&0 adds &415&0 new icons to them, which can be mixed and matched with the original patterns and icons.
The following items can be used alongside a dye in the crafting grid to add an icon to a &1Banner&0: &1All Iron Tools&0, &1Spark Augments&0, &1Raw Fish&0, &1Livingwood and Dreamwood Twigs&0, &1Lexica Botania&0, &1Terrasteel&0 and the &1Tiny Potato&0. botania.page.banners1=Showcase of the various banners