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

Mapping warnings cleanup (#36168)

Browse Source 
* Mapping warnings cleanup

* Redo
This commit is contained in:
J
2025-03-30 01:05:22 +00:00
committed by GitHub
parent 41f4d93a15
commit 99e675c506
4 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Mapping/MappingState.cs
View File

@@ -1,4 +1,4 @@
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using Content.Client.Administration.Managers; using Content.Client.Administration.Managers;
using Content.Client.ContextMenu.UI; using Content.Client.ContextMenu.UI;
@@ -149,7 +149,7 @@ public sealed class MappingState : GameplayStateBase
{ {
Deselect(); Deselect();
var coords = args.Coordinates.ToMap(_entityManager, _transform); var coords = _transform.ToMapCoordinates(args.Coordinates);
if (_verbs.TryGetEntityMenuEntities(coords, out var entities)) if (_verbs.TryGetEntityMenuEntities(coords, out var entities))
_entityMenuController.OpenRootMenu(entities); _entityMenuController.OpenRootMenu(entities);

3
Content.Server/Mapping/MappingCommand.cs
View File

@@ -2,8 +2,6 @@ using System.Linq;
using Content.Server.Administration; using Content.Server.Administration;
using Content.Server.GameTicking; using Content.Server.GameTicking;
using Content.Shared.Administration; using Content.Shared.Administration;
using Content.Shared.CCVar;
using Robust.Shared.Configuration;
using Robust.Shared.Console; using Robust.Shared.Console;
using Robust.Shared.ContentPack; using Robust.Shared.ContentPack;
using Robust.Shared.EntitySerialization; using Robust.Shared.EntitySerialization;
@@ -19,7 +17,6 @@ namespace Content.Server.Mapping
{ {
[Dependency] private readonly IEntityManager _entities = default!; [Dependency] private readonly IEntityManager _entities = default!;
[Dependency] private readonly IMapManager _map = default!; [Dependency] private readonly IMapManager _map = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
public string Command => "mapping"; public string Command => "mapping";
public string Description => Loc.GetString("cmd-mapping-desc"); public string Description => Loc.GetString("cmd-mapping-desc");

6
Content.Server/Mapping/MappingManager.cs
View File

@@ -1,12 +1,9 @@
using System.IO; using System.IO;
using Content.Server.Administration.Managers; using Content.Server.Administration.Managers;
using Content.Shared.Administration; using Content.Shared.Administration;
using Content.Shared.Mapping; using Content.Shared.Mapping;
using Robust.Server.GameObjects;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.EntitySerialization;
using Robust.Shared.EntitySerialization.Systems; using Robust.Shared.EntitySerialization.Systems;
using Robust.Shared.Map;
using Robust.Shared.Network; using Robust.Shared.Network;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Utility; using Robust.Shared.Utility;
@@ -19,7 +16,6 @@ public sealed class MappingManager : IPostInjectInit
{ {
[Dependency] private readonly IAdminManager _admin = default!; [Dependency] private readonly IAdminManager _admin = default!;
[Dependency] private readonly ILogManager _log = default!; [Dependency] private readonly ILogManager _log = default!;
[Dependency] private readonly IMapManager _map = default!;
[Dependency] private readonly IServerNetManager _net = default!; [Dependency] private readonly IServerNetManager _net = default!;
[Dependency] private readonly IPlayerManager _players = default!; [Dependency] private readonly IPlayerManager _players = default!;
[Dependency] private readonly IEntitySystemManager _systems = default!; [Dependency] private readonly IEntitySystemManager _systems = default!;

2
Content.Shared/Maps/TurfHelpers.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Shared.Maps
return null; return null;
mapManager ??= IoCManager.Resolve<IMapManager>(); mapManager ??= IoCManager.Resolve<IMapManager>();
var pos = coordinates.ToMap(entityManager, entityManager.System<SharedTransformSystem>()); var pos = entityManager.System<SharedTransformSystem>().ToMapCoordinates(coordinates);
if (!mapManager.TryFindGridAt(pos, out _, out var grid)) if (!mapManager.TryFindGridAt(pos, out _, out var grid))
return null; return null;