From 098bba42d6eeb0f542a7dc96ea45d2ff1c7f9fd0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 7 Jun 2014 13:52:23 +0100 Subject: [PATCH] Recipe/docs for the Manastar. --- .../botania/common/block/subtile/SubTileManastar.java | 7 +++++++ MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java | 4 +++- MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 4 ++++ MODSRC/vazkii/botania/common/lib/LibLexicon.java | 1 + resources/assets/botania/lang/en_US.lang | 5 +++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/MODSRC/vazkii/botania/common/block/subtile/SubTileManastar.java b/MODSRC/vazkii/botania/common/block/subtile/SubTileManastar.java index 418740f3a..c0db40890 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/MODSRC/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -13,9 +13,11 @@ package vazkii.botania.common.block.subtile; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.Botania; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileManastar extends SubTileEntity { @@ -45,4 +47,9 @@ public class SubTileManastar extends SubTileEntity { manaLastTick = mana; } + @Override + public LexiconEntry getEntry() { + return LexiconData.manastar; + } + } diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index fe7712580..c8c963735 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -25,6 +25,7 @@ public final class ModPetalRecipes { public static final String redstoneRoot = LibOreDict.REDSTONE_ROOT; public static RecipePetals pureDaisyRecipe; + public static RecipePetals manastarRecipe; public static RecipePetals daybloomRecipe; public static RecipePetals nightshadeRecipe; @@ -54,7 +55,8 @@ public final class ModPetalRecipes { public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); - + manastarRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MANASTAR), lightBlueMana, greenMana, redMana, cyanMana); + daybloomRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), yellow, yellow, orange, lightBlue); nightshadeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE), black, black, purple, gray); endoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), brown, red, redMana, brownMana, lightGray); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 8355d0acd..14320c677 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -71,6 +71,7 @@ public final class LexiconData { public static LexiconEntry manaDetector; public static LexiconEntry compositeLens; public static LexiconEntry redstoneSpreader; + public static LexiconEntry manastar; public static LexiconEntry functionalIntro; public static LexiconEntry jadedAmaranthus; @@ -238,6 +239,9 @@ public final class LexiconData { redstoneSpreader = new BLexiconEntry(LibLexicon.MANA_REDSTONE_SPREADER, categoryMana); redstoneSpreader.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeRedstoneSpreader)); + manastar = new BLexiconEntry(LibLexicon.MANA_MANASTAR, categoryMana); + manastar.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.manastarRecipe)); + // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCrafingRecipes.recipeRedstoneRoot)); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 4fd4e91c6..689303b9c 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -52,6 +52,7 @@ public final class LibLexicon { public static final String MANA_DETECTOR = "manaDetector"; public static final String MANA_COMPOSITE_LENS = "compositeLens"; public static final String MANA_REDSTONE_SPREADER = "redstoneSpreader"; + public static final String MANA_MANASTAR = "manastar"; public static final String FFLOWER_INTRO = "fIntro"; public static final String FFLOWER_JADED_AMARANTHUS = "jadedAmaranthus"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 28dcf7d95..e514eff98 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -585,6 +585,11 @@ botania.entry.redstoneSpreader=Redstone Mana Spreader botania.page.redstoneSpreader0=By combining a &1Mana Spreader&0 with a piece of &1Redstone&0, it's possible to create a &1Redstone Mana Spreader&0, which fires only when given a &4Redstone signal&0, regardless of having a block in the end to put the mana or not.
It's to keep in note that this doesn't let the spreader shoot a burst until the last one dissipates or is absorbed. botania.page.redstoneSpreader1=Just add redstone +# -- MANASTAR +botania.entry.manastar=Manastar +botania.page.manastar0=The imprecise measurements of the &1Wand of the Forest&0 sometimes won't cut it for telling if you're turning a profit or loss in your &1Mana Pools&0.
Creating a &1Manastar&0 and placing it next to your pools will have it shine red if there's a loss or blue if there's a profit. The measurement happens every few seconds. +botania.page.manastar1=&rI'm a shooting star leaping through the skies&r. + # - FUNCTIONAL FLOWERS # -- AN INTRODUCTION TO FUNCTION botania.entry.fIntro=An Introduction to Function