Changing getAABBPool().getAABB( -> getBoundingBox(

This commit is contained in:
Alexander Behrhof committed 2014-06-08 14:37:02 -04:00
1 parent d9cf30f767
commit 1278298d7c
17 files changed
+35 -29

No files matched your search

+6 -3
View File
@@ -71,18 +71,21 @@ public class TConstruct
public static final int liquidUpdateAmount = 6;
// the entire mod
public static final String modID = "TConstruct";
// Shared mod logger
public static final Logger logger = LogManager.getLogger("TConstruct");
public static final Logger logger = LogManager.getLogger(modID);
/* Instance of this mod, used for grabbing prototype fields */
@Instance("TConstruct")
@Instance(modID)
public static TConstruct instance;
/* Proxies for sides, used for graphics processing */
@SidedProxy(clientSide = "tconstruct.client.TProxyClient", serverSide = "tconstruct.common.TProxyCommon")
public static TProxyCommon proxy;
// Module loader
public static final ModuleController moduleLoader = new ModuleController("TDynstruct.cfg", "TConstruct");
public static final ModuleController moduleLoader = new ModuleController("TDynstruct.cfg", modID);
// The packet pipeline
public static final PacketPipeline packetPipeline = new PacketPipeline();
@@ -532,7 +532,7 @@ public class BlockLandmine extends BlockContainer
protected AxisAlignedBB getSensitiveAABB (World par1World, int par2, int par3, int par4)
{
float f = 0.125F;
// return AxisAlignedBB.getAABBPool().getAABB((double)((float)par1 + f),
// return AxisAlignedBB.getBoundingBox((double)((float)par1 + f),
// (double)par2, (double)((float)par3 + f), (double)((float)(par1 + 1) -
// f), (double)par2 + 0.25D, (double)((float)(par3 + 1) - f));
@@ -559,7 +559,7 @@ public class BlockLandmine extends BlockContainer
maxY = par3 + 1;
maxZ = par4 + 1;
}
return AxisAlignedBB.getAABBPool().getAABB(minX, minY, minZ, maxX, maxY, maxZ);
return AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ);
}
public Entity getMineTriggerer (World par1World, int par2, int par3, int par4)
@@ -597,17 +597,17 @@ public class BlockLandmine extends BlockContainer
if (triggerType == Sensitivity.everything)
{
list = par1World.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D));
list = par1World.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D));
}
if (triggerType == Sensitivity.mobs)
{
list = par1World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D));
list = par1World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D));
}
if (triggerType == Sensitivity.players)
{
list = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D));
list = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D));
}
if (list != null && !list.isEmpty())
@@ -77,9 +77,9 @@ public class CraftingSlab extends InventorySlab
{
int metadata = world.getBlockMetadata(x, y, z);
if (metadata == 5)
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125,
return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125,
(double) z + this.maxZ);
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ);
return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ);
}
@Override
@@ -159,7 +159,7 @@ public class DryingRack extends InventoryBlock
yMin = 0.75F;
break;
}
return AxisAlignedBB.getAABBPool().getAABB((double) x + xMin, (double) y + yMin, (double) z + zMin, (double) x + xMax, (double) y + yMax, (double) z + zMax);
return AxisAlignedBB.getBoundingBox((double) x + xMin, (double) y + yMin, (double) z + zMin, (double) x + xMax, (double) y + yMax, (double) z + zMax);
}
@Override
@@ -296,7 +296,7 @@ public class DryingRack extends InventoryBlock
/*
* @Override public AxisAlignedBB getCollisionBoundingBoxFromPool (World
* world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z);
* if (meta != 1) { return AxisAlignedBB.getAABBPool().getAABB(x, y, z, x +
* if (meta != 1) { return AxisAlignedBB.getBoundingBox(x, y, z, x +
* 1, y + 1, z + 1); } else { FaucetLogic logic = (FaucetLogic)
* world.getBlockTileEntity(x, y, z); if (logic != null) { float xMin =
* 0.25F; float xMax = 0.75F; float zMin = 0.25F; float zMax = 0.75F;
@@ -305,7 +305,7 @@ public class DryingRack extends InventoryBlock
* break; case 3: zMax = 0.375F; zMin = 0F; break; case 4: xMin = 0.625F;
* xMax = 1.0F; break; case 5: xMax = 0.375F; xMin = 0F; break; }
*
* return AxisAlignedBB.getAABBPool().getAABB((double) ((float) x + xMin),
* return AxisAlignedBB.getBoundingBox((double) ((float) x + xMin),
* (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x +
* xMax), (double) y + 0.625, (double) ((float) z + zMax)); } }
*
@@ -618,7 +618,7 @@ public class GlassBlockConnected extends MantleBlock
}
else
{
return AxisAlignedBB.getAABBPool().getAABB(0D, 0D, 0D, 0D, 0D, 0D);
return AxisAlignedBB.getBoundingBox(0D, 0D, 0D, 0D, 0D, 0D);
}
}
@@ -316,7 +316,7 @@ public class SearedBlock extends InventoryBlock
int meta = world.getBlockMetadata(x, y, z);
if (meta != 1)
{
return AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 1, z + 1);
return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1);
}
else
{
@@ -348,7 +348,7 @@ public class SearedBlock extends InventoryBlock
break;
}
return AxisAlignedBB.getAABBPool().getAABB((double) ((float) x + xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625,
return AxisAlignedBB.getBoundingBox((double) ((float) x + xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625,
(double) ((float) z + zMax));
}
}
@@ -116,9 +116,9 @@ public class ToolStationBlock extends InventoryBlock
{
int metadata = world.getBlockMetadata(x, y, z);
if (metadata == 5)
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125,
return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125,
(double) z + this.maxZ);
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ);
return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ);
}
@Override
@@ -122,7 +122,7 @@ public class DryingRackLogic extends InventoryLogic
@SideOnly(Side.CLIENT)
public AxisAlignedBB getRenderBoundingBox ()
{
AxisAlignedBB cbb = AxisAlignedBB.getAABBPool().getAABB(xCoord, yCoord - 1, zCoord, xCoord + 1, yCoord + 1, zCoord + 1);
AxisAlignedBB cbb = AxisAlignedBB.getBoundingBox(xCoord, yCoord - 1, zCoord, xCoord + 1, yCoord + 1, zCoord + 1);
return cbb;
}
@@ -308,7 +308,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
void detectEntities ()
{
AxisAlignedBB box = AxisAlignedBB.getAABBPool().getAABB(centerPos.x, centerPos.y, centerPos.z, centerPos.x + 1.0D, centerPos.y + 1.0D, centerPos.z + 1.0D).expand(1.0D, 0.0D, 1.0D);
AxisAlignedBB box = AxisAlignedBB.getBoundingBox(centerPos.x, centerPos.y, centerPos.z, centerPos.x + 1.0D, centerPos.y + 1.0D, centerPos.z + 1.0D).expand(1.0D, 0.0D, 1.0D);
List list = worldObj.getEntitiesWithinAABB(Entity.class, box);
for (Object o : list)
@@ -184,7 +184,7 @@ public class Landmine extends MantleBlock
{
var8 = world.getEntitiesWithinAABBExcludingEntity(
(Entity) null,
AxisAlignedBB.getAABBPool().getAABB((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D,
AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D,
(double) ((float) (posZ + 1) - var7)));
}
@@ -192,14 +192,14 @@ public class Landmine extends MantleBlock
{
var8 = world.getEntitiesWithinAABB(
EntityLiving.class,
AxisAlignedBB.getAABBPool().getAABB((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D,
AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D,
(double) ((float) (posZ + 1) - var7)));
}
/*
* if (this.triggerMobType == EnumCreatureType.players) { var8 =
* world.getEntitiesWithinAABB( EntityPlayer.class,
* AxisAlignedBB.getAABBPool().getAABB((double) ((float) posX + var7),
* AxisAlignedBB.getBoundingBox((double) ((float) posX + var7),
* (double) posY, (double) ((float) posZ + var7), (double) ((float)
* (posX + 1) - var7), (double) posY + 0.25D, (double) ((float) (posZ +
* 1) - var7))); }
@@ -1,5 +1,6 @@
package tconstruct.common;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import net.minecraft.block.Block;
import net.minecraft.block.Block.SoundType;
import net.minecraft.block.material.Material;
@@ -15,7 +16,9 @@ import tconstruct.library.tools.ToolCore;
import tconstruct.modifiers.tools.ModAttack;
import tconstruct.modifiers.tools.ModFlux;
import tconstruct.modifiers.tools.ModLapis;
import tconstruct.TConstruct;
@ObjectHolder(TConstruct.modID)
public class TRepo
{
// Supresses console spam when iguana's tweaks remove stuff
@@ -442,7 +442,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
for (int l = 0; l < k; ++l)
{
this.entityDropItem(new ItemStack(j), 1);
this.dropItem(j, 0);
}
}
@@ -252,7 +252,7 @@ public class Scythe extends Weapon
@Override
public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity)
{
AxisAlignedBB box = AxisAlignedBB.getAABBPool().getAABB(entity.posX, entity.posY, entity.posZ, entity.posX + 1.0D, entity.posY + 1.0D, entity.posZ + 1.0D).expand(1.0D, 1.0D, 1.0D);
AxisAlignedBB box = AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.posX + 1.0D, entity.posY + 1.0D, entity.posZ + 1.0D).expand(1.0D, 1.0D, 1.0D);
List list = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, box);
for (Object o : list)
{
@@ -26,7 +26,7 @@ final class BehaviorDispenseArmorCopy extends BehaviorDefaultDispenseItem
int i = par1IBlockSource.getXInt() + enumfacing.getFrontOffsetX();
int j = par1IBlockSource.getYInt() + enumfacing.getFrontOffsetY();
int k = par1IBlockSource.getZInt() + enumfacing.getFrontOffsetZ();
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) i, (double) j, (double) k, (double) (i + 1), (double) (j + 1), (double) (k + 1));
AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox((double) i, (double) j, (double) k, (double) (i + 1), (double) (j + 1), (double) (k + 1));
List list = par1IBlockSource.getWorld().selectEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb, new IEntitySelector.ArmoredMob(par2ItemStack));
if (list.size() > 0)
@@ -309,7 +309,7 @@ public class AbilityHelper
if (!(living instanceof EntityPlayer) || player.canAttackPlayer((EntityPlayer) living))
{
List var6 = player.worldObj.getEntitiesWithinAABB(EntityWolf.class,
AxisAlignedBB.getAABBPool().getAABB(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D));
AxisAlignedBB.getBoundingBox(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D));
Iterator var4 = var6.iterator();
while (var4.hasNext())
@@ -103,7 +103,7 @@ public class MiningExplosion extends Explosion
int l1 = MathHelper.floor_double(this.explosionY + (double) this.explosionSize + 1.0D);
int i2 = MathHelper.floor_double(this.explosionZ - (double) this.explosionSize - 1.0D);
int j2 = MathHelper.floor_double(this.explosionZ + (double) this.explosionSize + 1.0D);
List list = this.world.getEntitiesWithinAABBExcludingEntity(this.exploder, AxisAlignedBB.getAABBPool().getAABB((double) i, (double) k, (double) i2, (double) j, (double) l1, (double) j2));
List list = this.world.getEntitiesWithinAABBExcludingEntity(this.exploder, AxisAlignedBB.getBoundingBox((double) i, (double) k, (double) i2, (double) j, (double) l1, (double) j2));
Vec3 vec3 = this.world.getWorldVec3Pool().getVecFromPool(this.explosionX, this.explosionY, this.explosionZ);
for (int k2 = 0; k2 < list.size(); ++k2)
@@ -31,7 +31,7 @@ public class BehaviorShears extends Behavior
{
Random rand = ItemBlockLandmine.getRandom();
List<IShearable> sheeps = par1World.getEntitiesWithinAABB(IShearable.class, AxisAlignedBB.getAABBPool().getAABB(par2 - 2, par3 - 2, par4 - 2, par2 + 2, par3 + 2, par4 + 2));
List<IShearable> sheeps = par1World.getEntitiesWithinAABB(IShearable.class, AxisAlignedBB.getBoundingBox(par2 - 2, par3 - 2, par4 - 2, par2 + 2, par3 + 2, par4 + 2));
if (sheeps != null && !sheeps.isEmpty())
{