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

Cleanup all instances of IMapManager.GetMapEntityId (#37814)

Browse Source 
* Cleanup all instances of IMapManager.GetMapEntityId

* Dependencies

* LocalizedEntityCommands
This commit is contained in:
Tayrtahn
2025-05-25 13:09:47 -04:00
committed by GitHub
parent e08a7f3c84
commit 50fb48de2e
8 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Maps/PlanetCommand.cs
View File

@@ -22,16 +22,16 @@ namespace Content.Server.Maps;
/// Converts the supplied map into a "planet" with defaults.
/// </summary>
[AdminCommand(AdminFlags.Mapping)]
public sealed class PlanetCommand : IConsoleCommand
public sealed class PlanetCommand : LocalizedEntityCommands
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IPrototypeManager _protoManager = default!;
[Dependency] private readonly SharedMapSystem _map = default!;
public string Command => "planet";
public string Description => Loc.GetString("cmd-planet-desc");
public string Help => Loc.GetString("cmd-planet-help", ("command", Command));
public void Execute(IConsoleShell shell, string argStr, string[] args)
public override string Command => "planet";
public override string Description => Loc.GetString("cmd-planet-desc");
public override string Help => Loc.GetString("cmd-planet-help", ("command", Command));
public override void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length != 2)
{
@@ -46,8 +46,7 @@ public sealed class PlanetCommand : IConsoleCommand
}
var mapId = new MapId(mapInt);
if (!_mapManager.MapExists(mapId))
if (!_map.MapExists(mapId))
{
shell.WriteError(Loc.GetString($"cmd-planet-map", ("map", mapId)));
return;
@@ -60,13 +59,13 @@ public sealed class PlanetCommand : IConsoleCommand
}
var biomeSystem = _entManager.System<BiomeSystem>();
var mapUid = _mapManager.GetMapEntityId(mapId);
var mapUid = _map.GetMapOrInvalid(mapId);
biomeSystem.EnsurePlanet(mapUid, biomeTemplate);
shell.WriteLine(Loc.GetString("cmd-planet-success", ("mapId", mapId)));
}
public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
{
if (args.Length == 1)
return CompletionResult.FromHintOptions(CompletionHelper.MapIds(_entManager), "Map Id");