Merge branch 'dev' into rc

altmp · Sep 8, 2024 · 70441cb · 70441cb
2 parents c944968 + e275d6b
commit 70441cb
Show file tree

Hide file tree

Showing 174 changed files with 1,721 additions and 4,442 deletions.
diff --git a/api/AltV.Net.Async/AltAsync.BaseObject.cs b/api/AltV.Net.Async/AltAsync.BaseObject.cs
@@ -19,7 +19,7 @@ public static Task<BaseObjectType> GetTypeAsync(this IBaseObject baseObject) =>
         [Obsolete("Use async entities instead")]
         public static async Task SetMetaDataAsync(this IBaseObject baseObject, string key, object value)
         {
-            Alt.Core.CreateMValue(out var mValue, value);
+            Alt.CoreImpl.CreateMValue(out var mValue, value);
             await AltVAsync.Schedule(() => baseObject.SetMetaData(key, in mValue));
             mValue.Dispose();
         }

diff --git a/api/AltV.Net.Async/AltAsync.Entity.cs b/api/AltV.Net.Async/AltAsync.Entity.cs
@@ -24,7 +24,7 @@ public static Task<Rotation> GetRotationAsync(this IEntity entity) =>
         [Obsolete("Use async entities instead")]
         public static async Task SetSyncedMetaDataAsync(this IEntity entity, string key, object value)
         {
-            Alt.Core.CreateMValue(out var mValue, value);
+            Alt.CoreImpl.CreateMValue(out var mValue, value);
             await AltVAsync.Schedule(() => entity.SetSyncedMetaData(key, mValue));
             mValue.Dispose();
         }
@@ -40,7 +40,7 @@ public static Task<T> GetSyncedMetaDataAsync<T>(this IEntity entity, string key)
         [Obsolete("Use async entities instead")]
         public static async Task SetStreamSyncedMetaDataAsync(this IEntity entity, string key, object value)
         {
-            Alt.Core.CreateMValue(out var mValue, value);
+            Alt.CoreImpl.CreateMValue(out var mValue, value);
             await AltVAsync.Schedule(() => entity.SetStreamSyncedMetaData(key, mValue));
             mValue.Dispose();
         }
@@ -56,7 +56,7 @@ public static Task<T> GetStreamSyncedMetaDataAsync<T>(this IEntity entity, strin
         [Obsolete("Use async entities instead")]
         public static Task DeleteSyncedMetaDataAsync(this IEntity entity, string key) =>
             AltVAsync.Schedule(() => entity.DeleteSyncedMetaData(key));
-        
+
         [Obsolete("Use async entities instead")]
         public static Task DeleteStreamSyncedMetaDataAsync(this IEntity entity, string key) =>
             AltVAsync.Schedule(() => entity.DeleteStreamSyncedMetaData(key));

diff --git a/api/AltV.Net.Async/AltAsync.Off.cs b/api/AltV.Net.Async/AltAsync.Off.cs
@@ -3,9 +3,9 @@ namespace AltV.Net.Async
     public partial class AltAsync
     {
         public static void OffServer(string eventName, Function function) =>
-            Core.OffServer(eventName, function);
+            CoreImpl.OffServer(eventName, function);
 
         public static void OffClient(string eventName, Function function) =>
-            Core.OffClient(eventName, function);
+            CoreImpl.OffClient(eventName, function);
     }
 }
diff --git a/api/AltV.Net.Async/AltAsync.On.cs b/api/AltV.Net.Async/AltAsync.On.cs
diff --git a/api/AltV.Net.Async/AltAsync.Ped.cs b/api/AltV.Net.Async/AltAsync.Ped.cs
@@ -8,7 +8,7 @@ namespace AltV.Net.Async
     public static partial class AltAsync
     {
         public static Task<IPed> CreatePed(uint model, Position pos, Rotation rot, uint streamingDistance = 0) => AltVAsync.Schedule(() =>
-            Alt.Core.CreatePed(model, pos, rot, streamingDistance));
+            Alt.CoreImpl.CreatePed(model, pos, rot, streamingDistance));
 
         public static Task<IPed> CreatePed(PedModel model, Position pos, Rotation rot, uint streamingDistance = 0) =>
             CreatePed((uint)model, pos, rot, streamingDistance);

diff --git a/api/AltV.Net.Async/AltAsync.Player.cs b/api/AltV.Net.Async/AltAsync.Player.cs
@@ -88,8 +88,8 @@ public static async Task<IVehicle> GetVehicleAsync(this IPlayer player)
                     unsafe
                     {
                         player.CheckIfEntityExists();
-                        var vehiclePtr = Alt.Core.Library.Shared.Player_GetVehicle(player.PlayerNativePointer);
-                        return Alt.Core.PoolManager.Vehicle.Get(vehiclePtr);
+                        var vehiclePtr = Alt.CoreImpl.Library.Shared.Player_GetVehicle(player.PlayerNativePointer);
+                        return Alt.CoreImpl.PoolManager.Vehicle.Get(vehiclePtr);
                     }
                 });
         }
@@ -156,7 +156,7 @@ await AltVAsync.Schedule(() =>
                 unsafe
                 {
                     player.CheckIfEntityExists();
-                    Alt.Core.Library.Server.Player_Kick(player.PlayerNativePointer, reasonPtr);
+                    Alt.CoreImpl.Library.Server.Player_Kick(player.PlayerNativePointer, reasonPtr);
                 }
             });
             Marshal.FreeHGlobal(reasonPtr);
@@ -167,12 +167,12 @@ public static async Task EmitAsync(this IPlayer player, string eventName, params
         {
             var size = args.Length;
             var mValues = new MValueConst[size];
-            Alt.Core.CreateMValues(mValues, args);
+            Alt.CoreImpl.CreateMValues(mValues, args);
             var eventNamePtr = MemoryUtils.StringToHGlobalUtf8(eventName);
             await AltVAsync.Schedule(() =>
             {
                 player.CheckIfEntityExists();
-                Alt.Core.TriggerClientEvent(player, eventNamePtr, mValues);
+                Alt.CoreImpl.TriggerClientEvent(player, eventNamePtr, mValues);
             });
             Marshal.FreeHGlobal(eventNamePtr);
             for (var i = 0; i < size; i++)

diff --git a/api/AltV.Net.Async/AltAsync.RegisterEvents.cs b/api/AltV.Net.Async/AltAsync.RegisterEvents.cs
@@ -727,11 +727,11 @@ public static void RegisterEvents(object target)
                             break;
                         case AsyncServerEventAttribute @event:
                             var serverEventName = @event.Name ?? eventMethod.Name;
-                            Core.OnServer(serverEventName, Function.Create(Core, eventMethodDelegate));
+                            CoreImpl.OnServer(serverEventName, Function.Create(CoreImpl, eventMethodDelegate));
                             break;
                         case AsyncClientEventAttribute @event:
                             var clientEventName = @event.Name ?? eventMethod.Name;
-                            Core.OnClient(clientEventName, Function.Create(Core, eventMethodDelegate));
+                            CoreImpl.OnClient(clientEventName, Function.Create(CoreImpl, eventMethodDelegate));
                             break;
                     }
                 });

diff --git a/api/AltV.Net.Async/AltAsync.Vehicle.cs b/api/AltV.Net.Async/AltAsync.Vehicle.cs
@@ -14,7 +14,7 @@ namespace AltV.Net.Async
     public static partial class AltAsync
     {
         public static Task<IVehicle> CreateVehicle(uint model, Position pos, Rotation rot, uint streamingDistance = 0) => AltVAsync.Schedule(() =>
-            Alt.Core.CreateVehicle(model, pos, rot, streamingDistance));
+            Alt.CreateVehicle(model, pos, rot, streamingDistance));
 
         public static Task<IVehicle> CreateVehicle(VehicleModel model, Position pos, Rotation rot, uint streamingDistance = 0) =>
             CreateVehicle((uint) model, pos, rot, streamingDistance);
@@ -163,7 +163,7 @@ await AltVAsync.Schedule(() =>
                 unsafe
                 {
                     vehicle.CheckIfEntityExists();
-                    Alt.Core.Library.Server.Vehicle_SetNumberplateText(vehicle.VehicleNativePointer, numberPlateTextPtr);
+                    Alt.CoreImpl.Library.Server.Vehicle_SetNumberplateText(vehicle.VehicleNativePointer, numberPlateTextPtr);
                 }
             });
             Marshal.FreeHGlobal(numberPlateTextPtr);

diff --git a/api/AltV.Net.Async/AltAsync.VirtualEntity.cs b/api/AltV.Net.Async/AltAsync.VirtualEntity.cs
@@ -8,7 +8,7 @@ namespace AltV.Net.Async;
 public partial class AltAsync
 {
     public static Task<IVirtualEntityGroup> CreateVirtualEntityGroup(uint streamingDistance) =>AltVAsync.Schedule(() =>
-        Alt.Core.CreateVirtualEntityGroup(streamingDistance));
+        Alt.CreateVirtualEntityGroup(streamingDistance));
 
     public static Task<IVirtualEntity> CreateVirtualEntity(IVirtualEntityGroup group, Position position,
         uint streamingDistance, Dictionary<string, object> dataDict) =>