diff --git a/Content.Client/Audio/AmbientSoundSystem.cs b/Content.Client/Audio/AmbientSoundSystem.cs index e6ea94c3a6..9929751b22 100644 --- a/Content.Client/Audio/AmbientSoundSystem.cs +++ b/Content.Client/Audio/AmbientSoundSystem.cs @@ -3,17 +3,13 @@ using Content.Shared.CCVar; using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Shared.Audio; -using Robust.Shared.Log; using Robust.Shared.Configuration; -using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Random; using Robust.Shared.Timing; using Robust.Shared.Utility; using System.Linq; using System.Numerics; -using Robust.Client.GameObjects; -using Robust.Shared.Audio.Effects; using Robust.Shared.Audio.Systems; using Robust.Shared.Player; @@ -31,6 +27,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem [Dependency] private readonly SharedTransformSystem _xformSystem = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly IOverlayManager _overlayManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IRobustRandom _random = default!; @@ -65,18 +62,19 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem get => _overlayEnabled; set { - if (_overlayEnabled == value) return; + if (_overlayEnabled == value) + return; + _overlayEnabled = value; - var overlayManager = IoCManager.Resolve(); if (_overlayEnabled) { _overlay = new AmbientSoundOverlay(EntityManager, this, EntityManager.System()); - overlayManager.AddOverlay(_overlay); + _overlayManager.AddOverlay(_overlay); } else { - overlayManager.RemoveOverlay(_overlay!); + _overlayManager.RemoveOverlay(_overlay!); _overlay = null; } } diff --git a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs index bf7ab26cba..d82f6b07fb 100644 --- a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs +++ b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs @@ -3,11 +3,8 @@ using Content.Client.Gameplay; using Content.Shared.Audio; using Content.Shared.CCVar; using Content.Shared.GameTicking; -using Content.Shared.Random; using Content.Shared.Random.Rules; -using Robust.Client.GameObjects; using Robust.Client.Player; -using Robust.Client.ResourceManagement; using Robust.Client.State; using Robust.Shared.Audio; using Robust.Shared.Audio.Components; @@ -25,6 +22,7 @@ public sealed partial class ContentAudioSystem { [Dependency] private readonly IConfigurationManager _configManager = default!; [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly IPlayerManager _player = default!; [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IRobustRandom _random = default!; @@ -61,7 +59,7 @@ public sealed partial class ContentAudioSystem private void InitializeAmbientMusic() { Subs.CVar(_configManager, CCVars.AmbientMusicVolume, AmbienceCVarChanged, true); - _sawmill = IoCManager.Resolve().GetSawmill("audio.ambience"); + _sawmill = _logManager.GetSawmill("audio.ambience"); // Reset audio _nextAudio = TimeSpan.MaxValue; diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs index 0c72a8f99f..dc8fd98433 100644 --- a/Content.Client/NPC/PathfindingSystem.cs +++ b/Content.Client/NPC/PathfindingSystem.cs @@ -20,6 +20,7 @@ namespace Content.Client.NPC [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IInputManager _inputManager = default!; [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private readonly IOverlayManager _overlayManager = default!; [Dependency] private readonly IResourceCache _cache = default!; [Dependency] private readonly NPCSteeringSystem _steering = default!; [Dependency] private readonly MapSystem _mapSystem = default!; @@ -30,17 +31,15 @@ namespace Content.Client.NPC get => _modes; set { - var overlayManager = IoCManager.Resolve(); - if (value == PathfindingDebugMode.None) { Breadcrumbs.Clear(); Polys.Clear(); - overlayManager.RemoveOverlay(); + _overlayManager.RemoveOverlay(); } - else if (!overlayManager.HasOverlay()) + else if (!_overlayManager.HasOverlay()) { - overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem, _transformSystem)); + _overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem, _transformSystem)); } if ((value & PathfindingDebugMode.Steering) != 0x0) diff --git a/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs b/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs index 784c39a6ce..1f060e532d 100644 --- a/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs +++ b/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs @@ -11,6 +11,8 @@ namespace Content.Client.Radiation.Overlays; public sealed class RadiationDebugOverlay : Overlay { [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IResourceCache _cache = default!; + private readonly SharedMapSystem _mapSystem; private readonly RadiationSystem _radiation; @@ -24,8 +26,7 @@ public sealed class RadiationDebugOverlay : Overlay _radiation = _entityManager.System(); _mapSystem = _entityManager.System(); - var cache = IoCManager.Resolve(); - _font = new VectorFont(cache.GetResource("/Fonts/NotoSans/NotoSans-Regular.ttf"), 8); + _font = new VectorFont(_cache.GetResource("/Fonts/NotoSans/NotoSans-Regular.ttf"), 8); } protected override void Draw(in OverlayDrawArgs args) diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs index 56b54c176a..f6e6594af5 100644 --- a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs +++ b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs @@ -16,20 +16,20 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem get => _enableShuttlePosition; set { - if (_enableShuttlePosition == value) return; + if (_enableShuttlePosition == value) + return; _enableShuttlePosition = value; - var overlayManager = IoCManager.Resolve(); if (_enableShuttlePosition) { _overlay = new EmergencyShuttleOverlay(EntityManager.TransformQuery, XformSystem); - overlayManager.AddOverlay(_overlay); + _overlays.AddOverlay(_overlay); RaiseNetworkEvent(new EmergencyShuttleRequestPositionMessage()); } else { - overlayManager.RemoveOverlay(_overlay!); + _overlays.RemoveOverlay(_overlay!); _overlay = null; } } diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs index 6abebda6ee..c27e81b5c7 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs @@ -30,6 +30,7 @@ public sealed partial class GunSystem : SharedGunSystem { [Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private readonly IOverlayManager _overlayManager = default!; [Dependency] private readonly IPlayerManager _player = default!; [Dependency] private readonly IStateManager _state = default!; [Dependency] private readonly AnimationPlayerSystem _animPlayer = default!; @@ -50,11 +51,10 @@ public sealed partial class GunSystem : SharedGunSystem return; _spreadOverlay = value; - var overlayManager = IoCManager.Resolve(); if (_spreadOverlay) { - overlayManager.AddOverlay(new GunSpreadOverlay( + _overlayManager.AddOverlay(new GunSpreadOverlay( EntityManager, _eyeManager, Timing, @@ -65,7 +65,7 @@ public sealed partial class GunSystem : SharedGunSystem } else { - overlayManager.RemoveOverlay(); + _overlayManager.RemoveOverlay(); } } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 31f86d0236..32da51f8bb 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -8,7 +8,6 @@ using Content.Shared.CombatMode; using Content.Shared.Containers.ItemSlots; using Content.Shared.Damage; using Content.Shared.Examine; -using Content.Shared.Gravity; using Content.Shared.Hands; using Content.Shared.Hands.EntitySystems; using Content.Shared.Popups; @@ -27,7 +26,6 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Network; -using Robust.Shared.Physics; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Systems; using Robust.Shared.Prototypes; @@ -57,7 +55,6 @@ public abstract partial class SharedGunSystem : EntitySystem [Dependency] protected readonly SharedAudioSystem Audio = default!; [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; [Dependency] protected readonly SharedContainerSystem Containers = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; [Dependency] protected readonly SharedPointLightSystem Lights = default!; [Dependency] protected readonly SharedPopupSystem PopupSystem = default!; [Dependency] protected readonly SharedPhysicsSystem Physics = default!;