From efcd6be2bb6fdfe75c4df2b25cb25c819bca857e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 14 Feb 2014 19:01:16 +0000 Subject: [PATCH] Daybloom + Bellethorne recipe and documentation. --- .../common/crafting/ModPetalRecipes.java | 10 ++++++++- .../botania/common/lexicon/LexiconData.java | 10 ++++++++- .../vazkii/botania/common/lib/LibLexicon.java | 3 ++- resources/assets/botania/lang/en_US.lang | 21 +++++++++++++++---- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index ea482a590..64ffc9a72 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -20,11 +20,19 @@ import vazkii.botania.common.lib.LibOreDict; public final class ModPetalRecipes { public static final String white = LibOreDict.PETAL[0], orange = LibOreDict.PETAL[1], magenta = LibOreDict.PETAL[2], lightBlue = LibOreDict.PETAL[3], yellow = LibOreDict.PETAL[4], lime = LibOreDict.PETAL[5], pink = LibOreDict.PETAL[6], gray = LibOreDict.PETAL[7], lightGray = LibOreDict.PETAL[8], cyan = LibOreDict.PETAL[9], purple = LibOreDict.PETAL[10], blue = LibOreDict.PETAL[11], brown = LibOreDict.PETAL[12], green = LibOreDict.PETAL[13], red = LibOreDict.PETAL[14], black = LibOreDict.PETAL[15]; + public static final String whiteMana = LibOreDict.MANA_PETAL[0], orangeMana = LibOreDict.MANA_PETAL[1], magentaMana = LibOreDict.MANA_PETAL[2], lightBlueMana = LibOreDict.MANA_PETAL[3], yellowMana = LibOreDict.MANA_PETAL[4], limeMana = LibOreDict.MANA_PETAL[5], pinkMana = LibOreDict.MANA_PETAL[6], grayMana = LibOreDict.MANA_PETAL[7], lightGrayMana = LibOreDict.MANA_PETAL[8], cyanMana = LibOreDict.MANA_PETAL[9], purpleMana = LibOreDict.MANA_PETAL[10], blueMana = LibOreDict.MANA_PETAL[11], brownMana = LibOreDict.MANA_PETAL[12], greenMana = LibOreDict.MANA_PETAL[13], redMana = LibOreDict.MANA_PETAL[14], blackMana = LibOreDict.MANA_PETAL[15]; public static RecipePetals pureDaisyRecipe; + + public static RecipePetals daybloomRecipe; + + public static RecipePetals bellethorneRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); + + daybloomRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), yellow, yellow, orange, orange, lightBlue); + + bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), redMana, redMana, cyan, cyan, red); } - } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index ae0952d9d..9188cb910 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -49,8 +49,10 @@ public final class LexiconData { public static LexiconEntry pool; public static LexiconEntry functionalIntro; + public static LexiconEntry bellethorne; public static LexiconEntry generatingIntro; + public static LexiconEntry daybloom; public static void init() { BotaniaAPI.addCategory(categoryBasics = new LexiconCategory(LibLexicon.CATEGORY_BASICS)); @@ -96,9 +98,15 @@ public final class LexiconData { functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); - // GENERATINg FLOWERS ENTRIES + bellethorne = new BLexiconEntry(LibLexicon.FFLOWER_BELLETHORNE, categoryFunctionalFlowers); + bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bellethorneRecipe)); + + // GENERATING FLOWERS ENTRIES generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); + + daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); + daybloom.setPriority().setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.daybloomRecipe)); } } diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index c6e799295..ab0e20146 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -35,8 +35,9 @@ public final class LibLexicon { public static final String MANA_POOL = "pool"; public static final String FFLOWER_INTRO = "fIntro"; + public static final String FFLOWER_BELLETHORNE = "bellethorne"; public static final String GFLOWER_INTRO = "gIntro"; - public static final String FFLOWER_DAYBLOOM = "daybloom"; + public static final String GFLOWER_DAYBLOOM = "daybloom"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 2e7bdfc9c..935785da7 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -228,7 +228,7 @@ botania.page.runeAltar18=The &1Rune of Pride&0. # - MANA # -- INTRODUCTION TO MANA -botania.entry.mIntro=Introduction to Mana +botania.entry.mIntro=An Introduction to Mana botania.page.mIntro0=&4Mana&0 is an ethereal substance, in layman's terms, it's a form of &4mystical energy&0. It's sensorial existance is inconstant, and it's color depends on the environment it's put on.
Mastering &4Mana&0 is one of the most important skills a botanist needs to master. botania.page.mIntro1=In order to create &4Mana&0, one would require a set of &4Generating Flowers&0 (read the respective section). This &4Mana&0 can be dispersed utilizing &1Mana Spreaders&0 and stored in &1Mana Pools&0. &4Mana&0 can be used for a myriad of different things, for starters, it can be used for &4Functional Flowers&0 (read the respective section). botania.page.mIntro2=To get started with mastering the art of &4Mana&0, one would start by learning how to use &1Dayblooms&0, &1Mana Spreaders&0 and &1Mana Pools&0.
These form a basic infrastructure for mana, which can be used for all sorts of purposes. Have a read at the &4Functional Flora&0 and &4Magical Apparatus&0 sections of this Lexicon. @@ -246,6 +246,7 @@ botania.page.spreader7=The basic lens, it doesn't do anything... botania.page.spreader8=&4Dying&0 lenses! botania.page.spreader9=&1Rainbow Lens&0 all the way +# -- MANA POOL botania.entry.pool=Mana Pool botania.page.pool0=The &1Mana Pool&0 is, simply put, a storage of &4Mana&0.
Mana can be inserted into it by usage of a &1Mana Spreader&0, and any adjacent &1Mana Spreaders&0 will pull mana from it to increase their internal buffer automatically.
Any &4Functional Flowers&0 require a nearby &1Mana Pool&0 to draw power from. botania.page.pool1=Making the &1Mana Pool&0. @@ -256,13 +257,25 @@ botania.page.pool5=Infusing &1Mana Diamonds&0 botania.page.pool6=Infusing &1Mana Petals&0 # - FUNCTIONAL FLOWERS -botania.entry.fIntro=Introduction to Function +# -- AN INTRODUCTION TO FUNCTION +botania.entry.fIntro=An Introduction to Function botania.page.fIntro0=There's various places to put in use the &4Mana&0 a botanist generates, one of them is an assortment of &4Functional Flowers&0.
These flowers will drain &4Mana&0 from a nearby &1Mana Pool&0 into themselves, in order to do whatever task they were created for.
It's to note that these can't receive power directly through &1Mana Spreaders&0. botania.page.fIntro1=All &4Functional Flowers&0, alike the &4Generating Flowers&0 contain a small buffer of &4Mana&0.
Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings. botania.page.fIntro2=It is important to keep in mind that these flowers have a memory for which &1Mana Pool&0 they should pull &4Mana&0 out of. They'll only pull from the nearest pool present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. +# -- BELLETHRONE +botania.entry.bellethorne=Bellethorne +botania.page.bellethorne0=The &1Bellethorne&0 is a malevelous flower. By utilizing &4Mana&0 it slowly inflicts harm in any living beings (save for &4players&0) around it. +botania.page.bellethorne1=Every rose has its thorn + # - GENERATING FLOWERS -botania.entry.gIntro=Introduction to Generation +# -- AN INTRODUCTION TO GENERATION +botania.entry.gIntro=An Introduction to Generation botania.page.gIntro0=&4Generating Mana&0 should be at the top of the priorities for any botanist. Luckilly there's an array of &4Generating Flowers&0 willing to do the job.
These flowers, as their name shows, generate &4Mana&0, both passively and actively. Unless stated otherwise, all &4Generating Flowers&0 generate &4Mana&0 passively under certain circunstances. botania.page.gIntro1=All &4Generating Flowers&0, alike the &4Functional Flowers&0 contain a small buffer of &4Mana&0.
Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings.
This mana will be stored in the closest &1Mana Spreader&0 around. -botania.page.gIntro2=It is important to keep in mind that these flowers have a memory for which &1Mana Spreader&0 they should put &4Mana&0 in. They'll only store into the nearest spreader present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. \ No newline at end of file +botania.page.gIntro2=It is important to keep in mind that these flowers have a memory for which &1Mana Spreader&0 they should put &4Mana&0 in. They'll only store into the nearest spreader present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. + +# -- DAYBLOOM +botania.entry.daybloom=Daybloom +botania.page.daybloom0=The &1Daybloom&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it preforms a modified photosythesis process, in order to transform sunlight into &4Mana&0. +botania.page.daybloom1=Starting up a brand new day \ No newline at end of file