Creating a command line option class + singleton

Author: noellie-velez

com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.Netcode
+{
+    public class CommandLineOptions
+    {
+        public static CommandLineOptions Instance { get; private set; } = null!;
+
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void RuntimeInitializeOnLoad() => Instance = new CommandLineOptions();
+
+        // Contains the current application instance domain's command line arguments
+        internal static List<string> CommandLineArguments = new List<string>();
+
+        // Invoked upon application start
+        [RuntimeInitializeOnLoadMethod]
+        private static void ParseCommandLineArguments()
+        {
+            // Get all the command line arguments to be parsed later and/or modified
+            // prior to being parsed (for testing purposes).
+            CommandLineArguments = new List<string>(Environment.GetCommandLineArgs());
+        }
+
+        /// <summary>
+        /// Returns the value of an argument or null if there the argument is not present
+        /// </summary>
+        /// <param name="arg">The name of the argument</param>
+        public string GetArg(string arg)
+        {
+            var argIndex = CommandLineArguments.IndexOf(arg);
+            if (argIndex >= 0 && argIndex < CommandLineArguments.Count - 1)
+            {
+                return CommandLineArguments[argIndex + 1];
+            }
+
+            return null;
+        }
+    }
+}

com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs.meta

@@ -808,29 +808,16 @@ public void SetClientRelayData(string ipAddress, ushort port, byte[] allocationI
         // Command line options
         private const string k_OverridePortArg = "-port";
 
-        private string GetArg(string[] commandLineArgs, string arg)
-        {
-            var argIndex = Array.IndexOf(commandLineArgs, arg);
-            if (argIndex >= 0 && argIndex < commandLineArgs.Length - 1)
-            {
-                return commandLineArgs[argIndex + 1];
-            }
-
-            return null;
-        }
-
         private bool ParseCommandLineOptions(out ushort port)
         {
 #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT
-
             if (UnityEngine.DedicatedServer.Arguments.Port != null)
             {
                 port = (ushort)UnityEngine.DedicatedServer.Arguments.Port;
                 return true;
             }
-
 #else
-            if (GetArg(Environment.GetCommandLineArgs(), k_OverridePortArg) is string argValue)
+            if (CommandLineOptions.Instance.GetArg(k_OverridePortArg) is string argValue)
             {
                 port = (ushort)Convert.ChangeType(argValue, typeof(ushort));
                 return true;
@@ -1626,14 +1613,14 @@ public override void Initialize(NetworkManager networkManager = null)
                 return;
             }
 #endif
-
             m_NetworkManager = networkManager;
 
+            //If the port doesn't have a forced value and is set by a command line option, override it.
             if (!m_HasForcedConnectionData && ParseCommandLineOptions(out var port))
             {
                 if (m_NetworkManager?.LogLevel <= LogLevel.Developer)
                 {
-                    Debug.Log($"Already has command line option set. Using connection data set to {ConnectionData.Address}:{port}");
+                    Debug.Log($"The port is set by a command line option. Using following connection data: {ConnectionData.Address}:{port}");
                 }
                 ConnectionData.Port = (ushort)port;
             }