Skip to content

Commit 13723b8

Browse files
TemporalOroborosTemporalOroboros
committed
The rest
1 parent 9e18490 commit 13723b8

28 files changed

Lines changed: 100 additions & 95 deletions

File tree

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ private static (ISimulation, EntityUid gridA, EntityUid gridB) SimulationFactor
1919
.NewSimulation()
2020
.InitializeInstance();
2121

22-
var mapId = sim.Resolve<IEntityManager>().System<SharedMapSystem>().CreateMap();
23-
var mapManager = sim.Resolve<IMapManager>();
22+
var entMan = sim.Resolve<IEntityManager>();
23+
var mapSys = entMan.System<SharedMapSystem>();
24+
var mapId = mapSys.CreateMap();
2425

2526
// Adds two grids to use in tests.
26-
var gridA = mapManager.CreateGridEntity(mapId);
27-
var gridB = mapManager.CreateGridEntity(mapId);
27+
var gridA = mapSys.CreateGridEntity(mapId);
28+
var gridB = mapSys.CreateGridEntity(mapId);
2829

2930
return (sim, gridA, gridB);
3031
}

‎Robust.Client/Debugging/DebugPhysicsSystem.cs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public sealed partial class DebugPhysicsSystem : SharedDebugPhysicsSystem
8484
[Dependency] private IOverlayManager _overlay = default!;
8585
[Dependency] private IEyeManager _eye = default!;
8686
[Dependency] private IInputManager _input = default!;
87-
[Dependency] private IMapManager _map = default!;
87+
[Dependency] private SharedMapSystem _map = default!;
8888
[Dependency] private IPlayerManager _player = default!;
8989
[Dependency] private IResourceCache _resourceCache = default!;
9090

@@ -103,13 +103,13 @@ public PhysicsDebugFlags Flags
103103
EntityManager,
104104
_eye,
105105
_input,
106-
_map,
107106
_player,
108107
_resourceCache,
109108
this,
110109
_entityLookup,
111110
_physics,
112-
_transform));
111+
_transform,
112+
_map));
113113

114114
if (value == PhysicsDebugFlags.None)
115115
_overlay.RemoveOverlay(typeof(PhysicsDebugOverlay));
@@ -203,12 +203,12 @@ internal sealed class PhysicsDebugOverlay : Overlay
203203
private readonly IEntityManager _entityManager;
204204
private readonly IEyeManager _eyeManager;
205205
private readonly IInputManager _inputManager;
206-
private readonly IMapManager _mapManager;
207206
private readonly IPlayerManager _playerManager;
208207
private readonly DebugPhysicsSystem _debugPhysicsSystem;
209208
private readonly EntityLookupSystem _lookup;
210209
private readonly SharedPhysicsSystem _physicsSystem;
211210
private readonly SharedTransformSystem _transformSystem;
211+
private readonly SharedMapSystem _mapSystem;
212212

213213
public override OverlaySpace Space => OverlaySpace.WorldSpace | OverlaySpace.ScreenSpace;
214214

@@ -219,20 +219,26 @@ internal sealed class PhysicsDebugOverlay : Overlay
219219
private HashSet<Joint> _drawnJoints = new();
220220
private List<Entity<MapGridComponent>> _grids = new();
221221

222-
public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem, SharedTransformSystem transformSystem)
222+
public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem, SharedTransformSystem transformSystem, SharedMapSystem mapSystem)
223223
{
224224
_entityManager = entityManager;
225225
_eyeManager = eyeManager;
226226
_inputManager = inputManager;
227-
_mapManager = mapManager;
228227
_playerManager = playerManager;
229228
_debugPhysicsSystem = system;
230229
_lookup = lookup;
231230
_physicsSystem = physicsSystem;
232231
_transformSystem = transformSystem;
232+
_mapSystem = mapSystem;
233233
_font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
234234
}
235235

236+
[Obsolete("use the constructor that does not take IMapManager")]
237+
public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem, SharedTransformSystem transformSystem, SharedMapSystem? mapSystem = null)
238+
: this(entityManager, eyeManager, inputManager, playerManager, cache, system, lookup, physicsSystem, transformSystem, mapSystem ?? entityManager.System<SharedMapSystem>())
239+
{
240+
}
241+
236242
private void DrawWorld(DrawingHandleWorld worldHandle, OverlayDrawArgs args)
237243
{
238244
var viewBounds = args.WorldBounds;
@@ -293,7 +299,7 @@ private void DrawWorld(DrawingHandleWorld worldHandle, OverlayDrawArgs args)
293299
}
294300

295301
_grids.Clear();
296-
_mapManager.FindGridsIntersecting(mapId, viewBounds, ref _grids);
302+
_mapSystem.FindGridsIntersecting(mapId, viewBounds, ref _grids);
297303

298304
foreach (var grid in _grids)
299305
{

‎Robust.Client/GameObjects/EntitySystems/DebugLightTreeSystem.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ public bool Enabled
2727
{
2828
_lightOverlay = new DebugLightOverlay(
2929
EntityManager.System<EntityLookupSystem>(),
30-
IoCManager.Resolve<IEyeManager>(),
31-
IoCManager.Resolve<IMapManager>(),
3230
EntityManager.System<LightTreeSystem>());
3331

3432
overlayManager.AddOverlay(_lightOverlay);
@@ -51,7 +49,7 @@ private sealed class DebugLightOverlay : Overlay
5149

5250
public override OverlaySpace Space => OverlaySpace.WorldSpace;
5351

54-
public DebugLightOverlay(EntityLookupSystem lookup, IEyeManager eyeManager, IMapManager mapManager, LightTreeSystem trees)
52+
public DebugLightOverlay(EntityLookupSystem lookup, LightTreeSystem trees)
5553
{
5654
_lookup = lookup;
5755
_trees = trees;

‎Robust.Client/GameObjects/EntitySystems/GridChunkBoundsDebugSystem.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Robust.Shared.Enums;
55
using Robust.Shared.GameObjects;
66
using Robust.Shared.IoC;
7-
using Robust.Shared.Map;
87
using Robust.Shared.Map.Components;
98
using Robust.Shared.Maths;
109
using Robust.Shared.Physics;
@@ -15,8 +14,6 @@ namespace Robust.Client.GameObjects
1514
{
1615
public sealed partial class GridChunkBoundsDebugSystem : EntitySystem
1716
{
18-
[Dependency] private IEyeManager _eyeManager = default!;
19-
[Dependency] private IMapManager _mapManager = default!;
2017
[Dependency] private IOverlayManager _overlayManager = default!;
2118
[Dependency] private TransformSystem _transform = default!;
2219
[Dependency] private SharedMapSystem _map = default!;
@@ -37,8 +34,6 @@ public bool Enabled
3734
DebugTools.Assert(_overlay == null);
3835
_overlay = new GridChunkBoundsOverlay(
3936
EntityManager,
40-
_eyeManager,
41-
_mapManager,
4237
_transform,
4338
_map);
4439

@@ -65,7 +60,7 @@ internal sealed class GridChunkBoundsOverlay : Overlay
6560

6661
private List<Entity<MapGridComponent>> _grids = new();
6762

68-
public GridChunkBoundsOverlay(IEntityManager entManager, IEyeManager eyeManager, IMapManager mapManager, SharedTransformSystem transformSystem, SharedMapSystem mapSystem)
63+
public GridChunkBoundsOverlay(IEntityManager entManager, SharedTransformSystem transformSystem, SharedMapSystem mapSystem)
6964
{
7065
_entityManager = entManager;
7166
_transformSystem = transformSystem;

‎Robust.Client/Physics/GridFixtureSystem.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ namespace Robust.Client.Physics
1313
internal sealed partial class GridFixtureSystem : SharedGridFixtureSystem
1414
{
1515
[Dependency] private IOverlayManager _overlay = default!;
16-
[Dependency] private IMapManager _mapManager = default!;
1716
[Dependency] private SharedTransformSystem _transform = default!;
1817
[Dependency] private SharedMapSystem _map = default!;
1918

@@ -29,7 +28,7 @@ public bool EnableDebug
2928

3029
if (_enableDebug)
3130
{
32-
var overlay = new GridSplitNodeOverlay(_mapManager, this, _transform, _map);
31+
var overlay = new GridSplitNodeOverlay(this, _transform, _map);
3332
_overlay.AddOverlay(overlay);
3433
RaiseNetworkEvent(new RequestGridNodesMessage());
3534
}
@@ -76,7 +75,7 @@ private sealed class GridSplitNodeOverlay : Overlay
7675
private readonly SharedTransformSystem _transform;
7776
private readonly SharedMapSystem _map;
7877

79-
public GridSplitNodeOverlay(IMapManager mapManager, GridFixtureSystem system, SharedTransformSystem transform, SharedMapSystem map)
78+
public GridSplitNodeOverlay(GridFixtureSystem system, SharedTransformSystem transform, SharedMapSystem map)
8079
{
8180
_system = system;
8281
_transform = transform;

‎Robust.Client/Placement/IPlacementManager.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public interface IPlacementManager
2424

2525
IEntityManager EntityManager { get; }
2626
IEyeManager EyeManager { get; }
27+
[Obsolete("Use MapSystem")]
2728
IMapManager MapManager { get; }
2829

2930
/// <summary>

‎Robust.Client/Placement/Modes/AlignTileAny.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public override void AlignPlacementMode(ScreenCoordinates mouseScreen)
1717
// Go over diagonal size so when placing in a line it doesn't stop snapping.
1818
const float searchBoxSize = 2f; // size of search box in meters
1919

20-
MouseCoords = ScreenToCursorGrid(mouseScreen).AlignWithClosestGridTile(searchBoxSize, pManager.EntityManager, pManager.MapManager);
20+
MouseCoords = ScreenToCursorGrid(mouseScreen).AlignWithClosestGridTile(searchBoxSize, pManager.EntityManager);
2121

2222
var gridId = pManager.EntityManager.System<SharedTransformSystem>().GetGrid(MouseCoords);
2323

‎Robust.Client/Placement/PlacementManager.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public sealed partial class PlacementManager : IPlacementManager, IDisposable, I
4848

4949
public IEntityManager EntityManager => _entityManager;
5050
public IEyeManager EyeManager => _eyeManager;
51+
[Obsolete("use SharedMapSystem")]
5152
public IMapManager MapManager => _mapManager;
5253

5354
private ISawmill _sawmill = default!;

‎Robust.Client/Placement/PlacementMode.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public TileRef GetTileRef(EntityCoordinates coordinates)
201201
return gridUidOpt is { } gridUid && gridUid.IsValid()
202202
? pManager.EntityManager.System<SharedMapSystem>().GetTileRef(gridUid, pManager.EntityManager.GetComponent<MapGridComponent>(gridUid), MouseCoords)
203203
: new TileRef(gridUidOpt ?? EntityUid.Invalid,
204-
MouseCoords.ToVector2i(pManager.EntityManager, pManager.MapManager, pManager.EntityManager.System<SharedTransformSystem>()), Tile.Empty);
204+
MouseCoords.ToVector2i(pManager.EntityManager, pManager.EntityManager.System<SharedTransformSystem>()), Tile.Empty);
205205
}
206206

207207
public TextureResource GetSprite(string key)
@@ -267,7 +267,8 @@ protected EntityCoordinates ScreenToCursorGrid(ScreenCoordinates coords)
267267
{
268268
var mapCoords = pManager.EyeManager.PixelToMap(coords.Position);
269269
var transformSys = pManager.EntityManager.System<SharedTransformSystem>();
270-
if (!pManager.MapManager.TryFindGridAt(mapCoords, out var gridUid, out _))
270+
var mapSys = pManager.EntityManager.System<SharedMapSystem>();
271+
if (!mapSys.TryFindGridAt(mapCoords, out var gridUid, out _))
271272
{
272273
return transformSys.ToCoordinates(mapCoords);
273274
}

‎Robust.Client/UserInterface/CustomControls/DebugMonitorControls/DebugCoordsPanel.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ internal sealed partial class DebugCoordsPanel : PanelContainer
1919
[Dependency] private IInputManager _inputManager = default!;
2020
[Dependency] private IEntityManager _entityManager = default!;
2121
[Dependency] private IClyde _displayManager = default!;
22-
[Dependency] private IMapManager _mapManager = default!;
2322
[Dependency] private IBaseClient _baseClient = default!;
2423

2524
private readonly StringBuilder _textBuilder = new();
@@ -76,7 +75,7 @@ protected override void FrameUpdate(FrameEventArgs args)
7675
var mapSystem = _entityManager.System<SharedMapSystem>();
7776
var xformSystem = _entityManager.System<SharedTransformSystem>();
7877

79-
if (_mapManager.TryFindGridAt(mouseWorldMap, out var mouseGridUid, out var mouseGrid))
78+
if (mapSystem.TryFindGridAt(mouseWorldMap, out var mouseGridUid, out var mouseGrid))
8079
{
8180
mouseGridPos = mapSystem.MapToGrid(mouseGridUid, mouseWorldMap);
8281
tile = mapSystem.GetTileRef(mouseGridUid, mouseGrid, mouseGridPos);
@@ -86,7 +85,7 @@ protected override void FrameUpdate(FrameEventArgs args)
8685
mouseGridPos = new EntityCoordinates(mapSystem.GetMapOrInvalid(mouseWorldMap.MapId),
8786
mouseWorldMap.Position);
8887
tile = new TileRef(EntityUid.Invalid,
89-
mouseGridPos.ToVector2i(_entityManager, _mapManager, xformSystem), Tile.Empty);
88+
mouseGridPos.ToVector2i(_entityManager, xformSystem), Tile.Empty);
9089
}
9190
}
9291
}

0 commit comments

Comments
 (0)