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/misc/BlockCellWorkbench.java
+3 -3
View File
@@ -35,8 +35,8 @@ public class BlockCellWorkbench extends AEBaseBlock
public BlockCellWorkbench() {
super( BlockCellWorkbench.class, Material.iron );
setFeature( EnumSet.of( AEFeature.StorageCells ) );
setTileEntity( TileCellWorkbench.class );
this.setFeature( EnumSet.of( AEFeature.StorageCells ) );
this.setTileEntity( TileCellWorkbench.class );
}
@Override
@@ -45,7 +45,7 @@ public class BlockCellWorkbench extends AEBaseBlock
if ( p.isSneaking() )
return false;
TileCellWorkbench tg = getTileEntity( w, x, y, z );
TileCellWorkbench tg = this.getTileEntity( w, x, y, z );
if ( tg != null )
{
if ( Platform.isServer() )
src/main/java/appeng/block/misc/BlockCharger.java
+7 -7
View File
@@ -53,10 +53,10 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
public BlockCharger() {
super( BlockCharger.class, Material.iron );
setFeature( EnumSet.of( AEFeature.Core ) );
setTileEntity( TileCharger.class );
setLightOpacity( 2 );
isFullSize = isOpaque = false;
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setTileEntity( TileCharger.class );
this.setLightOpacity( 2 );
this.isFullSize = this.isOpaque = false;
}
@Override
@@ -67,7 +67,7 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
if ( Platform.isServer() )
{
TileCharger tc = getTileEntity( w, x, y, z );
TileCharger tc = this.getTileEntity( w, x, y, z );
if ( tc != null )
{
tc.activate( player );
@@ -93,7 +93,7 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
if ( r.nextFloat() < 0.98 )
return;
AEBaseTile tile = getTileEntity( w, x, y, z );
AEBaseTile tile = this.getTileEntity( w, x, y, z );
if ( tile instanceof TileCharger )
{
TileCharger tc = (TileCharger) tile;
@@ -120,7 +120,7 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual)
{
TileCharger tile = getTileEntity( w, x, y, z );
TileCharger tile = this.getTileEntity( w, x, y, z );
if ( tile != null )
{
double twoPixels = 2.0 / 16.0;
src/main/java/appeng/block/misc/BlockCondenser.java
+3 -3
View File
@@ -35,8 +35,8 @@ public class BlockCondenser extends AEBaseBlock
public BlockCondenser() {
super( BlockCondenser.class, Material.iron );
setFeature( EnumSet.of( AEFeature.Core ) );
setTileEntity( TileCondenser.class );
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setTileEntity( TileCondenser.class );
}
@Override
@@ -47,7 +47,7 @@ public class BlockCondenser extends AEBaseBlock
if ( Platform.isServer() )
{
TileCondenser tc = getTileEntity( w, x, y, z );
TileCondenser tc = this.getTileEntity( w, x, y, z );
if ( tc != null && !player.isSneaking() )
{
Platform.openGUI( player, tc, ForgeDirection.getOrientation(side), GuiBridge.GUI_CONDENSER );
src/main/java/appeng/block/misc/BlockInscriber.java
+5 -5
View File
@@ -37,10 +37,10 @@ public class BlockInscriber extends AEBaseBlock
public BlockInscriber() {
super( BlockInscriber.class, Material.iron );
setFeature( EnumSet.of( AEFeature.Inscriber ) );
setTileEntity( TileInscriber.class );
setLightOpacity( 2 );
isFullSize = isOpaque = false;
this.setFeature( EnumSet.of( AEFeature.Inscriber ) );
this.setTileEntity( TileInscriber.class );
this.setLightOpacity( 2 );
this.isFullSize = this.isOpaque = false;
}
@Override
@@ -55,7 +55,7 @@ public class BlockInscriber extends AEBaseBlock
if ( p.isSneaking() )
return false;
TileInscriber tg = getTileEntity( w, x, y, z );
TileInscriber tg = this.getTileEntity( w, x, y, z );
if ( tg != null )
{
if ( Platform.isServer() )
src/main/java/appeng/block/misc/BlockInterface.java
+3 -3
View File
@@ -38,8 +38,8 @@ public class BlockInterface extends AEBaseBlock
public BlockInterface() {
super( BlockInterface.class, Material.iron );
setFeature( EnumSet.of( AEFeature.Core ) );
setTileEntity( TileInterface.class );
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setTileEntity( TileInterface.class );
}
@Override
@@ -69,7 +69,7 @@ public class BlockInterface extends AEBaseBlock
if ( p.isSneaking() )
return false;
TileInterface tg = getTileEntity( w, x, y, z );
TileInterface tg = this.getTileEntity( w, x, y, z );
if ( tg != null )
{
if ( Platform.isServer() )
src/main/java/appeng/block/misc/BlockLightDetector.java
+4 -4
View File
@@ -33,8 +33,8 @@ public class BlockLightDetector extends BlockQuartzTorch
public BlockLightDetector() {
super( BlockLightDetector.class );
setFeature( EnumSet.of( AEFeature.LightDetector ) );
setTileEntity( TileLightDetector.class );
this.setFeature( EnumSet.of( AEFeature.LightDetector ) );
this.setTileEntity( TileLightDetector.class );
}
@Override
@@ -42,7 +42,7 @@ public class BlockLightDetector extends BlockQuartzTorch
{
super.onNeighborChange( world, x, y, z, tileX, tileY, tileZ );
TileLightDetector tld = getTileEntity( world, x, y, z );
TileLightDetector tld = this.getTileEntity( world, x, y, z );
if ( tld != null )
tld.updateLight();
}
@@ -50,7 +50,7 @@ public class BlockLightDetector extends BlockQuartzTorch
@Override
public int isProvidingWeakPower(IBlockAccess w, int x, int y, int z, int side)
{
if ( w instanceof World && ((TileLightDetector) getTileEntity( w, x, y, z )).isReady() )
if ( w instanceof World && ((TileLightDetector) this.getTileEntity( w, x, y, z )).isReady() )
return ((World) w).getBlockLightValue( x, y, z ) - 6;
return 0;
src/main/java/appeng/block/misc/BlockPaint.java
+7 -7
View File
@@ -45,11 +45,11 @@ public class BlockPaint extends AEBaseBlock
public BlockPaint() {
super( BlockPaint.class, new MaterialLiquid( MapColor.airColor ) );
setFeature( EnumSet.of( AEFeature.PaintBalls ) );
setTileEntity( TilePaint.class );
setLightOpacity( 0 );
isFullSize = false;
isOpaque = false;
this.setFeature( EnumSet.of( AEFeature.PaintBalls ) );
this.setTileEntity( TilePaint.class );
this.setLightOpacity( 0 );
this.isFullSize = false;
this.isOpaque = false;
}
@Override
@@ -61,7 +61,7 @@ public class BlockPaint extends AEBaseBlock
@Override
public int getLightValue(IBlockAccess w, int x, int y, int z)
{
TilePaint tp = getTileEntity( w, x, y, z );
TilePaint tp = this.getTileEntity( w, x, y, z );
if ( tp != null )
{
@@ -88,7 +88,7 @@ public class BlockPaint extends AEBaseBlock
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block junk)
{
TilePaint tp = getTileEntity( w, x, y, z );
TilePaint tp = this.getTileEntity( w, x, y, z );
if ( tp != null )
tp.onNeighborBlockChange();
src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java
+4 -4
View File
@@ -47,9 +47,9 @@ public class BlockQuartzGrowthAccelerator extends AEBaseBlock implements IOrient
public BlockQuartzGrowthAccelerator() {
super( BlockQuartzGrowthAccelerator.class, Material.rock );
setStepSound( Block.soundTypeMetal );
setFeature( EnumSet.of( AEFeature.Core ) );
setTileEntity( TileQuartzGrowthAccelerator.class );
this.setStepSound( Block.soundTypeMetal );
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setTileEntity( TileQuartzGrowthAccelerator.class );
}
@Override
@@ -71,7 +71,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseBlock implements IOrient
if ( !AEConfig.instance.enableEffects )
return;
TileQuartzGrowthAccelerator tileQuartzGrowthAccelerator = getTileEntity( w, x, y, z );
TileQuartzGrowthAccelerator tileQuartzGrowthAccelerator = this.getTileEntity( w, x, y, z );
if ( tileQuartzGrowthAccelerator != null && tileQuartzGrowthAccelerator.hasPower && CommonHelper.proxy.shouldAddParticles( r ) )
{
src/main/java/appeng/block/misc/BlockQuartzTorch.java
+11 -11
View File
@@ -53,14 +53,14 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
protected BlockQuartzTorch(Class which) {
super( which, Material.circuits );
setLightOpacity( 0 );
isFullSize = isOpaque = false;
this.setLightOpacity( 0 );
this.isFullSize = this.isOpaque = false;
}
public BlockQuartzTorch() {
this( BlockQuartzTorch.class );
setFeature( EnumSet.of( AEFeature.DecorativeLights ) );
setLightLevel( 0.9375F );
this.setFeature( EnumSet.of( AEFeature.DecorativeLights ) );
this.setLightLevel( 0.9375F );
}
@Override
@@ -86,7 +86,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
public boolean canPlaceBlockAt(World w, int x, int y, int z)
{
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
if ( canPlaceAt( w, x, y, z, dir ) )
if ( this.canPlaceAt( w, x, y, z, dir ) )
return true;
return false;
}
@@ -99,21 +99,21 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
@Override
public boolean isValidOrientation(World w, int x, int y, int z, ForgeDirection forward, ForgeDirection up)
{
return canPlaceAt( w, x, y, z, up.getOpposite() );
return this.canPlaceAt( w, x, y, z, up.getOpposite() );
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block id)
{
ForgeDirection up = getOrientable( w, x, y, z ).getUp();
if ( !canPlaceAt( w, x, y, z, up.getOpposite() ) )
dropTorch( w, x, y, z );
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
if ( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
this.dropTorch( w, x, y, z );
}
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual)
{
ForgeDirection up = getOrientable( w, x, y, z ).getUp();
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
double xOff = -0.3 * up.offsetX;
double yOff = -0.3 * up.offsetY;
double zOff = -0.3 * up.offsetZ;
@@ -139,7 +139,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
if ( r.nextFloat() < 0.98 )
return;
ForgeDirection up = getOrientable( w, x, y, z ).getUp();
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
double xOff = -0.3 * up.offsetX;
double yOff = -0.3 * up.offsetY;
double zOff = -0.3 * up.offsetZ;
src/main/java/appeng/block/misc/BlockSecurity.java
+3 -3
View File
@@ -37,8 +37,8 @@ public class BlockSecurity extends AEBaseBlock
public BlockSecurity() {
super( BlockSecurity.class, Material.iron );
setFeature( EnumSet.of( AEFeature.Security ) );
setTileEntity( TileSecurity.class );
this.setFeature( EnumSet.of( AEFeature.Security ) );
this.setTileEntity( TileSecurity.class );
}
@Override
@@ -53,7 +53,7 @@ public class BlockSecurity extends AEBaseBlock
if ( p.isSneaking() )
return false;
TileSecurity tg = getTileEntity( w, x, y, z );
TileSecurity tg = this.getTileEntity( w, x, y, z );
if ( tg != null )
{
if ( Platform.isClient() )
src/main/java/appeng/block/misc/BlockSkyCompass.java
+11 -11
View File
@@ -48,10 +48,10 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
public BlockSkyCompass() {
super( BlockSkyCompass.class, Material.iron );
setFeature( EnumSet.of( AEFeature.MeteoriteCompass ) );
setTileEntity( TileSkyCompass.class );
isOpaque = isFullSize = false;
lightOpacity = 0;
this.setFeature( EnumSet.of( AEFeature.MeteoriteCompass ) );
this.setTileEntity( TileSkyCompass.class );
this.isOpaque = this.isFullSize = false;
this.lightOpacity = 0;
}
@Override
@@ -78,7 +78,7 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
public boolean canPlaceBlockAt(World w, int x, int y, int z)
{
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
if ( canPlaceAt( w, x, y, z, dir ) )
if ( this.canPlaceAt( w, x, y, z, dir ) )
return true;
return false;
}
@@ -91,25 +91,25 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
@Override
public boolean isValidOrientation(World w, int x, int y, int z, ForgeDirection forward, ForgeDirection up)
{
TileSkyCompass sc = getTileEntity( w, x, y, z );
TileSkyCompass sc = this.getTileEntity( w, x, y, z );
if ( sc != null )
return false;
return canPlaceAt( w, x, y, z, forward.getOpposite() );
return this.canPlaceAt( w, x, y, z, forward.getOpposite() );
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block id)
{
TileSkyCompass sc = getTileEntity( w, x, y, z );
TileSkyCompass sc = this.getTileEntity( w, x, y, z );
ForgeDirection up = sc.getForward();
if ( !canPlaceAt( w, x, y, z, up.getOpposite() ) )
dropTorch( w, x, y, z );
if ( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
this.dropTorch( w, x, y, z );
}
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual)
{
TileSkyCompass tile = getTileEntity( w, x, y, z );
TileSkyCompass tile = this.getTileEntity( w, x, y, z );
if ( tile != null )
{
ForgeDirection forward = tile.getForward();
src/main/java/appeng/block/misc/BlockTinyTNT.java
+6 -6
View File
@@ -57,12 +57,12 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
public BlockTinyTNT() {
super( BlockTinyTNT.class, Material.tnt );
setFeature( EnumSet.of( AEFeature.TinyTNT ) );
setLightOpacity( 1 );
setBlockBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f );
isFullSize = isOpaque = false;
setStepSound( soundTypeGrass );
setHardness( 0F );
this.setFeature( EnumSet.of( AEFeature.TinyTNT ) );
this.setLightOpacity( 1 );
this.setBlockBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f );
this.isFullSize = this.isOpaque = false;
this.setStepSound( soundTypeGrass );
this.setHardness( 0F );
EntityRegistry.registerModEntity( EntityTinyTNTPrimed.class, "EntityTinyTNTPrimed", EntityIds.TINY_TNT, AppEng.instance, 16, 4, true );
}
src/main/java/appeng/block/misc/BlockVibrationChamber.java
+7 -7
View File
@@ -41,9 +41,9 @@ public class BlockVibrationChamber extends AEBaseBlock
public BlockVibrationChamber() {
super( BlockVibrationChamber.class, Material.iron );
setFeature( EnumSet.of( AEFeature.PowerGen ) );
setTileEntity( TileVibrationChamber.class );
setHardness( 4.2F );
this.setFeature( EnumSet.of( AEFeature.PowerGen ) );
this.setTileEntity( TileVibrationChamber.class );
this.setHardness( 4.2F );
}
@Override
@@ -54,7 +54,7 @@ public class BlockVibrationChamber extends AEBaseBlock
if ( Platform.isServer() )
{
TileVibrationChamber tc = getTileEntity( w, x, y, z );
TileVibrationChamber tc = this.getTileEntity( w, x, y, z );
if ( tc != null && !player.isSneaking() )
{
Platform.openGUI( player, tc, ForgeDirection.getOrientation( side ), GuiBridge.GUI_VIBRATION_CHAMBER );
@@ -69,9 +69,9 @@ public class BlockVibrationChamber extends AEBaseBlock
public IIcon getIcon(IBlockAccess w, int x, int y, int z, int s)
{
IIcon ico = super.getIcon( w, x, y, z, s );
TileVibrationChamber tvc = getTileEntity( w, x, y, z );
TileVibrationChamber tvc = this.getTileEntity( w, x, y, z );
if ( tvc != null && tvc.isOn && ico == getRendererInstance().getTexture( ForgeDirection.SOUTH ) )
if ( tvc != null && tvc.isOn && ico == this.getRendererInstance().getTexture( ForgeDirection.SOUTH ) )
{
return ExtraBlockTextures.BlockVibrationChamberFrontOn.getIcon();
}
@@ -85,7 +85,7 @@ public class BlockVibrationChamber extends AEBaseBlock
if ( !AEConfig.instance.enableEffects )
return;
AEBaseTile tile = getTileEntity( w, x, y, z );
AEBaseTile tile = this.getTileEntity( w, x, y, z );
if ( tile instanceof TileVibrationChamber )
{
TileVibrationChamber tc = (TileVibrationChamber) tile;