diff --git a/src/main/java/openblocks/client/renderer/block/canvas/StencilModelTransformer.java b/src/main/java/openblocks/client/renderer/block/canvas/StencilModelTransformer.java index 86ac598a..f412f705 100644 --- a/src/main/java/openblocks/client/renderer/block/canvas/StencilModelTransformer.java +++ b/src/main/java/openblocks/client/renderer/block/canvas/StencilModelTransformer.java @@ -176,7 +176,7 @@ public class StencilModelTransformer { } if (layersToRender.renderCovers) - builder.addGeneralQuads(addStencilCovers(innerModel.bounds.expand(COVER_DELTA, COVER_DELTA, COVER_DELTA), canvasState.sideStates)); + builder.addGeneralQuads(addStencilCovers(innerModel.bounds.grow(COVER_DELTA), canvasState.sideStates)); return builder.build(); } diff --git a/src/main/java/openblocks/common/entity/EntityMagnet.java b/src/main/java/openblocks/common/entity/EntityMagnet.java index f30f639f..5463b609 100644 --- a/src/main/java/openblocks/common/entity/EntityMagnet.java +++ b/src/main/java/openblocks/common/entity/EntityMagnet.java @@ -277,7 +277,7 @@ public class EntityMagnet extends EntitySmoothMove implements IEntityAdditionalS } protected List detectEntityTargets() { - AxisAlignedBB aabb = getEntityBoundingBox().expand(0.25, 0, 0.25).offset(0, -1, 0); + AxisAlignedBB aabb = getEntityBoundingBox().grow(0.25, 0, 0.25).offset(0, -1, 0); return world.getEntitiesInAABBexcluding(this, aabb, createPickTargetPredicate()); } diff --git a/src/main/java/openblocks/common/tileentity/TileEntityCannon.java b/src/main/java/openblocks/common/tileentity/TileEntityCannon.java index 074cab8a..6c3d4f55 100644 --- a/src/main/java/openblocks/common/tileentity/TileEntityCannon.java +++ b/src/main/java/openblocks/common/tileentity/TileEntityCannon.java @@ -162,8 +162,7 @@ public class TileEntityCannon extends SyncedTileEntity implements IPointable, IS @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() { - AxisAlignedBB box = super.getRenderBoundingBox(); - return box.expand(32.0, 32.0, 32.0); + return super.getRenderBoundingBox().grow(32); } private Vec3d calcMotionFromAngles() { diff --git a/src/main/java/openblocks/common/tileentity/TileEntityFan.java b/src/main/java/openblocks/common/tileentity/TileEntityFan.java index 1d620c57..c284d119 100644 --- a/src/main/java/openblocks/common/tileentity/TileEntityFan.java +++ b/src/main/java/openblocks/common/tileentity/TileEntityFan.java @@ -117,7 +117,7 @@ public class TileEntityFan extends SyncedTileEntity implements IPlaceAwareTile, private AxisAlignedBB getEntitySearchBoundingBox() { AxisAlignedBB boundingBox = BlockUtils.aabbOffset(pos, 0, -2, 0, +1, +3, 1); - return boundingBox.expand(Config.fanRange, Config.fanRange, Config.fanRange); + return boundingBox.grow(Config.fanRange); } private static boolean isLyingInSphericalCone(Vec3d coneAxis, Vec3d originToTarget, double halfAperture) { diff --git a/src/main/java/openblocks/common/tileentity/TileEntityGrave.java b/src/main/java/openblocks/common/tileentity/TileEntityGrave.java index dcd3ae4f..de4fec0c 100644 --- a/src/main/java/openblocks/common/tileentity/TileEntityGrave.java +++ b/src/main/java/openblocks/common/tileentity/TileEntityGrave.java @@ -69,7 +69,7 @@ public class TileEntityGrave extends SyncedTileEntity implements IPlaceAwareTile if (!world.isRemote) { if (Config.spawnSkeletons && world.getDifficulty() != EnumDifficulty.PEACEFUL && world.rand.nextDouble() < Config.skeletonSpawnRate) { - List mobs = world.getEntitiesWithinAABB(EntityLiving.class, getBB().expand(7, 7, 7), IS_MOB); + List mobs = world.getEntitiesWithinAABB(EntityLiving.class, getBB().grow(7), IS_MOB); if (mobs.size() < 5) { double chance = world.rand.nextDouble(); diff --git a/src/main/java/openblocks/common/tileentity/TileEntityTarget.java b/src/main/java/openblocks/common/tileentity/TileEntityTarget.java index 71f7d618..16c09e51 100644 --- a/src/main/java/openblocks/common/tileentity/TileEntityTarget.java +++ b/src/main/java/openblocks/common/tileentity/TileEntityTarget.java @@ -58,7 +58,7 @@ public class TileEntityTarget extends OpenTileEntity implements ISurfaceAttachme } private void predictOtherProjectiles() { - final List projectiles = world.getEntitiesWithinAABB(Entity.class, getBB().expand(10, 10, 10), PROJECTILE_SELECTOR); + final List projectiles = world.getEntitiesWithinAABB(Entity.class, getBB().grow(10), PROJECTILE_SELECTOR); IBlockState state = null; diff --git a/src/main/java/openblocks/common/tileentity/TileEntityVacuumHopper.java b/src/main/java/openblocks/common/tileentity/TileEntityVacuumHopper.java index 1902ae34..e180f91a 100644 --- a/src/main/java/openblocks/common/tileentity/TileEntityVacuumHopper.java +++ b/src/main/java/openblocks/common/tileentity/TileEntityVacuumHopper.java @@ -183,7 +183,7 @@ public class TileEntityVacuumHopper extends SyncedTileEntity implements IInvento spawnParticle(EnumParticleTypes.PORTAL, world.rand.nextDouble() - 0.5, world.rand.nextDouble() - 1.0, world.rand.nextDouble() - 0.5); } - List interestingItems = world.getEntitiesWithinAABB(Entity.class, getBB().expand(3, 3, 3), entitySelector); + List interestingItems = world.getEntitiesWithinAABB(Entity.class, getBB().grow(3), entitySelector); boolean needsSync = false; diff --git a/src/main/java/openblocks/common/tileentity/TileEntityVillageHighlighter.java b/src/main/java/openblocks/common/tileentity/TileEntityVillageHighlighter.java index c217475b..f398dde7 100644 --- a/src/main/java/openblocks/common/tileentity/TileEntityVillageHighlighter.java +++ b/src/main/java/openblocks/common/tileentity/TileEntityVillageHighlighter.java @@ -71,7 +71,7 @@ public class TileEntityVillageHighlighter extends SyncedTileEntity implements IT @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() { - return super.getRenderBoundingBox().expand(200, 200, 200); + return super.getRenderBoundingBox().grow(200); } @Override diff --git a/src/main/java/openblocks/enchantments/flimflams/InvisibleMobsFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/InvisibleMobsFlimFlam.java index 0b01643b..3fa311e9 100644 --- a/src/main/java/openblocks/enchantments/flimflams/InvisibleMobsFlimFlam.java +++ b/src/main/java/openblocks/enchantments/flimflams/InvisibleMobsFlimFlam.java @@ -20,7 +20,7 @@ public class InvisibleMobsFlimFlam implements IFlimFlamAction { public boolean execute(EntityPlayerMP target) { final World world = target.world; - AxisAlignedBB around = target.getEntityBoundingBox().expand(20, 20, 20); + AxisAlignedBB around = target.getEntityBoundingBox().grow(20); List mobs = world.getEntitiesWithinAABB(EntityLiving.class, around, WorldUtils.NON_PLAYER); if (mobs.isEmpty()) return false; diff --git a/src/main/java/openblocks/enchantments/flimflams/MountFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/MountFlimFlam.java index 0faca9cc..885b2cde 100644 --- a/src/main/java/openblocks/enchantments/flimflams/MountFlimFlam.java +++ b/src/main/java/openblocks/enchantments/flimflams/MountFlimFlam.java @@ -24,7 +24,7 @@ public class MountFlimFlam implements IFlimFlamAction { public boolean execute(EntityPlayerMP target) { final World world = target.world; - AxisAlignedBB around = target.getEntityBoundingBox().expand(40, 40, 40); + AxisAlignedBB around = target.getEntityBoundingBox().grow(40); List mobs = world.getEntitiesWithinAABB(EntityLiving.class, around, SAFE_SELECTOR); if (mobs.isEmpty()) return false; EntityLiving selected = CollectionUtils.getRandom(mobs); diff --git a/src/main/java/openblocks/enchantments/flimflams/RenameFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/RenameFlimFlam.java index 9156e98e..9878bad7 100644 --- a/src/main/java/openblocks/enchantments/flimflams/RenameFlimFlam.java +++ b/src/main/java/openblocks/enchantments/flimflams/RenameFlimFlam.java @@ -17,7 +17,7 @@ public class RenameFlimFlam implements IFlimFlamAction { @Override public boolean execute(EntityPlayerMP target) { World world = target.world; - AxisAlignedBB around = target.getEntityBoundingBox().expand(20, 20, 20); + AxisAlignedBB around = target.getEntityBoundingBox().grow(20); List living = world.getEntitiesWithinAABB(EntityLiving.class, around, WorldUtils.NON_PLAYER); Collections.shuffle(living); diff --git a/src/main/java/openblocks/enchantments/flimflams/SheepDyeFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/SheepDyeFlimFlam.java index 9bbc9cc7..661c5ef1 100644 --- a/src/main/java/openblocks/enchantments/flimflams/SheepDyeFlimFlam.java +++ b/src/main/java/openblocks/enchantments/flimflams/SheepDyeFlimFlam.java @@ -18,7 +18,7 @@ public class SheepDyeFlimFlam implements IFlimFlamAction { @Override public boolean execute(EntityPlayerMP target) { World world = target.world; - AxisAlignedBB around = target.getEntityBoundingBox().expand(20, 20, 20); + AxisAlignedBB around = target.getEntityBoundingBox().grow(20); List sheeps = world.getEntitiesWithinAABB(EntitySheep.class, around); if (sheeps.isEmpty()) return false;