fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use type-safe version of list for AxisAlignedBB

Browse Source
This commit is contained in:
thatsIch
2014-11-04 02:40:10 +01:00
parent 89030ed3a4
commit b123419486
10 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/misc/BlockCharger.java
+1 -1
View File
@@ -153,7 +153,7 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
} }
@Override @Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{ {
out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
} }
src/main/java/appeng/block/misc/BlockTinyTNT.java
+1 -2
View File
@@ -156,10 +156,9 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
} }
@Override @Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{ {
out.add( AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) ); out.add( AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) );
} }
} }
src/main/java/appeng/block/networking/BlockWireless.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision
} }
@Override @Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{ {
TileWireless tile = getTileEntity( w, x, y, z ); TileWireless tile = getTileEntity( w, x, y, z );
if ( tile != null ) if ( tile != null )
src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java
+1 -1
View File
@@ -101,7 +101,7 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
} }
@Override @Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{ {
double OnePx = 2.0 / 16.0; double OnePx = 2.0 / 16.0;
out.add( AxisAlignedBB.getBoundingBox( OnePx, OnePx, OnePx, 1.0 - OnePx, 1.0 - OnePx, 1.0 - OnePx ) ); out.add( AxisAlignedBB.getBoundingBox( OnePx, OnePx, OnePx, 1.0 - OnePx, 1.0 - OnePx, 1.0 - OnePx ) );
src/main/java/appeng/block/qnb/BlockQuantumRing.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision
} }
@Override @Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{ {
double OnePx = 2.0 / 16.0; double OnePx = 2.0 / 16.0;
TileQuantumBridge bridge = getTileEntity( w, x, y, z ); TileQuantumBridge bridge = getTileEntity( w, x, y, z );
src/main/java/appeng/block/spatial/BlockMatrixFrame.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
} }
@Override @Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{ {
out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
} }
src/main/java/appeng/block/storage/BlockSkyChest.java
+1 -1
View File
@@ -117,7 +117,7 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
} }
@Override @Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{ {
out.add( AxisAlignedBB.getBoundingBox( 0.05, 0.05, 0.05, 0.95, 0.95, 0.95 ) ); out.add( AxisAlignedBB.getBoundingBox( 0.05, 0.05, 0.05, 0.95, 0.95, 0.95 ) );
} }
src/main/java/appeng/helpers/ICustomCollision.java
+1 -3
View File
@@ -8,9 +8,7 @@ import net.minecraft.world.World;
public interface ICustomCollision public interface ICustomCollision
{ {
Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity thePlayer, boolean b); Iterable<AxisAlignedBB> 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); void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e);
} }
src/main/java/appeng/tile/grindstone/TileCrank.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision
} }
@Override @Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{ {
double xOff = -0.15 * getUp().offsetX; double xOff = -0.15 * getUp().offsetX;
double yOff = -0.15 * getUp().offsetY; double yOff = -0.15 * getUp().offsetY;
src/main/java/appeng/tile/networking/TileCableBus.java
+1 -1
View File
@@ -217,7 +217,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
} }
@Override @Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{ {
for (AxisAlignedBB bx : getSelectedBoundingBoxesFromPool( 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 ) ); out.add( AxisAlignedBB.getBoundingBox( bx.minX, bx.minY, bx.minZ, bx.maxX, bx.maxY, bx.maxZ ) );