Improve internal meta data for entities and base objects

FabianTerhorst · FabianTerhorst · commit bc27cb3edffd · 2019-06-11T15:58:45.000+02:00
diff --git a/api/AltV.Net.Mock/MockEntity.cs b/api/AltV.Net.Mock/MockEntity.cs
@@ -111,6 +111,26 @@ public bool GetSyncedMetaData<T>(string key, out T result)
             return true;
         }
 
+        public void SetMetaData(string key, ref MValue value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void GetMetaData(string key, ref MValue value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SetSyncedMetaData(string key, ref MValue value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void GetSyncedMetaData(string key, ref MValue value)
+        {
+            throw new NotImplementedException();
+        }
+
         public abstract void Remove();
 
         public void CheckIfEntityExists()
@@ -119,6 +139,7 @@ public void CheckIfEntityExists()
             {
                 return;
             }
+
             throw new EntityRemovedException(this);
         }
     }
diff --git a/api/AltV.Net.Mock/MockWorldObject.cs b/api/AltV.Net.Mock/MockWorldObject.cs
@@ -1,5 +1,6 @@
 using System;
 using AltV.Net.Data;
+using AltV.Net.Elements.Args;
 using AltV.Net.Elements.Entities;
 
 namespace AltV.Net.Mock
@@ -12,12 +13,13 @@ public MockWorldObject(IntPtr nativePointer, BaseObjectType type) : base(nativeP
 
         public override Position Position { get; set; }
         public override short Dimension { get; set; }
-        public override void SetMetaData(string key, object value)
+
+        public override void SetMetaData(string key, ref MValue value)
         {
             throw new NotImplementedException();
         }
 
-        public override bool GetMetaData<T>(string key, out T result)
+        public override void GetMetaData(string key, ref MValue value)
         {
             throw new NotImplementedException();
         }
diff --git a/api/AltV.Net/Data/ReadOnlyPlayer.cs b/api/AltV.Net/Data/ReadOnlyPlayer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using AltV.Net.Elements.Args;
 using AltV.Net.Elements.Entities;
 using AltV.Net.Native;
 
@@ -57,6 +58,26 @@ public bool GetData<T>(string key, out T result)
             throw new NotImplementedException();
         }
 
+        public void SetMetaData(string key, ref MValue value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void GetMetaData(string key, ref MValue value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SetSyncedMetaData(string key, ref MValue value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void GetSyncedMetaData(string key, ref MValue value)
+        {
+            throw new NotImplementedException();
+        }
+
         public Position Position
         {
             get => position;
diff --git a/api/AltV.Net/Elements/Entities/BaseObject.cs b/api/AltV.Net/Elements/Entities/BaseObject.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Concurrent;
+using AltV.Net.Elements.Args;
 
 namespace AltV.Net.Elements.Entities
 {
@@ -12,20 +13,88 @@ public abstract class BaseObject : IBaseObject, IInternalBaseObject
 
         public BaseObjectType Type { get; }
 
-        public abstract void SetMetaData(string key, object value);
-        public abstract bool GetMetaData<T>(string key, out T result);
+        public abstract void SetMetaData(string key, ref MValue value);
+        public abstract void GetMetaData(string key, ref MValue value);
 
         protected BaseObject(IntPtr nativePointer, BaseObjectType type)
         {
             if (nativePointer == IntPtr.Zero)
             {
                 throw new BaseObjectRemovedException(this);
             }
+
             NativePointer = nativePointer;
             Type = type;
             Exists = true;
         }
 
+        public void SetMetaData(string key, object value)
+        {
+            CheckIfEntityExists();
+            var mValue = MValue.CreateFromObject(value);
+            SetMetaData(key, ref mValue);
+        }
+
+        public bool GetMetaData(string key, out int result)
+        {
+            CheckIfEntityExists();
+            var mValue = MValue.Nil;
+            GetMetaData(key, ref mValue);
+            if (mValue.type != MValue.Type.INT)
+            {
+                result = default;
+                return false;
+            }
+
+            result = (int) mValue.GetInt();
+            return true;
+        }
+        
+        public bool GetMetaData(string key, out uint result)
+        {
+            CheckIfEntityExists();
+            var mValue = MValue.Nil;
+            GetMetaData(key, ref mValue);
+            if (mValue.type != MValue.Type.UINT)
+            {
+                result = default;
+                return false;
+            }
+
+            result = (uint) mValue.GetUint();
+            return true;
+        }
+        
+        public bool GetMetaData(string key, out float result)
+        {
+            CheckIfEntityExists();
+            var mValue = MValue.Nil;
+            GetMetaData(key, ref mValue);
+            if (mValue.type != MValue.Type.DOUBLE)
+            {
+                result = default;
+                return false;
+            }
+
+            result = (float) mValue.GetDouble();
+            return true;
+        }
+
+        public bool GetMetaData<T>(string key, out T result)
+        {
+            CheckIfEntityExists();
+            var mValue = MValue.Nil;
+            GetMetaData(key, ref mValue);
+            if (!(mValue.ToObject() is T cast))
+            {
+                result = default;
+                return false;
+            }
+
+            result = cast;
+            return true;
+        }
+
         public void SetData(string key, object value)
         {
             data[key] = value;
diff --git a/api/AltV.Net/Elements/Entities/Blip.cs b/api/AltV.Net/Elements/Entities/Blip.cs
@@ -37,27 +37,11 @@ public override short Dimension
             }
         }
 
-        public override void SetMetaData(string key, object value)
-        {
-            CheckIfEntityExists();
-            var mValue = MValue.CreateFromObject(value);
-            AltNative.Blip.Blip_SetMetaData(NativePointer, key, ref mValue);
-        }
+        public override void GetMetaData(string key, ref MValue value) =>
+            AltNative.Blip.Blip_GetMetaData(NativePointer, key, ref value);
 
-        public override bool GetMetaData<T>(string key, out T result)
-        {
-            CheckIfEntityExists();
-            var mValue = MValue.Nil;
-            AltNative.Blip.Blip_GetMetaData(NativePointer, key, ref mValue);
-            if (!(mValue.ToObject() is T cast))
-            {
-                result = default;
-                return false;
-            }
-
-            result = cast;
-            return true;
-        }
+        public override void SetMetaData(string key, ref MValue value) =>
+            AltNative.Blip.Blip_SetMetaData(NativePointer, key, ref value);
 
         public bool IsGlobal
         {
diff --git a/api/AltV.Net/Elements/Entities/Checkpoint.cs b/api/AltV.Net/Elements/Entities/Checkpoint.cs
@@ -48,27 +48,11 @@ public IPlayer Target
             }
         }
 
-        public override void SetMetaData(string key, object value)
-        {
-            CheckIfEntityExists();
-            var mValue = MValue.CreateFromObject(value);
-            AltNative.Checkpoint.Checkpoint_SetMetaData(NativePointer, key, ref mValue);
-        }
+        public override void GetMetaData(string key, ref MValue value) =>
+            AltNative.Checkpoint.Checkpoint_SetMetaData(NativePointer, key, ref value);
 
-        public override bool GetMetaData<T>(string key, out T result)
-        {
-            CheckIfEntityExists();
-            var mValue = MValue.Nil;
-            AltNative.Checkpoint.Checkpoint_GetMetaData(NativePointer, key, ref mValue);
-            if (!(mValue.ToObject() is T cast))
-            {
-                result = default;
-                return false;
-            }
-
-            result = cast;
-            return true;
-        }
+        public override void SetMetaData(string key, ref MValue value) =>
+            AltNative.Checkpoint.Checkpoint_SetMetaData(NativePointer, key, ref value);
 
         public bool IsGlobal
         {
diff --git a/api/AltV.Net/Elements/Entities/Entity.cs b/api/AltV.Net/Elements/Entities/Entity.cs
@@ -1,8 +1,10 @@
 using System;
 using AltV.Net.Data;
+using AltV.Net.Elements.Args;
 
 namespace AltV.Net.Elements.Entities
 {
+    //TODO: implement all meta data implementation here and require a AltNative.Player.Player_SetSyncedMetaData(NativePointer, key, ref mValue); implementation for each entity
     public abstract class Entity : WorldObject, IEntity
     {
         public ushort Id { get; }
@@ -11,8 +13,30 @@ public abstract class Entity : WorldObject, IEntity
 
         public abstract uint Model { get; set; }
 
-        public abstract void SetSyncedMetaData(string key, object value);
-        public abstract bool GetSyncedMetaData<T>(string key, out T result);
+        public abstract void SetSyncedMetaData(string key, ref MValue value);
+        public abstract void GetSyncedMetaData(string key, ref MValue value);
+        
+        public void SetSyncedMetaData(string key, object value)
+        {
+            CheckIfEntityExists();
+            var mValue = MValue.CreateFromObject(value);
+            SetSyncedMetaData(key, ref mValue);
+        }
+
+        public bool GetSyncedMetaData<T>(string key, out T result)
+        {
+            CheckIfEntityExists();
+            var mValue = MValue.Nil;
+            GetSyncedMetaData(key, ref mValue);
+            if (!(mValue.ToObject() is T cast))
+            {
+                result = default;
+                return false;
+            }
+
+            result = cast;
+            return true;
+        }
 
         protected Entity(IntPtr nativePointer, BaseObjectType type, ushort id) : base(nativePointer, type)
         {
diff --git a/api/AltV.Net/Elements/Entities/IBaseObject.cs b/api/AltV.Net/Elements/Entities/IBaseObject.cs
@@ -1,4 +1,5 @@
 using System;
+using AltV.Net.Elements.Args;
 
 namespace AltV.Net.Elements.Entities
 {
@@ -17,9 +18,9 @@ public interface IBaseObject
         /// WARNING: Do NOT use this.
         /// </summary>
         bool Exists { get; }
-        
+
         BaseObjectType Type { get; }
-        
+
         /// <summary>
         /// Sets the given object into the meta data with the given key
         /// </summary>
@@ -30,10 +31,62 @@ public interface IBaseObject
 
         bool GetMetaData<T>(string key, out T result);
 
+        void SetMetaData(string key, ref MValue value);
+        
+        void GetMetaData(string key, ref MValue value);
+        
         void SetData(string key, object value);
 
         bool GetData<T>(string key, out T result);
 
         void CheckIfEntityExists();
     }
+
+    public static class BaseObjectExtensions
+    {
+        public static bool GetMetaData(this IBaseObject baseObject, string key, out int result)
+        {
+            baseObject.CheckIfEntityExists();
+            var mValue = MValue.Nil;
+            baseObject.GetMetaData(key, ref mValue);
+            if (mValue.type != MValue.Type.INT)
+            {
+                result = default;
+                return false;
+            }
+
+            result = (int) mValue.GetInt();
+            return true;
+        }
+        
+        public static bool GetMetaData(this IBaseObject baseObject, string key, out uint result)
+        {
+            baseObject.CheckIfEntityExists();
+            var mValue = MValue.Nil;
+            baseObject.GetMetaData(key, ref mValue);
+            if (mValue.type != MValue.Type.UINT)
+            {
+                result = default;
+                return false;
+            }
+
+            result = (uint) mValue.GetUint();
+            return true;
+        }
+        
+        public static bool GetMetaData(this IBaseObject baseObject, string key, out float result)
+        {
+            baseObject.CheckIfEntityExists();
+            var mValue = MValue.Nil;
+            baseObject.GetMetaData(key, ref mValue);
+            if (mValue.type != MValue.Type.DOUBLE)
+            {
+                result = default;
+                return false;
+            }
+
+            result = (float) mValue.GetDouble();
+            return true;
+        }
+    }
 }
diff --git a/api/AltV.Net/Elements/Entities/IEntity.cs b/api/AltV.Net/Elements/Entities/IEntity.cs
diff --git a/api/AltV.Net/Elements/Entities/Player.cs b/api/AltV.Net/Elements/Entities/Player.cs
diff --git a/api/AltV.Net/Elements/Entities/Vehicle.cs b/api/AltV.Net/Elements/Entities/Vehicle.cs
diff --git a/api/AltV.Net/Elements/Entities/VoiceChannel.cs b/api/AltV.Net/Elements/Entities/VoiceChannel.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using AltV.Net.Data;`
	`3`	`+using AltV.Net.Elements.Args;`
`3`	`4`	`using AltV.Net.Elements.Entities;`
`4`	`5`
`5`	`6`	`namespace AltV.Net.Mock`
`@@ -12,12 +13,13 @@ public MockWorldObject(IntPtr nativePointer, BaseObjectType type) : base(nativeP`
`12`	`13`
`13`	`14`	`public override Position Position { get; set; }`
`14`	`15`	`public override short Dimension { get; set; }`
`15`		`- public override void SetMetaData(string key, object value)`
	`16`	`+`
	`17`	`+ public override void SetMetaData(string key, ref MValue value)`
`16`	`18`	`{`
`17`	`19`	`throw new NotImplementedException();`
`18`	`20`	`}`
`19`	`21`
`20`		`- public override bool GetMetaData<T>(string key, out T result)`
	`22`	`+ public override void GetMetaData(string key, ref MValue value)`
`21`	`23`	`{`
`22`	`24`	`throw new NotImplementedException();`
`23`	`25`	`}`