Update cpp sdk

FabianTerhorst · FabianTerhorst · commit 6ca454c16390 · 2019-08-04T15:37:09.000+02:00
diff --git a/api/AltV.Net.ColShape.Tests/MockVehicle.cs b/api/AltV.Net.ColShape.Tests/MockVehicle.cs
@@ -286,6 +286,10 @@ public void SetBumperDamageLevel(byte bumperId, byte damageLevel)
             throw new NotImplementedException();
         }
 
+        public byte Livery { get; set; }
+        public byte RoofLivery { get; set; }
+        public float LightsMultiplier { get; set; }
+
         public string DamageData { get; set; }
         public bool ManualEngineControl { get; set; }
         public string ScriptData { get; set; }
diff --git a/api/AltV.Net.Mock/MockServer.cs b/api/AltV.Net.Mock/MockServer.cs
@@ -25,6 +25,8 @@ public class MockServer : IServer
 
         private readonly IBaseObjectPool<IVoiceChannel> voiceChannelPool;
 
+        public int NetTime => 0;
+
         internal MockServer(IntPtr nativePointer, IBaseBaseObjectPool baseBaseObjectPool,
             IBaseEntityPool baseEntityPool, IEntityPool<IPlayer> playerPool,
             IEntityPool<IVehicle> vehiclePool,
diff --git a/api/AltV.Net.Mock/MockVehicle.cs b/api/AltV.Net.Mock/MockVehicle.cs
@@ -40,6 +40,10 @@ public MockVehicle(IntPtr nativePointer, ushort id): base(nativePointer, BaseObj
         public bool IsTireSmokeColorCustom { get; }
         public bool IsNeonActive { get; }
 
+        public byte Livery { get; set; }
+        public byte RoofLivery { get; set; }
+        public float LightsMultiplier { get; set; }
+
         public byte GetMod(byte category)
         {
             return 0;
diff --git a/api/AltV.Net/Elements/Entities/IVehicle.cs b/api/AltV.Net/Elements/Entities/IVehicle.cs
@@ -73,6 +73,10 @@ public interface IVehicle : IEntity
 
         Rgba NeonColor { get; set; }
         
+        byte Livery { get; set; }
+        
+        byte RoofLivery { get; set; }
+
         string AppearanceData { get; set; }
 
         byte GetMod(byte category);
@@ -120,6 +124,8 @@ public interface IVehicle : IEntity
         bool RoofOpened { get; set; }
 
         bool IsFlamethrowerActive { get; }
+        
+        float LightsMultiplier { get; set; }
 
         string State { get; set; }
 
diff --git a/api/AltV.Net/Elements/Entities/Vehicle.cs b/api/AltV.Net/Elements/Entities/Vehicle.cs
@@ -394,6 +394,34 @@ public Rgba NeonColor
             }
         }
 
+        public byte Livery
+        {
+            get
+            {
+                CheckIfEntityExists();
+                return AltNative.Vehicle.Vehicle_GetLivery(NativePointer);
+            }
+            set
+            {
+                CheckIfEntityExists();
+                AltNative.Vehicle.Vehicle_SetLivery(NativePointer, value);
+            }
+        }
+
+        public byte RoofLivery
+        {
+            get
+            {
+                CheckIfEntityExists();
+                return AltNative.Vehicle.Vehicle_GetRoofLivery(NativePointer);
+            }
+            set
+            {
+                CheckIfEntityExists();
+                AltNative.Vehicle.Vehicle_SetRoofLivery(NativePointer, value);
+            }
+        }
+
         public string AppearanceData
         {
             get
@@ -554,6 +582,20 @@ public bool IsFlamethrowerActive
             }
         }
 
+        public float LightsMultiplier
+        {
+            get
+            {
+                CheckIfEntityExists();
+                return AltNative.Vehicle.Vehicle_GetLightsMultiplier(NativePointer);
+            }
+            set
+            {
+                CheckIfEntityExists();
+                AltNative.Vehicle.Vehicle_SetLightsMultiplier(NativePointer, value);
+            }
+        }
+
         public string State
         {
             get
diff --git a/api/AltV.Net/IServer.cs b/api/AltV.Net/IServer.cs
@@ -7,6 +7,8 @@ namespace AltV.Net
 {
     public interface IServer
     {
+        int NetTime { get; }
+        
         void LogInfo(string message);
 
         /// <summary>
diff --git a/api/AltV.Net/Native/AltV.Server.cs b/api/AltV.Net/Native/AltV.Server.cs
@@ -94,6 +94,9 @@ internal static extern IntPtr Server_CreateColShapeRectangle(IntPtr serverPointe
 
             [DllImport(DllName, CallingConvention = NativeCallingConvention)]
             internal static extern void Server_DestroyColShape(IntPtr serverPointer, IntPtr baseObjectPointer);
+            
+            [DllImport(DllName, CallingConvention = NativeCallingConvention)]
+            internal static extern int Server_GetNetTime(IntPtr serverPointer);
         }
     }
 }
diff --git a/api/AltV.Net/Native/AltV.Vehicle.cs b/api/AltV.Net/Native/AltV.Vehicle.cs
@@ -203,6 +203,18 @@ internal static extern void Vehicle_SetNeonActive(IntPtr vehiclePointer, bool le
             [DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
             internal static extern void Vehicle_SetNeonColor(IntPtr vehiclePointer, Rgba color);
             
+            [DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
+            internal static extern byte Vehicle_GetLivery(IntPtr vehiclePointer);
+            
+            [DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
+            internal static extern void Vehicle_SetLivery(IntPtr vehiclePointer, byte livery);
+            
+            [DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
+            internal static extern byte Vehicle_GetRoofLivery(IntPtr vehiclePointer);
+            
+            [DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
+            internal static extern void Vehicle_SetRoofLivery(IntPtr vehiclePointer, byte roofLivery);
+
             [DllImport(DllName, CallingConvention = NativeCallingConvention)]
             internal static extern void Vehicle_GetAppearanceDataBase64(IntPtr vehiclePointer, ref IntPtr text);
             
@@ -268,6 +280,12 @@ internal static extern void Vehicle_SetNeonActive(IntPtr vehiclePointer, bool le
 
             [DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
             internal static extern bool Vehicle_IsFlamethrowerActive(IntPtr vehiclePointer);
+            
+            [DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
+            internal static extern float Vehicle_GetLightsMultiplier(IntPtr vehiclePointer);
+            
+            [DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
+            internal static extern void Vehicle_SetLightsMultiplier(IntPtr vehiclePointer, float multiplier);
 
             [DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
             internal static extern void Vehicle_GetGameStateBase64(IntPtr vehiclePointer, ref IntPtr text);
diff --git a/api/AltV.Net/Server.cs b/api/AltV.Net/Server.cs
@@ -28,6 +28,8 @@ public class Server : IServer
 
         private readonly IBaseObjectPool<IColShape> colShapePool;
 
+        public int NetTime => AltNative.Server.Server_GetNetTime(NativePointer);
+
         public Server(IntPtr nativePointer, IBaseBaseObjectPool baseBaseObjectPool, IBaseEntityPool baseEntityPool,
             IEntityPool<IPlayer> playerPool,
             IEntityPool<IVehicle> vehiclePool,
diff --git a/runtime/src/altv-c-api/server.cpp b/runtime/src/altv-c-api/server.cpp
@@ -120,4 +120,8 @@ void Server_DestroyVoiceChannel(alt::IServer* server, alt::IVoiceChannel* baseOb
 
 void Server_DestroyColShape(alt::IServer* server, alt::IColShape* baseObject) {
     return server->DestroyBaseObject(baseObject);
-}
+}
+
+int32_t Server_GetNetTime(alt::IServer* server) {
+    return server->GetNetTime();
+}
diff --git a/runtime/src/altv-c-api/server.h b/runtime/src/altv-c-api/server.h
@@ -51,6 +51,7 @@ EXPORT void Server_DestroyBlip(alt::IServer* server, alt::IBlip* baseObject);
 EXPORT void Server_DestroyCheckpoint(alt::IServer* server, alt::ICheckpoint* baseObject);
 EXPORT void Server_DestroyVoiceChannel(alt::IServer* server, alt::IVoiceChannel* baseObject);
 EXPORT void Server_DestroyColShape(alt::IServer* server, alt::IColShape* baseObject);
+EXPORT int32_t Server_GetNetTime(alt::IServer* server);
 #ifdef __cplusplus
 }
 #endif
diff --git a/runtime/src/altv-c-api/vehicle.cpp b/runtime/src/altv-c-api/vehicle.cpp
@@ -274,6 +274,22 @@ void Vehicle_SetNeonColor(alt::IVehicle* vehicle, alt::RGBA color) {
     return vehicle->SetNeonColor(color);
 }
 
+uint8_t Vehicle_GetLivery(alt::IVehicle* vehicle) {
+    return vehicle->GetLivery();
+}
+
+void Vehicle_SetLivery(alt::IVehicle* vehicle, uint8_t livery) {
+    vehicle->SetLivery(livery);
+}
+
+uint8_t Vehicle_GetRoofLivery(alt::IVehicle* vehicle) {
+    return vehicle->GetRoofLivery();
+}
+
+void Vehicle_SetRoofLivery(alt::IVehicle* vehicle, uint8_t roofLivery) {
+    vehicle->SetRoofLivery(roofLivery);
+}
+
 void Vehicle_GetAppearanceDataBase64(alt::IVehicle* vehicle, const char*&base64) {
     base64 = vehicle->GetAppearanceDataBase64().CStr();
 }
@@ -362,6 +378,14 @@ bool Vehicle_IsFlamethrowerActive(alt::IVehicle* vehicle) {
     return vehicle->IsFlamethrowerActive();
 }
 
+float Vehicle_GetLightsMultiplier(alt::IVehicle* vehicle) {
+    return vehicle->GetLightsMultiplier();
+}
+
+void Vehicle_SetLightsMultiplier(alt::IVehicle* vehicle, float multiplier) {
+    vehicle->SetLightsMultiplier(multiplier);
+}
+
 void Vehicle_GetGameStateBase64(alt::IVehicle* vehicle, const char*&text) {
     text = vehicle->GetGameStateBase64().CStr();
 }
diff --git a/runtime/src/altv-c-api/vehicle.h b/runtime/src/altv-c-api/vehicle.h
@@ -84,6 +84,11 @@ EXPORT void Vehicle_SetNeonActive(alt::IVehicle* vehicle, bool left, bool right,
 EXPORT void Vehicle_GetNeonColor(alt::IVehicle* vehicle, rgba_t &neonColor);
 EXPORT void Vehicle_SetNeonColor(alt::IVehicle* vehicle, alt::RGBA color);
 
+EXPORT uint8_t Vehicle_GetLivery(alt::IVehicle* vehicle);
+EXPORT void Vehicle_SetLivery(alt::IVehicle* vehicle, uint8_t livery);
+EXPORT uint8_t Vehicle_GetRoofLivery(alt::IVehicle* vehicle);
+EXPORT void Vehicle_SetRoofLivery(alt::IVehicle* vehicle, uint8_t roofLivery);
+
 EXPORT void Vehicle_GetAppearanceDataBase64(alt::IVehicle* vehicle, const char*&base64);
 EXPORT void Vehicle_LoadAppearanceDataFromBase64(alt::IVehicle* vehicle, const char* base64);
 
@@ -120,6 +125,9 @@ EXPORT void Vehicle_SetRoofOpened(alt::IVehicle* vehicle, bool state);
 
 EXPORT bool Vehicle_IsFlamethrowerActive(alt::IVehicle* vehicle);
 
+EXPORT float Vehicle_GetLightsMultiplier(alt::IVehicle* vehicle);
+EXPORT void Vehicle_SetLightsMultiplier(alt::IVehicle* vehicle, float multiplier);
+
 EXPORT void Vehicle_GetGameStateBase64(alt::IVehicle* vehicle, const char*&text);
 EXPORT void Vehicle_LoadGameStateFromBase64(alt::IVehicle* vehicle, const char* base64);
 
diff --git a/runtime/thirdparty/altv-cpp-api b/runtime/thirdparty/altv-cpp-api
@@ -1 +1 @@
-Subproject commit 8cd94042bf1249bb8e40680562f82b0ce21b951c
+Subproject commit 5778e0b866b558c22795ed9c3b893bb70a2ee6f1

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ namespace AltV.Net`
`7`	`7`	`{`
`8`	`8`	`public interface IServer`
`9`	`9`	`{`
	`10`	`+ int NetTime { get; }`
	`11`	`+`
`10`	`12`	`void LogInfo(string message);`
`11`	`13`
`12`	`14`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,9 @@ internal static extern IntPtr Server_CreateColShapeRectangle(IntPtr serverPointe`
`94`	`94`
`95`	`95`	`[DllImport(DllName, CallingConvention = NativeCallingConvention)]`
`96`	`96`	`internal static extern void Server_DestroyColShape(IntPtr serverPointer, IntPtr baseObjectPointer);`
	`97`	`+`
	`98`	`+ [DllImport(DllName, CallingConvention = NativeCallingConvention)]`
	`99`	`+ internal static extern int Server_GetNetTime(IntPtr serverPointer);`
`97`	`100`	`}`
`98`	`101`	`}`
`99`	`102`	`}`