From 73377e311d74396f8f4b1af2a90f5e2a42984e1d Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 25 Oct 2015 00:00:43 +0100 Subject: [PATCH] Recipe/docs for the Livingwood Avatar. --- .../vazkii/botania/common/block/BlockAvatar.java | 11 ++++++++++- .../botania/common/block/tile/TileAvatar.java | 2 +- .../common/crafting/ModCraftingRecipes.java | 10 +++++++++- .../botania/common/item/rod/ItemRainbowRod.java | 2 +- .../botania/common/item/rod/ItemTornadoRod.java | 2 +- .../vazkii/botania/common/lexicon/LexiconData.java | 14 +++++++++----- .../java/vazkii/botania/common/lib/LibLexicon.java | 1 + src/main/resources/assets/botania/lang/en_US.lang | 14 +++++++++++++- 8 files changed, 45 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 9b92859d2..5435c9ba0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -29,12 +29,16 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.RotationHelper; import vazkii.botania.api.item.IAvatarWieldable; +import vazkii.botania.api.lexicon.ILexicon; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileAvatar; import vazkii.botania.common.block.tile.TileSimpleInventory; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockAvatar extends BlockModContainer { +public class BlockAvatar extends BlockModContainer implements ILexiconable { private static final int[] META_ROTATIONS = new int[] { 2, 5, 3, 4 }; @@ -167,4 +171,9 @@ public class BlockAvatar extends BlockModContainer { return new TileAvatar(); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.avatar; + } + } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index cc276b9d5..a93d55b5b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -116,7 +116,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid @Override public boolean canRecieveManaFromBursts() { - return true; + return getStackInSlot(0) != null; } @Override diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 92ff6d809..905f1659f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -300,7 +300,8 @@ public final class ModCraftingRecipes { public static IRecipe recipeCellBlock; public static IRecipe recipeCorporeaRetainer; public static IRecipe recipeTeruTeruBozu; - + public static IRecipe recipeAvatar; + // Garden of Glass public static IRecipe recipeRootToSapling; public static IRecipe recipeRootToFertilizer; @@ -2022,6 +2023,13 @@ public final class ModCraftingRecipes { 'S', new ItemStack(Blocks.double_plant)); recipeTeruTeruBozu = BotaniaAPI.getLatestAddedRecipe(); + // Livingwood Avatar Recipe + addOreDictRecipe(new ItemStack(ModBlocks.avatar), + " W ", "WDW", "W W", + 'W', LibOreDict.LIVING_WOOD, + 'D', LibOreDict.MANA_DIAMOND); + recipeAvatar = BotaniaAPI.getLatestAddedRecipe(); + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 82200429f..52f135c4d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -140,7 +140,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi TileEntity te = (TileEntity) tile; World world = te.getWorldObj(); - if(world.isRemote || tile.getCurrentMana() < MANA_COST_AVATAR * 25) + if(world.isRemote || tile.getCurrentMana() < MANA_COST_AVATAR * 25 || !tile.isEnabled()) return; int x = te.xCoord; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 3a94f8e42..6fbb7cbbd 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -156,7 +156,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi public void onAvatarUpdate(IAvatarTile tile, ItemStack stack) { TileEntity te = (TileEntity) tile; World world = te.getWorldObj(); - if(tile.getCurrentMana() >= COST) { + if(tile.getCurrentMana() >= COST && tile.isEnabled()) { int range = 5; int rangeY = 3; List players = world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(te.xCoord + 0.5 - range, te.yCoord + 0.5 - rangeY, te.zCoord + 0.5 - range, te.xCoord + 0.5 + range, te.yCoord + 0.5 + rangeY, te.zCoord + 0.5 + range)); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 25c98fed2..d2f5089ab 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -161,6 +161,7 @@ public final class LexiconData { public static LexiconEntry cocoon; public static LexiconEntry manaBomb; public static LexiconEntry teruTeruBozu; + public static LexiconEntry avatar; public static LexiconEntry manaBlaster; public static LexiconEntry grassSeeds; @@ -666,6 +667,9 @@ public final class LexiconData { teruTeruBozu = new BLexiconEntry(LibLexicon.DEVICE_TERU_TERU_BOZU, categoryDevices); teruTeruBozu.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTeruTeruBozu)); + avatar = new BLexiconEntry(LibLexicon.DEVICE_AVATAR, categoryDevices); + avatar.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeAvatar)); + // 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)); @@ -708,13 +712,13 @@ public final class LexiconData { openBucket.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeOpenBucket)); rainbowRod = new ALexiconEntry(LibLexicon.TOOL_RAINBOW_ROD, categoryTools); - rainbowRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRainbowRod), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBifrost), new PageCraftingRecipe("4", ModCraftingRecipes.recipeShimmerrock), new PageCraftingRecipe("5", ModCraftingRecipes.recipeShimmerwoodPlanks)); + rainbowRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("6"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRainbowRod), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBifrost), new PageCraftingRecipe("4", ModCraftingRecipes.recipeShimmerrock), new PageCraftingRecipe("5", ModCraftingRecipes.recipeShimmerwoodPlanks)); tornadoRod = new BLexiconEntry(LibLexicon.TOOL_TORNADO_ROD, categoryTools); - tornadoRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTornadoRod)); + tornadoRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTornadoRod)); fireRod = new BLexiconEntry(LibLexicon.TOOL_FIRE_ROD, categoryTools); - fireRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFireRod)); + fireRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFireRod)); vineBall = new BLexiconEntry(LibLexicon.TOOL_VINE_BALL, categoryTools); vineBall.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeVineBall), new PageCraftingRecipe("3", ModCraftingRecipes.recipeSlingshot), new PageCraftingRecipe("4", ModCraftingRecipes.recipeMossStone)); @@ -732,7 +736,7 @@ public final class LexiconData { glassPick.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGlassPick)); diviningRod = new BLexiconEntry(LibLexicon.TOOL_DIVINING_ROD, categoryTools); - diviningRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDiviningRod)); + diviningRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDiviningRod)); gravityRod = new ALexiconEntry(LibLexicon.TOOL_GRAVITY_ROD, categoryTools); gravityRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeGravityRod)); @@ -741,7 +745,7 @@ public final class LexiconData { regenIvy.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRegenIvy)); missileRod = new ALexiconEntry(LibLexicon.TOOL_MISSILE_ROD, categoryTools); - missileRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMissileRod)); + missileRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMissileRod)); craftingHalo = new BLexiconEntry(LibLexicon.TOOL_CRAFTING_HALO, categoryTools); craftingHalo.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCraftingHalo)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index b9ad31213..7e8b84b4e 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -131,6 +131,7 @@ public final class LibLexicon { 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 DEVICE_AVATAR = "avatar"; 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 6d7f45e4b..9bbb97481 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2792,6 +2792,13 @@ botania.tagline.teruTeruBozu=Weather control and cuteness overload 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 +# -- LIVINGWOOD AVATAR +botania.entry.avatar=Livingwood Avatar +botania.tagline.avatar=Rod effects in a block +botania.page.avatar0=Cavring some &1Livingwood&0 and combining it with a &1Mana Diamond&0 heart creates an apparatus known as the &1Livingwood Avatar&0. By itself, this block doesn't do anything, aside from looking reasonably pretty.
However, giving it a &4Rod&0 can enable it to cast varied magic, depending on which one is given. At the cost of &4Mana&0, from a spreader, of course. +botania.page.avatar1=Not add &4Rods&0 fit this criteria. Any that do, however, will have an explanation of what they can do when given to a &1Livingwood Avatar&0 on their entry.
A few examples of some rods that will work are the &1Rod of the Skies&0, &1Rod of the Hells&0 and &1Rod of the Plentiful Mantle&0. +botania.page.avatar2=But is it an anime? + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Mana Blaster @@ -2908,6 +2915,7 @@ botania.entry.rainbowRod=Rod of the Bifrost botania.tagline.rainbowRod=A rod to create rainbow bridges, and fancy building blocks botania.page.rainbowRod0=&4Bifrost&0, the rainbow bridge that reaches between the world and the realm of the gods.
While this item, the &1Rod of the Bifrost&0 doesn't exactly do that, it allows the holder, via a right click and at the cost of some &4Mana&0, to create a rainbow bridge in the direction he or she is looking at. botania.page.rainbowRod1=This bridge extends as far as a hundred blocks, and will vanish after about fifteen seconds.
Only one bridge can be created for any given &1Rod of the Bifrost&0 at a time, as soon as the old bridge vanishes, a new one can be created. +botania.page.rainbowRod6=This rod can be given to a &1Livingwood Avatar&0. When done so, it'll create a rainbow bridge in front of wherever it's looking, whenever a player tries to walk in that area.
This process uses &4Mana&0 from the avatar, and can be disabled by applying redstone to it. botania.page.rainbowRod2=Going my way!! Cut open a path and go! botania.page.rainbowRod3=&1Bifrost Blocks&0 for decoration botania.page.rainbowRod4=Rainbow &1Shimmerrock&0 @@ -2917,13 +2925,15 @@ botania.page.rainbowRod5=Rainbow &1Shimmerwood Planks&0 botania.entry.tornadoRod=Rod of the Skies botania.tagline.tornadoRod=A rod to jump high in the sky botania.page.tornadoRod0=The &1Rod of the Skies&0 is a magical instrument with the ability to propel one in the air at fast velocity for the cost of some &4Mana&0.
To do so, one would simply hold it like a bow and watch as their momentum increases.
The rod takes a small amount of time to recharge, but during that time it'll block any fall damage, keeping the user safe. +botania.page.tornadoRod2=This rod can be given to a &1Livingwood Avatar&0. When done so, any players near the avatar will be launched high in the air, as if they'd used the rod, whenever they jump.
This process uses &4Mana&0 from the avatar, and can be disabled by applying redstone it. botania.page.tornadoRod1=A treasure from Lorule # -- ROD OF THE HELLS botania.entry.fireRod=Rod of the Hells botania.tagline.fireRod=A rod to create circles of flame botania.page.fireRod0=The &1Rod of the Hells&0 contains the essence of a burning flame, using it on the ground will create a circle of fire that burns anything inside it, for a decent cost of &4Mana&0.
The ring has a decent radius, and takes a small amount of time to fully propagate, it's to note that after that time it burns anything living in it, the caster included. -botania.page.fireRod1=Megu Megu Fire Endless Night +botania.page.fireRod2=This rod can be given to a &1Livingwood Avatar&0. When done so, it'll create a similar ring of flame that the rod creates when used.
This process uses &4Mana&0 from the avatar, and can be disabled by applying redstone to it. +botania.page.fireRod1=Through the fire and the flames # -- VINE BALLS botania.entry.vineBall=Vine Balls @@ -2965,6 +2975,7 @@ botania.page.glassPick1=Trapped inside with food botania.entry.diviningRod=Rod of the Plentiful Mantle botania.tagline.diviningRod=A rod to find ores botania.page.diviningRod0=The &1Rod of the Plentiful Mantle&0 has the ability to divine in a decently large radius around the user to find any ores. These will shine for a little bit, allowing their location.
This process, obviously, requires a decent amount of &4Mana&0 from the user's inventory. +botania.page.diviningRod2=This rod can be given to a &1Livingwood Avatar&0. When done so, it'll show all nearby ores, as if it was used by a player. The colors, in this case, remain the same if the avatar isn't moved.
This process uses &4Mana&0 from the avatar, and can be disabled by applying redstone to it. botania.page.diviningRod1=inb4 ee3 # -- ROD OF THE BLACK MESA @@ -2985,6 +2996,7 @@ botania.page.regenIvy2=Bring your Inferno Adze botania.entry.missileRod=Rod of the Unstable Reservoir botania.tagline.missileRod=A rod to pew pew botania.page.missileRod0=The &1Rod of the Unstable Reservoir&0 is a rather powerful weapon against a large crowd of foes. Channeling its power will materialize countless arcane missiles that home in on targets at random, at a pretty hefty cost of &4Mana&0. +botania.page.missileRod2=This rod can be given to a &1Livingwood Avatar&0. When done so, it'll create missiles to attack nearby mobs, as if the rod is used normally.
This process uses &4Mana&0 from the avatar, and can be disabled by applying redstone to it. botania.page.missileRod1=Zapzapzapzap # -- ASSEMBLY HALO