refactor(shared): cleanup nativepointer access

api/AltV.Net.Async/AsyncEntityPool.cs

@@ -76,15 +76,15 @@ public TEntity Create(ICore core, IntPtr entityPointer)
 
         public void Add(TEntity entity)
         {
-            entities[entity.NativePointer] = entity;
+            entities[entity.EntityNativePointer] = entity;
             if (forceAsync && entity is not AsyncEntity)
                 throw new Exception("Tried to add sync entity to async pool. Probably you used \"new Vehicle\" syntax (should be \"new AsyncVehicle\"), or didn't adapt your custom entity class to new Async API.");
             OnAdd(entity);
         }
 
         public bool Remove(TEntity entity)
         {
-            return Remove(entity.NativePointer);
+            return Remove(entity.EntityNativePointer);
         }
 
         //TODO: what should happen on failure
@@ -101,7 +101,7 @@ public bool Remove(IntPtr entityPointer)
                         if (ptr != IntPtr.Zero)
                         {
                             internalEntity.SetCached(ptr);
-                            cache[entity.NativePointer] = new WeakReference<TEntity>(entity);
+                            cache[entity.EntityNativePointer] = new WeakReference<TEntity>(entity);
                         }
                     }
                 }

api/AltV.Net.Client/Elements/Entities/Audio.cs

@@ -15,7 +15,6 @@ public struct AudioEntity
     public class Audio : BaseObject, IAudio
     {
         public IntPtr AudioNativePointer { get; }
-        public override IntPtr NativePointer => AudioNativePointer;
 
         public static IntPtr GetBaseObjectNativePointer(ICore core, IntPtr audioNativePointer)
         {

api/AltV.Net.Client/Elements/Entities/AudioFilter.cs

@@ -19,7 +19,6 @@ public AudioFilter(ICore core, IntPtr audioFilterNativePointer, uint id) : base(
     }
 
     public IntPtr AudioFilterNativePointer { get; }
-    public override IntPtr NativePointer => AudioFilterNativePointer;
 
     public uint Hash
     {

api/AltV.Net.Client/Elements/Entities/AudioOutput.cs

@@ -24,8 +24,6 @@ public AudioOutput(ICore core, IntPtr audioOutputNativePointer, BaseObjectType t
     }
 
     public IntPtr AudioOutputNativePointer { get; }
-    public override IntPtr NativePointer => AudioOutputNativePointer;
-
 
     public float Volume
     {

api/AltV.Net.Client/Elements/Entities/AudioOutputAttached.cs

@@ -42,6 +42,4 @@ public IWorldObject Entity
             }
         }
     }
-
-    public override IntPtr NativePointer => AudioOutputAttachedNativePointer;
 }

api/AltV.Net.Client/Elements/Entities/AudioOutputFrontend.cs

@@ -19,5 +19,4 @@ public AudioOutputFrontend(ICore core, IntPtr audioOutputFrontendNativePointer,
     }
 
     public IntPtr AudioOutputFrontendNativePointer { get; }
-    public override IntPtr NativePointer => AudioOutputFrontendNativePointer;
 }

api/AltV.Net.Client/Elements/Entities/AudioOutputWorld.cs

@@ -40,6 +40,4 @@ public Position Position
             }
         }
     }
-
-    public override IntPtr NativePointer => AudioOutputWorldNativePointer;
 }

api/AltV.Net.Client/Elements/Entities/BaseObject.cs

@@ -10,7 +10,6 @@ namespace AltV.Net.Client.Elements.Entities
     public class BaseObject : SharedBaseObject, IBaseObject
     {
         public override IntPtr BaseObjectNativePointer { get; protected set; }
-        public override IntPtr NativePointer => BaseObjectNativePointer;
         public override ICore Core { get; }
         public override BaseObjectType Type { get; }
         public uint Id { get; }

api/AltV.Net.Client/Elements/Entities/Blip.cs

@@ -11,7 +11,6 @@ namespace AltV.Net.Client.Elements.Entities
     public class Blip : WorldObject, IBlip
     {
         public IntPtr BlipNativePointer { get; }
-        public override IntPtr NativePointer => BlipNativePointer;
 
         private static IntPtr GetWorldObjectPointer(ICore core, IntPtr nativePointer)
         {

api/AltV.Net.Client/Elements/Entities/Checkpoint.cs

@@ -8,7 +8,6 @@ namespace AltV.Net.Client.Elements.Entities
     public class Checkpoint : ColShape, ICheckpoint
     {
         public IntPtr CheckpointNativePointer { get; }
-        public override IntPtr NativePointer => CheckpointNativePointer;
 
         private static IntPtr GetColShapePointer(ICore core, IntPtr nativePointer)
         {

api/AltV.Net.Client/Elements/Entities/ColShape.cs

@@ -8,7 +8,6 @@ namespace AltV.Net.Client.Elements.Entities
     public class ColShape : WorldObject, IColShape
     {
         public IntPtr ColShapeNativePointer { get; }
-        public override IntPtr NativePointer => ColShapeNativePointer;
 
         private static IntPtr GetWorldObjectPointer(ICore core, IntPtr nativePointer)
         {

api/AltV.Net.Client/Elements/Entities/Entity.cs

@@ -21,7 +21,6 @@ private static IntPtr GetWorldObjectPointer(ICore core, IntPtr entityPointer)
         }
 
         public IntPtr EntityNativePointer { get; private set; }
-        public override IntPtr NativePointer => EntityNativePointer;
 
         public Entity(ICore core, IntPtr entityPointer, uint id, BaseObjectType type) : base(core, GetWorldObjectPointer(core, entityPointer), type, id)
         {

api/AltV.Net.Client/Elements/Entities/Font.cs

@@ -19,5 +19,4 @@ public Font(ICore core, IntPtr fontNativePointer, uint id) : base(core, GetBaseO
     }
 
     public IntPtr FontNativePointer { get; }
-    public override IntPtr NativePointer => FontNativePointer;
 }

api/AltV.Net.Client/Elements/Entities/HttpClient.cs

@@ -10,7 +10,6 @@ namespace AltV.Net.Client.Elements.Entities
     public class HttpClient : BaseObject, IHttpClient
     {
         public IntPtr HttpClientNativePointer { get; }
-        public override IntPtr NativePointer => HttpClientNativePointer;
 
         private static IntPtr GetBaseObjectNativePointer(ICore core, IntPtr httpClientNativePointer)
         {
@@ -94,7 +93,7 @@ void ResolveTask(int statusCode, string body, IntPtr headerKeys, IntPtr headerVa
                 HttpResponseModuleDelegate resolveTask = ResolveTask;
                 handle = GCHandle.Alloc(resolveTask);
                 var urlPtr = MemoryUtils.StringToHGlobalUtf8(url);
-                Core.Library.Client.HttpClient_Get(NativePointer, urlPtr, resolveTask);
+                Core.Library.Client.HttpClient_Get(HttpClientNativePointer, urlPtr, resolveTask);
                 Marshal.FreeHGlobal(urlPtr);
             }
 
@@ -123,7 +122,7 @@ void ResolveTask(int statusCode, string body, IntPtr headerKeys, IntPtr headerVa
                 HttpResponseModuleDelegate resolveTask = ResolveTask;
                 handle = GCHandle.Alloc(resolveTask);
                 var urlPtr = MemoryUtils.StringToHGlobalUtf8(url);
-                Core.Library.Client.HttpClient_Head(NativePointer, urlPtr, resolveTask);
+                Core.Library.Client.HttpClient_Head(HttpClientNativePointer, urlPtr, resolveTask);
                 Marshal.FreeHGlobal(urlPtr);
             }
 
@@ -153,7 +152,7 @@ void ResolveTask(int statusCode, string body, IntPtr headerKeys, IntPtr headerVa
                 handle = GCHandle.Alloc(resolveTask);
                 var urlPtr = MemoryUtils.StringToHGlobalUtf8(url);
                 var bodyPtr = MemoryUtils.StringToHGlobalUtf8(body);
-                Core.Library.Client.HttpClient_Connect(NativePointer, urlPtr, bodyPtr, resolveTask);
+                Core.Library.Client.HttpClient_Connect(HttpClientNativePointer, urlPtr, bodyPtr, resolveTask);
                 Marshal.FreeHGlobal(urlPtr);
                 Marshal.FreeHGlobal(bodyPtr);
             }
@@ -184,7 +183,7 @@ void ResolveTask(int statusCode, string body, IntPtr headerKeys, IntPtr headerVa
                 handle = GCHandle.Alloc(resolveTask);
                 var urlPtr = MemoryUtils.StringToHGlobalUtf8(url);
                 var bodyPtr = MemoryUtils.StringToHGlobalUtf8(body);
-                Core.Library.Client.HttpClient_Delete(NativePointer, urlPtr, bodyPtr, resolveTask);
+                Core.Library.Client.HttpClient_Delete(HttpClientNativePointer, urlPtr, bodyPtr, resolveTask);
                 Marshal.FreeHGlobal(urlPtr);
                 Marshal.FreeHGlobal(bodyPtr);
             }
@@ -215,7 +214,7 @@ void ResolveTask(int statusCode, string body, IntPtr headerKeys, IntPtr headerVa
                 handle = GCHandle.Alloc(resolveTask);
                 var urlPtr = MemoryUtils.StringToHGlobalUtf8(url);
                 var bodyPtr = MemoryUtils.StringToHGlobalUtf8(body);
-                Core.Library.Client.HttpClient_Options(NativePointer, urlPtr, bodyPtr, resolveTask);
+                Core.Library.Client.HttpClient_Options(HttpClientNativePointer, urlPtr, bodyPtr, resolveTask);
                 Marshal.FreeHGlobal(urlPtr);
                 Marshal.FreeHGlobal(bodyPtr);
             }
@@ -246,7 +245,7 @@ void ResolveTask(int statusCode, string body, IntPtr headerKeys, IntPtr headerVa
                 handle = GCHandle.Alloc(resolveTask);
                 var urlPtr = MemoryUtils.StringToHGlobalUtf8(url);
                 var bodyPtr = MemoryUtils.StringToHGlobalUtf8(body);
-                Core.Library.Client.HttpClient_Patch(NativePointer, urlPtr, bodyPtr, resolveTask);
+                Core.Library.Client.HttpClient_Patch(HttpClientNativePointer, urlPtr, bodyPtr, resolveTask);
                 Marshal.FreeHGlobal(urlPtr);
                 Marshal.FreeHGlobal(bodyPtr);
             }
@@ -277,7 +276,7 @@ void ResolveTask(int statusCode, string body, IntPtr headerKeys, IntPtr headerVa
                 handle = GCHandle.Alloc(resolveTask);
                 var urlPtr = MemoryUtils.StringToHGlobalUtf8(url);
                 var bodyPtr = MemoryUtils.StringToHGlobalUtf8(body);
-                Core.Library.Client.HttpClient_Post(NativePointer, urlPtr, bodyPtr, resolveTask);
+                Core.Library.Client.HttpClient_Post(HttpClientNativePointer, urlPtr, bodyPtr, resolveTask);
                 Marshal.FreeHGlobal(urlPtr);
                 Marshal.FreeHGlobal(bodyPtr);
             }
@@ -308,7 +307,7 @@ void ResolveTask(int statusCode, string body, IntPtr headerKeys, IntPtr headerVa
                 handle = GCHandle.Alloc(resolveTask);
                 var urlPtr = MemoryUtils.StringToHGlobalUtf8(url);
                 var bodyPtr = MemoryUtils.StringToHGlobalUtf8(body);
-                Core.Library.Client.HttpClient_Put(NativePointer, urlPtr, bodyPtr, resolveTask);
+                Core.Library.Client.HttpClient_Put(HttpClientNativePointer, urlPtr, bodyPtr, resolveTask);
                 Marshal.FreeHGlobal(urlPtr);
                 Marshal.FreeHGlobal(bodyPtr);
             }
@@ -339,7 +338,7 @@ void ResolveTask(int statusCode, string body, IntPtr headerKeys, IntPtr headerVa
                 handle = GCHandle.Alloc(resolveTask);
                 var urlPtr = MemoryUtils.StringToHGlobalUtf8(url);
                 var bodyPtr = MemoryUtils.StringToHGlobalUtf8(body);
-                Core.Library.Client.HttpClient_Trace(NativePointer, urlPtr, bodyPtr, resolveTask);
+                Core.Library.Client.HttpClient_Trace(HttpClientNativePointer, urlPtr, bodyPtr, resolveTask);
                 Marshal.FreeHGlobal(urlPtr);
                 Marshal.FreeHGlobal(bodyPtr);
             }

api/AltV.Net.Client/Elements/Entities/LocalObject.cs

@@ -16,7 +16,6 @@ private static IntPtr GetObjectPointer(ICore core, IntPtr LocalObjectNativePoint
     }
 
     public IntPtr LocalObjectNativePointer { get; }
-    public override IntPtr NativePointer => LocalObjectNativePointer;
 
     public LocalObject(ICore core, IntPtr objectPointer, uint id) : base(core, GetObjectPointer(core, objectPointer), BaseObjectType.LocalObject, id)
     {

api/AltV.Net.Client/Elements/Entities/LocalPed.cs

@@ -7,7 +7,6 @@ namespace AltV.Net.Client.Elements.Entities;
 public class LocalPed : Ped, ILocalPed
 {
     public IntPtr LocalPedNativePointer { get; }
-    public override IntPtr NativePointer => LocalPedNativePointer;
 
     private static IntPtr GetPedPointer(ICore core, IntPtr nativePointer)
     {

api/AltV.Net.Client/Elements/Entities/LocalVehicle.cs

@@ -9,7 +9,6 @@ namespace AltV.Net.Client.Elements.Entities;
 public class LocalVehicle : Vehicle, ILocalVehicle
 {
     public IntPtr LocalVehicleNativePointer { get; }
-    public override IntPtr NativePointer => LocalVehicleNativePointer;
 
     private static IntPtr GetVehiclePointer(ICore core, IntPtr nativePointer)
     {

api/AltV.Net.Client/Elements/Entities/Marker.cs

@@ -23,7 +23,6 @@ public Marker(ICore core, IntPtr markerPointer, uint id) : base(core, GetWorldOb
     }
 
     public IntPtr MarkerNativePointer { get; }
-    public override IntPtr NativePointer => MarkerNativePointer;
 
     public bool IsGlobal
     {

api/AltV.Net.Client/Elements/Entities/Object.cs

@@ -7,7 +7,6 @@ namespace AltV.Net.Client.Elements.Entities;
 public class Object : Entity, IObject
 {
     public IntPtr ObjectNativePointer { get; private set; }
-    public override IntPtr NativePointer => ObjectNativePointer;
 
     private static IntPtr GetEntityPointer(ICore core, IntPtr pointer)
     {

api/AltV.Net.Client/Elements/Entities/Ped.cs

@@ -15,7 +15,6 @@ private static IntPtr GetEntityPointer(ICore core, IntPtr pedNativePointer)
     }
 
     public IntPtr PedNativePointer { get; private set; }
-    public override IntPtr NativePointer => PedNativePointer;
 
     public Ped(ICore core, IntPtr pedNativePointer, uint id) : base(core, GetEntityPointer(core, pedNativePointer), id, BaseObjectType.Ped)
     {

api/AltV.Net.Client/Elements/Entities/Player.cs

@@ -18,7 +18,6 @@ private static IntPtr GetEntityPointer(ICore core, IntPtr playerNativePointer)
         }
 
         public IntPtr PlayerNativePointer { get; private set; }
-        public override IntPtr NativePointer => PlayerNativePointer;
 
         public Player(ICore core, IntPtr playerPointer, uint id) : base(core, GetEntityPointer(core, playerPointer), id, BaseObjectType.Player)
         {

api/AltV.Net.Client/Elements/Entities/RmlDocument.cs

@@ -16,7 +16,6 @@ private static IntPtr GetRmlElementPointer(ICore core, IntPtr rmlDocumentPointer
         }
 
         public IntPtr RmlDocumentNativePointer { get; }
-        public override IntPtr NativePointer => RmlDocumentNativePointer;
 
         public RmlDocument(ICore core, IntPtr rmlDocumentPointer, uint id) : base(core, GetRmlElementPointer(core, rmlDocumentPointer), BaseObjectType.RmlDocument, id)
         {

api/AltV.Net.Client/Elements/Entities/RmlElement.cs

@@ -17,7 +17,6 @@ private static IntPtr GetBaseObjectPointer(ICore core, IntPtr rmlElementPointer)
         }
 
         public IntPtr RmlElementNativePointer { get; }
-        public override IntPtr NativePointer => RmlElementNativePointer;
 
         public RmlElement(ICore core, IntPtr rmlElementPointer, uint id) : base(core, GetBaseObjectPointer(core, rmlElementPointer), BaseObjectType.RmlDocument, id)
         {

api/AltV.Net.Client/Elements/Entities/TextLabel.cs

@@ -24,7 +24,6 @@ public TextLabel(ICore core, IntPtr worldObjectPointer, uint id) : base(core,
     }
 
     public IntPtr TextLabelNativePointer { get; }
-    public override IntPtr NativePointer => TextLabelNativePointer;
 
     public bool IsGlobal
     {

api/AltV.Net.Client/Elements/Entities/Vehicle.cs

@@ -16,7 +16,6 @@ private static IntPtr GetEntityPointer(ICore core, IntPtr vehicleNativePointer)
         }
 
         public IntPtr VehicleNativePointer { get; private set; }
-        public override IntPtr NativePointer => VehicleNativePointer;
 
         public Vehicle(ICore core, IntPtr vehiclePointer, uint id) : base(core, GetEntityPointer(core, vehiclePointer), id, BaseObjectType.Vehicle)
         {

api/AltV.Net.Client/Elements/Entities/VirtualEntity.cs

@@ -11,7 +11,6 @@ namespace AltV.Net.Client.Elements.Entities;
 public class VirtualEntity : WorldObject, IVirtualEntity
 {
     public IntPtr VirtualEntityNativePointer { get; }
-    public override IntPtr NativePointer => VirtualEntityNativePointer;
 
     public static IntPtr GetWorldObjectPointer(ICore core, IntPtr virtualEntityNativePointer)
     {

api/AltV.Net.Client/Elements/Entities/VirtualEntityGroup.cs

@@ -7,7 +7,6 @@ public class VirtualEntityGroup : BaseObject, IVirtualEntityGroup
 {
 
     public IntPtr VirtualEntityGroupNativePointer { get; }
-    public override IntPtr NativePointer => VirtualEntityGroupNativePointer;
 
     public static IntPtr GetBaseObjectNativePointer(ICore core, IntPtr virtualEntityGroupNativePointer)
     {

api/AltV.Net.Client/Elements/Entities/WebSocketClient.cs

@@ -9,7 +9,6 @@ namespace AltV.Net.Client.Elements.Entities
     public class WebSocketClient : BaseObject, IWebSocketClient
     {
         public IntPtr WebSocketClientNativePointer { get; }
-        public override IntPtr NativePointer => WebSocketClientNativePointer;
 
         private static IntPtr GetBaseObjectNativePointer(ICore core, IntPtr webSocketClientNativePointer)
         {

api/AltV.Net.Client/Elements/Entities/WebView.cs

@@ -20,7 +20,6 @@ private static IntPtr GetBaseObjectPointer(ICore core, IntPtr webViewNativePoint
         }
 
         public IntPtr WebViewNativePointer { get; }
-        public override IntPtr NativePointer => WebViewNativePointer;
 
         public WebView(ICore core, IntPtr webViewNativePointer, uint id) : base(core, GetBaseObjectPointer(core, webViewNativePointer), BaseObjectType.Webview, id)
         {

api/AltV.Net.Client/Elements/Entities/WorldObject.cs

@@ -17,7 +17,6 @@ private static IntPtr GetBaseObjectPointer(ICore core, IntPtr worldObjectPointer
         }
 
         public IntPtr WorldObjectNativePointer { get; private set; }
-        public override IntPtr NativePointer => WorldObjectNativePointer;
 
         public WorldObject(ICore core, IntPtr worldObjectPointer, BaseObjectType type, uint id) : base(core, GetBaseObjectPointer(core, worldObjectPointer), type, id)
         {

api/AltV.Net.Client/Elements/Pools/EntityPool.cs

@@ -34,13 +34,13 @@ public EntityPool(IEntityFactory<TEntity> entityFactory)
 
         public void Add(TEntity entity)
         {
-            _entities[entity.NativePointer] = entity;
+            _entities[entity.EntityNativePointer] = entity;
             OnAdd(entity);
         }
 
         public bool Remove(TEntity entity)
         {
-            return Remove(entity.NativePointer);
+            return Remove(entity.EntityNativePointer);
         }
 
         public bool Remove(IntPtr entityPointer)
@@ -56,7 +56,7 @@ public bool Remove(IntPtr entityPointer)
                         if (ptr != IntPtr.Zero)
                         {
                             internalEntity.SetCached(ptr);
-                            cache[entity.NativePointer] = new WeakReference<TEntity>(entity);
+                            cache[entity.EntityNativePointer] = new WeakReference<TEntity>(entity);
                         }
                     }
                 }

api/AltV.Net/Elements/Entities/Blip.cs

@@ -43,8 +43,6 @@ public IReadOnlyCollection<IPlayer> GetTargets()
             }
         }
 
-        public override IntPtr NativePointer => BlipNativePointer;
-
         public static uint GetId(IntPtr pedPointer)
         {
             unsafe

api/AltV.Net/Elements/Entities/Checkpoint.cs

@@ -13,7 +13,6 @@ namespace AltV.Net.Elements.Entities
     public class Checkpoint : ColShape, ICheckpoint
     {
         public IntPtr CheckpointNativePointer { get; }
-        public override IntPtr NativePointer => CheckpointNativePointer;
 
         private static IntPtr GetColShapePointer(ICore core, IntPtr nativePointer)
         {

api/AltV.Net/Elements/Entities/ColShape.cs

@@ -7,7 +7,6 @@ namespace AltV.Net.Elements.Entities
     public class ColShape : WorldObject, IColShape
     {
         public IntPtr ColShapeNativePointer { get; }
-        public override IntPtr NativePointer => ColShapeNativePointer;
 
         private static IntPtr GetWorldObjectPointer(ICore core, IntPtr nativePointer)
         {

api/AltV.Net/Elements/Entities/ConnectionInfo.cs

@@ -13,7 +13,6 @@ public class ConnectionInfo : BaseObject, IConnectionInfo
 {
 
     public IntPtr ConnectionInfoNativePointer { get; }
-    public override IntPtr NativePointer => ConnectionInfoNativePointer;
 
     private static IntPtr GetBaseObjectPointer(ICore core, IntPtr virtualEntityGroupNativePointer)
     {