From cd8d5a6a9c629fb75f5e45dc347e04ce64b79db3 Mon Sep 17 00:00:00 2001 From: B_Kirill <153602297+B-Kirill@users.noreply.github.com> Date: Sun, 28 Dec 2025 00:14:42 +1000 Subject: [PATCH] Cleanup warnings: CS0414, CS0618 (#42068) Cleanup --- .../Construction/UI/ConstructionMenuPresenter.cs | 6 +++++- Content.Client/Launcher/LauncherConnecting.cs | 8 ++++++-- Content.Server/Chat/Managers/ChatManager.cs | 7 ++++++- Content.Server/GameTicking/Commands/JoinGameCommand.cs | 10 ++++++++-- Content.Server/Traits/TraitSystem.cs | 2 -- Content.Shared/Fluids/SpraySafetySystem.cs | 2 -- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs index d5fee2bdda..6041b405c9 100644 --- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs +++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs @@ -30,7 +30,10 @@ namespace Content.Client.Construction.UI [Dependency] private readonly IUserInterfaceManager _uiManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!; + [Dependency] private readonly ILogManager _logManager = default!; + private readonly SpriteSystem _spriteSystem; + private readonly ISawmill _sawmill; private readonly IConstructionMenuView _constructionView; private readonly EntityWhitelistSystem _whitelistSystem; @@ -90,6 +93,7 @@ namespace Content.Client.Construction.UI _constructionView = new ConstructionMenu(); _whitelistSystem = _entManager.System(); _spriteSystem = _entManager.System(); + _sawmill = _logManager.GetSawmill("construction.ui"); // This is required so that if we load after the system is initialized, we can bind to it immediately if (_systemManager.TryGetEntitySystem(out var constructionSystem)) @@ -284,7 +288,7 @@ namespace Content.Client.Construction.UI if (!_constructionSystem!.TryGetRecipePrototype(recipe.ID, out var targetProtoId)) { - Logger.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.", + _sawmill.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.", recipe.ID, nameof(ConstructionPrototype)); continue; diff --git a/Content.Client/Launcher/LauncherConnecting.cs b/Content.Client/Launcher/LauncherConnecting.cs index 33d31cc52d..9b9c472781 100644 --- a/Content.Client/Launcher/LauncherConnecting.cs +++ b/Content.Client/Launcher/LauncherConnecting.cs @@ -20,8 +20,10 @@ namespace Content.Client.Launcher [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IClipboardManager _clipboard = default!; + [Dependency] private readonly ILogManager _logManager = default!; private LauncherConnectingGui? _control; + private ISawmill _sawmill = default!; private Page _currentPage; private string? _connectFailReason; @@ -61,6 +63,8 @@ namespace Content.Client.Launcher { _control = new LauncherConnectingGui(this, _random, _prototypeManager, _cfg, _clipboard); + _sawmill = _logManager.GetSawmill("launcher-ui"); + _userInterfaceManager.StateRoot.AddChild(_control); _clientNetManager.ConnectFailed += OnConnectFailed; @@ -115,12 +119,12 @@ namespace Content.Client.Launcher } else { - Logger.InfoS("launcher-ui", $"Redial not possible, no Ss14Address"); + _sawmill.Info($"Redial not possible, no Ss14Address"); } } catch (Exception ex) { - Logger.ErrorS("launcher-ui", $"Redial exception: {ex}"); + _sawmill.Error($"Redial exception: {ex}"); } return false; } diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index f90e286d9e..0843f80998 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -45,6 +45,9 @@ internal sealed partial class ChatManager : IChatManager [Dependency] private readonly PlayerRateLimitManager _rateLimitManager = default!; [Dependency] private readonly ISharedPlayerManager _player = default!; [Dependency] private readonly DiscordChatLink _discordLink = default!; + [Dependency] private readonly ILogManager _logManager = default!; + + private ISawmill _sawmill = default!; /// /// The maximum length a player-sent message can be sent @@ -64,6 +67,8 @@ internal sealed partial class ChatManager : IChatManager _configurationManager.OnValueChanged(CCVars.OocEnabled, OnOocEnabledChanged, true); _configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true); + _sawmill = _logManager.GetSawmill("SERVER"); + RegisterRateLimits(); } @@ -111,7 +116,7 @@ internal sealed partial class ChatManager : IChatManager { var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", FormattedMessage.EscapeText(message))); ChatMessageToAll(ChatChannel.Server, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride); - Logger.InfoS("SERVER", message); + _sawmill.Info(message); _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server announcement: {message}"); } diff --git a/Content.Server/GameTicking/Commands/JoinGameCommand.cs b/Content.Server/GameTicking/Commands/JoinGameCommand.cs index a32a2f9495..3f5e294754 100644 --- a/Content.Server/GameTicking/Commands/JoinGameCommand.cs +++ b/Content.Server/GameTicking/Commands/JoinGameCommand.cs @@ -17,6 +17,9 @@ namespace Content.Server.GameTicking.Commands [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly ILogManager _logManager = default!; + + private readonly ISawmill _sawmill; public string Command => "joingame"; public string Description => ""; @@ -25,7 +28,10 @@ namespace Content.Server.GameTicking.Commands public JoinGameCommand() { IoCManager.InjectDependencies(this); + + _sawmill = _logManager.GetSawmill("security"); } + public void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 2) @@ -46,8 +52,8 @@ namespace Content.Server.GameTicking.Commands if (ticker.PlayerGameStatuses.TryGetValue(player.UserId, out var status) && status == PlayerGameStatus.JoinedGame) { - Logger.InfoS("security", $"{player.Name} ({player.UserId}) attempted to latejoin while in-game."); - shell.WriteError($"{player.Name} is not in the lobby. This incident will be reported."); + _sawmill.Info($"{player.Name} ({player.UserId}) attempted to latejoin while in-game."); + shell.WriteError($"{player.Name} is not in the lobby. This incident will be reported."); return; } diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs index 010cb334da..0956bcb401 100644 --- a/Content.Server/Traits/TraitSystem.cs +++ b/Content.Server/Traits/TraitSystem.cs @@ -2,7 +2,6 @@ using Content.Shared.GameTicking; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Roles; -using Content.Shared.StatusEffectNew; using Content.Shared.Traits; using Content.Shared.Whitelist; using Robust.Shared.Prototypes; @@ -14,7 +13,6 @@ public sealed class TraitSystem : EntitySystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; public override void Initialize() { diff --git a/Content.Shared/Fluids/SpraySafetySystem.cs b/Content.Shared/Fluids/SpraySafetySystem.cs index c206bbda08..fa5377f046 100644 --- a/Content.Shared/Fluids/SpraySafetySystem.cs +++ b/Content.Shared/Fluids/SpraySafetySystem.cs @@ -1,7 +1,6 @@ using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Fluids.Components; using Content.Shared.Item.ItemToggle; -using Content.Shared.Popups; using Robust.Shared.Audio.Systems; namespace Content.Shared.Fluids; @@ -10,7 +9,6 @@ public sealed class SpraySafetySystem : EntitySystem { [Dependency] private readonly ItemToggleSystem _toggle = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; public override void Initialize() { -- 2.52.0