Merge pull request #575 from zziger/dev

Change Key enum for Keypress events and make dependency download optional
FabianTerhorst · May 22, 2022 · d6882cc · d6882cc
1 parent d50caaf
commit d6882cc
Show file tree

Hide file tree

Showing 7 changed files with 1,185 additions and 78 deletions.
diff --git a/api/AltV.Net.Client.Example/Class1.cs b/api/AltV.Net.Client.Example/Class1.cs
@@ -1,4 +1,5 @@
-using AltV.Net.Client.Elements.Interfaces;
+using AltV.Net.Client.Elements.Data;
+using AltV.Net.Client.Elements.Interfaces;
 using AltV.Net.Data;
 
 namespace AltV.Net.Client.Example
@@ -26,11 +27,11 @@ public override void OnStart()
             {
                 switch (key)
                 {
-                    case ConsoleKey.X:
+                    case Key.X:
                         drawNametags = !drawNametags;
                         webView.Emit("test");
                         break;
-                    case ConsoleKey.M:
+                    case Key.M:
                         Alt.Log($"HasLocalMeta Test3: {Alt.HasLocalMetaData("test3").ToString()}");
                         Alt.Log($"HasLocalMeta Test: {Alt.HasLocalMetaData("test").ToString()}");
                         Alt.GetLocalMetaData<string>("test", out var meta);

diff --git a/api/AltV.Net.Client/Core.Events.cs b/api/AltV.Net.Client/Core.Events.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using AltV.Net.Client.Elements.Data;
 using AltV.Net.Client.Elements.Interfaces;
 using AltV.Net.Client.Events;
 using AltV.Net.Client.Extensions;
@@ -215,12 +216,12 @@ public void OnAnyResourceStop(string name)
             AnyResourceStopEventHandler.GetEvents().ForEachCatching(fn => fn(name), $"event {nameof(OnAnyResourceStop)} \"{name}\"");
         }
 
-        public void OnKeyDown(ConsoleKey key)
+        public void OnKeyDown(Key key)
         {
             KeyDownEventHandler.GetEvents().ForEachCatching(fn => fn(key), $"event {nameof(OnKeyDown)}");
         }
 
-        public void OnKeyUp(ConsoleKey key)
+        public void OnKeyUp(Key key)
         {
             KeyUpEventHandler.GetEvents().ForEachCatching(fn => fn(key), $"event {nameof(OnKeyUp)}");
         }