Remove static IoC from Replay and Shared EntryPoint (#41707)

This commit is contained in:
B_Kirill
2025-12-06 01:51:48 +10:00
committed by GitHub
parent ad8597c198
commit e360f6e03a
2 changed files with 10 additions and 9 deletions
+2 -2
View File
@@ -19,8 +19,8 @@ public sealed class EntryPoint : GameClient
public override void Init() public override void Init()
{ {
base.Init(); base.Init();
IoCManager.BuildGraph(); Dependencies.BuildGraph();
IoCManager.InjectDependencies(this); Dependencies.InjectDependencies(this);
} }
public override void PostInit() public override void PostInit()
+8 -7
View File
@@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Content.Shared.Humanoid.Markings; using Content.Shared.Humanoid.Markings;
using Content.Shared.IoC;
using Content.Shared.Maps; using Content.Shared.Maps;
using Robust.Shared; using Robust.Shared;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
@@ -21,12 +20,15 @@ namespace Content.Shared.Entry
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly IResourceManager _resMan = default!; [Dependency] private readonly IResourceManager _resMan = default!;
#if DEBUG
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
#endif
private readonly ResPath _ignoreFileDirectory = new("/IgnoredPrototypes/"); private readonly ResPath _ignoreFileDirectory = new("/IgnoredPrototypes/");
public override void PreInit() public override void PreInit()
{ {
IoCManager.InjectDependencies(this); Dependencies.InjectDependencies(this);
} }
public override void Shutdown() public override void Shutdown()
@@ -44,13 +46,12 @@ namespace Content.Shared.Entry
base.PostInit(); base.PostInit();
InitTileDefinitions(); InitTileDefinitions();
IoCManager.Resolve<MarkingManager>().Initialize(); Dependencies.Resolve<MarkingManager>().Initialize();
#if DEBUG #if DEBUG
var configMan = IoCManager.Resolve<IConfigurationManager>(); _configurationManager.OverrideDefault(CVars.NetFakeLagMin, 0.075f);
configMan.OverrideDefault(CVars.NetFakeLagMin, 0.075f); _configurationManager.OverrideDefault(CVars.NetFakeLoss, 0.005f);
configMan.OverrideDefault(CVars.NetFakeLoss, 0.005f); _configurationManager.OverrideDefault(CVars.NetFakeDuplicates, 0.005f);
configMan.OverrideDefault(CVars.NetFakeDuplicates, 0.005f);
#endif #endif
} }