Skip to content

Commit 20d3437

Browse files
update cpp sdk
1 parent 8a77b49 commit 20d3437

File tree

10 files changed

+123
-14
lines changed

10 files changed

+123
-14
lines changed

api/AltV.Net.ColShape.Tests/MockPlayer.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ public void GetSyncedMetaData(string key, ref MValue value)
128128
public IVehicle Vehicle { get; }
129129
public byte Seat { get; }
130130
public uint Ping { get; }
131+
public ulong SocialClubId { get; }
132+
public ulong HardwareIdHash { get; }
133+
public ulong HardwareIdExHash { get; }
134+
public string AuthToken { get; }
135+
131136
public void Spawn(Position position, uint delayMs = 0)
132137
{
133138
throw new NotImplementedException();

api/AltV.Net.Mock/MockPlayer.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ public MockPlayer(IntPtr nativePointer, ushort id) : base(nativePointer, BaseObj
3636
public Position EntityAimOffset { get; }
3737
public bool IsFlashlightActive { get; }
3838
public string Ip { get; }
39+
public ulong SocialClubId { get; }
40+
public ulong HardwareIdHash { get; }
41+
public ulong HardwareIdExHash { get; }
42+
public string AuthToken { get; }
43+
3944
public void AddWeaponComponent(uint weapon, uint weaponComponent)
4045
{
4146
throw new NotImplementedException();

api/AltV.Net.Networking.Example/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ private static void Main(string[] args)
2020
var data2 = new Dictionary<string, object>();
2121
data["bla"] = "123";
2222
data["bla2"] = 1235;
23-
var entityToUpdate = AltNetworking.CreateEntity(new Position {X = 0, Y = 0, Z = 0}, 1, 50, data);
24-
AltNetworking.CreateEntity(new Position {X = 1, Y = 1, Z = 1}, 1, 50, data2);
23+
var entityToUpdate = AltNetworking.CreateEntity(new Position {X = 0, Y = 0, Z = 0}, 1, 50, data, StreamingType.DataStreaming);
24+
AltNetworking.CreateEntity(new Position {X = 1, Y = 1, Z = 1}, 1, 50, data2, StreamingType.DataStreaming);
2525
AltNetworking.OnEntityStreamIn = (entity, client) =>
2626
{
2727
Console.WriteLine("streamed in " + entity.Id + " in client " + client.Token);

api/AltV.Net/Data/ReadOnlyPlayer.cs

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,29 @@ public struct ReadOnlyPlayer : IPlayer, IDisposable
3939
public bool Exists => false;
4040
public BaseObjectType Type => BaseObjectType.Player;
4141

42-
public ushort MaxHealth { get; set; }
43-
public ushort MaxArmor { get; set; }
44-
public uint CurrentWeapon { get; set; }
45-
public IntPtr entityAimingAt;
46-
public byte entityAimingAtEntityType;
47-
public Position EntityAimOffset { get; }
48-
public bool IsFlashlightActive { get; }
49-
public string Ip { get; }
42+
//TODO: implement in struct
43+
public ushort MaxHealth
44+
{
45+
get => 0;
46+
set { }
47+
}
48+
49+
public ushort MaxArmor
50+
{
51+
get => 0;
52+
set { }
53+
}
54+
55+
public uint CurrentWeapon
56+
{
57+
get => 0;
58+
set { }
59+
}
60+
public IntPtr entityAimingAt => IntPtr.Zero;
61+
public byte entityAimingAtEntityType => 0;
62+
public Position EntityAimOffset => new Position();
63+
public bool IsFlashlightActive => false;
64+
public string Ip => "0.0.0.0";
5065

5166
public IEntity EntityAimingAt
5267
{
@@ -58,6 +73,11 @@ public IEntity EntityAimingAt
5873
}
5974
}
6075

76+
public ulong SocialClubId { get; }
77+
public ulong HardwareIdHash { get; }
78+
public ulong HardwareIdExHash { get; }
79+
public string AuthToken { get; }
80+
6181
public void SetMetaData(string key, object value)
6282
{
6383
throw new NotImplementedException();

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ public interface IPlayer : IEntity
99

1010
bool IsConnected { get; }
1111

12-
string Name { get; set; }
12+
string Name { get; }
13+
14+
ulong SocialClubId { get; }
15+
16+
ulong HardwareIdHash { get; }
17+
18+
ulong HardwareIdExHash { get; }
19+
20+
string AuthToken { get; }
1321

1422
ushort Health { get; set; }
1523

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

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,50 @@ public string Name
120120
AltNative.Player.Player_GetName(NativePointer, ref ptr);
121121
return Marshal.PtrToStringUTF8(ptr);
122122
}
123-
set
123+
/*set
124124
{
125125
CheckIfEntityExists();
126126
var stringPtr = AltNative.StringUtils.StringToHGlobalUtf8(value);
127127
AltNative.Player.Player_SetName(NativePointer, stringPtr);
128128
Marshal.FreeHGlobal(stringPtr);
129+
}*/
130+
}
131+
132+
public ulong SocialClubId
133+
{
134+
get
135+
{
136+
CheckIfEntityExists();
137+
return AltNative.Player.Player_GetSocialID(NativePointer);
138+
}
139+
}
140+
141+
public ulong HardwareIdHash
142+
{
143+
get
144+
{
145+
CheckIfEntityExists();
146+
return AltNative.Player.Player_GetHwidHash(NativePointer);
147+
}
148+
}
149+
150+
public ulong HardwareIdExHash
151+
{
152+
get
153+
{
154+
CheckIfEntityExists();
155+
return AltNative.Player.Player_GetHwidExHash(NativePointer);
156+
}
157+
}
158+
159+
public string AuthToken
160+
{
161+
get
162+
{
163+
CheckIfEntityExists();
164+
var ptr = IntPtr.Zero;
165+
AltNative.Player.Player_GetName(NativePointer, ref ptr);
166+
return Marshal.PtrToStringUTF8(ptr);
129167
}
130168
}
131169

api/AltV.Net/Native/AltV.Player.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,18 @@ internal static extern void
7070
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
7171
internal static extern void Player_SetName(IntPtr playerPointer, IntPtr name);
7272

73+
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
74+
internal static extern ulong Player_GetSocialID(IntPtr playerPointer);
75+
76+
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
77+
internal static extern ulong Player_GetHwidHash(IntPtr playerPointer);
78+
79+
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
80+
internal static extern ulong Player_GetHwidExHash(IntPtr playerPointer);
81+
82+
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
83+
internal static extern void Player_GetAuthToken(IntPtr playerPointer, IntPtr name);
84+
7385
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
7486
internal static extern ushort Player_GetHealth(IntPtr playerPointer);
7587

runtime/src/altv-c-api/player.cpp

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,23 @@ void Player_GetName(alt::IPlayer* player, const char*&name) {
7979
}
8080

8181
void Player_SetName(alt::IPlayer* player, const char* name) {
82-
player->SetName(name);
82+
//player->SetName(name);
83+
}
84+
85+
uint64_t Player_GetSocialID(alt::IPlayer* player) {
86+
return player->GetSocialID();
87+
}
88+
89+
uint64_t Player_GetHwidHash(alt::IPlayer* player) {
90+
return player->GetHwidHash();
91+
}
92+
93+
uint64_t Player_GetHwidExHash(alt::IPlayer* player) {
94+
return player->GetHwidExHash();
95+
}
96+
97+
void Player_GetAuthToken(alt::IPlayer* player, const char*&name) {
98+
name = player->GetAuthToken().CStr();
8399
}
84100

85101
uint16_t Player_GetHealth(alt::IPlayer* player) {

runtime/src/altv-c-api/player.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ EXPORT void Player_Despawn(alt::IPlayer* player);
6565
EXPORT void Player_GetName(alt::IPlayer* player, const char*&name);
6666
EXPORT void Player_SetName(alt::IPlayer* player, const char* name);
6767

68+
EXPORT uint64_t Player_GetSocialID(alt::IPlayer* player);
69+
EXPORT uint64_t Player_GetHwidHash(alt::IPlayer* player);
70+
EXPORT uint64_t Player_GetHwidExHash(alt::IPlayer* player);
71+
EXPORT void Player_GetAuthToken(alt::IPlayer* player, const char*& name);
72+
6873
EXPORT uint16_t Player_GetHealth(alt::IPlayer* player);
6974
EXPORT void Player_SetHealth(alt::IPlayer* player, uint16_t health);
7075

runtime/thirdparty/altv-cpp-api

0 commit comments

Comments
 (0)