fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed Vec3Pool

Browse Source
This commit is contained in:
AlgorithmX2
2014-06-13 12:42:09 -05:00
parent 5dec6e7003
commit 4763069fab
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/networking/BlockCableBus.java
+1 -1
View File
@@ -334,7 +334,7 @@ public class BlockCableBus extends AEBaseBlock
@Override @Override
public boolean onActivated(World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) 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 @Override
items/tools/powered/ToolMassCannon.java
+2 -2
View File
@@ -121,7 +121,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
double d0 = p.prevPosX + (p.posX - p.prevPosX) * (double) f; 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 d1 = p.prevPosY + (p.posY - p.prevPosY) * (double) f + 1.62D - (double) p.yOffset;
double d2 = p.prevPosZ + (p.posZ - p.prevPosZ) * (double) f; 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 f3 = MathHelper.cos( -f2 * 0.017453292F - (float) Math.PI );
float f4 = MathHelper.sin( -f2 * 0.017453292F - (float) Math.PI ); float f4 = MathHelper.sin( -f2 * 0.017453292F - (float) Math.PI );
float f5 = -MathHelper.cos( -f1 * 0.017453292F ); 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 ); MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, true );
if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > Closeest ) if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > Closeest )
{ {
spatial/StorageWorldProvider.java
+2 -2
View File
@@ -77,7 +77,7 @@ public class StorageWorldProvider extends WorldProvider
@Override @Override
public Vec3 getSkyColor(Entity cameraEntity, float partialTicks) 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 @Override
@@ -102,7 +102,7 @@ public class StorageWorldProvider extends WorldProvider
@Override @Override
public Vec3 getFogColor(float par1, float par2) 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 @Override
util/Platform.java
+3 -3
View File
@@ -1195,7 +1195,7 @@ public class Platform
+ (double) (player.worldObj.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight()); // isRemote + (double) (player.worldObj.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight()); // isRemote
double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; 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 f3 = MathHelper.cos( -f2 * 0.017453292F - (float) Math.PI );
float f4 = MathHelper.sin( -f2 * 0.017453292F - (float) Math.PI ); float f4 = MathHelper.sin( -f2 * 0.017453292F - (float) Math.PI );
float f5 = -MathHelper.cos( -f1 * 0.017453292F ); 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 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 d1 = p.prevPosY + (p.posY - p.prevPosY) * (double) f + 1.62D - (double) p.yOffset;
double d2 = p.prevPosZ + (p.posZ - p.prevPosZ) * (double) f; 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 f3 = MathHelper.cos( -f2 * 0.017453292F - (float) Math.PI );
float f4 = MathHelper.sin( -f2 * 0.017453292F - (float) Math.PI ); float f4 = MathHelper.sin( -f2 * 0.017453292F - (float) Math.PI );
float f5 = -MathHelper.cos( -f1 * 0.017453292F ); float f5 = -MathHelper.cos( -f1 * 0.017453292F );
@@ -1281,7 +1281,7 @@ public class Platform
if ( hitBlocks ) if ( hitBlocks )
{ {
Srec = w.getWorldVec3Pool().getVecFromPool( d0, d1, d2 ); Srec = Vec3.createVectorHelper( d0, d1, d2 );
pos = w.rayTraceBlocks( vec3, vec31, true ); pos = w.rayTraceBlocks( vec3, vec31, true );
} }