From e360f6e03a214394f958635a9267fa4cc12faf74 Mon Sep 17 00:00:00 2001 From: B_Kirill <153602297+B-Kirill@users.noreply.github.com> Date: Sat, 6 Dec 2025 01:51:48 +1000 Subject: [PATCH] Remove static IoC from Replay and Shared EntryPoint (#41707) --- Content.Replay/EntryPoint.cs | 4 ++-- Content.Shared/Entry/EntryPoint.cs | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Content.Replay/EntryPoint.cs b/Content.Replay/EntryPoint.cs index ed6460a7e7..6a6658f5ef 100644 --- a/Content.Replay/EntryPoint.cs +++ b/Content.Replay/EntryPoint.cs @@ -19,8 +19,8 @@ public sealed class EntryPoint : GameClient public override void Init() { base.Init(); - IoCManager.BuildGraph(); - IoCManager.InjectDependencies(this); + Dependencies.BuildGraph(); + Dependencies.InjectDependencies(this); } public override void PostInit() diff --git a/Content.Shared/Entry/EntryPoint.cs b/Content.Shared/Entry/EntryPoint.cs index db8d6a6abd..1b5755dd66 100644 --- a/Content.Shared/Entry/EntryPoint.cs +++ b/Content.Shared/Entry/EntryPoint.cs @@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; using Content.Shared.Humanoid.Markings; -using Content.Shared.IoC; using Content.Shared.Maps; using Robust.Shared; using Robust.Shared.Configuration; @@ -21,12 +20,15 @@ namespace Content.Shared.Entry [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private readonly IResourceManager _resMan = default!; +#if DEBUG + [Dependency] private readonly IConfigurationManager _configurationManager = default!; +#endif private readonly ResPath _ignoreFileDirectory = new("/IgnoredPrototypes/"); public override void PreInit() { - IoCManager.InjectDependencies(this); + Dependencies.InjectDependencies(this); } public override void Shutdown() @@ -44,13 +46,12 @@ namespace Content.Shared.Entry base.PostInit(); InitTileDefinitions(); - IoCManager.Resolve().Initialize(); + Dependencies.Resolve().Initialize(); #if DEBUG - var configMan = IoCManager.Resolve(); - configMan.OverrideDefault(CVars.NetFakeLagMin, 0.075f); - configMan.OverrideDefault(CVars.NetFakeLoss, 0.005f); - configMan.OverrideDefault(CVars.NetFakeDuplicates, 0.005f); + _configurationManager.OverrideDefault(CVars.NetFakeLagMin, 0.075f); + _configurationManager.OverrideDefault(CVars.NetFakeLoss, 0.005f); + _configurationManager.OverrideDefault(CVars.NetFakeDuplicates, 0.005f); #endif } -- 2.52.0