diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index 685c2976f..e4ffd6afc 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -42,6 +42,7 @@ public final class ModPetalRecipes { public static RecipePetals munchdewRecipe; public static RecipePetals entropinnyumRecipe; public static RecipePetals kekimurusRecipe; + public static RecipePetals gourmaryllisRecipe; public static RecipePetals jadedAmaranthusRecipe; public static RecipePetals bellethorneRecipe; @@ -76,7 +77,8 @@ public final class ModPetalRecipes { munchdewRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MUNCHDEW), lime, limeMana, green, red, redMana, white, whiteMana, runeGluttony); entropinnyumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM), red, redMana, gray, grayMana, white, whiteMana, runeWrath, runeFire); kekimurusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS), white, whiteMana, orangeMana, brownMana, brownMana, orange, runeGluttony); - + gourmaryllisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_GOURMARYLLIS), lightGray, lightGrayMana, yellowMana, yellow, yellowMana, red, runeFire, runeSummer); + jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JADED_AMARANTHUS), purpleMana, purpleMana, lime, purple, green, runeSpring, redstoneRoot); bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), redMana, redMana, cyan, cyan, red, redstoneRoot); dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DREADTHORN), blackMana, purpleMana, cyan, cyan, black, purple, redstoneRoot); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 19a31c425..3ec008ad7 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -88,7 +88,9 @@ public final class LexiconData { public static LexiconEntry pollidisiac; public static LexiconEntry clayconia; public static LexiconEntry loonium; - + public static LexiconEntry daffomill; + public static LexiconEntry vinculotus; + public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; public static LexiconEntry nightshade; @@ -99,8 +101,7 @@ public final class LexiconData { public static LexiconEntry munchdew; public static LexiconEntry entropinnyum; public static LexiconEntry kekimurus; - public static LexiconEntry daffomill; - public static LexiconEntry vinculotus; + public static LexiconEntry gourmaryllis; public static LexiconEntry pistonRelay; public static LexiconEntry pylon; @@ -355,6 +356,9 @@ public final class LexiconData { kekimurus = new BLexiconEntry(LibLexicon.GFLOWER_KEKIMURUS, categoryGenerationFlowers); kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.kekimurusRecipe)); + gourmaryllis = new BLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers); + gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe("3", ModPetalRecipes.gourmaryllisRecipe)); + // DEVICES ENTRIES pistonRelay = new BLexiconEntry(LibLexicon.DEVICE_PISTON_RELAY, categoryDevices); pistonRelay.setLexiconPages(new PageText("0"), new PageText("1"), new PageManaInfusionRecipe("2", ModManaInfusionRecipes.pistonRelayRecipe)); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index dc3be958f..357ae1284 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -78,7 +78,8 @@ public final class LibLexicon { public static final String GFLOWER_MUNCHDEW = "munchdew"; public static final String GFLOWER_ENTROPINNYUM = "entropinnyum"; public static final String GFLOWER_KEKIMURUS = "kekimurus"; - + public static final String GFLOWER_GOURMARYLLIS = "gourmaryllis"; + public static final String DEVICE_PISTON_RELAY = "pistonRelay"; public static final String DEVICE_PYLON = "pylon"; public static final String DEVICE_MANA_ENCHANTING = "manaEnchanting"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 933267272..c361eba05 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -981,6 +981,13 @@ botania.entry.kekimurus=Kekimurus botania.page.kekimurus0=&1Cake&0 is delicious, everyone loves it, flowers included.
The &1Kekimurus&0 is one of these &1Cake&0 aficionados, and will eat any it spots nearby, using it's enriching nutrients to create &4Mana&0. botania.page.kekimurus1=&oThe flower of Flaxbeard the kekker&r. +# -- GOURMARYLLIS +botania.entry.gourmaryllis=Gourmaryllis +botania.page.gourmaryllis0=The &1Gourmaryllis&0 is one hungry flower. It'll eat up any food in a small area around it, and turn it into &4Mana&0.
There's a catch, though, it can only digest a single food at any given time, the &4Mana&0 is created when it's done. Any other food it finds, it'll also devour, but not create any mana from it. +botania.page.gourmaryllis1=The amount of time it takes to digest a delicacy depends on it's nutricional value, in layman's terms, the amount of food points it restores.
So, a &1Steak&0 will take four seconds to digest, a &1Carrot&0 will take two, a loaf of &1Bread&0 will take two and a half, so on. +botania.page.gourmaryllis2=The amount of &4Mana&0 created also makes use of this value, but in a way where the more nutritious the food is, the more efficient it is. For example, a single &1Steak&0 will produce more &1Mana&0 from two &1Carrots&0, both absolutely and per second. +botania.page.gourmaryllis3=&oA hot pot for our new residents&r. + # - MAGICAL APPARATUS # -- FORCE RELAY botania.entry.pistonRelay=Force Relay