Merge pull request #225 from carmineos/clrcore-update

clrcore: updated ServerWrappers to use API

Author: blattersturm

code/client/clrcore/Server/ServerWrappers.cs

@@ -3,8 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using static CitizenFX.Core.Native.Function;
-using static CitizenFX.Core.Native.Hash;
+using static CitizenFX.Core.Native.API;
 
 namespace CitizenFX.Core
 {
@@ -24,19 +23,19 @@ internal Player(string sourceString)
 			m_handle = sourceString;
 		}
 
-		public string Name => Call<string>(GET_PLAYER_NAME, m_handle);
+		public string Name => GetPlayerName(m_handle);
 
-		public int Ping => Call<int>(GET_PLAYER_PING, m_handle);
+		public int Ping => GetPlayerPing(m_handle);
 
-		public int LastMsg => Call<int>(GET_PLAYER_LAST_MSG, m_handle);
+		public int LastMsg => GetPlayerLastMsg(m_handle);
 
 		public IdentifierCollection Identifiers => new IdentifierCollection(this);
 
-		public string EndPoint => Call<string>(GET_PLAYER_ENDPOINT, m_handle);
+		public string EndPoint => GetPlayerEndpoint(m_handle);
 
 		public Ped Character => Ped.FromPlayerHandle(m_handle);
 
-		public void Drop(string reason) => Call(DROP_PLAYER, m_handle, reason);
+		public void Drop(string reason) => DropPlayer(m_handle, reason);
 
 		public void TriggerEvent(string eventName, params object[] args)
 		{
@@ -46,7 +45,7 @@ public void TriggerEvent(string eventName, params object[] args)
 			{
 				fixed (byte* serialized = &argsSerialized[0])
 				{
-					Call(TRIGGER_CLIENT_EVENT_INTERNAL, eventName, m_handle, serialized, argsSerialized.Length);
+					TriggerClientEventInternal(eventName, m_handle, serialized, argsSerialized.Length);
 				}
 			}
 		}
@@ -93,11 +92,11 @@ internal IdentifierCollection(Player player)
 
 		public IEnumerator<string> GetEnumerator()
 		{
-			int numIndices = Call<int>(GET_NUM_PLAYER_IDENTIFIERS, m_player.Handle);
+			int numIndices = GetNumPlayerIdentifiers(m_player.Handle);
 
 			for (var i = 0; i < numIndices; i++)
 			{
-				yield return Call<string>(GET_PLAYER_IDENTIFIER, m_player.Handle, i);
+				yield return GetPlayerIdentifier(m_player.Handle, i);
 			}
 		}
 
@@ -121,11 +120,11 @@ public class PlayerList : IEnumerable<Player>
 	{
 		public IEnumerator<Player> GetEnumerator()
 		{
-			int numIndices = Call<int>(GET_NUM_PLAYER_INDICES);
+			int numIndices = GetNumPlayerIndices();
 
 			for (var i = 0; i < numIndices; i++)
 			{
-				yield return new Player(Call<string>(GET_PLAYER_FROM_INDEX, i));
+				yield return new Player(GetPlayerFromIndex(i));
 			}
 		}