Replace pragma warning 649 disable/restore with default!

Content.Client/State/GameScreen.cs

@@ -14,12 +14,10 @@ namespace Content.Client.State
 {
     public class GameScreen : GameScreenBase
     {
-#pragma warning disable 649
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private readonly IGameHud _gameHud;
-        [Dependency] private readonly IInputManager _inputManager;
-        [Dependency] private readonly IChatManager _chatManager;
-#pragma warning restore 649
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IChatManager _chatManager = default!;
 
         [ViewVariables] private ChatBox _gameChat;
 

Content.Client/State/GameScreenBase.cs

@@ -28,17 +28,15 @@ namespace Content.Client.State
     // Instantiated dynamically through the StateManager, Dependencies will be resolved.
     public partial class GameScreenBase : Robust.Client.State.State
     {
-#pragma warning disable 649
-        [Dependency] protected readonly IClientEntityManager EntityManager;
-        [Dependency] protected readonly IInputManager InputManager;
-        [Dependency] protected readonly IPlayerManager PlayerManager;
-        [Dependency] protected readonly IEyeManager EyeManager;
-        [Dependency] protected readonly IEntitySystemManager EntitySystemManager;
-        [Dependency] protected readonly IGameTiming Timing;
-        [Dependency] protected readonly IMapManager MapManager;
-        [Dependency] protected readonly IUserInterfaceManager UserInterfaceManager;
-        [Dependency] protected readonly IConfigurationManager ConfigurationManager;
-#pragma warning restore 649
+        [Dependency] protected readonly IClientEntityManager EntityManager = default!;
+        [Dependency] protected readonly IInputManager InputManager = default!;
+        [Dependency] protected readonly IPlayerManager PlayerManager = default!;
+        [Dependency] protected readonly IEyeManager EyeManager = default!;
+        [Dependency] protected readonly IEntitySystemManager EntitySystemManager = default!;
+        [Dependency] protected readonly IGameTiming Timing = default!;
+        [Dependency] protected readonly IMapManager MapManager = default!;
+        [Dependency] protected readonly IUserInterfaceManager UserInterfaceManager = default!;
+        [Dependency] protected readonly IConfigurationManager ConfigurationManager = default!;
 
         private IEntity _lastHoveredEntity;
 

Content.Client/State/LauncherConnecting.cs

@@ -16,13 +16,11 @@ namespace Content.Client.State
 {
     public class LauncherConnecting : Robust.Client.State.State
     {
-#pragma warning disable 649
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private readonly IStylesheetManager _stylesheetManager;
-        [Dependency] private readonly IClientNetManager _clientNetManager;
-        [Dependency] private readonly IGameController _gameController;
-        [Dependency] private readonly IBaseClient _baseClient;
-#pragma warning restore 649
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IStylesheetManager _stylesheetManager = default!;
+        [Dependency] private readonly IClientNetManager _clientNetManager = default!;
+        [Dependency] private readonly IGameController _gameController = default!;
+        [Dependency] private readonly IBaseClient _baseClient = default!;
 
         private Control _control;
         private Label _connectStatus;

Content.Client/State/LobbyState.cs

@@ -24,19 +24,17 @@ namespace Content.Client.State
 {
     public class LobbyState : Robust.Client.State.State
     {
-#pragma warning disable 649
-        [Dependency] private readonly IBaseClient _baseClient;
-        [Dependency] private readonly IClientConsole _console;
-        [Dependency] private readonly IChatManager _chatManager;
-        [Dependency] private readonly IInputManager _inputManager;
-        [Dependency] private readonly IEntityManager _entityManager;
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly IClientGameTicker _clientGameTicker;
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private readonly IClientPreferencesManager _preferencesManager;
-#pragma warning restore 649
+        [Dependency] private readonly IBaseClient _baseClient = default!;
+        [Dependency] private readonly IClientConsole _console = default!;
+        [Dependency] private readonly IChatManager _chatManager = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IClientGameTicker _clientGameTicker = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
 
         [ViewVariables] private CharacterSetupGui _characterSetup;
         [ViewVariables] private LobbyGui _lobby;
@@ -215,7 +213,7 @@ namespace Content.Client.State
 
             foreach (var session in _playerManager.Sessions.OrderBy(s => s.Name))
             {
-                
+
 
                 var readyState = "";
                 // Don't show ready state if we're ingame

Content.Client/State/MainMenu.cs

@@ -27,15 +27,13 @@ namespace Content.Client.State
     {
         private const string PublicServerAddress = "server.spacestation14.io";
 
-#pragma warning disable 649
-        [Dependency] private readonly IBaseClient _client;
-        [Dependency] private readonly IClientNetManager _netManager;
-        [Dependency] private readonly IConfigurationManager _configurationManager;
-        [Dependency] private readonly IGameController _controllerProxy;
-        [Dependency] private readonly ILocalizationManager _loc;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly IUserInterfaceManager userInterfaceManager;
-#pragma warning restore 649
+        [Dependency] private readonly IBaseClient _client = default!;
+        [Dependency] private readonly IClientNetManager _netManager = default!;
+        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+        [Dependency] private readonly IGameController _controllerProxy = default!;
+        [Dependency] private readonly ILocalizationManager _loc = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
 
         private MainMenuControl _mainMenuControl;
         private OptionsMenu OptionsMenu;
@@ -48,7 +46,7 @@ namespace Content.Client.State
         public override void Startup()
         {
             _mainMenuControl = new MainMenuControl(_resourceCache, _configurationManager);
-            userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
+            _userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
 
             _mainMenuControl.QuitButton.OnPressed += QuitButtonPressed;
             _mainMenuControl.OptionsButton.OnPressed += OptionsButtonPressed;
@@ -108,7 +106,7 @@ namespace Content.Client.State
             if (!UsernameHelpers.IsNameValid(inputName, out var reason))
             {
                 var invalidReason = _loc.GetString(reason.ToText());
-                userInterfaceManager.Popup(
+                _userInterfaceManager.Popup(
                     _loc.GetString("Invalid username:\n{0}", invalidReason),
                     _loc.GetString("Invalid Username"));
                 return;
@@ -130,7 +128,7 @@ namespace Content.Client.State
             }
             catch (ArgumentException e)
             {
-                userInterfaceManager.Popup($"Unable to connect: {e.Message}", "Connection error.");
+                _userInterfaceManager.Popup($"Unable to connect: {e.Message}", "Connection error.");
                 Logger.Warning(e.ToString());
                 _netManager.ConnectFailed -= _onConnectFailed;
             }
@@ -185,7 +183,7 @@ namespace Content.Client.State
 
         private void _onConnectFailed(object _, NetConnectFailArgs args)
         {
-            userInterfaceManager.Popup($"Failed to connect:\n{args.Reason}");
+            _userInterfaceManager.Popup($"Failed to connect:\n{args.Reason}");
             _netManager.ConnectFailed -= _onConnectFailed;
             _setConnectingState(false);
         }