Merge tag '15.0.190-dev' into rc

emcifuntik · emcifuntik · commit 63b94a012479 · 2023-10-20T13:22:40.000+02:00
# Conflicts:
#	runtime
diff --git a/api/AltV.Net.Async/Elements/Entities/AsyncConnectionInfo.cs b/api/AltV.Net.Async/Elements/Entities/AsyncConnectionInfo.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Threading.Tasks;
+using AltV.Net.Data;
 using AltV.Net.Elements.Entities;
 
 namespace AltV.Net.Async.Elements.Entities;
@@ -224,6 +225,18 @@ public string CloudId
         }
     }
 
+    public CloudAuthResult CloudAuthResult
+    {
+        get
+        {
+            lock (ConnectionInfo)
+            {
+                if (!AsyncContext.CheckIfExistsOrCachedNullable(ConnectionInfo)) return default;
+                return ConnectionInfo.CloudAuthResult;
+            }
+        }
+    }
+
 
     [Obsolete("Use new async API instead")]
     public IConnectionInfo ToAsync(IAsyncContext asyncContext)
diff --git a/api/AltV.Net.Async/Elements/Entities/AsyncPlayer.cs b/api/AltV.Net.Async/Elements/Entities/AsyncPlayer.cs
@@ -1507,6 +1507,38 @@ public string CloudId
             }
         }
 
+        public CloudAuthResult CloudAuthResult
+        {
+            get
+            {
+                lock (Player)
+                {
+                    if (!AsyncContext.CheckIfExistsOrCachedNullable(Player)) return default;
+                    return Player.CloudAuthResult;
+                }
+            }
+        }
+
+        public string BloodDamage
+        {
+            get
+            {
+                lock (Player)
+                {
+                    if (!AsyncContext.CheckIfExistsOrCachedNullable(Player)) return default;
+                    return Player.BloodDamage;
+                }
+            }
+            set
+            {
+                lock (Player)
+                {
+                    if (!AsyncContext.CheckIfExistsNullable(Player)) return;
+                    Player.BloodDamage = value;
+                }
+            }
+        }
+
         [Obsolete("Use new async API instead")]
         public IPlayer ToAsync(IAsyncContext asyncContext)
         {
diff --git a/api/AltV.Net.CApi/Libraries/ClientLibrary.cs b/api/AltV.Net.CApi/Libraries/ClientLibrary.cs
@@ -886,7 +886,7 @@ public unsafe interface IClientLibrary
 
     public unsafe class ClientLibrary : IClientLibrary
     {
-        public readonly uint Methods = 1729;
+        public readonly uint Methods = 1735;
         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; }
@@ -3512,7 +3512,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 != 17234525495073991761UL) Outdated = true;
+            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 14520310097856707558UL) 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);
diff --git a/api/AltV.Net.CApi/Libraries/ServerLibrary.cs b/api/AltV.Net.CApi/Libraries/ServerLibrary.cs
diff --git a/api/AltV.Net.CApi/Libraries/SharedLibrary.cs b/api/AltV.Net.CApi/Libraries/SharedLibrary.cs
@@ -410,7 +410,7 @@ public unsafe interface ISharedLibrary
 
     public unsafe class SharedLibrary : ISharedLibrary
     {
-        public readonly uint Methods = 1729;
+        public readonly uint Methods = 1735;
         public delegate* unmanaged[Cdecl]<nint, uint> Audio_GetID { get; }
         public delegate* unmanaged[Cdecl]<nint, uint> AudioAttachedOutput_GetID { get; }
         public delegate* unmanaged[Cdecl]<nint, uint> AudioFilter_GetID { get; }
@@ -1608,7 +1608,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
         public SharedLibrary(Dictionary<ulong, IntPtr> funcTable)
         {
             if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
-            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 17234525495073991761UL) Outdated = true;
+            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 14520310097856707558UL) Outdated = true;
             Audio_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<Audio_GetIDDelegate>(funcTable, 4464042055475980737UL, Audio_GetIDFallback);
             AudioAttachedOutput_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioAttachedOutput_GetIDDelegate>(funcTable, 17725794901805112189UL, AudioAttachedOutput_GetIDFallback);
             AudioFilter_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioFilter_GetIDDelegate>(funcTable, 8824535635529306325UL, AudioFilter_GetIDFallback);
diff --git a/api/AltV.Net.Mock/MockConnectionInfo.cs b/api/AltV.Net.Mock/MockConnectionInfo.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using AltV.Net.Data;
 using AltV.Net.Elements.Args;
 using AltV.Net.Elements.Entities;
 using AltV.Net.Shared.Elements.Entities;
@@ -41,5 +42,6 @@ public void Decline(string reason)
         }
 
         public string CloudId { get; }
+        public CloudAuthResult CloudAuthResult { get; }
     }
 }
diff --git a/api/AltV.Net.Mock/MockCore.cs b/api/AltV.Net.Mock/MockCore.cs
@@ -1013,6 +1013,15 @@ public void SetVoiceExternal(string host, ushort port)
         public byte SyncReceiveThreadCount { get; set; }
         public byte SyncSendThreadCount { get; set; }
         public uint[] LoadedVehicleModels { get; }
+        public void AddClientConfigKey(string key)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool HasBenefit(Benefit benefit)
+        {
+            throw new NotImplementedException();
+        }
 
         public string PtrToStringUtf8AndFree(nint str, int size)
         {
diff --git a/api/AltV.Net/Alt.cs b/api/AltV.Net/Alt.cs
@@ -147,6 +147,8 @@ public static Task ForEachColShapes(IAsyncBaseObjectCallback<IColShape> baseObje
 
         public static int NetTime => Core.NetTime;
 
+        public static void AddClientConfigKey(string key) => Core.AddClientConfigKey(key);
+
         public static ushort MaxStreamingPeds
         {
             get => Core.MaxStreamingPeds;
@@ -208,5 +210,7 @@ public static byte SyncSendThreadCount
             get => Core.SyncSendThreadCount;
             set => Core.SyncSendThreadCount = value;
         }
+
+        public static bool HasBenefit(Benefit benefit) => Core.HasBenefit(benefit);
     }
 }
diff --git a/api/AltV.Net/Core.cs b/api/AltV.Net/Core.cs
@@ -1099,6 +1099,19 @@ public void RestartResource(string name)
             }
         }
 
+        public void AddClientConfigKey(string key)
+        {
+            unsafe
+            {
+                CheckIfCallIsValid();
+                var keyPtr = MemoryUtils.StringToHGlobalUtf8(key);
+                Library.Server.Core_AddClientConfigKey(NativePointer, keyPtr);
+                Marshal.FreeHGlobal(keyPtr);
+            }
+        }
+
+
+
         #region SyncedMetaData
         public void SetSyncedMetaData(string key, object value)
         {
@@ -1618,6 +1631,15 @@ public uint MigrationDistance
                 }
             }
         }
+
+        public bool HasBenefit(Benefit benefit)
+        {
+            unsafe
+            {
+                return Library.Server.Core_HasBenefit(NativePointer, (byte)benefit) == 1;
+            }
+        }
+
         public byte MigrationThreadCount
         {
             get
diff --git a/api/AltV.Net/Data/Benefit.cs b/api/AltV.Net/Data/Benefit.cs
@@ -0,0 +1,7 @@
+﻿namespace AltV.Net.Data;
+
+public enum Benefit : byte
+{
+    None,
+    CloudAuth
+}
diff --git a/api/AltV.Net/Data/CloudAuthResult.cs b/api/AltV.Net/Data/CloudAuthResult.cs
@@ -0,0 +1,8 @@
+﻿namespace AltV.Net.Data;
+
+public enum CloudAuthResult : byte
+{
+    Success,
+    NoBenefit,
+    VerifyFailed,
+}
diff --git a/api/AltV.Net/Data/WeaponDamageResponse.cs b/api/AltV.Net/Data/WeaponDamageResponse.cs
@@ -2,5 +2,5 @@
 
 public record WeaponDamageResponse(bool notCancel, uint? Damage) {
     public static implicit operator WeaponDamageResponse(bool val) => new WeaponDamageResponse(val, null);
-    public static implicit operator WeaponDamageResponse(uint val) => new WeaponDamageResponse(false, val);
+    public static implicit operator WeaponDamageResponse(uint val) => new WeaponDamageResponse(true, val);
 };
diff --git a/api/AltV.Net/Elements/Entities/ConnectionInfo.cs b/api/AltV.Net/Elements/Entities/ConnectionInfo.cs
@@ -3,6 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using AltV.Net.CApi.ServerEvents;
+using AltV.Net.Data;
 using AltV.Net.Native;
 using AltV.Net.Shared.Utils;
 
@@ -255,4 +256,15 @@ public string CloudId
             }
         }
     }
+
+    public CloudAuthResult CloudAuthResult
+    {
+        get
+        {
+            unsafe
+            {
+                return (CloudAuthResult)Core.Library.Server.ConnectionInfo_GetCloudAuthResult(ConnectionInfoNativePointer);
+            }
+        }
+    }
 }
diff --git a/api/AltV.Net/Elements/Entities/IConnectionInfo.cs b/api/AltV.Net/Elements/Entities/IConnectionInfo.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using AltV.Net.Data;
 using AltV.Net.Elements.Entities;
 
 namespace AltV.Net.Elements.Entities;
@@ -28,4 +29,6 @@ public interface IConnectionInfo : IBaseObject
     void Accept(bool sendNames = true);
     void Decline(string reason);
     string CloudId { get; }
+
+    CloudAuthResult CloudAuthResult { get; }
 }
diff --git a/api/AltV.Net/Elements/Entities/IPlayer.cs b/api/AltV.Net/Elements/Entities/IPlayer.cs
@@ -463,6 +463,10 @@ void PlayAnimation(string animDict, string animName, float blendInSpeed, float b
         Decoration[] GetDecorations();
         void PlayScenario(string name);
         string CloudId { get; }
+
+        CloudAuthResult CloudAuthResult { get; }
+
+        string BloodDamage { get; set; }
     }
 
     public static class PlayerExtensions
diff --git a/api/AltV.Net/Elements/Entities/Player.cs b/api/AltV.Net/Elements/Entities/Player.cs
@@ -401,6 +401,42 @@ public string CloudId
             }
         }
 
+        public CloudAuthResult CloudAuthResult
+        {
+            get
+            {
+                unsafe
+                {
+                    CheckIfEntityExistsOrCached();
+                    return (CloudAuthResult)Core.Library.Server.Player_GetCloudAuthResult(PlayerNativePointer);
+                }
+            }
+        }
+
+        public string BloodDamage
+        {
+            get
+            {
+                unsafe
+                {
+                    CheckIfEntityExistsOrCached();
+                    var size = 0;
+                    return Core.PtrToStringUtf8AndFree(
+                        Core.Library.Server.Player_GetBloodDamageBase64(PlayerNativePointer, &size), size);
+                }
+            }
+            set
+            {
+                unsafe
+                {
+                    CheckIfEntityExists();
+                    var stringPtr = MemoryUtils.StringToHGlobalUtf8(value);
+                    Core.Library.Server.Player_SetBloodDamageBase64(PlayerNativePointer, stringPtr);
+                    Marshal.FreeHGlobal(stringPtr);
+                }
+            }
+        }
+
         public bool IsConnected
         {
             get
diff --git a/api/AltV.Net/ICore.cs b/api/AltV.Net/ICore.cs
@@ -225,5 +225,9 @@ IBaseObject[] GetClosestEntities(Position position, int range, int dimension, in
         byte SyncSendThreadCount { get; set; }
 
         uint[] LoadedVehicleModels { get; }
+
+        void AddClientConfigKey(string key);
+
+        bool HasBenefit(Benefit benefit);
     }
 }
diff --git a/runtime b/runtime
@@ -1 +1 @@
-Subproject commit 898673ca91ee794f476b5c2f348b2220b7cad14d
+Subproject commit 1b61599fd9b11787fad963c24922860ebfe9c93a

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Threading.Tasks;`
	`3`	`+using AltV.Net.Data;`
`3`	`4`	`using AltV.Net.Elements.Args;`
`4`	`5`	`using AltV.Net.Elements.Entities;`
`5`	`6`	`using AltV.Net.Shared.Elements.Entities;`
`@@ -41,5 +42,6 @@ public void Decline(string reason)`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`public string CloudId { get; }`
	`45`	`+ public CloudAuthResult CloudAuthResult { get; }`
`44`	`46`	`}`
`45`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ public static Task ForEachColShapes(IAsyncBaseObjectCallback<IColShape> baseObje`
`147`	`147`
`148`	`148`	`public static int NetTime => Core.NetTime;`
`149`	`149`
	`150`	`+ public static void AddClientConfigKey(string key) => Core.AddClientConfigKey(key);`
	`151`	`+`
`150`	`152`	`public static ushort MaxStreamingPeds`
`151`	`153`	`{`
`152`	`154`	`get => Core.MaxStreamingPeds;`
`@@ -208,5 +210,7 @@ public static byte SyncSendThreadCount`
`208`	`210`	`get => Core.SyncSendThreadCount;`
`209`	`211`	`set => Core.SyncSendThreadCount = value;`
`210`	`212`	`}`
	`213`	`+`
	`214`	`+ public static bool HasBenefit(Benefit benefit) => Core.HasBenefit(benefit);`
`211`	`215`	`}`
`212`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1099,6 +1099,19 @@ public void RestartResource(string name)`
`1099`	`1099`	`}`
`1100`	`1100`	`}`
`1101`	`1101`
	`1102`	`+ public void AddClientConfigKey(string key)`
	`1103`	`+ {`
	`1104`	`+ unsafe`
	`1105`	`+ {`
	`1106`	`+ CheckIfCallIsValid();`
	`1107`	`+ var keyPtr = MemoryUtils.StringToHGlobalUtf8(key);`
	`1108`	`+ Library.Server.Core_AddClientConfigKey(NativePointer, keyPtr);`
	`1109`	`+ Marshal.FreeHGlobal(keyPtr);`
	`1110`	`+ }`
	`1111`	`+ }`
	`1112`	`+`
	`1113`	`+`
	`1114`	`+`
`1102`	`1115`	`#region SyncedMetaData`
`1103`	`1116`	`public void SetSyncedMetaData(string key, object value)`
`1104`	`1117`	`{`
`@@ -1618,6 +1631,15 @@ public uint MigrationDistance`
`1618`	`1631`	`}`
`1619`	`1632`	`}`
`1620`	`1633`	`}`
	`1634`	`+`
	`1635`	`+ public bool HasBenefit(Benefit benefit)`
	`1636`	`+ {`
	`1637`	`+ unsafe`
	`1638`	`+ {`
	`1639`	`+ return Library.Server.Core_HasBenefit(NativePointer, (byte)benefit) == 1;`
	`1640`	`+ }`
	`1641`	`+ }`
	`1642`	`+`
`1621`	`1643`	`public byte MigrationThreadCount`
`1622`	`1644`	`{`
`1623`	`1645`	`get`