Formatted code

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
@@ -88,7 +88,7 @@ public class AEBaseItemBlock extends ItemBlock
{
return this.blockType.getUnlocalizedName( is );
}
@Override
public boolean placeBlockAt(
final ItemStack stack,
@@ -95,7 +95,6 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
this.setTileProvider( this.hasBlockTileEntity() );
}
// update Block value.
private void setTileProvider( final boolean b )
{
@@ -115,7 +114,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
@Nullable
public <T extends AEBaseTile> T getTileEntity( final IBlockAccess w, final int x, final int y, final int z )
{
return this.getTileEntity( w, new BlockPos(x,y,z) );
return this.getTileEntity( w, new BlockPos( x, y, z ) );
}
@Nullable
@@ -163,7 +162,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
final BlockPos pos,
final IBlockState state )
{
final AEBaseTile te = this.getTileEntity( w,pos );
final AEBaseTile te = this.getTileEntity( w, pos );
if( te != null )
{
final ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
@@ -183,7 +182,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
// super will remove the TE, as it is not an instance of BlockContainer
super.breakBlock( w, pos, state );
}
@Override
public final EnumFacing[] getValidRotations( final World w, final BlockPos pos )
{
@@ -219,7 +218,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
return false;
}
return super.recolorBlock( world, pos, side, color);
return super.recolorBlock( world, pos, side, color );
}
@Override
@@ -243,7 +242,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
final int eventID,
final int eventParam )
{
super.onBlockEventReceived( worldIn, pos, state ,eventID, eventParam);
super.onBlockEventReceived( worldIn, pos, state, eventID, eventParam );
final TileEntity tileentity = worldIn.getTileEntity( pos );
return tileentity != null ? tileentity.receiveClientEvent( eventID, eventParam ) : false;
}
@@ -1,8 +1,11 @@
package appeng.block;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.property.IUnlistedProperty;
public final class UnlistedBlockAccess implements IUnlistedProperty<IBlockAccess>
{
@Override
@@ -1,8 +1,11 @@
package appeng.block;
import net.minecraft.util.BlockPos;
import net.minecraftforge.common.property.IUnlistedProperty;
public final class UnlistedBlockPos implements IUnlistedProperty<BlockPos>
{
@Override
@@ -60,10 +60,10 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
{
for( final Block craftingUnitBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
{
return ( (BlockCraftingUnit)craftingUnitBlock ).getIcon( side, state );
return ( (BlockCraftingUnit) craftingUnitBlock ).getIcon( side, state );
}
}
return ExtraBlockTextures.BlockCraftingMonitorFit_Light.getIcon();
}
@@ -32,10 +32,10 @@ import appeng.tile.crafting.TileCraftingStorageTile;
public class BlockCraftingStorage extends BlockCraftingUnit
{
public BlockCraftingStorage( final CraftingUnitType type )
{
super(type );
super( type );
this.setTileEntity( TileCraftingStorageTile.class );
}
@@ -46,29 +46,29 @@ public class BlockCraftingStorage extends BlockCraftingUnit
}
@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 )
{
final boolean formed = (boolean)state.getValue( FORMED );
switch( this.type )
final boolean formed = (boolean) state.getValue( FORMED );
switch( this.type )
{
default:
case STORAGE_1K:
return formed ?
super.getIcon( side,state ) :
ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
return formed ?
super.getIcon( side, state ) :
ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
case STORAGE_4K:
return formed ?
ExtraBlockTextures.BlockCraftingStorage4k.getIcon() :
ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
return formed ?
ExtraBlockTextures.BlockCraftingStorage4k.getIcon() :
ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
case STORAGE_16K:
return formed ?
ExtraBlockTextures.BlockCraftingStorage16k.getIcon() :
ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon();
return formed ?
ExtraBlockTextures.BlockCraftingStorage16k.getIcon() :
ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon();
case STORAGE_64K:
return formed ?
ExtraBlockTextures.BlockCraftingStorage64k.getIcon() :
ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon();
return formed ?
ExtraBlockTextures.BlockCraftingStorage64k.getIcon() :
ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon();
}
}
@@ -61,7 +61,7 @@ public class BlockCrank extends AEBaseTileBlock
{
return RenderBlockCrank.class;
}
@Override
public boolean onActivated(
final World w,
@@ -95,7 +95,7 @@ public class BlockCrank extends AEBaseTileBlock
world.destroyBlock( pos, true ); // w.destroyBlock( x, y, z, true );
world.markBlockForUpdate( pos );
}
@Override
public void onBlockPlacedBy(
final World world,
@@ -120,7 +120,7 @@ public class BlockCrank extends AEBaseTileBlock
this.dropCrank( world, pos );
}
}
@Override
public boolean isValidOrientation(
final World w,
@@ -146,12 +146,12 @@ public class BlockCrank extends AEBaseTileBlock
private boolean isCrankable( final World world, final BlockPos pos, final EnumFacing offset )
{
final BlockPos o = pos.offset( offset);
final BlockPos o = pos.offset( offset );
final TileEntity te = world.getTileEntity( o );
return te instanceof ICrankable && ( (ICrankable) te ).canCrankAttach( offset.getOpposite() );
}
@Override
public void onNeighborBlockChange(
final World world,
@@ -61,7 +61,7 @@ public class BlockGrinder extends AEBaseTileBlock
// TODO Auto-generated method stub
return super.onBlockActivated( worldIn, pos, state, playerIn, side, hitX, hitY, hitZ );
}
@Override
public boolean onActivated(
final World w,
@@ -95,8 +95,8 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
return true;
}
@Override
@Override
@SideOnly( Side.CLIENT )
public void randomDisplayTick(
final World w,
@@ -55,7 +55,7 @@ public class BlockInscriber extends AEBaseTileBlock
{
return RenderBlockInscriber.class;
}
@Override
public boolean onActivated(
final World w,
@@ -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 );
}
}
@@ -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;
}
}
@@ -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 );
}
}
@@ -59,7 +59,7 @@ public class BlockSecurity extends AEBaseTileBlock
{
return RendererSecurity.class;
}
@Override
public boolean onActivated(
final World w,
@@ -183,6 +183,6 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
final List<AxisAlignedBB> out,
final Entity e )
{
}
}
@@ -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 );
@@ -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 );
@@ -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()
{
@@ -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
@@ -67,7 +67,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
{
return EnumWorldBlockLayer.CUTOUT;
}
@Override
public boolean onBlockActivated(
final World w,
@@ -53,7 +53,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
{
return EnumWorldBlockLayer.CUTOUT;
}
@Override
public void onNeighborBlockChange(
final World w,
@@ -47,7 +47,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
{
super( AEGlassMaterial.INSTANCE );
}
@Override
public void randomDisplayTick(
final World w,
@@ -105,7 +105,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
final double onePixel = 2.0 / 16.0;
return Collections.singletonList( AxisAlignedBB.fromBounds( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) );
}
@Override
public void addCollidingBlockToList(
final World w,
@@ -78,7 +78,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
return Arrays.asList( new AxisAlignedBB[] {} );// AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 )
// } );
}
@Override
public void addCollidingBlockToList(
final World w,
@@ -57,7 +57,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock
tsp.onNeighborBlockChange();
}
}
@Override
public int getLightValue(
final IBlockAccess w,
@@ -43,7 +43,7 @@ import appeng.util.Platform;
public class BlockChest extends AEBaseTileBlock
{
public BlockChest()
{
super( Material.iron );
@@ -58,7 +58,7 @@ public class BlockDrive extends AEBaseTileBlock
{
return RenderDrive.class;
}
@Override
public boolean onActivated(
final World w,
@@ -45,7 +45,7 @@ public class BlockIOPort extends AEBaseTileBlock
this.setTileEntity( TileIOPort.class );
this.setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.IOPort ) );
}
@Override
public void onNeighborBlockChange(
final World w,
@@ -59,7 +59,7 @@ public class BlockIOPort extends AEBaseTileBlock
te.updateRedstoneState();
}
}
@Override
public boolean onActivated(
final World w,
@@ -46,14 +46,14 @@ import appeng.util.Platform;
public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
{
public static enum SkyChestType
{
STONE, BLOCK
};
public final SkyChestType type;
public BlockSkyChest( final SkyChestType type )
{
super( Material.rock, Optional.of( type.name() ) );
@@ -90,7 +90,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
return true;
}
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
final World w,
@@ -113,7 +113,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
final double sc = 0.06;
return Collections.singletonList( AxisAlignedBB.fromBounds( Math.max( 0.0, offsetX - o.getFrontOffsetX() * sc ), Math.max( 0.0, offsetY - o.getFrontOffsetY() * sc ), Math.max( 0.0, offsetZ - o.getFrontOffsetZ() * sc ), Math.min( 1.0, ( 1.0 - offsetX ) - o.getFrontOffsetX() * sc ), Math.min( 1.0, ( 1.0 - offsetY ) - o.getFrontOffsetY() * sc ), Math.min( 1.0, ( 1.0 - offsetZ ) - o.getFrontOffsetZ() * sc ) ) );
}
@Override
public void addCollidingBlockToList(
final World w,