diff --git a/api/AltV.Net.CApi.Generator/TypeRegistry.cs b/api/AltV.Net.CApi.Generator/TypeRegistry.cs index 87dc24ba..50b7d7b8 100644 --- a/api/AltV.Net.CApi.Generator/TypeRegistry.cs +++ b/api/AltV.Net.CApi.Generator/TypeRegistry.cs @@ -218,6 +218,6 @@ public static class TypeRegistry { "ClrConfigNodeData*", "nint" }, { "ClrAmmoFlags*", "nint" }, { "ClrDecoration**", "nint" }, - { "interior_extent_info_t&", "InteriorExtentInfo*" }, + { "aabb_t&", "AABB*" }, }; } \ No newline at end of file diff --git a/api/AltV.Net.CApi/Data/InteriorExtentInfo.cs b/api/AltV.Net.CApi/Data/AABB.cs similarity index 57% rename from api/AltV.Net.CApi/Data/InteriorExtentInfo.cs rename to api/AltV.Net.CApi/Data/AABB.cs index ecc99d1a..67fd0267 100644 --- a/api/AltV.Net.CApi/Data/InteriorExtentInfo.cs +++ b/api/AltV.Net.CApi/Data/AABB.cs @@ -3,14 +3,14 @@ namespace AltV.Net.Data { [StructLayout(LayoutKind.Sequential)] - public struct InteriorExtentInfo : IEquatable + public struct AABB : IEquatable { - public static InteriorExtentInfo Zero = new InteriorExtentInfo(Position.Zero, Position.Zero); + public static AABB Zero = new AABB(Position.Zero, Position.Zero); public Position Min; public Position Max; - public InteriorExtentInfo(Position min, Position max) + public AABB(Position min, Position max) { Min = min; Max = max; @@ -18,15 +18,15 @@ public InteriorExtentInfo(Position min, Position max) public override string ToString() { - return $"InteriorExtentInfo(min: {Min}, max: {Max})"; + return $"AABB(min: {Min}, max: {Max})"; } public override bool Equals(object obj) { - return obj is InteriorExtentInfo other && Equals(other); + return obj is AABB other && Equals(other); } - public bool Equals(InteriorExtentInfo other) + public bool Equals(AABB other) { return Min.Equals(other.Min) && Max.Equals(other.Max); } diff --git a/api/AltV.Net.CApi/Libraries/ClientLibrary.cs b/api/AltV.Net.CApi/Libraries/ClientLibrary.cs index 7b230b9f..ba28fbf8 100644 --- a/api/AltV.Net.CApi/Libraries/ClientLibrary.cs +++ b/api/AltV.Net.CApi/Libraries/ClientLibrary.cs @@ -3717,7 +3717,7 @@ private IntPtr GetUnmanagedPtr(IDictionary funcTable, ulong ha public ClientLibrary(Dictionary funcTable) { if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true; - else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 3741487677670128934UL) Outdated = true; + else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 10075699596264467259UL) Outdated = true; Audio_AddOutput = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 9914412815391408844UL, Audio_AddOutputFallback); Audio_GetBaseObject = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 6330360502401226894UL, Audio_GetBaseObjectFallback); Audio_GetCurrentTime = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 2944324482134975819UL, Audio_GetCurrentTimeFallback); @@ -4182,7 +4182,7 @@ public ClientLibrary(Dictionary funcTable) HttpClient_Put = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 8280976854604120523UL, HttpClient_PutFallback); HttpClient_SetExtraHeader = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 4939806300942583161UL, HttpClient_SetExtraHeaderFallback); HttpClient_Trace = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 12260251650657662947UL, HttpClient_TraceFallback); - Interior_GetEntitiesExtents = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 11053057787907413702UL, Interior_GetEntitiesExtentsFallback); + Interior_GetEntitiesExtents = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 15230725921455826742UL, Interior_GetEntitiesExtentsFallback); Interior_GetPortalCount = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 9833874365185055719UL, Interior_GetPortalCountFallback); Interior_GetPosition = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 10883468373939012235UL, Interior_GetPositionFallback); Interior_GetRoomCount = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 15377866266281851140UL, Interior_GetRoomCountFallback); @@ -4203,7 +4203,7 @@ public ClientLibrary(Dictionary funcTable) InteriorPortal_SetFlag = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 9853055316547927459UL, InteriorPortal_SetFlagFallback); InteriorPortal_SetRoomFrom = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 12340070947493379575UL, InteriorPortal_SetRoomFromFallback); InteriorPortal_SetRoomTo = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 16837975631170049766UL, InteriorPortal_SetRoomToFallback); - InteriorRoom_GetExtents = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 6970051561303592745UL, InteriorRoom_GetExtentsFallback); + InteriorRoom_GetExtents = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 8261388998032521861UL, InteriorRoom_GetExtentsFallback); InteriorRoom_GetFlag = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 7856663484428066825UL, InteriorRoom_GetFlagFallback); InteriorRoom_GetIndex = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 15158102510225914020UL, InteriorRoom_GetIndexFallback); InteriorRoom_GetName = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 4739364089865431579UL, InteriorRoom_GetNameFallback); diff --git a/api/AltV.Net.CApi/Libraries/ServerLibrary.cs b/api/AltV.Net.CApi/Libraries/ServerLibrary.cs index 3bea490a..d58cebb1 100644 --- a/api/AltV.Net.CApi/Libraries/ServerLibrary.cs +++ b/api/AltV.Net.CApi/Libraries/ServerLibrary.cs @@ -1917,7 +1917,7 @@ private IntPtr GetUnmanagedPtr(IDictionary funcTable, ulong ha public ServerLibrary(Dictionary funcTable) { if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true; - else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 3741487677670128934UL) Outdated = true; + else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 10075699596264467259UL) Outdated = true; BaseObject_DeleteSyncedMetaData = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 8228424877092269355UL, BaseObject_DeleteSyncedMetaDataFallback); BaseObject_SetMultipleSyncedMetaData = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 1390762125822890831UL, BaseObject_SetMultipleSyncedMetaDataFallback); BaseObject_SetSyncedMetaData = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 8002999088966424231UL, BaseObject_SetSyncedMetaDataFallback); diff --git a/api/AltV.Net.CApi/Libraries/SharedLibrary.cs b/api/AltV.Net.CApi/Libraries/SharedLibrary.cs index c227abfe..40a28e93 100644 --- a/api/AltV.Net.CApi/Libraries/SharedLibrary.cs +++ b/api/AltV.Net.CApi/Libraries/SharedLibrary.cs @@ -1669,7 +1669,7 @@ private IntPtr GetUnmanagedPtr(IDictionary funcTable, ulong ha public SharedLibrary(Dictionary funcTable) { if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true; - else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 3741487677670128934UL) Outdated = true; + else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 10075699596264467259UL) Outdated = true; Audio_GetID = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 4464042055475980737UL, Audio_GetIDFallback); AudioAttachedOutput_GetID = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 17725794901805112189UL, AudioAttachedOutput_GetIDFallback); AudioFilter_GetID = (delegate* unmanaged[Cdecl]) GetUnmanagedPtr(funcTable, 8824535635529306325UL, AudioFilter_GetIDFallback); diff --git a/api/AltV.Net.Client/Elements/Data/IInterior.cs b/api/AltV.Net.Client/Elements/Data/IInterior.cs index 6813b41d..41452501 100644 --- a/api/AltV.Net.Client/Elements/Data/IInterior.cs +++ b/api/AltV.Net.Client/Elements/Data/IInterior.cs @@ -11,5 +11,5 @@ public interface IInterior ushort PortalCount { get; } Position Position { get; } Rotation Rotation { get; } - InteriorExtentInfo EntitiesExtents { get; } + AABB EntitiesExtents { get; } } \ No newline at end of file diff --git a/api/AltV.Net.Client/Elements/Data/IInteriorRoom.cs b/api/AltV.Net.Client/Elements/Data/IInteriorRoom.cs index b4aa24cd..52764786 100644 --- a/api/AltV.Net.Client/Elements/Data/IInteriorRoom.cs +++ b/api/AltV.Net.Client/Elements/Data/IInteriorRoom.cs @@ -9,5 +9,5 @@ public interface IInteriorRoom uint NameHash { get; } int Flag { get; set; } uint Timecycle { get; set; } - InteriorExtentInfo Extents { get; set; } + AABB Extents { get; set; } } \ No newline at end of file diff --git a/runtime b/runtime index b0388443..3e77ac20 160000 --- a/runtime +++ b/runtime @@ -1 +1 @@ -Subproject commit b0388443b81ec422cf99b129c6940557ab93d7ad +Subproject commit 3e77ac2009ff3d02204dfef63ee344c65a36b54c