diff --git a/block/AEBaseBlock.java b/block/AEBaseBlock.java index 0de749fc2..7c00b6ab6 100644 --- a/block/AEBaseBlock.java +++ b/block/AEBaseBlock.java @@ -475,7 +475,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature if ( collisionHandler != null ) { - Iterable bbs = collisionHandler.getSelectedBoundingBoxsFromPool( w, x, y, z, null, true ); + Iterable bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, null, true ); MovingObjectPosition br = null; double lastDist = 0; @@ -537,7 +537,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature EntityPlayer player = Minecraft.getMinecraft().thePlayer; LookDirection ld = Platform.getPlayerRay( player, Platform.getEyeOffset( player ) ); - Iterable bbs = collisionHandler.getSelectedBoundingBoxsFromPool( w, x, y, z, Minecraft.getMinecraft().thePlayer, true ); + Iterable bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, Minecraft.getMinecraft().thePlayer, true ); AxisAlignedBB br = null; double lastDist = 0; @@ -572,7 +572,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } } - for (AxisAlignedBB bx : collisionHandler.getSelectedBoundingBoxsFromPool( w, x, y, z, null, false )) + for (AxisAlignedBB bx : collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, null, false )) { if ( b == null ) b = bx; diff --git a/block/misc/BlockCharger.java b/block/misc/BlockCharger.java index 77b8e0e65..08e59b43f 100644 --- a/block/misc/BlockCharger.java +++ b/block/misc/BlockCharger.java @@ -98,7 +98,7 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { TileCharger tile = getTileEntity( w, x, y, z ); if ( tile != null ) diff --git a/block/misc/BlockQuartzTorch.java b/block/misc/BlockQuartzTorch.java index 6bdc43358..56c50d68c 100644 --- a/block/misc/BlockQuartzTorch.java +++ b/block/misc/BlockQuartzTorch.java @@ -91,7 +91,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { ForgeDirection up = getOrientable( w, x, y, z ).getUp(); double xOff = -0.3 * up.offsetX; diff --git a/block/misc/BlockSkyCompass.java b/block/misc/BlockSkyCompass.java index c24df0647..c6913f2d8 100644 --- a/block/misc/BlockSkyCompass.java +++ b/block/misc/BlockSkyCompass.java @@ -86,7 +86,7 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { TileSkyCompass tile = getTileEntity( w, x, y, z ); if ( tile != null ) diff --git a/block/misc/BlockTinyTNT.java b/block/misc/BlockTinyTNT.java index 706326e3a..ab9121263 100644 --- a/block/misc/BlockTinyTNT.java +++ b/block/misc/BlockTinyTNT.java @@ -150,7 +150,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { return Arrays.asList( new AxisAlignedBB[] { AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) } ); } diff --git a/block/networking/BlockWireless.java b/block/networking/BlockWireless.java index 45e857cfd..6dda040c3 100644 --- a/block/networking/BlockWireless.java +++ b/block/networking/BlockWireless.java @@ -45,7 +45,7 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { TileWireless tile = getTileEntity( w, x, y, z ); if ( tile != null ) diff --git a/block/qnb/BlockQuantumLinkChamber.java b/block/qnb/BlockQuantumLinkChamber.java index f6c86a26b..bb179ef59 100644 --- a/block/qnb/BlockQuantumLinkChamber.java +++ b/block/qnb/BlockQuantumLinkChamber.java @@ -94,7 +94,7 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { double OnePx = 2.0 / 16.0; return Arrays.asList( new AxisAlignedBB[] { AxisAlignedBB.getBoundingBox( OnePx, OnePx, OnePx, 1.0 - OnePx, 1.0 - OnePx, 1.0 - OnePx ) } ); diff --git a/block/qnb/BlockQuantumRing.java b/block/qnb/BlockQuantumRing.java index 0e4def0fe..eac978874 100644 --- a/block/qnb/BlockQuantumRing.java +++ b/block/qnb/BlockQuantumRing.java @@ -54,7 +54,7 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { double OnePx = 2.0 / 16.0; TileQuantumBridge bridge = getTileEntity( w, x, y, z ); diff --git a/block/spatial/BlockMatrixFrame.java b/block/spatial/BlockMatrixFrame.java index ea011c488..ec6c514c6 100644 --- a/block/spatial/BlockMatrixFrame.java +++ b/block/spatial/BlockMatrixFrame.java @@ -55,7 +55,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { return Arrays.asList( new AxisAlignedBB[] {} );// AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) // } ); diff --git a/block/storage/BlockSkyChest.java b/block/storage/BlockSkyChest.java index b62b659de..1bfc1a23a 100644 --- a/block/storage/BlockSkyChest.java +++ b/block/storage/BlockSkyChest.java @@ -97,7 +97,7 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { TileSkyChest sk = getTileEntity( w, x, y, z ); double sc = 0.06; diff --git a/helpers/ICustomCollision.java b/helpers/ICustomCollision.java index 5bb0809dd..b214fa8ec 100644 --- a/helpers/ICustomCollision.java +++ b/helpers/ICustomCollision.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; public interface ICustomCollision { - Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity thePlayer, boolean b); + Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity thePlayer, boolean b); void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e); diff --git a/tile/grindstone/TileCrank.java b/tile/grindstone/TileCrank.java index d7b383166..247d3219e 100644 --- a/tile/grindstone/TileCrank.java +++ b/tile/grindstone/TileCrank.java @@ -116,7 +116,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * getUp().offsetY; diff --git a/tile/networking/TileCableBus.java b/tile/networking/TileCableBus.java index c23f2a817..abf70ea73 100644 --- a/tile/networking/TileCableBus.java +++ b/tile/networking/TileCableBus.java @@ -210,7 +210,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean visual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean visual) { return cb.getSelectedBoundingBoxsFromPool( false, true, e, visual ); } @@ -218,7 +218,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) { - for (AxisAlignedBB bx : getSelectedBoundingBoxsFromPool( w, x, y, z, e, false )) + for (AxisAlignedBB bx : getSelectedBoundingBoxesFromPool( w, x, y, z, e, false )) out.add( AxisAlignedBB.getBoundingBox( bx.minX, bx.minY, bx.minZ, bx.maxX, bx.maxY, bx.maxZ ) ); }