Finish off the Manastorm Charge.

This commit is contained in:
Lizbeth Rika committed 2015-07-25 17:28:14 +01:00
1 parent e934524587
commit cc68144a87
6 files changed
+32 -3

No files matched your search

@@ -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;
}
}
@@ -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",
@@ -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);
@@ -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);
@@ -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";