Skip to content

Commit b8958a9

Browse files
DoxohDoxoh
committed
add connectioninfo Get/Set Text
1 parent 52c9885 commit b8958a9

File tree

8 files changed

+62
-7
lines changed

8 files changed

+62
-7
lines changed

‎api/AltV.Net.Async/Elements/Entities/AsyncConnectionInfo.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,26 @@ public string CloudAuthHash
172172
}
173173
}
174174

175+
public string Text
176+
{
177+
get
178+
{
179+
lock (ConnectionInfo)
180+
{
181+
if (!AsyncContext.CheckIfExistsOrCachedNullable(ConnectionInfo)) return default;
182+
return ConnectionInfo.Text;
183+
}
184+
}
185+
set
186+
{
187+
lock (ConnectionInfo)
188+
{
189+
if (!AsyncContext.CheckIfExistsOrCachedNullable(ConnectionInfo)) return;
190+
ConnectionInfo.Text = value;
191+
}
192+
}
193+
}
194+
175195
public bool IsAccepted
176196
{
177197
get

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ public unsafe interface IClientLibrary
875875

876876
public unsafe class ClientLibrary : IClientLibrary
877877
{
878-
public readonly uint Methods = 1647;
878+
public readonly uint Methods = 1649;
879879
public delegate* unmanaged[Cdecl]<nint, nint, void> Audio_AddOutput { get; }
880880
public delegate* unmanaged[Cdecl]<nint, nint> Audio_GetBaseObject { get; }
881881
public delegate* unmanaged[Cdecl]<nint, double> Audio_GetCurrentTime { get; }
@@ -3468,7 +3468,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
34683468
public ClientLibrary(Dictionary<ulong, IntPtr> funcTable)
34693469
{
34703470
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
3471-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 2468460721273675373UL) Outdated = true;
3471+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 14445254643518506927UL) Outdated = true;
34723472
Audio_AddOutput = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Audio_AddOutputDelegate>(funcTable, 9914412815391408844UL, Audio_AddOutputFallback);
34733473
Audio_GetBaseObject = (delegate* unmanaged[Cdecl]<nint, nint>) GetUnmanagedPtr<Audio_GetBaseObjectDelegate>(funcTable, 6330360502401226894UL, Audio_GetBaseObjectFallback);
34743474
Audio_GetCurrentTime = (delegate* unmanaged[Cdecl]<nint, double>) GetUnmanagedPtr<Audio_GetCurrentTimeDelegate>(funcTable, 2944324482134975819UL, Audio_GetCurrentTimeFallback);

‎api/AltV.Net.CApi/Libraries/ServerLibrary.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ public unsafe interface IServerLibrary
3737
public delegate* unmanaged[Cdecl]<IntPtr, ulong> ConnectionInfo_GetPasswordHash { get; }
3838
public delegate* unmanaged[Cdecl]<IntPtr, ulong> ConnectionInfo_GetSocialId { get; }
3939
public delegate* unmanaged[Cdecl]<IntPtr, int*, nint> ConnectionInfo_GetSocialName { get; }
40+
public delegate* unmanaged[Cdecl]<IntPtr, int*, nint> ConnectionInfo_GetText { get; }
4041
public delegate* unmanaged[Cdecl]<IntPtr, byte> ConnectionInfo_IsAccepted { get; }
42+
public delegate* unmanaged[Cdecl]<IntPtr, nint, void> ConnectionInfo_SetText { get; }
4143
public delegate* unmanaged[Cdecl]<nint, byte, byte, Vector3, nint[], int, uint*, nint> Core_CreateBlip { get; }
4244
public delegate* unmanaged[Cdecl]<nint, byte, byte, nint, nint[], int, uint*, nint> Core_CreateBlipAttached { get; }
4345
public delegate* unmanaged[Cdecl]<nint, byte, Vector3, float, float, Rgba, uint, uint*, nint> Core_CreateCheckpoint { get; }
@@ -438,7 +440,7 @@ public unsafe interface IServerLibrary
438440

439441
public unsafe class ServerLibrary : IServerLibrary
440442
{
441-
public readonly uint Methods = 1647;
443+
public readonly uint Methods = 1649;
442444
public delegate* unmanaged[Cdecl]<nint, nint, void> BaseObject_DeleteSyncedMetaData { get; }
443445
public delegate* unmanaged[Cdecl]<nint, nint, nint, void> BaseObject_SetSyncedMetaData { get; }
444446
public delegate* unmanaged[Cdecl]<nint, nint, void> Blip_AddTargetPlayer { get; }
@@ -466,7 +468,9 @@ public unsafe class ServerLibrary : IServerLibrary
466468
public delegate* unmanaged[Cdecl]<IntPtr, ulong> ConnectionInfo_GetPasswordHash { get; }
467469
public delegate* unmanaged[Cdecl]<IntPtr, ulong> ConnectionInfo_GetSocialId { get; }
468470
public delegate* unmanaged[Cdecl]<IntPtr, int*, nint> ConnectionInfo_GetSocialName { get; }
471+
public delegate* unmanaged[Cdecl]<IntPtr, int*, nint> ConnectionInfo_GetText { get; }
469472
public delegate* unmanaged[Cdecl]<IntPtr, byte> ConnectionInfo_IsAccepted { get; }
473+
public delegate* unmanaged[Cdecl]<IntPtr, nint, void> ConnectionInfo_SetText { get; }
470474
public delegate* unmanaged[Cdecl]<nint, byte, byte, Vector3, nint[], int, uint*, nint> Core_CreateBlip { get; }
471475
public delegate* unmanaged[Cdecl]<nint, byte, byte, nint, nint[], int, uint*, nint> Core_CreateBlipAttached { get; }
472476
public delegate* unmanaged[Cdecl]<nint, byte, Vector3, float, float, Rgba, uint, uint*, nint> Core_CreateCheckpoint { get; }
@@ -917,8 +921,12 @@ public unsafe class ServerLibrary : IServerLibrary
917921
private static ulong ConnectionInfo_GetSocialIdFallback(IntPtr _connectionInfo) => throw new Exceptions.OutdatedSdkException("ConnectionInfo_GetSocialId", "ConnectionInfo_GetSocialId SDK method is outdated. Please update your module nuget");
918922
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate nint ConnectionInfo_GetSocialNameDelegate(IntPtr _connectionInfo, int* _size);
919923
private static nint ConnectionInfo_GetSocialNameFallback(IntPtr _connectionInfo, int* _size) => throw new Exceptions.OutdatedSdkException("ConnectionInfo_GetSocialName", "ConnectionInfo_GetSocialName SDK method is outdated. Please update your module nuget");
924+
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate nint ConnectionInfo_GetTextDelegate(IntPtr _connectionInfo, int* _size);
925+
private static nint ConnectionInfo_GetTextFallback(IntPtr _connectionInfo, int* _size) => throw new Exceptions.OutdatedSdkException("ConnectionInfo_GetText", "ConnectionInfo_GetText SDK method is outdated. Please update your module nuget");
920926
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate byte ConnectionInfo_IsAcceptedDelegate(IntPtr _connectionInfo);
921927
private static byte ConnectionInfo_IsAcceptedFallback(IntPtr _connectionInfo) => throw new Exceptions.OutdatedSdkException("ConnectionInfo_IsAccepted", "ConnectionInfo_IsAccepted SDK method is outdated. Please update your module nuget");
928+
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void ConnectionInfo_SetTextDelegate(IntPtr _connectionInfo, nint _text);
929+
private static void ConnectionInfo_SetTextFallback(IntPtr _connectionInfo, nint _text) => throw new Exceptions.OutdatedSdkException("ConnectionInfo_SetText", "ConnectionInfo_SetText SDK method is outdated. Please update your module nuget");
922930
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate nint Core_CreateBlipDelegate(nint _server, byte _global, byte _type, Vector3 _pos, nint[] targets, int _targetsSize, uint* _id);
923931
private static nint Core_CreateBlipFallback(nint _server, byte _global, byte _type, Vector3 _pos, nint[] targets, int _targetsSize, uint* _id) => throw new Exceptions.OutdatedSdkException("Core_CreateBlip", "Core_CreateBlip SDK method is outdated. Please update your module nuget");
924932
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate nint Core_CreateBlipAttachedDelegate(nint _server, byte _global, byte _type, nint _attachTo, nint[] targets, int _targetsSize, uint* _id);
@@ -1720,7 +1728,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
17201728
public ServerLibrary(Dictionary<ulong, IntPtr> funcTable)
17211729
{
17221730
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
1723-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 2468460721273675373UL) Outdated = true;
1731+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 14445254643518506927UL) Outdated = true;
17241732
BaseObject_DeleteSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<BaseObject_DeleteSyncedMetaDataDelegate>(funcTable, 8228424877092269355UL, BaseObject_DeleteSyncedMetaDataFallback);
17251733
BaseObject_SetSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, nint, void>) GetUnmanagedPtr<BaseObject_SetSyncedMetaDataDelegate>(funcTable, 8002999088966424231UL, BaseObject_SetSyncedMetaDataFallback);
17261734
Blip_AddTargetPlayer = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Blip_AddTargetPlayerDelegate>(funcTable, 12411235729553386187UL, Blip_AddTargetPlayerFallback);
@@ -1748,7 +1756,9 @@ public ServerLibrary(Dictionary<ulong, IntPtr> funcTable)
17481756
ConnectionInfo_GetPasswordHash = (delegate* unmanaged[Cdecl]<IntPtr, ulong>) GetUnmanagedPtr<ConnectionInfo_GetPasswordHashDelegate>(funcTable, 18130628108130086100UL, ConnectionInfo_GetPasswordHashFallback);
17491757
ConnectionInfo_GetSocialId = (delegate* unmanaged[Cdecl]<IntPtr, ulong>) GetUnmanagedPtr<ConnectionInfo_GetSocialIdDelegate>(funcTable, 10464338232675126241UL, ConnectionInfo_GetSocialIdFallback);
17501758
ConnectionInfo_GetSocialName = (delegate* unmanaged[Cdecl]<IntPtr, int*, nint>) GetUnmanagedPtr<ConnectionInfo_GetSocialNameDelegate>(funcTable, 12079559810042444284UL, ConnectionInfo_GetSocialNameFallback);
1759+
ConnectionInfo_GetText = (delegate* unmanaged[Cdecl]<IntPtr, int*, nint>) GetUnmanagedPtr<ConnectionInfo_GetTextDelegate>(funcTable, 15232547943166326905UL, ConnectionInfo_GetTextFallback);
17511760
ConnectionInfo_IsAccepted = (delegate* unmanaged[Cdecl]<IntPtr, byte>) GetUnmanagedPtr<ConnectionInfo_IsAcceptedDelegate>(funcTable, 8806505177995284480UL, ConnectionInfo_IsAcceptedFallback);
1761+
ConnectionInfo_SetText = (delegate* unmanaged[Cdecl]<IntPtr, nint, void>) GetUnmanagedPtr<ConnectionInfo_SetTextDelegate>(funcTable, 13680172646316204766UL, ConnectionInfo_SetTextFallback);
17521762
Core_CreateBlip = (delegate* unmanaged[Cdecl]<nint, byte, byte, Vector3, nint[], int, uint*, nint>) GetUnmanagedPtr<Core_CreateBlipDelegate>(funcTable, 16420035482870248864UL, Core_CreateBlipFallback);
17531763
Core_CreateBlipAttached = (delegate* unmanaged[Cdecl]<nint, byte, byte, nint, nint[], int, uint*, nint>) GetUnmanagedPtr<Core_CreateBlipAttachedDelegate>(funcTable, 6946126881626778655UL, Core_CreateBlipAttachedFallback);
17541764
Core_CreateCheckpoint = (delegate* unmanaged[Cdecl]<nint, byte, Vector3, float, float, Rgba, uint, uint*, nint>) GetUnmanagedPtr<Core_CreateCheckpointDelegate>(funcTable, 3410920088129362997UL, Core_CreateCheckpointFallback);

‎api/AltV.Net.CApi/Libraries/SharedLibrary.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ public unsafe interface ISharedLibrary
374374

375375
public unsafe class SharedLibrary : ISharedLibrary
376376
{
377-
public readonly uint Methods = 1647;
377+
public readonly uint Methods = 1649;
378378
public delegate* unmanaged[Cdecl]<nint, uint> Audio_GetID { get; }
379379
public delegate* unmanaged[Cdecl]<nint, uint> AudioAttachedOutput_GetID { get; }
380380
public delegate* unmanaged[Cdecl]<nint, uint> AudioFilter_GetID { get; }
@@ -1464,7 +1464,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
14641464
public SharedLibrary(Dictionary<ulong, IntPtr> funcTable)
14651465
{
14661466
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
1467-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 2468460721273675373UL) Outdated = true;
1467+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 14445254643518506927UL) Outdated = true;
14681468
Audio_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<Audio_GetIDDelegate>(funcTable, 4464042055475980737UL, Audio_GetIDFallback);
14691469
AudioAttachedOutput_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioAttachedOutput_GetIDDelegate>(funcTable, 17725794901805112189UL, AudioAttachedOutput_GetIDFallback);
14701470
AudioFilter_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioFilter_GetIDDelegate>(funcTable, 8824535635529306325UL, AudioFilter_GetIDFallback);

‎api/AltV.Net.Mock/MockConnectionInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public MockConnectionInfo(ICore core, IntPtr nativePointer, uint id) : base(core
2727
public long DiscordUserId { get; }
2828
public string SocialName { get; }
2929
public string CloudAuthHash { get; }
30+
public string Text { get; set; }
3031
public bool IsAccepted { get; }
3132

3233
public void Accept(bool sendNames = true)

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,29 @@ public string CloudAuthHash
200200
}
201201
}
202202

203+
public string Text
204+
{
205+
get
206+
{
207+
unsafe
208+
{
209+
var size = 0;
210+
return Core.PtrToStringUtf8AndFree(
211+
Core.Library.Server.ConnectionInfo_GetText(ConnectionInfoNativePointer, &size), size);
212+
}
213+
}
214+
set
215+
{
216+
unsafe
217+
{
218+
CheckIfEntityExists();
219+
var stringPtr = AltNative.StringUtils.StringToHGlobalUtf8(value);
220+
Core.Library.Server.ConnectionInfo_SetText(ConnectionInfoNativePointer, stringPtr);
221+
Marshal.FreeHGlobal(stringPtr);
222+
}
223+
}
224+
}
225+
203226
public bool IsAccepted
204227
{
205228
get

‎api/AltV.Net/Elements/Entities/IConnectionInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public interface IConnectionInfo : IBaseObject
2121
string SocialName { get; }
2222

2323
string CloudAuthHash { get; }
24+
string Text { get; set; }
2425

2526
bool IsAccepted { get; }
2627

‎runtime‎

0 commit comments

Comments
 (0)