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/AEBaseBlock.java
+72 -72
View File
@@ -102,11 +102,11 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
protected AEBaseBlock( Class<? extends AEBaseBlock> c, Material mat )
{
this( c, mat, Optional.<String> absent() );
setLightOpacity( 255 );
setLightLevel( 0 );
setHardness( 2.2F );
setTileProvider( false );
setHarvestLevel( "pickaxe", 0 );
this.setLightOpacity( 255 );
this.setLightLevel( 0 );
this.setHardness( 2.2F );
this.setTileProvider( false );
this.setHarvestLevel( "pickaxe", 0 );
}
protected AEBaseBlock( Class<?> c, Material mat, Optional<String> subName )
@@ -114,27 +114,27 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
super( mat );
if ( mat == AEGlassMaterial.instance || mat == Material.glass )
setStepSound( Block.soundTypeGlass );
this.setStepSound( Block.soundTypeGlass );
else if ( mat == Material.rock )
setStepSound( Block.soundTypeStone );
this.setStepSound( Block.soundTypeStone );
else if ( mat == Material.wood )
setStepSound( Block.soundTypeWood );
this.setStepSound( Block.soundTypeWood );
else
setStepSound( Block.soundTypeMetal );
this.setStepSound( Block.soundTypeMetal );
featureFullName = new FeatureNameExtractor( c, subName ).get();
featureSubName = subName;
this.featureFullName = new FeatureNameExtractor( c, subName ).get();
this.featureSubName = subName;
}
@Override
public String toString()
{
return featureFullName;
return this.featureFullName;
}
public void registerNoIcons()
{
BlockRenderInfo info = getRendererInstance();
BlockRenderInfo info = this.getRendererInstance();
FlippableIcon i = new FlippableIcon( new MissingIcon( this ) );
info.updateIcons( i, i, i, i, i, i );
}
@@ -147,9 +147,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
protected void setTileEntity( Class<? extends TileEntity> c )
{
AEBaseTile.registerTileItem( c, new ItemStackSrc( this, 0 ) );
GameRegistry.registerTileEntity( tileEntityType = c, featureFullName );
isInventory = IInventory.class.isAssignableFrom( c );
setTileProvider( hasBlockTileEntity() );
GameRegistry.registerTileEntity( this.tileEntityType = c, this.featureFullName );
this.isInventory = IInventory.class.isAssignableFrom( c );
this.setTileProvider( this.hasBlockTileEntity() );
}
// update Block value.
@@ -166,7 +166,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
final public IFeatureHandler handler()
{
return handler;
return this.handler;
}
@Override
@@ -177,13 +177,13 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public boolean isOpaque()
{
return isOpaque;
return this.isOpaque;
}
@Override
public boolean renderAsNormalBlock()
{
return isFullSize && isOpaque;
return this.isFullSize && this.isOpaque;
}
@Override
@@ -196,17 +196,17 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
public IIcon getIcon( IBlockAccess w, int x, int y, int z, int s )
{
return getIcon( mapRotation( w, x, y, z, s ), w.getBlockMetadata( x, y, z ) );
return this.getIcon( this.mapRotation( w, x, y, z, s ), w.getBlockMetadata( x, y, z ) );
}
@Override
@SideOnly( Side.CLIENT )
public IIcon getIcon( int direction, int metadata )
{
if ( renderIcon != null )
return renderIcon;
if ( this.renderIcon != null )
return this.renderIcon;
return getRendererInstance().getTexture( ForgeDirection.getOrientation( direction ) );
return this.getRendererInstance().getTexture( ForgeDirection.getOrientation( direction ) );
}
@Override
@@ -220,7 +220,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
collisionHandler = ( ICustomCollision ) this;
else
{
AEBaseTile te = getTileEntity( w, x, y, z );
AEBaseTile te = this.getTileEntity( w, x, y, z );
if ( te instanceof ICustomCollision )
collisionHandler = ( ICustomCollision ) te;
}
@@ -256,7 +256,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
collisionHandler = ( ICustomCollision ) this;
else
{
AEBaseTile te = getTileEntity( w, x, y, z );
AEBaseTile te = this.getTileEntity( w, x, y, z );
if ( te instanceof ICustomCollision )
collisionHandler = ( ICustomCollision ) te;
}
@@ -275,11 +275,11 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
for ( AxisAlignedBB bb : bbs )
{
setBlockBounds( ( float ) bb.minX, ( float ) bb.minY, ( float ) bb.minZ, ( float ) bb.maxX, ( float ) bb.maxY, ( float ) bb.maxZ );
this.setBlockBounds( ( float ) bb.minX, ( float ) bb.minY, ( float ) bb.minZ, ( float ) bb.maxX, ( float ) bb.maxY, ( float ) bb.maxZ );
MovingObjectPosition r = super.collisionRayTrace( w, x, y, z, ld.a, ld.b );
setBlockBounds( 0, 0, 0, 1, 1, 1 );
this.setBlockBounds( 0, 0, 0, 1, 1, 1 );
if ( r != null )
{
@@ -330,7 +330,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
final public boolean isOpaqueCube()
{
return isOpaque;
return this.isOpaque;
}
@Override
@@ -342,7 +342,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
collisionHandler = ( ICustomCollision ) this;
else
{
AEBaseTile te = getTileEntity( w, x, y, z );
AEBaseTile te = this.getTileEntity( w, x, y, z );
if ( te instanceof ICustomCollision )
collisionHandler = ( ICustomCollision ) te;
}
@@ -356,11 +356,11 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
for ( AxisAlignedBB bb : bbs )
{
setBlockBounds( ( float ) bb.minX, ( float ) bb.minY, ( float ) bb.minZ, ( float ) bb.maxX, ( float ) bb.maxY, ( float ) bb.maxZ );
this.setBlockBounds( ( float ) bb.minX, ( float ) bb.minY, ( float ) bb.minZ, ( float ) bb.maxX, ( float ) bb.maxY, ( float ) bb.maxZ );
MovingObjectPosition r = super.collisionRayTrace( w, x, y, z, a, b );
setBlockBounds( 0, 0, 0, 1, 1, 1 );
this.setBlockBounds( 0, 0, 0, 1, 1, 1 );
if ( r != null )
{
@@ -384,7 +384,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
return null;
}
setBlockBounds( 0, 0, 0, 1, 1, 1 );
this.setBlockBounds( 0, 0, 0, 1, 1, 1 );
return super.collisionRayTrace( w, x, y, z, a, b );
}
@@ -401,7 +401,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
Block id = w.getBlock( x, y, z );
if ( id != null )
{
AEBaseTile tile = getTileEntity( w, x, y, z );
AEBaseTile tile = this.getTileEntity( w, x, y, z );
ItemStack[] drops = Platform.getBlockDrops( w, x, y, z );
if ( tile == null )
@@ -436,10 +436,10 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
IMemoryCard memoryCard = ( IMemoryCard ) is.getItem();
if ( player.isSneaking() )
{
AEBaseTile t = getTileEntity( w, x, y, z );
AEBaseTile t = this.getTileEntity( w, x, y, z );
if ( t != null )
{
String name = getUnlocalizedName();
String name = this.getUnlocalizedName();
NBTTagCompound data = t.downloadSettings( SettingsFrom.MEMORY_CARD );
if ( data != null )
{
@@ -453,9 +453,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{
String name = memoryCard.getSettingsName( is );
NBTTagCompound data = memoryCard.getData( is );
if ( getUnlocalizedName().equals( name ) )
if ( this.getUnlocalizedName().equals( name ) )
{
AEBaseTile t = getTileEntity( w, x, y, z );
AEBaseTile t = this.getTileEntity( w, x, y, z );
t.uploadSettings( SettingsFrom.MEMORY_CARD, data );
memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED );
}
@@ -467,7 +467,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
}
return onActivated( w, x, y, z, player, side, hitX, hitY, hitZ );
return this.onActivated( w, x, y, z, player, side, hitX, hitY, hitZ );
}
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
@@ -480,7 +480,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{
if ( is.hasDisplayName() )
{
TileEntity te = getTileEntity( w, x, y, z );
TileEntity te = this.getTileEntity( w, x, y, z );
if ( te instanceof AEBaseTile )
( ( AEBaseTile ) w.getTileEntity( x, y, z ) ).setName( is.getDisplayName() );
}
@@ -497,13 +497,13 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
public boolean hasComparatorInputOverride()
{
return isInventory;
return this.isInventory;
}
@Override
public int getComparatorInputOverride( World w, int x, int y, int z, int s )
{
TileEntity te = getTileEntity( w, x, y, z );
TileEntity te = this.getTileEntity( w, x, y, z );
if ( te instanceof IInventory )
return Container.calcRedstoneFromInventory( ( IInventory ) te );
return 0;
@@ -513,7 +513,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@SideOnly( Side.CLIENT )
public void registerBlockIcons( IIconRegister iconRegistry )
{
BlockRenderInfo info = getRendererInstance();
BlockRenderInfo info = this.getRendererInstance();
FlippableIcon topIcon;
FlippableIcon bottomIcon;
FlippableIcon sideIcon;
@@ -522,13 +522,13 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
FlippableIcon southIcon;
FlippableIcon northIcon;
this.blockIcon = topIcon = optionalIcon( iconRegistry, this.getTextureName(), null );
bottomIcon = optionalIcon( iconRegistry, this.getTextureName() + "Bottom", topIcon );
sideIcon = optionalIcon( iconRegistry, this.getTextureName() + "Side", topIcon );
eastIcon = optionalIcon( iconRegistry, this.getTextureName() + "East", sideIcon );
westIcon = optionalIcon( iconRegistry, this.getTextureName() + "West", sideIcon );
southIcon = optionalIcon( iconRegistry, this.getTextureName() + "Front", sideIcon );
northIcon = optionalIcon( iconRegistry, this.getTextureName() + "Back", sideIcon );
this.blockIcon = topIcon = this.optionalIcon( iconRegistry, this.getTextureName(), null );
bottomIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Bottom", topIcon );
sideIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Side", topIcon );
eastIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "East", sideIcon );
westIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "West", sideIcon );
southIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Front", sideIcon );
northIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Back", sideIcon );
info.updateIcons( bottomIcon, topIcon, northIcon, southIcon, eastIcon, westIcon );
}
@@ -536,7 +536,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
final public boolean isNormalCube( IBlockAccess world, int x, int y, int z )
{
return isFullSize;
return this.isFullSize;
}
@Override
@@ -544,9 +544,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{
IOrientable rotatable = null;
if ( hasBlockTileEntity() )
if ( this.hasBlockTileEntity() )
{
rotatable = ( AEBaseTile ) getTileEntity( w, x, y, z );
rotatable = ( AEBaseTile ) this.getTileEntity( w, x, y, z );
}
else if ( this instanceof IOrientableBlock )
{
@@ -555,9 +555,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
if ( rotatable != null && rotatable.canBeRotated() )
{
if ( hasCustomRotation() )
if ( this.hasCustomRotation() )
{
customRotateBlock( rotatable, axis );
this.customRotateBlock( rotatable, axis );
return true;
}
else
@@ -600,9 +600,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
final public ForgeDirection[] getValidRotations( World w, int x, int y, int z )
{
if ( hasBlockTileEntity() )
if ( this.hasBlockTileEntity() )
{
AEBaseTile obj = getTileEntity( w, x, y, z );
AEBaseTile obj = this.getTileEntity( w, x, y, z );
if ( obj != null && obj.canBeRotated() )
{
return ForgeDirection.VALID_DIRECTIONS;
@@ -615,7 +615,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
public boolean recolourBlock( World world, int x, int y, int z, ForgeDirection side, int colour )
{
TileEntity te = getTileEntity( world, x, y, z );
TileEntity te = this.getTileEntity( world, x, y, z );
if ( te instanceof IColorableTile )
{
@@ -637,12 +637,12 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@SideOnly( Side.CLIENT )
public BlockRenderInfo getRendererInstance()
{
if ( renderInfo != null )
return renderInfo;
if ( this.renderInfo != null )
return this.renderInfo;
try
{
return renderInfo = new BlockRenderInfo( getRenderer().newInstance() );
return this.renderInfo = new BlockRenderInfo( this.getRenderer().newInstance() );
}
catch ( Throwable t )
{
@@ -694,9 +694,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{
IOrientable ori = null;
if ( hasBlockTileEntity() )
if ( this.hasBlockTileEntity() )
{
ori = ( AEBaseTile ) getTileEntity( w, x, y, z );
ori = ( AEBaseTile ) this.getTileEntity( w, x, y, z );
}
else if ( this instanceof IOrientableBlock )
{
@@ -705,7 +705,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
if ( ori != null && ori.canBeRotated() )
{
return mapRotation( ori, ForgeDirection.getOrientation( s ) ).ordinal();
return this.mapRotation( ori, ForgeDirection.getOrientation( s ) ).ordinal();
}
return s;
@@ -713,16 +713,16 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public boolean hasBlockTileEntity()
{
return tileEntityType != null;
return this.tileEntityType != null;
}
public <T extends TileEntity> T getTileEntity( IBlockAccess w, int x, int y, int z )
{
if ( !hasBlockTileEntity() )
if ( !this.hasBlockTileEntity() )
return null;
TileEntity te = w.getTileEntity( x, y, z );
if ( tileEntityType.isInstance( te ) )
if ( this.tileEntityType.isInstance( te ) )
return ( T ) te;
return null;
@@ -772,7 +772,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public Class<? extends TileEntity> getTileEntityClass()
{
return tileEntityType;
return this.tileEntityType;
}
@SideOnly( Side.CLIENT )
@@ -784,11 +784,11 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
final public TileEntity createNewTileEntity( World var1, int var2 )
{
if ( hasBlockTileEntity() )
if ( this.hasBlockTileEntity() )
{
try
{
return tileEntityType.newInstance();
return this.tileEntityType.newInstance();
}
catch ( Throwable e )
{
@@ -801,7 +801,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
public void breakBlock( World w, int x, int y, int z, Block a, int b )
{
AEBaseTile te = getTileEntity( w, x, y, z );
AEBaseTile te = this.getTileEntity( w, x, y, z );
if ( te != null )
{
ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
@@ -821,7 +821,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public String getUnlocalizedName( ItemStack is )
{
return getUnlocalizedName();
return this.getUnlocalizedName();
}
public void addInformation( ItemStack is, EntityPlayer player, List<String> lines, boolean advancedItemTooltips )
@@ -836,6 +836,6 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public boolean hasSubtypes()
{
return hasSubtypes;
return this.hasSubtypes;
}
}
src/main/java/appeng/block/AEBaseItemBlock.java
+14 -14
View File
@@ -48,8 +48,8 @@ public class AEBaseItemBlock extends ItemBlock
public AEBaseItemBlock(Block id)
{
super( id );
blockType = (AEBaseBlock) id;
hasSubtypes = blockType.hasSubtypes;
this.blockType = (AEBaseBlock) id;
this.hasSubtypes = this.blockType.hasSubtypes;
if ( Platform.isClient() )
MinecraftForgeClient.registerItemRenderer( this, ItemRenderer.instance );
@@ -58,7 +58,7 @@ public class AEBaseItemBlock extends ItemBlock
@Override
public int getMetadata(int dmg)
{
if ( hasSubtypes )
if ( this.hasSubtypes )
return dmg;
return 0;
}
@@ -66,7 +66,7 @@ public class AEBaseItemBlock extends ItemBlock
@Override
public String getUnlocalizedName(ItemStack is)
{
return blockType.getUnlocalizedName( is );
return this.blockType.getUnlocalizedName( is );
}
@Override
@@ -91,9 +91,9 @@ public class AEBaseItemBlock extends ItemBlock
IOrientable ori = null;
if ( blockType.hasBlockTileEntity() )
if ( this.blockType.hasBlockTileEntity() )
{
if ( blockType instanceof BlockLightDetector )
if ( this.blockType instanceof BlockLightDetector )
{
up = ForgeDirection.getOrientation( side );
if ( up == ForgeDirection.UP || up == ForgeDirection.DOWN )
@@ -101,7 +101,7 @@ public class AEBaseItemBlock extends ItemBlock
else
forward = ForgeDirection.UP;
}
else if ( blockType instanceof BlockWireless || blockType instanceof BlockSkyCompass )
else if ( this.blockType instanceof BlockWireless || this.blockType instanceof BlockSkyCompass )
{
forward = ForgeDirection.getOrientation( side );
if ( forward == ForgeDirection.UP || forward == ForgeDirection.DOWN )
@@ -145,9 +145,9 @@ public class AEBaseItemBlock extends ItemBlock
}
}
if ( blockType instanceof IOrientableBlock )
if ( this.blockType instanceof IOrientableBlock )
{
ori = ((IOrientableBlock) blockType).getOrientable( w, x, y, z );
ori = ((IOrientableBlock) this.blockType).getOrientable( w, x, y, z );
up = ForgeDirection.getOrientation( side );
forward = ForgeDirection.SOUTH;
if ( up.offsetY == 0 )
@@ -156,20 +156,20 @@ public class AEBaseItemBlock extends ItemBlock
ori.setOrientation( forward, up );
}
if ( !blockType.isValidOrientation( w, x, y, z, forward, up ) )
if ( !this.blockType.isValidOrientation( w, x, y, z, forward, up ) )
return false;
if ( super.placeBlockAt( stack, player, w, x, y, z, side, hitX, hitY, hitZ, metadata ) )
{
if ( blockType.hasBlockTileEntity() && !(blockType instanceof BlockLightDetector) )
if ( this.blockType.hasBlockTileEntity() && !(this.blockType instanceof BlockLightDetector) )
{
AEBaseTile tile = blockType.getTileEntity( w, x, y, z );
AEBaseTile tile = this.blockType.getTileEntity( w, x, y, z );
ori = tile;
if ( tile == null )
return true;
if ( ori.canBeRotated() && !blockType.hasCustomRotation() )
if ( ori.canBeRotated() && !this.blockType.hasCustomRotation() )
{
if ( ori.getForward() == null || ori.getUp() == null || // null
tile.getForward() == ForgeDirection.UNKNOWN || ori.getUp() == ForgeDirection.UNKNOWN )
@@ -183,7 +183,7 @@ public class AEBaseItemBlock extends ItemBlock
tile.onPlacement( stack, player, side );
}
else if ( blockType instanceof IOrientableBlock )
else if ( this.blockType instanceof IOrientableBlock )
{
ori.setOrientation( forward, up );
}
src/main/java/appeng/block/AEBaseItemBlockChargeable.java
+9 -9
View File
@@ -88,47 +88,47 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
@Override
public double injectAEPower(ItemStack is, double amt)
{
double internalCurrentPower = getInternal( is );
double internalMaxPower = getMaxEnergyCapacity();
double internalCurrentPower = this.getInternal( is );
double internalMaxPower = this.getMaxEnergyCapacity();
internalCurrentPower += amt;
if ( internalCurrentPower > internalMaxPower )
{
amt = internalCurrentPower - internalMaxPower;
internalCurrentPower = internalMaxPower;
setInternal( is, internalCurrentPower );
this.setInternal( is, internalCurrentPower );
return amt;
}
setInternal( is, internalCurrentPower );
this.setInternal( is, internalCurrentPower );
return 0;
}
@Override
public double extractAEPower(ItemStack is, double amt)
{
double internalCurrentPower = getInternal( is );
double internalCurrentPower = this.getInternal( is );
if ( internalCurrentPower > amt )
{
internalCurrentPower -= amt;
setInternal( is, internalCurrentPower );
this.setInternal( is, internalCurrentPower );
return amt;
}
amt = internalCurrentPower;
setInternal( is, 0 );
this.setInternal( is, 0 );
return amt;
}
@Override
public double getAEMaxPower(ItemStack is)
{
return getMaxEnergyCapacity();
return this.getMaxEnergyCapacity();
}
@Override
public double getAECurrentPower(ItemStack is)
{
return getInternal( is );
return this.getInternal( is );
}
@Override
src/main/java/appeng/block/crafting/BlockCraftingStorage.java
+2 -2
View File
@@ -35,7 +35,7 @@ public class BlockCraftingStorage extends BlockCraftingUnit
{
super( BlockCraftingStorage.class );
setTileEntity( TileCraftingStorageTile.class );
this.setTileEntity( TileCraftingStorageTile.class );
}
@Override
@@ -56,7 +56,7 @@ public class BlockCraftingStorage extends BlockCraftingUnit
if ( is.getItemDamage() == 3 )
return "tile.appliedenergistics2.BlockCraftingStorage64k";
return getItemUnlocalizedName( is );
return this.getItemUnlocalizedName( is );
}
@Override
src/main/java/appeng/block/crafting/BlockCraftingUnit.java
+11 -11
View File
@@ -49,21 +49,21 @@ public class BlockCraftingUnit extends AEBaseBlock
{
super( childClass, Material.iron );
hasSubtypes = true;
setFeature( EnumSet.of( AEFeature.CraftingCPU ) );
this.hasSubtypes = true;
this.setFeature( EnumSet.of( AEFeature.CraftingCPU ) );
}
public BlockCraftingUnit()
{
this( BlockCraftingUnit.class );
setTileEntity( TileCraftingTile.class );
this.setTileEntity( TileCraftingTile.class );
}
@Override
public boolean onActivated(World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ)
{
TileCraftingTile tg = getTileEntity( w, x, y, z );
TileCraftingTile tg = this.getTileEntity( w, x, y, z );
if ( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() )
{
if ( Platform.isClient() )
@@ -80,7 +80,7 @@ public class BlockCraftingUnit extends AEBaseBlock
public int getDamageValue(World w, int x, int y, int z)
{
int meta = w.getBlockMetadata( x, y, z );
return damageDropped( meta );
return this.damageDropped( meta );
}
@Override
@@ -95,7 +95,7 @@ public class BlockCraftingUnit extends AEBaseBlock
if ( is.getItemDamage() == 1 )
return "tile.appliedenergistics2.BlockCraftingAccelerator";
return getItemUnlocalizedName( is );
return this.getItemUnlocalizedName( is );
}
protected String getItemUnlocalizedName(ItemStack is)
@@ -106,9 +106,9 @@ public class BlockCraftingUnit extends AEBaseBlock
@Override
public void setRenderStateByMeta(int itemDamage)
{
IIcon front = getIcon( ForgeDirection.SOUTH.ordinal(), itemDamage );
IIcon other = getIcon( ForgeDirection.NORTH.ordinal(), itemDamage );
getRendererInstance().setTemporaryRenderIcons( other, other, front, other, other, other );
IIcon front = this.getIcon( ForgeDirection.SOUTH.ordinal(), itemDamage );
IIcon other = this.getIcon( ForgeDirection.NORTH.ordinal(), itemDamage );
this.getRendererInstance().setTemporaryRenderIcons( other, other, front, other, other, other );
}
@Override
@@ -137,7 +137,7 @@ public class BlockCraftingUnit extends AEBaseBlock
@Override
public void breakBlock(World w, int x, int y, int z, Block a, int b)
{
TileCraftingTile cp = getTileEntity( w, x, y, z );
TileCraftingTile cp = this.getTileEntity( w, x, y, z );
if ( cp != null )
cp.breakCluster();
@@ -147,7 +147,7 @@ public class BlockCraftingUnit extends AEBaseBlock
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block junk)
{
TileCraftingTile cp = getTileEntity( w, x, y, z );
TileCraftingTile cp = this.getTileEntity( w, x, y, z );
if ( cp != null )
cp.updateMultiBlock();
}
src/main/java/appeng/block/crafting/BlockMolecularAssembler.java
+5 -5
View File
@@ -39,10 +39,10 @@ public class BlockMolecularAssembler extends AEBaseBlock
public BlockMolecularAssembler() {
super( BlockMolecularAssembler.class, Material.iron );
setFeature( EnumSet.of( AEFeature.MolecularAssembler ) );
setTileEntity( TileMolecularAssembler.class );
isOpaque = false;
lightOpacity = 1;
this.setFeature( EnumSet.of( AEFeature.MolecularAssembler ) );
this.setTileEntity( TileMolecularAssembler.class );
this.isOpaque = false;
this.lightOpacity = 1;
}
public static boolean booleanAlphaPass = false;
@@ -70,7 +70,7 @@ public class BlockMolecularAssembler extends AEBaseBlock
@Override
public boolean onActivated(World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ)
{
TileMolecularAssembler tg = getTileEntity( w, x, y, z );
TileMolecularAssembler tg = this.getTileEntity( w, x, y, z );
if ( tg != null && !p.isSneaking() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_MAC );
src/main/java/appeng/block/grindstone/BlockCrank.java
+16 -16
View File
@@ -43,10 +43,10 @@ public class BlockCrank extends AEBaseBlock
public BlockCrank() {
super( BlockCrank.class, Material.wood );
setFeature( EnumSet.of( AEFeature.GrindStone ) );
setTileEntity( TileCrank.class );
setLightOpacity( 0 );
isFullSize = isOpaque = false;
this.setFeature( EnumSet.of( AEFeature.GrindStone ) );
this.setTileEntity( TileCrank.class );
this.setLightOpacity( 0 );
this.isFullSize = this.isOpaque = false;
}
@Override
@@ -54,11 +54,11 @@ public class BlockCrank extends AEBaseBlock
{
if ( player instanceof FakePlayer || player == null )
{
dropCrank(w, x, y, z);
this.dropCrank(w, x, y, z);
return true;
}
AEBaseTile tile = getTileEntity( w, x, y, z );
AEBaseTile tile = this.getTileEntity( w, x, y, z );
if ( tile instanceof TileCrank )
{
if ( ((TileCrank) tile).power() )
@@ -86,7 +86,7 @@ public class BlockCrank extends AEBaseBlock
private ForgeDirection findCrankable( World world, int x, int y, int z )
{
for ( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
if ( isCrankable( world, x, y, z, dir ) )
if ( this.isCrankable( world, x, y, z, dir ) )
{
return dir;
}
@@ -96,14 +96,14 @@ public class BlockCrank extends AEBaseBlock
@Override
public boolean canPlaceBlockAt( World world, int x, int y, int z )
{
return findCrankable( world , x, y, z ) != ForgeDirection.UNKNOWN;
return this.findCrankable( world , x, y, z ) != ForgeDirection.UNKNOWN;
}
@Override
public boolean isValidOrientation( World world, int x, int y, int z, ForgeDirection forward, ForgeDirection up )
{
TileEntity te = world.getTileEntity( x, y, z );
return !(te instanceof TileCrank) || isCrankable( world, x, y, z, up.getOpposite() );
return !(te instanceof TileCrank) || this.isCrankable( world, x, y, z, up.getOpposite() );
}
private void dropCrank( World world, int x, int y, int z )
@@ -115,10 +115,10 @@ public class BlockCrank extends AEBaseBlock
@Override
public void onBlockPlacedBy( World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemStack )
{
AEBaseTile tile = getTileEntity( world, x, y, z );
AEBaseTile tile = this.getTileEntity( world, x, y, z );
if ( tile != null )
{
ForgeDirection mnt = findCrankable( world, x, y, z );
ForgeDirection mnt = this.findCrankable( world, x, y, z );
ForgeDirection forward = ForgeDirection.UP;
if ( mnt == ForgeDirection.UP || mnt == ForgeDirection.DOWN )
{
@@ -128,24 +128,24 @@ public class BlockCrank extends AEBaseBlock
}
else
{
dropCrank( world, x, y, z );
this.dropCrank( world, x, y, z );
}
}
@Override
public void onNeighborBlockChange (World world, int x, int y, int z, Block block )
{
AEBaseTile tile = getTileEntity( world, x, y, z );
AEBaseTile tile = this.getTileEntity( world, x, y, z );
if ( tile != null )
{
if ( !isCrankable( world, x, y, z, tile.getUp().getOpposite() ) )
if ( !this.isCrankable( world, x, y, z, tile.getUp().getOpposite() ) )
{
dropCrank( world, x, y, z );
this.dropCrank( world, x, y, z );
}
}
else
{
dropCrank( world, x, y, z );
this.dropCrank( world, x, y, z );
}
}
src/main/java/appeng/block/grindstone/BlockGrinder.java
+4 -4
View File
@@ -35,15 +35,15 @@ public class BlockGrinder extends AEBaseBlock
public BlockGrinder() {
super( BlockGrinder.class, Material.rock );
setFeature( EnumSet.of( AEFeature.GrindStone ) );
setTileEntity( TileGrinder.class );
setHardness( 3.2F );
this.setFeature( EnumSet.of( AEFeature.GrindStone ) );
this.setTileEntity( TileGrinder.class );
this.setHardness( 3.2F );
}
@Override
public boolean onActivated(World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ)
{
TileGrinder tg = getTileEntity( w, x, y, z );
TileGrinder tg = this.getTileEntity( w, x, y, z );
if ( tg != null && !p.isSneaking() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_GRINDER );
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;
src/main/java/appeng/block/networking/BlockCableBus.java
+32 -32
View File
@@ -95,9 +95,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
public BlockCableBus() {
super( BlockCableBus.class, AEGlassMaterial.instance );
setFeature( EnumSet.of( AEFeature.Core ) );
setLightOpacity( 0 );
isFullSize = isOpaque = false;
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setLightOpacity( 0 );
this.isFullSize = this.isOpaque = false;
}
@Override
@@ -112,7 +112,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@SideOnly(Side.CLIENT)
public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer)
{
Object object = cb( world, target.blockX, target.blockY, target.blockZ );
Object object = this.cb( world, target.blockX, target.blockY, target.blockZ );
if ( object instanceof IPartHost )
{
IPartHost host = (IPartHost) object;
@@ -120,7 +120,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
for (ForgeDirection side : ForgeDirection.values())
{
IPart p = host.getPart( side );
IIcon ico = getIcon( p );
IIcon ico = this.getIcon( p );
if ( ico == null )
continue;
@@ -159,7 +159,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@SideOnly(Side.CLIENT)
public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer)
{
Object object = cb( world, x, y, z );
Object object = this.cb( world, x, y, z );
if ( object instanceof IPartHost )
{
IPartHost host = (IPartHost) object;
@@ -167,7 +167,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
for (ForgeDirection side : ForgeDirection.values())
{
IPart p = host.getPart( side );
IIcon ico = getIcon( p );
IIcon ico = this.getIcon( p );
if ( ico == null )
continue;
@@ -235,20 +235,20 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@Override
public boolean isLadder(IBlockAccess world, int x, int y, int z, EntityLivingBase entity)
{
return cb( world, x, y, z ).isLadder( entity );
return this.cb( world, x, y, z ).isLadder( entity );
}
@Override
public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour)
{
return recolourBlock( world, x, y, z, side, colour, null );
return this.recolourBlock( world, x, y, z, side, colour, null );
}
public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour, EntityPlayer who)
{
try
{
return cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who );
return this.cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who );
}
catch (Throwable ignored)
{
@@ -259,7 +259,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@Override
public void randomDisplayTick(World world, int x, int y, int z, Random r)
{
cb( world, x, y, z ).randomDisplayTick( world, x, y, z, r );
this.cb( world, x, y, z ).randomDisplayTick( world, x, y, z, r );
}
@Override
@@ -272,14 +272,14 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
}
if ( block == null )
return 0;
return cb( world, x, y, z ).getLightValue();
return this.cb( world, x, y, z ).getLightValue();
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
{
Vec3 v3 = target.hitVec.addVector( -x, -y, -z );
SelectedPart sp = cb( world, x, y, z ).selectPart( v3 );
SelectedPart sp = this.cb( world, x, y, z ).selectPart( v3 );
if ( sp.part != null )
return sp.part.getItemStack( PartItemStack.Pick );
@@ -292,7 +292,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@Override
public boolean isReplaceable(IBlockAccess world, int x, int y, int z)
{
return cb( world, x, y, z ).isEmpty();
return this.cb( world, x, y, z ).isEmpty();
}
@SuppressWarnings("deprecation")
@@ -301,7 +301,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
{
if ( player.capabilities.isCreativeMode )
{
AEBaseTile tile = getTileEntity( world, x, y, z );
AEBaseTile tile = this.getTileEntity( world, x, y, z );
if ( tile != null )
tile.disableDrops();
// maybe ray trace?
@@ -312,7 +312,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@Override
public IIcon getIcon(IBlockAccess w, int x, int y, int z, int s)
{
return getIcon( s, 0 );
return this.getIcon( s, 0 );
}
@Override
@@ -346,20 +346,20 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@Override
public boolean isSideSolid(IBlockAccess w, int x, int y, int z, ForgeDirection side)
{
return cb( w, x, y, z ).isSolidOnSide( side );
return this.cb( w, x, y, z ).isSolidOnSide( side );
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block meh)
{
cb( w, x, y, z ).onNeighborChanged();
this.cb( w, x, y, z ).onNeighborChanged();
}
@Override
public void onNeighborChange(IBlockAccess w, int x, int y, int z, int tileX, int tileY, int tileZ)
{
if ( Platform.isServer() )
cb( w, x, y, z ).onNeighborChanged();
this.cb( w, x, y, z ).onNeighborChanged();
}
@Override
@@ -371,13 +371,13 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@Override
public boolean onActivated(World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{
return cb( w, x, y, z ).activate( player, Vec3.createVectorHelper( hitX, hitY, hitZ ) );
return this.cb( w, x, y, z ).activate( player, Vec3.createVectorHelper( hitX, hitY, hitZ ) );
}
@Override
public void onEntityCollidedWithBlock(World w, int x, int y, int z, Entity e)
{
cb( w, x, y, z ).onEntityCollision( e );
this.cb( w, x, y, z ).onEntityCollision( e );
}
@Override
@@ -387,15 +387,15 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
{
case -1:
case 4:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.UP, ForgeDirection.DOWN ) );
return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.UP, ForgeDirection.DOWN ) );
case 0:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.NORTH ) );
return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.NORTH ) );
case 1:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.EAST ) );
return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.EAST ) );
case 2:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.SOUTH ) );
return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.SOUTH ) );
case 3:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.WEST ) );
return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.WEST ) );
}
return false;
}
@@ -403,13 +403,13 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@Override
public int isProvidingWeakPower(IBlockAccess w, int x, int y, int z, int side)
{
return cb( w, x, y, z ).isProvidingWeakPower( ForgeDirection.getOrientation( side ).getOpposite() );
return this.cb( w, x, y, z ).isProvidingWeakPower( ForgeDirection.getOrientation( side ).getOpposite() );
}
@Override
public int isProvidingStrongPower(IBlockAccess w, int x, int y, int z, int side)
{
return cb( w, x, y, z ).isProvidingStrongPower( ForgeDirection.getOrientation( side ).getOpposite() );
return this.cb( w, x, y, z ).isProvidingStrongPower( ForgeDirection.getOrientation( side ).getOpposite() );
}
@Override
@@ -421,7 +421,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
public void setupTile()
{
setTileEntity( noTesrTile = Api.instance.partHelper.getCombinedInstance( TileCableBus.class.getName() ) );
this.setTileEntity( noTesrTile = Api.instance.partHelper.getCombinedInstance( TileCableBus.class.getName() ) );
if ( Platform.isClient() )
{
tesrTile = Api.instance.partHelper.getCombinedInstance( TileCableBusTESR.class.getName() );
@@ -453,20 +453,20 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@Method(iname = "MFR")
public RedNetConnectionType getConnectionType(World world, int x, int y, int z, ForgeDirection side)
{
return cb( world, x, y, z ).canConnectRedstone( EnumSet.allOf( ForgeDirection.class ) ) ? RedNetConnectionType.CableSingle : RedNetConnectionType.None;
return this.cb( world, x, y, z ).canConnectRedstone( EnumSet.allOf( ForgeDirection.class ) ) ? RedNetConnectionType.CableSingle : RedNetConnectionType.None;
}
int myColorMultiplier = 0xffffff;
public void setRenderColor(int color)
{
myColorMultiplier = color;
this.myColorMultiplier = color;
}
@Override
public int colorMultiplier(IBlockAccess p_149720_1_, int p_149720_2_, int p_149720_3_, int p_149720_4_)
{
return myColorMultiplier;
return this.myColorMultiplier;
}
}
src/main/java/appeng/block/networking/BlockController.java
+4 -4
View File
@@ -34,15 +34,15 @@ public class BlockController extends AEBaseBlock
public BlockController() {
super( BlockController.class, Material.iron );
setFeature( EnumSet.of( AEFeature.Channels ) );
setTileEntity( TileController.class );
setHardness( 6 );
this.setFeature( EnumSet.of( AEFeature.Channels ) );
this.setTileEntity( TileController.class );
this.setHardness( 6 );
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block id_junk)
{
TileController tc = getTileEntity( w, x, y, z );
TileController tc = this.getTileEntity( w, x, y, z );
if ( tc != null )
tc.onNeighborChange( false );
}
src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java
+2 -2
View File
@@ -30,8 +30,8 @@ public class BlockCreativeEnergyCell extends AEBaseBlock
public BlockCreativeEnergyCell() {
super( BlockCreativeEnergyCell.class, AEGlassMaterial.instance );
setFeature( EnumSet.of( AEFeature.Creative ) );
setTileEntity( TileCreativeEnergyCell.class );
this.setFeature( EnumSet.of( AEFeature.Creative ) );
this.setTileEntity( TileCreativeEnergyCell.class );
}
}
src/main/java/appeng/block/networking/BlockDenseEnergyCell.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
public BlockDenseEnergyCell() {
super( BlockDenseEnergyCell.class );
setFeature( EnumSet.of( AEFeature.DenseEnergyCells ) );
setTileEntity( TileDenseEnergyCell.class );
this.setFeature( EnumSet.of( AEFeature.DenseEnergyCells ) );
this.setTileEntity( TileDenseEnergyCell.class );
}
@Override
src/main/java/appeng/block/networking/BlockEnergyAcceptor.java
+2 -2
View File
@@ -30,8 +30,8 @@ public class BlockEnergyAcceptor extends AEBaseBlock
public BlockEnergyAcceptor() {
super( BlockEnergyAcceptor.class, Material.iron );
setFeature( EnumSet.of( AEFeature.Core ) );
setTileEntity( TileEnergyAcceptor.class );
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setTileEntity( TileEnergyAcceptor.class );
}
}
src/main/java/appeng/block/networking/BlockEnergyCell.java
+4 -4
View File
@@ -53,8 +53,8 @@ public class BlockEnergyCell extends AEBaseBlock
public BlockEnergyCell() {
this( BlockEnergyCell.class );
setFeature( EnumSet.of( AEFeature.Core ) );
setTileEntity( TileEnergyCell.class );
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setTileEntity( TileEnergyCell.class );
}
@Override
@@ -65,8 +65,8 @@ public class BlockEnergyCell extends AEBaseBlock
ItemStack charged = new ItemStack( this, 1 );
NBTTagCompound tag = Platform.openNbtData( charged );
tag.setDouble( "internalCurrentPower", getMaxPower() );
tag.setDouble( "internalMaxPower", getMaxPower() );
tag.setDouble( "internalCurrentPower", this.getMaxPower() );
tag.setDouble( "internalMaxPower", this.getMaxPower() );
itemStacks.add( charged );
}
src/main/java/appeng/block/networking/BlockWireless.java
+8 -8
View File
@@ -44,11 +44,11 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision
public BlockWireless() {
super( BlockWireless.class, AEGlassMaterial.instance );
setFeature( EnumSet.of( AEFeature.Core, AEFeature.WirelessAccessTerminal ) );
setTileEntity( TileWireless.class );
setLightOpacity( 0 );
isFullSize = false;
isOpaque = false;
this.setFeature( EnumSet.of( AEFeature.Core, AEFeature.WirelessAccessTerminal ) );
this.setTileEntity( TileWireless.class );
this.setLightOpacity( 0 );
this.isFullSize = false;
this.isOpaque = false;
}
@Override
@@ -60,7 +60,7 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual)
{
TileWireless tile = getTileEntity( w, x, y, z );
TileWireless tile = this.getTileEntity( w, x, y, z );
if ( tile != null )
{
ForgeDirection forward = tile.getForward();
@@ -122,7 +122,7 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision
@Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{
TileWireless tile = getTileEntity( w, x, y, z );
TileWireless tile = this.getTileEntity( w, x, y, z );
if ( tile != null )
{
ForgeDirection forward = tile.getForward();
@@ -188,7 +188,7 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision
if ( p.isSneaking() )
return false;
TileWireless tg = getTileEntity( w, x, y, z );
TileWireless tg = this.getTileEntity( w, x, y, z );
if ( tg != null )
{
if ( Platform.isServer() )
src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java
+9 -9
View File
@@ -51,19 +51,19 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
public BlockQuantumLinkChamber() {
super( BlockQuantumLinkChamber.class, AEGlassMaterial.instance );
setFeature( EnumSet.of( AEFeature.QuantumNetworkBridge ) );
setTileEntity( TileQuantumBridge.class );
this.setFeature( EnumSet.of( AEFeature.QuantumNetworkBridge ) );
this.setTileEntity( TileQuantumBridge.class );
float shave = 2.0f / 16.0f;
setBlockBounds( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave );
setLightOpacity( 0 );
isFullSize = isOpaque = false;
this.setBlockBounds( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave );
this.setLightOpacity( 0 );
this.isFullSize = this.isOpaque = false;
}
@Override
@SideOnly(Side.CLIENT)
public void randomDisplayTick(World w, int bx, int by, int bz, Random r)
{
TileQuantumBridge bridge = getTileEntity( w, bx, by, bz );
TileQuantumBridge bridge = this.getTileEntity( w, bx, by, bz );
if ( bridge != null )
{
if ( bridge.hasQES() )
@@ -77,7 +77,7 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block pointlessNumber)
{
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if ( bridge != null )
bridge.neighborUpdate();
}
@@ -85,7 +85,7 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
@Override
public void breakBlock(World w, int x, int y, int z, Block a, int b)
{
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if ( bridge != null )
bridge.breakCluster();
@@ -104,7 +104,7 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
if ( p.isSneaking() )
return false;
TileQuantumBridge tg = getTileEntity( w, x, y, z );
TileQuantumBridge tg = this.getTileEntity( w, x, y, z );
if ( tg != null )
{
if ( Platform.isServer() )
src/main/java/appeng/block/qnb/BlockQuantumRing.java
+9 -9
View File
@@ -41,18 +41,18 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision
public BlockQuantumRing() {
super( BlockQuantumRing.class, Material.iron );
setFeature( EnumSet.of( AEFeature.QuantumNetworkBridge ) );
setTileEntity( TileQuantumBridge.class );
this.setFeature( EnumSet.of( AEFeature.QuantumNetworkBridge ) );
this.setTileEntity( TileQuantumBridge.class );
float shave = 2.0f / 16.0f;
setBlockBounds( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave );
setLightOpacity( 1 );
isFullSize = isOpaque = false;
this.setBlockBounds( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave );
this.setLightOpacity( 1 );
this.isFullSize = this.isOpaque = false;
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block pointlessNumber)
{
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if ( bridge != null )
bridge.neighborUpdate();
}
@@ -60,7 +60,7 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision
@Override
public void breakBlock(World w, int x, int y, int z, Block a, int b)
{
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if ( bridge != null )
bridge.breakCluster();
@@ -77,7 +77,7 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual)
{
double OnePx = 2.0 / 16.0;
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if ( bridge != null && bridge.isCorner() )
{
OnePx = 4.0 / 16.0;
@@ -93,7 +93,7 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{
double OnePx = 2.0 / 16.0;
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if ( bridge != null && bridge.isCorner() )
{
OnePx = 4.0 / 16.0;
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
src/main/java/appeng/block/spatial/BlockMatrixFrame.java
+5 -5
View File
@@ -45,11 +45,11 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
public BlockMatrixFrame()
{
super( BlockMatrixFrame.class, Material.anvil );
setFeature( EnumSet.of( AEFeature.SpatialIO ) );
setResistance( 6000000.0F );
setBlockUnbreakable();
setLightOpacity( 0 );
isOpaque = false;
this.setFeature( EnumSet.of( AEFeature.SpatialIO ) );
this.setResistance( 6000000.0F );
this.setBlockUnbreakable();
this.setLightOpacity( 0 );
this.isOpaque = false;
}
@Override
src/main/java/appeng/block/spatial/BlockSpatialIOPort.java
+4 -4
View File
@@ -36,14 +36,14 @@ public class BlockSpatialIOPort extends AEBaseBlock
public BlockSpatialIOPort() {
super( BlockSpatialIOPort.class, Material.iron );
setFeature( EnumSet.of( AEFeature.SpatialIO ) );
setTileEntity( TileSpatialIOPort.class );
this.setFeature( EnumSet.of( AEFeature.SpatialIO ) );
this.setTileEntity( TileSpatialIOPort.class );
}
@Override
public final void onNeighborBlockChange(World w, int x, int y, int z, Block junk)
{
TileSpatialIOPort te = getTileEntity( w, x, y, z );
TileSpatialIOPort te = this.getTileEntity( w, x, y, z );
if ( te != null )
te.updateRedstoneState();
}
@@ -54,7 +54,7 @@ public class BlockSpatialIOPort extends AEBaseBlock
if ( p.isSneaking() )
return false;
TileSpatialIOPort tg = getTileEntity( w, x, y, z );
TileSpatialIOPort tg = this.getTileEntity( w, x, y, z );
if ( tg != null )
{
if ( Platform.isServer() )
src/main/java/appeng/block/spatial/BlockSpatialPylon.java
+4 -4
View File
@@ -35,14 +35,14 @@ public class BlockSpatialPylon extends AEBaseBlock
public BlockSpatialPylon() {
super( BlockSpatialPylon.class, AEGlassMaterial.instance );
setFeature( EnumSet.of( AEFeature.SpatialIO ) );
setTileEntity( TileSpatialPylon.class );
this.setFeature( EnumSet.of( AEFeature.SpatialIO ) );
this.setTileEntity( TileSpatialPylon.class );
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block junk)
{
TileSpatialPylon tsp = getTileEntity( w, x, y, z );
TileSpatialPylon tsp = this.getTileEntity( w, x, y, z );
if ( tsp != null )
tsp.onNeighborBlockChange();
}
@@ -50,7 +50,7 @@ public class BlockSpatialPylon extends AEBaseBlock
@Override
public int getLightValue(IBlockAccess w, int x, int y, int z)
{
TileSpatialPylon tsp = getTileEntity( w, x, y, z );
TileSpatialPylon tsp = this.getTileEntity( w, x, y, z );
if ( tsp != null )
return tsp.getLightValue();
return super.getLightValue( w, x, y, z );
src/main/java/appeng/block/storage/BlockChest.java
+3 -3
View File
@@ -41,8 +41,8 @@ public class BlockChest extends AEBaseBlock
public BlockChest() {
super( BlockChest.class, Material.iron );
setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEChest ) );
setTileEntity( TileChest.class );
this.setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEChest ) );
this.setTileEntity( TileChest.class );
}
@Override
@@ -54,7 +54,7 @@ public class BlockChest extends AEBaseBlock
@Override
public boolean onActivated(World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ)
{
TileChest tg = getTileEntity( w, x, y, z );
TileChest tg = this.getTileEntity( w, x, y, z );
if ( tg != null && !p.isSneaking() )
{
if ( Platform.isClient() )
src/main/java/appeng/block/storage/BlockDrive.java
+3 -3
View File
@@ -37,8 +37,8 @@ public class BlockDrive extends AEBaseBlock
public BlockDrive() {
super( BlockDrive.class, Material.iron );
setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEDrive ) );
setTileEntity( TileDrive.class );
this.setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEDrive ) );
this.setTileEntity( TileDrive.class );
}
@Override
@@ -53,7 +53,7 @@ public class BlockDrive extends AEBaseBlock
if ( p.isSneaking() )
return false;
TileDrive tg = getTileEntity( w, x, y, z );
TileDrive tg = this.getTileEntity( w, x, y, z );
if ( tg != null )
{
if ( Platform.isServer() )
src/main/java/appeng/block/storage/BlockIOPort.java
+4 -4
View File
@@ -36,14 +36,14 @@ public class BlockIOPort extends AEBaseBlock
public BlockIOPort() {
super( BlockIOPort.class, Material.iron );
setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.IOPort ) );
setTileEntity( TileIOPort.class );
this.setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.IOPort ) );
this.setTileEntity( TileIOPort.class );
}
@Override
public final void onNeighborBlockChange(World w, int x, int y, int z, Block junk)
{
TileIOPort te = getTileEntity( w, x, y, z );
TileIOPort te = this.getTileEntity( w, x, y, z );
if ( te != null )
te.updateRedstoneState();
}
@@ -54,7 +54,7 @@ public class BlockIOPort extends AEBaseBlock
if ( p.isSneaking() )
return false;
TileIOPort tg = getTileEntity( w, x, y, z );
TileIOPort tg = this.getTileEntity( w, x, y, z );
if ( tg != null )
{
if ( Platform.isServer() )
src/main/java/appeng/block/storage/BlockSkyChest.java
+11 -11
View File
@@ -54,22 +54,22 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
public BlockSkyChest() {
super( BlockSkyChest.class, Material.rock );
setFeature( EnumSet.of( AEFeature.Core, AEFeature.SkyStoneChests ) );
setTileEntity( TileSkyChest.class );
isOpaque = isFullSize = false;
lightOpacity = 0;
hasSubtypes = true;
setHardness( 50 );
blockResistance = 150.0f;
this.setFeature( EnumSet.of( AEFeature.Core, AEFeature.SkyStoneChests ) );
this.setTileEntity( TileSkyChest.class );
this.isOpaque = this.isFullSize = false;
this.lightOpacity = 0;
this.hasSubtypes = true;
this.setHardness( 50 );
this.blockResistance = 150.0f;
}
@Override
public String getUnlocalizedName(ItemStack is)
{
if ( is.getItemDamage() == 1 )
return getUnlocalizedName() + ".Block";
return this.getUnlocalizedName() + ".Block";
return getUnlocalizedName();
return this.getUnlocalizedName();
}
@Override
@@ -107,7 +107,7 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
public boolean onActivated(World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{
if ( Platform.isServer() )
Platform.openGUI( player, getTileEntity( w, x, y, z ), ForgeDirection.getOrientation( side ), GuiBridge.GUI_SKYCHEST );
Platform.openGUI( player, this.getTileEntity( w, x, y, z ), ForgeDirection.getOrientation( side ), GuiBridge.GUI_SKYCHEST );
return true;
}
@@ -121,7 +121,7 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual)
{
TileSkyChest sk = getTileEntity( w, x, y, z );
TileSkyChest sk = this.getTileEntity( w, x, y, z );
double sc = 0.06;
ForgeDirection o = ForgeDirection.UNKNOWN;