From 546fa445260734de9dc72078f541676fa27e0b10 Mon Sep 17 00:00:00 2001 From: Kara Date: Sat, 14 Oct 2023 09:42:37 -0700 Subject: [PATCH] Kill `SharedUnoccludedExtensions` (#20914) --- .../Administration/Systems/AdminVerbSystem.cs | 5 +- .../Pointing/EntitySystems/PointingSystem.cs | 4 +- Content.Shared/Examine/ExamineSystemShared.cs | 8 +- .../Helpers/SharedUnoccludedExtensions.cs | 347 ------------------ 4 files changed, 9 insertions(+), 355 deletions(-) delete mode 100644 Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index 4ed8e19f55..709602a1b3 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -15,8 +15,8 @@ using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components; using Content.Shared.Administration; using Content.Shared.Configurable; using Content.Shared.Database; +using Content.Shared.Examine; using Content.Shared.GameTicking; -using Content.Shared.Interaction.Helpers; using Content.Shared.Inventory; using Content.Shared.Mind; using Content.Shared.Mind.Components; @@ -353,7 +353,8 @@ namespace Content.Server.Administration.Systems Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/information.svg.192dpi.png")), Act = () => { - var message = args.User.InRangeUnOccluded(args.Target) + + var message = ExamineSystemShared.InRangeUnOccluded(args.User, args.Target) ? Loc.GetString("in-range-unoccluded-verb-on-activate-not-occluded") : Loc.GetString("in-range-unoccluded-verb-on-activate-occluded"); args.Target.PopupMessage(args.User, message); diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs index 8756134310..8f00125ea3 100644 --- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs @@ -3,12 +3,12 @@ using Content.Server.Administration.Logs; using Content.Server.Pointing.Components; using Content.Shared.Bed.Sleep; using Content.Shared.Database; +using Content.Shared.Examine; using Content.Shared.Eye; using Content.Shared.Ghost; using Content.Shared.IdentityManagement; using Content.Shared.Input; using Content.Shared.Interaction; -using Content.Shared.Interaction.Helpers; using Content.Shared.Mind; using Content.Shared.Mobs.Systems; using Content.Shared.Pointing; @@ -94,7 +94,7 @@ namespace Content.Server.Pointing.EntitySystems } else { - return pointer.InRangeUnOccluded(coordinates, 15, e => e == pointer); + return ExamineSystemShared.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer); } } diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 81fc016904..2e0cffd7d2 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -204,7 +204,7 @@ namespace Content.Shared.Examine return true; } - public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range, Ignored? predicate, bool ignoreInsideBlocker = true) + public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { var entMan = IoCManager.Resolve(); var originPos = entMan.GetComponent(origin).MapPosition; @@ -213,7 +213,7 @@ namespace Content.Shared.Examine return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); } - public static bool InRangeUnOccluded(EntityUid origin, IComponent other, float range, Ignored? predicate, bool ignoreInsideBlocker = true) + public static bool InRangeUnOccluded(EntityUid origin, IComponent other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { var entMan = IoCManager.Resolve(); var originPos = entMan.GetComponent(origin).MapPosition; @@ -222,7 +222,7 @@ namespace Content.Shared.Examine return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); } - public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true) + public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { var entMan = IoCManager.Resolve(); var originPos = entMan.GetComponent(origin).MapPosition; @@ -231,7 +231,7 @@ namespace Content.Shared.Examine return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); } - public static bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true) + public static bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { var entMan = IoCManager.Resolve(); var originPos = entMan.GetComponent(origin).MapPosition; diff --git a/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs b/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs deleted file mode 100644 index 9ea48a89c8..0000000000 --- a/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs +++ /dev/null @@ -1,347 +0,0 @@ -using Content.Shared.DragDrop; -using Content.Shared.Examine; -using Robust.Shared.Containers; -using Robust.Shared.Map; -using static Content.Shared.Examine.ExamineSystemShared; -using static Content.Shared.Interaction.SharedInteractionSystem; - -namespace Content.Shared.Interaction.Helpers -{ - public static class SharedUnoccludedExtensions - { - #region Entities - public static bool InRangeUnOccluded( - this EntityUid origin, - EntityUid other, - float range = ExamineRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - return ExamineSystemShared.InRangeUnOccluded(origin, other, range, predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this EntityUid origin, - IComponent other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - return ExamineSystemShared.InRangeUnOccluded(origin, other, range, predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this EntityUid origin, - BaseContainer other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var otherEntity = other.Owner; - - return ExamineSystemShared.InRangeUnOccluded(origin, otherEntity, range, predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this EntityUid origin, - EntityCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - return ExamineSystemShared.InRangeUnOccluded(origin, other, range, predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this EntityUid origin, - MapCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - return ExamineSystemShared.InRangeUnOccluded(origin, other, range, predicate, ignoreInsideBlocker); - } - #endregion - - #region Components - public static bool InRangeUnOccluded( - this IComponent origin, - EntityUid other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, other, range, predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this IComponent origin, - IComponent other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, other, range, predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this IComponent origin, - BaseContainer other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - var otherEntity = other.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, otherEntity, range, predicate, - ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this IComponent origin, - EntityCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, other, range, predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this IComponent origin, - MapCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, other, range, predicate, - ignoreInsideBlocker); - } - #endregion - - #region Containers - public static bool InRangeUnOccluded( - this BaseContainer origin, - EntityUid other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, other, range, predicate, - ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this BaseContainer origin, - IComponent other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, other, range, predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this BaseContainer origin, - BaseContainer other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - var otherEntity = other.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, otherEntity, range, predicate, - ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this BaseContainer origin, - EntityCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, other, range, predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this BaseContainer origin, - MapCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var originEntity = origin.Owner; - - return ExamineSystemShared.InRangeUnOccluded(originEntity, other, range, predicate, ignoreInsideBlocker); - } - #endregion - - #region EntityCoordinates - public static bool InRangeUnOccluded( - this EntityCoordinates origin, - EntityUid other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var entMan = IoCManager.Resolve(); - var originPosition = origin.ToMap(entMan); - var otherPosition = entMan.GetComponent(other).MapPosition; - - return ExamineSystemShared.InRangeUnOccluded(originPosition, otherPosition, range, - predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this EntityCoordinates origin, - IComponent other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var entMan = IoCManager.Resolve(); - var originPosition = origin.ToMap(entMan); - var otherPosition = entMan.GetComponent(other.Owner).MapPosition; - - return ExamineSystemShared.InRangeUnOccluded(originPosition, otherPosition, range, - predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this EntityCoordinates origin, - BaseContainer other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var entMan = IoCManager.Resolve(); - var originPosition = origin.ToMap(entMan); - var otherPosition = entMan.GetComponent(other.Owner).MapPosition; - - return ExamineSystemShared.InRangeUnOccluded(originPosition, otherPosition, range, - predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this EntityCoordinates origin, - EntityCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true, - IEntityManager? entityManager = null) - { - IoCManager.Resolve(ref entityManager); - - var originPosition = origin.ToMap(entityManager); - var otherPosition = other.ToMap(entityManager); - - return ExamineSystemShared.InRangeUnOccluded(originPosition, otherPosition, range, - predicate, ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this EntityCoordinates origin, - MapCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true, - IEntityManager? entityManager = null) - { - IoCManager.Resolve(ref entityManager); - - var originPosition = origin.ToMap(entityManager); - - return ExamineSystemShared.InRangeUnOccluded(originPosition, other, range, predicate, - ignoreInsideBlocker); - } - #endregion - - #region MapCoordinates - public static bool InRangeUnOccluded( - this MapCoordinates origin, - EntityUid other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var entMan = IoCManager.Resolve(); - var otherPosition = entMan.GetComponent(other).MapPosition; - - return ExamineSystemShared.InRangeUnOccluded(origin, otherPosition, range, predicate, - ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this MapCoordinates origin, - IComponent other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var entMan = IoCManager.Resolve(); - var otherPosition = entMan.GetComponent(other.Owner).MapPosition; - - return ExamineSystemShared.InRangeUnOccluded(origin, otherPosition, range, predicate, - ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this MapCoordinates origin, - BaseContainer other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - var entMan = IoCManager.Resolve(); - var otherPosition = entMan.GetComponent(other.Owner).MapPosition; - - return ExamineSystemShared.InRangeUnOccluded(origin, otherPosition, range, predicate, - ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this MapCoordinates origin, - EntityCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true, - IEntityManager? entityManager = null) - { - IoCManager.Resolve(ref entityManager); - - var otherPosition = other.ToMap(entityManager); - - return ExamineSystemShared.InRangeUnOccluded(origin, otherPosition, range, predicate, - ignoreInsideBlocker); - } - - public static bool InRangeUnOccluded( - this MapCoordinates origin, - MapCoordinates other, - float range = InteractionRange, - Ignored? predicate = null, - bool ignoreInsideBlocker = true) - { - return ExamineSystemShared.InRangeUnOccluded(origin, other, range, predicate, - ignoreInsideBlocker); - } - #endregion - } -}