All parameters on one line (for now)
Easier picking of 1.7 changes
This commit is contained in:
@@ -45,10 +45,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDropped(
|
||||
final IBlockState state,
|
||||
final Random rand,
|
||||
final int fortune )
|
||||
public Item getItemDropped( final IBlockState state, final Random rand, final int fortune )
|
||||
{
|
||||
for( final Item charged : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeItem().asSet() )
|
||||
{
|
||||
@@ -59,8 +56,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(
|
||||
final IBlockState state )
|
||||
public int damageDropped( final IBlockState state )
|
||||
{
|
||||
for( final ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ).asSet() )
|
||||
{
|
||||
@@ -71,11 +67,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
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 )
|
||||
{
|
||||
|
||||
@@ -60,10 +60,7 @@ public class QuartzGlassBlock extends AEBaseBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldSideBeRendered(
|
||||
final IBlockAccess w,
|
||||
final BlockPos pos,
|
||||
final EnumFacing side )
|
||||
public boolean shouldSideBeRendered( final IBlockAccess w, final BlockPos pos, final EnumFacing side )
|
||||
{
|
||||
final Material mat = w.getBlockState( pos ).getBlock().getMaterial();
|
||||
if( mat == Material.glass || mat == AEGlassMaterial.INSTANCE )
|
||||
|
||||
@@ -44,11 +44,7 @@ public class QuartzLampBlock extends QuartzGlassBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
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 )
|
||||
{
|
||||
|
||||
@@ -77,9 +77,7 @@ public class QuartzOreBlock extends AEBaseBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMixedBrightnessForBlock(
|
||||
final IBlockAccess worldIn,
|
||||
final BlockPos pos )
|
||||
public int getMixedBrightnessForBlock( final IBlockAccess worldIn, final BlockPos pos )
|
||||
{
|
||||
int j1 = super.getMixedBrightnessForBlock( worldIn, pos );
|
||||
if( this.enhanceBrightness )
|
||||
@@ -111,10 +109,8 @@ public class QuartzOreBlock extends AEBaseBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDropped(
|
||||
final IBlockState state, /* is null */
|
||||
final Random rand,
|
||||
final int fortune )
|
||||
public Item getItemDropped( final IBlockState state, /* is null */
|
||||
final Random rand, final int fortune )
|
||||
{
|
||||
for( final Item crystalItem : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeItem().asSet() )
|
||||
{
|
||||
@@ -125,12 +121,7 @@ public class QuartzOreBlock extends AEBaseBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dropBlockAsItemWithChance(
|
||||
final World w,
|
||||
final BlockPos pos,
|
||||
final IBlockState state,
|
||||
final float chance,
|
||||
final int fortune )
|
||||
public void dropBlockAsItemWithChance( final World w, final BlockPos pos, final IBlockState state, final float chance, final int fortune )
|
||||
{
|
||||
super.dropBlockAsItemWithChance( w, pos, state, chance, fortune );
|
||||
|
||||
@@ -143,8 +134,7 @@ public class QuartzOreBlock extends AEBaseBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(
|
||||
final IBlockState state )
|
||||
public int damageDropped( final IBlockState state )
|
||||
{
|
||||
for( final ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeStack( 1 ).asSet() )
|
||||
{
|
||||
|
||||
@@ -45,15 +45,13 @@ public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock
|
||||
}
|
||||
|
||||
@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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user