mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 04:09:40 +00:00
Finishing off the Rod of the Hells.
This commit is contained in:
1 parent
0a58712f7a
commit
3c7ef62187
6 files changed
+35
-21
No files matched your search
@@ -149,6 +149,7 @@ public final class ModCrafingRecipes {
|
||||
public static IRecipe recipeSpectralPlatform;
|
||||
public static List<IRecipe> recipesDreamwoodSpreader;
|
||||
public static IRecipe recipeTornadoRod;
|
||||
public static IRecipe recipeFireRod;
|
||||
|
||||
public static void init() {
|
||||
// Lexicon Recipe
|
||||
@@ -876,6 +877,14 @@ public final class ModCrafingRecipes {
|
||||
'R', LibOreDict.RUNE[3]);
|
||||
recipeTornadoRod = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Rod of the Hells Recipe
|
||||
addOreDictRecipe(new ItemStack(ModItems.fireRod),
|
||||
" R", " T ", "R ",
|
||||
'F', new ItemStack(Items.blaze_powder),
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'R', LibOreDict.RUNE[1]);
|
||||
recipeFireRod = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Mana and Terrasteel Block Recipes
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
|
||||
"III", "III", "III",
|
||||
|
||||
@@ -15,9 +15,7 @@ package vazkii.botania.common.entity;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.DamageSource;
|
||||
@@ -28,16 +26,10 @@ import vazkii.botania.common.core.helper.MathHelper;
|
||||
|
||||
public class EntityFlameRing extends Entity {
|
||||
|
||||
String summoner;
|
||||
|
||||
public EntityFlameRing(World world) {
|
||||
super(world);
|
||||
}
|
||||
|
||||
public EntityFlameRing(World world, String summoner) {
|
||||
super(world);
|
||||
this.summoner = summoner;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void entityInit() {
|
||||
@@ -84,13 +76,13 @@ public class EntityFlameRing extends Entity {
|
||||
|
||||
if(ticksExisted > 45) {
|
||||
AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX, posY, posZ).expand(radius, radius, radius);
|
||||
List<EntityLivingBase> entities = worldObj.getEntitiesWithinAABB(EntityLiving.class, boundingBox);
|
||||
List<EntityLivingBase> entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox);
|
||||
|
||||
if(entities.isEmpty())
|
||||
return;
|
||||
|
||||
for(EntityLivingBase entity : entities) {
|
||||
if(entity == null || (entity instanceof EntityPlayer && ((EntityPlayer)entity).getCommandSenderName().equals(summoner)) || MathHelper.pointDistancePlane(posX, posY, entity.posX, entity.posY) > radius)
|
||||
if(entity == null || MathHelper.pointDistancePlane(posX, posY, entity.posX, entity.posY) > radius)
|
||||
continue;
|
||||
|
||||
entity.setFire(4);
|
||||
@@ -98,18 +90,20 @@ public class EntityFlameRing extends Entity {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void readEntityFromNBT(NBTTagCompound var1) {
|
||||
summoner = var1.getString("summoner");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void writeEntityToNBT(NBTTagCompound var1) {
|
||||
var1.setString("summoner", summoner);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void readEntityFromNBT(NBTTagCompound var1) {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void writeEntityToNBT(NBTTagCompound var1) {
|
||||
// NO-OP
|
||||
}
|
||||
}
|
||||
@@ -27,12 +27,13 @@ public class ItemFireRod extends ItemMod {
|
||||
public ItemFireRod() {
|
||||
setUnlocalizedName(LibItemNames.FIRE_ROD);
|
||||
setMaxStackSize(1);
|
||||
setMaxDamage(COOLDOWN);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, int x, int y, int z, int par7, float par8, float par9, float par10) {
|
||||
if(!par3World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExact(par1ItemStack, player, COST, false)) {
|
||||
EntityFlameRing entity = new EntityFlameRing(player.worldObj, player.getCommandSenderName());
|
||||
EntityFlameRing entity = new EntityFlameRing(player.worldObj);
|
||||
entity.setPosition(x + 0.5, y + 1, z + 0.5);
|
||||
player.worldObj.spawnEntityInWorld(entity);
|
||||
|
||||
|
||||
@@ -127,6 +127,7 @@ public final class LexiconData {
|
||||
public static LexiconEntry spawnerMover;
|
||||
public static LexiconEntry rainbowRod;
|
||||
public static LexiconEntry tornadoRod;
|
||||
public static LexiconEntry fireRod;
|
||||
|
||||
public static LexiconEntry baublesIntro;
|
||||
public static LexiconEntry tinyPlanet;
|
||||
@@ -424,6 +425,9 @@ public final class LexiconData {
|
||||
tornadoRod = new BLexiconEntry(LibLexicon.TOOL_TORNADO_ROD, categoryTools);
|
||||
tornadoRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTornadoRod));
|
||||
|
||||
fireRod = new BLexiconEntry(LibLexicon.TOOL_FIRE_ROD, categoryTools);
|
||||
fireRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeFireRod));
|
||||
|
||||
// BAUBLES ENTRIES
|
||||
baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles);
|
||||
baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2"));
|
||||
|
||||
@@ -105,6 +105,7 @@ public final class LibLexicon {
|
||||
public static final String TOOL_SPAWNER_MOVER = "spawnerMover";
|
||||
public static final String TOOL_RAINBOW_ROD = "rainbowRod";
|
||||
public static final String TOOL_TORNADO_ROD = "tornadoRod";
|
||||
public static final String TOOL_FIRE_ROD = "fireRod";
|
||||
|
||||
public static final String BAUBLE_INTRO = "bIntro";
|
||||
public static final String BAUBLE_TINY_PLANET = "tinyPlanet";
|
||||
|
||||
@@ -1071,6 +1071,11 @@ botania.entry.tornadoRod=Rod of the Skies
|
||||
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.<br>To do so, one would simply hold it like a bow and watch as their momentum increases.<br>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.tornadoRod1=A treasure from Lorule
|
||||
|
||||
# -- ROD OF THE HELLS
|
||||
botania.entry.fireRod=Rod of the Hells
|
||||
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.<br>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
|
||||
|
||||
# - BAUBLES
|
||||
# -- AN INTRODUCTION TO BAUBLES
|
||||
botania.entry.bIntro=An Introduction to Baubles
|
||||
|
||||
Reference in new issue
Block a user