Physics (#3485)

* Content side new physics structure

* BroadPhase outline done

* But we need to fix WorldAABB

* Fix static pvs AABB

* Fix import

* Rando fixes

* B is for balloon

* Change human mob hitbox to circle

* Decent movement

* Start adding friction to player controller

I think it's the best way to go about it to keep other objects somewhat consistent for physics.

* This baby can fit so many physics bugs in it.

* Slight mob mover optimisations.

* Player mover kinda works okay.

* Beginnings of testbed

* More testbed

* Circlestack bed

* Namespaces

* BB fixes

* Pull WorldAABB

* Joint pulling

* Semi-decent movement I guess.

* Pulling better

* Bullet controller + old movement

* im too dumb for this shit

* Use kinematic mob controller again

It's probably for the best TBH

* Stashed shitcode

* Remove SlipController

* In which movement code is entirely refactored

* Singularity fix

* Fix ApplyLinearImpulse

* MoveRelay fix

* Fix door collisions

* Disable subfloor collisions

Saves on broadphase a fair bit

* Re-implement ClimbController

* Zumzum's pressure

* Laggy item throwing

* Minor atmos change

* Some caching

* Optimise controllers

* Optimise CollideWith to hell and back

* Re-do throwing and tile friction

* Landing too

* Optimise controllers

* Move CCVars and other stuff swept is beautiful

* Cleanup a bunch of controllers

* Fix shooting and high pressure movement controller

* Flashing improvements

* Stuff and things

* Combat collisions

* Combat mode collisions

* Pulling distance joint again

* Cleanup physics interfaces

* More like scuffedularity

* Shit's fucked

* Haha tests go green

* Bigmoneycrab

* Fix dupe pulling

* Zumzum's based fix

* Don't run tile friction for non-predicted bodies

* Experimental pulling improvement

* Everything's a poly now

* Optimise AI region debugging a bit

Could still be better but should improve default performance a LOT

* Mover no updater

* Crazy kinematic body idea

* Good collisions

* KinematicController

* Fix aghost

* Throwing refactor

* Pushing cleanup

* Fix throwing and footstep sounds

* Frametime in ICollideBehavior

* Fix stuff

* Actually fix weightlessness

* Optimise collision behaviors a lot

* Make open lockers still collide with walls

* powwweeerrrrr

* Merge master proper

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Ch ch ch changesss

* SHIP IT

* Fix #if DEBUG

* Fix vaulting and item locker collision

* Fix throwing

* Editing yaml by hand what can go wrong

* on

* Last yaml fixes

* Okay now it's fixed

* Linter

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Vera Aguilera Puerto <zddm@outlook.es>

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs

@@ -6,10 +6,13 @@ using Content.Shared.AI;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
+using Robust.Shared.Players;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -73,6 +76,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
         private readonly List<PathfindingRegion> _queuedCacheDeletions = new();
 
 #if DEBUG
+        private HashSet<IPlayerSession> _subscribedSessions = new();
         private int _runningCacheIdx = 0;
 #endif
 
@@ -81,7 +85,8 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
             _pathfindingSystem = Get<PathfindingSystem>();
             SubscribeLocalEvent<PathfindingChunkUpdateMessage>(RecalculateNodeRegions);
 #if DEBUG
-            SubscribeLocalEvent<PlayerAttachSystemMessage>(SendDebugMessage);
+            SubscribeNetworkEvent<SharedAiDebug.SubscribeReachableMessage>(HandleSubscription);
+            SubscribeNetworkEvent<SharedAiDebug.UnsubscribeReachableMessage>(HandleUnsubscription);
 #endif
             _mapManager.OnGridRemoved += GridRemoved;
         }
@@ -99,8 +104,9 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
                 GenerateRegions(chunk);
             }
 
+            // TODO: Only send diffs instead
 #if DEBUG
-            if (_queuedUpdates.Count > 0)
+            if (_subscribedSessions.Count > 0 && _queuedUpdates.Count > 0)
             {
                 foreach (var (gridId, regs) in _regions)
                 {
@@ -129,8 +135,28 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
             _cachedAccessible.Clear();
             _queuedCacheDeletions.Clear();
             _mapManager.OnGridRemoved -= GridRemoved;
+            UnsubscribeLocalEvent<PathfindingChunkUpdateMessage>();
+            UnsubscribeLocalEvent<PlayerAttachSystemMessage>();
+            UnsubscribeNetworkEvent<SharedAiDebug.SubscribeReachableMessage>();
+            UnsubscribeNetworkEvent<SharedAiDebug.UnsubscribeReachableMessage>();
         }
 
+#if DEBUG
+        private void HandleSubscription(SharedAiDebug.SubscribeReachableMessage message, EntitySessionEventArgs eventArgs)
+        {
+            _subscribedSessions.Add((IPlayerSession) eventArgs.SenderSession);
+            foreach (var (gridId, _) in _regions)
+            {
+                SendRegionsDebugMessage(gridId);
+            }
+        }
+
+        private void HandleUnsubscription(SharedAiDebug.UnsubscribeReachableMessage message, EntitySessionEventArgs eventArgs)
+        {
+            _subscribedSessions.Remove((IPlayerSession) eventArgs.SenderSession);
+        }
+#endif
+
         private void RecalculateNodeRegions(PathfindingChunkUpdateMessage message)
         {
             // TODO: Only need to do changed nodes ideally
@@ -154,7 +180,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
             var targetNode = _pathfindingSystem.GetNode(targetTile);
 
             var collisionMask = 0;
-            if (entity.TryGetComponent(out IPhysicsComponent physics))
+            if (entity.TryGetComponent(out IPhysBody physics))
             {
                 collisionMask = physics.CollisionMask;
             }
@@ -681,15 +707,9 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
         }
 
 #if DEBUG
-        private void SendDebugMessage(PlayerAttachSystemMessage message)
-        {
-            var playerGrid = message.Entity.Transform.GridID;
-            if(playerGrid.IsValid())
-                SendRegionsDebugMessage(playerGrid);
-        }
-
         private void SendRegionsDebugMessage(GridId gridId)
         {
+            if (_subscribedSessions.Count == 0) return;
             var grid = _mapManager.GetGrid(gridId);
             // Chunk / Regions / Nodes
             var debugResult = new Dictionary<int, Dictionary<int, List<Vector2>>>();
@@ -722,17 +742,23 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
 
                 chunkIdx++;
             }
-            RaiseNetworkEvent(new SharedAiDebug.ReachableChunkRegionsDebugMessage(gridId, debugResult));
+
+            foreach (var session in _subscribedSessions)
+            {
+                RaiseNetworkEvent(new SharedAiDebug.ReachableChunkRegionsDebugMessage(gridId, debugResult), session.ConnectedClient);
+            }
         }
 
         /// <summary>
-        /// Sent whenever the reachable cache for a particular mob is built or retrieved
+        ///     Sent whenever the reachable cache for a particular mob is built or retrieved
         /// </summary>
         /// <param name="gridId"></param>
         /// <param name="regions"></param>
         /// <param name="cached"></param>
         private void SendRegionCacheMessage(GridId gridId, IEnumerable<PathfindingRegion> regions, bool cached)
         {
+            if (_subscribedSessions.Count == 0) return;
+
             var grid = _mapManager.GetGrid(gridId);
             var debugResult = new Dictionary<int, List<Vector2>>();
 
@@ -750,7 +776,10 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
                 _runningCacheIdx++;
             }
 
-            RaiseNetworkEvent(new SharedAiDebug.ReachableCacheDebugMessage(gridId, debugResult, cached));
+            foreach (var session in _subscribedSessions)
+            {
+                RaiseNetworkEvent(new SharedAiDebug.ReachableCacheDebugMessage(gridId, debugResult, cached), session.ConnectedClient);
+            }
         }
 #endif
     }

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/ReachableArgs.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Access;
 using Content.Server.GameObjects.Components.Movement;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Physics;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
 {
@@ -27,7 +28,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
         public static ReachableArgs GetArgs(IEntity entity)
         {
             var collisionMask = 0;
-            if (entity.TryGetComponent(out IPhysicsComponent? physics))
+            if (entity.TryGetComponent(out IPhysBody? physics))
             {
                 collisionMask = physics.CollisionMask;
             }

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs

@@ -6,6 +6,7 @@ using Content.Server.GameObjects.Components.Doors;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Utility;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
@@ -40,7 +41,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
             GenerateMask();
         }
 
-        public static bool IsRelevant(IEntity entity, IPhysicsComponent physicsComponent)
+        public static bool IsRelevant(IEntity entity, IPhysBody physicsComponent)
         {
             if (entity.Transform.GridID == GridId.Invalid ||
                 (PathfindingSystem.TrackedCollisionLayers & physicsComponent.CollisionLayer) == 0)
@@ -256,7 +257,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
         /// <param name="entity"></param>
         /// TODO: These 2 methods currently don't account for a bunch of changes (e.g. airlock unpowered, wrenching, etc.)
         /// TODO: Could probably optimise this slightly more.
-        public void AddEntity(IEntity entity, IPhysicsComponent physicsComponent)
+        public void AddEntity(IEntity entity, IPhysBody physicsComponent)
         {
             // If we're a door
             if (entity.HasComponent<AirlockComponent>() || entity.HasComponent<ServerDoorComponent>())
@@ -275,7 +276,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
 
             DebugTools.Assert((PathfindingSystem.TrackedCollisionLayers & physicsComponent.CollisionLayer) != 0);
 
-            if (!physicsComponent.Anchored)
+            if (physicsComponent.BodyType == BodyType.Static)
             {
                 _physicsLayers.Add(entity, physicsComponent.CollisionLayer);
             }

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs

@@ -11,6 +11,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Utility;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
@@ -29,7 +30,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
-        
+
         public IReadOnlyDictionary<GridId, Dictionary<Vector2i, PathfindingChunk>> Graph => _graph;
         private readonly Dictionary<GridId, Dictionary<Vector2i, PathfindingChunk>> _graph = new();
 
@@ -81,7 +82,8 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
 
             foreach (var update in _collidableUpdateQueue)
             {
-                var entity = EntityManager.GetEntity(update.Owner);
+                if (!EntityManager.TryGetEntity(update.Owner, out var entity)) continue;
+
                 if (update.CanCollide)
                 {
                     HandleEntityAdd(entity);
@@ -262,7 +264,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
         {
             if (entity.Deleted ||
                 _lastKnownPositions.ContainsKey(entity) ||
-                !entity.TryGetComponent(out IPhysicsComponent physics) ||
+                !entity.TryGetComponent(out IPhysBody physics) ||
                 !PathfindingNode.IsRelevant(entity, physics))
             {
                 return;
@@ -301,7 +303,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
         {
             // If we've moved to space or the likes then remove us.
             if (moveEvent.Sender.Deleted ||
-                !moveEvent.Sender.TryGetComponent(out IPhysicsComponent physics) ||
+                !moveEvent.Sender.TryGetComponent(out IPhysBody physics) ||
                 !PathfindingNode.IsRelevant(moveEvent.Sender, physics) ||
                 moveEvent.NewPosition.GetGridId(EntityManager) == GridId.Invalid)
             {
@@ -366,7 +368,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
 
         public bool CanTraverse(IEntity entity, PathfindingNode node)
         {
-            if (entity.TryGetComponent(out IPhysicsComponent physics) &&
+            if (entity.TryGetComponent(out IPhysBody physics) &&
                 (physics.CollisionMask & node.BlockedCollisionMask) != 0)
             {
                 return false;

Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs

@@ -13,6 +13,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
@@ -413,7 +414,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Steering
             var startTile = gridManager.GetTileRef(entity.Transform.Coordinates);
             var endTile = gridManager.GetTileRef(steeringRequest.TargetGrid);
             var collisionMask = 0;
-            if (entity.TryGetComponent(out IPhysicsComponent physics))
+            if (entity.TryGetComponent(out IPhysBody physics))
             {
                 collisionMask = physics.CollisionMask;
             }
@@ -599,7 +600,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Steering
                 return Vector2.Zero;
             }
 
-            if (target.TryGetComponent(out IPhysicsComponent physics))
+            if (target.TryGetComponent(out IPhysBody physics))
             {
                 var targetDistance = (targetPos.Position - entityPos.Position);
                 targetPos = targetPos.Offset(physics.LinearVelocity * targetDistance);
@@ -617,7 +618,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Steering
         /// <returns></returns>
         private Vector2 CollisionAvoidance(IEntity entity, Vector2 direction, ICollection<IEntity> ignoredTargets)
         {
-            if (direction == Vector2.Zero || !entity.TryGetComponent(out IPhysicsComponent physics))
+            if (direction == Vector2.Zero || !entity.TryGetComponent(out IPhysBody physics))
             {
                 return Vector2.Zero;
             }
@@ -658,7 +659,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Steering
                     // if we're moving in the same direction then ignore
                     // So if 2 entities are moving towards each other and both detect a collision they'll both move in the same direction
                     // i.e. towards the right
-                    if (physicsEntity.TryGetComponent(out IPhysicsComponent otherPhysics) &&
+                    if (physicsEntity.TryGetComponent(out IPhysBody otherPhysics) &&
                         Vector2.Dot(otherPhysics.LinearVelocity, direction) > 0)
                     {
                         continue;

Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.Items.Storage;
@@ -25,6 +26,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Players;
 
 namespace Content.Server.GameObjects.EntitySystems.Click
@@ -568,61 +570,12 @@ namespace Content.Server.GameObjects.EntitySystems.Click
             }
 
             var comps = thrown.GetAllComponents<IThrown>().ToList();
+            var args = new ThrownEventArgs(user);
 
             // Call Thrown on all components that implement the interface
             foreach (var comp in comps)
             {
-                comp.Thrown(new ThrownEventArgs(user));
-            }
-        }
-
-        /// <summary>
-        ///     Calls Land on all components that implement the ILand interface
-        ///     on an entity that has landed after being thrown.
-        /// </summary>
-        public void LandInteraction(IEntity user, IEntity landing, EntityCoordinates landLocation)
-        {
-            var landMsg = new LandMessage(user, landing, landLocation);
-            RaiseLocalEvent(landMsg);
-            if (landMsg.Handled)
-            {
-                return;
-            }
-
-            var comps = landing.GetAllComponents<ILand>().ToList();
-
-            // Call Land on all components that implement the interface
-            foreach (var comp in comps)
-            {
-                comp.Land(new LandEventArgs(user, landLocation));
-            }
-        }
-
-        /// <summary>
-        ///     Calls ThrowCollide on all components that implement the IThrowCollide interface
-        ///     on a thrown entity and the target entity it hit.
-        /// </summary>
-        public void ThrowCollideInteraction(IEntity user, IEntity thrown, IEntity target, EntityCoordinates location)
-        {
-            var collideMsg = new ThrowCollideMessage(user, thrown, target, location);
-            RaiseLocalEvent(collideMsg);
-            if (collideMsg.Handled)
-            {
-                return;
-            }
-
-            var eventArgs = new ThrowCollideEventArgs(user, thrown, target, location);
-
-            foreach (var comp in thrown.GetAllComponents<IThrowCollide>().ToArray())
-            {
-                if (thrown.Deleted) break;
-                comp.DoHit(eventArgs);
-            }
-
-            foreach (var comp in target.GetAllComponents<IThrowCollide>().ToArray())
-            {
-                if (target.Deleted) break;
-                comp.HitBy(eventArgs);
+                comp.Thrown(args);
             }
         }
 

Content.Server/GameObjects/EntitySystems/ClimbSystem.cs

@@ -1,18 +1,39 @@
-using Content.Server.GameObjects.Components.Movement;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.GameObjects.Components.Movement;
+using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {
     [UsedImplicitly]
-    internal sealed class ClimbSystem : EntitySystem
+    internal sealed class ClimbSystem : EntitySystem, IResettingEntitySystem
     {
+        private readonly HashSet<ClimbingComponent> _activeClimbers = new();
+
+        public void AddActiveClimber(ClimbingComponent climbingComponent)
+        {
+            _activeClimbers.Add(climbingComponent);
+        }
+
+        public void RemoveActiveClimber(ClimbingComponent climbingComponent)
+        {
+            _activeClimbers.Remove(climbingComponent);
+        }
+
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<ClimbingComponent>(true))
+            foreach (var climber in _activeClimbers.ToArray())
             {
-                comp.Update();
+                climber.Update();
             }
         }
+
+        public void Reset()
+        {
+            _activeClimbers.Clear();
+        }
     }
 }

Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs

@@ -1,18 +0,0 @@
-using Content.Server.GameObjects.Components.Conveyor;
-using JetBrains.Annotations;
-using Robust.Shared.GameObjects;
-
-namespace Content.Server.GameObjects.EntitySystems
-{
-    [UsedImplicitly]
-    internal sealed class ConveyorSystem : EntitySystem
-    {
-        public override void Update(float frameTime)
-        {
-            foreach (var comp in ComponentManager.EntityQuery<ConveyorComponent>(true))
-            {
-                comp.Update(frameTime);
-            }
-        }
-    }
-}

Content.Server/GameObjects/EntitySystems/HandsSystem.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Linq;
 using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Items;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Stack;
 using Content.Server.GameObjects.EntitySystems.Click;
 using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Throw;
 using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Input;
 using Content.Shared.Interfaces;
@@ -145,12 +145,12 @@ namespace Content.Server.GameObjects.EntitySystems
 
         private bool HandleThrowItem(ICommonSession session, EntityCoordinates coords, EntityUid uid)
         {
-            var plyEnt = ((IPlayerSession)session).AttachedEntity;
+            var playerEnt = ((IPlayerSession)session).AttachedEntity;
 
-            if (plyEnt == null || !plyEnt.IsValid())
+            if (playerEnt == null || !playerEnt.IsValid())
                 return false;
 
-            if (!plyEnt.TryGetComponent(out HandsComponent handsComp))
+            if (!playerEnt.TryGetComponent(out HandsComponent handsComp))
                 return false;
 
             if (!handsComp.CanDrop(handsComp.ActiveHand))
@@ -169,14 +169,19 @@ namespace Content.Server.GameObjects.EntitySystems
             else
             {
                 stackComp.Use(1);
-                throwEnt = throwEnt.EntityManager.SpawnEntity(throwEnt.Prototype.ID, plyEnt.Transform.Coordinates);
+                throwEnt = throwEnt.EntityManager.SpawnEntity(throwEnt.Prototype.ID, playerEnt.Transform.Coordinates);
 
                 // can only throw one item at a time, regardless of what the prototype stack size is.
                 if (throwEnt.TryGetComponent<StackComponent>(out var newStackComp))
                     newStackComp.Count = 1;
             }
 
-            throwEnt.ThrowTo(ThrowForce, coords, plyEnt.Transform.Coordinates, false, plyEnt);
+            var direction = coords.ToMapPos(EntityManager) - playerEnt.Transform.WorldPosition;
+            if (direction == Vector2.Zero) return true;
+
+            direction = direction.Normalized * MathF.Min(direction.Length, 8.0f);
+
+            throwEnt.TryThrow(direction * ThrowForce * 15, playerEnt);
 
             return true;
         }

Content.Server/GameObjects/EntitySystems/MoverSystem.cs

@@ -1,163 +0,0 @@
-#nullable enable
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Sound;
-using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Maps;
-using Content.Shared.Physics;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.GameObjects.EntitySystems
-{
-    [UsedImplicitly]
-    internal class MoverSystem : SharedMoverSystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-
-        private AudioSystem _audioSystem = default!;
-
-        private const float StepSoundMoveDistanceRunning = 2;
-        private const float StepSoundMoveDistanceWalking = 1.5f;
-
-        /// <inheritdoc />
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<PlayerDetachedSystemMessage>(PlayerDetached);
-
-            _audioSystem = EntitySystemManager.GetEntitySystem<AudioSystem>();
-
-            UpdatesBefore.Add(typeof(PhysicsSystem));
-        }
-
-        public override void Update(float frameTime)
-        {
-            foreach (var (moverComponent, collidableComponent) in EntityManager.ComponentManager
-                .EntityQuery<IMoverComponent, IPhysicsComponent>(false))
-            {
-                var entity = moverComponent.Owner;
-                UpdateKinematics(entity.Transform, moverComponent, collidableComponent);
-            }
-        }
-
-        private void PlayerDetached(PlayerDetachedSystemMessage ev)
-        {
-            if (ev.Entity.TryGetComponent(out IPhysicsComponent? physics) &&
-                physics.TryGetController(out MoverController controller) &&
-                !ev.Entity.IsWeightless())
-            {
-                controller.StopMoving();
-            }
-        }
-
-        protected override void HandleFootsteps(IMoverComponent mover)
-        {
-            var transform = mover.Owner.Transform;
-            // Handle footsteps.
-            if (_mapManager.GridExists(mover.LastPosition.GetGridId(EntityManager)))
-            {
-                // Can happen when teleporting between grids.
-                if (!transform.Coordinates.TryDistance(EntityManager, mover.LastPosition, out var distance))
-                {
-                    mover.LastPosition = transform.Coordinates;
-                    return;
-                }
-
-                mover.StepSoundDistance += distance;
-            }
-
-            mover.LastPosition = transform.Coordinates;
-            float distanceNeeded;
-            if (mover.Sprinting)
-            {
-                distanceNeeded = StepSoundMoveDistanceRunning;
-            }
-            else
-            {
-                distanceNeeded = StepSoundMoveDistanceWalking;
-            }
-
-            if (mover.StepSoundDistance > distanceNeeded)
-            {
-                mover.StepSoundDistance = 0;
-
-                if (!mover.Owner.HasTag("FootstepSound"))
-                {
-                    return;
-                }
-
-                if (mover.Owner.TryGetComponent<InventoryComponent>(out var inventory)
-                    && inventory.TryGetSlotItem<ItemComponent>(EquipmentSlotDefines.Slots.SHOES, out var item)
-                    && item.Owner.TryGetComponent<FootstepModifierComponent>(out var modifier))
-                {
-                    modifier.PlayFootstep();
-                }
-                else
-                {
-                    PlayFootstepSound(transform.Coordinates, mover.Sprinting);
-                }
-            }
-        }
-
-        private void PlayFootstepSound(EntityCoordinates coordinates, bool sprinting)
-        {
-            // Step one: figure out sound collection prototype.
-            var grid = _mapManager.GetGrid(coordinates.GetGridId(EntityManager));
-            var tile = grid.GetTileRef(coordinates);
-
-            // If the coordinates have a FootstepModifier component
-            // i.e. component that emit sound on footsteps emit that sound
-            string? soundCollectionName = null;
-            foreach (var maybeFootstep in grid.GetSnapGridCell(tile.GridIndices, SnapGridOffset.Center))
-            {
-                if (maybeFootstep.Owner.TryGetComponent(out FootstepModifierComponent? footstep))
-                {
-                    soundCollectionName = footstep._soundCollectionName;
-                    break;
-                }
-            }
-            // if there is no FootstepModifierComponent, determine sound based on tiles
-            if (soundCollectionName == null)
-            {
-                // Walking on a tile.
-                var def = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId];
-                if (def.FootstepSounds == null)
-                {
-                    // Nothing to play, oh well.
-                    return;
-                }
-
-                soundCollectionName = def.FootstepSounds;
-            }
-
-            // Ok well we know the position of the
-            try
-            {
-                var soundCollection = _prototypeManager.Index<SoundCollectionPrototype>(soundCollectionName);
-                var file = _robustRandom.Pick(soundCollection.PickFiles);
-                _audioSystem.PlayAtCoords(file, coordinates, sprinting ? AudioParams.Default.WithVolume(0.75f) : null);
-            }
-            catch (UnknownPrototypeException)
-            {
-                // Shouldn't crash over a sound
-                Logger.ErrorS("sound", $"Unable to find sound collection for {soundCollectionName}");
-            }
-        }
-    }
-}

Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs

@@ -8,6 +8,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
+using Robust.Shared.Physics.Broadphase;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -137,7 +138,7 @@ namespace Content.Server.GameObjects.EntitySystems
                 // Determine if the solar panel is occluded, and zero out coverage if so.
                 // FIXME: The "Opaque" collision group doesn't seem to work right now.
                 var ray = new CollisionRay(entity.Transform.WorldPosition, TowardsSun.ToVec(), (int) CollisionGroup.Opaque);
-                var rayCastResults = IoCManager.Resolve<IPhysicsManager>().IntersectRay(entity.Transform.MapID, ray, SunOcclusionCheckDistance, entity);
+                var rayCastResults = EntitySystem.Get<SharedBroadPhaseSystem>().IntersectRay(entity.Transform.MapID, ray, SunOcclusionCheckDistance, entity);
                 if (rayCastResults.Any())
                     coverage = 0;
             }

Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs

@@ -1,18 +0,0 @@
-using Content.Server.GameObjects.Components.Recycling;
-using JetBrains.Annotations;
-using Robust.Shared.GameObjects;
-
-namespace Content.Server.GameObjects.EntitySystems
-{
-    [UsedImplicitly]
-    internal sealed class RecyclerSystem : EntitySystem
-    {
-        public override void Update(float frameTime)
-        {
-            foreach (var component in ComponentManager.EntityQuery<RecyclerComponent>(true))
-            {
-                component.Update(frameTime);
-            }
-        }
-    }
-}

Content.Server/GameObjects/EntitySystems/SingularitySystem.cs

@@ -7,36 +7,21 @@ namespace Content.Server.GameObjects.EntitySystems
     [UsedImplicitly]
     public class SingularitySystem : EntitySystem
     {
-        private float curTimeSingulo;
-        private float curTimePull;
+        private float _accumulator;
 
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
 
-            curTimeSingulo += frameTime;
-            curTimePull += frameTime;
+            _accumulator += frameTime;
 
-            var shouldUpdate = curTimeSingulo >= 1f;
-            var shouldPull = curTimePull >= 0.2f;
-            if (!shouldUpdate && !shouldPull) return;
-            var singulos = ComponentManager.EntityQuery<SingularityComponent>(true);
-
-            if (curTimeSingulo >= 1f)
+            while (_accumulator > 1.0f)
             {
-                curTimeSingulo -= 1f;
-                foreach (var singulo in singulos)
-                {
-                    singulo.Update();
-                }
-            }
+                _accumulator -= 1.0f;
 
-            if (curTimePull >= 0.5f)
-            {
-                curTimePull -= 0.5f;
-                foreach (var singulo in singulos)
+                foreach (var singularity in ComponentManager.EntityQuery<SingularityComponent>())
                 {
-                    singulo.PullUpdate();
+                    singularity.Update(1);
                 }
             }
         }