Merge pull request #20 from downloadpizza/feature/configurableCommandPrefix

Add CommandPrefix config entry

Author: MaxWasUnavailable

Nuclei/Features/ChatService.cs

@@ -42,11 +42,11 @@ private static bool CanSend(string message, bool ignoreEmpty = false, bool ignor
     /// <returns> The sanitized message. </returns>
     private static string SanitizeMessage(this string message)
     {
-        return message.TrimStart('/');
+        return message.TrimStart(NucleiConfig.CommandPrefixChar);
     }
 
     /// <summary>
-    ///     Pre-processes a chat message by replacing dynamic placeholders & sanitizing it.
+    ///     Pre-processes a chat message by replacing dynamic placeholders &amp; sanitizing it.
     /// </summary>
     /// <param name="message"> The message to pre-process. </param>
     /// <param name="player"> Player to use for chat message variables </param>

Nuclei/Features/NucleiConfig.cs

@@ -78,6 +78,9 @@ public static class NucleiConfig
 
     internal static ConfigEntry<bool>? UseAllMissions;
     internal const bool DefaultUseAllMissions = false;
+
+    internal static ConfigEntry<string>? CommandPrefix;
+    internal const string DefaultCommandPrefix = "/";
 
     internal static List<string> ModeratorsList => Moderators!.Value.Split(';').Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
 
@@ -86,6 +89,8 @@ public static class NucleiConfig
     internal static List<string> BannedPlayersList => BannedPlayers!.Value.Split(';').Where(b => !string.IsNullOrWhiteSpace(b)).ToList();
 
     internal static List<string> MissionsList => Missions!.Value.Split(';').Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
+
+    internal static char CommandPrefixChar => CommandPrefix!.Value[0];
 
     internal static void InitSettings(ConfigFile config)
     {
@@ -153,6 +158,9 @@ internal static void InitSettings(ConfigFile config)
 
         UseAllMissions = config.Bind(GeneralSection, "UseAllMissions", DefaultUseAllMissions, "Whether to use all missions available to the client (including tutorials, workshop items, custom missions, etc...) for mission selection. If false, only the missions in the config will be used.");
         Nuclei.Logger?.LogDebug($"UseAllMissions: {UseAllMissions.Value}");
+
+        CommandPrefix = config.Bind(GeneralSection, "CommandPrefix", DefaultCommandPrefix, "What to use as the command prefix (the character at the start of a command).");
+        Nuclei.Logger?.LogDebug($"CommandPrefix: {CommandPrefix.Value}");
 
         Nuclei.Logger?.LogDebug("Loaded settings!");
     }
@@ -196,6 +204,12 @@ internal static void ValidateSettings()
             Nuclei.Logger?.LogWarning("TargetFrameRate cannot be less than -1! Setting to -1 (unlimited).");
             TargetFrameRate.Value = -1;
         }
+
+        if (CommandPrefix!.Value.Length != 1)
+        {
+            Nuclei.Logger?.LogWarning("CommandPrefix must be a single character! Resetting to default value.");
+            CommandPrefix.Value = DefaultCommandPrefix;
+        }
 
         ValidateForUserErrors();
 

Nuclei/Nuclei.csproj

@@ -7,7 +7,7 @@
         <PackageId>MaxWasUnavailable.Nuclei</PackageId>
         <Title>Nuclei</Title>
         <Description>A flexible and powerful dedicated server solution for Nuclear Option.</Description>
-        <Version>1.3.2</Version>
+        <Version>1.3.3</Version>
         <Authors>MaxWasUnavailable</Authors>
         <PackageTags>nuclear;option;bepinex</PackageTags>
 

Nuclei/Patches/ChatManagerPatches.cs

@@ -1,5 +1,6 @@
 using HarmonyLib;
 using Mirage;
+using Nuclei.Features;
 using Nuclei.Features.Commands;
 using Nuclei.Helpers;
 
@@ -17,7 +18,7 @@ private static bool UserCode_CmdSendChatMessage_1323305531Prefix(string message,
         if (!sender.TryGetPlayer(out var player)) 
             Nuclei.Logger?.LogWarning("Player component is null");
 
-        if (message.StartsWith("/") && message.Length > 1)
+        if (message.StartsWith(NucleiConfig.CommandPrefix!.Value) && message.Length > 1)
             if (CommandService.TryExecuteCommand(player!, message.Remove(0, 1)))
                 return false;