diff --git a/build.properties b/build.properties index fbe22bf..368db47 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,3 @@ -mod_version=r7.3 +mod_version=r7.4 mod_name=Tainted-Magic minecraft_version=1.7.10 \ No newline at end of file diff --git a/src/main/java/taintedmagic/common/items/wand/ItemFocusTaintedBlast.java b/src/main/java/taintedmagic/common/items/wand/ItemFocusTaintedBlast.java index a2c98ba..158a83b 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemFocusTaintedBlast.java +++ b/src/main/java/taintedmagic/common/items/wand/ItemFocusTaintedBlast.java @@ -1,10 +1,10 @@ package taintedmagic.common.items.wand; -import java.util.Iterator; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; @@ -96,30 +96,28 @@ public class ItemFocusTaintedBlast extends ItemFocusBasic public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) { - Iterator i$; ItemWandCasting wand = (ItemWandCasting) s.getItem(); - int potency = wand.getFocusPotency(s); + int pot = wand.getFocusPotency(s); if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) { - List entities = p.worldObj.getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(p.posX, p.posY, p.posZ, p.posX + 1, p.posY + 1, p.posZ + 1).expand(15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge))); - if ( (entities != null) && (entities.size() > 0)) for (i$ = entities.iterator(); i$.hasNext();) + List ents = w.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(p.posX, p.posY, p.posZ, p.posX + 1, p.posY + 1, p.posZ + 1).expand(15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge))); + if (ents != null && ents.size() > 0) { - Object ent = i$.next(); - Entity eo = (Entity) ent; - - if (eo != p) + for (int a = 0; a < ents.size(); a++) { - if (eo.isEntityAlive() && !eo.isEntityInvulnerable()) + Entity e = ents.get(a); + + if (e != p && e.isEntityAlive() && !e.isEntityInvulnerable()) { - double d = TaintedMagicHelper.getDistanceTo(eo.posX, eo.posY, eo.posZ, p); - if (d < 7.0D) + double dist = TaintedMagicHelper.getDistanceTo(e.posX, e.posY, e.posZ, p); + if (dist < 7.0D) { - eo.attackEntityFrom(DamageSource.magic, 2.0F); + e.attackEntityFrom(DamageSource.magic, 2.0F); } + Vector3 movement = TaintedMagicHelper.getDistanceBetween(e, p); + e.addVelocity(movement.x * 3, 0.8, movement.z * 3); } - Vector3 movement = TaintedMagicHelper.getDistanceBetween(eo, p); - eo.addVelocity(movement.x * 3, 0.8, movement.z * 3); } } w.playSoundAtEntity(p, "taintedmagic:shockwave", 5.0F, 1.0F * (float) Math.random()); diff --git a/src/main/java/taintedmagic/common/lib/LibStrings.java b/src/main/java/taintedmagic/common/lib/LibStrings.java index e75e22e..d44cd86 100644 --- a/src/main/java/taintedmagic/common/lib/LibStrings.java +++ b/src/main/java/taintedmagic/common/lib/LibStrings.java @@ -4,6 +4,6 @@ public class LibStrings { public static final String MODID = "TaintedMagic"; public static final String NAME = "Tainted Magic"; - public static final String VERSION = "r7.3"; + public static final String VERSION = "r7.4"; public static final String DEPENDENCIES = "required-after:Forge@[10.13.2.1291,);required-after:Thaumcraft@[4.2.3.5,);after:ThaumicTinkerer"; } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index f9368de..681c7f8 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "TaintedMagic", "name": "Tainted Magic", "description": "A TC4 addon that brings you to the dark side of Thaumaturgy...", - "version": "r7.3", + "version": "r7.4", "mcversion": "1.7.10", "url": "http://bitly.com/1HV2VSK", "updateUrl": "", diff --git a/version.txt b/version.txt index f5d9023..a69cb25 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -r7.3 \ No newline at end of file +r7.4 \ No newline at end of file