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

All parameters on one line (for now)

Browse Source 
Easier picking of 1.7 changes
This commit is contained in:
yueh
2016-01-01 02:02:05 +01:00
parent e08ab38c52
commit f84b9a7e1d
147 changed files with 840 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/spatial/BlockMatrixFrame.java
+5 -22
View File
@@ -70,49 +70,32 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
}
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
final World w,
final BlockPos pos,
final Entity thePlayer,
final boolean b )
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
{
return Arrays.asList( new AxisAlignedBB[] {} );// AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 )
// } );
}
@Override
public void addCollidingBlockToList(
final World w,
final BlockPos pos,
final AxisAlignedBB bb,
final List<AxisAlignedBB> out,
final Entity e )
public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
{
out.add( AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
}
@Override
public boolean canPlaceBlockAt(
final World worldIn,
final BlockPos pos )
public boolean canPlaceBlockAt( final World worldIn, final BlockPos pos )
{
return false;
}
@Override
public void onBlockExploded(
final World world,
final BlockPos pos,
final Explosion explosion )
public void onBlockExploded( final World world, final BlockPos pos, final Explosion explosion )
{
// Don't explode.
}
@Override
public boolean canEntityDestroy(
final IBlockAccess world,
final BlockPos pos,
final Entity entity )
public boolean canEntityDestroy( final IBlockAccess world, final BlockPos pos, final Entity entity )
{
return false;
}
src/main/java/appeng/block/spatial/BlockSpatialIOPort.java
+2 -13
View File
@@ -48,11 +48,7 @@ public class BlockSpatialIOPort extends AEBaseTileBlock
}
@Override
public void onNeighborBlockChange(
final World w,
final BlockPos pos,
final IBlockState state,
final Block neighborBlock )
public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
{
final TileSpatialIOPort te = this.getTileEntity( w, pos );
if( te != null )
@@ -62,14 +58,7 @@ public class BlockSpatialIOPort extends AEBaseTileBlock
}
@Override
public boolean onActivated(
final World w,
final BlockPos pos,
final EntityPlayer p,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
if( p.isSneaking() )
{
src/main/java/appeng/block/spatial/BlockSpatialPylon.java
+2 -8
View File
@@ -46,11 +46,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock
}
@Override
public void onNeighborBlockChange(
final World w,
final BlockPos pos,
final IBlockState state,
final Block neighborBlock )
public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
{
final TileSpatialPylon tsp = this.getTileEntity( w, pos );
if( tsp != null )
@@ -60,9 +56,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock
}
@Override
public int getLightValue(
final IBlockAccess w,
final BlockPos pos )
public int getLightValue( final IBlockAccess w, final BlockPos pos )
{
final TileSpatialPylon tsp = this.getTileEntity( w, pos );
if( tsp != null )