Add color and icon Url to the config file

Author: DiFFoZ

OpenDeathMessages/Events/PlayerDeathEvent.cs

@@ -1,11 +1,12 @@
-using Microsoft.Extensions.Localization;
+using EvolutionPlugins.Universal.Extras.Broadcast;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Localization;
 using OpenMod.API.Eventing;
 using OpenMod.API.Users;
-using OpenMod.UnityEngine.Extensions;
+using OpenMod.Unturned.Locations;
 using OpenMod.Unturned.Players.Life.Events;
 using OpenMod.Unturned.Users;
-using SDG.Unturned;
-using System.Linq;
+using System.Drawing;
 using System.Numerics;
 using System.Threading.Tasks;
 
@@ -16,13 +17,20 @@ public class PlayerDeathEvent : IEventListener<UnturnedPlayerDeathEvent>
         private readonly IUnturnedUserDirectory m_UnturnedUserDirectory;
         private readonly IUserManager m_UserManager;
         private readonly IStringLocalizer m_StringLocalizer;
+        private readonly IConfiguration m_Configuration;
+        private readonly IBroadcastManager m_BroadcastManager;
+        private readonly IUnturnedLocationDirectory m_UnturnedLocationDirectory;
 
         public PlayerDeathEvent(IUnturnedUserDirectory unturnedUserDirectory, IUserManager userManager,
-            IStringLocalizer stringLocalizer)
+            IStringLocalizer stringLocalizer, IConfiguration configuration, IBroadcastManager broadcastManager,
+            IUnturnedLocationDirectory unturnedLocationDirectory)
         {
             m_UnturnedUserDirectory = unturnedUserDirectory;
             m_UserManager = userManager;
             m_StringLocalizer = stringLocalizer;
+            m_Configuration = configuration;
+            m_BroadcastManager = broadcastManager;
+            m_UnturnedLocationDirectory = unturnedLocationDirectory;
         }
 
         public async Task HandleEventAsync(object? sender, UnturnedPlayerDeathEvent @event)
@@ -35,29 +43,22 @@ public async Task HandleEventAsync(object? sender, UnturnedPlayerDeathEvent @eve
 
             var instigatorUser = m_UnturnedUserDirectory.FindUser(@event.Instigator);
 
-            var provider = victimUser.Provider ?? m_UserManager.UserProviders.FirstOrDefault(x => x is UnturnedUserProvider);
-            if (provider == null)
-            {
-                return;
-            }
+            var victimPosition = victimUser.Player.Transform.Position;
 
-            var deathPositionUVector = @event.DeathPosition.ToUnityVector();
-            var distance = Vector3.Distance(victimUser.Player.Transform.Position,
+            var distance = Vector3.Distance(victimPosition,
                 instigatorUser?.Player.Transform.Position ?? victimUser.Player.Transform.Position);
 
-            var nearNode = LevelNodes.nodes.OfType<LocationNode>()
-                .OrderBy(x => (x.point - deathPositionUVector).sqrMagnitude)
-                .FirstOrDefault();
+            var location = m_UnturnedLocationDirectory.GetNearestLocation(victimPosition);
 
-            await provider.BroadcastAsync(m_StringLocalizer[$"deathCause:{@event.DeathCause.ToString().ToLower()}", new
+            await m_BroadcastManager.BroadcastAsync(m_StringLocalizer[$"deathCause:{@event.DeathCause.ToString().ToLower()}", new
             {
                 Victim = victimUser,
                 Instigator = instigatorUser,
                 @event.DeathPosition,
                 Distance = distance,
-                Node = nearNode?.name, // can smartFormat parse fields?
+                Node = location?.Name ?? string.Empty,
                 Limb = m_StringLocalizer[$"limbParse:{@event.Limb.ToString().ToLower()}"].Value
-            }]);
+            }], m_Configuration["iconUrl"], ColorTranslator.FromHtml(m_Configuration["color"]));
         }
     }
 }

OpenDeathMessages/EvolutionPlugins.OpenDeathMessages.csproj

@@ -21,19 +21,21 @@
     <RepositoryType>git</RepositoryType>
     <PackageProjectUrl>https://github.com/EvolutionPlugins/OpenDeathMessages</PackageProjectUrl>
   </PropertyGroup>
-
+	
   <ItemGroup>
-    <PackageReference Include="OpenMod.Unturned" Version="3.0.22+d9126b5" />
+    <PackageReference Include="EvolutionPlugins.Universal.Extras.Unturned" Version="1.0.1" />
+    <PackageReference Include="OpenMod.Unturned" Version="3.1.3" />
     <PackageReference Include="Legacy2CPSWorkaround" Version="1.0.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.0">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="config.yaml" />
     <EmbeddedResource Include="translations.yaml" />
   </ItemGroup>
 

OpenDeathMessages/ServiceConfigurator.cs

@@ -0,0 +1,15 @@
+using EvolutionPlugins.Universal.Extras.Broadcast;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using OpenMod.API.Ioc;
+
+namespace EvolutionPlugins.OpenDeathMessages
+{
+    public class ServiceConfigurator : IServiceConfigurator
+    {
+        public void ConfigureServices(IOpenModServiceConfigurationContext openModStartupContext, IServiceCollection serviceCollection)
+        {
+            serviceCollection.TryAddSingleton<IBroadcastManager, BroadcastManager>();
+        }
+    }
+}

OpenDeathMessages/config.yaml

@@ -0,0 +1,3 @@
+iconUrl: "https://i.imgur.com/Ld1qy8j.png"
+# it can support hex color (#FFFFFF)
+color: "white"