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/networking/BlockController.java
+13 -13
View File
@@ -49,36 +49,36 @@ public class BlockController extends AEBaseTileBlock
{
return this.name();
}
};
public static final PropertyEnum CONTROLLER_STATE = PropertyEnum.create("state",ControllerBlockState.class);
@Override
protected IProperty[] getAEStates()
{
return new IProperty[]{ CONTROLLER_STATE };
}
public static final PropertyEnum CONTROLLER_STATE = PropertyEnum.create( "state", ControllerBlockState.class );
@Override
protected IProperty[] getAEStates()
{
return new IProperty[] { CONTROLLER_STATE };
}
@Override
public int getMetaFromState(
final IBlockState state )
{
return ((ControllerBlockState)state.getValue( CONTROLLER_STATE )).ordinal();
return ( (ControllerBlockState) state.getValue( CONTROLLER_STATE ) ).ordinal();
}
@Override
public IBlockState getStateFromMeta( final int meta )
{
return this.getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.OFFLINE );
}
@Override
public EnumWorldBlockLayer getBlockLayer()
{
return EnumWorldBlockLayer.CUTOUT;
}
public BlockController()
{
super( Material.iron );
src/main/java/appeng/block/networking/BlockDenseEnergyCell.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
}
@Override
public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state)
public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state )
{
switch( (int)state.getValue( ENERGY_STORAGE ) )
switch( (int) state.getValue( ENERGY_STORAGE ) )
{
default:
case 0:
@@ -59,7 +59,7 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
return ExtraBlockTextures.MEDenseEnergyCell7.getIcon();
}
}
@Override
public double getMaxPower()
{
src/main/java/appeng/block/networking/BlockEnergyCell.java
+7 -7
View File
@@ -52,15 +52,15 @@ public class BlockEnergyCell extends AEBaseTileBlock
public int getMetaFromState(
final IBlockState state )
{
return (int)state.getValue( ENERGY_STORAGE );
return (int) state.getValue( ENERGY_STORAGE );
}
@Override
public IBlockState getStateFromMeta( final int meta )
{
return this.getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) );
return this.getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) );
}
public BlockEnergyCell()
{
super( AEGlassMaterial.INSTANCE );
@@ -76,9 +76,9 @@ public class BlockEnergyCell extends AEBaseTileBlock
}
@Override
public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final IBlockState state)
public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final IBlockState state )
{
switch( (int)state.getValue( ENERGY_STORAGE ) )
switch( (int) state.getValue( ENERGY_STORAGE ) )
{
default:
case 0:
@@ -122,7 +122,7 @@ public class BlockEnergyCell extends AEBaseTileBlock
@Override
protected IProperty[] getAEStates()
{
return new IProperty[]{ENERGY_STORAGE};
return new IProperty[] { ENERGY_STORAGE };
}
@Override
src/main/java/appeng/block/networking/BlockWireless.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
{
return EnumWorldBlockLayer.CUTOUT;
}
@Override
public boolean onBlockActivated(
final World w,