diff --git a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index 2d040aa16..bdc398b5c 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -12,7 +12,9 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; +import vazkii.botania.common.lexicon.LexiconData; public class SubTileThermalily extends SubTileHydroangeas { @@ -21,10 +23,10 @@ public class SubTileThermalily extends SubTileHydroangeas { return 0xD03C00; } -// @Override -// public LexiconEntry getEntry() { -// return LexiconData.hydroangeas; -// } + @Override + public LexiconEntry getEntry() { + return LexiconData.thermalily; + } @Override public void doBurnParticles() { diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index a4f3c5b52..03bcca064 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -33,6 +33,7 @@ public final class ModPetalRecipes { public static RecipePetals heiseiDreamRecipe; public static RecipePetals tigerseyeRecipe; public static RecipePetals hydroangeasRecipe; + public static RecipePetals thermalilyRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); @@ -40,6 +41,7 @@ public final class ModPetalRecipes { daybloomRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), yellow, yellow, orange, lightBlue); endoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), brown, red, redMana, brownMana, lightGray); hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), blue, blue, pink, blue); + thermalilyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_THERMALILY), red, orangeMana, orange, runeEarth, runeFire); jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JADED_AMARANTHUS), purpleMana, purpleMana, lime, purple, green); bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), redMana, redMana, cyan, cyan, red); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 522f3b8b4..359ed8f1f 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -63,17 +63,18 @@ public final class LexiconData { public static LexiconEntry lensPhantom; public static LexiconEntry manaTransport; public static LexiconEntry manaDetector; - + public static LexiconEntry functionalIntro; public static LexiconEntry jadedAmaranthus; public static LexiconEntry bellethorne; public static LexiconEntry heiseiDream; public static LexiconEntry tigerseye; - + public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; public static LexiconEntry endoflame; public static LexiconEntry hydroangeas; + public static LexiconEntry thermalily; public static LexiconEntry pistonRelay; public static LexiconEntry pylon; @@ -191,6 +192,9 @@ public final class LexiconData { hydroangeas = new BLexiconEntry(LibLexicon.GFLOWER_HYDROANGEAS, categoryGenerationFlowers); hydroangeas.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.hydroangeasRecipe)); + thermalily = new BLexiconEntry(LibLexicon.GFLOWER_THERMALILY, categoryGenerationFlowers); + thermalily.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.thermalilyRecipe)); + // 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 1337be2c1..82509e4f9 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -57,6 +57,7 @@ public final class LibLexicon { public static final String GFLOWER_DAYBLOOM = "daybloom"; public static final String GFLOWER_ENDOFLAME = "endoflame"; public static final String GFLOWER_HYDROANGEAS = "hydroangeas"; + public static final String GFLOWER_THERMALILY = "thermalily"; public static final String DEVICE_PISTON_RELAY = "pistonRelay"; public static final String DEVICE_PYLON = "pylon"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 920cee8e4..384010b2f 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -431,6 +431,11 @@ botania.entry.hydroangeas=Hydroangeas botania.page.hydroangeas0=While you can generate easy &4Mana&0 with the &1Daybloom&0, sometimes you need to create more energy without using any fuels...
The &1Hydroangeas&0 will devour adjacent water sources to create mana, it does have a cooldown timer though, so power can not be generated instantly. botania.page.hydroangeas1=&oAquatic Power&r. +# -- THERMALILY +botania.entry.thermalily=Thermalily +botania.page.thermalily0=There comes a point where slow generating power, like the &1Hydroangeas&0 or the &1Endoflame&0 is not enough. An answer to that is the &1Thermalily&0, which works similarly to the &1Hydroangeas&0, except with &1Lava&0. Care should be taken with this flower, as it generates power at an extremely fast speed. +botania.page.thermalily1=&oLily ought to know&r. + # - MAGICAL APPARATUS # -- FORCE RELAY botania.entry.pistonRelay=Force Relay