Replace all usages of obsolete MapGridComponent methods (#5547)

* Replace obsolete MapGridComponent methods

Some other obsolete methods were also replaced in edited files

* Whitespace and better readability

* Value instead of cast

* Fix ISawmill not initialized and incorrect log

Robust.Client/Physics/GridFixtureSystem.cs

@@ -13,8 +13,9 @@ namespace Robust.Client.Physics
     internal sealed class GridFixtureSystem : SharedGridFixtureSystem
     {
         [Dependency] private readonly IOverlayManager _overlay = default!;
-        [Dependency] private readonly IMapManager _map = default!;
+        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
+        [Dependency] private readonly SharedMapSystem _map = default!;
 
         public bool EnableDebug
         {
@@ -28,7 +29,7 @@ namespace Robust.Client.Physics
 
                 if (_enableDebug)
                 {
-                    var overlay = new GridSplitNodeOverlay(_map, this, _transform);
+                    var overlay = new GridSplitNodeOverlay(_mapManager, this, _transform, _map);
                     _overlay.AddOverlay(overlay);
                     RaiseNetworkEvent(new RequestGridNodesMessage());
                 }
@@ -74,12 +75,14 @@ namespace Robust.Client.Physics
             private readonly IMapManager _mapManager;
             private readonly GridFixtureSystem _system;
             private readonly SharedTransformSystem _transform;
+            private readonly SharedMapSystem _map;
 
-            public GridSplitNodeOverlay(IMapManager mapManager, GridFixtureSystem system, SharedTransformSystem transform)
+            public GridSplitNodeOverlay(IMapManager mapManager, GridFixtureSystem system, SharedTransformSystem transform, SharedMapSystem map)
             {
                 _mapManager = mapManager;
                 _system = system;
                 _transform = transform;
+                _map = map;
             }
 
             protected internal override void Draw(in OverlayDrawArgs args)
@@ -89,7 +92,7 @@ namespace Robust.Client.Physics
                 var state = (_system, _transform, args.WorldBounds, worldHandle);
 
                 _mapManager.FindGridsIntersecting(args.MapId, args.WorldBounds, ref state,
-                    static (EntityUid uid, MapGridComponent grid,
+                    (EntityUid uid, MapGridComponent grid,
                         ref (GridFixtureSystem system, SharedTransformSystem transform, Box2Rotated worldBounds, DrawingHandleWorld worldHandle) tuple) =>
                     {
                         // May not have received nodes yet.
@@ -97,7 +100,7 @@ namespace Robust.Client.Physics
                             return true;
 
                         tuple.worldHandle.SetTransform(tuple.transform.GetWorldMatrix(uid));
-                        var chunkEnumerator = grid.GetMapChunks(tuple.worldBounds);
+                        var chunkEnumerator = _map.GetMapChunks(uid, grid, tuple.worldBounds);
 
                         while (chunkEnumerator.MoveNext(out var chunk))
                         {

Robust.Client/Placement/Modes/AlignSnapgridCenter.cs

@@ -25,7 +25,9 @@ namespace Robust.Client.Placement.Modes
             {
                 var viewportSize = (Vector2)pManager.Clyde.ScreenSize;
 
-                var gridPosition = Grid.MapToGrid(pManager.EyeManager.ScreenToMap(Vector2.Zero));
+                var gridUid = pManager.EntityManager.System<SharedTransformSystem>().GetGrid(MouseCoords);
+
+                var gridPosition = pManager.EntityManager.System<SharedMapSystem>().MapToGrid(gridUid!.Value, pManager.EyeManager.ScreenToMap(Vector2.Zero));
 
                 var gridstart = pManager.EyeManager.CoordinatesToScreen(
                     gridPosition.WithPosition(new Vector2(MathF.Floor(gridPosition.X), MathF.Floor(gridPosition.Y))));
@@ -52,9 +54,9 @@ namespace Robust.Client.Placement.Modes
         {
             MouseCoords = ScreenToCursorGrid(mouseScreen);
 
-            var gridIdOpt = MouseCoords.GetGridUid(pManager.EntityManager);
+            var gridIdOpt = pManager.EntityManager.System<SharedTransformSystem>().GetGrid(MouseCoords);
             SnapSize = 1f;
-            if (gridIdOpt is EntityUid gridId && gridId.IsValid())
+            if (gridIdOpt is { } gridId && gridId.IsValid())
             {
                 Grid = pManager.EntityManager.GetComponent<MapGridComponent>(gridId);
                 SnapSize = Grid.TileSize; //Find snap size for the grid.

Robust.Client/Placement/PlacementManager.cs

@@ -27,6 +27,7 @@ namespace Robust.Client.Placement
 {
     public sealed partial class PlacementManager : IPlacementManager, IDisposable, IEntityEventSubscriber
     {
+        [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IClientNetManager _networkManager = default!;
         [Dependency] internal readonly IPlayerManager PlayerManager = default!;
         [Dependency] internal readonly IResourceCache ResourceCache = default!;
@@ -42,6 +43,11 @@ namespace Robust.Client.Placement
         [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] internal readonly IClyde Clyde = default!;
 
+        private ISawmill _sawmill = default!;
+
+        private SharedMapSystem Maps => EntityManager.System<SharedMapSystem>();
+        private SharedTransformSystem XformSystem => EntityManager.System<SharedTransformSystem>();
+
         /// <summary>
         ///     How long before a pending tile change is dropped.
         /// </summary>
@@ -188,6 +194,7 @@ namespace Robust.Client.Placement
         public void Initialize()
         {
             _drawingShader = _prototypeManager.Index<ShaderPrototype>("unshaded").Instance();
+            _sawmill = _logManager.GetSawmill("placement");
 
             _networkManager.RegisterNetMessage<MsgPlacement>(HandlePlacementMessage);
 
@@ -337,7 +344,11 @@ namespace Robust.Client.Placement
 
         private void HandleTileChanged(ref TileChangedEvent args)
         {
-            var coords = EntityManager.GetComponent<MapGridComponent>(args.NewTile.GridUid).GridTileToLocal(args.NewTile.GridIndices);
+            var coords = Maps.GridTileToLocal(
+                args.NewTile.GridUid,
+                EntityManager.GetComponent<MapGridComponent>(args.NewTile.GridUid),
+                args.NewTile.GridIndices);
+
             _pendingTileChanges.RemoveAll(c => c.Item1 == coords);
         }
 
@@ -475,7 +486,7 @@ namespace Robust.Client.Placement
 
             if (!_modeDictionary.TryFirstOrNull(pair => pair.Key.Equals(CurrentPermission.PlacementOption), out KeyValuePair<string, Type>? placeMode))
             {
-                Logger.LogS(LogLevel.Warning, nameof(PlacementManager), $"Invalid placement mode `{CurrentPermission.PlacementOption}`");
+                _sawmill.Log(LogLevel.Warning, $"Invalid placement mode `{CurrentPermission.PlacementOption}`");
                 Clear();
                 return;
             }
@@ -531,8 +542,7 @@ namespace Robust.Client.Placement
                     coordinates = new EntityCoordinates();
                     return false;
                 }
-                coordinates = EntityCoordinates.FromMap(MapManager,
-                                                        EyeManager.PixelToMap(InputManager.MouseScreenPosition));
+                coordinates = XformSystem.ToCoordinates(ent, EyeManager.PixelToMap(InputManager.MouseScreenPosition));
                 return true;
             }
         }
@@ -648,7 +658,7 @@ namespace Robust.Client.Placement
                 PlayerManager.LocalEntity is not {Valid: true} controlled)
                 return;
 
-            var worldPos = EntityManager.GetComponent<TransformComponent>(controlled).WorldPosition;
+            var worldPos = XformSystem.GetWorldPosition(controlled);
 
             args.WorldHandle.DrawCircle(worldPos, CurrentPermission.Range, new Color(1, 1, 1, 0.25f));
         }
@@ -754,14 +764,14 @@ namespace Robust.Client.Placement
 
             if (CurrentPermission.IsTile)
             {
-                var gridIdOpt = EntityManager.System<SharedTransformSystem>().GetGrid(coordinates);
+                var gridIdOpt = XformSystem.GetGrid(coordinates);
                 // If we have actually placed something on a valid grid...
                 if (gridIdOpt is { } gridId && gridId.IsValid())
                 {
                     var grid = EntityManager.GetComponent<MapGridComponent>(gridId);
 
                     // no point changing the tile to the same thing.
-                    if (EntityManager.System<SharedMapSystem>().GetTileRef(gridId, grid, coordinates).Tile.TypeId == CurrentPermission.TileType)
+                    if (Maps.GetTileRef(gridId, grid, coordinates).Tile.TypeId == CurrentPermission.TileType)
                         return;
                 }
 

Robust.Server/Placement/PlacementManager.cs

@@ -143,7 +143,7 @@ namespace Robust.Server.Placement
                         _factory.GetComponentName(typeof(PlacementReplacementComponent)), out var compRegistry))
                 {
                     var key = ((PlacementReplacementComponent)compRegistry.Component).Key;
-                    var gridUid = coordinates.GetGridUid(_entityManager);
+                    var gridUid = _xformSystem.GetGrid(coordinates);
 
                     if (_entityManager.TryGetComponent<MapGridComponent>(gridUid, out var grid))
                     {
@@ -191,7 +191,7 @@ namespace Robust.Server.Placement
 
             EntityUid gridId = coordinates.EntityId;
             if (_entityManager.TryGetComponent(coordinates.EntityId, out grid)
-                || _mapManager.TryFindGridAt(coordinates.ToMap(_entityManager, _xformSystem), out gridId, out grid))
+                || _mapManager.TryFindGridAt(_xformSystem.ToMapCoordinates(coordinates), out gridId, out grid))
             {
                 _maps.SetTile(gridId, grid, coordinates, new Tile(tileType));
 
@@ -200,10 +200,13 @@ namespace Robust.Server.Placement
             }
             else if (tileType != 0) // create a new grid
             {
-                var newGrid = _mapManager.CreateGridEntity(coordinates.GetMapId(_entityManager));
-                var newGridXform = _entityManager.GetComponent<TransformComponent>(newGrid);
+                var newGrid = _mapManager.CreateGridEntity(_xformSystem.GetMapId(coordinates));
+                var newGridXform = new Entity<TransformComponent>(
+                    newGrid.Owner,
+                    _entityManager.GetComponent<TransformComponent>(newGrid));
+
                 _xformSystem.SetWorldPosition(newGridXform, coordinates.Position - newGrid.Comp.TileSizeHalfVector); // assume bottom left tile origin
-                var tilePos = newGrid.Comp.WorldToTile(coordinates.Position);
+                var tilePos = _maps.WorldToTile(newGrid.Owner, newGrid.Comp, coordinates.Position);
                 _maps.SetTile(newGrid.Owner, newGrid.Comp, tilePos, new Tile(tileType));
 
                 var placementEraseEvent = new PlacementTileEvent(tileType, coordinates, placingUserId);
@@ -228,7 +231,7 @@ namespace Robust.Server.Placement
         {
             EntityCoordinates start = _entityManager.GetCoordinates(msg.NetCoordinates);
             Vector2 rectSize = msg.RectSize;
-            foreach (var entity in _lookup.GetEntitiesIntersecting(start.GetMapId(_entityManager),
+            foreach (var entity in _lookup.GetEntitiesIntersecting(_xformSystem.GetMapId(start),
                 new Box2(start.Position, start.Position + rectSize)))
             {
                 if (_entityManager.Deleted(entity) ||