From d03d1f1cedf207133df6f29a1d7f5fcebca114b9 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 24 Nov 2014 19:35:21 +0000 Subject: [PATCH] Leaving this unfinished since I really don't feel like doing much more today. --- .../common/core/BotaniaCreativeTab.java | 1 + .../common/entity/EntityMagicMissile.java | 115 ++++++++++++++++++ .../botania/common/entity/ModEntities.java | 2 + .../vazkii/botania/common/item/ModItems.java | 3 + .../common/item/rod/ItemMissileRod.java | 85 +++++++++++++ .../botania/common/lib/LibEntityNames.java | 1 + .../botania/common/lib/LibItemNames.java | 1 + .../botania/textures/items/missileRod.png | Bin 0 -> 3244 bytes 8 files changed, 208 insertions(+) create mode 100644 src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java create mode 100644 src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java create mode 100644 src/main/resources/assets/botania/textures/items/missileRod.png diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 077e29f01..88e22445d 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -82,6 +82,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.fireRod); addItem(ModItems.diviningRod); addItem(ModItems.gravityRod); + addItem(ModItems.missileRod); addItem(ModItems.virus); addItem(ModItems.slingshot); addItem(ModItems.vineBall); diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java new file mode 100644 index 000000000..3f9dcab32 --- /dev/null +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.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 @ [Nov 24, 2014, 5:58:22 PM (GMT)] + */ +package vazkii.botania.common.entity; + +import java.util.List; + +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.mana.IManaCollisionGhost; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.Vector3; +import net.minecraft.block.Block; +import net.minecraft.block.BlockBush; +import net.minecraft.block.BlockLeaves; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class EntityMagicMissile extends EntityThrowable { + + EntityLivingBase target; + + public EntityMagicMissile(World world) { + super(world); + setSize(0F, 0F); + } + + @Override + public void onUpdate() { + super.onUpdate(); + + if(!worldObj.isRemote && !getTarget()) { + setDead(); + return; + } + + Vector3 thisVec = Vector3.fromEntityCenter(this); + Vector3 oldPos = new Vector3(lastTickPosX, lastTickPosY, lastTickPosZ); + Vector3 diff = thisVec.copy().sub(oldPos); + Vector3 step = diff.copy().normalize().multiply(0.05); + int steps = (int) (diff.mag() / step.mag()); + Vector3 particlePos = oldPos.copy(); + + for(int i = 0; i < steps; i++) { + Botania.proxy.sparkleFX(worldObj, particlePos.x, particlePos.y, particlePos.z, 1F, 0.4F, 1F, 0.8F, 2); + if(worldObj.rand.nextInt(steps) <= 1) + Botania.proxy.sparkleFX(worldObj, particlePos.x + (Math.random() - 0.5) * 0.4, particlePos.y + (Math.random() - 0.5) * 0.4, particlePos.z + (Math.random() - 0.5) * 0.4, 1F, 0.4F, 1F, 0.8F, 2); + + particlePos.add(step); + } + + if(!worldObj.isRemote) { + Vector3 targetVec = Vector3.fromEntityCenter(target); + Vector3 motionVec = targetVec.copy().sub(thisVec).normalize().multiply(0.6); + motionX = motionVec.x; + motionY = motionVec.y; + if(ticksExisted < 10) + motionY = Math.abs(motionY); + motionZ = motionVec.z; + + List targetList = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5)); + if(targetList.contains(target) && target != null) { + EntityLivingBase thrower = getThrower(); + EntityPlayer player = thrower instanceof EntityPlayer ? (EntityPlayer) thrower : null; + target.attackEntityFrom(player == null ? DamageSource.generic : DamageSource.causePlayerDamage(player), 5); + setDead(); + } + } + } + + public boolean getTarget() { + if(target != null && target.getHealth() > 0 && !target.isDead && worldObj.getLoadedEntityList().contains(target)) + return true; + target = null; + + double range = 12; + List entities = worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); + while(entities.size() > 0) { + IMob mob = entities.get(worldObj.rand.nextInt(entities.size())); + if(!(mob instanceof EntityLivingBase)) { // Just in case... + entities.remove(mob); + continue; + } + + target = (EntityLivingBase) mob; + break; + } + + return target != null; + } + + @Override + protected void onImpact(MovingObjectPosition pos) { + Block block = worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); + + if(!(block instanceof BlockBush) && !(block instanceof BlockLeaves) && (pos.entityHit == null || target == pos.entityHit)) + setDead(); + } + +} diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index f8ad6405b..1321e1495 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -19,6 +19,7 @@ public final class ModEntities { public static void init() { int id = 0; + 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); @@ -28,6 +29,7 @@ public final class ModEntities { EntityRegistry.registerModEntity(EntityMagicLandmine.class, LibEntityNames.MAGIC_LANDMINE, id++, Botania.instance, 128, 40, false); EntityRegistry.registerModEntity(EntitySpark.class, LibEntityNames.SPARK, id++, Botania.instance, 64, 10, false); EntityRegistry.registerModEntity(EntityThrownItem.class, LibEntityNames.THROWN_ITEM, id++, Botania.instance, 64, 20, true); + EntityRegistry.registerModEntity(EntityMagicMissile.class, LibEntityNames.MAGIC_MISSILE, id++, Botania.instance, 64, 10, true); } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 6f61774e6..6a3c6ac11 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -79,6 +79,7 @@ import vazkii.botania.common.item.rod.ItemDirtRod; import vazkii.botania.common.item.rod.ItemDiviningRod; import vazkii.botania.common.item.rod.ItemFireRod; import vazkii.botania.common.item.rod.ItemGravityRod; +import vazkii.botania.common.item.rod.ItemMissileRod; import vazkii.botania.common.item.rod.ItemRainbowRod; import vazkii.botania.common.item.rod.ItemSkyDirtRod; import vazkii.botania.common.item.rod.ItemTerraformRod; @@ -180,6 +181,7 @@ public final class ModItems { public static Item brewVial; public static Item brewFlask; public static Item bloodPendant; + public static Item missileRod; public static void init() { lexicon = new ItemLexicon(); @@ -274,6 +276,7 @@ public final class ModItems { brewVial = new ItemBrewVial(); brewFlask = new ItemBrewFlask(); bloodPendant = new ItemBloodPendant(); + missileRod = new ItemMissileRod(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java new file mode 100644 index 000000000..e6861afbe --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -0,0 +1,85 @@ +/** + * 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 @ [Nov 24, 2014, 5:58:16 PM (GMT)] + */ +package vazkii.botania.common.item.rod; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockFlower; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.subtile.ISpecialFlower; +import vazkii.botania.common.Botania; +import vazkii.botania.common.entity.EntityMagicMissile; +import vazkii.botania.common.item.ItemMod; +import vazkii.botania.common.item.rod.ItemTerraformRod.CoordsWithBlock; +import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; + +public class ItemMissileRod extends ItemMod implements IManaUsingItem { + + private static final int COST_PER = 120; + + public ItemMissileRod() { + super(); + setMaxStackSize(1); + setUnlocalizedName(LibItemNames.MISSILE_ROD); + } + + @Override + public EnumAction getItemUseAction(ItemStack par1ItemStack) { + return EnumAction.bow; + } + + @Override + public int getMaxItemUseDuration(ItemStack par1ItemStack) { + return 72000; + } + + @Override + public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { + if(count != getMaxItemUseDuration(stack) && count % 2 == 0 && !player.worldObj.isRemote && ManaItemHandler.requestManaExact(stack, player, COST_PER, false)) { + EntityMagicMissile missile = new EntityMagicMissile(player.worldObj); + missile.setPosition(player.posX + (Math.random() - 0.5 * 0.1), player.posY + 2.4 + (Math.random() - 0.5 * 0.1), player.posZ + (Math.random() - 0.5 * 0.1)); + if(missile.getTarget()) { + player.worldObj.spawnEntityInWorld(missile); + ManaItemHandler.requestManaExact(stack, player, COST_PER, true); + } + Botania.proxy.sparkleFX(player.worldObj, player.posX, player.posY + 2.4, player.posZ, 1F, 0.4F, 1F, 6F, 6); + } + } + + @Override + public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); + return par1ItemStack; + } + + @Override + public boolean isFull3D() { + return true; + } + + @Override + public boolean usesMana(ItemStack stack) { + return true; + } +} diff --git a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java index e2c5e9252..2716f8559 100644 --- a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java @@ -24,5 +24,6 @@ public final class LibEntityNames { public static final String MAGIC_LANDMINE = LibResources.PREFIX_MOD + "magicLandmine"; public static final String SPARK = LibResources.PREFIX_MOD + "spark"; public static final String THROWN_ITEM = LibResources.PREFIX_MOD + "thrownItem"; + public static final String MAGIC_MISSILE = LibResources.PREFIX_MOD + "magicMissile"; } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 4e95b6c2d..dd1737647 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -106,6 +106,7 @@ public final class LibItemNames { public static final String BREW_VIAL = "brewVial"; public static final String BREW_FLASK = "brewFlask"; public static final String BLOOD_PENDANT = "bloodPendant"; + public static final String MISSILE_ROD = "missileRod"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/resources/assets/botania/textures/items/missileRod.png b/src/main/resources/assets/botania/textures/items/missileRod.png new file mode 100644 index 0000000000000000000000000000000000000000..c047bbfee133b0b90c3f98803bcd8b2714bcaad6 GIT binary patch literal 3244 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 literal 0 HcmV?d00001