From 84b2f071571a42ca100d785365ed200c02e2d16c Mon Sep 17 00:00:00 2001 From: TemporalOroboros Date: Wed, 1 Jul 2026 20:44:54 -0700 Subject: [PATCH] The IMapManager is dead (#44002) * Axes the easy IMapManager references * Axes the references to unported (obsolete) IMapManager methods * Converts salvageruler command to a LocalizedEntityCommand so it can use SharedMapSystem * Removes IMapManager from GameTicker This required axing the map nuke during restart, but that should be fine? Maps are entities so EntityManager.FlushEntities should delete them all and that's the preceding line * submodule update(?) --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- Content.Client/Atmos/AlignAtmosPipeLayers.cs | 3 +- .../Atmos/Overlays/AtmosDebugOverlay.cs | 3 +- .../GasTileDangerousTemperatureOverlay.cs | 5 ++- .../Atmos/Overlays/GasTileFireOverlay.cs | 3 +- .../Atmos/Overlays/GasTileHeatBlurOverlay.cs | 5 ++- .../Overlays/GasTileVisibleGasOverlay.cs | 3 +- Content.Client/Decals/DecalPlacementSystem.cs | 3 +- .../Decals/Overlays/DecalPlacementOverlay.cs | 9 ++-- Content.Client/Gameplay/GameplayStateBase.cs | 3 +- .../Light/AmbientOcclusionOverlay.cs | 11 +++-- Content.Client/Light/RoofOverlay.cs | 3 +- Content.Client/Light/SunShadowOverlay.cs | 5 ++- Content.Client/Light/TileEmissionOverlay.cs | 3 +- Content.Client/Mapping/MappingState.cs | 5 ++- Content.Client/Maps/GridDraggingSystem.cs | 4 +- Content.Client/NPC/PathfindingSystem.cs | 18 +++----- .../NodeContainer/NodeGroupSystem.cs | 5 --- .../NodeContainer/NodeVisualizationOverlay.cs | 5 +-- .../Overlays/StencilOverlay.Weather.cs | 2 +- Content.Client/Overlays/StencilOverlay.cs | 1 - Content.Client/RCD/AlignRCDConstruction.cs | 3 +- Content.Client/Sandbox/SandboxSystem.cs | 3 +- Content.Client/Shuttles/UI/MapScreen.xaml.cs | 3 +- .../Shuttles/UI/ShuttleDockControl.xaml.cs | 5 ++- .../Shuttles/UI/ShuttleNavControl.xaml.cs | 5 ++- .../Weapons/Melee/MeleeWeaponSystem.cs | 2 +- .../Weapons/Misc/TetherGunSystem.cs | 3 +- .../Tests/ContainerOcclusionTest.cs | 3 -- .../Tests/Damageable/DamageableTest.cs | 1 - .../Tests/DeviceLinking/DeviceLinkingTest.cs | 3 +- .../Tests/DeviceNetwork/DeviceNetworkTest.cs | 3 -- .../Tests/Doors/AirlockTest.cs | 1 - Content.IntegrationTests/Tests/EntityTest.cs | 6 +-- .../Tests/Fluids/FluidSpillTest.cs | 3 +- .../Tests/FollowerSystemTest.cs | 1 - .../Tests/GravityGridTest.cs | 5 +-- .../Click/InteractionSystemTests.cs | 5 --- .../Tests/Interaction/InRangeUnobstructed.cs | 1 - .../Interaction/InteractionTest.Helpers.cs | 8 ++-- .../Tests/Interaction/InteractionTest.cs | 3 +- .../Networking/SimplePredictReconcileTest.cs | 1 - .../Tests/PostMapInitTest.cs | 3 +- .../Tests/Power/PowerStateTest.cs | 9 ++-- .../Tests/Power/PowerTest.cs | 45 +++++++------------ .../Tests/Respirator/LungTest.cs | 1 - .../Tests/SaveLoadMapTest.cs | 9 ++-- .../Tests/SaveLoadSaveTest.cs | 3 +- .../Tests/Shuttle/DockTest.cs | 5 +-- Content.IntegrationTests/Tests/ShuttleTest.cs | 1 - .../Tests/VendingMachineRestockTest.cs | 1 - Content.MapRenderer/Painters/GridPainter.cs | 2 - Content.MapRenderer/Painters/MapPainter.cs | 4 +- .../Effects/ProjectileAnomalySystem.cs | 3 +- .../EntitySystems/AtmosDebugOverlaySystem.cs | 3 +- .../AtmosphereSystem.Commands.cs | 2 +- .../Atmos/EntitySystems/AtmosphereSystem.cs | 1 - .../EntitySystems/GasTileOverlaySystem.cs | 3 -- Content.Server/Chunking/ChunkingSystem.cs | 5 +-- .../Conditions/ComponentInTile.cs | 2 +- .../AreaReactionEntityEffectSystem.cs | 3 +- .../EntitySystems/ExplosionSystem.TileFill.cs | 6 +-- .../EntitySystems/ExplosionSystem.cs | 1 - .../PuddleDebugDebugOverlaySystem.cs | 5 +-- .../GameTicking/GameTicker.RoundFlow.cs | 2 - .../GameTicking/GameTicker.Spawning.cs | 2 +- Content.Server/GameTicking/GameTicker.cs | 1 - .../NPC/Systems/NPCCombatSystem.Ranged.cs | 2 +- Content.Server/NPC/Systems/NPCCombatSystem.cs | 1 - Content.Server/Pinpointer/NavMapSystem.cs | 3 +- .../Pointing/EntitySystems/PointingSystem.cs | 3 +- .../Systems/RadiationSystem.GridCast.cs | 2 +- .../Radiation/Systems/RadiationSystem.cs | 1 - Content.Server/Salvage/SalvageRulerCommand.cs | 18 +++----- .../Salvage/SalvageSystem.Magnet.cs | 10 +++-- Content.Server/Salvage/SalvageSystem.cs | 2 - .../Shuttles/Systems/DockingSystem.Shuttle.cs | 2 +- .../Shuttles/Systems/DockingSystem.cs | 1 - .../Systems/ShuttleSystem.FasterThanLight.cs | 2 +- .../Systems/ShuttleSystem.GridFill.cs | 2 +- .../Shuttles/Systems/ShuttleSystem.cs | 3 -- .../EntitySystems/EventHorizonSystem.cs | 3 +- .../EntitySystems/EntityStorageSystem.cs | 3 +- .../Trigger/Systems/SmokeOnTriggerSystem.cs | 3 +- .../Weapons/Ranged/Systems/GunSystem.cs | 2 +- .../Abilities/Mime/MimePowersSystem.cs | 3 +- .../EntitySystems/AnchorableSystem.cs | 3 +- .../Construction/SharedConstructionSystem.cs | 3 +- .../Coordinates/Helpers/SnapgridHelper.cs | 4 +- Content.Shared/Decals/SharedDecalSystem.cs | 2 - .../Interaction/SharedInteractionSystem.cs | 3 +- Content.Shared/Magic/SharedMagicSystem.cs | 3 +- Content.Shared/Maps/TileSystem.cs | 3 +- Content.Shared/Maps/TurfSystem.cs | 3 +- .../Controllers/SharedConveyorController.cs | 4 -- Content.Shared/Random/Rules/GridInRange.cs | 4 +- .../Shuttles/Systems/SharedShuttleSystem.cs | 3 +- Content.Shared/Tiles/FloorTileSystem.cs | 5 +-- .../Tools/Systems/SharedToolSystem.Tile.cs | 2 +- .../Tools/Systems/SharedToolSystem.cs | 1 - .../Weapons/Melee/SharedMeleeWeaponSystem.cs | 2 +- .../Weapons/Ranged/Systems/SharedGunSystem.cs | 2 +- .../en-US/salvage/salvage-ruler-command.ftl | 4 +- 102 files changed, 148 insertions(+), 258 deletions(-) diff --git a/Content.Client/Atmos/AlignAtmosPipeLayers.cs b/Content.Client/Atmos/AlignAtmosPipeLayers.cs index d9ce52a262..5df861e9d8 100644 --- a/Content.Client/Atmos/AlignAtmosPipeLayers.cs +++ b/Content.Client/Atmos/AlignAtmosPipeLayers.cs @@ -26,7 +26,6 @@ public sealed partial class AlignAtmosPipeLayers : SnapgridCenter { [Dependency] private IEntityManager _entityManager = default!; [Dependency] private IPrototypeManager _protoManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IEyeManager _eyeManager = default!; private readonly SharedMapSystem _mapSystem; @@ -86,7 +85,7 @@ public sealed partial class AlignAtmosPipeLayers : SnapgridCenter if (pManager.PlacementType != PlacementTypes.None) return; - MouseCoords = _unalignedMouseCoords.AlignWithClosestGridTile(SearchBoxSize, _entityManager, _mapManager); + MouseCoords = _unalignedMouseCoords.AlignWithClosestGridTile(SearchBoxSize, _entityManager); var gridId = _transformSystem.GetGrid(MouseCoords); diff --git a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs index 33fec9d985..448261e33c 100644 --- a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs +++ b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs @@ -21,7 +21,6 @@ namespace Content.Client.Atmos.Overlays; public sealed partial class AtmosDebugOverlay : Overlay { [Dependency] private IEntityManager _entManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IInputManager _input = default!; [Dependency] private IUserInterfaceManager _ui = default!; [Dependency] private IResourceCache _cache = default!; @@ -262,7 +261,7 @@ public sealed partial class AtmosDebugOverlay : Overlay private void GetGrids(MapId mapId, Box2Rotated box) { _grids.Clear(); - _mapManager.FindGridsIntersecting( + _map.FindGridsIntersecting( mapId, box, ref _grids, diff --git a/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs b/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs index 65d1b11e53..bdd62db9a8 100644 --- a/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs @@ -19,10 +19,10 @@ public sealed partial class GasTileDangerousTemperatureOverlay : Overlay public override bool RequestScreenTexture { get; set; } = false; [Dependency] private IEntityManager _entManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IClyde _clyde = default!; private GasTileOverlaySystem? _gasTileOverlay; + private readonly SharedMapSystem _mapSys; private readonly SharedTransformSystem _xformSys; private EntityQuery _overlayQuery; @@ -37,6 +37,7 @@ public sealed partial class GasTileDangerousTemperatureOverlay : Overlay public GasTileDangerousTemperatureOverlay() { IoCManager.InjectDependencies(this); + _mapSys = _entManager.System(); _xformSys = _entManager.System(); _overlayQuery = _entManager.GetEntityQuery(); @@ -174,7 +175,7 @@ public sealed partial class GasTileDangerousTemperatureOverlay : Overlay () => { _grids.Clear(); - _mapManager.FindGridsIntersecting(mapId, worldAABB, ref _grids); + _mapSys.FindGridsIntersecting(mapId, worldAABB, ref _grids); foreach (var grid in _grids) { diff --git a/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs b/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs index 45cebef98b..370ed2a792 100644 --- a/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs @@ -23,7 +23,6 @@ public sealed partial class GasTileFireOverlay : Overlay [Dependency] private IPrototypeManager _protoMan = default!; [Dependency] private IResourceCache _resourceCache = default!; [Dependency] private IEntityManager _entManager = default!; - [Dependency] private IMapManager _mapManager = default!; public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities | OverlaySpace.WorldSpaceBelowWorld; private static readonly ProtoId UnshadedShader = "unshaded"; @@ -113,7 +112,7 @@ public sealed partial class GasTileFireOverlay : Overlay return; // TODO: WorldBounds callback. - _mapManager.FindGridsIntersecting(args.MapId, args.WorldAABB, ref gridState, + _mapSystem.FindGridsIntersecting(args.MapId, args.WorldAABB, ref gridState, static (EntityUid uid, MapGridComponent grid, ref (Box2Rotated WorldBounds, DrawingHandleWorld drawHandle, diff --git a/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs b/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs index 7815bec6e4..4dc1300193 100644 --- a/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs @@ -28,12 +28,12 @@ public sealed partial class GasTileHeatBlurOverlay : Overlay private static readonly ProtoId HeatOverlayShader = "HeatBlur"; [Dependency] private IEntityManager _entManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IPrototypeManager _proto = default!; [Dependency] private IClyde _clyde = default!; [Dependency] private IConfigurationManager _configManager = default!; [Dependency] private IResourceCache _resourceCache = default!; + private readonly SharedMapSystem _maps; private readonly SharedTransformSystem _xformSys; private readonly ShaderInstance _shader; @@ -63,6 +63,7 @@ public sealed partial class GasTileHeatBlurOverlay : Overlay public GasTileHeatBlurOverlay() { IoCManager.InjectDependencies(this); + _maps = _entManager.System(); _xformSys = _entManager.System(); _noiseTexture = _resourceCache.GetTexture("/Textures/Effects/HeatBlur/perlin_noise.png"); @@ -126,7 +127,7 @@ public sealed partial class GasTileHeatBlurOverlay : Overlay () => { _intersectingGrids.Clear(); - _mapManager.FindGridsIntersecting(mapId, worldAABB, ref _intersectingGrids); + _maps.FindGridsIntersecting(mapId, worldAABB, ref _intersectingGrids); foreach (var grid in _intersectingGrids) { if (!overlayQuery.TryGetComponent(grid.Owner, out var comp)) diff --git a/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs b/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs index d5b21aeabe..65d0b919d0 100644 --- a/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs @@ -25,7 +25,6 @@ public sealed partial class GasTileVisibleGasOverlay : Overlay [Dependency] private IEntityManager _entManager = default!; [Dependency] private IResourceCache _resourceCache = default!; [Dependency] private IPrototypeManager _protoManager = default!; - [Dependency] private IMapManager _mapManager = default!; private static readonly ProtoId UnshadedShader = "unshaded"; @@ -142,7 +141,7 @@ public sealed partial class GasTileVisibleGasOverlay : Overlay return; // TODO: WorldBounds callback. - _mapManager.FindGridsIntersecting(args.MapId, + _mapSystem.FindGridsIntersecting(args.MapId, args.WorldAABB, ref gridState, static (EntityUid uid, diff --git a/Content.Client/Decals/DecalPlacementSystem.cs b/Content.Client/Decals/DecalPlacementSystem.cs index 1e07cc1451..7bbb05b29f 100644 --- a/Content.Client/Decals/DecalPlacementSystem.cs +++ b/Content.Client/Decals/DecalPlacementSystem.cs @@ -22,6 +22,7 @@ public sealed partial class DecalPlacementSystem : EntitySystem [Dependency] private InputSystem _inputSystem = default!; [Dependency] private MetaDataSystem _metaData = default!; [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedMapSystem _maps = default!; [Dependency] private SharedTransformSystem _transform = default!; [Dependency] private SpriteSystem _sprite = default!; @@ -48,7 +49,7 @@ public sealed partial class DecalPlacementSystem : EntitySystem public override void Initialize() { base.Initialize(); - _overlay.AddOverlay(new DecalPlacementOverlay(this, _transform, _sprite)); + _overlay.AddOverlay(new DecalPlacementOverlay(this, _maps, _transform, _sprite)); CommandBinds.Builder.Bind(EngineKeyFunctions.EditorPlaceObject, new PointerStateInputCmdHandler( (session, coords, uid) => diff --git a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs index e0e73af5f7..a9e68b32f6 100644 --- a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs +++ b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs @@ -3,8 +3,6 @@ using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Input; using Robust.Shared.Enums; -using Robust.Shared.Map; -using Robust.Shared.Prototypes; namespace Content.Client.Decals.Overlays; @@ -12,17 +10,18 @@ public sealed partial class DecalPlacementOverlay : Overlay { [Dependency] private IEyeManager _eyeManager = default!; [Dependency] private IInputManager _inputManager = default!; - [Dependency] private IMapManager _mapManager = default!; private readonly DecalPlacementSystem _placement; + private readonly SharedMapSystem _maps; private readonly SharedTransformSystem _transform; private readonly SpriteSystem _sprite; public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities; - public DecalPlacementOverlay(DecalPlacementSystem placement, SharedTransformSystem transform, SpriteSystem sprite) + public DecalPlacementOverlay(DecalPlacementSystem placement, SharedMapSystem maps, SharedTransformSystem transform, SpriteSystem sprite) { IoCManager.InjectDependencies(this); _placement = placement; + _maps = maps; _transform = transform; _sprite = sprite; ZIndex = 1000; @@ -42,7 +41,7 @@ public sealed partial class DecalPlacementOverlay : Overlay return; // No map support for decals - if (!_mapManager.TryFindGridAt(mousePos, out var gridUid, out var grid)) + if (!_maps.TryFindGridAt(mousePos, out var gridUid, out var grid)) { return; } diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs index 97c6e8a8b2..975164722f 100644 --- a/Content.Client/Gameplay/GameplayStateBase.cs +++ b/Content.Client/Gameplay/GameplayStateBase.cs @@ -37,7 +37,6 @@ namespace Content.Client.Gameplay [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IEntitySystemManager _entitySystemManager = default!; [Dependency] private IGameTiming _timing = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] protected IUserInterfaceManager UserInterfaceManager = default!; [Dependency] private IEntityManager _entityManager = default!; [Dependency] private IViewVariablesManager _vvm = default!; @@ -240,7 +239,7 @@ namespace Content.Client.Gameplay var transformSystem = _entitySystemManager.GetEntitySystem(); var mapSystem = _entitySystemManager.GetEntitySystem(); - coordinates = _mapManager.TryFindGridAt(mousePosWorld, out var uid, out _) ? + coordinates = mapSystem.TryFindGridAt(mousePosWorld, out var uid, out _) ? mapSystem.MapToGrid(uid, mousePosWorld) : transformSystem.ToCoordinates(mousePosWorld); } diff --git a/Content.Client/Light/AmbientOcclusionOverlay.cs b/Content.Client/Light/AmbientOcclusionOverlay.cs index ef510a2d26..68b8bc72a3 100644 --- a/Content.Client/Light/AmbientOcclusionOverlay.cs +++ b/Content.Client/Light/AmbientOcclusionOverlay.cs @@ -5,7 +5,7 @@ using Content.Shared.Maps; using Robust.Client.Graphics; using Robust.Shared.Configuration; using Robust.Shared.Enums; -using Robust.Shared.Map; +using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; using Robust.Shared.Utility; @@ -23,9 +23,10 @@ public sealed partial class AmbientOcclusionOverlay : Overlay [Dependency] private IClyde _clyde = default!; [Dependency] private IConfigurationManager _cfgManager = default!; [Dependency] private IEntityManager _entManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IPrototypeManager _proto = default!; + private List> _cachedGrids = new(); + public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities; private readonly OverlayResourceCache _resources = new (); @@ -115,7 +116,9 @@ public sealed partial class AmbientOcclusionOverlay : Overlay // Don't want lighting affecting it. worldHandle.UseShader(_proto.Index(UnshadedShader).Instance()); - foreach (var grid in _mapManager.FindGridsIntersecting(mapId, worldBounds)) + _cachedGrids.Clear(); + maps.FindGridsIntersecting(mapId, worldBounds, ref _cachedGrids); + foreach (var grid in _cachedGrids) { var transform = xformSystem.GetWorldMatrix(grid.Owner); var worldToTextureMatrix = Matrix3x2.Multiply(transform, invMatrix); @@ -126,7 +129,7 @@ public sealed partial class AmbientOcclusionOverlay : Overlay if (turfSystem.IsSpace(tileRef)) continue; - var bounds = lookups.GetLocalBounds(tileRef, grid.TileSize); + var bounds = lookups.GetLocalBounds(tileRef, grid.Comp.TileSize); worldHandle.DrawRect(bounds, Color.White); } } diff --git a/Content.Client/Light/RoofOverlay.cs b/Content.Client/Light/RoofOverlay.cs index 7923601fa9..934c2bc001 100644 --- a/Content.Client/Light/RoofOverlay.cs +++ b/Content.Client/Light/RoofOverlay.cs @@ -14,7 +14,6 @@ namespace Content.Client.Light; public sealed partial class RoofOverlay : Overlay { private readonly IEntityManager _entManager; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IOverlayManager _overlay = default!; private readonly EntityLookupSystem _lookup; @@ -56,7 +55,7 @@ public sealed partial class RoofOverlay : Overlay var target = lightRes.EnlargedLightTarget; _grids.Clear(); - _mapManager.FindGridsIntersecting(args.MapId, bounds, ref _grids, approx: true, includeMap: true); + _mapSystem.FindGridsIntersecting(args.MapId, bounds, ref _grids, approx: true, includeMap: true); var lightScale = viewport.LightRenderTarget.Size / (Vector2) viewport.Size; var scale = viewport.RenderScale / (Vector2.One / lightScale); diff --git a/Content.Client/Light/SunShadowOverlay.cs b/Content.Client/Light/SunShadowOverlay.cs index abdd69d667..4f16f63624 100644 --- a/Content.Client/Light/SunShadowOverlay.cs +++ b/Content.Client/Light/SunShadowOverlay.cs @@ -18,9 +18,9 @@ public sealed partial class SunShadowOverlay : Overlay [Dependency] private IClyde _clyde = default!; [Dependency] private IEntityManager _entManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IPrototypeManager _protoManager = default!; private readonly EntityLookupSystem _lookup; + private readonly SharedMapSystem _mapSys; private readonly SharedTransformSystem _xformSys; private readonly HashSet> _shadows = new(); @@ -31,6 +31,7 @@ public sealed partial class SunShadowOverlay : Overlay { IoCManager.InjectDependencies(this); _xformSys = _entManager.System(); + _mapSys = _entManager.System(); _lookup = _entManager.System(); ZIndex = AfterLightTargetOverlay.ContentZIndex + 1; } @@ -46,7 +47,7 @@ public sealed partial class SunShadowOverlay : Overlay return; _grids.Clear(); - _mapManager.FindGridsIntersecting(args.MapId, + _mapSys.FindGridsIntersecting(args.MapId, args.WorldBounds.Enlarged(SunShadowComponent.MaxLength), ref _grids); diff --git a/Content.Client/Light/TileEmissionOverlay.cs b/Content.Client/Light/TileEmissionOverlay.cs index 448a5b3639..743dd9d513 100644 --- a/Content.Client/Light/TileEmissionOverlay.cs +++ b/Content.Client/Light/TileEmissionOverlay.cs @@ -11,7 +11,6 @@ public sealed partial class TileEmissionOverlay : Overlay { public override OverlaySpace Space => OverlaySpace.BeforeLighting; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IOverlayManager _overlay = default!; private SharedMapSystem _mapSystem; @@ -50,7 +49,7 @@ public sealed partial class TileEmissionOverlay : Overlay var target = lightoverlay.GetCachedForViewport(args.Viewport).EnlargedLightTarget; var viewport = args.Viewport; _grids.Clear(); - _mapManager.FindGridsIntersecting(mapId, bounds, ref _grids, approx: true); + _mapSystem.FindGridsIntersecting(mapId, bounds, ref _grids, approx: true); if (_grids.Count == 0) return; diff --git a/Content.Client/Mapping/MappingState.cs b/Content.Client/Mapping/MappingState.cs index bddfe27d80..829cfeb63a 100644 --- a/Content.Client/Mapping/MappingState.cs +++ b/Content.Client/Mapping/MappingState.cs @@ -45,7 +45,6 @@ public sealed partial class MappingState : GameplayStateBase [Dependency] private IEntityNetworkManager _entityNetwork = default!; [Dependency] private IInputManager _input = default!; [Dependency] private ILogManager _log = default!; - [Dependency] private IMapManager _mapMan = default!; [Dependency] private MappingManager _mapping = default!; [Dependency] private IOverlayManager _overlays = default!; [Dependency] private IPlacementManager _placement = default!; @@ -56,6 +55,7 @@ public sealed partial class MappingState : GameplayStateBase private EntityMenuUIController _entityMenuController = default!; private DecalPlacementSystem _decal = default!; + private MapSystem _maps = default!; private SpriteSystem _sprite = default!; private TransformSystem _transform = default!; private VerbSystem _verbs = default!; @@ -207,6 +207,7 @@ public sealed partial class MappingState : GameplayStateBase _entityMenuController = UserInterfaceManager.GetUIController(); _decal = _entityManager.System(); + _maps = _entityManager.System(); _sprite = _entityManager.System(); _transform = _entityManager.System(); _verbs = _entityManager.System(); @@ -795,7 +796,7 @@ public sealed partial class MappingState : GameplayStateBase { var mapPos = _transform.ToMapCoordinates(coords); - if (_mapMan.TryFindGridAt(mapPos, out var gridUid, out var grid) && + if (_maps.TryFindGridAt(mapPos, out var gridUid, out var grid) && _entityManager.System().TryGetTileRef(gridUid, grid, coords, out var tileRef) && _allPrototypesDict.TryGetValue(_entityManager.System().GetContentTileDefinition(tileRef), out button)) { diff --git a/Content.Client/Maps/GridDraggingSystem.cs b/Content.Client/Maps/GridDraggingSystem.cs index f78f96c547..530aebdd73 100644 --- a/Content.Client/Maps/GridDraggingSystem.cs +++ b/Content.Client/Maps/GridDraggingSystem.cs @@ -16,7 +16,7 @@ public sealed partial class GridDraggingSystem : SharedGridDraggingSystem [Dependency] private IEyeManager _eyeManager = default!; [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private IInputManager _inputManager = default!; - [Dependency] private IMapManager _mapManager = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; [Dependency] private InputSystem _inputSystem = default!; [Dependency] private SharedTransformSystem _transformSystem = default!; @@ -99,7 +99,7 @@ public sealed partial class GridDraggingSystem : SharedGridDraggingSystem if (_dragging == null) { - if (!_mapManager.TryFindGridAt(mousePos, out var gridUid, out var grid)) + if (!_mapSystem.TryFindGridAt(mousePos, out var gridUid, out var grid)) return; StartDragging(gridUid, Vector2.Transform(mousePos.Position, _transformSystem.GetInvWorldMatrix(gridUid))); diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs index 3cca80198d..26bb12ee2d 100644 --- a/Content.Client/NPC/PathfindingSystem.cs +++ b/Content.Client/NPC/PathfindingSystem.cs @@ -19,7 +19,6 @@ namespace Content.Client.NPC [Dependency] private IEyeManager _eyeManager = default!; [Dependency] private IGameTiming _timing = default!; [Dependency] private IInputManager _inputManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IOverlayManager _overlayManager = default!; [Dependency] private IResourceCache _cache = default!; [Dependency] private NPCSteeringSystem _steering = default!; @@ -39,7 +38,7 @@ namespace Content.Client.NPC } else if (!_overlayManager.HasOverlay()) { - _overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem, _transformSystem)); + _overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _cache, this, _mapSystem, _transformSystem)); } if ((value & PathfindingDebugMode.Steering) != 0x0) @@ -137,7 +136,6 @@ namespace Content.Client.NPC private readonly IEntityManager _entManager; private readonly IEyeManager _eyeManager; private readonly IInputManager _inputManager; - private readonly IMapManager _mapManager; private readonly PathfindingSystem _system; private readonly MapSystem _mapSystem; private readonly SharedTransformSystem _transformSystem; @@ -151,7 +149,6 @@ namespace Content.Client.NPC IEntityManager entManager, IEyeManager eyeManager, IInputManager inputManager, - IMapManager mapManager, IResourceCache cache, PathfindingSystem system, MapSystem mapSystem, @@ -160,7 +157,6 @@ namespace Content.Client.NPC _entManager = entManager; _eyeManager = eyeManager; _inputManager = inputManager; - _mapManager = mapManager; _system = system; _mapSystem = mapSystem; _transformSystem = transformSystem; @@ -193,7 +189,7 @@ namespace Content.Client.NPC var found = false; _grids.Clear(); - _mapManager.FindGridsIntersecting(mouseWorldPos.MapId, aabb, ref _grids); + _mapSystem.FindGridsIntersecting(mouseWorldPos.MapId, aabb, ref _grids); foreach (var grid in _grids) { @@ -269,7 +265,7 @@ namespace Content.Client.NPC if ((_system.Modes & PathfindingDebugMode.Poly) != 0x0 && mouseWorldPos.MapId == args.MapId) { - if (!_mapManager.TryFindGridAt(mouseWorldPos, out var gridUid, out var grid) || !xformQuery.TryGetComponent(gridUid, out var gridXform)) + if (!_mapSystem.TryFindGridAt(mouseWorldPos, out var gridUid, out var grid) || !xformQuery.TryGetComponent(gridUid, out var gridXform)) return; if (!_system.Polys.TryGetValue(_entManager.GetNetEntity(gridUid), out var data)) @@ -346,7 +342,7 @@ namespace Content.Client.NPC mouseWorldPos.MapId == args.MapId) { _grids.Clear(); - _mapManager.FindGridsIntersecting(mouseWorldPos.MapId, aabb, ref _grids); + _mapSystem.FindGridsIntersecting(mouseWorldPos.MapId, aabb, ref _grids); foreach (var grid in _grids) { @@ -408,7 +404,7 @@ namespace Content.Client.NPC mouseWorldPos.MapId == args.MapId) { _grids.Clear(); - _mapManager.FindGridsIntersecting(args.MapId, aabb, ref _grids); + _mapSystem.FindGridsIntersecting(args.MapId, aabb, ref _grids); foreach (var grid in _grids) { @@ -447,7 +443,7 @@ namespace Content.Client.NPC mouseWorldPos.MapId == args.MapId) { _grids.Clear(); - _mapManager.FindGridsIntersecting(args.MapId, aabb, ref _grids); + _mapSystem.FindGridsIntersecting(args.MapId, aabb, ref _grids); foreach (var grid in _grids) { @@ -506,7 +502,7 @@ namespace Content.Client.NPC if ((_system.Modes & PathfindingDebugMode.Chunks) != 0x0) { _grids.Clear(); - _mapManager.FindGridsIntersecting(args.MapId, args.WorldBounds, ref _grids); + _mapSystem.FindGridsIntersecting(args.MapId, args.WorldBounds, ref _grids); foreach (var grid in _grids) { diff --git a/Content.Client/NodeContainer/NodeGroupSystem.cs b/Content.Client/NodeContainer/NodeGroupSystem.cs index cbba584a59..200781a274 100644 --- a/Content.Client/NodeContainer/NodeGroupSystem.cs +++ b/Content.Client/NodeContainer/NodeGroupSystem.cs @@ -5,9 +5,6 @@ using JetBrains.Annotations; using Robust.Client.Graphics; using Robust.Client.Input; using Robust.Client.ResourceManagement; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Map; namespace Content.Client.NodeContainer { @@ -16,7 +13,6 @@ namespace Content.Client.NodeContainer { [Dependency] private IOverlayManager _overlayManager = default!; [Dependency] private EntityLookupSystem _entityLookup = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IInputManager _inputManager = default!; [Dependency] private IResourceCache _resourceCache = default!; @@ -88,7 +84,6 @@ namespace Content.Client.NodeContainer var overlay = new NodeVisualizationOverlay( this, _entityLookup, - _mapManager, _inputManager, _resourceCache, EntityManager); diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs index 9466ca032b..75567f1f6c 100644 --- a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs +++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs @@ -17,7 +17,6 @@ namespace Content.Client.NodeContainer { private readonly NodeGroupSystem _system; private readonly EntityLookupSystem _lookup; - private readonly IMapManager _mapManager; private readonly IInputManager _inputManager; private readonly IEntityManager _entityManager; private readonly SharedTransformSystem _transformSystem; @@ -38,14 +37,12 @@ namespace Content.Client.NodeContainer public NodeVisualizationOverlay( NodeGroupSystem system, EntityLookupSystem lookup, - IMapManager mapManager, IInputManager inputManager, IResourceCache cache, IEntityManager entityManager) { _system = system; _lookup = lookup; - _mapManager = mapManager; _inputManager = inputManager; _entityManager = entityManager; _transformSystem = _entityManager.System(); @@ -119,7 +116,7 @@ namespace Content.Client.NodeContainer var xformQuery = _entityManager.GetEntityQuery(); _grids.Clear(); - _mapManager.FindGridsIntersecting(map, worldAABB, ref _grids); + _mapSystem.FindGridsIntersecting(map, worldAABB, ref _grids); foreach (var grid in _grids) { diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs index 2a46dbecd5..2d7a94828f 100644 --- a/Content.Client/Overlays/StencilOverlay.Weather.cs +++ b/Content.Client/Overlays/StencilOverlay.Weather.cs @@ -33,7 +33,7 @@ public sealed partial class StencilOverlay _grids.Clear(); // idk if this is safe to cache in a field and clear sloth help - _mapManager.FindGridsIntersecting(mapId, worldAABB, ref _grids); + _map.FindGridsIntersecting(mapId, worldAABB, ref _grids); foreach (var grid in _grids) { diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs index 83f9188ccb..86c9c68a83 100644 --- a/Content.Client/Overlays/StencilOverlay.cs +++ b/Content.Client/Overlays/StencilOverlay.cs @@ -27,7 +27,6 @@ public sealed partial class StencilOverlay : Overlay [Dependency] private IClyde _clyde = default!; [Dependency] private IEntityManager _entManager = default!; [Dependency] private IGameTiming _timing = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IPrototypeManager _protoManager = default!; private readonly ParallaxSystem _parallax; private readonly SharedTransformSystem _transform; diff --git a/Content.Client/RCD/AlignRCDConstruction.cs b/Content.Client/RCD/AlignRCDConstruction.cs index ee7411a6de..4ffd25c690 100644 --- a/Content.Client/RCD/AlignRCDConstruction.cs +++ b/Content.Client/RCD/AlignRCDConstruction.cs @@ -16,7 +16,6 @@ namespace Content.Client.RCD; public sealed partial class AlignRCDConstruction : PlacementMode { [Dependency] private IEntityManager _entityManager = default!; - [Dependency] private IMapManager _mapManager = default!; private readonly SharedMapSystem _mapSystem; private readonly HandsSystem _handsSystem; private readonly RCDSystem _rcdSystem; @@ -46,7 +45,7 @@ public sealed partial class AlignRCDConstruction : PlacementMode public override void AlignPlacementMode(ScreenCoordinates mouseScreen) { _unalignedMouseCoords = ScreenToCursorGrid(mouseScreen); - MouseCoords = _unalignedMouseCoords.AlignWithClosestGridTile(SearchBoxSize, _entityManager, _mapManager); + MouseCoords = _unalignedMouseCoords.AlignWithClosestGridTile(SearchBoxSize, _entityManager); var gridId = _transformSystem.GetGrid(MouseCoords); diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs index 3965779b62..18617b08bb 100644 --- a/Content.Client/Sandbox/SandboxSystem.cs +++ b/Content.Client/Sandbox/SandboxSystem.cs @@ -13,7 +13,6 @@ namespace Content.Client.Sandbox { [Dependency] private IClientAdminManager _adminManager = default!; [Dependency] private IClientConsoleHost _consoleHost = default!; - [Dependency] private IMapManager _map = default!; [Dependency] private IPlacementManager _placement = default!; [Dependency] private ContentEyeSystem _contentEye = default!; [Dependency] private SharedTransformSystem _transform = default!; @@ -116,7 +115,7 @@ namespace Content.Client.Sandbox // Try copy tile. - if (!_map.TryFindGridAt(_transform.ToMapCoordinates(coords), out var gridUid, out var grid) || !_mapSystem.TryGetTileRef(gridUid, grid, coords, out var tileRef)) + if (!_mapSystem.TryFindGridAt(_transform.ToMapCoordinates(coords), out var gridUid, out var grid) || !_mapSystem.TryGetTileRef(gridUid, grid, coords, out var tileRef)) return false; if (_placement.Eraser) diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml.cs b/Content.Client/Shuttles/UI/MapScreen.xaml.cs index c39656f681..bf59a0b92d 100644 --- a/Content.Client/Shuttles/UI/MapScreen.xaml.cs +++ b/Content.Client/Shuttles/UI/MapScreen.xaml.cs @@ -28,7 +28,6 @@ public sealed partial class MapScreen : BoxContainer { [Dependency] private IEntityManager _entManager = default!; [Dependency] private IGameTiming _timing = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IRobustRandom _random = default!; private readonly SharedAudioSystem _audio; private readonly SharedMapSystem _maps; @@ -311,7 +310,7 @@ public sealed partial class MapScreen : BoxContainer }; _mapHeadings.Add(mapComp.MapId, gridContents); - foreach (var grid in _mapManager.GetAllGrids(mapComp.MapId)) + foreach (var grid in _maps.GetAllGrids(mapComp.MapId)) { _entManager.TryGetComponent(grid.Owner, out IFFComponent? iffComp); diff --git a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs index 0a8a5a5495..8937f7e819 100644 --- a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs +++ b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs @@ -18,8 +18,8 @@ namespace Content.Client.Shuttles.UI; public sealed partial class ShuttleDockControl : BaseShuttleControl { [Dependency] private IGameTiming _timing = default!; - [Dependency] private IMapManager _mapManager = default!; private readonly DockingSystem _dockSystem; + private readonly SharedMapSystem _maps; private readonly SharedShuttleSystem _shuttles; private readonly SharedTransformSystem _xformSystem; @@ -62,6 +62,7 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl { RobustXamlLoader.Load(this); _dockSystem = EntManager.System(); + _maps = EntManager.System(); _shuttles = EntManager.System(); _xformSystem = EntManager.System(); MinSize = new Vector2(SizeFull, SizeFull); @@ -121,7 +122,7 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl // Draw nearby grids var controlBounds = PixelSizeBox; _grids.Clear(); - _mapManager.FindGridsIntersecting(gridXform.MapID, viewBoundsWorld, ref _grids); + _maps.FindGridsIntersecting(gridXform.MapID, viewBoundsWorld, ref _grids); // offset the dotted-line position to the bounds. Vector2? viewedDockPos = _viewedState != null ? MidPointVector : null; diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs index bf1c4ad814..fcc2a94dcb 100644 --- a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs +++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs @@ -20,7 +20,7 @@ namespace Content.Client.Shuttles.UI; [GenerateTypedNameReferences] public sealed partial class ShuttleNavControl : BaseShuttleControl { - [Dependency] private IMapManager _mapManager = default!; + private readonly SharedMapSystem _maps; private readonly SharedShuttleSystem _shuttles; private readonly SharedTransformSystem _transform; @@ -52,6 +52,7 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl public ShuttleNavControl() : base(64f, 256f, 256f) { RobustXamlLoader.Load(this); + _maps = EntManager.System(); _shuttles = EntManager.System(); _transform = EntManager.System(); } @@ -187,7 +188,7 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl var viewAABB = viewBounds.CalcBoundingBox(); _grids.Clear(); - _mapManager.FindGridsIntersecting(xform.MapID, new Box2(mapPos.Position - MaxRadarRangeVector, mapPos.Position + MaxRadarRangeVector), ref _grids, approx: true, includeMap: false); + _maps.FindGridsIntersecting(xform.MapID, new Box2(mapPos.Position - MaxRadarRangeVector, mapPos.Position + MaxRadarRangeVector), ref _grids, approx: true, includeMap: false); // Draw other grids... differently foreach (var grid in _grids) diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs index 94b994a340..42c60e815e 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs @@ -101,7 +101,7 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem EntityCoordinates coordinates; - if (MapManager.TryFindGridAt(mousePos, out var gridUid, out _)) + if (Maps.TryFindGridAt(mousePos, out var gridUid, out _)) { coordinates = TransformSystem.ToCoordinates(gridUid, mousePos); } diff --git a/Content.Client/Weapons/Misc/TetherGunSystem.cs b/Content.Client/Weapons/Misc/TetherGunSystem.cs index 276ed5352c..88a3a208e0 100644 --- a/Content.Client/Weapons/Misc/TetherGunSystem.cs +++ b/Content.Client/Weapons/Misc/TetherGunSystem.cs @@ -13,7 +13,6 @@ public sealed partial class TetherGunSystem : SharedTetherGunSystem [Dependency] private IEyeManager _eyeManager = default!; [Dependency] private IGameTiming _timing = default!; [Dependency] private IInputManager _input = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IOverlayManager _overlay = default!; [Dependency] private IPlayerManager _player = default!; [Dependency] private MapSystem _mapSystem = default!; @@ -73,7 +72,7 @@ public sealed partial class TetherGunSystem : SharedTetherGunSystem EntityCoordinates coords; - if (_mapManager.TryFindGridAt(mouseWorldPos, out var gridUid, out _)) + if (_mapSystem.TryFindGridAt(mouseWorldPos, out var gridUid, out _)) { coords = TransformSystem.ToCoordinates(gridUid, mouseWorldPos); } diff --git a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs index cb7e401601..186e0753af 100644 --- a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs +++ b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs @@ -43,7 +43,6 @@ namespace Content.IntegrationTests.Tests var serverEntManager = server.ResolveDependency(); EntityUid dummy = default; - var mapManager = server.ResolveDependency(); var map = await pair.CreateTestMap(); await server.WaitPost(() => @@ -83,7 +82,6 @@ namespace Content.IntegrationTests.Tests var serverEntManager = server.ResolveDependency(); EntityUid dummy = default; - var mapManager = server.ResolveDependency(); var map = await pair.CreateTestMap(); @@ -124,7 +122,6 @@ namespace Content.IntegrationTests.Tests var serverEntManager = server.ResolveDependency(); EntityUid dummy = default; - var mapManager = server.ResolveDependency(); var map = await pair.CreateTestMap(); diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs index f274e1e419..051a015e0f 100644 --- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs +++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs @@ -101,7 +101,6 @@ namespace Content.IntegrationTests.Tests.Damageable var server = pair.Server; var sEntityManager = server.ResolveDependency(); - var sMapManager = server.ResolveDependency(); var sPrototypeManager = server.ResolveDependency(); var sEntitySystemManager = server.ResolveDependency(); diff --git a/Content.IntegrationTests/Tests/DeviceLinking/DeviceLinkingTest.cs b/Content.IntegrationTests/Tests/DeviceLinking/DeviceLinkingTest.cs index c9550d1840..695f16f65c 100644 --- a/Content.IntegrationTests/Tests/DeviceLinking/DeviceLinkingTest.cs +++ b/Content.IntegrationTests/Tests/DeviceLinking/DeviceLinkingTest.cs @@ -34,7 +34,6 @@ public sealed class DeviceLinkingTest : GameTest var server = pair.Server; var protoMan = server.ProtoMan; var compFact = server.ResolveDependency(); - var mapMan = server.ResolveDependency(); var mapSys = server.System(); var deviceLinkSys = server.System(); @@ -49,7 +48,7 @@ public sealed class DeviceLinkingTest : GameTest { // Create a map for each entity/port combo so they can't interfere mapSys.CreateMap(out var mapId); - var grid = mapMan.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); mapSys.SetTile(grid.Owner, grid.Comp, Vector2i.Zero, new Tile(1)); var coord = new EntityCoordinates(grid.Owner, 0, 0); diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs index 6ecdffc58c..d3719a262b 100644 --- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs +++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs @@ -54,7 +54,6 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var deviceNetSystem = entityManager.EntitySysManager.GetEntitySystem(); var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem(); @@ -115,7 +114,6 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork var testMap = await pair.CreateTestMap(); var coordinates = testMap.GridCoords; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var deviceNetSystem = entityManager.EntitySysManager.GetEntitySystem(); var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem(); @@ -198,7 +196,6 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork var testMap = await pair.CreateTestMap(); var coordinates = testMap.GridCoords; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var deviceNetSystem = entityManager.EntitySysManager.GetEntitySystem(); var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem(); diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs index af03de169f..3a0038cb0d 100644 --- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs +++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs @@ -115,7 +115,6 @@ namespace Content.IntegrationTests.Tests.Doors await server.WaitIdleAsync(); - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var physicsSystem = entityManager.System(); var xformSystem = entityManager.System(); diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 59164972c7..35298ce44e 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -44,7 +44,6 @@ namespace Content.IntegrationTests.Tests var server = pair.Server; var entityMan = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var prototypeMan = server.ResolveDependency(); var mapSystem = entityMan.System(); @@ -62,7 +61,7 @@ namespace Content.IntegrationTests.Tests foreach (var protoId in protoIds) { mapSystem.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSystem.CreateGridEntity(mapId); // TODO: Fix this better in engine. mapSystem.SetTile(grid.Owner, grid.Comp, Vector2i.Zero, new Tile(1)); var coord = new EntityCoordinates(grid.Owner, 0, 0); @@ -160,7 +159,6 @@ namespace Content.IntegrationTests.Tests var cfg = server.ResolveDependency(); var prototypeMan = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var sEntMan = server.ResolveDependency(); var mapSys = server.System(); @@ -179,7 +177,7 @@ namespace Content.IntegrationTests.Tests foreach (var protoId in protoIds) { mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); var ent = sEntMan.SpawnEntity(protoId, new EntityCoordinates(grid.Owner, 0.5f, 0.5f)); foreach (var (_, component) in sEntMan.GetNetComponents(ent)) { diff --git a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs index c073020e9c..3cc544250d 100644 --- a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs @@ -39,7 +39,6 @@ public sealed class FluidSpill : GameTest { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var puddleSystem = server.System(); var mapSystem = server.System(); @@ -55,7 +54,7 @@ public sealed class FluidSpill : GameTest await server.WaitPost(() => { mapSystem.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSystem.CreateGridEntity(mapId); gridId = grid.Owner; for (var x = 0; x < 3; x++) diff --git a/Content.IntegrationTests/Tests/FollowerSystemTest.cs b/Content.IntegrationTests/Tests/FollowerSystemTest.cs index 464b3306f2..56153aa8c2 100644 --- a/Content.IntegrationTests/Tests/FollowerSystemTest.cs +++ b/Content.IntegrationTests/Tests/FollowerSystemTest.cs @@ -20,7 +20,6 @@ public sealed class FollowerSystemTest : GameTest var server = pair.Server; var entMan = server.ResolveDependency(); - var mapMan = server.ResolveDependency(); var sysMan = server.ResolveDependency(); var logMan = server.ResolveDependency(); var mapSys = server.System(); diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs index 10804ea201..963f0a775a 100644 --- a/Content.IntegrationTests/Tests/GravityGridTest.cs +++ b/Content.IntegrationTests/Tests/GravityGridTest.cs @@ -38,7 +38,6 @@ namespace Content.IntegrationTests.Tests var testMap = await pair.CreateTestMap(); var entityMan = server.EntMan; - var mapMan = server.MapMan; var mapSys = entityMan.System(); EntityUid generator = default; @@ -49,8 +48,8 @@ namespace Content.IntegrationTests.Tests await server.WaitAssertion(() => { var mapId = testMap.MapId; - grid1 = mapMan.CreateGridEntity(mapId); - grid2 = mapMan.CreateGridEntity(mapId); + grid1 = mapSys.CreateGridEntity(mapId); + grid2 = mapSys.CreateGridEntity(mapId); mapSys.SetTile(grid1, grid1, Vector2i.Zero, new Tile(1)); mapSys.SetTile(grid2, grid2, Vector2i.Zero, new Tile(1)); diff --git a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs index e4bd4615c5..64f49eb9ca 100644 --- a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs +++ b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs @@ -45,7 +45,6 @@ namespace Content.IntegrationTests.Tests.Interaction.Click var server = pair.Server; var sEntities = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var sysMan = server.ResolveDependency(); var handSys = sysMan.GetEntitySystem(); @@ -111,7 +110,6 @@ namespace Content.IntegrationTests.Tests.Interaction.Click var server = pair.Server; var sEntities = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var sysMan = server.ResolveDependency(); var handSys = sysMan.GetEntitySystem(); @@ -177,7 +175,6 @@ namespace Content.IntegrationTests.Tests.Interaction.Click var server = pair.Server; var sEntities = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var sysMan = server.ResolveDependency(); var handSys = sysMan.GetEntitySystem(); @@ -243,7 +240,6 @@ namespace Content.IntegrationTests.Tests.Interaction.Click var server = pair.Server; var sEntities = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var sysMan = server.ResolveDependency(); var handSys = sysMan.GetEntitySystem(); @@ -307,7 +303,6 @@ namespace Content.IntegrationTests.Tests.Interaction.Click var server = pair.Server; var sEntities = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var sysMan = server.ResolveDependency(); var handSys = sysMan.GetEntitySystem(); var conSystem = sysMan.GetEntitySystem(); diff --git a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs index 966f13675d..0e20587d94 100644 --- a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs +++ b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs @@ -32,7 +32,6 @@ namespace Content.IntegrationTests.Tests.Interaction var server = pair.Server; var sEntities = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var conSystem = sEntities.EntitySysManager.GetEntitySystem(); var tSystem = sEntities.EntitySysManager.GetEntitySystem(); diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs index c133db07cd..bbfb641c96 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs @@ -789,7 +789,7 @@ public abstract partial class InteractionTest var pos = Transform.ToMapCoordinates(serverCoords); await Server.WaitPost(() => { - if (MapMan.TryFindGridAt(pos, out var gridUid, out var grid)) + if (MapSystem.TryFindGridAt(pos, out var gridUid, out var grid)) tile = MapSystem.GetTileRef(gridUid, grid, serverCoords).Tile; }); @@ -1148,7 +1148,7 @@ public abstract partial class InteractionTest MapSystem.SetTile(gridEnt, SEntMan.GetCoordinates(coords ?? TargetCoords), tile); return; } - else if (MapMan.TryFindGridAt(pos, out var gUid, out var gComp)) + else if (MapSystem.TryFindGridAt(pos, out var gUid, out var gComp)) { MapSystem.SetTile(gUid, gComp, SEntMan.GetCoordinates(coords ?? TargetCoords), tile); return; @@ -1157,7 +1157,7 @@ public abstract partial class InteractionTest if (proto == null) return; - gridEnt = MapMan.CreateGridEntity(MapData.MapId); + gridEnt = MapSystem.CreateGridEntity(MapData.MapId); grid = gridEnt; gridUid = gridEnt; gridComp = gridEnt.Comp; @@ -1165,7 +1165,7 @@ public abstract partial class InteractionTest Transform.SetWorldPosition((gridUid, gridXform), pos.Position); MapSystem.SetTile((gridUid, gridComp), SEntMan.GetCoordinates(coords ?? TargetCoords), tile); - if (!MapMan.TryFindGridAt(pos, out _, out _)) + if (!MapSystem.TryFindGridAt(pos, out _, out _)) Assert.Fail("Failed to create grid?"); }); await AssertTile(proto, coords); diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs index c4fd300de0..fd42fa9f5d 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs @@ -101,8 +101,7 @@ public abstract partial class InteractionTest : GameTest // SERVER dependencies [SidedDependency(Side.Server)] protected ITileDefinitionManager TileMan = default!; - [SidedDependency(Side.Server)] protected IMapManager MapMan = default!; - protected IPrototypeManager ProtoMan => SProtoMan; + [SidedDependency(Side.Server)] protected IPrototypeManager ProtoMan => SProtoMan; protected IGameTiming STiming => SGameTiming; [SidedDependency(Side.Server)] protected IComponentFactory Factory = default!; [SidedDependency(Side.Server)] protected HandsSystem HandSys = default!; diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index e09d6e5534..588b39b070 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs @@ -37,7 +37,6 @@ namespace Content.IntegrationTests.Tests.Networking var server = pair.Server; var client = pair.Client; - var sMapManager = server.ResolveDependency(); var sEntityManager = server.ResolveDependency(); var cEntityManager = client.ResolveDependency(); var sGameTiming = server.ResolveDependency(); diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index a02179efc6..2470568dc3 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -329,7 +329,6 @@ namespace Content.IntegrationTests.Tests var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entManager = server.ResolveDependency(); var mapLoader = entManager.System(); var mapSystem = entManager.System(); @@ -356,7 +355,7 @@ namespace Content.IntegrationTests.Tests EntityUid? targetGrid = null; var memberQuery = entManager.GetEntityQuery(); - var grids = mapManager.GetAllGrids(mapId).ToList(); + var grids = mapSystem.GetAllGrids(mapId).ToList(); var gridUids = grids.Select(o => o.Owner).ToList(); targetGrid = gridUids.First(); diff --git a/Content.IntegrationTests/Tests/Power/PowerStateTest.cs b/Content.IntegrationTests/Tests/Power/PowerStateTest.cs index a265de532f..46fc4f54f9 100644 --- a/Content.IntegrationTests/Tests/Power/PowerStateTest.cs +++ b/Content.IntegrationTests/Tests/Power/PowerStateTest.cs @@ -35,14 +35,13 @@ public sealed class PowerStateTest : GameTest var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entManager = server.ResolveDependency(); var mapSys = entManager.System(); await server.WaitAssertion(() => { mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); mapSys.SetTile(grid, Vector2i.Zero, new Tile(1)); @@ -77,14 +76,13 @@ public sealed class PowerStateTest : GameTest var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entManager = server.ResolveDependency(); var mapSys = entManager.System(); await server.WaitAssertion(() => { mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); mapSys.SetTile(grid, Vector2i.Zero, new Tile(1)); @@ -128,14 +126,13 @@ public sealed class PowerStateTest : GameTest var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entManager = server.ResolveDependency(); var mapSys = entManager.System(); await server.WaitAssertion(() => { mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); mapSys.SetTile(grid, Vector2i.Zero, new Tile(1)); diff --git a/Content.IntegrationTests/Tests/Power/PowerTest.cs b/Content.IntegrationTests/Tests/Power/PowerTest.cs index db6c0b7c89..674869e691 100644 --- a/Content.IntegrationTests/Tests/Power/PowerTest.cs +++ b/Content.IntegrationTests/Tests/Power/PowerTest.cs @@ -170,7 +170,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var mapSys = entityManager.System(); const float loadPower = 200; @@ -181,7 +180,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 3; i++) @@ -230,7 +229,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var mapSys = entityManager.System(); const float loadPower = 200; @@ -241,7 +239,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 3; i++) @@ -286,7 +284,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var mapSys = entityManager.System(); var gameTiming = server.ResolveDependency(); @@ -296,7 +293,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 3; i++) @@ -372,7 +369,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -388,7 +384,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 3; i++) @@ -476,7 +472,6 @@ namespace Content.IntegrationTests.Tests.Power var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); var mapSys = entityManager.System(); @@ -492,7 +487,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 3; i++) @@ -571,7 +566,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -584,7 +578,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 3; i++) @@ -629,7 +623,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -645,7 +638,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 4; i++) @@ -709,7 +702,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -725,7 +717,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 4; i++) @@ -789,7 +781,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); var mapSys = entityManager.System(); @@ -800,7 +791,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Map layout here is // C - consumer @@ -884,7 +875,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -900,7 +890,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Layout is two generators, two batteries, and one load. As to why two: because previously this test // would fail ONLY if there were more than two batteries present, because each of them tries to supply @@ -981,7 +971,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); var mapSys = entityManager.System(); @@ -992,7 +981,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Map layout here is // C - consumer @@ -1067,7 +1056,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); var mapSys = entityManager.System(); @@ -1078,7 +1066,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitPost(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 4; i++) @@ -1150,7 +1138,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var nodeContainer = entityManager.System(); var mapSys = entityManager.System(); @@ -1162,7 +1149,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 4; i++) @@ -1214,7 +1201,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); var mapSys = entityManager.System(); @@ -1227,7 +1213,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); // Power only works when anchored for (var i = 0; i < 3; i++) @@ -1272,7 +1258,6 @@ namespace Content.IntegrationTests.Tests.Power { var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); var extensionCableSystem = entityManager.System(); @@ -1284,7 +1269,7 @@ namespace Content.IntegrationTests.Tests.Power await server.WaitAssertion(() => { var map = mapSys.CreateMap(out var mapId); - var grid = mapManager.CreateGridEntity(mapId); + var grid = mapSys.CreateGridEntity(mapId); const int range = 5; diff --git a/Content.IntegrationTests/Tests/Respirator/LungTest.cs b/Content.IntegrationTests/Tests/Respirator/LungTest.cs index 097fe5e3a0..482216e920 100644 --- a/Content.IntegrationTests/Tests/Respirator/LungTest.cs +++ b/Content.IntegrationTests/Tests/Respirator/LungTest.cs @@ -132,7 +132,6 @@ public sealed class LungTest : GameTest var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var cfg = server.ResolveDependency(); var mapLoader = entityManager.System(); diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs index 914a1e21c2..57f0a3b937 100644 --- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs @@ -24,7 +24,6 @@ namespace Content.IntegrationTests.Tests var pair = Pair; var server = pair.Server; - var mapManager = server.ResolveDependency(); var sEntities = server.ResolveDependency(); var mapLoader = sEntities.System(); var mapSystem = sEntities.System(); @@ -39,12 +38,12 @@ namespace Content.IntegrationTests.Tests mapSystem.CreateMap(out var mapId); { - var mapGrid = mapManager.CreateGridEntity(mapId); + var mapGrid = mapSystem.CreateGridEntity(mapId); xformSystem.SetWorldPosition(mapGrid, new Vector2(10, 10)); mapSystem.SetTile(mapGrid, new Vector2i(0, 0), new Tile(typeId: 1, flags: 1, variant: 255)); } { - var mapGrid = mapManager.CreateGridEntity(mapId); + var mapGrid = mapSystem.CreateGridEntity(mapId); xformSystem.SetWorldPosition(mapGrid, new Vector2(-8, -8)); mapSystem.SetTile(mapGrid, new Vector2i(0, 0), new Tile(typeId: 2, flags: 1, variant: 254)); } @@ -67,7 +66,7 @@ namespace Content.IntegrationTests.Tests await server.WaitAssertion(() => { { - if (!mapManager.TryFindGridAt(newMap, new Vector2(10, 10), out var gridUid, out var mapGrid) || + if (!mapSystem.TryFindGridAt(newMap, new Vector2(10, 10), out var gridUid, out var mapGrid) || !sEntities.TryGetComponent(gridUid, out var gridXform)) { Assert.Fail(); @@ -81,7 +80,7 @@ namespace Content.IntegrationTests.Tests }); } { - if (!mapManager.TryFindGridAt(newMap, new Vector2(-8, -8), out var gridUid, out var mapGrid) || + if (!mapSystem.TryFindGridAt(newMap, new Vector2(-8, -8), out var gridUid, out var mapGrid) || !sEntities.TryGetComponent(gridUid, out var gridXform)) { Assert.Fail(); diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs index 9339d61270..c62dced18f 100644 --- a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs @@ -27,7 +27,6 @@ namespace Content.IntegrationTests.Tests var entManager = server.ResolveDependency(); var mapLoader = entManager.System(); var mapSystem = entManager.System(); - var mapManager = server.ResolveDependency(); var cfg = server.ResolveDependency(); Assert.That(cfg.GetCVar(CCVars.GridFill), Is.False); @@ -40,7 +39,7 @@ namespace Content.IntegrationTests.Tests await server.WaitPost(() => { mapSystem.CreateMap(out var mapId0); - var grid0 = mapManager.CreateGridEntity(mapId0); + var grid0 = mapSystem.CreateGridEntity(mapId0); entManager.RunMapInit(grid0.Owner, entManager.GetComponent(grid0)); Assert.That(mapLoader.TrySaveGrid(grid0.Owner, rp1)); mapSystem.CreateMap(out var mapId1); diff --git a/Content.IntegrationTests/Tests/Shuttle/DockTest.cs b/Content.IntegrationTests/Tests/Shuttle/DockTest.cs index 927f973472..74d2794c70 100644 --- a/Content.IntegrationTests/Tests/Shuttle/DockTest.cs +++ b/Content.IntegrationTests/Tests/Shuttle/DockTest.cs @@ -33,7 +33,6 @@ public sealed class DockTest : GameTest var map = await pair.CreateTestMap(); var entManager = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var dockingSystem = entManager.System(); var mapSystem = entManager.System(); var xformSystem = entManager.System(); @@ -43,8 +42,8 @@ public sealed class DockTest : GameTest await server.WaitAssertion(() => { entManager.DeleteEntity(map.Grid); - var grid1 = mapManager.CreateGridEntity(mapId); - var grid2 = mapManager.CreateGridEntity(mapId); + var grid1 = mapSystem.CreateGridEntity(mapId); + var grid2 = mapSystem.CreateGridEntity(mapId); var grid1Ent = grid1.Owner; var grid2Ent = grid2.Owner; var grid2Offset = new Vector2(50f, 50f); diff --git a/Content.IntegrationTests/Tests/ShuttleTest.cs b/Content.IntegrationTests/Tests/ShuttleTest.cs index 1c447db871..2c77f6b8c7 100644 --- a/Content.IntegrationTests/Tests/ShuttleTest.cs +++ b/Content.IntegrationTests/Tests/ShuttleTest.cs @@ -19,7 +19,6 @@ namespace Content.IntegrationTests.Tests var server = pair.Server; await server.WaitIdleAsync(); - var mapMan = server.ResolveDependency(); var entManager = server.ResolveDependency(); var physicsSystem = entManager.System(); diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs index ec6ff3ba59..7f2807fe7b 100644 --- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs +++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs @@ -349,7 +349,6 @@ namespace Content.IntegrationTests.Tests var server = pair.Server; await server.WaitIdleAsync(); - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var entitySystemManager = server.ResolveDependency(); diff --git a/Content.MapRenderer/Painters/GridPainter.cs b/Content.MapRenderer/Painters/GridPainter.cs index ed17d0d3d6..47cf2fcc3d 100644 --- a/Content.MapRenderer/Painters/GridPainter.cs +++ b/Content.MapRenderer/Painters/GridPainter.cs @@ -24,7 +24,6 @@ namespace Content.MapRenderer.Painters private readonly IEntityManager _cEntityManager; private readonly IEntityManager _sEntityManager; - private readonly IMapManager _sMapManager; private readonly ConcurrentDictionary> _entities; private readonly Dictionary> _decals; @@ -37,7 +36,6 @@ namespace Content.MapRenderer.Painters _cEntityManager = client.ResolveDependency(); _sEntityManager = server.ResolveDependency(); - _sMapManager = server.ResolveDependency(); _entities = GetEntities(); _decals = GetDecals(); diff --git a/Content.MapRenderer/Painters/MapPainter.cs b/Content.MapRenderer/Painters/MapPainter.cs index a0198b35a0..c6ae9c03bf 100644 --- a/Content.MapRenderer/Painters/MapPainter.cs +++ b/Content.MapRenderer/Painters/MapPainter.cs @@ -156,8 +156,6 @@ namespace Content.MapRenderer.Painters await _pair.RunTicksSync(10); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); - var sMapManager = server.ResolveDependency(); - var tilePainter = new TilePainter(client, server); var entityPainter = new GridPainter(client, server); var xformQuery = sEntityManager.GetEntityQuery(); @@ -175,7 +173,7 @@ namespace Content.MapRenderer.Painters if (_map is RenderMapPrototype) { var mapId = sEntityManager.System().DefaultMap; - _grids = sMapManager.GetAllGrids(mapId).ToArray(); + _grids = mapSys.GetAllGrids(mapId).ToArray(); } foreach (var (uid, _) in _grids) diff --git a/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs b/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs index 9117bf262d..e70faac1a9 100644 --- a/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs @@ -18,7 +18,6 @@ public sealed partial class ProjectileAnomalySystem : EntitySystem [Dependency] private TransformSystem _xform = default!; [Dependency] private EntityLookupSystem _lookup = default!; [Dependency] private IRobustRandom _random = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private GunSystem _gunSystem = default!; [Dependency] private SharedMapSystem _map = default!; [Dependency] private EntityQuery _mobStateQuery = default!; @@ -93,7 +92,7 @@ public sealed partial class ProjectileAnomalySystem : EntitySystem { var mapPos = _xform.ToMapCoordinates(coords); - var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _) + var spawnCoords = _map.TryFindGridAt(mapPos, out var gridUid, out _) ? _xform.WithEntityId(coords, gridUid) : new(_map.GetMapOrInvalid(mapPos.MapId), mapPos.Position); diff --git a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs index 57ef0fa13f..956f79d2fc 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs @@ -18,7 +18,6 @@ namespace Content.Server.Atmos.EntitySystems public sealed partial class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem { [Dependency] private IPlayerManager _playerManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IConfigurationManager _configManager = default!; [Dependency] private SharedTransformSystem _transform = default!; [Dependency] private MapSystem _mapSystem = default!; @@ -140,7 +139,7 @@ namespace Content.Server.Atmos.EntitySystems new Vector2(LocalViewRange, LocalViewRange)); _grids.Clear(); - _mapManager.FindGridsIntersecting(transform.MapID, worldBounds, ref _grids); + _mapSystem.FindGridsIntersecting(transform.MapID, worldBounds, ref _grids); foreach (var grid in _grids) { diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs index abe382d733..571dc3c819 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs @@ -183,7 +183,7 @@ public sealed partial class AtmosphereSystem if (playerMap == null) return CompletionResult.FromOptions(options); - foreach (var grid in _mapManager.GetAllGrids(playerMap.Value).OrderBy(o => o.Owner)) + foreach (var grid in _mapSystem.GetAllGrids(playerMap.Value).OrderBy(o => o.Owner)) { var uid = grid.Owner; if (!TryComp(uid, out TransformComponent? gridXform)) diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs index c089b123a6..400b778cac 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs @@ -28,7 +28,6 @@ namespace Content.Server.Atmos.EntitySystems; [UsedImplicitly] public sealed partial class AtmosphereSystem : SharedAtmosphereSystem { - [Dependency] private IMapManager _mapManager = default!; [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private IAdminLogManager _adminLog = default!; [Dependency] private IParallelManager _parallel = default!; diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs index f57b59614d..061ef36bb0 100644 --- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs +++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs @@ -27,7 +27,6 @@ namespace Content.Server.Atmos.EntitySystems { [Robust.Shared.IoC.Dependency] private IGameTiming _gameTiming = default!; [Robust.Shared.IoC.Dependency] private IPlayerManager _playerManager = default!; - [Robust.Shared.IoC.Dependency] private IMapManager _mapManager = default!; [Robust.Shared.IoC.Dependency] private IParallelManager _parMan = default!; [Robust.Shared.IoC.Dependency] private AtmosphereSystem _atmosphereSystem = default!; [Robust.Shared.IoC.Dependency] private ChunkingSystem _chunkingSys = default!; @@ -71,7 +70,6 @@ namespace Content.Server.Atmos.EntitySystems ChunkIndexPool = _chunkIndexPool, Sessions = _sessions, ChunkingSys = _chunkingSys, - MapManager = _mapManager, ChunkViewerPool = _chunkViewerPool, LastSentChunks = _lastSentChunks, GridQuery = _mapGridQuery, @@ -383,7 +381,6 @@ namespace Content.Server.Atmos.EntitySystems public int BatchSize => 2; public IEntityManager EntManager; - public IMapManager MapManager; public ChunkingSystem ChunkingSys; public GasTileOverlaySystem System; public ObjectPool> ChunkIndexPool; diff --git a/Content.Server/Chunking/ChunkingSystem.cs b/Content.Server/Chunking/ChunkingSystem.cs index 7d2399182f..feb315fd0e 100644 --- a/Content.Server/Chunking/ChunkingSystem.cs +++ b/Content.Server/Chunking/ChunkingSystem.cs @@ -2,7 +2,6 @@ using Microsoft.Extensions.ObjectPool; using Robust.Shared; using Robust.Shared.Configuration; using Robust.Shared.Enums; -using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Player; using Robust.Shared.Utility; @@ -17,7 +16,7 @@ namespace Content.Shared.Chunking; public sealed partial class ChunkingSystem : EntitySystem { [Dependency] private IConfigurationManager _configurationManager = default!; - [Dependency] private IMapManager _mapManager = default!; + [Dependency] private SharedMapSystem _maps = default!; [Dependency] private SharedTransformSystem _transform = default!; private Box2 _baseViewBounds; @@ -69,7 +68,7 @@ public sealed partial class ChunkingSystem : EntitySystem var bounds = _baseViewBounds.Translated(pos).Enlarged(viewEnlargement); var state = new QueryState(chunks, indexPool, chunkSize, bounds, _transform, EntityManager); - _mapManager.FindGridsIntersecting(xform.MapID, bounds, ref state, AddGridChunks, true); + _maps.FindGridsIntersecting(xform.MapID, bounds, ref state, AddGridChunks, true); } private static bool AddGridChunks( diff --git a/Content.Server/Construction/Conditions/ComponentInTile.cs b/Content.Server/Construction/Conditions/ComponentInTile.cs index 6af8c36e24..c536bc7a4b 100644 --- a/Content.Server/Construction/Conditions/ComponentInTile.cs +++ b/Content.Server/Construction/Conditions/ComponentInTile.cs @@ -48,7 +48,7 @@ namespace Content.Server.Construction.Conditions return false; var transformSys = entityManager.System(); - var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve(), transformSys); + var indices = transform.Coordinates.ToVector2i(entityManager, transformSys); var lookup = entityManager.EntitySysManager.GetEntitySystem(); diff --git a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs index 7f585204c1..7294d9933e 100644 --- a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs @@ -18,7 +18,6 @@ namespace Content.Server.EntityEffects.Effects.Solution; /// public sealed partial class AreaReactionEntityEffectsSystem : EntityEffectSystem { - [Dependency] private IMapManager _mapManager = default!; [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private SharedMapSystem _map = default!; [Dependency] private SharedTransformSystem _xform = default!; @@ -34,7 +33,7 @@ public sealed partial class AreaReactionEntityEffectsSystem : EntityEffectSystem var spreadAmount = (int) Math.Max(0, Math.Ceiling(args.Scale / args.Effect.OverflowThreshold)); var effect = args.Effect; - if (!_mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) || + if (!_map.TryFindGridAt(mapCoords, out var gridUid, out var grid) || !_map.TryGetTileRef(gridUid, grid, xform.Coordinates, out var tileRef)) return; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs index 608c5725db..b268fd896c 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs @@ -48,7 +48,7 @@ public sealed partial class ExplosionSystem var (localGrids, referenceGrid, maxDistance) = GetLocalGrids(epicenter, totalIntensity, slope, maxIntensity); // get the epicenter tile indices - if (_mapManager.TryFindGridAt(epicenter, out var gridUid, out var candidateGrid) && + if (_map.TryFindGridAt(epicenter, out var gridUid, out var candidateGrid) && _map.TryGetTileRef(gridUid, candidateGrid, _map.WorldToTile(gridUid, candidateGrid, epicenter.Position), out var tileRef) && !tileRef.Tile.IsEmpty) { @@ -279,7 +279,7 @@ public sealed partial class ExplosionSystem var box = Box2.CenteredAround(epicenter.Position, new Vector2(radius, radius)); _grids.Clear(); - _mapManager.FindGridsIntersecting(epicenter.MapId, box, ref _grids); + _map.FindGridsIntersecting(epicenter.MapId, box, ref _grids); foreach (var grid in _grids) { if (TryComp(grid.Owner, out PhysicsComponent? physics) && physics.FixturesMass > mass) @@ -301,7 +301,7 @@ public sealed partial class ExplosionSystem radius *= 4; box = Box2.CenteredAround(epicenter.Position, new Vector2(radius, radius)); _grids.Clear(); - _mapManager.FindGridsIntersecting(epicenter.MapId, box, ref _grids); + _map.FindGridsIntersecting(epicenter.MapId, box, ref _grids); var grids = _grids.Select(x => x.Owner).ToList(); if (referenceGrid != null) diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index e51574c6f5..cdb90c781d 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -35,7 +35,6 @@ namespace Content.Server.Explosion.EntitySystems; public sealed partial class ExplosionSystem : SharedExplosionSystem { - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IRobustRandom _robustRandom = default!; [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private IConfigurationManager _cfg = default!; diff --git a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs index 12ef19219d..978e09ba1a 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs @@ -11,7 +11,6 @@ namespace Content.Server.Fluids.EntitySystems; public sealed partial class PuddleDebugDebugOverlaySystem : SharedPuddleDebugOverlaySystem { [Dependency] private IGameTiming _timing = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private PuddleSystem _puddle = default!; [Dependency] private SharedTransformSystem _transform = default!; [Dependency] private SharedMapSystem _map = default!; @@ -62,7 +61,7 @@ public sealed partial class PuddleDebugDebugOverlaySystem : SharedPuddleDebugOve new Vector2(LocalViewRange, LocalViewRange)); _grids.Clear(); - _mapManager.FindGridsIntersecting(transform.MapID, worldBounds, ref _grids); + _map.FindGridsIntersecting(transform.MapID, worldBounds, ref _grids); foreach (var grid in _grids) { @@ -79,7 +78,7 @@ public sealed partial class PuddleDebugDebugOverlaySystem : SharedPuddleDebugOve if (!Resolve(uid, ref puddle, ref xform, false)) continue; - var pos = xform.Coordinates.ToVector2i(EntityManager, _mapManager, _transform); + var pos = xform.Coordinates.ToVector2i(EntityManager, _transform); var vol = _puddle.CurrentVolume(uid, puddle); data.Add(new PuddleDebugOverlayData(pos, vol)); } diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index 8c47add01e..e6ae3634c1 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -724,8 +724,6 @@ namespace Content.Server.GameTicking EntityManager.FlushEntities(); - _mapManager.Restart(); - _banManager.Restart(); _gameMapManager.ClearSelectedMap(); diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 626af6dd3a..d18b37fc23 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -476,7 +476,7 @@ namespace Content.Server.GameTicking var spawn = _robustRandom.Pick(_possiblePositions); var toMap = _transform.ToMapCoordinates(spawn); - if (_mapManager.TryFindGridAt(toMap, out var gridUid, out _)) + if (_map.TryFindGridAt(toMap, out var gridUid, out _)) { var gridXform = Transform(gridUid); diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index b3b88f29a2..3d6ad8ad4c 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -39,7 +39,6 @@ namespace Content.Server.GameTicking [Dependency] private IGameMapManager _gameMapManager = default!; [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private ILogManager _logManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IRobustRandom _robustRandom = default!; #if EXCEPTION_TOLERANCE [Dependency] private IRuntimeLog _runtimeLog = default!; diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs index c01601e9bd..1e40dcdb98 100644 --- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs +++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs @@ -183,7 +183,7 @@ public sealed partial class NPCCombatSystem EntityCoordinates targetCordinates; - if (_mapManager.TryFindGridAt(xform.MapID, targetPos, out var gridUid, out var mapGrid)) + if (_map.TryFindGridAt(xform.MapID, targetPos, out var gridUid, out var mapGrid)) { targetCordinates = new EntityCoordinates(gridUid, _map.WorldToLocal(gridUid, mapGrid, targetSpot)); } diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.cs b/Content.Server/NPC/Systems/NPCCombatSystem.cs index 3b7052180f..de7fb874e4 100644 --- a/Content.Server/NPC/Systems/NPCCombatSystem.cs +++ b/Content.Server/NPC/Systems/NPCCombatSystem.cs @@ -16,7 +16,6 @@ namespace Content.Server.NPC.Systems; public sealed partial class NPCCombatSystem : EntitySystem { [Dependency] private IGameTiming _timing = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IRobustRandom _random = default!; [Dependency] private GunSystem _gun = default!; [Dependency] private InteractionSystem _interaction = default!; diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs index bef26e9867..3ab469744a 100644 --- a/Content.Server/Pinpointer/NavMapSystem.cs +++ b/Content.Server/Pinpointer/NavMapSystem.cs @@ -24,7 +24,6 @@ public sealed partial class NavMapSystem : SharedNavMapSystem [Dependency] private SharedAppearanceSystem _appearance = default!; [Dependency] private SharedMapSystem _mapSystem = default!; [Dependency] private SharedTransformSystem _transformSystem = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private TurfSystem _turfSystem = default!; @@ -448,7 +447,7 @@ public sealed partial class NavMapSystem : SharedNavMapSystem return beacon.Value.Comp.Text!; var gridOffset = Angle.Zero; - if (_mapManager.TryFindGridAt(pos.Value, out var grid, out _)) + if (_mapSystem.TryFindGridAt(pos.Value, out var grid, out _)) gridOffset = Transform(grid).LocalRotation; // get the angle between the two positions, adjusted for the grid rotation so that diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs index f7fed9a154..1c062ace16 100644 --- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs @@ -33,7 +33,6 @@ namespace Content.Server.Pointing.EntitySystems { [Dependency] private IConfigurationManager _config = default!; [Dependency] private IReplayRecordingManager _replay = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private IGameTiming _gameTiming = default!; @@ -284,7 +283,7 @@ namespace Content.Server.Pointing.EntitySystems TileRef? tileRef = null; string? position = null; - if (_mapManager.TryFindGridAt(mapCoordsPointed, out var gridUid, out var grid)) + if (_map.TryFindGridAt(mapCoordsPointed, out var gridUid, out var grid)) { position = $"EntId={gridUid} {_map.WorldToTile(gridUid, grid, mapCoordsPointed.Position)}"; tileRef = _map.GetTileRef(gridUid, grid, _map.WorldToTile(gridUid, grid, mapCoordsPointed.Position)); diff --git a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs index 796c1e1fce..8bba597792 100644 --- a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs +++ b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs @@ -173,7 +173,7 @@ public partial class RadiationSystem // Avoids having to do a lookup per source*receiver. var box = Box2.FromTwoPoints(source.WorldPosition, destWorld); _grids.Clear(); - _mapManager.FindGridsIntersecting(mapId, box, ref _grids, true); + _maps.FindGridsIntersecting(mapId, box, ref _grids, true); // gridcast through each grid and try to hit some radiation blockers // the ray will be updated with each grid that has some blockers diff --git a/Content.Server/Radiation/Systems/RadiationSystem.cs b/Content.Server/Radiation/Systems/RadiationSystem.cs index ec354d723d..d553e4692a 100644 --- a/Content.Server/Radiation/Systems/RadiationSystem.cs +++ b/Content.Server/Radiation/Systems/RadiationSystem.cs @@ -11,7 +11,6 @@ namespace Content.Server.Radiation.Systems; public sealed partial class RadiationSystem : SharedRadiationSystem { - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IConfigurationManager _cfg = default!; [Dependency] private SharedTransformSystem _transform = default!; [Dependency] private SharedStackSystem _stack = default!; diff --git a/Content.Server/Salvage/SalvageRulerCommand.cs b/Content.Server/Salvage/SalvageRulerCommand.cs index d5c0b30672..da3ea6cd2c 100644 --- a/Content.Server/Salvage/SalvageRulerCommand.cs +++ b/Content.Server/Salvage/SalvageRulerCommand.cs @@ -1,23 +1,17 @@ using Content.Server.Administration; using Content.Shared.Administration; using Robust.Shared.Console; -using Robust.Shared.Map; namespace Content.Server.Salvage; [AdminCommand(AdminFlags.Admin)] -sealed partial class SalvageRulerCommand : IConsoleCommand +sealed partial class SalvageRulerCommand : LocalizedEntityCommands { - [Dependency] private IEntityManager _entities = default!; - [Dependency] private IMapManager _maps = default!; + [Dependency] private SharedMapSystem _maps = default!; - public string Command => "salvageruler"; + public override string Command => "salvageruler"; - public string Description => Loc.GetString("salvage-ruler-command-description"); - - public string Help => Loc.GetString("salvage-ruler-command-help-text", ("command",Command)); - - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 0) { @@ -39,12 +33,12 @@ sealed partial class SalvageRulerCommand : IConsoleCommand return; } - var entityTransform = _entities.GetComponent(entity.Value); + var entityTransform = EntityManager.GetComponent(entity.Value); var total = Box2.UnitCentered; var first = true; foreach (var mapGrid in _maps.GetAllGrids(entityTransform.MapID)) { - var aabb = _entities.System().GetWorldMatrix(mapGrid).TransformBox(mapGrid.Comp.LocalAABB); + var aabb = EntityManager.System().GetWorldMatrix(mapGrid).TransformBox(mapGrid.Comp.LocalAABB); if (first) { total = aabb; diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs index ff66c75a48..15db37db09 100644 --- a/Content.Server/Salvage/SalvageSystem.Magnet.cs +++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs @@ -8,6 +8,7 @@ using Content.Shared.Radio; using Content.Shared.Salvage.Magnet; using Robust.Shared.Exceptions; using Robust.Shared.Map; +using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; namespace Content.Server.Salvage; @@ -292,12 +293,12 @@ public sealed partial class SalvageSystem switch (offering) { case AsteroidOffering asteroid: - var grid = _mapManager.CreateGridEntity(salvMap); + var grid = _mapSystem.CreateGridEntity(salvMap); await _dungeon.GenerateDungeonAsync(asteroid.DungeonConfig, grid.Owner, grid.Comp, Vector2i.Zero, seed); break; case DebrisOffering debris: var debrisProto = ProtoMan.Index(debris.Id); - var debrisGrid = _mapManager.CreateGridEntity(salvMap); + var debrisGrid = _mapSystem.CreateGridEntity(salvMap); await _dungeon.GenerateDungeonAsync(debrisProto, debrisGrid.Owner, debrisGrid.Comp, Vector2i.Zero, seed); break; case SalvageOffering wreck: @@ -422,6 +423,7 @@ public sealed partial class SalvageSystem var magnetPos = _transform.GetWorldPosition(magnet) + worldAngle.ToVec() * bounds.MaxDimension; var origin = attachedAABB.ClosestPoint(magnetPos); var fraction = 0.50f; + var grids = new List>(); // Thanks 20kdc for (var i = 0; i < 20; i++) @@ -437,7 +439,9 @@ public sealed partial class SalvageSystem // This doesn't stop it from spawning on top of random things in space // Might be better like this, ghosts could stop it before - if (_mapManager.FindGridsIntersecting(finalCoords.MapId, box2Rot).Any()) + grids.Clear(); + _mapSystem.FindGridsIntersecting(finalCoords.MapId, box2Rot, ref grids); + if (grids.Count > 0) { // Bump it further and further just in case. fraction += 0.1f; diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs index 5fbf7b1a72..94c4dc85dd 100644 --- a/Content.Server/Salvage/SalvageSystem.cs +++ b/Content.Server/Salvage/SalvageSystem.cs @@ -3,7 +3,6 @@ using Content.Shared.Radio; using Content.Shared.Salvage; using Robust.Server.GameObjects; using Robust.Shared.Configuration; -using Robust.Shared.Map; using Robust.Shared.Random; using Content.Server.Chat.Managers; using Content.Server.Gravity; @@ -26,7 +25,6 @@ namespace Content.Server.Salvage [Dependency] private IConfigurationManager _configurationManager = default!; [Dependency] private IGameTiming _timing = default!; [Dependency] private ILogManager _logManager = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IRobustRandom _random = default!; [Dependency] private AnchorableSystem _anchorable = default!; [Dependency] private BiomeSystem _biome = default!; diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs index f660e677f1..388c022388 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs @@ -209,7 +209,7 @@ public sealed partial class DockingSystem // Check if there's no intersecting grids (AKA oh god it's docking at cargo). grids.Clear(); - _mapManager.FindGridsIntersecting(targetGridXform.MapID, dockedBounds, ref grids, includeMap: false); + _mapSystem.FindGridsIntersecting(targetGridXform.MapID, dockedBounds, ref grids, includeMap: false); if (grids.Any(o => o.Owner != targetGrid && o.Owner != targetGridXform.MapUid)) { continue; diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs index c9d1847536..5c29de00b0 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.cs @@ -18,7 +18,6 @@ namespace Content.Server.Shuttles.Systems { public sealed partial class DockingSystem : SharedDockingSystem { - [Dependency] private IMapManager _mapManager = default!; [Dependency] private SharedMapSystem _mapSystem = default!; [Dependency] private DoorSystem _doorSystem = default!; [Dependency] private EntityLookupSystem _lookup = default!; diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 60568a5b04..ba94495215 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -803,7 +803,7 @@ public sealed partial class ShuttleSystem // We don't include this in the actual targetAABB because then we would be double-expanding it. // Once in this loop, then again when placing the shuttle later. // Note that targetAABB already has expansionAmount factored in already. - _mapManager.FindGridsIntersecting(mapId, targetAABB.Enlarged(maxOffset), ref grids); + Maps.FindGridsIntersecting(mapId, targetAABB.Enlarged(maxOffset), ref grids); foreach (var grid in grids) { diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs index 021a90fe6a..6c4b3a347d 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs @@ -107,7 +107,7 @@ public sealed partial class ShuttleSystem _mapSystem.CreateMap(out var mapId); - var spawnedGrid = _mapManager.CreateGridEntity(mapId); + var spawnedGrid = Maps.CreateGridEntity(mapId); _transform.SetMapCoordinates(spawnedGrid, new MapCoordinates(Vector2.Zero, mapId)); _dungeon.GenerateDungeon(dungeonProto, spawnedGrid.Owner, spawnedGrid.Comp, Vector2i.Zero, _random.Next(), spawnCoords); diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs index 6d8d004c9a..965636ec39 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs @@ -20,12 +20,10 @@ using Robust.Server.GameStates; using Robust.Shared.Audio.Systems; using Robust.Shared.Configuration; using Robust.Shared.EntitySerialization.Systems; -using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Physics; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Systems; -using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; using Content.Shared.Maps; @@ -38,7 +36,6 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem [Dependency] private IAdminLogManager _logger = default!; [Dependency] private IConfigurationManager _cfg = default!; [Dependency] private IGameTiming _gameTiming = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IRobustRandom _random = default!; [Dependency] private BiomeSystem _biomes = default!; [Dependency] private GibbingSystem _gibbing = default!; diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs index 7c9eec38c0..516c2daab2 100644 --- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs @@ -27,7 +27,6 @@ public sealed partial class EventHorizonSystem : SharedEventHorizonSystem #region Dependencies [Dependency] private EntityLookupSystem _lookup = default!; [Dependency] private IGameTiming _timing = default!; - [Dependency] private IMapManager _mapMan = default!; [Dependency] private IAdminLogManager _adminLogger = default!; [Dependency] private SharedContainerSystem _containerSystem = default!; [Dependency] private SharedPhysicsSystem _physics = default!; @@ -309,7 +308,7 @@ public sealed partial class EventHorizonSystem : SharedEventHorizonSystem var box = Box2.CenteredAround(mapPos.Position, new Vector2(range, range)); var circle = new Circle(mapPos.Position, range); var grids = new List>(); - _mapMan.FindGridsIntersecting(mapPos.MapId, box, ref grids); + _mapSystem.FindGridsIntersecting(mapPos.MapId, box, ref grids); foreach (var grid in grids) { diff --git a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs index ed9522f3f2..372df0efc5 100644 --- a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs +++ b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs @@ -14,7 +14,6 @@ public sealed partial class EntityStorageSystem : SharedEntityStorageSystem { [Dependency] private ConstructionSystem _construction = default!; [Dependency] private AtmosphereSystem _atmos = default!; - [Dependency] private IMapManager _map = default!; [Dependency] private MapSystem _mapSystem = default!; public override void Initialize() @@ -77,7 +76,7 @@ public sealed partial class EntityStorageSystem : SharedEntityStorageSystem { var targetCoordinates = TransformSystem.ToMapCoordinates(new EntityCoordinates(uid, component.EnteringOffset)); - if (_map.TryFindGridAt(targetCoordinates, out var gridId, out var grid)) + if (_mapSystem.TryFindGridAt(targetCoordinates, out var gridId, out var grid)) { return _mapSystem.GetTileRef(gridId, grid, targetCoordinates); } diff --git a/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs index 574f9db000..bf7ed19e77 100644 --- a/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs @@ -15,7 +15,6 @@ namespace Content.Server.Trigger.Systems; /// public sealed partial class SmokeOnTriggerSystem : EntitySystem { - [Dependency] private IMapManager _mapMan = default!; [Dependency] private MapSystem _map = default!; [Dependency] private SmokeSystem _smoke = default!; [Dependency] private TransformSystem _transform = default!; @@ -42,7 +41,7 @@ public sealed partial class SmokeOnTriggerSystem : EntitySystem // TODO: move all of this into an API function in SmokeSystem var xform = Transform(target.Value); var mapCoords = _transform.GetMapCoordinates(target.Value, xform); - if (!_mapMan.TryFindGridAt(mapCoords, out var gridUid, out var gridComp) || + if (!_map.TryFindGridAt(mapCoords, out var gridUid, out var gridComp) || !_map.TryGetTileRef(gridUid, gridComp, xform.Coordinates, out var tileRef) || tileRef.Tile.IsEmpty) { diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index 774a23e87e..a08c7dece8 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -72,7 +72,7 @@ public sealed partial class GunSystem : SharedGunSystem var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle()); // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map. - var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out _) + var fromEnt = Maps.TryFindGridAt(fromMap, out var gridUid, out _) ? TransformSystem.WithEntityId(fromCoordinates, gridUid) : new EntityCoordinates(_map.GetMapOrInvalid(fromMap.MapId), fromMap.Position); diff --git a/Content.Shared/Abilities/Mime/MimePowersSystem.cs b/Content.Shared/Abilities/Mime/MimePowersSystem.cs index 418e26a48a..a900e32e5f 100644 --- a/Content.Shared/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Shared/Abilities/Mime/MimePowersSystem.cs @@ -20,7 +20,6 @@ public sealed partial class MimePowersSystem : EntitySystem [Dependency] private SharedActionsSystem _actionsSystem = default!; [Dependency] private AlertsSystem _alertsSystem = default!; [Dependency] private TurfSystem _turf = default!; - [Dependency] private IMapManager _mapMan = default!; [Dependency] private SharedContainerSystem _container = default!; [Dependency] private IGameTiming _timing = default!; @@ -90,7 +89,7 @@ public sealed partial class MimePowersSystem : EntitySystem var xform = Transform(ent); // Get the tile in front of the mime var offsetValue = xform.LocalRotation.ToWorldVec(); - var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan); + var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager); var tile = _turf.GetTileRef(coords); if (tile == null) return; diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs index 300001003e..d17b08461c 100644 --- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs +++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs @@ -25,7 +25,6 @@ namespace Content.Shared.Construction.EntitySystems; public sealed partial class AnchorableSystem : EntitySystem { - [Dependency] private IMapManager _mapManager = default!; [Dependency] private ISharedAdminLogManager _adminLogger = default!; [Dependency] private SharedPopupSystem _popup = default!; [Dependency] private PullingSystem _pulling = default!; @@ -174,7 +173,7 @@ public sealed partial class AnchorableSystem : EntitySystem // TODO: Anchoring snaps rn anyway! if (component.Snap) { - var coordinates = xform.Coordinates.SnapToGrid(EntityManager, _mapManager); + var coordinates = xform.Coordinates.SnapToGrid(EntityManager); if (AnyUnstackable(uid, coordinates)) { diff --git a/Content.Shared/Construction/SharedConstructionSystem.cs b/Content.Shared/Construction/SharedConstructionSystem.cs index d92ca7b7ed..4df5a40332 100644 --- a/Content.Shared/Construction/SharedConstructionSystem.cs +++ b/Content.Shared/Construction/SharedConstructionSystem.cs @@ -7,7 +7,6 @@ namespace Content.Shared.Construction { public abstract partial class SharedConstructionSystem : EntitySystem { - [Dependency] private IMapManager _mapManager = default!; [Dependency] private SharedMapSystem _map = default!; [Dependency] protected SharedTransformSystem TransformSystem = default!; @@ -19,7 +18,7 @@ namespace Content.Shared.Construction if (!canBuildInImpassable) return null; - if (!_mapManager.TryFindGridAt(coords, out var gridUid, out var grid)) + if (!_map.TryFindGridAt(coords, out var gridUid, out var grid)) return null; var ignored = _map.GetAnchoredEntities((gridUid, grid), coords).ToHashSet(); diff --git a/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs b/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs index aa2bd15586..8d84a30ec0 100644 --- a/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs +++ b/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Coordinates.Helpers { public static class SnapgridHelper { - public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, IEntityManager? entMan = null, IMapManager? mapManager = null) + public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, IEntityManager? entMan = null) { - IoCManager.Resolve(ref entMan, ref mapManager); + IoCManager.Resolve(ref entMan); var xformSys = entMan.System(); var gridId = xformSys.GetGrid(coordinates.EntityId); diff --git a/Content.Shared/Decals/SharedDecalSystem.cs b/Content.Shared/Decals/SharedDecalSystem.cs index 8738d8c0f1..d4ea0d8190 100644 --- a/Content.Shared/Decals/SharedDecalSystem.cs +++ b/Content.Shared/Decals/SharedDecalSystem.cs @@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis; using System.Numerics; using Robust.Shared.GameStates; using Robust.Shared.Map; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using static Content.Shared.Decals.DecalGridComponent; @@ -10,7 +9,6 @@ namespace Content.Shared.Decals { public abstract partial class SharedDecalSystem : EntitySystem { - [Dependency] protected IMapManager MapManager = default!; protected bool PvsEnabled; diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 0d29e67beb..541736d869 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -54,7 +54,6 @@ namespace Content.Shared.Interaction public abstract partial class SharedInteractionSystem : EntitySystem { [Dependency] private IGameTiming _gameTiming = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private ISharedAdminLogManager _adminLogger = default!; [Dependency] private ISharedChatManager _chat = default!; [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; @@ -900,7 +899,7 @@ namespace Content.Shared.Interaction ignoreAnchored = angleDelta < wallMount.Arc / 2 || Math.Tau - angleDelta < wallMount.Arc / 2; } - if (ignoreAnchored && _mapManager.TryFindGridAt(targetCoords, out var gridUid, out var grid)) + if (ignoreAnchored && _map.TryFindGridAt(targetCoords, out var gridUid, out var grid)) ignored.UnionWith(_map.GetAnchoredEntities((gridUid, grid), targetCoords)); } diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs index e8d0b0091c..517c8f8f09 100644 --- a/Content.Shared/Magic/SharedMagicSystem.cs +++ b/Content.Shared/Magic/SharedMagicSystem.cs @@ -46,7 +46,6 @@ namespace Content.Shared.Magic; public abstract partial class SharedMagicSystem : EntitySystem { [Dependency] private ISerializationManager _seriMan = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private SharedMapSystem _mapSystem = default!; [Dependency] private IRobustRandom _random = default!; [Dependency] private SharedGunSystem _gunSystem = default!; @@ -343,7 +342,7 @@ public abstract partial class SharedMagicSystem : EntitySystem if (!_net.IsServer) return; - var ent = Spawn(proto, position.SnapToGrid(EntityManager, _mapManager)); + var ent = Spawn(proto, position.SnapToGrid(EntityManager)); if (lifetime != null) { diff --git a/Content.Shared/Maps/TileSystem.cs b/Content.Shared/Maps/TileSystem.cs index 51c37c41f8..aba82bbf5a 100644 --- a/Content.Shared/Maps/TileSystem.cs +++ b/Content.Shared/Maps/TileSystem.cs @@ -21,7 +21,6 @@ namespace Content.Shared.Maps; public sealed partial class TileSystem : EntitySystem { [Dependency] private IConfigurationManager _cfg = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private IRobustRandom _robustRandom = default!; [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private SharedDecalSystem _decal = default!; @@ -314,7 +313,7 @@ public sealed partial class TileSystem : EntitySystem } //Destroy any decals on the tile - var decals = _decal.GetDecalsInRange(gridUid, coordinates.SnapToGrid(EntityManager, _mapManager).Position, 0.5f); + var decals = _decal.GetDecalsInRange(gridUid, coordinates.SnapToGrid(EntityManager).Position, 0.5f); foreach (var (id, _) in decals) { _decal.RemoveDecal(tileRef.GridUid, id); diff --git a/Content.Shared/Maps/TurfSystem.cs b/Content.Shared/Maps/TurfSystem.cs index 4ecafc3d9d..c6b0755cf4 100644 --- a/Content.Shared/Maps/TurfSystem.cs +++ b/Content.Shared/Maps/TurfSystem.cs @@ -14,7 +14,6 @@ namespace Content.Shared.Maps; /// public sealed partial class TurfSystem : EntitySystem { - [Dependency] private IMapManager _mapManager = default!; [Dependency] private EntityLookupSystem _entityLookup = default!; [Dependency] private SharedTransformSystem _transform = default!; [Dependency] private SharedMapSystem _mapSystem = default!; @@ -33,7 +32,7 @@ public sealed partial class TurfSystem : EntitySystem return null; var pos = _transform.ToMapCoordinates(coordinates); - if (!_mapManager.TryFindGridAt(pos, out var gridUid, out var gridComp)) + if (!_mapSystem.TryFindGridAt(pos, out var gridUid, out var gridComp)) return null; if (!_mapSystem.TryGetTileRef(gridUid, gridComp, coordinates, out var tile)) diff --git a/Content.Shared/Physics/Controllers/SharedConveyorController.cs b/Content.Shared/Physics/Controllers/SharedConveyorController.cs index bf49bcdba1..e3de6fb703 100644 --- a/Content.Shared/Physics/Controllers/SharedConveyorController.cs +++ b/Content.Shared/Physics/Controllers/SharedConveyorController.cs @@ -1,12 +1,9 @@ using System.Numerics; using Content.Shared.Conveyor; using Content.Shared.Gravity; -using Content.Shared.Movement.Components; using Content.Shared.Movement.Events; using Content.Shared.Movement.Systems; using Content.Shared.Stacks; -using Robust.Shared.Collections; -using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Controllers; @@ -18,7 +15,6 @@ namespace Content.Shared.Physics.Controllers; public abstract partial class SharedConveyorController : VirtualController { - [Dependency] protected IMapManager MapManager = default!; [Dependency] private IParallelManager _parallel = default!; [Dependency] private CollisionWakeSystem _wake = default!; [Dependency] protected EntityLookupSystem Lookup = default!; diff --git a/Content.Shared/Random/Rules/GridInRange.cs b/Content.Shared/Random/Rules/GridInRange.cs index bdc0cedf73..d2aef57cf3 100644 --- a/Content.Shared/Random/Rules/GridInRange.cs +++ b/Content.Shared/Random/Rules/GridInRange.cs @@ -27,13 +27,13 @@ public sealed partial class GridInRangeRule : RulesRule } var transform = entManager.System(); - var mapManager = IoCManager.Resolve(); + var maps = entManager.System(); var worldPos = transform.GetWorldPosition(xform); var gridRange = new Vector2(Range, Range); _grids.Clear(); - mapManager.FindGridsIntersecting(xform.MapID, new Box2(worldPos - gridRange, worldPos + gridRange), ref _grids); + maps.FindGridsIntersecting(xform.MapID, new Box2(worldPos - gridRange, worldPos + gridRange), ref _grids); if (_grids.Count > 0) return !Inverted; diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs index f05640913f..56c7107ad0 100644 --- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs +++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs @@ -14,7 +14,6 @@ namespace Content.Shared.Shuttles.Systems; public abstract partial class SharedShuttleSystem : EntitySystem { - [Dependency] private IMapManager _mapManager = default!; [Dependency] private ItemSlotsSystem _itemSlots = default!; [Dependency] protected FixtureSystem Fixtures = default!; [Dependency] protected SharedMapSystem Maps = default!; @@ -224,7 +223,7 @@ public abstract partial class SharedShuttleSystem : EntitySystem var ourFTLBuffer = GetFTLBufferRange(shuttleUid); var circle = new PhysShapeCircle(ourFTLBuffer + FTLBufferRange, targetPosition); - _mapManager.FindGridsIntersecting(mapCoordinates.MapId, circle, Robust.Shared.Physics.Transform.Empty, + Maps.FindGridsIntersecting(mapCoordinates.MapId, circle, Robust.Shared.Physics.Transform.Empty, ref _grids, includeMap: false); // If any grids in range that aren't us then can't FTL. diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs index 3af3d2131d..f5460ba9c9 100644 --- a/Content.Shared/Tiles/FloorTileSystem.cs +++ b/Content.Shared/Tiles/FloorTileSystem.cs @@ -25,7 +25,6 @@ namespace Content.Shared.Tiles; public sealed partial class FloorTileSystem : EntitySystem { [Dependency] private IGameTiming _timing = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] private INetManager _netManager = default!; [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private ISharedAdminLogManager _adminLogger = default!; @@ -80,7 +79,7 @@ public sealed partial class FloorTileSystem : EntitySystem // so we're just gon with this for now. const bool inRange = true; var state = (inRange, location.EntityId); - _mapManager.FindGridsIntersecting(map.MapId, new Box2(map.Position - CheckRange, map.Position + CheckRange), ref state, + _map.FindGridsIntersecting(map.MapId, new Box2(map.Position - CheckRange, map.Position + CheckRange), ref state, static (EntityUid entityUid, MapGridComponent grid, ref (bool weh, EntityUid EntityId) tuple) => { if (tuple.EntityId == entityUid) @@ -163,7 +162,7 @@ public sealed partial class FloorTileSystem : EntitySystem if (_netManager.IsClient) return; - var grid = _mapManager.CreateGridEntity(locationMap.MapId); + var grid = _map.CreateGridEntity(locationMap.MapId); var gridXform = Transform(grid); _transform.SetWorldPosition((grid, gridXform), locationMap.Position); location = new EntityCoordinates(grid, Vector2.Zero); diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Tile.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Tile.cs index 1f6e60fa5a..35f93b750f 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.Tile.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.Tile.cs @@ -68,7 +68,7 @@ public abstract partial class SharedToolSystem var comp = ent.Comp1!; var tool = ent.Comp2!; - if (!_mapManager.TryFindGridAt(_transformSystem.ToMapCoordinates(clickLocation), out var gridUid, out var mapGrid)) + if (!_maps.TryFindGridAt(_transformSystem.ToMapCoordinates(clickLocation), out var gridUid, out var mapGrid)) return false; var tileRef = _maps.GetTileRef(gridUid, mapGrid, clickLocation); diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs index 3d75bb477f..a8471b2da2 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs @@ -19,7 +19,6 @@ namespace Content.Shared.Tools.Systems; public abstract partial class SharedToolSystem : EntitySystem { [Dependency] private IGameTiming _timing = default!; - [Dependency] private IMapManager _mapManager = default!; [Dependency] protected ISharedAdminLogManager AdminLogger = default!; [Dependency] private ITileDefinitionManager _tileDefManager = default!; [Dependency] private SharedAudioSystem _audioSystem = default!; diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 023a6329d7..861260ec54 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -47,7 +47,6 @@ namespace Content.Shared.Weapons.Melee; public abstract partial class SharedMeleeWeaponSystem : EntitySystem { [Dependency] protected IGameTiming Timing = default!; - [Dependency] protected IMapManager MapManager = default!; [Dependency] private INetManager _netMan = default!; [Dependency] private IRobustRandom _random = default!; [Dependency] protected ISharedAdminLogManager AdminLogger = default!; @@ -59,6 +58,7 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem [Dependency] protected MobStateSystem MobState = default!; [Dependency] private SharedAudioSystem _audio = default!; [Dependency] protected SharedCombatModeSystem CombatMode = default!; + [Dependency] protected SharedMapSystem Maps = default!; [Dependency] protected SharedInteractionSystem Interaction = default!; [Dependency] private SharedPhysicsSystem _physics = default!; [Dependency] protected SharedPopupSystem PopupSystem = default!; diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index bc28a1a599..b84441582f 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -51,13 +51,13 @@ public abstract partial class SharedGunSystem : EntitySystem [Dependency] protected DamageableSystem Damageable = default!; [Dependency] protected ExamineSystemShared Examine = default!; [Dependency] protected IGameTiming Timing = default!; - [Dependency] protected IMapManager MapManager = default!; [Dependency] protected IRobustRandom Random = default!; [Dependency] protected ISharedAdminLogManager Logs = default!; [Dependency] protected SharedActionsSystem Actions = default!; [Dependency] protected SharedAppearanceSystem Appearance = default!; [Dependency] protected SharedAudioSystem Audio = default!; [Dependency] protected SharedContainerSystem Containers = default!; + [Dependency] protected SharedMapSystem Maps = default!; [Dependency] protected SharedPhysicsSystem Physics = default!; [Dependency] protected SharedPointLightSystem Lights = default!; [Dependency] protected SharedPopupSystem PopupSystem = default!; diff --git a/Resources/Locale/en-US/salvage/salvage-ruler-command.ftl b/Resources/Locale/en-US/salvage/salvage-ruler-command.ftl index 3a0b054b24..884b9d3777 100644 --- a/Resources/Locale/en-US/salvage/salvage-ruler-command.ftl +++ b/Resources/Locale/en-US/salvage/salvage-ruler-command.ftl @@ -1,2 +1,2 @@ -salvage-ruler-command-description = Measures grids on this map to get a total world AABB. Use for salvage bounds specifications. -salvage-ruler-command-help-text = Usage: {$command} +cmd-salvageruler-desc = Measures grids on this map to get a total world AABB. Use for salvage bounds specifications. +cmd-salvageruler-help = Usage: {$command}