tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the last bits of dependencies on localization manager (#2127)

Browse Source 
* Removed the last bits of dependencies on localization manager

* Updated submodules to resolve error

Co-authored-by: David Tan <>
This commit is contained in:
DTanxxx
2020-09-27 01:30:13 +12:00
committed by GitHub
parent 4b9d488c1e
commit 3e6f0eef58
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Sandbox/SandboxManager.cs
View File

@@ -77,7 +77,6 @@ namespace Content.Client.Sandbox
[Dependency] private readonly IClientConsole _console = default!; [Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IGameHud _gameHud = default!; [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IClientNetManager _netManager = default!; [Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private readonly ILocalizationManager _localization = default!;
[Dependency] private readonly IPlacementManager _placementManager = default!; [Dependency] private readonly IPlacementManager _placementManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!; [Dependency] private readonly IResourceCache _resourceCache = default!;
@@ -241,7 +240,7 @@ namespace Content.Client.Sandbox
private void ToggleEntitySpawnWindow() private void ToggleEntitySpawnWindow()
{ {
if (_spawnWindow == null) if (_spawnWindow == null)
_spawnWindow = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache, _localization); _spawnWindow = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
if (_spawnWindow.IsOpen) if (_spawnWindow.IsOpen)
{ {
@@ -249,7 +248,7 @@ namespace Content.Client.Sandbox
} }
else else
{ {
_spawnWindow = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache, _localization); _spawnWindow = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
_spawnWindow.OpenToLeft(); _spawnWindow.OpenToLeft();
} }
} }

3
Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs
View File

@@ -438,8 +438,7 @@ namespace Content.Client.UserInterface.AdminMenu
var manager = IoCManager.Resolve<IAdminMenuManager>(); var manager = IoCManager.Resolve<IAdminMenuManager>();
var window = new EntitySpawnWindow(IoCManager.Resolve<IPlacementManager>(), var window = new EntitySpawnWindow(IoCManager.Resolve<IPlacementManager>(),
IoCManager.Resolve<IPrototypeManager>(), IoCManager.Resolve<IPrototypeManager>(),
IoCManager.Resolve<IResourceCache>(), IoCManager.Resolve<IResourceCache>());
IoCManager.Resolve<ILocalizationManager>());
manager.OpenCommand(window); manager.OpenCommand(window);
} }
} }

3
Content.Shared/EntryPoint.cs
View File

@@ -18,7 +18,6 @@
[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 ILocalizationManager _localizationManager = default!;
public override void PreInit() public override void PreInit()
{ {
@@ -28,7 +27,7 @@
textMacroFactory.DoAutoRegistrations(); textMacroFactory.DoAutoRegistrations();
// Default to en-US. // Default to en-US.
_localizationManager.LoadCulture(new CultureInfo(Culture)); Loc.LoadCulture(new CultureInfo(Culture));
} }
public override void Init() public override void Init()