Merge pull request #27 from swiftly-solution/beta

Author: samyycX

generator/gameevent_generator/generate.py

@@ -300,7 +300,7 @@ def render_interface(event: GameEventDef) -> str:
   lines.append(f"public interface {type_name} : IGameEvent<{type_name}> {{")
   lines.append("")
   # static abstract implementations required by IGameEvent<T>
-  lines.append(f"  static {type_name} IGameEvent<{type_name}>.Create() => new {type_name}Impl();")
+  lines.append(f"  static {type_name} IGameEvent<{type_name}>.Create(nint address) => new {type_name}Impl(address);")
   lines.append("")
   lines.append(f"  static string IGameEvent<{type_name}>.GetName() => \"{original_name}\";")
   lines.append("")
@@ -410,9 +410,9 @@ def render_class(event: GameEventDef) -> str:
   lines.append(f"internal class {type_name}Impl : GameEvent<{type_name}>, {type_name}")
   lines.append("{")
   lines.append("")
-  # lines.append(f"  public {type_name}Impl() : base()")
-  # lines.append("  {")
-  # lines.append("  }")
+  lines.append(f"  public {type_name}Impl(nint address) : base(address)")
+  lines.append("  {")
+  lines.append("  }")
 
   used_prop_names: Dict[str, int] = {}
   for fname, fdef in event.fields.items():

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

@@ -4,10 +4,16 @@ namespace SwiftlyS2.Core.GameEvents;
 
 internal class GameEvent<T> where T : IGameEvent<T> {
 
-  public IGameEventAccessor Accessor { get; private init; }
+  private GameEventAccessor _Accessor { get; init; }
 
-  public GameEvent() {
-    Accessor = new GameEventAccessor();
+  public IGameEventAccessor Accessor => _Accessor;
+
+  public GameEvent(nint address) {
+    _Accessor = new GameEventAccessor(address);
+  }
+
+  public void Dispose() {
+    _Accessor.Dispose();
   }
 
   public bool DontBroadcast { 

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

@@ -7,19 +7,21 @@
 
 namespace SwiftlyS2.Core.GameEvents;
 
-internal class GameEventAccessor : NativeHandle, IGameEventAccessor {
-
+internal class GameEventAccessor : NativeHandle, IGameEventAccessor, IDisposable {
+  
   public bool DontBroadcast { get; set; }
+  private bool _IsValid = true;
 
-  internal GameEventAccessor() : base(0) {
+  public GameEventAccessor(nint handle) : base(handle)
+  {
   }
 
-  public void InternalSet(nint handle) {
-    _Handle = handle;
+  public void Dispose() {
+    _IsValid = false;
   }
 
   private void CheckIsValid() {
-    if (_Handle == 0) throw new InvalidOperationException("The event is not initialized.");
+    if (!_IsValid) throw new InvalidOperationException("The event is already disposed.");
   }
 
   public void SetBool(string key, bool value) {

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

@@ -82,10 +82,10 @@ public GameEventCallback(IGameEventService.GameEventHandler<T> callback, bool pr
         var category = "GameEventCallback::" + EventName;
         if (hash != T.GetHash()) return HookResult.Continue;
         Profiler.StartRecording(category);
-        var eventObj = GameEventSingletonWrapper<T>.Borrow(pEvent);
+        var eventObj = T.Create(pEvent);
         var result = _callback(eventObj);
         pDontBroadcast.Write(eventObj.DontBroadcast);
-        GameEventSingletonWrapper<T>.Return();
+        eventObj.Dispose();
         Profiler.StopRecording(category);
         return result;
       } catch (Exception e) {

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

@@ -91,8 +91,9 @@ public void Fire<T>() where T : IGameEvent<T>
 
   public void Fire<T>(Action<T> configureEvent) where T : IGameEvent<T> {
     var handle = NativeGameEvents.CreateEvent(T.GetName());
-    var eventObj = GameEventSingletonWrapper<T>.Borrow(handle);
+    var eventObj = T.Create(handle);
     configureEvent(eventObj);
+    eventObj.Dispose();
     for (int i = 0; i < NativePlayerManager.GetPlayerCap(); i++) {
       if (NativeGameEvents.IsPlayerListeningToEventName(i, T.GetName()) && NativePlayerManager.IsPlayerOnline(i))
       {
@@ -104,16 +105,17 @@ public void Fire<T>(Action<T> configureEvent) where T : IGameEvent<T> {
 
   public void FireToPlayer<T>(int slot) where T : IGameEvent<T> {
     var handle = NativeGameEvents.CreateEvent(T.GetName());
+    var eventObj = T.Create(handle);
     NativeGameEvents.FireEventToClient(handle, slot);
     NativeGameEvents.FreeEvent(handle);
   }
 
   public void FireToPlayer<T>(int slot, Action<T> configureEvent) where T : IGameEvent<T> {
     var handle = NativeGameEvents.CreateEvent(T.GetName());
-    var eventObj = GameEventSingletonWrapper<T>.Borrow(handle);
+    var eventObj = T.Create(handle);
     configureEvent(eventObj);
+    eventObj.Dispose();
     NativeGameEvents.FireEventToClient(handle, slot);
-    GameEventSingletonWrapper<T>.Return();
     NativeGameEvents.FreeEvent(handle);
   }
 
@@ -124,10 +126,10 @@ public void FireToServer<T>() where T : IGameEvent<T> {
 
   public void FireToServer<T>(Action<T> configureEvent) where T : IGameEvent<T> {
     var handle = NativeGameEvents.CreateEvent(T.GetName());
-    var eventObj = GameEventSingletonWrapper<T>.Borrow(handle);
+    var eventObj = T.Create(handle);
     configureEvent(eventObj);
+    eventObj.Dispose();
     NativeGameEvents.FireEvent(handle, true);
-    GameEventSingletonWrapper<T>.Return();
   }
 
   public void Dispose() {

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

@@ -12,6 +12,9 @@ namespace SwiftlyS2.Core.GameEventDefinitions;
 internal class EventAchievementEarnedImpl : GameEvent<EventAchievementEarned>, EventAchievementEarned
 {
 
+  public EventAchievementEarnedImpl(nint address) : base(address)
+  {
+  }
 
   // entindex of the player
   public int Player

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventAchievementEarnedImpl.cs

@@ -12,6 +12,9 @@ namespace SwiftlyS2.Core.GameEventDefinitions;
 internal class EventAchievementEarnedLocalImpl : GameEvent<EventAchievementEarnedLocal>, EventAchievementEarnedLocal
 {
 
+  public EventAchievementEarnedLocalImpl(nint address) : base(address)
+  {
+  }
 
   // achievement ID
   public short Achievement

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventAchievementEarnedLocalImpl.cs

@@ -12,6 +12,9 @@ namespace SwiftlyS2.Core.GameEventDefinitions;
 internal class EventAchievementEventImpl : GameEvent<EventAchievementEvent>, EventAchievementEvent
 {
 
+  public EventAchievementEventImpl(nint address) : base(address)
+  {
+  }
 
   // non-localized name of achievement
   public string AchievementName

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventAchievementEventImpl.cs

@@ -12,4 +12,7 @@ namespace SwiftlyS2.Core.GameEventDefinitions;
 internal class EventAchievementInfoLoadedImpl : GameEvent<EventAchievementInfoLoaded>, EventAchievementInfoLoaded
 {
 
+  public EventAchievementInfoLoadedImpl(nint address) : base(address)
+  {
+  }
 }