refactor(managed): .GetHandle() -> .Address

Author: samyycX

managed/src/SwiftlyS2.Core/Misc/SwiftlyLogger.cs

@@ -52,7 +52,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
     var id = $"[{eventId.ToString()}]";
     var color = GetLogLevelColor(logLevel);
 
-    AnsiConsole.MarkupLineInterpolated($"[lightsteelblue1 bold]{_contextName}[/] [lightsteelblue]|[/] [grey42]{timestamp}[/] [lightsteelblue]|[/] [{color}]{level}[/] [lightsteelblue]|[/] [lightsteelblue]{_categoryName}{id}[/]");
+    AnsiConsole.MarkupLineInterpolated($"[lightsteelblue1 bold]{_contextName}[/] [lightsteelblue]|[/] [grey42]{timestamp}[/] [lightsteelblue]|[/] [{color}]{level}[/] [lightsteelblue]|[/] [lightsteelblue]{_categoryName}{id}[/][default]");
 
     string? message = formatter != null ? formatter(state, exception) : state?.ToString();
     if (!string.IsNullOrEmpty(message))
@@ -64,6 +64,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
     {
       AnsiConsole.WriteException(exception);
     }
+    AnsiConsole.ResetColors();
   }
 
   private static string GetLogLevelString(LogLevel logLevel)

managed/src/SwiftlyS2.Core/Modules/EntitySystem/EntitySystem.cs

@@ -41,7 +41,7 @@ public T CreateEntityByDesignerName<T>(string designerName) where T : ISchemaCla
   }
 
   public CHandle<T> GetRefEHandle<T>(T entity) where T : class, ISchemaClass<T> {
-    var handle = NativeEntitySystem.GetEntityHandleFromEntity(entity.GetHandle());
+    var handle = NativeEntitySystem.GetEntityHandleFromEntity(entity.Address);
     return new CHandle<T> {
       Raw = handle,
     };
@@ -56,7 +56,7 @@ public IEnumerable<CEntityInstance> GetAllEntities() {
     CEntityIdentity? pFirst = new CEntityIdentityImpl(NativeEntitySystem.GetFirstActiveEntity());
 
     for (; pFirst != null && pFirst.IsValid; pFirst = pFirst.Next) {
-      yield return new CEntityInstanceImpl(pFirst.GetHandle().Read<nint>());
+      yield return new CEntityInstanceImpl(pFirst.Address.Read<nint>());
     }
   }
 
@@ -65,13 +65,13 @@ public IEnumerable<T> GetAllEntitiesByClass<T>() where T : class, ISchemaClass<T
     if (designerName == null) {
       throw new ArgumentException($"Can't get entities with class {typeof(T).Name}, which doesn't have a designer name");
     }
-    return GetAllEntities().Where((entity) => entity.Entity?.DesignerName == designerName).Select((entity) => T.From(entity.GetHandle()));
+    return GetAllEntities().Where((entity) => entity.Entity?.DesignerName == designerName).Select((entity) => T.From(entity.Address));
   }
 
   public IEnumerable<T> GetAllEntitiesByDesignerName<T>(string designerName) where T : class, ISchemaClass<T> {
     return GetAllEntities()
       .Where(entity => entity.Entity?.DesignerName == designerName)
-      .Select(entity => T.From(entity.GetHandle()));
+      .Select(entity => T.From(entity.Address));
   }
 
   Guid IEntitySystemService.HookEntityOutput<T>(string outputName, IEntitySystemService.EntityOutputHandler callback)

managed/src/SwiftlyS2.Core/Modules/GameEvents/GameEventAccessor.cs

@@ -24,117 +24,117 @@ private void CheckIsValid() {
 
   public void SetBool(string key, bool value) {
     CheckIsValid();
-    NativeGameEvents.SetBool(GetHandle(), key, value);
+    NativeGameEvents.SetBool(Address, key, value);
   }
 
   public bool GetBool(string key) {
     CheckIsValid();
-    return NativeGameEvents.GetBool(GetHandle(), key);
+    return NativeGameEvents.GetBool(Address, key);
   }
 
   public void SetInt32(string key, int value) {
     CheckIsValid();
-    NativeGameEvents.SetInt(GetHandle(), key, value);
+    NativeGameEvents.SetInt(Address, key, value);
   }
 
   public int GetInt32(string key) {
     CheckIsValid();
-    return NativeGameEvents.GetInt(GetHandle(), key);
+    return NativeGameEvents.GetInt(Address, key);
   }
 
   public void SetUInt64(string key, ulong value) {
     CheckIsValid();
-    NativeGameEvents.SetUint64(GetHandle(), key, value);
+    NativeGameEvents.SetUint64(Address, key, value);
   }
 
   public ulong GetUInt64(string key) {
     CheckIsValid();
-    return NativeGameEvents.GetUint64(GetHandle(), key);
+    return NativeGameEvents.GetUint64(Address, key);
   }
 
   public void SetFloat(string key, float value) {
     CheckIsValid();
-    NativeGameEvents.SetFloat(GetHandle(), key, value);
+    NativeGameEvents.SetFloat(Address, key, value);
   }
 
   public float GetFloat(string key) {
     CheckIsValid();
-    return NativeGameEvents.GetFloat(GetHandle(), key);
+    return NativeGameEvents.GetFloat(Address, key);
   }
 
   public void SetString(string key, string value) {
     CheckIsValid();
-    NativeGameEvents.SetString(GetHandle(), key, value);
+    NativeGameEvents.SetString(Address, key, value);
   }
 
   public string GetString(string key) {
     CheckIsValid();
-    return NativeGameEvents.GetString(GetHandle(), key);
+    return NativeGameEvents.GetString(Address, key);
   }
 
   public void SetEntity<K>(string key, K value) where K : CEntityInstance {
     CheckIsValid();
-    NativeGameEvents.SetEntity(GetHandle(), key, value.GetHandle());
+    NativeGameEvents.SetEntity(Address, key, value.Address);
   }
 
   public K GetEntity<K>(string key) where K : CEntityInstance {
     CheckIsValid();
-    return (K)K.From(NativeGameEvents.GetEntity(GetHandle(), key));
+    return (K)K.From(NativeGameEvents.GetEntity(Address, key));
   }
 
   public void SetEntityIndex(string key, int value) {
     CheckIsValid();
-    NativeGameEvents.SetEntityIndex(GetHandle(), key, value);
+    NativeGameEvents.SetEntityIndex(Address, key, value);
   }
 
   public int GetEntityIndex(string key) {
     CheckIsValid();
-    return NativeGameEvents.GetEntityIndex(GetHandle(), key);
+    return NativeGameEvents.GetEntityIndex(Address, key);
   }
 
   public void SetPlayerSlot(string key, int value) {
     CheckIsValid();
-    NativeGameEvents.SetPlayerSlot(GetHandle(), key, value);
+    NativeGameEvents.SetPlayerSlot(Address, key, value);
   }
 
   public int GetPlayerSlot(string key) {
     CheckIsValid();
-    return NativeGameEvents.GetPlayerSlot(GetHandle(), key);
+    return NativeGameEvents.GetPlayerSlot(Address, key);
   }
 
   public CCSPlayerController GetPlayerController(string key) {
     CheckIsValid();
-    return new CCSPlayerControllerImpl(NativeGameEvents.GetPlayerController(GetHandle(), key));
+    return new CCSPlayerControllerImpl(NativeGameEvents.GetPlayerController(Address, key));
   }
 
   public CCSPlayerPawn GetPlayerPawn(string key) {
     CheckIsValid();
-    return new CCSPlayerPawnImpl(NativeGameEvents.GetPlayerPawn(GetHandle(), key));
+    return new CCSPlayerPawnImpl(NativeGameEvents.GetPlayerPawn(Address, key));
   }
 
   public void SetPtr(string key, nint value) {
     CheckIsValid();
-    NativeGameEvents.SetPtr(GetHandle(), key, value);
+    NativeGameEvents.SetPtr(Address, key, value);
   }
 
   public nint GetPtr(string key) {
     CheckIsValid();
-    return NativeGameEvents.GetPtr(GetHandle(), key);
+    return NativeGameEvents.GetPtr(Address, key);
   }
 
   public int GetPawnEntityIndex(string key) {
     CheckIsValid();
-    return NativeGameEvents.GetPawnEntityIndex(GetHandle(), key);
+    return NativeGameEvents.GetPawnEntityIndex(Address, key);
   }
 
   public bool IsReliable() {
     CheckIsValid();
-    return NativeGameEvents.IsReliable(GetHandle());
+    return NativeGameEvents.IsReliable(Address);
   }
 
   public bool IsLocal() {
     CheckIsValid();
-    return NativeGameEvents.IsLocal(GetHandle());
+    return NativeGameEvents.IsLocal(Address);
   }
 
 

managed/src/SwiftlyS2.Core/Modules/NetMessages/NetMessage.cs

@@ -43,21 +43,21 @@ private void CheckIsManuallyAllocated() {
 
   public void Send() {
     CheckIsManuallyAllocated();
-    NativeNetMessages.SendMessageToPlayers(_allocatedHandle!.GetHandle(), T.MessageId, _filter.ToMask());
+    NativeNetMessages.SendMessageToPlayers(_allocatedHandle!.Address, T.MessageId, _filter.ToMask());
   }
 
   public void SendToAllPlayers()
   {
     CheckIsManuallyAllocated();
     _filter.AddAllPlayers();
-    NativeNetMessages.SendMessageToPlayers(_allocatedHandle!.GetHandle(), T.MessageId, _filter.ToMask());
+    NativeNetMessages.SendMessageToPlayers(_allocatedHandle!.Address, T.MessageId, _filter.ToMask());
   }
 
   public void SendToPlayer(int playerId)
   {
     CheckIsManuallyAllocated();
     _filter.AddRecipient(playerId);
-    NativeNetMessages.SendMessageToPlayers(_allocatedHandle!.GetHandle(), T.MessageId, _filter.ToMask());
+    NativeNetMessages.SendMessageToPlayers(_allocatedHandle!.Address, T.MessageId, _filter.ToMask());
   }
 
 }

managed/src/SwiftlyS2.Core/Modules/NetMessages/NetMessageAllocableNativeHandle.cs

@@ -9,7 +9,7 @@ public NetMessageAllocableNativeHandle(nint handle) : base(handle, true) {
   }
 
   protected override bool Free() {
-    NativeNetMessages.DeallocateNetMessage(GetHandle());
+    NativeNetMessages.DeallocateNetMessage(Address);
     return true;
   }