Create HeartApi (#222)

Data/Scripts/HeartModule/Client/Projectiles/ProjectileManager.cs

@@ -96,5 +96,7 @@ public static HitscanProjectile GetProjectile(uint id)
         }
 
         public static int ActiveProjectiles => _?._projectiles.Count ?? -1;
+
+        public static bool TryGetProjectile(uint id, out HitscanProjectile projectile) => _._projectiles.TryGetValue(id, out projectile);
     }
 }

Data/Scripts/HeartModule/MasterSession.cs

@@ -1,9 +1,11 @@
 using System;
 using Orrery.HeartModule.Shared.Definitions;
+using Orrery.HeartModule.Shared.HeartApi;
 using Orrery.HeartModule.Shared.Logging;
 using Sandbox.ModAPI;
 using VRage.Game.Components;
 using VRage.Utils;
+using VRageMath;
 
 namespace Orrery.HeartModule
 {
@@ -13,6 +15,7 @@ internal class MasterSession : MySessionComponentBase
         public static MasterSession I;
         private HeartLog _heartLog;
         private CriticalHandle _criticalHandle;
+        private ApiSender _apiSender = new ApiSender();
         private int _ticks;
 
         public override void LoadData()
@@ -27,6 +30,9 @@ public override void LoadData()
 
             DefinitionManager.LoadData();
 
+            _apiSender.LoadData();
+            HeartLog.Info("HeartAPI ready.");
+
             HeartLog.Info("[MasterSession] finished LoadData.");
             MyLog.Default.WriteLineAndConsole("\n========================================\nOrrery Combat Framework initialized - check [\\Storage\\3130655435.sbm_HeartModule\\debug.log] for logs.\n========================================");
         }
@@ -57,6 +63,9 @@ protected override void UnloadData()
         {
             HeartLog.Info("[MasterSession] Begin UnloadData.");
 
+            _apiSender.UnloadData();
+            HeartLog.Info("HeartAPI unloaded.");
+
             DefinitionManager.UnloadData();
 
             _criticalHandle.UnloadData();

Data/Scripts/HeartModule/Server/Projectiles/HitscanProjectile.cs

@@ -137,9 +137,7 @@ internal virtual void CheckImpact()
 
                 {
                     double closestDistance = double.MaxValue;
-                    LineD testLine = Raycast;
-                    testLine.To -= Direction * 0.5f;
-                    testLine.From += Direction * 0.5f;
+                    LineD testLine = new LineD(Raycast.From - Direction * 0.5f, Raycast.To + Direction * 0.5f);
 
                     foreach (var grid in grids)
                     {
@@ -171,6 +169,15 @@ internal virtual void CheckImpact()
 
                     if (Definition.UngroupedDef.Impulse != 0)
                         closestBlock.CubeGrid.Physics?.ApplyImpulse(Direction * Definition.UngroupedDef.Impulse * (HitCount - prevHitCount), closestIntersect);
+
+                    try
+                    {
+                        Definition.LiveMethods.ServerOnImpact?.Invoke(Id, Position, Direction, closestBlock.CubeGrid);
+                    }
+                    catch (Exception ex)
+                    {
+                        HeartLog.Exception(ex, typeof(HitscanProjectile));
+                    }
                 }
             }
 

Data/Scripts/HeartModule/Server/Projectiles/ProjectileManager.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Orrery.HeartModule.Server.Networking;
 using Orrery.HeartModule.Shared.Definitions;
 using Orrery.HeartModule.Shared.Logging;
 using Orrery.HeartModule.Shared.Networking;
 using Orrery.HeartModule.Shared.Utility;
 using Sandbox.ModAPI;
+using VRage.Collections;
 using VRage.ModAPI;
 using VRageMath;
 
@@ -17,7 +19,8 @@ internal class ProjectileManager
 
         private readonly HashSet<HitscanProjectile> _projectiles = new HashSet<HitscanProjectile>();
         private readonly HashSet<HitscanProjectile> _projectilesWithHealth = new HashSet<HitscanProjectile>();
-        private readonly HashSet<HitscanProjectile> _deadProjectiles = new HashSet<HitscanProjectile>();
+        private readonly MyConcurrentList<HitscanProjectile> _deadProjectiles = new MyConcurrentList<HitscanProjectile>();
+        private readonly MyConcurrentList<HitscanProjectile> _queuedProjectiles = new MyConcurrentList<HitscanProjectile>();
         private uint _maxProjectileId = 0;
 
         public ProjectileManager()
@@ -32,6 +35,14 @@ public void Close()
 
         public void UpdateBeforeSimulation()
         {
+            foreach (var projectile in _queuedProjectiles)
+            {
+                _projectiles.Add(projectile);
+                if (projectile.Definition.PhysicalProjectileDef.Health > 0)
+                    _projectilesWithHealth.Add(projectile);
+            }
+            _queuedProjectiles.Clear();
+
             MyAPIGateway.Parallel.ForEach(_projectiles, projectile =>
             {
                 projectile.UpdateTick(1/60d);
@@ -52,14 +63,14 @@ public void UpdateAfterSimulation()
 
             foreach (var deadProjectile in _deadProjectiles)
             {
-                if (!deadProjectile.Definition.PhysicalProjectileDef.IsHitscan) // Hitscans only last one tick.
+                if (deadProjectile != null && !deadProjectile.Definition.PhysicalProjectileDef.IsHitscan) // Hitscans only last one tick.
                     ServerNetwork.SendToEveryoneInSync((SerializedCloseProjectile) deadProjectile, deadProjectile.Position);
                 _projectiles.Remove(deadProjectile);
                 _projectilesWithHealth.Remove(deadProjectile);
 
                 try
                 {
-                    deadProjectile.Definition.LiveMethods.ServerOnEndOfLife?.Invoke(deadProjectile.Id);
+                    deadProjectile?.Definition.LiveMethods.ServerOnEndOfLife?.Invoke(deadProjectile.Id);
                 }
                 catch (Exception ex)
                 {
@@ -74,10 +85,7 @@ public static void SpawnProjectile(HitscanProjectile projectile)
         {
             if (projectile == null) throw new Exception("Tried spawning null projectile!");
             projectile.Id = _._maxProjectileId++;
-            _._projectiles.Add(projectile);
-
-            if (projectile.Definition.PhysicalProjectileDef.Health > 0)
-                _._projectilesWithHealth.Add(projectile);
+            _._queuedProjectiles.Add(projectile);
 
             ServerNetwork.SendToEveryoneInSync((SerializedSpawnProjectile) projectile, projectile.Position);
             try
@@ -145,5 +153,19 @@ public static void GetProjectilesInLine(LineD line, ref HashSet<PhysicalProjecti
                     projectiles.Add(projectile);
             }
         }
+
+        public static bool TryGetProjectile(uint id, out HitscanProjectile projectile)
+        {
+            foreach (var p in _._projectiles)
+            {
+                if (p.Id != id)
+                    continue;
+                projectile = p;
+                return true;
+            }
+
+            projectile = null;
+            return false;
+        }
     }
 }

Data/Scripts/HeartModule/Shared/HeartApi/ApiSender.cs

@@ -1,26 +1,25 @@
-using System;
-using System.Collections.Generic;
-using Orrery.HeartModule.Shared.Logging;
+using Orrery.HeartModule.Shared.Logging;
 using Sandbox.ModAPI;
 
 namespace Orrery.HeartModule.Shared.HeartApi
 {
     internal class ApiSender
     {
-        const long HeartApiChannel = 8644; // https://xkcd.com/221/
+        private const long HeartApiChannel = 8644; // https://xkcd.com/221/
 
-        Dictionary<string, Delegate> methods = new HeartApiMethods().ModApiMethods;
+        private readonly HeartApiMethods _methods = new HeartApiMethods();
 
         public void LoadData()
         {
-            MyAPIGateway.Utilities.SendModMessage(HeartApiChannel, methods); // Update mods that loaded before this one
+            MyAPIGateway.Utilities.SendModMessage(HeartApiChannel, _methods.CommunicationTuple); // Update mods that loaded before this one
             MyAPIGateway.Utilities.RegisterMessageHandler(HeartApiChannel, RecieveApiMethods);
             HeartLog.Debug("Orrery Combat Framework: HeartAPISender ready.");
         }
 
         public void UnloadData()
         {
             MyAPIGateway.Utilities.UnregisterMessageHandler(HeartApiChannel, RecieveApiMethods);
+            MyAPIGateway.Utilities.SendModMessage(HeartApiChannel, false); // Tell all HeartApi instances to close
         }
 
         /// <summary>
@@ -34,7 +33,7 @@ public void RecieveApiMethods(object data)
 
             if (data is bool && (bool)data)
             {
-                MyAPIGateway.Utilities.SendModMessage(HeartApiChannel, methods);
+                MyAPIGateway.Utilities.SendModMessage(HeartApiChannel, _methods.CommunicationTuple);
                 HeartLog.Debug("Orrery Combat Framework: HeartAPISender send methods.");
             }
         }