From cd872efb8f3f0176add5744f427672fc733f0b96 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 15 Apr 2014 01:51:47 +0100 Subject: [PATCH] Recipes/docs for the new flowers. --- .../block/subtile/functional/SubTileJiyuulia.java | 6 ++++++ .../subtile/functional/SubTileTangleberrie.java | 7 +++++++ .../botania/common/crafting/ModPetalRecipes.java | 4 ++++ .../botania/common/lexicon/LexiconData.java | 8 ++++++++ MODSRC/vazkii/botania/common/lib/LibLexicon.java | 2 ++ resources/assets/botania/lang/en_US.lang | 15 ++++++++++++--- 6 files changed, 39 insertions(+), 3 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java index f54220e13..76059edb8 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java @@ -17,10 +17,12 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.lexicon.LexiconData; public class SubTileJiyuulia extends SubTileTangleberrie { @@ -44,5 +46,9 @@ public class SubTileJiyuulia extends SubTileTangleberrie { return 0xBD9ACA; } + @Override + public LexiconEntry getEntry() { + return LexiconData.jiyuulia; + } } diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 7f7a2f404..73c51552f 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -17,10 +17,12 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.lexicon.LexiconData; public class SubTileTangleberrie extends SubTileFunctional { @@ -84,5 +86,10 @@ public class SubTileTangleberrie extends SubTileFunctional { public int getMaxMana() { return 20; } + + @Override + public LexiconEntry getEntry() { + return LexiconData.tangleberrie; + } } diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index e6de1c3a6..021d18b3d 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -41,6 +41,8 @@ public final class ModPetalRecipes { public static RecipePetals exoflameRecipe; public static RecipePetals agricarnationRecipe; public static RecipePetals hopperhockRecipe; + public static RecipePetals tangleberrieRecipe; + public static RecipePetals jiyuuliaRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); @@ -61,5 +63,7 @@ public final class ModPetalRecipes { exoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_EXOFLAME), red, redMana, redMana, gray, lightGray, runeFire, runeSummer); agricarnationRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_AGRICARNATION), redMana, yellow, greenMana, lime, lime, limeMana, runeSpring); hopperhockRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HOPPERHOCK), gray, grayMana, lightGray, lightGrayMana, runeAir); + tangleberrieRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_TANGLEBERRIE), grayMana, lightGrayMana, cyanMana, cyan, runeAir, runeEarth); + jiyuuliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JIYUULIA), pinkMana, purpleMana, lightGrayMana, pink, runeWater, runeAir); } } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 1fd513983..75931fd6a 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -80,6 +80,8 @@ public final class LexiconData { public static LexiconEntry exoflame; public static LexiconEntry agricarnation; public static LexiconEntry hopperhock; + public static LexiconEntry tangleberrie; + public static LexiconEntry jiyuulia; public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; @@ -235,6 +237,12 @@ public final class LexiconData { hopperhock = new BLexiconEntry(LibLexicon.FFLOWER_HOPPERHOCK, categoryFunctionalFlowers); hopperhock.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.hopperhockRecipe)); + tangleberrie = new BLexiconEntry(LibLexicon.FFLOWER_TANGLEBERRIE, categoryFunctionalFlowers); + tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tangleberrieRecipe)); + + jiyuulia = new BLexiconEntry(LibLexicon.FFLOWER_JIYUULIA, categoryFunctionalFlowers); + jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jiyuuliaRecipe)); + // GENERATING FLOWERS ENTRIES generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 4f210685b..d40f44784 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -62,6 +62,8 @@ public final class LibLexicon { public static final String FFLOWER_EXOFLAME = "exoflame"; public static final String FFLOWER_AGRICARNATION = "agricarnation"; public static final String FFLOWER_HOPPERHOCK = "hopperhock"; + public static final String FFLOWER_TANGLEBERRIE = "tangleberrie"; + public static final String FFLOWER_JIYUULIA = "jiyuulia"; public static final String GFLOWER_INTRO = "gIntro"; 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 8d9cade9e..449046271 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -158,7 +158,6 @@ tile.botania:flower.jiyuulia.name=Jiyuulia tile.botania:flower.jiyuulia.reference=Flugel der Freiheit # TRANSLATE THAT VEXATOS - # ITEM NAMES item.botania:lexicon.name=Lexica Botania item.botania:petal0.name=Mystical White Petal @@ -526,13 +525,23 @@ botania.page.exoflame1=&oBut we should be going nowhere fast&r. # -- AGRICARNATION botania.entry.agricarnation=Agricarnation botania.page.agricarnation0=The slow growth of crops is always a problem to feed the masses. The &1Agricarnation&0 is a flower that turns &4Mana&0 into a type of natural fertilizer, causing nearby plantlife to grow at a faster rate. -botania.page.agricarnation1=&0Grandola Vila Morena&r... +botania.page.agricarnation1=&oGrandola Vila Morena&r... # -- HOPPERHOCK botania.entry.hopperhock=Hopperhock botania.page.hopperhock0=The &1Hopperhock&0 will pick up items around it. Giving it &4Mana&0 is optional, but it'll increase it's range.
Items picked up will be put in adjacent inventories (e.g. &1Chests&0). Placing &1Item Frames&0 in any of the inventories will specify which items can or can't go in them. botania.page.hopperhock1=Any inventory which has no &1Item Frame&0 adjacent to it can accept any items, but labeled inventories will take priority.
The rule using to sort items can be changed by shift-right clicking the flower with a &1Wand of the Forest&0. -botania.page.hopperhock2=&0I guess I'll be talking my loli and leaving&r. +botania.page.hopperhock2=&oI guess I'll be talking my loli and leaving&r. + +# -- TANGLEBERRIE +botania.entry.tangleberrie=Tangleberrie +botania.page.tangleberrie0=The &1Tangleberrie&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters within a circle ward, preventing them from getting out. +botania.page.tangleberrie1=&oTangled, brave and frozen&r. + +# -- JIYUULIA +botania.entry.jiyuulia=Jiyuulia +botania.page.jiyuulia0=The &1Jiyuulia&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters at bay, protecting a circular area from them getting in. +botania.page.jiyuulia1=&oKeep out, please&r. # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION