From aa488208176c527e3bf94f2e954b2770dd215ebf Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 2 May 2014 18:49:17 +0100 Subject: [PATCH] Recipe/docs for the rannuncarpus. --- .../subtile/functional/SubTileRannuncarpus.java | 16 +++++++++++----- .../botania/common/crafting/ModPetalRecipes.java | 3 +++ .../botania/common/lexicon/LexiconData.java | 4 ++++ MODSRC/vazkii/botania/common/lib/LibLexicon.java | 1 + resources/assets/botania/lang/en_US.lang | 8 +++++++- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 964115a0c..e303e6c13 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -14,9 +14,6 @@ package vazkii.botania.common.block.subtile.functional; import java.util.ArrayList; import java.util.List; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -26,13 +23,17 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemReed; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.common.core.helper.ObfuscationHelper; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; +import cpw.mods.fml.relauncher.ReflectionHelper; public class SubTileRannuncarpus extends SubTileFunctional { @@ -153,6 +154,11 @@ public class SubTileRannuncarpus extends SubTileFunctional { return 0xFFB27F; } + @Override + public LexiconEntry getEntry() { + return LexiconData.rannuncarpus; + } + static class BlockData { Block block; diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index 021d18b3d..5666a676c 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common.crafting; +import net.minecraft.item.ItemSpade; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -43,6 +44,7 @@ public final class ModPetalRecipes { public static RecipePetals hopperhockRecipe; public static RecipePetals tangleberrieRecipe; public static RecipePetals jiyuuliaRecipe; + public static RecipePetals rannuncarpusRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); @@ -65,5 +67,6 @@ public final class ModPetalRecipes { 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); + rannuncarpusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RANNUNCARPUS), orangeMana, orangeMana, orange, yellow, runeEarth, red, redMana); } } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 0604637c3..719302ef8 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -83,6 +83,7 @@ public final class LexiconData { public static LexiconEntry hopperhock; public static LexiconEntry tangleberrie; public static LexiconEntry jiyuulia; + public static LexiconEntry rannuncarpus; public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; @@ -255,6 +256,9 @@ public final class LexiconData { jiyuulia = new BLexiconEntry(LibLexicon.FFLOWER_JIYUULIA, categoryFunctionalFlowers); jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jiyuuliaRecipe)); + rannuncarpus = new BLexiconEntry(LibLexicon.FFLOWER_RANNUNCARPUS, categoryFunctionalFlowers); + rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.rannuncarpusRecipe)); + // 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 a707979b1..8b29c914c 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -65,6 +65,7 @@ public final class LibLexicon { 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 FFLOWER_RANNUNCARPUS = "rannuncarpus"; 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 bef2171d9..99616589a 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -571,6 +571,12 @@ 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. +# -- RANNUNCARPUS +botania.entry.rannuncarpus=Rannuncarpus +botania.page.rannuncarpus0=Quite a handy flower indeed, the &1Rannuncarpus&0 will pick up any nearby blocks in dropped item form and place them in the world nearby. It, however, only places the blocks thrown at it on top of a specific block, to specify this block, place it right below the soil the flower is resting on. +botania.page.rannuncarpus1=Block items, such as &1Sugar Cane&0 will also work, but, much alike any other blocks, will only be placed in a location where they normally would be able to be placed.
Lastly, giving &4Mana&0 to the flower is optional, but it increases it's range. +botania.page.rannuncarpus2=&oNeed a hand&r? + # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION botania.entry.gIntro=An Introduction to Generation @@ -745,7 +751,7 @@ botania.page.lavaPendant1=Hanako could have used one of these # -- GOLDEN LAUREL CROWN botania.entry.goldenLaurel=Golden Laurel Crown -botania.page.goldenLaurel0=One of the uses for &1Essence of Eternal Life&0 is to, of course, grant a layer of immortability to one that uses it, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. +botania.page.goldenLaurel0=One of the uses for &1Essence of Eternal Life&0 is to, of course, grant a layer of immortality to one that uses it, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. botania.page.goldenLaurel1=Given the theme, probably Viridi # - MISCLANEOUS