From 6283aea2b9ff3cd35f2be41b523d2e26c791399a Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 15 May 2015 18:48:48 +0100 Subject: [PATCH] Recipe/docs for Incense. --- .../botania/common/block/BlockIncensePlate.java | 10 +++++++++- .../common/crafting/ModCraftingRecipes.java | 17 +++++++++++++++++ .../botania/common/lexicon/LexiconData.java | 4 ++++ .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 8 ++++++++ 5 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 006093ac0..8840eba99 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -26,13 +26,16 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.RotationHelper; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockIncensePlate extends BlockModContainer { +public class BlockIncensePlate extends BlockModContainer implements ILexiconable { private static final int[] META_ROTATIONS = new int[] { 2, 5, 3, 4 }; @@ -138,4 +141,9 @@ public class BlockIncensePlate extends BlockModContainer { return new TileIncensePlate(); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.incense; + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 3cec0f1ec..a95a13014 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -257,6 +257,8 @@ public final class ModCraftingRecipes { public static List recipesAltarMeta; public static IRecipe recipeCorporeaCrystalCube; public static IRecipe recipeTemperanceStone; + public static IRecipe recipeIncenseStick; + public static IRecipe recipeIncensePlate; public static void init() { // Lexicon Recipe @@ -1711,6 +1713,21 @@ public final class ModCraftingRecipes { 'R', LibOreDict.RUNE[2]); recipeTemperanceStone = BotaniaAPI.getLatestAddedRecipe(); + // Incense Stick Recipe + addOreDictRecipe(new ItemStack(ModItems.incenseStick), + " G", " B ", "T ", + 'G', new ItemStack(Items.ghast_tear), + 'B', new ItemStack(Items.blaze_powder), + 'T', LibOreDict.LIVINGWOOD_TWIG); + recipeIncenseStick = BotaniaAPI.getLatestAddedRecipe(); + + // Incense Plate Recipe + addOreDictRecipe(new ItemStack(ModBlocks.incensePlate), + "WSS", + 'W', LibOreDict.LIVING_WOOD, + 'S', new ItemStack(ModFluffBlocks.livingwoodSlab)); + recipeIncensePlate = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index bb8658c67..f47a384ce 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -144,6 +144,7 @@ public final class LexiconData { public static LexiconEntry brewery; public static LexiconEntry flasks; public static LexiconEntry complexBrews; + public static LexiconEntry incense; public static LexiconEntry manaBlaster; public static LexiconEntry grassSeeds; @@ -580,6 +581,9 @@ public final class LexiconData { new PageBrew(ModBrewRecipes.featherFeetBrew, "3a", "3b"), new PageBrew(ModBrewRecipes.emptinessBrew, "4a", "4b"), new PageBrew(ModBrewRecipes.bloodthirstBrew, "5a", "5b"), new PageBrew(ModBrewRecipes.allureBrew, "6a", "6b")).setIcon(((IBrewContainer) ModItems.vial).getItemForBrew(ModBrews.jumpBoost, new ItemStack(ModItems.vial))); + incense = new BLexiconEntry(LibLexicon.DEVICE_INCENSE, categoryDevices); + incense.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeIncenseStick), new PageCraftingRecipe("4", ModCraftingRecipes.recipeIncensePlate)); + // TOOLS ENTRIES manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 9120c0ad6..d9289d6cd 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -116,6 +116,7 @@ public final class LibLexicon { public static final String DEVICE_BREWERY = "brewery"; public static final String DEVICE_FLASKS = "flasks"; public static final String DEVICE_COMPLEX_BREWS = "complexBrews"; + public static final String DEVICE_INCENSE = "incense"; public static final String TOOL_MANA_BLASTER = "manaBlaster"; public static final String TOOL_GRASS_SEEDS = "grassSeeds"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index eec008be7..c761f876f 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1985,6 +1985,14 @@ botania.page.complexBrews5b=Shall we pray for a miracle? botania.page.complexBrews6a=A player affected with this brew's effect will have much higher proficiency at fishing and will catch fish and other loot twice as fast. botania.page.complexBrews6b=Maybe you'll catch a Chris +# -- BREW INCENSES +botania.entry.incense=Brew Incenses +botania.page.incense0=&4Brews&0 can provide a great variety of effects when in liquid form. They, however, don't last long, and take up inventory space. Utilizing &1Incense Sticks&0 instead of flasks mitigates that problem, these can be infused with &4Brew&0 effects just like a normal flask would, but take around ten times as much &4Mana&0 to do so. +botania.page.incense1=An &1Incense Stick&0 can be placed on an &1Incense Plate&0 by right clicking on it, a simple click with a &1Flint and Steel&0 will light it up. Once lit, the stick can not be retrieved.
A single stick of incense will burn for sixty times as long as as the liquid counterpart before needing to be replaced. +botania.page.incense2=&1Incense Plates&0 that are burning &1Incense Sticks&0 will provide the effects of the &4Brew&0 infused in the stick to any players on a 24 block radius of the plate.
Not all &4Brews&0 can be infused into &1Incense Sticks&0, for example, &4Instant Health&0 or &1Absorption&0 can't, nor can any with more than one effect. +botania.page.incense3=Incense is wincense +botania.page.incense4=I can incense it + # -- EYE OF THE ANCIENTS botania.entry.forestEye=Eye of the Ancients botania.page.forestEye0=As the Ancients who used to watch over the world always looked for the living beings on it, this block, the &1Eye of the Ancients&0, will do just that.
By attaching a &1Comparator&0 next to it, it'll send out a redstone signal equivalent to the amount of animals it can find.