diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index 04320f760..a29d145e2 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -18,7 +18,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.common.lexicon.LexiconData; public class SubTileHyacidus extends SubTileFunctional { @@ -48,4 +50,9 @@ public class SubTileHyacidus extends SubTileFunctional { return 180; } + @Override + public LexiconEntry getEntry() { + return LexiconData.hyacidus; + } + } \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index c37f0ad42..2715d3f1d 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -45,6 +45,7 @@ public final class ModPetalRecipes { public static RecipePetals tangleberrieRecipe; public static RecipePetals jiyuuliaRecipe; public static RecipePetals rannuncarpusRecipe; + public static RecipePetals hyacidusRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); @@ -69,5 +70,6 @@ public final class ModPetalRecipes { 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); + hyacidusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYACIDUS), purple, purpleMana, magenta, magentaMana, brown, green, greenMana, runeWater, runeAutumn); } } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index d709a82c2..95b613e0e 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -86,6 +86,7 @@ public final class LexiconData { public static LexiconEntry tangleberrie; public static LexiconEntry jiyuulia; public static LexiconEntry rannuncarpus; + public static LexiconEntry hyacidus; public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; @@ -267,6 +268,9 @@ public final class LexiconData { rannuncarpus = new BLexiconEntry(LibLexicon.FFLOWER_RANNUNCARPUS, categoryFunctionalFlowers); rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.rannuncarpusRecipe)); + hyacidus = new BLexiconEntry(LibLexicon.FFLOWER_HYACIDUS, categoryFunctionalFlowers); + hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.hyacidusRecipe)); + // 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 446ce4dd1..75a65cd2d 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -67,6 +67,7 @@ public final class LibLexicon { 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 FFLOWER_HYACIDUS = "hyacidus"; 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 51e17f56b..b77279c94 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -591,6 +591,11 @@ botania.page.rannuncarpus0=Quite a handy flower indeed, the &1Rannuncarpus&0 wil 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? +# -- HYACIDUS +botania.entry.hyacidus=Hyacidus +botania.page.hyacidus0=For some reason, poison does not kill. The &1Hyacidus&0, to that, can be used to poison any nearby mobs, bringing them to their knees for a one hit kill after a bit. +botania.page.hyacidus1=&oSteel is immune&r. + # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION botania.entry.gIntro=An Introduction to Generation