diff --git a/Content.Client/Animations/AnimationsTestComponent.cs b/Content.Client/Animations/AnimationsTestComponent.cs index 801b193748..234a509eb4 100644 --- a/Content.Client/Animations/AnimationsTestComponent.cs +++ b/Content.Client/Animations/AnimationsTestComponent.cs @@ -24,8 +24,8 @@ namespace Content.Client.Animations { new AnimationTrackComponentProperty { - ComponentType = typeof(ITransformComponent), - Property = nameof(ITransformComponent.LocalRotation), + ComponentType = typeof(TransformComponent), + Property = nameof(TransformComponent.LocalRotation), InterpolationMode = AnimationInterpolationMode.Linear, KeyFrames = { diff --git a/Content.Client/Animations/ReusableAnimations.cs b/Content.Client/Animations/ReusableAnimations.cs index f6314348e9..fc718d1cfd 100644 --- a/Content.Client/Animations/ReusableAnimations.cs +++ b/Content.Client/Animations/ReusableAnimations.cs @@ -36,8 +36,8 @@ namespace Content.Client.Animations { new AnimationTrackComponentProperty { - ComponentType = typeof(ITransformComponent), - Property = nameof(ITransformComponent.LocalPosition), + ComponentType = typeof(TransformComponent), + Property = nameof(TransformComponent.LocalPosition), InterpolationMode = AnimationInterpolationMode.Linear, KeyFrames = { diff --git a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs index 228446516b..9da44150d8 100644 --- a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs +++ b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs @@ -61,7 +61,7 @@ namespace Content.Client.Atmos.Visualizers { base.OnChangeData(component); - if (!component.Owner.TryGetComponent(out var xform)) + if (!component.Owner.TryGetComponent(out var xform)) return; if (!component.Owner.TryGetComponent(out var sprite)) diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs index 977e63b2f7..5352fd9278 100644 --- a/Content.Client/Popups/PopupSystem.cs +++ b/Content.Client/Popups/PopupSystem.cs @@ -48,7 +48,7 @@ namespace Content.Client.Popups if (!EntityManager.EntityExists(uid)) return; - var transform = EntityManager.GetComponent(uid); + var transform = EntityManager.GetComponent(uid); PopupMessage(message, _eyeManager.CoordinatesToScreen(transform.Coordinates)); } diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs index 1e30f6a77f..34e970d5cc 100644 --- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs +++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs @@ -28,8 +28,8 @@ namespace Content.IntegrationTests.Tests.Disposal SubscribeLocalEvent(ev => { var (_, toInsert, unit) = ev; - var insertTransform = EntityManager.GetComponent(toInsert); - var unitTransform = EntityManager.GetComponent(unit); + var insertTransform = EntityManager.GetComponent(toInsert); + var unitTransform = EntityManager.GetComponent(unit); // Not in a tube yet Assert.That(insertTransform.Parent, Is.EqualTo(unitTransform)); }, after: new[] {typeof(SharedDisposalUnitSystem)}); diff --git a/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs b/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs index e6c7cbb38a..81473aeb70 100644 --- a/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs +++ b/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs @@ -31,7 +31,7 @@ namespace Content.Server.Administration.Commands var entityManager = IoCManager.Resolve(); - if (!entityManager.TryGetComponent(entityUid, out var transform)) return; + if (!entityManager.TryGetComponent(entityUid, out var transform)) return; var parent = transform.ParentUid; diff --git a/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs b/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs index 982d8e6087..3a3d7114aa 100644 --- a/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs +++ b/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs @@ -32,7 +32,7 @@ namespace Content.Server.Administration.Commands var entityManager = IoCManager.Resolve(); - if (!entityManager.TryGetComponent(entityUid, out var transform)) return; + if (!entityManager.TryGetComponent(entityUid, out var transform)) return; var parent = transform.ParentUid; diff --git a/Content.Server/Administration/Commands/RemoveMechanismCommand.cs b/Content.Server/Administration/Commands/RemoveMechanismCommand.cs index 49c4f2bd8c..5284ecc759 100644 --- a/Content.Server/Administration/Commands/RemoveMechanismCommand.cs +++ b/Content.Server/Administration/Commands/RemoveMechanismCommand.cs @@ -32,7 +32,7 @@ namespace Content.Server.Administration.Commands var entityManager = IoCManager.Resolve(); - if (!entityManager.TryGetComponent(entityUid, out var transform)) return; + if (!entityManager.TryGetComponent(entityUid, out var transform)) return; var parent = transform.ParentUid; diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs index 6380f5860f..251ddfb2ca 100644 --- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs +++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs @@ -70,7 +70,7 @@ namespace Content.Server.Atmos.EntitySystems _timer -= UpdateTimer; - foreach (var (barotrauma, damageable, transform) in EntityManager.EntityQuery(false)) + foreach (var (barotrauma, damageable, transform) in EntityManager.EntityQuery(false)) { var totalDamage = FixedPoint2.Zero; foreach (var (barotraumaDamageType, _) in barotrauma.Damage.DamageDict) diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index a52b48af93..1ab30f95ce 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -187,7 +187,7 @@ namespace Content.Server.Atmos.EntitySystems _timer -= UpdateTime; // TODO: This needs cleanup to take off the crust from TemperatureComponent and shit. - foreach (var (flammable, physics, transform) in EntityManager.EntityQuery()) + foreach (var (flammable, physics, transform) in EntityManager.EntityQuery()) { var uid = flammable.Owner.Uid; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs index 04a9939421..4a2eeaedd5 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs @@ -51,7 +51,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems /// /// Completely dumps the content of the canister into the world. /// - public void PurgeContents(EntityUid uid, GasCanisterComponent? canister = null, ITransformComponent? transform = null) + public void PurgeContents(EntityUid uid, GasCanisterComponent? canister = null, TransformComponent? transform = null) { if (!Resolve(uid, ref canister, ref transform)) return; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs index 8ab8356f7f..bf0a6164a9 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs @@ -29,7 +29,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems private void OnPortableAnchorAttempt(EntityUid uid, GasPortableComponent component, AnchorAttemptEvent args) { - if (!EntityManager.TryGetComponent(uid, out ITransformComponent? transform)) + if (!EntityManager.TryGetComponent(uid, out TransformComponent? transform)) return; // If we can't find any ports, cancel the anchoring. diff --git a/Content.Server/Construction/Completions/BuildComputer.cs b/Content.Server/Construction/Completions/BuildComputer.cs index 948c40ce4f..fdf7d6c134 100644 --- a/Content.Server/Construction/Completions/BuildComputer.cs +++ b/Content.Server/Construction/Completions/BuildComputer.cs @@ -48,7 +48,7 @@ namespace Content.Server.Construction.Completions container.Remove(board); - var transform = entityManager.GetComponent(uid); + var transform = entityManager.GetComponent(uid); var computer = entityManager.SpawnEntity(boardComponent.Prototype, transform.Coordinates); computer.Transform.LocalRotation = transform.LocalRotation; diff --git a/Content.Server/Construction/Completions/BuildMachine.cs b/Content.Server/Construction/Completions/BuildMachine.cs index 8749bd5950..499c942243 100644 --- a/Content.Server/Construction/Completions/BuildMachine.cs +++ b/Content.Server/Construction/Completions/BuildMachine.cs @@ -61,7 +61,7 @@ namespace Content.Server.Construction.Completions entBoardContainer.Remove(board); - var transform = entityManager.GetComponent(uid); + var transform = entityManager.GetComponent(uid); var machine = entityManager.SpawnEntity(boardComponent.Prototype, transform.Coordinates); machine.Transform.LocalRotation = transform.LocalRotation; diff --git a/Content.Server/Construction/Completions/EmptyAllContainers.cs b/Content.Server/Construction/Completions/EmptyAllContainers.cs index 376082ec07..502fd42cac 100644 --- a/Content.Server/Construction/Completions/EmptyAllContainers.cs +++ b/Content.Server/Construction/Completions/EmptyAllContainers.cs @@ -16,7 +16,7 @@ namespace Content.Server.Construction.Completions if (!entityManager.TryGetComponent(uid, out ContainerManagerComponent? containerManager)) return; - var transform = entityManager.GetComponent(uid); + var transform = entityManager.GetComponent(uid); foreach (var container in containerManager.GetAllContainers()) { container.EmptyContainer(true, transform.Coordinates); diff --git a/Content.Server/Construction/Completions/EmptyContainer.cs b/Content.Server/Construction/Completions/EmptyContainer.cs index 83c19e223b..7cb0c7791f 100644 --- a/Content.Server/Construction/Completions/EmptyContainer.cs +++ b/Content.Server/Construction/Completions/EmptyContainer.cs @@ -21,7 +21,7 @@ namespace Content.Server.Construction.Completions !containerManager.TryGetContainer(Container, out var container)) return; // TODO: Use container system methods. - var transform = entityManager.GetComponent(uid); + var transform = entityManager.GetComponent(uid); foreach (var contained in container.ContainedEntities.ToArray()) { container.ForceRemove(contained); diff --git a/Content.Server/Construction/Completions/SetAnchor.cs b/Content.Server/Construction/Completions/SetAnchor.cs index c05f444241..64b1a5b8ff 100644 --- a/Content.Server/Construction/Completions/SetAnchor.cs +++ b/Content.Server/Construction/Completions/SetAnchor.cs @@ -16,7 +16,7 @@ namespace Content.Server.Construction.Completions public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager) { - var transform = entityManager.GetComponent(uid); + var transform = entityManager.GetComponent(uid); transform.Anchored = Value; } } diff --git a/Content.Server/Construction/Completions/SnapToGrid.cs b/Content.Server/Construction/Completions/SnapToGrid.cs index 5d58a9c149..7f0224144c 100644 --- a/Content.Server/Construction/Completions/SnapToGrid.cs +++ b/Content.Server/Construction/Completions/SnapToGrid.cs @@ -16,7 +16,7 @@ namespace Content.Server.Construction.Completions public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager) { - var transform = entityManager.GetComponent(uid); + var transform = entityManager.GetComponent(uid); transform.Coordinates = transform.Coordinates.SnapToGrid(entityManager); if (SouthRotation) diff --git a/Content.Server/Construction/Completions/SpawnPrototype.cs b/Content.Server/Construction/Completions/SpawnPrototype.cs index 3ce16ba322..391ac5d3f3 100644 --- a/Content.Server/Construction/Completions/SpawnPrototype.cs +++ b/Content.Server/Construction/Completions/SpawnPrototype.cs @@ -21,7 +21,7 @@ namespace Content.Server.Construction.Completions if (string.IsNullOrEmpty(Prototype)) return; - var coordinates = entityManager.GetComponent(uid).Coordinates; + var coordinates = entityManager.GetComponent(uid).Coordinates; if (EntityPrototypeHelpers.HasComponent(Prototype)) { diff --git a/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs b/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs index 253bd44faf..7db6fc7969 100644 --- a/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs +++ b/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs @@ -24,7 +24,7 @@ namespace Content.Server.Construction.Completions var containerSystem = entityManager.EntitySysManager.GetEntitySystem(); var container = containerSystem.EnsureContainer(uid, Container); - var coordinates = entityManager.GetComponent(uid).Coordinates; + var coordinates = entityManager.GetComponent(uid).Coordinates; for (var i = 0; i < Amount; i++) { container.Insert(entityManager.SpawnEntity(Prototype, coordinates)); diff --git a/Content.Server/Construction/Conditions/ComponentInTile.cs b/Content.Server/Construction/Conditions/ComponentInTile.cs index e75a30b887..05fb8674ce 100644 --- a/Content.Server/Construction/Conditions/ComponentInTile.cs +++ b/Content.Server/Construction/Conditions/ComponentInTile.cs @@ -50,7 +50,7 @@ namespace Content.Server.Construction.Conditions var type = IoCManager.Resolve().GetRegistration(Component).Type; - var transform = entityManager.GetComponent(uid); + var transform = entityManager.GetComponent(uid); var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve()); var entities = indices.GetEntitiesInTile(transform.GridID, LookupFlags.Approximate | LookupFlags.IncludeAnchored, IoCManager.Resolve()); diff --git a/Content.Server/Construction/Conditions/EntityAnchored.cs b/Content.Server/Construction/Conditions/EntityAnchored.cs index 688976cb28..e1b503c440 100644 --- a/Content.Server/Construction/Conditions/EntityAnchored.cs +++ b/Content.Server/Construction/Conditions/EntityAnchored.cs @@ -19,7 +19,7 @@ namespace Content.Server.Construction.Conditions public bool Condition(EntityUid uid, IEntityManager entityManager) { - var transform = entityManager.GetComponent(uid); + var transform = entityManager.GetComponent(uid); return transform.Anchored && Anchored || !transform.Anchored && !Anchored; } diff --git a/Content.Server/Construction/ConstructionSystem.Graph.cs b/Content.Server/Construction/ConstructionSystem.Graph.cs index ba69e5300f..128273bdb8 100644 --- a/Content.Server/Construction/ConstructionSystem.Graph.cs +++ b/Content.Server/Construction/ConstructionSystem.Graph.cs @@ -153,7 +153,7 @@ namespace Content.Server.Construction private EntityUid? ChangeEntity(EntityUid uid, EntityUid? userUid, string newEntity, ConstructionComponent? construction = null, MetaDataComponent? metaData = null, - ITransformComponent? transform = null, + TransformComponent? transform = null, ContainerManagerComponent? containerManager = null) { if (!Resolve(uid, ref construction, ref metaData, ref transform)) @@ -187,7 +187,7 @@ namespace Content.Server.Construction } // Transform transferring. - var newTransform = EntityManager.GetComponent(newUid); + var newTransform = EntityManager.GetComponent(newUid); newTransform.LocalRotation = transform.LocalRotation; newTransform.Anchored = transform.Anchored; diff --git a/Content.Server/DoAfter/DoAfter.cs b/Content.Server/DoAfter/DoAfter.cs index c95f1338c4..4e7ef466d6 100644 --- a/Content.Server/DoAfter/DoAfter.cs +++ b/Content.Server/DoAfter/DoAfter.cs @@ -42,13 +42,13 @@ namespace Content.Server.DoAfter if (eventArgs.BreakOnUserMove) { - UserGrid = entityManager.GetComponent(eventArgs.User).Coordinates; + UserGrid = entityManager.GetComponent(eventArgs.User).Coordinates; } if (eventArgs.BreakOnTargetMove) { // Target should never be null if the bool is set. - TargetGrid = entityManager.GetComponent(eventArgs.Target!.Value).Coordinates; + TargetGrid = entityManager.GetComponent(eventArgs.Target!.Value).Coordinates; } // For this we need to stay on the same hand slot and need the same item in that hand slot @@ -113,13 +113,13 @@ namespace Content.Server.DoAfter } // TODO :Handle inertia in space. - if (EventArgs.BreakOnUserMove && !entityManager.GetComponent(EventArgs.User).Coordinates.InRange( + if (EventArgs.BreakOnUserMove && !entityManager.GetComponent(EventArgs.User).Coordinates.InRange( entityManager, UserGrid, EventArgs.MovementThreshold)) { return true; } - if (EventArgs.BreakOnTargetMove && !entityManager.GetComponent(EventArgs.Target!.Value).Coordinates.InRange( + if (EventArgs.BreakOnTargetMove && !entityManager.GetComponent(EventArgs.Target!.Value).Coordinates.InRange( entityManager, TargetGrid, EventArgs.MovementThreshold)) { return true; diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index 76a590c807..e7dd2ad2c6 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -139,7 +139,7 @@ namespace Content.Server.Electrocution public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid, ElectrifiedComponent? electrified = null, NodeContainerComponent? nodeContainer = null, - ITransformComponent? transform = null) + TransformComponent? transform = null) { if (!Resolve(uid, ref electrified, ref transform, false)) return false; @@ -253,7 +253,7 @@ namespace Content.Server.Electrocution float siemensCoefficient = 1f, StatusEffectsComponent? statusEffects = null, SharedAlertsComponent? alerts = null, - ITransformComponent? sourceTransform = null) + TransformComponent? sourceTransform = null) { if (!DoCommonElectrocutionAttempt(uid, sourceUid, ref siemensCoefficient)) return false; diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs index c6cd3788ca..bb281adbba 100644 --- a/Content.Server/Flash/FlashSystem.cs +++ b/Content.Server/Flash/FlashSystem.cs @@ -151,7 +151,7 @@ namespace Content.Server.Flash public void FlashArea(EntityUid source, EntityUid? user, float range, float duration, float slowTo = 0f, bool displayPopup = false, SoundSpecifier? sound = null) { - var transform = EntityManager.GetComponent(source); + var transform = EntityManager.GetComponent(source); foreach (var entity in _entityLookup.GetEntitiesInRange(transform.Coordinates, range)) { diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index f9bcbcdf81..df953200c7 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -64,7 +64,7 @@ namespace Content.Server.GameTicking throw new InvalidOperationException($"No grid found for map {map}"); } - var stationXform = EntityManager.GetComponent(grid.GridEntityId); + var stationXform = EntityManager.GetComponent(grid.GridEntityId); if (StationOffset) { diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 3fda57c694..d8f11c0495 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -256,7 +256,7 @@ namespace Content.Server.GameTicking _possiblePositions.Clear(); - foreach (var (point, transform) in EntityManager.EntityQuery()) + foreach (var (point, transform) in EntityManager.EntityQuery()) { if (point.SpawnType == SpawnPointType.Job && point.Job?.ID == jobId) _possiblePositions.Add(transform.Coordinates); @@ -274,7 +274,7 @@ namespace Content.Server.GameTicking _possiblePositions.Clear(); - foreach (var (point, transform) in EntityManager.EntityQuery()) + foreach (var (point, transform) in EntityManager.EntityQuery()) { if (point.SpawnType == SpawnPointType.LateJoin) _possiblePositions.Add(transform.Coordinates); } @@ -292,7 +292,7 @@ namespace Content.Server.GameTicking _possiblePositions.Clear(); - foreach (var (point, transform) in EntityManager.EntityQuery()) + foreach (var (point, transform) in EntityManager.EntityQuery()) { if (point.SpawnType == SpawnPointType.Observer) _possiblePositions.Add(transform.Coordinates); diff --git a/Content.Server/Pinpointer/ServerPinpointerSystem.cs b/Content.Server/Pinpointer/ServerPinpointerSystem.cs index a51348e9d9..c52c7b9e29 100644 --- a/Content.Server/Pinpointer/ServerPinpointerSystem.cs +++ b/Content.Server/Pinpointer/ServerPinpointerSystem.cs @@ -40,7 +40,7 @@ namespace Content.Server.Pinpointer foreach (var uid in ActivePinpointers) { UpdateDirectionToTarget(uid); - } + } } /// @@ -48,7 +48,7 @@ namespace Content.Server.Pinpointer /// Will return null if can't find anything /// private EntityUid? FindTargetFromWhitelist(EntityUid uid, EntityWhitelist whitelist, - ITransformComponent? transform = null) + TransformComponent? transform = null) { if (!Resolve(uid, ref transform)) return null; @@ -125,9 +125,9 @@ namespace Content.Server.Pinpointer private Vector2? CalculateDirection(EntityUid pinUid, EntityUid trgUid) { // check if entities have transform component - if (!EntityManager.TryGetComponent(pinUid, out ITransformComponent? pin)) + if (!EntityManager.TryGetComponent(pinUid, out TransformComponent? pin)) return null; - if (!EntityManager.TryGetComponent(trgUid, out ITransformComponent? trg)) + if (!EntityManager.TryGetComponent(trgUid, out TransformComponent? trg)) return null; // check if they are on same map diff --git a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs index ef910b3c8c..069633fe56 100644 --- a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs @@ -37,7 +37,7 @@ namespace Content.Server.Pointing.EntitySystems } } - private IEntity? RandomNearbyPlayer(EntityUid uid, RoguePointingArrowComponent? component = null, ITransformComponent? transform = null) + private IEntity? RandomNearbyPlayer(EntityUid uid, RoguePointingArrowComponent? component = null, TransformComponent? transform = null) { if (!Resolve(uid, ref component, ref transform)) return null; @@ -55,7 +55,7 @@ namespace Content.Server.Pointing.EntitySystems return _random.Pick(players).AttachedEntity; } - private void UpdateAppearance(EntityUid uid, RoguePointingArrowComponent? component = null, ITransformComponent? transform = null, AppearanceComponent? appearance = null) + private void UpdateAppearance(EntityUid uid, RoguePointingArrowComponent? component = null, TransformComponent? transform = null, AppearanceComponent? appearance = null) { if (!Resolve(uid, ref component, ref transform, ref appearance) || component.Chasing == null) return; @@ -65,7 +65,7 @@ namespace Content.Server.Pointing.EntitySystems public override void Update(float frameTime) { - foreach (var (component, transform) in EntityManager.EntityQuery()) + foreach (var (component, transform) in EntityManager.EntityQuery()) { var uid = component.Owner.Uid; component.Chasing ??= RandomNearbyPlayer(uid, component, transform); diff --git a/Content.Server/Power/EntitySystems/CableVisSystem.cs b/Content.Server/Power/EntitySystems/CableVisSystem.cs index 1932f55b97..326101d89e 100644 --- a/Content.Server/Power/EntitySystems/CableVisSystem.cs +++ b/Content.Server/Power/EntitySystems/CableVisSystem.cs @@ -49,7 +49,7 @@ namespace Content.Server.Power.EntitySystems var mask = WireVisDirFlags.None; - var transform = EntityManager.GetComponent(uid); + var transform = EntityManager.GetComponent(uid); // Only valid grids allowed. if(!transform.GridID.IsValid()) diff --git a/Content.Server/Tabletop/TabletopSystem.Draggable.cs b/Content.Server/Tabletop/TabletopSystem.Draggable.cs index 773f009dc1..86cbe74b47 100644 --- a/Content.Server/Tabletop/TabletopSystem.Draggable.cs +++ b/Content.Server/Tabletop/TabletopSystem.Draggable.cs @@ -52,7 +52,7 @@ namespace Content.Server.Tabletop // TODO: some permission system, disallow movement if you're not permitted to move the item // Move the entity and dirty it (we use the map ID from the entity so noone can try to be funny and move the item to another map) - var transform = EntityManager.GetComponent(movedEntity.Uid); + var transform = EntityManager.GetComponent(movedEntity.Uid); var entityCoordinates = new EntityCoordinates(_mapManager.GetMapEntityId(transform.MapID), msg.Coordinates.Position); transform.Coordinates = entityCoordinates; } diff --git a/Content.Server/Tools/ToolSystem.Welder.cs b/Content.Server/Tools/ToolSystem.Welder.cs index 7b1ddda95f..503d2c21d8 100644 --- a/Content.Server/Tools/ToolSystem.Welder.cs +++ b/Content.Server/Tools/ToolSystem.Welder.cs @@ -113,7 +113,7 @@ namespace Content.Server.Tools SoundSystem.Play(Filter.Pvs(uid), welder.WelderOnSounds.GetSound(), uid, AudioHelpers.WithVariation(0.125f).WithVolume(-5f)); - // TODO: Use ITransformComponent directly. + // TODO: Use TransformComponent directly. _atmosphereSystem.HotspotExpose(welder.Owner.Transform.Coordinates, 700, 50, true); welder.Dirty(); @@ -316,7 +316,7 @@ namespace Content.Server.Tools if (!_solutionContainerSystem.TryGetSolution(tool, welder.FuelSolution, out var solution, solutionContainer)) continue; - // TODO: Use ITransformComponent directly. + // TODO: Use TransformComponent directly. _atmosphereSystem.HotspotExpose(welder.Owner.Transform.Coordinates, 700, 50, true); solution.RemoveReagent(welder.FuelReagent, welder.FuelConsumption * _welderTimer); diff --git a/Content.Shared/Movement/SharedMoverController.cs b/Content.Shared/Movement/SharedMoverController.cs index dd1c89a5de..928865cd65 100644 --- a/Content.Shared/Movement/SharedMoverController.cs +++ b/Content.Shared/Movement/SharedMoverController.cs @@ -169,7 +169,7 @@ namespace Content.Shared.Movement /// /// Used for weightlessness to determine if we are near a wall. /// - public static bool IsAroundCollider(SharedPhysicsSystem broadPhaseSystem, ITransformComponent transform, IMobMoverComponent mover, IPhysBody collider) + public static bool IsAroundCollider(SharedPhysicsSystem broadPhaseSystem, TransformComponent transform, IMobMoverComponent mover, IPhysBody collider) { var enlargedAABB = collider.GetWorldAABB().Enlarged(mover.GrabRange); diff --git a/Content.Shared/SubFloor/SubFloorHideSystem.cs b/Content.Shared/SubFloor/SubFloorHideSystem.cs index 61455966c6..de1b9092b4 100644 --- a/Content.Shared/SubFloor/SubFloorHideSystem.cs +++ b/Content.Shared/SubFloor/SubFloorHideSystem.cs @@ -142,7 +142,7 @@ namespace Content.Shared.SubFloor private void UpdateEntity(EntityUid uid) { - var transform = EntityManager.GetComponent(uid); + var transform = EntityManager.GetComponent(uid); if (!_mapManager.TryGetGrid(transform.GridID, out var grid)) { @@ -175,7 +175,7 @@ namespace Content.Shared.SubFloor subFloor = true; } // We only need to query the TransformComp if the SubfloorHide is enabled and requires anchoring. - else if (subFloorHideComponent.RequireAnchored && EntityManager.TryGetComponent(uid, out ITransformComponent? transformComponent)) + else if (subFloorHideComponent.RequireAnchored && EntityManager.TryGetComponent(uid, out TransformComponent? transformComponent)) { // If we require the entity to be anchored but it's not, this will set subfloor to true, unhiding it. subFloor = !transformComponent.Anchored; diff --git a/Content.Shared/Transform/TransformExtensions.cs b/Content.Shared/Transform/TransformExtensions.cs index 2872034bc2..fcc2473b08 100644 --- a/Content.Shared/Transform/TransformExtensions.cs +++ b/Content.Shared/Transform/TransformExtensions.cs @@ -4,7 +4,7 @@ namespace Content.Shared.Transform { public static class TransformExtensions { - public static void AttachToGrandparent(this ITransformComponent transform) + public static void AttachToGrandparent(this TransformComponent transform) { var grandParent = transform.Parent?.Parent;