Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '6.0.x' into 6.1.x

Browse source
This commit is contained in:
SpaceToad 2014-06-14 18:02:56 +02:00
commit 149e65d2c1
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/buildcraft/builders/BlockMarker.java
View file

@ -43,17 +43,17 @@ public class BlockMarker extends BlockContainer {
ForgeDirection dir = ForgeDirection.getOrientation(meta); ForgeDirection dir = ForgeDirection.getOrientation(meta);
switch (dir) { switch (dir) {
case DOWN: case DOWN:
return AxisAlignedBB.getAABBPool().getAABB(0.5F - w, 1F - h, 0.5F - w, 0.5F + w, 1F, 0.5F + w); return AxisAlignedBB.getBoundingBox(0.5F - w, 1F - h, 0.5F - w, 0.5F + w, 1F, 0.5F + w);
case UP: case UP:
return AxisAlignedBB.getAABBPool().getAABB(0.5F - w, 0F, 0.5F - w, 0.5F + w, h, 0.5F + w); return AxisAlignedBB.getBoundingBox(0.5F - w, 0F, 0.5F - w, 0.5F + w, h, 0.5F + w);
case SOUTH: case SOUTH:
return AxisAlignedBB.getAABBPool().getAABB(0.5F - w, 0.5F - w, 0F, 0.5F + w, 0.5F + w, h); return AxisAlignedBB.getBoundingBox(0.5F - w, 0.5F - w, 0F, 0.5F + w, 0.5F + w, h);
case NORTH: case NORTH:
return AxisAlignedBB.getAABBPool().getAABB(0.5F - w, 0.5F - w, 1 - h, 0.5F + w, 0.5F + w, 1); return AxisAlignedBB.getBoundingBox(0.5F - w, 0.5F - w, 1 - h, 0.5F + w, 0.5F + w, 1);
case EAST: case EAST:
return AxisAlignedBB.getAABBPool().getAABB(0F, 0.5F - w, 0.5F - w, h, 0.5F + w, 0.5F + w); return AxisAlignedBB.getBoundingBox(0F, 0.5F - w, 0.5F - w, h, 0.5F + w, 0.5F + w);
default: default:
return AxisAlignedBB.getAABBPool().getAABB(1 - h, 0.5F - w, 0.5F - w, 1F, 0.5F + w, 0.5F + w); return AxisAlignedBB.getBoundingBox(1 - h, 0.5F - w, 0.5F - w, 1F, 0.5F + w, 0.5F + w);
} }
} }

4
common/buildcraft/builders/urbanism/EntityUrbanist.java
View file

@ -56,7 +56,7 @@ public class EntityUrbanist extends EntityLivingBase {
public void onUpdate() { public void onUpdate() {
Vec3 look = this.getLook(1.0F).normalize(); Vec3 look = this.getLook(1.0F).normalize();
Vec3 worldUp = worldObj.getWorldVec3Pool().getVecFromPool(0, 1, 0); Vec3 worldUp = Vec3.createVectorHelper(0, 1, 0);
Vec3 side = worldUp.crossProduct(look).normalize(); Vec3 side = worldUp.crossProduct(look).normalize();
Vec3 forward = side.crossProduct(worldUp).normalize(); Vec3 forward = side.crossProduct(worldUp).normalize();
@ -158,7 +158,7 @@ public class EntityUrbanist extends EntityLivingBase {
look = this.getLook(1.0F).normalize(); look = this.getLook(1.0F).normalize();
Vec3 aimed = worldObj.getWorldVec3Pool().getVecFromPool( Vec3 aimed = Vec3.createVectorHelper(
localPos.xCoord + look.xCoord * 200, localPos.xCoord + look.xCoord * 200,
localPos.yCoord + look.yCoord * 200, localPos.yCoord + look.yCoord * 200,
localPos.zCoord + look.zCoord * 200); localPos.zCoord + look.zCoord * 200);

2
common/buildcraft/energy/BlockEngine.java
View file

@ -166,7 +166,7 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight {
if (tile instanceof TileEngine) { if (tile instanceof TileEngine) {
return boxes[((TileEngine) tile).orientation.ordinal()]; return boxes[((TileEngine) tile).orientation.ordinal()];
} else { } else {
return new AxisAlignedBB[]{AxisAlignedBB.getAABBPool().getAABB(0.0, 0.0, 0.0, 1.0, 1.0, 1.0)}; return new AxisAlignedBB[]{AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 1.0, 1.0, 1.0)};
} }
} }

14
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -310,7 +310,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
double eyeHeight = world.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight(); double eyeHeight = world.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight();
Vec3 lookVec = player.getLookVec(); Vec3 lookVec = player.getLookVec();
Vec3 origin = world.getWorldVec3Pool().getVecFromPool(player.posX, player.posY + eyeHeight, player.posZ); Vec3 origin = Vec3.createVectorHelper(player.posX, player.posY + eyeHeight, player.posZ);
Vec3 direction = origin.addVector(lookVec.xCoord * reachDistance, lookVec.yCoord * reachDistance, lookVec.zCoord * reachDistance); Vec3 direction = origin.addVector(lookVec.xCoord * reachDistance, lookVec.yCoord * reachDistance, lookVec.zCoord * reachDistance);
return doRayTrace(world, x, y, z, origin, direction); return doRayTrace(world, x, y, z, origin, direction);
@ -469,7 +469,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
bounds[2][1] = max; bounds[2][1] = max;
MatrixTranformations.transform(bounds, side); MatrixTranformations.transform(bounds, side);
return AxisAlignedBB.getAABBPool().getAABB(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); return AxisAlignedBB.getBoundingBox(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]);
} }
private AxisAlignedBB getFacadeBoundingBox(ForgeDirection side) { private AxisAlignedBB getFacadeBoundingBox(ForgeDirection side) {
@ -485,7 +485,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
bounds[2][1] = 1.0F; bounds[2][1] = 1.0F;
MatrixTranformations.transform(bounds, side); MatrixTranformations.transform(bounds, side);
return AxisAlignedBB.getAABBPool().getAABB(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); return AxisAlignedBB.getBoundingBox(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]);
} }
private AxisAlignedBB getPlugBoundingBox(ForgeDirection side) { private AxisAlignedBB getPlugBoundingBox(ForgeDirection side) {
@ -501,7 +501,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
bounds[2][1] = 0.75F; bounds[2][1] = 0.75F;
MatrixTranformations.transform(bounds, side); MatrixTranformations.transform(bounds, side);
return AxisAlignedBB.getAABBPool().getAABB(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); return AxisAlignedBB.getBoundingBox(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]);
} }
private AxisAlignedBB getRobotStationBoundingBox(ForgeDirection side) { private AxisAlignedBB getRobotStationBoundingBox(ForgeDirection side) {
@ -517,7 +517,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
bounds[2][1] = 0.75F; bounds[2][1] = 0.75F;
MatrixTranformations.transform(bounds, side); MatrixTranformations.transform(bounds, side);
return AxisAlignedBB.getAABBPool().getAABB(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); return AxisAlignedBB.getBoundingBox(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]);
} }
private AxisAlignedBB getPipeBoundingBox(ForgeDirection side) { private AxisAlignedBB getPipeBoundingBox(ForgeDirection side) {
@ -525,7 +525,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
float max = CoreConstants.PIPE_MAX_POS; float max = CoreConstants.PIPE_MAX_POS;
if (side == ForgeDirection.UNKNOWN) { if (side == ForgeDirection.UNKNOWN) {
return AxisAlignedBB.getAABBPool().getAABB(min, min, min, max, max, max); return AxisAlignedBB.getBoundingBox(min, min, min, max, max, max);
} }
float[][] bounds = new float[3][2]; float[][] bounds = new float[3][2];
@ -540,7 +540,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
bounds[2][1] = max; bounds[2][1] = max;
MatrixTranformations.transform(bounds, side); MatrixTranformations.transform(bounds, side);
return AxisAlignedBB.getAABBPool().getAABB(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); return AxisAlignedBB.getBoundingBox(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]);
} }
public static void removePipe(Pipe pipe) { public static void removePipe(Pipe pipe) {

2
common/buildcraft/transport/pipes/PipeItemsObsidian.java
View file

@ -142,7 +142,7 @@ public class PipeItemsObsidian extends Pipe<PipeTransportItems> {
Position min = p1.min(p2); Position min = p1.min(p2);
Position max = p1.max(p2); Position max = p1.max(p2);
return AxisAlignedBB.getAABBPool().getAABB(min.x, min.y, min.z, max.x, max.y, max.z); return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z);
} }
@Override @Override