From 1278298d7c8626f41371440484ef40165c7d6182 Mon Sep 17 00:00:00 2001 From: Alexander Behrhof Date: Sun, 8 Jun 2014 14:37:02 -0400 Subject: [PATCH] Changing getAABBPool().getAABB( -> getBoundingBox( --- src/main/java/tconstruct/TConstruct.java | 9 ++++++--- src/main/java/tconstruct/blocks/BlockLandmine.java | 10 +++++----- src/main/java/tconstruct/blocks/CraftingSlab.java | 4 ++-- src/main/java/tconstruct/blocks/DryingRack.java | 6 +++--- .../java/tconstruct/blocks/GlassBlockConnected.java | 2 +- src/main/java/tconstruct/blocks/SearedBlock.java | 4 ++-- src/main/java/tconstruct/blocks/ToolStationBlock.java | 4 ++-- .../java/tconstruct/blocks/logic/DryingRackLogic.java | 2 +- .../java/tconstruct/blocks/logic/SmelteryLogic.java | 2 +- src/main/java/tconstruct/blocks/traps/Landmine.java | 6 +++--- src/main/java/tconstruct/common/TRepo.java | 3 +++ src/main/java/tconstruct/entity/BlueSlime.java | 2 +- src/main/java/tconstruct/items/tools/Scythe.java | 2 +- .../library/armor/BehaviorDispenseArmorCopy.java | 2 +- .../java/tconstruct/library/tools/AbilityHelper.java | 2 +- src/main/java/tconstruct/util/MiningExplosion.java | 2 +- .../util/landmine/behavior/BehaviorShears.java | 2 +- 17 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index a1e0f9c2bb6..767be6caadc 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -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(); diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java index e7d1f8c718a..ad10f96328a 100644 --- a/src/main/java/tconstruct/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/blocks/BlockLandmine.java @@ -532,7 +532,7 @@ protected int getMineState (World par1World, int par2, int par3, int par4) 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 @@ protected AxisAlignedBB getSensitiveAABB (World par1World, int par2, int par3, i 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 Entity getMineTriggerer (World par1World, int par2, int par3, int par4) 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()) diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java index f4bf5dec631..2446eb0fe83 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/blocks/CraftingSlab.java @@ -77,9 +77,9 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, { 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 diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index a80aef6d396..01e58f35c1b 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -159,7 +159,7 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, 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 TileEntity createTileEntity (World world, int metadata) /* * @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 TileEntity createTileEntity (World world, int metadata) * 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)); } } * diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index a55389e22c1..fc4698161c7 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -618,7 +618,7 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool (World par1World, int par2, } else { - return AxisAlignedBB.getAABBPool().getAABB(0D, 0D, 0D, 0D, 0D, 0D); + return AxisAlignedBB.getBoundingBox(0D, 0D, 0D, 0D, 0D, 0D); } } diff --git a/src/main/java/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/blocks/SearedBlock.java index 11f51558888..b60496cb903 100644 --- a/src/main/java/tconstruct/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/blocks/SearedBlock.java @@ -316,7 +316,7 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, 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 AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, 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)); } } diff --git a/src/main/java/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/blocks/ToolStationBlock.java index a156e60eca8..9092c6395ad 100644 --- a/src/main/java/tconstruct/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/blocks/ToolStationBlock.java @@ -116,9 +116,9 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, { 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 diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 64e5e9349b5..cbfd9e448b7 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -122,7 +122,7 @@ public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) @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; } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index 869273dd31c..f023de0b2a3 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -308,7 +308,7 @@ public void updateEntity () 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) diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index b39d43a394f..ee5bf4616e3 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -184,7 +184,7 @@ private void setStateIfMobInteractsWithPlate (World world, int posX, int posY, i { 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 @@ private void setStateIfMobInteractsWithPlate (World world, int posX, int posY, i { 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))); } diff --git a/src/main/java/tconstruct/common/TRepo.java b/src/main/java/tconstruct/common/TRepo.java index b8477663b7c..81b92eac293 100644 --- a/src/main/java/tconstruct/common/TRepo.java +++ b/src/main/java/tconstruct/common/TRepo.java @@ -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.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 diff --git a/src/main/java/tconstruct/entity/BlueSlime.java b/src/main/java/tconstruct/entity/BlueSlime.java index 3a020e641f2..db1439e00a0 100644 --- a/src/main/java/tconstruct/entity/BlueSlime.java +++ b/src/main/java/tconstruct/entity/BlueSlime.java @@ -442,7 +442,7 @@ protected void dropFewItems (boolean par1, int par2) for (int l = 0; l < k; ++l) { - this.entityDropItem(new ItemStack(j), 1); + this.dropItem(j, 0); } } diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 2359208f417..b639c25a5f0 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -252,7 +252,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl @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) { diff --git a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java index ca4f1167183..1ffe5045cd7 100644 --- a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java +++ b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java @@ -26,7 +26,7 @@ protected ItemStack dispenseStack (IBlockSource par1IBlockSource, ItemStack par2 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) diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index ee6c2e57e76..a8c9f880950 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -309,7 +309,7 @@ static void alertPlayerWolves (EntityPlayer player, EntityLivingBase living, boo 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()) diff --git a/src/main/java/tconstruct/util/MiningExplosion.java b/src/main/java/tconstruct/util/MiningExplosion.java index df2aa5db119..b36721e477b 100644 --- a/src/main/java/tconstruct/util/MiningExplosion.java +++ b/src/main/java/tconstruct/util/MiningExplosion.java @@ -103,7 +103,7 @@ public void doExplosionA () 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) diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java index 7163d4996b6..b5f5df4a4a3 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java @@ -31,7 +31,7 @@ public void executeLogic (World par1World, int par2, int par3, int par4, ItemSta { Random rand = ItemBlockLandmine.getRandom(); - List sheeps = par1World.getEntitiesWithinAABB(IShearable.class, AxisAlignedBB.getAABBPool().getAABB(par2 - 2, par3 - 2, par4 - 2, par2 + 2, par3 + 2, par4 + 2)); + List sheeps = par1World.getEntitiesWithinAABB(IShearable.class, AxisAlignedBB.getBoundingBox(par2 - 2, par3 - 2, par4 - 2, par2 + 2, par3 + 2, par4 + 2)); if (sheeps != null && !sheeps.isEmpty()) {