Removes all engine use of IMapManager

Resources/Locale/en-US/commands.ftl

@@ -306,6 +306,15 @@ cmd-addmap-help = Usage: {$command} <mapID> [pre-init]
 cmd-rmmap-desc = Removes a map from the world. You cannot remove nullspace.
 cmd-rmmap-help = Usage: {$command} <mapId>
 
+cmd-pausemap-desc = Pauses a map, pausing all simulation processing on it.
+cmd-pausemap-help = Usage: pausemap <map ID>
+
+cmd-unpausemap-desc = Unpauses a map, resuming all simulation processing on it.
+cmd-unpausemap-help = Usage: unpausemap <map ID>
+
+cmd-querymappaused-desc = Check whether a map is paused or not.
+cmd-querymappaused-help = Usage: querymappaused <map ID>
+
 cmd-savegrid-desc = Serializes a grid to disk.
 cmd-savegrid-help = Usage: {$command} <gridID> <Path>
 

Robust.Benchmarks/Transform/RecursiveMoveBenchmark.cs

@@ -47,7 +47,6 @@ public void GlobalSetup()
 
         Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()).Wait();
 
-        var mapMan = server.ResolveDependency<IMapManager>();
         _entMan = server.ResolveDependency<IEntityManager>();
         var confMan = server.ResolveDependency<IConfigurationManager>();
         var sPlayerMan = server.ResolveDependency<ISharedPlayerManager>();
@@ -92,7 +91,7 @@ public void GlobalSetup()
         server.WaitPost(() =>
         {
             var map = server.ResolveDependency<SharedMapSystem>().CreateMap(out var mapId);
-            var gridComp = mapMan.CreateGridEntity(mapId);
+            var gridComp = mapSys.CreateGridEntity(mapId);
             var grid = gridComp.Owner;
             mapSys.SetTile(grid, gridComp, Vector2i.Zero, new Tile(1));
             _gridCoords = new EntityCoordinates(grid, .5f, .5f);

Robust.Client.IntegrationTests/GameObjects/Components/TransformComponentTests.cs

@@ -19,12 +19,13 @@ private static (ISimulation, EntityUid gridA, EntityUid gridB)  SimulationFactor
                 .NewSimulation()
                 .InitializeInstance();
 
-            var mapId = sim.Resolve<IEntityManager>().System<SharedMapSystem>().CreateMap();
-            var mapManager = sim.Resolve<IMapManager>();
+            var entMan = sim.Resolve<IEntityManager>();
+            var mapSys = entMan.System<SharedMapSystem>();
+            var mapId = mapSys.CreateMap();
 
             // Adds two grids to use in tests.
-            var gridA = mapManager.CreateGridEntity(mapId);
-            var gridB = mapManager.CreateGridEntity(mapId);
+            var gridA = mapSys.CreateGridEntity(mapId);
+            var gridB = mapSys.CreateGridEntity(mapId);
 
             return (sim, gridA, gridB);
         }

Robust.Client/Console/Commands/Debug.cs

@@ -718,7 +718,6 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
 
     internal sealed partial class ChunkInfoCommand : LocalizedEntityCommands
     {
-        [Dependency] private IMapManager _map = default!;
         [Dependency] private IEyeManager _eye = default!;
         [Dependency] private IInputManager _input = default!;
         [Dependency] private SharedMapSystem _mapSystem = default!;
@@ -729,7 +728,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var mousePos = _eye.PixelToMap(_input.MouseScreenPosition);
 
-            if (!_map.TryFindGridAt(mousePos, out var gridUid, out var grid))
+            if (!_mapSystem.TryFindGridAt(mousePos, out var gridUid, out var grid))
             {
                 shell.WriteLine("No grid under your mouse cursor.");
                 return;

Robust.Client/Debugging/DebugAnchoringSystem.cs

@@ -17,7 +17,6 @@ public sealed partial class DebugAnchoringSystem : EntitySystem
     {
         [Dependency] private IEyeManager _eyeManager = default!;
         [Dependency] private IInputManager _inputManager = default!;
-        [Dependency] private IMapManager _mapManager = default!;
         [Dependency] private IUserInterfaceManager _userInterface = default!;
         [Dependency] private MapSystem _mapSystem = default!;
 
@@ -64,7 +63,7 @@ public override void FrameUpdate(float frameTime)
             var mouseSpot = _inputManager.MouseScreenPosition;
             var spot = _eyeManager.PixelToMap(mouseSpot);
 
-            if (!_mapManager.TryFindGridAt(spot, out var gridUid, out var grid))
+            if (!_mapSystem.TryFindGridAt(spot, out var gridUid, out var grid))
             {
                 _label.Text = string.Empty;
                 _hovered = null;

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -84,7 +84,7 @@ public sealed partial class DebugPhysicsSystem : SharedDebugPhysicsSystem
         [Dependency] private IOverlayManager _overlay = default!;
         [Dependency] private IEyeManager _eye = default!;
         [Dependency] private IInputManager _input = default!;
-        [Dependency] private IMapManager _map = default!;
+        [Dependency] private SharedMapSystem _map = default!;
         [Dependency] private IPlayerManager _player = default!;
         [Dependency] private IResourceCache _resourceCache = default!;
 
@@ -103,13 +103,13 @@ public PhysicsDebugFlags Flags
                             EntityManager,
                             _eye,
                             _input,
-                            _map,
                             _player,
                             _resourceCache,
                             this,
                             _entityLookup,
                             _physics,
-                            _transform));
+                            _transform,
+                            _map));
 
                 if (value == PhysicsDebugFlags.None)
                     _overlay.RemoveOverlay(typeof(PhysicsDebugOverlay));
@@ -203,12 +203,12 @@ internal sealed class PhysicsDebugOverlay : Overlay
         private readonly IEntityManager _entityManager;
         private readonly IEyeManager _eyeManager;
         private readonly IInputManager _inputManager;
-        private readonly IMapManager _mapManager;
         private readonly IPlayerManager _playerManager;
         private readonly DebugPhysicsSystem _debugPhysicsSystem;
         private readonly EntityLookupSystem _lookup;
         private readonly SharedPhysicsSystem _physicsSystem;
         private readonly SharedTransformSystem _transformSystem;
+        private readonly SharedMapSystem _mapSystem;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace | OverlaySpace.ScreenSpace;
 
@@ -219,20 +219,26 @@ internal sealed class PhysicsDebugOverlay : Overlay
         private HashSet<Joint> _drawnJoints = new();
         private List<Entity<MapGridComponent>> _grids = new();
 
-        public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem, SharedTransformSystem transformSystem)
+        public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem, SharedTransformSystem transformSystem, SharedMapSystem mapSystem)
         {
             _entityManager = entityManager;
             _eyeManager = eyeManager;
             _inputManager = inputManager;
-            _mapManager = mapManager;
             _playerManager = playerManager;
             _debugPhysicsSystem = system;
             _lookup = lookup;
             _physicsSystem = physicsSystem;
             _transformSystem = transformSystem;
+            _mapSystem = mapSystem;
             _font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
         }
 
+        [Obsolete("use the constructor that does not take IMapManager")]
+        public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem, SharedTransformSystem transformSystem, SharedMapSystem? mapSystem = null)
+            : this(entityManager, eyeManager, inputManager, playerManager, cache, system, lookup, physicsSystem, transformSystem, mapSystem ?? entityManager.System<SharedMapSystem>())
+        {
+        }
+
         private void DrawWorld(DrawingHandleWorld worldHandle, OverlayDrawArgs args)
         {
             var viewBounds = args.WorldBounds;
@@ -293,7 +299,7 @@ private void DrawWorld(DrawingHandleWorld worldHandle, OverlayDrawArgs args)
                 }
 
                 _grids.Clear();
-                _mapManager.FindGridsIntersecting(mapId, viewBounds, ref _grids);
+                _mapSystem.FindGridsIntersecting(mapId, viewBounds, ref _grids);
 
                 foreach (var grid in _grids)
                 {

Robust.Client/Debugging/Overlays/TileDebugOverlay.cs

@@ -25,6 +25,7 @@ public abstract partial class TileDebugOverlay : Overlay, IPostInjectInit
 {
     [Dependency] protected IEntityManager Entity = default!;
     [Dependency] protected IEyeManager Eye = default!;
+    [Obsolete("use SharedMapSystem")]
     [Dependency] protected IMapManager MapMan = default!;
     [Dependency] protected IInputManager Input = default!;
     [Dependency] protected IUserInterfaceManager Ui = default!;
@@ -59,7 +60,7 @@ protected internal override void Draw(in OverlayDrawArgs args)
         if (args.Viewport.Eye?.Position.MapId is not {} map || map == MapId.Nullspace)
             return;
 
-        MapMan.FindGridsIntersecting(map, args.WorldBounds, ref Grids);
+        Map.FindGridsIntersecting(map, args.WorldBounds, ref Grids);
 
         foreach (var grid in Grids)
         {
@@ -108,7 +109,7 @@ protected virtual void DrawTooltip(DrawingHandleScreen handle)
 
         var coords = viewport.PixelToMap(mousePos.Position);
 
-        if (!MapMan.TryFindGridAt(coords, out var grid, out var comp))
+        if (!Map.TryFindGridAt(coords, out var grid, out var comp))
             return;
 
         var local = Map.WorldToLocal(grid, comp, coords.Position);

Robust.Client/GameObjects/EntitySystems/DebugLightTreeSystem.cs

@@ -27,8 +27,6 @@ public bool Enabled
                 {
                     _lightOverlay = new DebugLightOverlay(
                         EntityManager.System<EntityLookupSystem>(),
-                        IoCManager.Resolve<IEyeManager>(),
-                        IoCManager.Resolve<IMapManager>(),
                         EntityManager.System<LightTreeSystem>());
 
                     overlayManager.AddOverlay(_lightOverlay);
@@ -46,18 +44,14 @@ public bool Enabled
         private sealed class DebugLightOverlay : Overlay
         {
             private EntityLookupSystem _lookup;
-            private IEyeManager _eyeManager;
-            private IMapManager _mapManager;
 
             private LightTreeSystem _trees;
 
             public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-            public DebugLightOverlay(EntityLookupSystem lookup, IEyeManager eyeManager, IMapManager mapManager, LightTreeSystem trees)
+            public DebugLightOverlay(EntityLookupSystem lookup, LightTreeSystem trees)
             {
                 _lookup = lookup;
-                _eyeManager = eyeManager;
-                _mapManager = mapManager;
                 _trees = trees;
             }
 

Robust.Client/GameObjects/EntitySystems/GridChunkBoundsDebugSystem.cs

@@ -4,7 +4,6 @@
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
@@ -15,8 +14,6 @@ namespace Robust.Client.GameObjects
 {
     public sealed partial class GridChunkBoundsDebugSystem : EntitySystem
     {
-        [Dependency] private IEyeManager _eyeManager = default!;
-        [Dependency] private IMapManager _mapManager = default!;
         [Dependency] private IOverlayManager _overlayManager = default!;
         [Dependency] private TransformSystem _transform = default!;
         [Dependency] private SharedMapSystem _map = default!;
@@ -37,8 +34,6 @@ public bool Enabled
                     DebugTools.Assert(_overlay == null);
                     _overlay = new GridChunkBoundsOverlay(
                         EntityManager,
-                        _eyeManager,
-                        _mapManager,
                         _transform,
                         _map);
 
@@ -58,20 +53,16 @@ public bool Enabled
     internal sealed class GridChunkBoundsOverlay : Overlay
     {
         private readonly IEntityManager _entityManager;
-        private readonly IEyeManager _eyeManager;
-        private readonly IMapManager _mapManager;
         private readonly SharedTransformSystem _transformSystem;
         private readonly SharedMapSystem _mapSystem;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
         private List<Entity<MapGridComponent>> _grids = new();
 
-        public GridChunkBoundsOverlay(IEntityManager entManager, IEyeManager eyeManager, IMapManager mapManager, SharedTransformSystem transformSystem, SharedMapSystem mapSystem)
+        public GridChunkBoundsOverlay(IEntityManager entManager, SharedTransformSystem transformSystem, SharedMapSystem mapSystem)
         {
             _entityManager = entManager;
-            _eyeManager = eyeManager;
-            _mapManager = mapManager;
             _transformSystem = transformSystem;
             _mapSystem = mapSystem;
         }
@@ -84,7 +75,7 @@ protected internal override void Draw(in OverlayDrawArgs args)
 
             var fixturesQuery = _entityManager.GetEntityQuery<FixturesComponent>();
             _grids.Clear();
-            _mapManager.FindGridsIntersecting(currentMap, viewport, ref _grids);
+            _mapSystem.FindGridsIntersecting(currentMap, viewport, ref _grids);
             foreach (var grid in _grids)
             {
                 var worldMatrix = _transformSystem.GetWorldMatrix(grid);

Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs

@@ -52,19 +52,18 @@ private void RenderTileEdgesChanges(bool value)
         private void _drawGrids(Viewport viewport, Box2 worldAABB, Box2Rotated worldBounds, IEye eye)
         {
             var mapId = eye.Position.MapId;
-            if (!_mapManager.MapExists(mapId))
+            if (!_mapSystem.MapExists(mapId))
             {
                 // fall back to nullspace map
                 mapId = MapId.Nullspace;
             }
 
             _grids.Clear();
-            _mapManager.FindGridsIntersecting(mapId, worldBounds, ref _grids);
+            _mapSystem.FindGridsIntersecting(mapId, worldBounds, ref _grids);
 
             var requiresFlush = true;
             GLShaderProgram gridProgram = default!;
             var gridOverlays = GetOverlaysForSpace(OverlaySpace.WorldSpaceGrids);
-            var mapSystem = _entityManager.System<SharedMapSystem>();
 
             foreach (var mapGrid in _grids)
             {
@@ -86,7 +85,7 @@ private void _drawGrids(Viewport viewport, Box2 worldAABB, Box2Rotated worldBoun
                 }
 
                 gridProgram.SetUniform(UniIModelMatrix, _transformSystem.GetWorldMatrix(mapGrid));
-                var enumerator = mapSystem.GetMapChunks(mapGrid.Owner, mapGrid.Comp, worldBounds);
+                var enumerator = _mapSystem.GetMapChunks(mapGrid.Owner, mapGrid.Comp, worldBounds);
 
                 // Handle base texture updates.
                 while (enumerator.MoveNext(out var chunk))
@@ -123,7 +122,7 @@ private void _drawGrids(Viewport viewport, Box2 worldAABB, Box2Rotated worldBoun
                 // Handle edge sprites.
                 if (_drawTileEdges)
                 {
-                    enumerator = mapSystem.GetMapChunks(mapGrid.Owner, mapGrid.Comp, worldBounds);
+                    enumerator = _mapSystem.GetMapChunks(mapGrid.Owner, mapGrid.Comp, worldBounds);
                     while (enumerator.MoveNext(out var chunk))
                     {
                         var datum = data[chunk.Indices];
@@ -132,7 +131,7 @@ private void _drawGrids(Viewport viewport, Box2 worldAABB, Box2Rotated worldBoun
                     }
                 }
 
-                enumerator = mapSystem.GetMapChunks(mapGrid.Owner, mapGrid.Comp, worldBounds);
+                enumerator = _mapSystem.GetMapChunks(mapGrid.Owner, mapGrid.Comp, worldBounds);
 
                 // Draw chunks
                 while (enumerator.MoveNext(out var chunk))

Robust.Client/Graphics/Clyde/Clyde.cs

@@ -37,7 +37,6 @@ internal sealed partial class Clyde : IClydeInternal, IPostInjectInit, IEntityEv
         [Dependency] private IClydeTileDefinitionManager _tileDefinitionManager = default!;
         [Dependency] private ILightManager _lightManager = default!;
         [Dependency] private ILogManager _logManager = default!;
-        [Dependency] private IMapManager _mapManager = default!;
         [Dependency] private IOverlayManager _overlayManager = default!;
         [Dependency] private IResourceCache _resourceCache = default!;
         [Dependency] private IResourceManager _resManager = default!;

Robust.Client/Physics/GridFixtureSystem.cs

@@ -13,7 +13,6 @@ namespace Robust.Client.Physics
     internal sealed partial class GridFixtureSystem : SharedGridFixtureSystem
     {
         [Dependency] private IOverlayManager _overlay = default!;
-        [Dependency] private IMapManager _mapManager = default!;
         [Dependency] private SharedTransformSystem _transform = default!;
         [Dependency] private SharedMapSystem _map = default!;
 
@@ -29,7 +28,7 @@ public bool EnableDebug
 
                 if (_enableDebug)
                 {
-                    var overlay = new GridSplitNodeOverlay(_mapManager, this, _transform, _map);
+                    var overlay = new GridSplitNodeOverlay(this, _transform, _map);
                     _overlay.AddOverlay(overlay);
                     RaiseNetworkEvent(new RequestGridNodesMessage());
                 }
@@ -72,14 +71,12 @@ private sealed class GridSplitNodeOverlay : Overlay
         {
             public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-            private readonly IMapManager _mapManager;
             private readonly GridFixtureSystem _system;
             private readonly SharedTransformSystem _transform;
             private readonly SharedMapSystem _map;
 
-            public GridSplitNodeOverlay(IMapManager mapManager, GridFixtureSystem system, SharedTransformSystem transform, SharedMapSystem map)
+            public GridSplitNodeOverlay(GridFixtureSystem system, SharedTransformSystem transform, SharedMapSystem map)
             {
-                _mapManager = mapManager;
                 _system = system;
                 _transform = transform;
                 _map = map;
@@ -91,7 +88,7 @@ protected internal override void Draw(in OverlayDrawArgs args)
 
                 var state = (_system, _transform, args.WorldBounds, worldHandle);
 
-                _mapManager.FindGridsIntersecting(args.MapId, args.WorldBounds, ref state,
+                _map.FindGridsIntersecting(args.MapId, args.WorldBounds, ref state,
                     (EntityUid uid, MapGridComponent grid,
                         ref (GridFixtureSystem system, SharedTransformSystem transform, Box2Rotated worldBounds, DrawingHandleWorld worldHandle) tuple) =>
                     {

Robust.Client/Placement/IPlacementManager.cs

@@ -24,6 +24,7 @@ public interface IPlacementManager
 
         IEntityManager EntityManager { get; }
         IEyeManager EyeManager { get; }
+        [Obsolete("Use MapSystem")]
         IMapManager MapManager { get; }
 
         /// <summary>

Robust.Client/Placement/Modes/AlignTileAny.cs

@@ -17,7 +17,7 @@ public override void AlignPlacementMode(ScreenCoordinates mouseScreen)
             // Go over diagonal size so when placing in a line it doesn't stop snapping.
             const float searchBoxSize = 2f; // size of search box in meters
 
-            MouseCoords = ScreenToCursorGrid(mouseScreen).AlignWithClosestGridTile(searchBoxSize, pManager.EntityManager, pManager.MapManager);
+            MouseCoords = ScreenToCursorGrid(mouseScreen).AlignWithClosestGridTile(searchBoxSize, pManager.EntityManager);
 
             var gridId = pManager.EntityManager.System<SharedTransformSystem>().GetGrid(MouseCoords);
 

Robust.Client/Placement/PlacementManager.cs

@@ -48,6 +48,7 @@ public sealed partial class PlacementManager : IPlacementManager, IDisposable, I
 
         public IEntityManager EntityManager => _entityManager;
         public IEyeManager EyeManager => _eyeManager;
+        [Obsolete("use SharedMapSystem")]
         public IMapManager MapManager => _mapManager;
 
         private ISawmill _sawmill = default!;