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/misc/BlockQuartzTorch.java
+4 -14
View File
@@ -66,15 +66,13 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
}
@Override
public int getMetaFromState(
final IBlockState state )
public int getMetaFromState( final IBlockState state )
{
return 0;
}
@Override
public IBlockState getStateFromMeta(
final int meta )
public IBlockState getStateFromMeta( final int meta )
{
return this.getDefaultState();
}
@@ -124,11 +122,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
@Override
@SideOnly( Side.CLIENT )
public void randomDisplayTick(
final World w,
final BlockPos pos,
final IBlockState state,
final Random r )
public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r )
{
if( !AEConfig.instance.enableEffects )
{
@@ -156,11 +150,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
}
@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 EnumFacing up = this.getOrientable( w, pos ).getUp();
if( !this.canPlaceAt( w, pos, up.getOpposite() ) )