From 4763069fabde4084d59c948e32f44e4314829980 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Fri, 13 Jun 2014 12:42:09 -0500 Subject: [PATCH] Removed Vec3Pool --- block/networking/BlockCableBus.java | 2 +- items/tools/powered/ToolMassCannon.java | 4 ++-- spatial/StorageWorldProvider.java | 4 ++-- util/Platform.java | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/block/networking/BlockCableBus.java b/block/networking/BlockCableBus.java index ee97652e..e000b679 100644 --- a/block/networking/BlockCableBus.java +++ b/block/networking/BlockCableBus.java @@ -334,7 +334,7 @@ public class BlockCableBus extends AEBaseBlock @Override public boolean onActivated(World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return cb( w, x, y, z ).activate( player, w.getWorldVec3Pool().getVecFromPool( hitX, hitY, hitZ ) ); + return cb( w, x, y, z ).activate( player, Vec3.createVectorHelper( hitX, hitY, hitZ ) ); } @Override diff --git a/items/tools/powered/ToolMassCannon.java b/items/tools/powered/ToolMassCannon.java index db96e7ec..260a0b46 100644 --- a/items/tools/powered/ToolMassCannon.java +++ b/items/tools/powered/ToolMassCannon.java @@ -121,7 +121,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell double d0 = p.prevPosX + (p.posX - p.prevPosX) * (double) f; double d1 = p.prevPosY + (p.posY - p.prevPosY) * (double) f + 1.62D - (double) p.yOffset; double d2 = p.prevPosZ + (p.posZ - p.prevPosZ) * (double) f; - Vec3 vec3 = w.getWorldVec3Pool().getVecFromPool( d0, d1, d2 ); + Vec3 vec3 = Vec3.createVectorHelper( 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 ); @@ -177,7 +177,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } } - Vec3 Srec = w.getWorldVec3Pool().getVecFromPool( d0, d1, d2 ); + Vec3 Srec = Vec3.createVectorHelper( d0, d1, d2 ); MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, true ); if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > Closeest ) { diff --git a/spatial/StorageWorldProvider.java b/spatial/StorageWorldProvider.java index bf312277..adb81085 100644 --- a/spatial/StorageWorldProvider.java +++ b/spatial/StorageWorldProvider.java @@ -77,7 +77,7 @@ public class StorageWorldProvider extends WorldProvider @Override public Vec3 getSkyColor(Entity cameraEntity, float partialTicks) { - return this.worldObj.getWorldVec3Pool().getVecFromPool( 0.0, 0.0, 0.0 ); + return Vec3.createVectorHelper( 0.0, 0.0, 0.0 ); } @Override @@ -102,7 +102,7 @@ public class StorageWorldProvider extends WorldProvider @Override public Vec3 getFogColor(float par1, float par2) { - return this.worldObj.getWorldVec3Pool().getVecFromPool( 0.0, 0.0, 0.0 ); + return Vec3.createVectorHelper( 0.0, 0.0, 0.0 ); } @Override diff --git a/util/Platform.java b/util/Platform.java index 8857301d..35140c90 100644 --- a/util/Platform.java +++ b/util/Platform.java @@ -1195,7 +1195,7 @@ public class Platform + (double) (player.worldObj.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight()); // isRemote double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; - Vec3 vec3 = player.worldObj.getWorldVec3Pool().getVecFromPool( d0, d1, d2 ); + Vec3 vec3 = Vec3.createVectorHelper( 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 ); @@ -1222,7 +1222,7 @@ public class Platform double d0 = p.prevPosX + (p.posX - p.prevPosX) * (double) f; double d1 = p.prevPosY + (p.posY - p.prevPosY) * (double) f + 1.62D - (double) p.yOffset; double d2 = p.prevPosZ + (p.posZ - p.prevPosZ) * (double) f; - Vec3 vec3 = w.getWorldVec3Pool().getVecFromPool( d0, d1, d2 ); + Vec3 vec3 = Vec3.createVectorHelper( 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 ); @@ -1281,7 +1281,7 @@ public class Platform if ( hitBlocks ) { - Srec = w.getWorldVec3Pool().getVecFromPool( d0, d1, d2 ); + Srec = Vec3.createVectorHelper( d0, d1, d2 ); pos = w.rayTraceBlocks( vec3, vec31, true ); }