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

Formatted code

Browse Source
This commit is contained in:
yueh
2015-12-24 02:03:16 +01:00
parent e94a0cfccf
commit c9e8a6e939
216 changed files with 1196 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/misc/BlockCharger.java
+2 -2
View File
@@ -95,8 +95,8 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
return true;
}
@Override
@Override
@SideOnly( Side.CLIENT )
public void randomDisplayTick(
final World w,
src/main/java/appeng/block/misc/BlockInscriber.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class BlockInscriber extends AEBaseTileBlock
{
return RenderBlockInscriber.class;
}
@Override
public boolean onActivated(
final World w,
src/main/java/appeng/block/misc/BlockLightDetector.java
+8 -8
View File
@@ -45,7 +45,7 @@ import appeng.helpers.MetaRotation;
import appeng.tile.misc.TileLightDetector;
public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock,ICustomCollision
public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision
{
public BlockLightDetector()
@@ -66,18 +66,18 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
{
return 0;
}
@Override
public IBlockState getStateFromMeta(
final int meta )
{
return this.getDefaultState();
}
@Override
protected IProperty[] getAEStates()
{
return new IProperty[]{ BlockTorch.FACING };
return new IProperty[] { BlockTorch.FACING };
}
@Override
@@ -140,7 +140,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
{
return w.isSideSolid( pos.offset( dir ), dir.getOpposite(), false );
}
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
final World w,
@@ -168,7 +168,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
* + (double) z + 0.15,// ahh xOff + (double) x + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) );
*/
}
@Override
public void onNeighborBlockChange(
final World w,
@@ -188,7 +188,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
w.destroyBlock( pos, true );
w.markBlockForUpdate( pos );
}
@Override
public boolean canPlaceBlockAt(
final World w,
@@ -213,6 +213,6 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
@Override
public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos )
{
return new MetaRotation( w, pos,true );
return new MetaRotation( w, pos, true );
}
}
src/main/java/appeng/block/misc/BlockPaint.java
+6 -6
View File
@@ -77,7 +77,7 @@ public class BlockPaint extends AEBaseTileBlock
{
// do nothing
}
@Override
public AxisAlignedBB getCollisionBoundingBox(
final World worldIn,
@@ -127,9 +127,9 @@ public class BlockPaint extends AEBaseTileBlock
final float chance,
final int fortune )
{
}
@Override
public void fillWithRain(
final World w,
@@ -140,7 +140,7 @@ public class BlockPaint extends AEBaseTileBlock
w.setBlockToAir( pos );
}
}
@Override
public int getLightValue(
final IBlockAccess w,
@@ -163,7 +163,7 @@ public class BlockPaint extends AEBaseTileBlock
{
return true;
}
@Override
public boolean isReplaceable(
final World worldIn,
@@ -171,5 +171,5 @@ public class BlockPaint extends AEBaseTileBlock
{
return true;
}
}
src/main/java/appeng/block/misc/BlockQuartzTorch.java
+6 -6
View File
@@ -63,25 +63,25 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
this.setFullSize( false );
this.setOpaque( false );
}
@Override
public int getMetaFromState(
final IBlockState state )
{
return 0;
}
@Override
public IBlockState getStateFromMeta(
final int meta )
{
return this.getDefaultState();
}
@Override
protected IProperty[] getAEStates()
{
return new IProperty[]{ BlockTorch.FACING };
return new IProperty[] { BlockTorch.FACING };
}
@Override
@@ -120,7 +120,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
* + (double) z + 0.15,// ahh xOff + (double) x + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) );
*/
}
@Override
@SideOnly( Side.CLIENT )
public void randomDisplayTick(
@@ -196,6 +196,6 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
@Override
public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos )
{
return new MetaRotation( w, pos,true );
return new MetaRotation( w, pos, true );
}
}
src/main/java/appeng/block/misc/BlockSecurity.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class BlockSecurity extends AEBaseTileBlock
{
return RendererSecurity.class;
}
@Override
public boolean onActivated(
final World w,
src/main/java/appeng/block/misc/BlockSkyCompass.java
+1 -1
View File
@@ -183,6 +183,6 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
final List<AxisAlignedBB> out,
final Entity e )
{
}
}
src/main/java/appeng/block/misc/BlockVibrationChamber.java
+2 -2
View File
@@ -52,9 +52,9 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
this.setHardness( 4.2F );
this.setFeature( EnumSet.of( AEFeature.PowerGen ) );
}
@Override
public appeng.client.texture.IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side)
public appeng.client.texture.IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side )
{
final IAESprite ico = super.getIcon( w, pos, side );
final TileVibrationChamber tvc = this.getTileEntity( w, pos );