add new core methods and add playerhealevent

Author: Doxoh

api/AltV.Net.Async/AltAsync.RegisterEvents.cs

@@ -97,6 +97,23 @@ public static void RegisterEvents(object target)
                                     };
                                     break;
                                 }
+                                case ScriptEventType.PlayerHeal:
+                                {
+                                    scriptFunction = ScriptFunction.Create(eventMethodDelegate,
+                                        new[] { typeof(IPlayer), typeof(ushort), typeof(ushort), typeof(ushort), typeof(ushort) }, isAsync: true);
+                                    if (scriptFunction == null) return;
+                                    OnPlayerHeal += (player, oldHealth, newHealth, oldArmour, newArmour) =>
+                                    {
+                                        var currScriptFunction = scriptFunction.Clone();
+                                        currScriptFunction.Set(player);
+                                        currScriptFunction.Set(oldHealth);
+                                        currScriptFunction.Set(newHealth);
+                                        currScriptFunction.Set(oldArmour);
+                                        currScriptFunction.Set(newArmour);
+                                        return currScriptFunction.CallAsync();
+                                    };
+                                    break;
+                                }
                                 case ScriptEventType.PlayerDisconnect:
                                 {
                                     scriptFunction = ScriptFunction.Create(eventMethodDelegate,

api/AltV.Net.Async/AltAsync.cs

@@ -40,6 +40,12 @@ public static event PlayerDeadAsyncDelegate OnPlayerDead
             remove => Core.PlayerDeadAsyncEventHandler.Remove(value);
         }
 
+        public static event PlayerHealAsyncDelegate OnPlayerHeal
+        {
+            add => Core.PlayerHealAsyncEventHandler.Add(value);
+            remove => Core.PlayerHealAsyncEventHandler.Remove(value);
+        }
+
         public static event ExplosionAsyncDelegate OnExplosion
         {
             add => Core.ExplosionAsyncEventHandler.Add(value);

api/AltV.Net.Async/AsyncCore.cs

@@ -47,6 +47,9 @@ public override IEnumerable<string> GetRegisteredServerEvents()
         internal readonly AsyncEventHandler<PlayerDeadAsyncDelegate> PlayerDeadAsyncEventHandler =
             new(EventType.PLAYER_DEATH);
 
+        internal readonly AsyncEventHandler<PlayerHealAsyncDelegate> PlayerHealAsyncEventHandler =
+            new(EventType.PLAYER_HEAL);
+
         internal readonly AsyncEventHandler<ExplosionAsyncDelegate> ExplosionAsyncEventHandler =
             new(EventType.EXPLOSION_EVENT);
 
@@ -197,6 +200,17 @@ await PlayerDeadAsyncEventHandler.CallAsync(@delegate =>
             });
         }
 
+        public override void OnPlayerHealEvent(IPlayer player, ushort oldHealth, ushort newHealth, ushort oldArmour, ushort newArmour)
+        {
+            base.OnPlayerHealEvent(player, oldHealth, newHealth, oldArmour, newArmour);
+            if (!PlayerHealAsyncEventHandler.HasEvents()) return;
+            Task.Run(async () =>
+            {
+                await PlayerHealAsyncEventHandler.CallAsync(@delegate =>
+                    @delegate(player, oldHealth, newHealth, oldArmour, newArmour));
+            });
+        }
+
         public override void OnPlayerConnectEvent(IPlayer player, string reason)
         {
             base.OnPlayerConnectEvent(player, reason);

api/AltV.Net.Async/Events/Events.cs

@@ -17,6 +17,9 @@ public delegate Task PlayerDamageAsyncDelegate(IPlayer player, IEntity attacker,
 
     public delegate Task PlayerDeadAsyncDelegate(IPlayer player, IEntity killer, uint weapon);
 
+    public delegate Task PlayerHealAsyncDelegate(IPlayer target, ushort oldHealth, ushort newHealth, ushort oldArmour,
+        ushort newArmour);
+
     public delegate Task PlayerDisconnectAsyncDelegate(IPlayer player, string reason);
 
     public delegate Task PlayerRemoveAsyncDelegate(IPlayer player);

api/AltV.Net.CApi.Generator/TypeRegistry.cs

@@ -108,7 +108,7 @@ public static class TypeRegistry
         { "vector3_t&", "Vector3*" },
         { "rgba_t", "Rgba" },
         { "rgba_t&", "Rgba*" },
-        { "alt::Array<uint32_t>", "UIntArray*" },
+        { "std::vector<uint32_t>", "UIntArray*" },
 
         { "alt::Quaternion", "Quaternion" },
         { "alt::Quaternion&", "Quaternion*" },
@@ -134,8 +134,8 @@ public static class TypeRegistry
         { "const char*&", "nint*" },
         { "char**", "nint" },
         { "char**&", "nint*" },
-        { "alt::Array<uint32_t>&", "UIntArray*" },
-        { "alt::Array<uint32_t>*", "UIntArray*" },
+        { "std::vector<uint32_t>&", "UIntArray*" },
+        { "std::vector<uint32_t>*", "UIntArray*" },
         { "void*", "nint" },
         { "alt::IBaseObject::Type&", "BaseObjectType*" },
         { "player_struct_t*", "ReadOnlyPlayer*" },
@@ -146,7 +146,7 @@ public static class TypeRegistry
         { "alt::IVoiceChannel*", "nint" },
         { "alt::IBlip*", "nint" },
         { "alt::IBlip**", "nint" },
-        { "alt::Array<alt::String>&", "StringArray*" },
+        { "std::vector<alt::String>&", "StringArray*" },
         //{ "alt::MValue::List&", "MValueWriter2.MValueArray*" },
         { "const alt::MValue&", "MValue*" },
         { "const char**", "string[]" },
@@ -167,13 +167,13 @@ public static class TypeRegistry
         { "alt::EventCallback", "EventCallback" },
         { "alt::TickCallback", "TickCallback" },
         { "alt::CommandCallback", "CommandCallback" },
-        { "alt::Array<alt::IPlayer*>*", "PlayerPointerArray*" },
-        { "alt::Array<alt::IVehicle*>*", "VehiclePointerArray*" },
-        { "alt::Array<alt::IPlayer*>&", "PlayerPointerArray*" },
-        { "alt::Array<alt::IVehicle*>&", "VehiclePointerArray*" },
-        { "alt::Array<alt::StringView>*", "StringViewArray*" },
-        { "alt::Array<alt::String>*", "StringArray*" },
-        { "alt::Array<alt::MValue>*", "MValueWriter2.MValueArray*" },
+        { "std::vector<alt::IPlayer*>*", "PlayerPointerArray*" },
+        { "std::vector<alt::IVehicle*>*", "VehiclePointerArray*" },
+        { "std::vector<alt::IPlayer*>&", "PlayerPointerArray*" },
+        { "std::vector<alt::IVehicle*>&", "VehiclePointerArray*" },
+        { "std::vector<alt::StringView>*", "StringViewArray*" },
+        { "std::vector<alt::String>*", "StringArray*" },
+        { "std::vector<alt::MValue>*", "MValueWriter2.MValueArray*" },
         { "alt::MValue*[]", "nint[]" },
         { "alt::IPlayer*[]", "nint[]" },
         { "alt::IVehicle*[]", "nint[]" },
@@ -201,7 +201,7 @@ public static class TypeRegistry
         { "head_overlay_t", "HeadOverlay" },
         { "head_overlay_t&", "HeadOverlay*" },
         { "weapon_t*[]", "WeaponData[]" },
-        { "alt::Array<weapon_t>&", "WeaponArray*" },
+        { "std::vector<weapon_t>&", "WeaponArray*" },
         { "vector2_t[]", "Vector2[]" },
         { "alt::IConnectionInfo*", "IntPtr" },
         { "ClrVehicleModelInfo*", "nint" },

api/AltV.Net.CApi/Libraries/ClientLibrary.cs

@@ -876,7 +876,7 @@ public unsafe interface IClientLibrary
 
     public unsafe class ClientLibrary : IClientLibrary
     {
-        public readonly uint Methods = 1649;
+        public readonly uint Methods = 1661;
         public delegate* unmanaged[Cdecl]<nint, nint, void> Audio_AddOutput { get; }
         public delegate* unmanaged[Cdecl]<nint, nint> Audio_GetBaseObject { get; }
         public delegate* unmanaged[Cdecl]<nint, double> Audio_GetCurrentTime { get; }
@@ -3472,7 +3472,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
         public ClientLibrary(Dictionary<ulong, IntPtr> funcTable)
         {
             if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
-            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 5645779348269713775UL) Outdated = true;
+            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 11511328496285563025UL) Outdated = true;
             Audio_AddOutput = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Audio_AddOutputDelegate>(funcTable, 9914412815391408844UL, Audio_AddOutputFallback);
             Audio_GetBaseObject = (delegate* unmanaged[Cdecl]<nint, nint>) GetUnmanagedPtr<Audio_GetBaseObjectDelegate>(funcTable, 6330360502401226894UL, Audio_GetBaseObjectFallback);
             Audio_GetCurrentTime = (delegate* unmanaged[Cdecl]<nint, double>) GetUnmanagedPtr<Audio_GetCurrentTimeDelegate>(funcTable, 2944324482134975819UL, Audio_GetCurrentTimeFallback);