From 9b2ef03340025e9be974ee40162be34e3e5f139b Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Jun 2014 02:06:46 +0100 Subject: [PATCH] Added the Rod of the Hells. Particle spam woot. --- .../common/core/BotaniaCreativeTab.java | 1 + .../common/core/helper/MathHelper.java | 4 + .../common/entity/EntityFlameRing.java | 115 ++++++++++++++++++ .../botania/common/entity/ModEntities.java | 1 + .../botania/common/item/ItemFireRod.java | 58 +++++++++ .../vazkii/botania/common/item/ModItems.java | 4 +- .../botania/common/lib/LibEntityNames.java | 1 + .../botania/common/lib/LibItemNames.java | 1 + resources/assets/botania/lang/en_US.lang | 1 + .../assets/botania/textures/items/fireRod.png | Bin 0 -> 3277 bytes .../botania/textures/items/fireRod.png.mcmeta | 19 +++ 11 files changed, 204 insertions(+), 1 deletion(-) create mode 100644 MODSRC/vazkii/botania/common/entity/EntityFlameRing.java create mode 100644 MODSRC/vazkii/botania/common/item/ItemFireRod.java create mode 100644 resources/assets/botania/textures/items/fireRod.png create mode 100644 resources/assets/botania/textures/items/fireRod.png.mcmeta diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 8fcbcc3fa..d0b93ae53 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -69,6 +69,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.spawnerMover); addItem(ModItems.rainbowRod); addItem(ModItems.tornadoRod); + addItem(ModItems.fireRod); addBlock(ModBlocks.forestDrum); addBlock(ModBlocks.forestEye); diff --git a/MODSRC/vazkii/botania/common/core/helper/MathHelper.java b/MODSRC/vazkii/botania/common/core/helper/MathHelper.java index 9ed30a412..c0dc39357 100644 --- a/MODSRC/vazkii/botania/common/core/helper/MathHelper.java +++ b/MODSRC/vazkii/botania/common/core/helper/MathHelper.java @@ -18,6 +18,10 @@ public final class MathHelper { public static float pointDistanceSpace(double x1, double y1, double z1, double x2, double y2, double z2) { return (float) Math.sqrt(Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2) + Math.pow(z1 - z2, 2)); } + + public static float pointDistancePlane(double x1, double y1, double x2, double y2) { + return (float) Math.sqrt(Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2)); + } public static void setEntityMotionFromVector(Entity entity, Vector3 originalPosVector, float modifier) { Vector3 entityVector = Vector3.fromEntityCenter(entity); diff --git a/MODSRC/vazkii/botania/common/entity/EntityFlameRing.java b/MODSRC/vazkii/botania/common/entity/EntityFlameRing.java new file mode 100644 index 000000000..1105dfc36 --- /dev/null +++ b/MODSRC/vazkii/botania/common/entity/EntityFlameRing.java @@ -0,0 +1,115 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jun 26, 2014, 12:31:10 AM (GMT)] + */ +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; +import net.minecraft.world.World; +import vazkii.botania.common.Botania; +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() { + setSize(0F, 0F); + } + + @Override + public void onEntityUpdate() { + super.onEntityUpdate(); + + float radius = 5F; + float renderRadius = (float) (radius - Math.random()); + + for(int i = 0; i < Math.min(90, ticksExisted); i++) { + float a = i; + if(a % 2 == 0) + a = 45 + a; + + if(worldObj.rand.nextInt(ticksExisted < 90 ? 8 : 20) == 0) { + float rad = (float) ((a * 4) * Math.PI / 180F); + double x = Math.cos(rad) * renderRadius; + double z = Math.sin(rad) * renderRadius; + + Botania.proxy.wispFX(worldObj, posX + x, posY - 0.2, posZ + z, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.65F + (float) Math.random() * 0.45F, (float) (Math.random() - 0.5F) * 0.15F, 0.055F + (float) Math.random() * 0.025F, (float) (Math.random() - 0.5F) * 0.15F); + + float gs = (float) Math.random() * 0.15F; + float smokeRadius = (float) (renderRadius - Math.random() * renderRadius); + x = Math.cos(rad) * smokeRadius; + z = Math.sin(rad) * smokeRadius; + Botania.proxy.wispFX(worldObj, posX + x, posY - 0.2, posZ + z, gs, gs, gs, 0.65F + (float) Math.random() * 0.45F, -0.155F - (float) Math.random() * 0.025F); + } + } + + if(worldObj.rand.nextInt(20) == 0) + worldObj.playSoundAtEntity(this, "fire.fire", 1F, 1F); + + if(worldObj.isRemote) + return; + + if(ticksExisted >= 300) { + setDead(); + return; + } + + if(ticksExisted > 45) { + AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX, posY, posZ).expand(radius, radius, radius); + List entities = worldObj.getEntitiesWithinAABB(EntityLiving.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) + continue; + + entity.setFire(4); + } + } + } + + @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; + } +} \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/entity/ModEntities.java b/MODSRC/vazkii/botania/common/entity/ModEntities.java index 844900c36..4c3e707fc 100644 --- a/MODSRC/vazkii/botania/common/entity/ModEntities.java +++ b/MODSRC/vazkii/botania/common/entity/ModEntities.java @@ -22,6 +22,7 @@ public final class ModEntities { EntityRegistry.registerModEntity(EntityManaBurst.class, LibEntityNames.MANA_BURST, id++, Botania.instance, 64, 10, true); EntityRegistry.registerModEntity(EntitySignalFlare.class, LibEntityNames.SIGNAL_FLARE, id++, Botania.instance, 2048, 10, false); EntityRegistry.registerModEntity(EntityPixie.class, LibEntityNames.PIXIE, id++, Botania.instance, 16, 3, true); + EntityRegistry.registerModEntity(EntityFlameRing.class, LibEntityNames.FLAME_RING, id++, Botania.instance, 32, 40, false); } } diff --git a/MODSRC/vazkii/botania/common/item/ItemFireRod.java b/MODSRC/vazkii/botania/common/item/ItemFireRod.java new file mode 100644 index 000000000..48336a227 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/ItemFireRod.java @@ -0,0 +1,58 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jun 26, 2014, 12:08:06 AM (GMT)] + */ +package vazkii.botania.common.item; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.entity.EntityFlameRing; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemFireRod extends ItemMod { + + private static final int COST = 900; + private static final int COOLDOWN = 1200; + + public ItemFireRod() { + setUnlocalizedName(LibItemNames.FIRE_ROD); + setMaxStackSize(1); + } + + @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()); + entity.setPosition(x + 0.5, y + 1, z + 0.5); + player.worldObj.spawnEntityInWorld(entity); + + par1ItemStack.setItemDamage(COOLDOWN); + ManaItemHandler.requestManaExact(par1ItemStack, player, COST, true); + par3World.playSoundAtEntity(player, "mob.blaze.breathe", 1F, 1F); + } + + return true; + } + + @Override + public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + if(par1ItemStack.isItemDamaged()) + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + } + + @Override + public boolean isFull3D() { + return true; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 1d9103b93..ec5abaa09 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -127,6 +127,7 @@ public final class ModItems { public static Item superTravelBelt; public static Item rainbowRod; public static Item tornadoRod; + public static Item fireRod; public static void init() { lexicon = new ItemLexicon(); @@ -196,7 +197,8 @@ public final class ModItems { superTravelBelt = new ItemSuperTravelBelt(); rainbowRod = new ItemRainbowRod(); tornadoRod = new ItemTornadoRod(); - + fireRod = new ItemFireRod(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/MODSRC/vazkii/botania/common/lib/LibEntityNames.java b/MODSRC/vazkii/botania/common/lib/LibEntityNames.java index b39a28b82..0b3cc9892 100644 --- a/MODSRC/vazkii/botania/common/lib/LibEntityNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibEntityNames.java @@ -18,5 +18,6 @@ public final class LibEntityNames { public static final String MANA_BURST = LibResources.PREFIX_MOD + "manaBurst"; public static final String SIGNAL_FLARE = LibResources.PREFIX_MOD + "signalFlare"; public static final String PIXIE = LibResources.PREFIX_MOD + "pixie"; + public static final String FLAME_RING = LibResources.PREFIX_MOD + "flameRing"; } diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 0d13de961..345ec515e 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -80,6 +80,7 @@ public final class LibItemNames { public static final String SUPER_TRAVEL_BELT = "superTravelBelt"; public static final String RAINBOW_ROD = "rainbowRod"; public static final String TORNADO_ROD = "tornadoRod"; + public static final String FIRE_ROD = "fireRod"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 2c5a0de66..7eb08fa68 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -512,6 +512,7 @@ item.botania:pixieRing.name=Great Fairy Ring item.botania:superTravelBelt.name=Globetrotter's Sash item.botania:rainbowRod.name=Rod of Bifrost item.botania:tornadoRod.name=Rod of the Skies +item.botania:fireRod.name=Rod of the Hells # GUI TEXT botania.gui.lexicon.header=Lexica Botania, %s Edition's Index - Pick which category you would like to study: diff --git a/resources/assets/botania/textures/items/fireRod.png b/resources/assets/botania/textures/items/fireRod.png new file mode 100644 index 0000000000000000000000000000000000000000..710a8c1c7e80c7089eb8901f2e841fe9c24d2abd GIT binary patch literal 3277 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 LNkvXXu0mjf