Port to 1.11

This commit is contained in:
yueh
2016-12-08 12:42:00 +01:00
parent 589730bfad
commit ed9e6dd21c
262 changed files with 4027 additions and 3954 deletions
@@ -130,9 +130,9 @@ public class TilePaint extends AEBaseTile
this.isLit = 14;
}
if( this.worldObj != null )
if( this.world != null )
{
this.worldObj.getLightFor( EnumSkyBlock.BLOCK, this.pos );
this.world.getLightFor( EnumSkyBlock.BLOCK, this.pos );
}
}
@@ -170,8 +170,8 @@ public class TilePaint extends AEBaseTile
public boolean isSideValid( final EnumFacing side )
{
final BlockPos p = this.pos.offset( side );
final IBlockState blk = this.worldObj.getBlockState( p );
return blk.getBlock().isSideSolid( this.worldObj.getBlockState( p ), this.worldObj, p, side.getOpposite() );
final IBlockState blk = this.world.getBlockState( p );
return blk.getBlock().isSideSolid( this.world.getBlockState( p ), this.world, p, side.getOpposite() );
}
private void removeSide( final EnumFacing side )
@@ -210,7 +210,7 @@ public class TilePaint extends AEBaseTile
if( this.dots == null )
{
this.worldObj.setBlockToAir( this.pos );
this.world.setBlockToAir( this.pos );
}
}
@@ -235,8 +235,8 @@ public class TilePaint extends AEBaseTile
{
final BlockPos p = this.pos.offset( side );
final IBlockState blk = this.worldObj.getBlockState( p );
if( blk.getBlock().isSideSolid( this.worldObj.getBlockState( p ), this.worldObj, p, side.getOpposite() ) )
final IBlockState blk = this.world.getBlockState( p );
if( blk.getBlock().isSideSolid( this.world.getBlockState( p ), this.world, p, side.getOpposite() ) )
{
final ItemPaintBall ipb = (ItemPaintBall) type.getItem();