diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index 6cd12dccc..c37f0ad42 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -34,6 +34,7 @@ public final class ModPetalRecipes { public static RecipePetals jadedAmaranthusRecipe; public static RecipePetals bellethorneRecipe; + public static RecipePetals dreadthorneRecipe; public static RecipePetals heiseiDreamRecipe; public static RecipePetals tigerseyeRecipe; public static RecipePetals orechidRecipe; @@ -57,6 +58,7 @@ public final class ModPetalRecipes { jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JADED_AMARANTHUS), purpleMana, purpleMana, lime, purple, green, runeSpring); bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), redMana, redMana, cyan, cyan, red); + dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DREADTHORN), blackMana, purpleMana, cyan, cyan, black, purple); heiseiDreamRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HEISEI_DREAM), purpleMana, pinkMana, magentaMana, purple, pink, magenta, runeWrath); tigerseyeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_TIGERSEYE), yellow, brownMana, orangeMana, lime, runeAutumn); orechidRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID), gray, grayMana, lightGray, lightGrayMana, lightBlue, yellow, green, red, runePride, runeSloth); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 6f80cdbf8..d709a82c2 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -75,6 +75,7 @@ public final class LexiconData { public static LexiconEntry functionalIntro; public static LexiconEntry jadedAmaranthus; public static LexiconEntry bellethorne; + public static LexiconEntry dreadthorne; public static LexiconEntry heiseiDream; public static LexiconEntry tigerseye; public static LexiconEntry orechid; @@ -233,6 +234,9 @@ public final class LexiconData { bellethorne = new BLexiconEntry(LibLexicon.FFLOWER_BELLETHORNE, categoryFunctionalFlowers); bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bellethorneRecipe)); + dreadthorne = new BLexiconEntry(LibLexicon.FFLOWER_DREADTHORNE, categoryFunctionalFlowers); + dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.dreadthorneRecipe)); + heiseiDream = new BLexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers); heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.heiseiDreamRecipe)); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index b45e067d1..446ce4dd1 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -56,6 +56,7 @@ public final class LibLexicon { public static final String FFLOWER_INTRO = "fIntro"; public static final String FFLOWER_JADED_AMARANTHUS = "jadedAmaranthus"; public static final String FFLOWER_BELLETHORNE = "bellethorne"; + public static final String FFLOWER_DREADTHORNE = "dreadthorne"; public static final String FFLOWER_HEISEI_DREAM = "heiseiDream"; public static final String FFLOWER_TIGERSEYE = "tigerseye"; public static final String FFLOWER_ORECHID = "orechid"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 49154de03..f127e255e 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -532,6 +532,11 @@ 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=&oEvery rose has its thorn&r. +# -- DREADTHORNE +botania.entry.dreadthorne=Dreadthorne +botania.page.dreadthorne0=The &1Dreadthorne&0 is a slightly more specific counterpart to the &1Bellethrorne&0, by which, instead of all mobs around, it'll only hurt &4adult&0 animals and none else. +botania.page.dreadthorne1=&oNo Mr.Bond, I expect you to die&r. + # -- HEISEI DREAM botania.entry.heiseiDream=Heisei Dream botania.page.heiseiDream0=The &1Heisei Dream&0 will, by utilizing &4Mana&0, awaken feelings of anger and revenge in any nearby &4mobs&0, turning them against eachother.