diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index 6e97cf137..251f64923 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -12,13 +12,18 @@ package vazkii.botania.common.block; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.common.entity.EntityManaStorm; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockManaBomb extends BlockMod implements IManaTrigger { +public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconable { public BlockManaBomb() { super(Material.wood); @@ -38,4 +43,9 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger { } } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.manaBomb; + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 67a16445b..c52f22e2e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -273,6 +273,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeLuminizerLauncher; public static IRecipe recipeObedienceStick; public static IRecipe recipeCacophonium; + public static IRecipe recipeManaBomb; // Garden of Glass public static IRecipe recipeRootToSapling; @@ -1850,6 +1851,14 @@ public final class ModCraftingRecipes { 'N', new ItemStack(Blocks.noteblock)); recipeCacophonium = BotaniaAPI.getLatestAddedRecipe(); + // Manastorm Charge Recipe + addOreDictRecipe(new ItemStack(ModBlocks.manaBomb), + "LTL", "TGT", "LTL", + 'L', LibOreDict.LIVING_WOOD, + 'T', new ItemStack(Blocks.tnt), + 'G', LibOreDict.LIFE_ESSENCE); + recipeManaBomb = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block/Nugget Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 1774f8f04..605efade7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -57,7 +57,7 @@ public class EntityManaStorm extends Entity { deathTime++; if(deathTime >= DEATH_TIME) { setDead(); - worldObj.createExplosion(this, posX, posY, posZ, 10F, true); + worldObj.newExplosion(this, posX, posY, posZ, 8F, true, true); } } } @@ -69,7 +69,7 @@ public class EntityManaStorm extends Entity { float motionModifier = 0.5F; burst.setColor(0x20FF20); burst.setMana(120); - burst.setStartingMana(420); + burst.setStartingMana(320); burst.setMinManaLoss(50); burst.setManaLossPerTick(1F); burst.setGravity(0F); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index b5efcad60..547cbeb3c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -154,6 +154,7 @@ public final class LexiconData { public static LexiconEntry ghostRail; public static LexiconEntry canopyDrum; public static LexiconEntry cocoon; + public static LexiconEntry manaBomb; public static LexiconEntry manaBlaster; public static LexiconEntry grassSeeds; @@ -619,6 +620,9 @@ public final class LexiconData { cocoon = Botania.gardenOfGlassLoaded ? new BLexiconEntry(LibLexicon.DEVICE_COCOON, categoryDevices) : new ALexiconEntry(LibLexicon.DEVICE_COCOON, categoryDevices); cocoon.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCocoon)); + + manaBomb = new ALexiconEntry(LibLexicon.DEVICE_MANA_BOMB, categoryDevices); + manaBomb.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaBomb)); // TOOLS ENTRIES manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index ed66affb4..9c0d1569e 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -124,6 +124,7 @@ public final class LibLexicon { public static final String DEVICE_GHOST_RAIL = "ghostRail"; 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 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 a3d1c6f75..51ebd53e9 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2226,6 +2226,11 @@ botania.entry.cocoon=Cocoon of Caprice botania.page.cocoon0=A cocoon is usually a symbol of change, of evolution.
Creating a &1Cocoon of Carpice&0 and placing it down will slowly evolve the rudimentary contents inside it into a &1Baby Animal&0. More often than not the animal hatched will be a farm animal, but on rare ocasions, different animals such as &1Wolves&0 or &1Horses&0 may be created. botania.page.cocoon1=New World, Perfect World +# -- MANASTORM CHARGE +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... + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Mana Blaster