diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 5cd6c24e9..e4666d5f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -21,11 +21,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileTeruTeruBozu; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTeruTeruBozu extends BlockModContainer { +public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable { public BlockTeruTeruBozu() { super(Material.cloth); @@ -110,4 +113,9 @@ public class BlockTeruTeruBozu extends BlockModContainer { return new TileTeruTeruBozu(); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.teruTeruBozu; + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index ce30ddfbe..1b98301f9 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -297,7 +297,8 @@ public final class ModCraftingRecipes { public static List recipesPavement; public static IRecipe recipeCellBlock; public static IRecipe recipeCorporeaRetainer; - + public static IRecipe recipeTeruTeruBozu; + // Garden of Glass public static IRecipe recipeRootToSapling; public static IRecipe recipeRootToFertilizer; @@ -2008,6 +2009,13 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaRetainer), new ItemStack(Blocks.chest), new ItemStack(ModItems.corporeaSpark)); recipeCorporeaRetainer = BotaniaAPI.getLatestAddedRecipe(); + // Teru Teru Bozu Recipe + addOreDictRecipe(new ItemStack(ModBlocks.teruTeruBozu), + "C", "C", "S", + 'C', LibOreDict.MANAWEAVE_CLOTH, + 'S', new ItemStack(Blocks.double_plant)); + recipeTeruTeruBozu = BotaniaAPI.getLatestAddedRecipe(); + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index a164017f3..b1cceb038 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -160,6 +160,7 @@ public final class LexiconData { public static LexiconEntry canopyDrum; public static LexiconEntry cocoon; public static LexiconEntry manaBomb; + public static LexiconEntry teruTeruBozu; public static LexiconEntry manaBlaster; public static LexiconEntry grassSeeds; @@ -658,6 +659,9 @@ public final class LexiconData { manaBomb = new ALexiconEntry(LibLexicon.DEVICE_MANA_BOMB, categoryDevices); manaBomb.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaBomb)); + teruTeruBozu = new BLexiconEntry(LibLexicon.DEVICE_TERU_TERU_BOZU, categoryDevices); + teruTeruBozu.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTeruTeruBozu)); + // 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 794eb1502..63a4abb0b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -128,6 +128,7 @@ public final class LibLexicon { public static final String DEVICE_CANOPY_DRUM = "canopyDrum"; public static final String DEVICE_COCOON = "cocoon"; public static final String DEVICE_MANA_BOMB = "manaBomb"; + public static final String DEVICE_TERU_TERU_BOZU = "teruTeruBozu"; 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 41d6328b3..6ac8c6250 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2660,6 +2660,11 @@ botania.entry.manaBomb=Manastorm Charge botania.page.manaBomb0=Putting together some &1TNT&0 and a &1Gaia Spirit&0 creates a &1Manastorm Charge&0, a type of explosive, per say. Ignited with a &1Mana Burst&0, the charge will create an unstable &1Manastorm Epicenter&0, which will, over time, spawn supercharged &1Mana Bursts&0, that explode on contact with other blocks.
Needless to say, only a maniac would unleash such a force near anything they care about. botania.page.manaBomb1=Prepare to face the mighty... +# -- TERU TERU BOZU +botania.entry.teruTeruBozu=Teru Teru Bozu +botania.page.teruTeruBozu0=&1Teru Teru Bozu&0 are known as amulets that can ward away bad weather. Simply creating one of these and placing it in the world will decrease the amount of time that &1Rain&0 or &1Snowstorms&0 will last for. During bad weather, right clicking one with a &1Sunflower&0 or tossing said flower at it will have sun come back. Attaching a &1Redstone Comparator&0 to one of these allows for it to detect bad weather. +botania.page.teruTeruBozu1=Too spoopy + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Mana Blaster