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

Changed access to use this qualifier

Browse Source
This commit is contained in:
yueh
2014-12-29 15:13:47 +01:00
parent 2a5e57a59b
commit f471513bd0
604 changed files with 11573 additions and 11573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/solids/BlockFluix.java
+1 -1
View File
@@ -32,6 +32,6 @@ public class BlockFluix extends AEDecorativeBlock
public BlockFluix()
{
super( BlockFluix.class, Material.rock );
setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
}
}
src/main/java/appeng/block/solids/BlockQuartz.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class BlockQuartz extends AEDecorativeBlock
public BlockQuartz() {
super( BlockQuartz.class, Material.rock );
setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
}
}
src/main/java/appeng/block/solids/BlockQuartzChiseled.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class BlockQuartzChiseled extends AEDecorativeBlock
public BlockQuartzChiseled() {
super( BlockQuartzChiseled.class, Material.rock );
setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
}
}
src/main/java/appeng/block/solids/BlockQuartzGlass.java
+3 -3
View File
@@ -58,9 +58,9 @@ public class BlockQuartzGlass extends AEBaseBlock
public BlockQuartzGlass(Class c) {
super( c, Material.glass );
setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
setLightOpacity( 0 );
isOpaque = false;
this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
this.setLightOpacity( 0 );
this.isOpaque = false;
}
}
src/main/java/appeng/block/solids/BlockQuartzLamp.java
+3 -3
View File
@@ -35,9 +35,9 @@ public class BlockQuartzLamp extends BlockQuartzGlass
public BlockQuartzLamp() {
super( BlockQuartzLamp.class );
setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) );
setLightLevel( 1.0f );
setBlockTextureName( "BlockQuartzGlass" );
this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) );
this.setLightLevel( 1.0f );
this.setBlockTextureName( "BlockQuartzGlass" );
}
@Override
src/main/java/appeng/block/solids/BlockQuartzPillar.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class BlockQuartzPillar extends AEBaseBlock implements IOrientableBlock
public BlockQuartzPillar() {
super( BlockQuartzPillar.class, Material.rock );
setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
}
@Override
src/main/java/appeng/block/solids/BlockSkyStone.java
+17 -17
View File
@@ -81,11 +81,11 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
public BlockSkyStone() {
super( BlockSkyStone.class, Material.rock );
setFeature( EnumSet.of( AEFeature.Core ) );
setHardness( 50 );
hasSubtypes = true;
blockResistance = 150.0f;
setHarvestLevel( "pickaxe", 3, 0 );
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setHardness( 50 );
this.hasSubtypes = true;
this.blockResistance = 150.0f;
this.setHarvestLevel( "pickaxe", 3, 0 );
MinecraftForge.EVENT_BUS.register( this );
}
@@ -99,15 +99,15 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
public String getUnlocalizedName(ItemStack is)
{
if ( is.getItemDamage() == 1 )
return getUnlocalizedName() + ".Block";
return this.getUnlocalizedName() + ".Block";
if ( is.getItemDamage() == 2 )
return getUnlocalizedName() + ".Brick";
return this.getUnlocalizedName() + ".Brick";
if ( is.getItemDamage() == 3 )
return getUnlocalizedName() + ".SmallBrick";
return this.getUnlocalizedName() + ".SmallBrick";
return getUnlocalizedName();
return this.getUnlocalizedName();
}
@Override
@@ -135,9 +135,9 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
public void registerBlockIcons(IIconRegister ir)
{
super.registerBlockIcons( ir );
Block = ir.registerIcon( getTextureName() + ".Block" );
Brick = ir.registerIcon( getTextureName() + ".Brick" );
SmallBrick = ir.registerIcon( getTextureName() + ".SmallBrick" );
this.Block = ir.registerIcon( this.getTextureName() + ".Block" );
this.Brick = ir.registerIcon( this.getTextureName() + ".Brick" );
this.SmallBrick = ir.registerIcon( this.getTextureName() + ".SmallBrick" );
}
@Override
@@ -145,18 +145,18 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
public IIcon getIcon(int direction, int metadata)
{
if ( metadata == 1 )
return Block;
return this.Block;
if ( metadata == 2 )
return Brick;
return this.Brick;
if ( metadata == 3 )
return SmallBrick;
return this.SmallBrick;
return super.getIcon( direction, metadata );
}
@Override
public void setRenderStateByMeta(int metadata)
{
getRendererInstance().setTemporaryRenderIcon( getIcon( 0, metadata ) );
this.getRendererInstance().setTemporaryRenderIcon( this.getIcon( 0, metadata ) );
}
@Override
@@ -197,7 +197,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
// use AE2's renderer, no rotatable blocks.
int getRealRenderType()
{
return getRenderType();
return this.getRenderType();
}
@Override
src/main/java/appeng/block/solids/OreQuartz.java
+13 -13
View File
@@ -43,12 +43,12 @@ public class OreQuartz extends AEBaseBlock
public OreQuartz(Class self) {
super( self, Material.rock );
setFeature( EnumSet.of( AEFeature.Core ) );
setHardness( 3.0F );
setResistance( 5.0F );
boostBrightnessLow = 0;
boostBrightnessHigh = 1;
enhanceBrightness = false;
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setHardness( 3.0F );
this.setResistance( 5.0F );
this.boostBrightnessLow = 0;
this.boostBrightnessHigh = 1;
this.enhanceBrightness = false;
}
@Override
@@ -67,14 +67,14 @@ public class OreQuartz extends AEBaseBlock
public int getMixedBrightnessForBlock(IBlockAccess par1iBlockAccess, int par2, int par3, int par4)
{
int j1 = super.getMixedBrightnessForBlock( par1iBlockAccess, par2, par3, par4 );
if ( enhanceBrightness )
if ( this.enhanceBrightness )
{
j1 = Math.max( j1 >> 20, j1 >> 4 );
if ( j1 > 4 )
j1 += boostBrightnessHigh;
j1 += this.boostBrightnessHigh;
else
j1 += boostBrightnessLow;
j1 += this.boostBrightnessLow;
if ( j1 > 15 )
j1 = 15;
@@ -95,13 +95,13 @@ public class OreQuartz extends AEBaseBlock
@Override
public Item getItemDropped(int id, Random rand, int meta)
{
return getItemDropped().getItem();
return this.getItemDropped().getItem();
}
@Override
public int damageDropped(int id)
{
return getItemDropped().getItemDamage();
return this.getItemDropped().getItemDamage();
}
@Override
@@ -113,7 +113,7 @@ public class OreQuartz extends AEBaseBlock
@Override
public int quantityDroppedWithBonus(int fortune, Random rand)
{
if ( fortune > 0 && Item.getItemFromBlock( this ) != getItemDropped( 0, rand, fortune ) )
if ( fortune > 0 && Item.getItemFromBlock( this ) != this.getItemDropped( 0, rand, fortune ) )
{
int j = rand.nextInt( fortune + 2 ) - 1;
@@ -135,7 +135,7 @@ public class OreQuartz extends AEBaseBlock
{
super.dropBlockAsItemWithChance( w, x, y, z, blockID, something, meta );
if ( getItemDropped( blockID, w.rand, meta ) != Item.getItemFromBlock( this ) )
if ( this.getItemDropped( blockID, w.rand, meta ) != Item.getItemFromBlock( this ) )
{
int xp = MathHelper.getRandomIntegerInRange( w.rand, 2, 5 );
src/main/java/appeng/block/solids/OreQuartzCharged.java
+2 -2
View File
@@ -35,8 +35,8 @@ public class OreQuartzCharged extends OreQuartz
public OreQuartzCharged() {
super( OreQuartzCharged.class );
boostBrightnessLow = 2;
boostBrightnessHigh = 5;
this.boostBrightnessLow = 2;
this.boostBrightnessHigh = 5;
}
@Override