Update MoverController.cs to not use Component.Owner (#29965)

* Update MoverController.cs * Update a bunch of movement code to use Entity<T> * Last errors * wow, there were more errors --------- Co-authored-by: plykiya <[email protected]>
Simple-Station · Jan 14, 2025 · 5bb56c0 · 5bb56c0
1 parent 04406f6
commit 5bb56c0
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 125 deletions.
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
@@ -34,57 +34,57 @@ public override void Initialize()
             Subs.CVar(_config, CCVars.DefaultWalk, _ => RaiseNetworkEvent(new UpdateInputCVarsMessage()));
         }
 
-        private void OnUpdatePredicted(EntityUid uid, InputMoverComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdatePredicted(Entity<InputMoverComponent> entity, ref UpdateIsPredictedEvent args)
         {
             // Enable prediction if an entity is controlled by the player
-            if (uid == _playerManager.LocalEntity)
+            if (entity.Owner == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
-        private void OnUpdateRelayTargetPredicted(EntityUid uid, MovementRelayTargetComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdateRelayTargetPredicted(Entity<MovementRelayTargetComponent> entity, ref UpdateIsPredictedEvent args)
         {
-            if (component.Source == _playerManager.LocalEntity)
+            if (entity.Comp.Source == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
-        private void OnUpdatePullablePredicted(EntityUid uid, PullableComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdatePullablePredicted(Entity<PullableComponent> entity, ref UpdateIsPredictedEvent args)
         {
             // Enable prediction if an entity is being pulled by the player.
             // Disable prediction if an entity is being pulled by some non-player entity.
 
-            if (component.Puller == _playerManager.LocalEntity)
+            if (entity.Comp.Puller == _playerManager.LocalEntity)
                 args.IsPredicted = true;
-            else if (component.Puller != null)
+            else if (entity.Comp.Puller != null)
                 args.BlockPrediction = true;
 
             // TODO recursive pulling checks?
             // What if the entity is being pulled by a vehicle controlled by the player?
         }
 
-        private void OnRelayPlayerAttached(EntityUid uid, RelayInputMoverComponent component, LocalPlayerAttachedEvent args)
+        private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref LocalPlayerAttachedEvent args)
         {
-            Physics.UpdateIsPredicted(uid);
-            Physics.UpdateIsPredicted(component.RelayEntity);
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            Physics.UpdateIsPredicted(entity.Owner);
+            Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnRelayPlayerDetached(EntityUid uid, RelayInputMoverComponent component, LocalPlayerDetachedEvent args)
+        private void OnRelayPlayerDetached(Entity<RelayInputMoverComponent> entity, ref LocalPlayerDetachedEvent args)
         {
-            Physics.UpdateIsPredicted(uid);
-            Physics.UpdateIsPredicted(component.RelayEntity);
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            Physics.UpdateIsPredicted(entity.Owner);
+            Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnPlayerAttached(EntityUid uid, InputMoverComponent component, LocalPlayerAttachedEvent args)
+        private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref LocalPlayerAttachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
-        private void OnPlayerDetached(EntityUid uid, InputMoverComponent component, LocalPlayerDetachedEvent args)
+        private void OnPlayerDetached(Entity<InputMoverComponent> entity, ref LocalPlayerDetachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
         public override void UpdateBeforeSolve(bool prediction, float frameTime)

diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
@@ -40,7 +40,7 @@ public override void Initialize()
     private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
     {
         // If they haven't actually moved then ignore it.
-        if ((args.Component.HeldMoveButtons &
+        if ((args.Entity.Comp.HeldMoveButtons &
              (MoveButtons.Down | MoveButtons.Left | MoveButtons.Up | MoveButtons.Right)) == 0x0)
         {
             return;

diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
@@ -127,7 +127,7 @@ private void OnActionPerform(EntityUid uid, GhostComponent component, BooActionE
         private void OnRelayMoveInput(EntityUid uid, GhostOnMoveComponent component, ref MoveInputEvent args)
         {
             // If they haven't actually moved then ignore it.
-            if ((args.Component.HeldMoveButtons &
+            if ((args.Entity.Comp.HeldMoveButtons &
                  (MoveButtons.Down | MoveButtons.Left | MoveButtons.Up | MoveButtons.Right)) == 0x0)
             {
                 return;

diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
@@ -30,26 +30,26 @@ public override void Initialize()
             SubscribeLocalEvent<InputMoverComponent, PlayerDetachedEvent>(OnPlayerDetached);
         }
 
-        private void OnRelayPlayerAttached(EntityUid uid, RelayInputMoverComponent component, PlayerAttachedEvent args)
+        private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref PlayerAttachedEvent args)
         {
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnRelayPlayerDetached(EntityUid uid, RelayInputMoverComponent component, PlayerDetachedEvent args)
+        private void OnRelayPlayerDetached(Entity<RelayInputMoverComponent> entity, ref PlayerDetachedEvent args)
         {
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnPlayerAttached(EntityUid uid, InputMoverComponent component, PlayerAttachedEvent args)
+        private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref PlayerAttachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
-        private void OnPlayerDetached(EntityUid uid, InputMoverComponent component, PlayerDetachedEvent args)
+        private void OnPlayerDetached(Entity<InputMoverComponent> entity, ref PlayerDetachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
         protected override bool CanSound()

diff --git a/Content.Shared/Movement/Events/MoveInputEvent.cs b/Content.Shared/Movement/Events/MoveInputEvent.cs
@@ -9,16 +9,14 @@ namespace Content.Shared.Movement.Events;
 [ByRefEvent]
 public readonly struct MoveInputEvent
 {
-    public readonly EntityUid Entity;
-    public readonly InputMoverComponent Component;
+    public readonly Entity<InputMoverComponent> Entity;
     public readonly MoveButtons OldMovement;
 
-    public bool HasDirectionalMovement => (Component.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None;
+    public bool HasDirectionalMovement => (Entity.Comp.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None;
 
-    public MoveInputEvent(EntityUid entity, InputMoverComponent component, MoveButtons oldMovement)
+    public MoveInputEvent(Entity<InputMoverComponent> entity, MoveButtons oldMovement)
     {
         Entity = entity;
-        Component = component;
         OldMovement = oldMovement;
     }
 }
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.CVars.cs b/Content.Shared/Movement/Systems/SharedMoverController.CVars.cs
@@ -23,7 +23,7 @@ private void OnMindAdded(Entity<InputMoverComponent> ent, ref MindAddedMessage a
             return;
 
         ent.Comp.DefaultSprinting = _netConfig.GetClientCVar(channel, CCVars.DefaultWalk);
-        WalkingAlert(ent, ent.Comp);
+        WalkingAlert(ent);
     }
 
     private void OnMindRemoved(Entity<InputMoverComponent> ent, ref MindRemovedMessage args)