diff --git a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 3d96bf354..632e61b8c 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -18,8 +18,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.AxisAlignedBB; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; import vazkii.botania.common.block.subtile.SubTileGenerating; +import vazkii.botania.common.lexicon.LexiconData; public class SubTileEndoflame extends SubTileGenerating { @@ -71,6 +73,11 @@ public class SubTileEndoflame extends SubTileGenerating { public int getColor() { return 0x785000; } + + @Override + public LexiconEntry getEntry() { + return LexiconData.endoflame; + } @Override public void writeToPacketNBT(NBTTagCompound cmp) { diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index 640b2cb01..d7629e7e3 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -25,6 +25,7 @@ public final class ModPetalRecipes { public static RecipePetals pureDaisyRecipe; public static RecipePetals daybloomRecipe; + public static RecipePetals endoflameRecipe; public static RecipePetals bellethorneRecipe; @@ -32,7 +33,8 @@ public final class ModPetalRecipes { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); daybloomRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), yellow, yellow, orange, orange, lightBlue); - + endoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), brown, red, redMana, brownMana, lightGray); + 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 1b868ec0b..1204b295c 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -61,6 +61,7 @@ public final class LexiconData { public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; + public static LexiconEntry endoflame; public static LexiconEntry unstableBlocks; @@ -142,6 +143,9 @@ public final class LexiconData { daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); daybloom.setPriority().setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.daybloomRecipe)); + endoflame = new BLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); + endoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.endoflameRecipe)); + // MISCLENAEOUS ENTRIES unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCrafingRecipes.recipesUnstableBlocks)); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 74d1801df..df4fc0233 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -47,6 +47,7 @@ public final class LibLexicon { public static final String GFLOWER_INTRO = "gIntro"; public static final String GFLOWER_DAYBLOOM = "daybloom"; + public static final String GFLOWER_ENDOFLAME = "endoflame"; public static final String MISC_UNSTABLE_BLOCKS = "unstableBlocks"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index beaa43dd3..858c15aa2 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -311,7 +311,7 @@ botania.page.fIntro2=It is important to keep in mind that these flowers memorize # -- BELLETHRONE 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=Every rose has its thorn +botania.page.bellethorne1=&oEvery rose has its thorn&r. # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION @@ -323,7 +323,12 @@ botania.page.gIntro2=It is important to keep in mind that these flowers memorize # -- DAYBLOOM botania.entry.daybloom=Daybloom botania.page.daybloom0=The &1Daybloom&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it preforms a modified photosythesis process, in order to transform sunlight into &4Mana&0. -botania.page.daybloom1=Starting up a brand new day +botania.page.daybloom1=&oStarting up a brand new day&r. + +# -- ENDOFLAME +botania.entry.endoflame=Endoflame +botania.page.endoflame0=While the &1Daybloom&0 is all well and good, a botanist requires more effective means of generating &4Mana&0.
The &1Endoflame&0 does that exactly, it will absorb any combustible items or blocks dropped on the nearby vacinity (albeit only one at a time) and burn through them to passively generate mana while the fuel lasts. +botania.page.endoflame1=&oNot nitor&r. # - MAGICAL APPARATUS