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

Obsolete Logger cleanup for EntitySystems part 2 (#26159)

Browse Source 
* Kill the static InRangeUnOccluded

* Adjusted 4 more EntitySystems that were missed.
This commit is contained in:
LordCarve
2024-03-17 08:31:09 +01:00
committed by GitHub
parent 90be67e679
commit 7d275a4b5e
14 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/CardboardBox/CardboardBoxSystem.cs
View File

@@ -1,4 +1,4 @@
using System.Numerics; using System.Numerics;
using Content.Shared.CardboardBox; using Content.Shared.CardboardBox;
using Content.Shared.CardboardBox.Components; using Content.Shared.CardboardBox.Components;
using Content.Shared.Examine; using Content.Shared.Examine;
@@ -11,6 +11,7 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
{ {
[Dependency] private readonly EntityLookupSystem _entityLookup = default!; [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
[Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly TransformSystem _transform = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -55,7 +56,7 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
foreach (var mob in mobMoverEntities) foreach (var mob in mobMoverEntities)
{ {
var mapPos = _transform.GetMapCoordinates(mob); var mapPos = _transform.GetMapCoordinates(mob);
if (!ExamineSystemShared.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null)) if (!_examine.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
continue; continue;
var ent = Spawn(box.Effect, mapPos); var ent = Spawn(box.Effect, mapPos);

5
Content.Client/Popups/PopupOverlay.cs
View File

@@ -21,6 +21,7 @@ public sealed class PopupOverlay : Overlay
private readonly IUserInterfaceManager _uiManager; private readonly IUserInterfaceManager _uiManager;
private readonly PopupSystem _popup; private readonly PopupSystem _popup;
private readonly PopupUIController _controller; private readonly PopupUIController _controller;
private readonly ExamineSystemShared _examine;
private readonly ShaderInstance _shader; private readonly ShaderInstance _shader;
@@ -33,12 +34,14 @@ public sealed class PopupOverlay : Overlay
IPrototypeManager protoManager, IPrototypeManager protoManager,
IUserInterfaceManager uiManager, IUserInterfaceManager uiManager,
PopupUIController controller, PopupUIController controller,
ExamineSystemShared examine,
PopupSystem popup) PopupSystem popup)
{ {
_configManager = configManager; _configManager = configManager;
_entManager = entManager; _entManager = entManager;
_playerMgr = playerMgr; _playerMgr = playerMgr;
_uiManager = uiManager; _uiManager = uiManager;
_examine = examine;
_popup = popup; _popup = popup;
_controller = controller; _controller = controller;
@@ -81,7 +84,7 @@ public sealed class PopupOverlay : Overlay
var distance = (mapPos.Position - args.WorldBounds.Center).Length(); var distance = (mapPos.Position - args.WorldBounds.Center).Length();
// Should handle fade here too wyci. // Should handle fade here too wyci.
if (!args.WorldBounds.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance, if (!args.WorldBounds.Contains(mapPos.Position) || !_examine.InRangeUnOccluded(viewPos, mapPos, distance,
e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager)) e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager))
continue; continue;

3
Content.Client/Popups/PopupSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using Content.Shared.Examine;
using Content.Shared.GameTicking; using Content.Shared.GameTicking;
using Content.Shared.Popups; using Content.Shared.Popups;
using Robust.Client.Graphics; using Robust.Client.Graphics;
@@ -26,6 +27,7 @@ namespace Content.Client.Popups
[Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IUserInterfaceManager _uiManager = default!; [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
[Dependency] private readonly IReplayRecordingManager _replayRecording = default!; [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!;
public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels; public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels;
public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels; public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels;
@@ -51,6 +53,7 @@ namespace Content.Client.Popups
_prototype, _prototype,
_uiManager, _uiManager,
_uiManager.GetUIController<PopupUIController>(), _uiManager.GetUIController<PopupUIController>(),
_examine,
this)); this));
} }

2
Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
View File

@@ -613,7 +613,7 @@ public sealed class ChatUIController : UIController
var otherPos = EntityManager.GetComponent<TransformComponent>(ent).MapPosition; var otherPos = EntityManager.GetComponent<TransformComponent>(ent).MapPosition;
if (occluded && !ExamineSystemShared.InRangeUnOccluded( if (occluded && !_examine.InRangeUnOccluded(
playerPos, playerPos,
otherPos, 0f, otherPos, 0f,
(ent, player), predicate)) (ent, player), predicate))

8
Content.Client/Verbs/VerbSystem.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Client.Verbs
public sealed class VerbSystem : SharedVerbSystem public sealed class VerbSystem : SharedVerbSystem
{ {
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly ExamineSystem _examineSystem = default!; [Dependency] private readonly ExamineSystem _examine = default!;
[Dependency] private readonly TagSystem _tagSystem = default!; [Dependency] private readonly TagSystem _tagSystem = default!;
[Dependency] private readonly IStateManager _stateManager = default!; [Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private readonly EntityLookupSystem _entityLookup = default!; [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
@@ -77,7 +77,7 @@ namespace Content.Client.Verbs
bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e); bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e);
// first check the general location. // first check the general location.
if (!_examineSystem.CanExamine(player.Value, targetPos, Predicate)) if (!_examine.CanExamine(player.Value, targetPos, Predicate))
return false; return false;
TryComp(player.Value, out ExaminerComponent? examiner); TryComp(player.Value, out ExaminerComponent? examiner);
@@ -86,7 +86,7 @@ namespace Content.Client.Verbs
entities = new(); entities = new();
foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize)) foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize))
{ {
if (_examineSystem.CanExamine(player.Value, targetPos, Predicate, ent, examiner)) if (_examine.CanExamine(player.Value, targetPos, Predicate, ent, examiner))
entities.Add(ent); entities.Add(ent);
} }
} }
@@ -147,7 +147,7 @@ namespace Content.Client.Verbs
{ {
var entity = entities[i]; var entity = entities[i];
if (!ExamineSystemShared.InRangeUnOccluded( if (!_examine.InRangeUnOccluded(
playerPos, playerPos,
xformQuery.GetComponent(entity).MapPosition, xformQuery.GetComponent(entity).MapPosition,
ExamineSystemShared.ExamineRange, ExamineSystemShared.ExamineRange,

3
Content.Server/Administration/Systems/AdminVerbSystem.cs
View File

@@ -66,6 +66,7 @@ namespace Content.Server.Administration.Systems
[Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly StationSystem _stations = default!; [Dependency] private readonly StationSystem _stations = default!;
[Dependency] private readonly StationSpawningSystem _spawning = default!; [Dependency] private readonly StationSpawningSystem _spawning = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!;
private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new(); private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new();
@@ -416,7 +417,7 @@ namespace Content.Server.Administration.Systems
Act = () => Act = () =>
{ {
var message = ExamineSystemShared.InRangeUnOccluded(args.User, args.Target) var message = _examine.InRangeUnOccluded(args.User, args.Target)
? Loc.GetString("in-range-unoccluded-verb-on-activate-not-occluded") ? Loc.GetString("in-range-unoccluded-verb-on-activate-not-occluded")
: Loc.GetString("in-range-unoccluded-verb-on-activate-occluded"); : Loc.GetString("in-range-unoccluded-verb-on-activate-occluded");

4
Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
View File

@@ -635,14 +635,14 @@ namespace Content.Server.Atmos.EntitySystems
// Turns out: no they don't. Temporary debug checks to figure out which caller is causing problems: // Turns out: no they don't. Temporary debug checks to figure out which caller is causing problems:
if (tile == null) if (tile == null)
{ {
Logger.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}"); Log.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}");
return; return;
} }
var adj = tile.AdjacentTiles[direction.ToIndex()]; var adj = tile.AdjacentTiles[direction.ToIndex()];
if (adj == null) if (adj == null)
{ {
var nonNull = tile.AdjacentTiles.Where(x => x != null).Count(); var nonNull = tile.AdjacentTiles.Where(x => x != null).Count();
Logger.Error($"Encountered null adjacent tile in {nameof(AdjustEqMovement)}. Dir: {direction}, Tile: {tile.Tile}, non-null adj count: {nonNull}, Trace: {Environment.StackTrace}"); Log.Error($"Encountered null adjacent tile in {nameof(AdjustEqMovement)}. Dir: {direction}, Tile: {tile.Tile}, non-null adj count: {nonNull}, Trace: {Environment.StackTrace}");
return; return;
} }

2
Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
View File

@@ -39,7 +39,7 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
var uid = args.SenderSession.AttachedEntity; var uid = args.SenderSession.AttachedEntity;
if (!Exists(uid)) if (!Exists(uid))
{ {
Logger.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity."); Log.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
return; return;
} }

4
Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
View File

@@ -201,7 +201,7 @@ public sealed class PiratesRuleSystem : GameRuleSystem<PiratesRuleComponent>
if (!gridId.HasValue) if (!gridId.HasValue)
{ {
Logger.ErrorS("pirates", $"Gridid was null when loading \"{map}\", aborting."); Log.Error($"Gridid was null when loading \"{map}\", aborting.");
foreach (var session in ops) foreach (var session in ops)
{ {
ev.PlayerPool.Add(session); ev.PlayerPool.Add(session);
@@ -230,7 +230,7 @@ public sealed class PiratesRuleSystem : GameRuleSystem<PiratesRuleComponent>
if (spawns.Count == 0) if (spawns.Count == 0)
{ {
spawns.Add(Transform(pirates.PirateShip).Coordinates); spawns.Add(Transform(pirates.PirateShip).Coordinates);
Logger.WarningS("pirates", $"Fell back to default spawn for pirates!"); Log.Warning($"Fell back to default spawn for pirates!");
} }
for (var i = 0; i < ops.Length; i++) for (var i = 0; i < ops.Length; i++)

5
Content.Server/NPC/Systems/NPCUtilitySystem.cs
View File

@@ -43,6 +43,7 @@ public sealed class NPCUtilitySystem : EntitySystem
[Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SolutionContainerSystem _solutions = default!; [Dependency] private readonly SolutionContainerSystem _solutions = default!;
[Dependency] private readonly WeldableSystem _weldable = default!; [Dependency] private readonly WeldableSystem _weldable = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!;
private EntityQuery<PuddleComponent> _puddleQuery; private EntityQuery<PuddleComponent> _puddleQuery;
private EntityQuery<TransformComponent> _xformQuery; private EntityQuery<TransformComponent> _xformQuery;
@@ -296,7 +297,7 @@ public sealed class NPCUtilitySystem : EntitySystem
{ {
var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager); var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f; return _examine.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f;
} }
case TargetInLOSOrCurrentCon: case TargetInLOSOrCurrentCon:
{ {
@@ -313,7 +314,7 @@ public sealed class NPCUtilitySystem : EntitySystem
return 1f; return 1f;
} }
return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f; return _examine.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f;
} }
case TargetIsAliveCon: case TargetIsAliveCon:
{ {

3
Content.Server/Pointing/EntitySystems/PointingSystem.cs
View File

@@ -37,6 +37,7 @@ namespace Content.Server.Pointing.EntitySystems
[Dependency] private readonly VisibilitySystem _visibilitySystem = default!; [Dependency] private readonly VisibilitySystem _visibilitySystem = default!;
[Dependency] private readonly SharedMindSystem _minds = default!; [Dependency] private readonly SharedMindSystem _minds = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!;
private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f); private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f);
@@ -100,7 +101,7 @@ namespace Content.Server.Pointing.EntitySystems
} }
else else
{ {
return ExamineSystemShared.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer); return _examine.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer);
} }
} }

3
Content.Server/Remotes/DoorRemoteSystem.cs
View File

@@ -22,6 +22,7 @@ namespace Content.Server.Remotes
[Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly DoorSystem _doorSystem = default!; [Dependency] private readonly DoorSystem _doorSystem = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!;
// I'm so sorry [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!; // I'm so sorry [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!;
public override void Initialize() public override void Initialize()
@@ -67,7 +68,7 @@ namespace Content.Server.Remotes
|| !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
// Only able to control doors if they are within your vision and within your max range. // Only able to control doors if they are within your vision and within your max range.
// Not affected by mobs or machines anymore. // Not affected by mobs or machines anymore.
|| !ExamineSystemShared.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null)) || !_examine.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
{ {
return; return;
} }

2
Content.Server/Tabletop/TabletopSystem.Session.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.Tabletop
// Since this is the first time opening this session, set up the game // Since this is the first time opening this session, set up the game
tabletop.Setup.SetupTabletop(session, EntityManager); tabletop.Setup.SetupTabletop(session, EntityManager);
Logger.Info($"Created tabletop session number {tabletop} at position {session.Position}."); Log.Info($"Created tabletop session number {tabletop} at position {session.Position}.");
return session; return session;
} }

12
Content.Shared/Examine/ExamineSystemShared.cs
View File

@@ -144,7 +144,7 @@ namespace Content.Shared.Examine
return TryComp<EyeComponent>(uid, out var eye) && eye.DrawFov; return TryComp<EyeComponent>(uid, out var eye) && eye.DrawFov;
} }
public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null) public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
{ {
// No, rider. This is better. // No, rider. This is better.
// ReSharper disable once ConvertToLocalFunction // ReSharper disable once ConvertToLocalFunction
@@ -154,7 +154,7 @@ namespace Content.Shared.Examine
return InRangeUnOccluded(origin, other, range, predicate, wrapped, ignoreInsideBlocker, entMan); return InRangeUnOccluded(origin, other, range, predicate, wrapped, ignoreInsideBlocker, entMan);
} }
public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range, public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range,
TState state, Func<EntityUid, TState, bool> predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null) TState state, Func<EntityUid, TState, bool> predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
{ {
if (other.MapId != origin.MapId || if (other.MapId != origin.MapId ||
@@ -171,7 +171,7 @@ namespace Content.Shared.Examine
if (length > MaxRaycastRange) if (length > MaxRaycastRange)
{ {
Logger.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size."); Log.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size.");
length = MaxRaycastRange; length = MaxRaycastRange;
} }
@@ -207,7 +207,7 @@ namespace Content.Shared.Examine
return true; return true;
} }
public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
{ {
var entMan = IoCManager.Resolve<IEntityManager>(); var entMan = IoCManager.Resolve<IEntityManager>();
var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition; var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -216,7 +216,7 @@ namespace Content.Shared.Examine
return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
} }
public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
{ {
var entMan = IoCManager.Resolve<IEntityManager>(); var entMan = IoCManager.Resolve<IEntityManager>();
var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition; var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -225,7 +225,7 @@ namespace Content.Shared.Examine
return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
} }
public static bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) public bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
{ {
var entMan = IoCManager.Resolve<IEntityManager>(); var entMan = IoCManager.Resolve<IEntityManager>();
var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition; var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;