From 766db75cfac676d1d165b4a66fcff38a37abbaf0 Mon Sep 17 00:00:00 2001 From: Chandler Date: Sat, 31 Jan 2015 10:32:01 -0600 Subject: [PATCH 1/3] Remove Calls to SpellHelper --- .../api/spell/EntitySpellProjectile.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java index bfa5f693..d6ed9986 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java @@ -18,7 +18,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -190,7 +189,7 @@ public class EntitySpellProjectile extends Entity implements IProjectile var16.setBlockBoundsBasedOnState(worldObj, xTile, yTile, zTile); AxisAlignedBB var2 = var16.getCollisionBoundingBoxFromPool(worldObj, xTile, yTile, zTile); - if (var2 != null && var2.isVecInside(SpellHelper.createVec3(posX, posY, posZ))) + if (var2 != null && var2.isVecInside(APISpellHelper.createVec3(posX, posY, posZ))) { inGround = true; } @@ -219,15 +218,15 @@ public class EntitySpellProjectile extends Entity implements IProjectile } } - Vec3 var17 = SpellHelper.createVec3(posX, posY, posZ); - Vec3 var3 = SpellHelper.createVec3(posX + motionX, posY + motionY, posZ + motionZ); + Vec3 var17 = APISpellHelper.createVec3(posX, posY, posZ); + Vec3 var3 = APISpellHelper.createVec3(posX + motionX, posY + motionY, posZ + motionZ); MovingObjectPosition var4 = worldObj.func_147447_a(var17, var3, true, false, false); - var17 = SpellHelper.createVec3(posX, posY, posZ); - var3 = SpellHelper.createVec3(posX + motionX, posY + motionY, posZ + motionZ); + var17 = APISpellHelper.createVec3(posX, posY, posZ); + var3 = APISpellHelper.createVec3(posX + motionX, posY + motionY, posZ + motionZ); if (var4 != null) { - var3 = SpellHelper.createVec3(var4.hitVec.xCoord, var4.hitVec.yCoord, var4.hitVec.zCoord); + var3 = APISpellHelper.createVec3(var4.hitVec.xCoord, var4.hitVec.yCoord, var4.hitVec.zCoord); } Entity var5 = null; From f2916909cd4def0e0f10c73c3474e2c06af4e20b Mon Sep 17 00:00:00 2001 From: Chandler Date: Sat, 31 Jan 2015 10:34:06 -0600 Subject: [PATCH 2/3] Remove Calls to SpellHelper --- .../WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java index afdca1cb..5f2410a2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java @@ -154,7 +154,7 @@ public class APISpellHelper if (!world.isRemote && player instanceof EntityPlayer) d1 += 1.62D; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; - Vec3 vec3 = SpellHelper.createVec3(d0, d1, d2); + Vec3 vec3 = APISpellHelper.createVec3(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); float f4 = MathHelper.sin(-f2 * 0.017453292F - (float) Math.PI); float f5 = -MathHelper.cos(-f1 * 0.017453292F); From e43f313396824ee7ddb0fbff6d24a44f880d712f Mon Sep 17 00:00:00 2001 From: Chandler Date: Sat, 31 Jan 2015 10:37:04 -0600 Subject: [PATCH 3/3] Remove import --- .../WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java index 5f2410a2..7958c621 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java @@ -16,7 +16,6 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class APISpellHelper {