From 546bfd0a3059aeb1ead3c212f0c37b360c1dff7e Mon Sep 17 00:00:00 2001 From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com> Date: Sun, 8 Jun 2025 20:09:42 -0400 Subject: [PATCH] MapManager warnings cleanup Server Edition 2003 (#36781) * now you see me * unused depen * test fail fix attempt 1 * test fail fix attempt 2 * fix test fail attempt 3 * shot in the dark. * Does this work? * import cleanup * taking a shot at this. * Convert PersistenceSaveCommand to LocalizedEntityCommands. * requested changes * requested changes. also dealt with improperly named private const * Update Content.Server/GameTicking/GameTicker.Spawning.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/GameTicking/GameTicker.Spawning.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Convert PlanetCommand to LocalizedEntityCommand * Update BiomeSystem.cs * Update Content.Server/Salvage/SalvageSystem.Runner.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Procedural/DungeonSystem.Rooms.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Salvage/SpawnSalvageMissionJob.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Station/Systems/StationBiomeSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * revert to latest master. * slartis suggestion. * Update SetMapAtmosCommand.cs * cleanup * Update PersistenceSaveCommand.cs * finish localizing persistencesavecommand * this is icky, I change. * :sigh: * revert whatever I did here? * oh I see, some inconsistencies. * revert this * Update PlanetCommand.cs * move this ftl to the commands folder --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Administration/Commands/PersistenceSaveCommand.cs | 7 ++----- Content.Server/Polymorph/Systems/PolymorphSystem.cs | 1 - Content.Shared/Weather/SharedWeatherSystem.cs | 1 - .../Locale/en-US/commands/persistence-save-command.ftl | 3 +++ Resources/Locale/en-US/persistence/command.ftl | 1 - 5 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 Resources/Locale/en-US/commands/persistence-save-command.ftl delete mode 100644 Resources/Locale/en-US/persistence/command.ftl diff --git a/Content.Server/Administration/Commands/PersistenceSaveCommand.cs b/Content.Server/Administration/Commands/PersistenceSaveCommand.cs index 56ad2be260..269e651e81 100644 --- a/Content.Server/Administration/Commands/PersistenceSaveCommand.cs +++ b/Content.Server/Administration/Commands/PersistenceSaveCommand.cs @@ -12,12 +12,10 @@ namespace Content.Server.Administration.Commands; public sealed class PersistenceSave : LocalizedEntityCommands { [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IEntitySystemManager _system = default!; [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private readonly MapLoaderSystem _mapLoader = default!; public override string Command => "persistencesave"; - public override string Description => "Saves server data to a persistence file to be loaded later."; - public override string Help => "persistencesave [mapId] [filePath - default: game.map (CCVar) ]"; public override void Execute(IConsoleShell shell, string argStr, string[] args) { @@ -47,8 +45,7 @@ public sealed class PersistenceSave : LocalizedEntityCommands return; } - var mapLoader = _system.GetEntitySystem(); - mapLoader.TrySaveMap(mapId, new ResPath(saveFilePath)); + _mapLoader.TrySaveMap(mapId, new ResPath(saveFilePath)); shell.WriteLine(Loc.GetString("cmd-savemap-success")); } } diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs index 5976594a57..c134eca114 100644 --- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs +++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs @@ -20,7 +20,6 @@ using Content.Shared.Popups; using Robust.Server.Audio; using Robust.Server.Containers; using Robust.Server.GameObjects; -using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Content.Shared/Weather/SharedWeatherSystem.cs b/Content.Shared/Weather/SharedWeatherSystem.cs index 382af64565..b537884950 100644 --- a/Content.Shared/Weather/SharedWeatherSystem.cs +++ b/Content.Shared/Weather/SharedWeatherSystem.cs @@ -13,7 +13,6 @@ namespace Content.Shared.Weather; public abstract class SharedWeatherSystem : EntitySystem { [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] protected readonly IMapManager MapManager = default!; [Dependency] protected readonly IPrototypeManager ProtoMan = default!; [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; [Dependency] private readonly MetaDataSystem _metadata = default!; diff --git a/Resources/Locale/en-US/commands/persistence-save-command.ftl b/Resources/Locale/en-US/commands/persistence-save-command.ftl new file mode 100644 index 0000000000..d12ff8cbee --- /dev/null +++ b/Resources/Locale/en-US/commands/persistence-save-command.ftl @@ -0,0 +1,3 @@ +cmd-persistencesave-desc = Saves server data to a persistence file to be loaded later. +cmd-persistencesave-usage = persistencesave [mapId] [filePath - default: game.map (CCVar) ] +cmd-persistencesave-no-path = filePath was not specified and CCVar {$cvar} is not set. Manually set the filePath param in order to save the map. diff --git a/Resources/Locale/en-US/persistence/command.ftl b/Resources/Locale/en-US/persistence/command.ftl deleted file mode 100644 index b070aee115..0000000000 --- a/Resources/Locale/en-US/persistence/command.ftl +++ /dev/null @@ -1 +0,0 @@ -cmd-persistencesave-no-path = filePath was not specified and CCVar {$cvar} is not set. Manually set the filePath param in order to save the map.