wylab/wylab-station-14
1
1
Fork 0
forked from space-syndicate/space-station-14
Code Pull Requests 2 Actions 27 Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Replay/EntryPoint.cs
View File

@@ -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()

15
Content.Shared/Entry/EntryPoint.cs
View File

@@ -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<MarkingManager>().Initialize();
Dependencies.Resolve<MarkingManager>().Initialize();
#if DEBUG
var configMan = IoCManager.Resolve<IConfigurationManager>();
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
}