Try fix travis and add synced meta data and meta data events

FabianTerhorst · FabianTerhorst · commit 43747f9cc980 · 2019-05-09T19:23:10.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -37,7 +37,6 @@ matrix:
     - cd Release
     - ls -l
 deploy:
-  matrix:
   - provider: releases
     skip_cleanup: true
     api_key:
diff --git a/api/AltV.Net/Alt.cs b/api/AltV.Net/Alt.cs
@@ -99,6 +99,18 @@ public static event ConsoleCommandDelegate OnConsoleCommand
             add => Module.ConsoleCommandEventHandler.Add(value);
             remove => Module.ConsoleCommandEventHandler.Remove(value);
         }
+        
+        public static event MetaDataChangeDelegate OnMetaDataChange
+        {
+            add => Module.MetaDataChangeEventHandler.Add(value);
+            remove => Module.MetaDataChangeEventHandler.Remove(value);
+        }
+        
+        public static event MetaDataChangeDelegate OnSyncedMetaDataChange
+        {
+            add => Module.SyncedMetaDataChangeEventHandler.Add(value);
+            remove => Module.SyncedMetaDataChangeEventHandler.Remove(value);
+        }
 
         public static void Emit(string eventName, params object[] args) => Server.TriggerServerEvent(eventName, args);
 
diff --git a/api/AltV.Net/Events/Events.cs b/api/AltV.Net/Events/Events.cs
@@ -36,4 +36,6 @@ namespace AltV.Net.Events
     public delegate void ServerCustomEventEventDelegate(string eventName, ref MValueArray mValueArray);
 
     public delegate void ConsoleCommandDelegate(string name, string[] args);
+    
+    public delegate void MetaDataChangeDelegate(IEntity entity, string name, object value);
 }
diff --git a/api/AltV.Net/Module.cs b/api/AltV.Net/Module.cs
@@ -90,6 +90,12 @@ public class Module
 
         internal readonly IEventHandler<ConsoleCommandDelegate> ConsoleCommandEventHandler =
             new HashSetEventHandler<ConsoleCommandDelegate>();
+        
+        internal readonly IEventHandler<MetaDataChangeDelegate> MetaDataChangeEventHandler =
+            new HashSetEventHandler<MetaDataChangeDelegate>();
+        
+        internal readonly IEventHandler<MetaDataChangeDelegate> SyncedMetaDataChangeEventHandler =
+            new HashSetEventHandler<MetaDataChangeDelegate>();
 
         public Module(IServer server, CSharpNativeResource cSharpNativeResource, IBaseBaseObjectPool baseBaseObjectPool,
             IBaseEntityPool baseEntityPool, IEntityPool<IPlayer> playerPool,
@@ -640,5 +646,45 @@ public void OnConsoleCommand(string name, ref StringViewArray args)
         public virtual void OnConsoleCommandEvent(string name, string[] args)
         {
         }
+
+        public void OnMetaDataChange(IntPtr entityPointer, BaseObjectType entityType, string key,
+            ref MValue value)
+        {
+            if (!BaseEntityPool.GetOrCreate(entityPointer, entityType, out var entity))
+            {
+                return;
+            }
+
+            OnMetaDataChangeEvent(entity, key, value.ToObject());
+        }
+        
+        public virtual void OnMetaDataChangeEvent(IEntity entity, string key, object value)
+        {
+            if (!MetaDataChangeEventHandler.HasEvents()) return;
+            foreach (var eventHandler in MetaDataChangeEventHandler.GetEvents())
+            {
+                eventHandler(entity, key, value);
+            }
+        }
+        
+        public void OnSyncedMetaDataChange(IntPtr entityPointer, BaseObjectType entityType, string key,
+            ref MValue value)
+        {
+            if (!BaseEntityPool.GetOrCreate(entityPointer, entityType, out var entity))
+            {
+                return;
+            }
+            
+            OnSyncedMetaDataChangeEvent(entity, key, value.ToObject());
+        }
+        
+        public virtual void OnSyncedMetaDataChangeEvent(IEntity entity, string key, object value)
+        {
+            if (!SyncedMetaDataChangeEventHandler.HasEvents()) return;
+            foreach (var eventHandler in SyncedMetaDataChangeEventHandler.GetEvents())
+            {
+                eventHandler(entity, key, value);
+            }
+        }
     }
 }
diff --git a/api/AltV.Net/ModuleWrapper.cs b/api/AltV.Net/ModuleWrapper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.CompilerServices;
+using AltV.Net.Elements.Args;
 using AltV.Net.Elements.Entities;
 using AltV.Net.Native;
 
@@ -192,5 +193,15 @@ public static void OnConsoleCommand(string name, ref StringViewArray args)
         {
             _module.OnConsoleCommand(name, ref args);
         }
+        
+        public static void OnMetaDataChange(IntPtr entityPointer, BaseObjectType entityType, string key, ref MValue value)
+        {
+            _module.OnMetaDataChange(entityPointer, entityType, key, ref value);
+        }
+        
+        public static void OnSyncedMetaDataChange(IntPtr entityPointer, BaseObjectType entityType, string key, ref MValue value)
+        {
+            _module.OnSyncedMetaDataChange(entityPointer, entityType, key, ref value);
+        }
     }
 }
diff --git a/api/AltV.Net/Native/AltV.Resource.cs b/api/AltV.Net/Native/AltV.Resource.cs
@@ -86,6 +86,9 @@ internal delegate void PlayerChangeVehicleSeatDelegate(IntPtr vehiclePointer, In
 
             internal delegate void ConsoleCommandDelegate(string name, ref StringViewArray args);
 
+            internal delegate void MetaDataChange(IntPtr entityPointer, BaseObjectType entityType, string key,
+                ref MValue value);
+
             [DllImport(DllName, CallingConvention = NativeCallingConvention)]
             internal static extern void CSharpResource_SetMain(IntPtr resourcePointer, MainDelegate mainDelegate,
                 TickDelegate tickDelegate, ServerEventDelegate serverEventDelegate,
@@ -103,7 +106,9 @@ internal static extern void CSharpResource_SetMain(IntPtr resourcePointer, MainD
                 CreateCheckpointDelegate createCheckpointDelegate, RemoveCheckpointDelegate removeCheckpointDelegate,
                 CreateVoiceChannelDelegate createVoiceChannelDelegate,
                 RemoveVoiceChannelDelegate removeVoiceChannelDelegate,
-                ConsoleCommandDelegate consoleCommandDelegate
+                ConsoleCommandDelegate consoleCommandDelegate,
+                MetaDataChange metaDataChange,
+                MetaDataChange syncedMetaDataChange
             );
         }
     }
diff --git a/api/AltV.Net/ResourceBuilder.cs b/api/AltV.Net/ResourceBuilder.cs
@@ -124,6 +124,14 @@ public void Start()
 
             AltNative.Resource.ConsoleCommandDelegate onConsoleCommand = ModuleWrapper.OnConsoleCommand;
 
+            GCHandle.Alloc(onConsoleCommand);
+            
+            AltNative.Resource.MetaDataChange onMetaDataChange = ModuleWrapper.OnMetaDataChange;
+
+            GCHandle.Alloc(onConsoleCommand);
+            
+            AltNative.Resource.MetaDataChange onSyncedMetaDataChange = ModuleWrapper.OnSyncedMetaDataChange;
+
             GCHandle.Alloc(onConsoleCommand);
 
             AltNative.Resource.CSharpResource_SetMain(resourcePointer, onStart, onTick, onServerEvent, onCheckpoint,
@@ -132,7 +140,7 @@ public void Start()
                 onPlayerChangeVehicleSeat, onPlayerEnterVehicle, onPlayerLeaveVehicle, onCreatePlayer, onRemovePlayer,
                 onCreateVehicle, onRemoveVehicle,
                 onCreateBlip, onRemoveBlip, onCreateCheckpoint, onRemoveCheckpoint, onCreateVoiceChannel,
-                onRemoveVoiceChannel, onConsoleCommand);
+                onRemoveVoiceChannel, onConsoleCommand, onMetaDataChange, onSyncedMetaDataChange);
         }
 
         private void OnStart(IntPtr pointer, IntPtr ptr, string name, string point)
diff --git a/runtime/include/CSharpResource.h b/runtime/include/CSharpResource.h
@@ -7,6 +7,8 @@
 #endif
 
 #include <altv-cpp-api/SDK.h>
+#include <altv-cpp-api/events/CMetaDataChangeEvent.h>
+#include <altv-cpp-api/events/CSyncedMetaDataChangeEvent.h>
 
 #ifdef _WIN32
 #define RESOURCES_PATH "\\resources\\"
@@ -92,6 +94,7 @@ typedef void (* RemoveCheckpointDelegate_t)(alt::ICheckpoint* checkpoint);
 typedef void (* OnCreateVoiceChannelDelegate_t)(alt::IVoiceChannel* channel);
 typedef void (* OnRemoveVoiceChannelDelegate_t)(alt::IVoiceChannel* channel);
 typedef void (* OnConsoleCommandDelegate_t)(const char* name, alt::Array<alt::StringView>* args);
+typedef void (* MetaChangeDelegate_t)(void* entity, alt::IBaseObject::Type type, alt::StringView key, alt::MValue* value);
 
 class CSharpResource : public alt::IResource {
     bool OnEvent(const alt::CEvent* ev) override;
@@ -174,6 +177,10 @@ class CSharpResource : public alt::IResource {
 
     OnConsoleCommandDelegate_t OnConsoleCommandDelegate;
 
+    MetaChangeDelegate_t OnMetaChangeDelegate;
+
+    MetaChangeDelegate_t OnSyncedMetaChangeDelegate;
+
     void* runtimeHost;
     unsigned int domainId;
 };
@@ -205,7 +212,9 @@ EXPORT void CSharpResource_SetMain(CSharpResource* resource,
                                    RemoveCheckpointDelegate_t removeCheckpointDelegate,
                                    OnCreateVoiceChannelDelegate_t createVoiceChannelDelegate,
                                    OnRemoveVoiceChannelDelegate_t removeVoiceChannelDelegate,
-                                   OnConsoleCommandDelegate_t consoleCommandDelegate);
+                                   OnConsoleCommandDelegate_t consoleCommandDelegate,
+                                   MetaChangeDelegate_t metaChangeDelegate,
+                                   MetaChangeDelegate_t syncedMetaChangeDelegate);
 
 EXPORT alt::IServer* CSharpResource_GetServerPointer();
 
diff --git a/runtime/src/CSharpResource.cpp b/runtime/src/CSharpResource.cpp
@@ -223,6 +223,24 @@ CSharpResource::~CSharpResource() {
 bool CSharpResource::OnEvent(const alt::CEvent* ev) {
     server->LogInfo(alt::String("event: ") + ((int) ev->GetType() + '0'));
     switch (ev->GetType()) {
+        case alt::CEvent::Type::META_CHANGE: {
+            auto event = ((alt::CMetaChangeEvent*) (ev));
+            auto entity = event->GetTarget();
+            if (entity == nullptr) return true;
+            auto key = event->GetKey();
+            auto value = event->GetVal();
+            OnMetaChangeDelegate(GetEntityPointer(entity), entity->GetType(), key == nullptr ? "" : key.CStr(), &value);
+            break;
+        }
+        case alt::CEvent::Type::SYNCED_META_CHANGE: {
+            auto event = ((alt::CSyncedMetaDataChangeEvent*) (ev));
+            auto entity = event->GetTarget();
+            if (entity == nullptr) return true;
+            auto key = event->GetKey();
+            auto value = event->GetVal();
+            OnSyncedMetaChangeDelegate(GetEntityPointer(entity), entity->GetType(), key == nullptr ? "" : key.CStr(), &value);
+            break;
+        }
         case alt::CEvent::Type::CHECKPOINT_EVENT: {
             auto entity = ((alt::CCheckpointEvent*) (ev))->GetEntity();
             OnCheckpointDelegate(((alt::CCheckpointEvent*) (ev))->GetTarget(),
@@ -386,7 +404,9 @@ void CSharpResource_SetMain(CSharpResource* resource, MainDelegate_t mainDelegat
                             RemoveCheckpointDelegate_t removeCheckpointDelegate,
                             OnCreateVoiceChannelDelegate_t createVoiceChannelDelegate,
                             OnRemoveVoiceChannelDelegate_t removeVoiceChannelDelegate,
-                            OnConsoleCommandDelegate_t consoleCommandDelegate) {
+                            OnConsoleCommandDelegate_t consoleCommandDelegate,
+                            MetaChangeDelegate_t metaChangeDelegate,
+                            MetaChangeDelegate_t syncedMetaChangeDelegate) {
     resource->MainDelegate = mainDelegate;
     resource->OnTickDelegate = tickDelegate;
     resource->OnServerEventDelegate = serverEventDelegate;
@@ -412,6 +432,8 @@ void CSharpResource_SetMain(CSharpResource* resource, MainDelegate_t mainDelegat
     resource->OnCreateVoiceChannelDelegate = createVoiceChannelDelegate;
     resource->OnRemoveVoiceChannelDelegate = removeVoiceChannelDelegate;
     resource->OnConsoleCommandDelegate = consoleCommandDelegate;
+    resource->OnMetaChangeDelegate = metaChangeDelegate;
+    resource->OnSyncedMetaChangeDelegate = syncedMetaChangeDelegate;
 }
 
 alt::IServer* CSharpResource_GetServerPointer() {
diff --git a/runtime/thirdparty/altv-cpp-api b/runtime/thirdparty/altv-cpp-api
@@ -1 +1 @@
-Subproject commit d650d761832274aba8b36d6f5d8077be38c7c4c2
+Subproject commit 7c6ed8977e0188d970720a28106a4189da960438

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,6 @@ namespace AltV.Net.Events`
`36`	`36`	`public delegate void ServerCustomEventEventDelegate(string eventName, ref MValueArray mValueArray);`
`37`	`37`
`38`	`38`	`public delegate void ConsoleCommandDelegate(string name, string[] args);`
	`39`	`+`
	`40`	`+ public delegate void MetaDataChangeDelegate(IEntity entity, string name, object value);`
`39`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Runtime.CompilerServices;`
	`3`	`+using AltV.Net.Elements.Args;`
`3`	`4`	`using AltV.Net.Elements.Entities;`
`4`	`5`	`using AltV.Net.Native;`
`5`	`6`
`@@ -192,5 +193,15 @@ public static void OnConsoleCommand(string name, ref StringViewArray args)`
`192`	`193`	`{`
`193`	`194`	`_module.OnConsoleCommand(name, ref args);`
`194`	`195`	`}`
	`196`	`+`
	`197`	`+ public static void OnMetaDataChange(IntPtr entityPointer, BaseObjectType entityType, string key, ref MValue value)`
	`198`	`+ {`
	`199`	`+ _module.OnMetaDataChange(entityPointer, entityType, key, ref value);`
	`200`	`+ }`
	`201`	`+`
	`202`	`+ public static void OnSyncedMetaDataChange(IntPtr entityPointer, BaseObjectType entityType, string key, ref MValue value)`
	`203`	`+ {`
	`204`	`+ _module.OnSyncedMetaDataChange(entityPointer, entityType, key, ref value);`
	`205`	`+ }`
`195`	`206`	`}`
`196`	`207`	`}`