Replace text label properties with async getter/setters

Author: markatk

src/AlternateLife.RageMP.Net/Elements/Entities/TextLabel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Threading.Tasks;
 using AlternateLife.RageMP.Net.Data;
 using AlternateLife.RageMP.Net.Enums;
 using AlternateLife.RageMP.Net.Extensions;
@@ -11,91 +12,85 @@ namespace AlternateLife.RageMP.Net.Elements.Entities
 {
     internal class TextLabel : Entity, ITextLabel
     {
-        public Color Color
+
+        internal TextLabel(IntPtr nativePointer, Plugin plugin) : base(nativePointer, plugin, EntityType.TextLabel)
         {
-            get
-            {
-                CheckExistence();
+        }
 
-                return StructConverter.PointerToStruct<ColorRgba>(Rage.TextLabel.TextLabel_GetColor(NativePointer)).FromModColor();
-            }
-            set
-            {
-                CheckExistence();
+        public async Task SetColorAsync(Color value)
+        {
+            CheckExistence();
 
-                Rage.TextLabel.TextLabel_SetColor(NativePointer, value.ToModColor());
-            }
+            await _plugin.Schedule(() => Rage.TextLabel.TextLabel_SetColor(NativePointer, value.ToModColor())).ConfigureAwait(false);
         }
 
-        public string Text
+        public async Task<Color> GetColorAsync()
         {
-            get
-            {
-                CheckExistence();
+            CheckExistence();
 
-                return StringConverter.PointerToString(Rage.TextLabel.TextLabel_GetText(NativePointer));
-            }
-            set
+            return await _plugin.Schedule(() => StructConverter.PointerToStruct<ColorRgba>(Rage.TextLabel.TextLabel_GetColor(NativePointer)).FromModColor()).ConfigureAwait(false);
+        }
+
+        public async Task SetTextAsync(string value)
+        {
+            Contract.NotNull(value, nameof(value));
+
+            using (var converter = new StringConverter())
             {
-                Contract.NotNull(value, nameof(value));
+                var text = converter.StringToPointer(value);
 
-                using (var converter = new StringConverter())
-                {
-                    Rage.TextLabel.TextLabel_SetText(NativePointer, converter.StringToPointer(value));
-                }
+                await _plugin.Schedule(() => Rage.TextLabel.TextLabel_SetText(NativePointer, text)).ConfigureAwait(false);
             }
         }
 
-        public bool LOS
+        public async Task<string> GetTextAsync()
         {
-            get
-            {
-                CheckExistence();
+            CheckExistence();
 
-                return Rage.TextLabel.TextLabel_GetLOS(NativePointer);
-            }
-            set
-            {
-                CheckExistence();
+            return await _plugin.Schedule(() => StringConverter.PointerToString(Rage.TextLabel.TextLabel_GetText(NativePointer))).ConfigureAwait(false);
+        }
 
-                Rage.TextLabel.TextLabel_SetLOS(NativePointer, value);
-            }
+        public async Task SetLOSAsync(bool value)
+        {
+            CheckExistence();
+
+            await _plugin.Schedule(() => Rage.TextLabel.TextLabel_SetLOS(NativePointer, value)).ConfigureAwait(false);
         }
 
-        public float DrawDistance
+        public async Task<bool> GetLOSAsync()
         {
-            get
-            {
-                CheckExistence();
+            CheckExistence();
 
-                return Rage.TextLabel.TextLabel_GetDrawDistance(NativePointer);
-            }
-            set
-            {
-                CheckExistence();
+            return await _plugin.Schedule(() => Rage.TextLabel.TextLabel_GetLOS(NativePointer)).ConfigureAwait(false);
+        }
 
-                Rage.TextLabel.TextLabel_SetDrawDistance(NativePointer, value);
-            }
+        public async Task SetDrawDistanceAsync(float value)
+        {
+            CheckExistence();
+
+            await _plugin.Schedule(() => Rage.TextLabel.TextLabel_SetDrawDistance(NativePointer, value)).ConfigureAwait(false);
         }
 
-        public uint Font
+        public async Task<float> GetDrawDistanceAsync()
         {
-            get
-            {
-                CheckExistence();
+            CheckExistence();
 
-                return Rage.TextLabel.TextLabel_GetFont(NativePointer);
-            }
-            set
-            {
-                CheckExistence();
+            return await _plugin.Schedule(() => Rage.TextLabel.TextLabel_GetDrawDistance(NativePointer)).ConfigureAwait(false);
+        }
 
-                Rage.TextLabel.TextLabel_SetFont(NativePointer, value);
-            }
+        public async Task SetFontAsync(uint value)
+        {
+            CheckExistence();
+
+            await _plugin.Schedule(() => Rage.TextLabel.TextLabel_SetFont(NativePointer, value)).ConfigureAwait(false);
         }
 
-        internal TextLabel(IntPtr nativePointer, Plugin plugin) : base(nativePointer, plugin, EntityType.TextLabel)
+        public async Task<uint> GetFontAsync()
         {
+            CheckExistence();
+
+            return await _plugin.Schedule(() => Rage.TextLabel.TextLabel_GetFont(NativePointer)).ConfigureAwait(false);
         }
+
     }
 }

src/AlternateLife.RageMP.Net/Interfaces/ITextLabel.cs

@@ -1,41 +1,82 @@
 using System;
 using System.Drawing;
+using System.Threading.Tasks;
 using AlternateLife.RageMP.Net.Exceptions;
 
 namespace AlternateLife.RageMP.Net.Interfaces
 {
     public interface ITextLabel : IEntity
     {
         /// <summary>
-        /// Get or set the color of the text label.
+        /// Set the color of the text label.
         /// </summary>
+        /// <param name="color">New color of the text label</param>
         /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
-        Color Color { get; set; }
+        Task SetColorAsync(Color color);
 
         /// <summary>
-        /// Get or set the text of the text label.
+        /// Get the color of the text label.
         /// </summary>
+        /// <returns>Color of the text label</returns>
         /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="value"/> is null</exception>
-        string Text { get; set; }
+        Task<Color> GetColorAsync();
 
         /// <summary>
-        /// Get or set the line of sight state of the text label.
+        /// Set the text of the text label.
         /// </summary>
+        /// <param name="text">New text of the text label</param>
         /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
-        bool LOS { get; set; }
+        /// <exception cref="ArgumentNullException"><paramref name="text"/> is null</exception>
+        Task SetTextAsync(string text);
 
         /// <summary>
-        /// Get or set the draw distance of the text label.
+        /// Get the text of the text label.
         /// </summary>
+        /// <returns>Text of the text label</returns>
         /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
-        float DrawDistance { get; set; }
+        Task<string> GetTextAsync();
 
         /// <summary>
-        /// Get or set the font of the text label.
+        /// Set the line of sight state of the text label.
         /// </summary>
+        /// <param name="los">New line of sight state of the text label</param>
         /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
-        uint Font { get; set; }
+        Task SetLOSAsync(bool los);
+
+        /// <summary>
+        /// Get the line of sight state of the text label.
+        /// </summary>
+        /// <returns>Line of sight state of the text label</returns>
+        /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
+        Task<bool> GetLOSAsync();
+
+        /// <summary>
+        /// Set the draw distance of the text label.
+        /// </summary>
+        /// <param name="drawDistance">New draw distance of the text label</param>
+        /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
+        Task SetDrawDistanceAsync(float drawDistance);
+
+        /// <summary>
+        /// Get the draw distance of the text label.
+        /// </summary>
+        /// <returns>New draw distance of the text label</returns>
+        /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
+        Task<float> GetDrawDistanceAsync();
+
+        /// <summary>
+        /// Set the font of the text label.
+        /// </summary>
+        /// <param name="font">New font of the text label</param>
+        /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
+        Task SetFontAsync(uint font);
+
+        /// <summary>
+        /// Get the font of the text label.
+        /// </summary>
+        /// <returns>Font of the text label</returns>
+        /// <exception cref="EntityDeletedException">This entity was deleted before</exception>
+        Task<uint> GetFontAsync();
 
     }
 }

src/AlternateLife.RageMP.Net/Native/Rage.TextLabel.cs

@@ -18,7 +18,7 @@ internal static class TextLabel
             internal static extern IntPtr TextLabel_GetText(IntPtr textLabel);
 
             [DllImport(_dllName, CallingConvention = _callingConvention)]
-            internal static extern void TextLabel_SetText(IntPtr textLabel, IntPtr color);
+            internal static extern void TextLabel_SetText(IntPtr textLabel, IntPtr text);
 
             [DllImport(_dllName, CallingConvention = _callingConvention)]
             internal static extern bool TextLabel_GetLOS(IntPtr textLabel);