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/storage/BlockChest.java
+1 -8
View File
@@ -65,14 +65,7 @@ public class BlockChest 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 )
{
final TileChest tg = this.getTileEntity( w, pos );
if( tg != null && !p.isSneaking() )
src/main/java/appeng/block/storage/BlockDrive.java
+1 -8
View File
@@ -61,14 +61,7 @@ public class BlockDrive 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/storage/BlockIOPort.java
+2 -13
View File
@@ -48,11 +48,7 @@ public class BlockIOPort 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 TileIOPort te = this.getTileEntity( w, pos );
if( te != null )
@@ -62,14 +58,7 @@ public class BlockIOPort 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/storage/BlockSkyChest.java
+3 -19
View File
@@ -74,14 +74,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
}
@Override
public boolean onActivated(
final World w,
final BlockPos pos,
final EntityPlayer player,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
if( Platform.isServer() )
{
@@ -92,11 +85,7 @@ public class BlockSkyChest extends AEBaseTileBlock 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 )
{
final TileSkyChest sk = this.getTileEntity( w, pos );
EnumFacing o = EnumFacing.UP;
@@ -115,12 +104,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
}
@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.05, 0.05, 0.05, 0.95, 0.95, 0.95 ) );
}