Version: 162.2.2

(cherry picked from commit 24d5c26fa6)
(cherry picked from commit 688efac67b634c613539b783a9fb6e679948cd53)

.github/CODEOWNERS

@@ -7,6 +7,3 @@
 **/Toolshed/** @moonheart08
 *Command.cs @moonheart08
 *Commands.cs @moonheart08
-
-# Physics
-**/Robust.Shared/Physics/** @metalgearsloth

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
 
-    <!-- This file automatically reset by Tools/version.py -->
+    <!-- This file automatically reset by Tools/version.py -->
 

RELEASE-NOTES.md

@@ -54,431 +54,7 @@ END TEMPLATE-->
 *None yet*
 
 
-## 184.1.0
-
-### New features
-
-* Add API to get gain / volume for a provided value on SharedAudioSystem.
-* Make GetOcclusion public for AudioSystem.
-* Add SharedAudioSystem.SetGain to complement SharedAudioSystem.SetVolume
-
-
-## 184.0.1
-
-### Bugfixes
-
-* Update MIDI position and occlusion every frame instead of at set intervals.
-* Fix global audio not being global.
-
-
-## 184.0.0
-
-### Internal
-
-* Add RobustMemoryManager with RecyclableIOMemoryStream to significantly reduce MsgState allocations until better memory management is implemented.
-
-
-## 183.0.0
-
-### Breaking changes
-
-* Audio rework has been re-merged now that the issues with packaging on server have been rectified (thanks PJB!)
-* Reverted Arch pending further performance work on making TryGetComponent competitive with live.
-
-
-## 182.1.1
-
-### Internal
-
-* Remove AggressiveInlining from Arch for debugging.
-
-
-## 182.1.0
-
-### New features
-
-* Add IRobustRandom.SetSeed
-
-### Other
-
-* Add Arch.TrimExcess() back to remove excess archetypes on map load / EntityManager flush.
-
-
-## 182.0.0
-
-### Breaking changes
-
-* Add EntityUid's generation / version to the hashcode.
-
-
-## 181.0.2
-
-### Bugfixes
-
-* Fix exceptions from having too many lights on screen and causing the game to go black.
-* Fix components having events raised in ClientGameStateManager before fully set and causing nullable reference exceptions.
-* Replace tile intersection IEnumerables with TileEnumerator internally. Also made it public for external callers that wish to avoid IEnumerable.
-
-
-## 181.0.1
-
-### Bugfixes
-
-* Fix the non-generic HasComp and add a test for good measure.
-
-
-## 181.0.0
-
-### Breaking changes
-
-- Arch is merged refactoring how components are stored on engine. There's minimal changes on the API end to facilitate component nullability with much internal refactoring.
-
-
-## 180.2.1
-
-
-## 180.2.0
-
-### New features
-
-* Add EnsureEntity variants that take in collections.
-* Add more MapSystem helper methods.
-
-### Internal
-
-* Cache some more PVS data to avoid re-allocating every tick.
-
-
-## 180.1.0
-
-### New features
-
-* Add the map name to lsmap.
-* Add net.pool_size to CVars to control the message data pool size in Lidgren and to also toggle pooling.
-
-### Bugfixes
-
-* Fix physics contraints causing enormous heap allocations.
-* Fix potential error when writing a runtime log.
-* Fix shape lookups for non-hard fixtures in EntityLookupSystem from 180.0.0
-
-
-## 180.0.0
-
-### Breaking changes
-
-* Removed some obsolete methods from EntityLookupSystem.
-
-### New features
-
-* PhysicsSystem.TryGetNearest now supports chain shapes.
-* Add IPhysShape methods to EntityLookupSystem rather than relying on AABB checks.
-* Add some more helper methods to SharedTransformSystem.
-* Add GetOrNew dictionary extension that also returns a bool on whether the key existed.
-* Add a GetAnchoredEntities overload that takes in a list.
-
-### Other
-
-* Use NetEntities for the F3 debug panel to align with command usage.
-
-
-## 179.0.0
-
-### Breaking changes
-
-* EyeComponent.Eye is no longer nullable
-
-### New features
-
-* Light rendering can now be enabled or disable per eye.
-
-### Bugfixes
-
-* Deserializing old maps with empty grid chunks should now just ignore those chunks.
-
-### Other
-
-* UnknownPrototypeException now also tells you the prototype kind instead of just the unkown ID.
-* Adding or removing networked components while resetting predicted entities now results in a more informative exception.
-
-
-## 178.0.0
-
-### Breaking changes
-
-* Most methods in ActorSystem have been moved to ISharedPlayerManager. 
-* Several actor/player related components and events have been moved to shared.
-
-### New features
-
-* Added `NetListAsArray<T>.Value` to the sandbox whitelist
-
-
-## 177.0.0
-
-### Breaking changes
-
-* Removed toInsertXform and added containerXform in SharedContainerSystem.CanInsert.
-* Removed EntityQuery parameters from SharedContainerSystem.IsEntityOrParentInContainer.
-* Changed the signature of ContainsEntity in SharedTransformSystem to use Entity<T>.
-* Removed one obsoleted SharedTransformSystem.AnchorEntity method.
-* Changed signature of SharedTransformSystem.SetCoordinates to use Entity<T>.
-
-### New features
-
-* Added more Entity<T> query methods.
-* Added BeforeApplyState event to replay playback.
-
-### Bugfixes
-
-* Fixed inverted GetAllMapGrids map id check.
-* Fixed transform test warnings.
-* Fixed PlacementManager warnings.
-* Fixed reparenting bug for entities that are being deleted.
-
-### Other
-
-* Changed VerticalAlignment of RichTextLabel to Center to be consistent with Label.
-* Changed PVS error log to be a warning instead.
-* Marked insert and remove container methods as obsolete, added container system methods to replace them.
-* Marked TransformComponent.MapPosition as obsolete, added GetMapCoordinates system method to replace it.
-
-### Internal
-
-* Moved TryGetUi/TryToggleUi/ToggleUi/TryOpen/OpenUi/TryClose/CloseUi methods from UserInterfaceSystem to SharedUserInterfaceSystem.
-
-
-## 176.0.0
-
-### Breaking changes
-
-* Reverted audio rework temporarily until packaging is fixed.
-* Changes to Robust.Packaging to facilitate Content.Packaging ports from the python packaging scripts.
-
-### New features
-
-* Add a cvar for max game state buffer size.
-* Add an overload for GetEntitiesInRange that takes in a set.
-
-### Bugfixes
-
-* Fix PVS initial list capacity always being 0.
-* Fix replay lerp error spam.
-
-
-## 175.0.0
-
-### Breaking changes
-
-* Removed static SoundSystem.Play methods.
-* Moved IPlayingAudioStream onto AudioComponent and entities instead of an abstract stream.
-* IResourceCache is in shared and IClientResourceCache is the client version to use for textures.
-* Default audio attenuation changed from InverseDistanceClamped to LinearDistanceClamped.
-* Removed per-source audio attenuation.
-
-### New features
-
-* Add preliminary support for EFX Reverb presets + auxiliary slots; these are also entities.
-* Audio on grid entities is now attached to the grid.
-
-### Bugfixes
-
-* If an audio entity comes into PVS range its track will start at the relevant offset and not the beginning.
-* Z-Axis offset is considered for ReferenceDistance / MaxDistance for audio.
-* Audio will now pause if the attached entity is paused.
-
-### Other
-
-* Changed audio Z-Axis offset from -5m to -1m.
-
-
-## 174.0.0
-
-### Breaking changes
-
-* ActorComponent has been moved to `Robust.Shared.Player` (namespace changed).
-
-### New features
-
-* Added `SpriteSystem.GetFrame()` method, which takes in an animated RSI and a time and returns a frame/texture.
-* Added `IRobustRandom.NextAngle()`
-
-
-## 173.1.0
-
-### New features
-
-* Add physics chain shapes from Box2D.
-
-
-## 173.0.0
-
-### Breaking changes
-
-* Remove GridModifiedEvent in favor of TileChangedEvent.
-
-### Bugfixes
-
-* Fix some grid rendering bugs where chunks don't get destroyed correctly.
-
-
-## 172.0.0
-
-### Breaking changes
-
-* Remove TryLifestage helper methods.
-* Refactor IPlayerManager to remove more IPlayerSession, changed PlayerAttachedEvent etc on client to have the Local prefix, and shuffled namespaces around.
-
-### New features
-
-* Add EnsureComponent(ref Entity<\T?>)
-
-### Bugfixes
-
-* Re-add force ask threshold and fix other PVS bugs.
-
-
-## 171.0.0
-
-### Breaking changes
-
-* Change PlaceNextTo method names to be more descriptive.
-* Rename RefreshRelay for joints to SetRelay to match its behaviour.
-
-### Bugfixes
-
-* Fix PVS error spam for joint relays not being cleaned up.
-
-### Other
-
-* Set EntityLastModifiedTick on entity spawn.
-
-
-## 170.0.0
-
-### Breaking changes
-
-* Removed obsolete methods and properties in VisibilitySystem, SharedContainerSystem and MetaDataComponent.
-
-### Bugfixes
-
-* Fixed duplicate command error.
-* Fixed not being able to delete individual entities with the delete command.
-
-### Other
-
-* FileLogHandler logs can now be deleted while the engine is running.
-
-
-## 169.0.1
-
-### Other
-
-* The client now knows about registered server-side toolshed commands.
-
-## 169.0.0
-
-### Breaking changes
-
-* Entity<T> has been introduced to hold a component and its owning entity. Some methods that returned and accepted components directly have been removed or obsoleted to reflect this.
-
-### Other
-
-* By-value events may now be subscribed to by-ref.
-* The manifest's assemblyPrefix value is now respected on the server.
-
-
-## 168.0.0
-
-### Breaking changes
-
-* The Component.OnRemove method has been removed. Use SubscribeLocalEvent<TComp, ComponentRemove>(OnRemove) from an EntitySystem instead.
-
-
-## 167.0.0
-
-### Breaking changes
-
-* Remove ComponentExtensions.
-* Remove ContainerHelpers.
-* Change some TransformSystem methods to fix clientside lerping.
-
-### Bugfixes
-
-* Fixed PVS bugs from dropped entity states.
-
-### Other
-
-* Add more joint debug asserts.
-
-
-## 166.0.0
-
-### Breaking changes
-
-* EntityUid-NetEntity conversion methods now return null when given a null value, rather than returning an invalid id.
-* ExpandPvsEvent now defaults to using null lists to reduce allocations.
-* Various component lifestage related methods have been moved from the `Component` class to `EntityManager`.
-* Session/client specific PVS overrides are now always recursive, which means that all children of the overriden entity will also get sent.
-
-### New features
-
-* Added a SortedSet yaml serializer.
-
-### Other
-
-* AddComponentUninitialized is now marked as obsolete and will be removed in the future.
-* DebugTools.AssertOwner() now accepts null components.
-
-
-## 165.0.0
-
-### Breaking changes
-
-* The arguments of `SplitContainer`s resize-finished event have changed.
-
-### New features
-
-* The YAML validator now checks the default values of ProtoId<T> and EntProtoId data fields.
-
-### Bugfixes
-
-* The minimum draggable area of split containers now blocks mouse inputs.
-
-
-## 164.0.0
-
-### Breaking changes
-
-* Make automatic component states infer cloneData.
-* Removed cloneData from AutoNetworkedFieldAttribute. This is now automatically inferred.
-
-### Internal
-
-* Reduce Transform GetComponents in RecursiveDeleteEntity.
-
-
-## 163.0.0
-
-### Breaking changes
-
-* Moved TimedDespawn to engine for a component that deletes the attached entity after a timer has elapsed.
-
-### New features
-
-* Add ExecuteCommand for integration tests.
-* Allow adding / removing widgets of cub-controls.
-* Give maps / grids a default name to help with debugging.
-* Use ToPrettyString in component resolve errors to help with debugging.
-
-### Bugfixes
-
-* Fix console backspace exception.
-* Fix rendering invalid maps spamming exceptions every frame.
-
-### Internal
-
-* Move ClientGameStatemanager local variables to fields to avoid re-allocating every tick.
+## 162.2.2
 
 
 ## 162.2.1

Resources/EnginePrototypes/Audio/audio_entities.yml

@@ -1,5 +0,0 @@
-- type: entity
-  id: Audio
-  name: Audio
-  description: Audio entity used by engine
-  save: false

Resources/Locale/en-US/commands.ftl

@@ -17,15 +17,15 @@ cmd-error-dir-not-found = Could not find directory: {$dir}.
 cmd-failure-no-attached-entity = There is no entity attached to this shell.
 
 ## 'help' command
-cmd-help-desc = Display general help or help text for a specific command
-cmd-help-help = Usage: help [command name]
+cmd-oldhelp-desc = Display general help or help text for a specific command
+cmd-oldhelp-help = Usage: help [command name]
     When no command name is provided, displays general-purpose help text. If a command name is provided, displays help text for that command.
 
-cmd-help-no-args = To display help for a specific command, write 'help <command>'. To list all available commands, write 'list'. To search for commands, use 'list <filter>'.
-cmd-help-unknown = Unknown command: { $command }
-cmd-help-top = { $command } - { $description }
-cmd-help-invalid-args = Invalid amount of arguments.
-cmd-help-arg-cmdname = [command name]
+cmd-oldhelp-no-args = To display help for a specific command, write 'help <command>'. To list all available commands, write 'list'. To search for commands, use 'list <filter>'.
+cmd-oldhelp-unknown = Unknown command: { $command }
+cmd-oldhelp-top = { $command } - { $description }
+cmd-oldhelp-invalid-args = Invalid amount of arguments.
+cmd-oldhelp-arg-cmdname = [command name]
 
 ## 'cvar' command
 cmd-cvar-desc = Gets or sets a CVar.
@@ -561,7 +561,3 @@ cmd-vfs_ls-hint-path = <path>
 
 cmd-reloadtiletextures-desc = Reloads the tile texture atlas to allow hot reloading tile sprites
 cmd-reloadtiletextures-help = Usage: reloadtiletextures
-
-cmd-audio_length-desc = Shows the length of an audio file
-cmd-audio_length-help = Usage: audio_length { cmd-audio_length-arg-file-name }
-cmd-audio_length-arg-file-name = <file name>

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -23,6 +23,16 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
         "Make sure that methods subscribing to a ref event have the ref keyword for the event argument."
     );
 
+    private static readonly DiagnosticDescriptor ByValueEventSubscribedByRefRule = new(
+        Diagnostics.IdValueEventRaisedByRef,
+        "Value event subscribed to by-ref",
+        "Tried to subscribe to a value event '{0}' by-ref.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure that methods subscribing to value events do not have the ref keyword for the event argument."
+    );
+
     private static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
         Diagnostics.IdByRefEventRaisedByValue,
         "By-ref event raised by value",
@@ -45,6 +55,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
 
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
         ByRefEventSubscribedByValueRule,
+        ByValueEventSubscribedByRefRule,
         ByRefEventRaisedByValueRule,
         ByValueEventRaisedByRefRule
     );
@@ -53,9 +64,71 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     {
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
         context.EnableConcurrentExecution();
+        context.RegisterOperationAction(CheckEventSubscription, OperationKind.Invocation);
         context.RegisterOperationAction(CheckEventRaise, OperationKind.Invocation);
     }
 
+    private void CheckEventSubscription(OperationAnalysisContext context)
+    {
+        if (context.Operation is not IInvocationOperation operation)
+            return;
+
+        var subscribeMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("SubscribeLocalEvent"))
+            .Cast<IMethodSymbol>();
+
+        if (subscribeMethods == null)
+            return;
+
+        if (!subscribeMethods.Any(m => m.Equals(operation.TargetMethod.OriginalDefinition, Default)))
+            return;
+
+        var typeArguments = operation.TargetMethod.TypeArguments;
+        if (typeArguments.Length < 1 || typeArguments.Length > 2)
+            return;
+
+        if (operation.Arguments.First().Value is not IDelegateCreationOperation delegateCreation)
+            return;
+
+        if (delegateCreation.Target is not IMethodReferenceOperation methodReference)
+            return;
+
+        var eventParameter = methodReference.Method.Parameters.LastOrDefault();
+        if (eventParameter == null)
+            return;
+
+        ITypeSymbol eventArgument;
+        switch (typeArguments.Length)
+        {
+            case 1:
+                eventArgument = typeArguments[0];
+                break;
+            case 2:
+                eventArgument = typeArguments[1];
+                break;
+            default:
+                return;
+        }
+
+        var byRefAttribute = context.Compilation.GetTypeByMetadataName(ByRefAttribute);
+        if (byRefAttribute == null)
+            return;
+
+        var isByRefEventType = eventArgument
+            .GetAttributes()
+            .Any(attribute => attribute.AttributeClass?.Equals(byRefAttribute, Default) ?? false);
+        var parameterIsRef = eventParameter.RefKind == RefKind.Ref;
+
+        if (isByRefEventType != parameterIsRef)
+        {
+            var descriptor = isByRefEventType ? ByRefEventSubscribedByValueRule : ByValueEventSubscribedByRefRule;
+            var diagnostic = Diagnostic.Create(descriptor, operation.Syntax.GetLocation(), eventArgument);
+            context.ReportDiagnostic(diagnostic);
+        }
+    }
+
     private void CheckEventRaise(OperationAnalysisContext context)
     {
         if (context.Operation is not IInvocationOperation operation)

Robust.Analyzers/Diagnostics.cs

@@ -18,6 +18,7 @@ public static class Diagnostics
     public const string IdInvalidNotNullableFlagType = "RA0011";
     public const string IdNotNullableFlagValueType = "RA0012";
     public const string IdByRefEventSubscribedByValue = "RA0013";
+    public const string IdValueEventSubscribedByRef = "RA0014";
     public const string IdByRefEventRaisedByValue = "RA0015";
     public const string IdValueEventRaisedByRef = "RA0016";
     public const string IdDataDefinitionPartial = "RA0017";

Robust.Benchmarks/Transform/RecursiveMoveBenchmark.cs

@@ -54,7 +54,7 @@ public class RecursiveMoveBenchmark
         var mapSys = _entMan.System<SharedMapSystem>();
         var mapId = mapMan.CreateMap();
         var map = mapMan.GetMapEntityId(mapId);
-        var gridComp = mapMan.CreateGridEntity(mapId);
+        var gridComp = mapMan.CreateGrid(mapId);
         var grid = gridComp.Owner;
         _gridCoords = new EntityCoordinates(grid, .5f, .5f);
         _mapCoords = new EntityCoordinates(map, 100, 100);

Robust.Client/Animations/AnimationTrackPlaySound.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using Robust.Client.Audio;
 using Robust.Client.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Player;
 
 namespace Robust.Client.Animations
@@ -39,12 +37,7 @@ namespace Robust.Client.Animations
 
                 var keyFrame = KeyFrames[keyFrameIndex];
 
-                var audioParams = keyFrame.AudioParamsFunc.Invoke();
-                var audio = new SoundPathSpecifier(keyFrame.Resource)
-                {
-                    Params = audioParams
-                };
-                IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AudioSystem>().PlayEntity(audio, Filter.Local(), entity, true);
+                SoundSystem.Play(keyFrame.Resource, Filter.Local(), entity, keyFrame.AudioParamsFunc.Invoke());
             }
 
             return (keyFrameIndex, playingTime);

Robust.Client/Audio/AudioManager.ALDisposeQueues.cs

@@ -1,58 +0,0 @@
-using System.Collections.Concurrent;
-using OpenTK.Audio.OpenAL;
-
-namespace Robust.Client.Audio;
-
-internal partial class AudioManager
-{
-    // Used to track audio sources that were disposed in the finalizer thread,
-    // so we need to properly send them off in the main thread.
-    private readonly ConcurrentQueue<(int sourceHandle, int filterHandle)> _sourceDisposeQueue = new();
-    private readonly ConcurrentQueue<(int sourceHandle, int filterHandle)> _bufferedSourceDisposeQueue = new();
-    private readonly ConcurrentQueue<int> _bufferDisposeQueue = new();
-
-    public void FlushALDisposeQueues()
-    {
-        // Clear out finalized audio sources.
-        while (_sourceDisposeQueue.TryDequeue(out var handles))
-        {
-            OpenALSawmill.Debug("Cleaning out source {0} which finalized in another thread.", handles.sourceHandle);
-            if (IsEfxSupported) RemoveEfx(handles);
-            AL.DeleteSource(handles.sourceHandle);
-            _checkAlError();
-            _audioSources.Remove(handles.sourceHandle);
-        }
-
-        // Clear out finalized buffered audio sources.
-        while (_bufferedSourceDisposeQueue.TryDequeue(out var handles))
-        {
-            OpenALSawmill.Debug("Cleaning out buffered source {0} which finalized in another thread.", handles.sourceHandle);
-            if (IsEfxSupported) RemoveEfx(handles);
-            AL.DeleteSource(handles.sourceHandle);
-            _checkAlError();
-            _bufferedAudioSources.Remove(handles.sourceHandle);
-        }
-
-        // Clear out finalized audio buffers.
-        while (_bufferDisposeQueue.TryDequeue(out var handle))
-        {
-            AL.DeleteBuffer(handle);
-            _checkAlError();
-        }
-    }
-
-    internal void DeleteSourceOnMainThread(int sourceHandle, int filterHandle)
-    {
-        _sourceDisposeQueue.Enqueue((sourceHandle, filterHandle));
-    }
-
-    internal void DeleteBufferedSourceOnMainThread(int bufferedSourceHandle, int filterHandle)
-    {
-        _bufferedSourceDisposeQueue.Enqueue((bufferedSourceHandle, filterHandle));
-    }
-
-    internal void DeleteAudioBufferOnMainThread(int bufferHandle)
-    {
-        _bufferDisposeQueue.Enqueue(bufferHandle);
-    }
-}

Robust.Client/Audio/AudioManager.Public.cs

@@ -1,339 +0,0 @@
-using System;
-using System.IO;
-using System.Numerics;
-using System.Threading;
-using OpenTK.Audio.OpenAL;
-using Robust.Client.Audio.Sources;
-using Robust.Client.Graphics;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.AudioLoading;
-using Robust.Shared.Audio.Sources;
-using Robust.Shared.Maths;
-
-namespace Robust.Client.Audio;
-
-internal partial class AudioManager
-{
-    private float _zOffset;
-
-    public void SetZOffset(float offset)
-    {
-        _zOffset = offset;
-    }
-
-    /// <inheritdoc />
-    public float GetAttenuationGain(float distance, float rolloffFactor, float referenceDistance, float maxDistance)
-    {
-        switch (_attenuation)
-        {
-            case Attenuation.LinearDistance:
-                return 1 - rolloffFactor * (distance - referenceDistance) / (maxDistance - referenceDistance);
-            case Attenuation.LinearDistanceClamped:
-                distance = MathF.Max(referenceDistance, MathF.Min(distance, maxDistance));
-                return 1 - rolloffFactor * (distance - referenceDistance) / (maxDistance - referenceDistance);
-            default:
-                // TODO: If you see this you can implement
-                throw new NotImplementedException();
-        }
-    }
-
-    public void InitializePostWindowing()
-    {
-        _gameThread = Thread.CurrentThread;
-        InitializeAudio();
-    }
-
-    public void Shutdown()
-    {
-        DisposeAllAudio();
-
-        if (_openALContext != ALContext.Null)
-        {
-            ALC.MakeContextCurrent(ALContext.Null);
-
-            ALC.DestroyContext(_openALContext);
-        }
-
-        if (_openALDevice != IntPtr.Zero)
-        {
-            ALC.CloseDevice(_openALDevice);
-        }
-    }
-
-    /// <inheritdoc/>
-    public void SetPosition(Vector2 position)
-    {
-        AL.Listener(ALListener3f.Position, position.X, position.Y, _zOffset);
-    }
-
-    /// <inheritdoc/>
-    public void SetRotation(Angle angle)
-    {
-        var vec = angle.ToVec();
-
-        // Default orientation: at: (0, 0, -1)  up: (0, 1, 0)
-        var at = new OpenTK.Mathematics.Vector3(0f, 0f, -1f);
-        var up = new OpenTK.Mathematics.Vector3(vec.Y, vec.X, 0f);
-        AL.Listener(ALListenerfv.Orientation, new []{0, 0, -1, vec.X, vec.Y, 0});
-        AL.Listener(ALListenerfv.Orientation, ref at, ref up);
-    }
-
-    /// <inheritdoc/>
-    public AudioStream LoadAudioOggVorbis(Stream stream, string? name = null)
-    {
-        var vorbis = AudioLoaderOgg.LoadAudioData(stream);
-
-        var buffer = AL.GenBuffer();
-
-        ALFormat format;
-        // NVorbis only supports loading into floats.
-        // If this becomes a problem due to missing extension support (doubt it but ok),
-        // check the git history, I originally used libvorbisfile which worked and loaded 16 bit LPCM.
-        if (vorbis.Channels == 1)
-        {
-            format = ALFormat.MonoFloat32Ext;
-        }
-        else if (vorbis.Channels == 2)
-        {
-            format = ALFormat.StereoFloat32Ext;
-        }
-        else
-        {
-            throw new InvalidOperationException("Unable to load audio with more than 2 channels.");
-        }
-
-        unsafe
-        {
-            fixed (float* ptr = vorbis.Data.Span)
-            {
-                AL.BufferData(buffer, format, (IntPtr) ptr, vorbis.Data.Length * sizeof(float),
-                    (int) vorbis.SampleRate);
-            }
-        }
-
-        _checkAlError();
-
-        var handle = new ClydeHandle(_audioSampleBuffers.Count);
-        _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
-        var length = TimeSpan.FromSeconds(vorbis.TotalSamples / (double) vorbis.SampleRate);
-        return new AudioStream(handle, length, (int) vorbis.Channels, name, vorbis.Title, vorbis.Artist);
-    }
-
-    /// <inheritdoc/>
-    public AudioStream LoadAudioWav(Stream stream, string? name = null)
-    {
-        var wav = AudioLoaderWav.LoadAudioData(stream);
-
-        var buffer = AL.GenBuffer();
-
-        ALFormat format;
-        if (wav.BitsPerSample == 16)
-        {
-            if (wav.NumChannels == 1)
-            {
-                format = ALFormat.Mono16;
-            }
-            else if (wav.NumChannels == 2)
-            {
-                format = ALFormat.Stereo16;
-            }
-            else
-            {
-                throw new InvalidOperationException("Unable to load audio with more than 2 channels.");
-            }
-        }
-        else if (wav.BitsPerSample == 8)
-        {
-            if (wav.NumChannels == 1)
-            {
-                format = ALFormat.Mono8;
-            }
-            else if (wav.NumChannels == 2)
-            {
-                format = ALFormat.Stereo8;
-            }
-            else
-            {
-                throw new InvalidOperationException("Unable to load audio with more than 2 channels.");
-            }
-        }
-        else
-        {
-            throw new InvalidOperationException("Unable to load wav with bits per sample different from 8 or 16");
-        }
-
-        unsafe
-        {
-            fixed (byte* ptr = wav.Data.Span)
-            {
-                AL.BufferData(buffer, format, (IntPtr) ptr, wav.Data.Length, wav.SampleRate);
-            }
-        }
-
-        _checkAlError();
-
-        var handle = new ClydeHandle(_audioSampleBuffers.Count);
-        _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
-        var length = TimeSpan.FromSeconds(wav.Data.Length / (double) wav.BlockAlign / wav.SampleRate);
-        return new AudioStream(handle, length, wav.NumChannels, name);
-    }
-
-    /// <inheritdoc/>
-    public AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null)
-    {
-        var fmt = channels switch
-        {
-            1 => ALFormat.Mono16,
-            2 => ALFormat.Stereo16,
-            _ => throw new ArgumentOutOfRangeException(
-                nameof(channels), "Only stereo and mono is currently supported")
-        };
-
-        var buffer = AL.GenBuffer();
-        _checkAlError();
-
-        unsafe
-        {
-            fixed (short* ptr = samples)
-            {
-                AL.BufferData(buffer, fmt, (IntPtr) ptr, samples.Length * sizeof(short), sampleRate);
-            }
-        }
-
-        _checkAlError();
-
-        var handle = new ClydeHandle(_audioSampleBuffers.Count);
-        var length = TimeSpan.FromSeconds((double) samples.Length / channels / sampleRate);
-        _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
-        return new AudioStream(handle, length, channels, name);
-    }
-
-    public void SetMasterVolume(float newVolume)
-    {
-        AL.Listener(ALListenerf.Gain, newVolume);
-    }
-
-    public void SetAttenuation(Attenuation attenuation)
-    {
-        switch (attenuation)
-        {
-            case Attenuation.NoAttenuation:
-                AL.DistanceModel(ALDistanceModel.None);
-                break;
-            case Attenuation.InverseDistance:
-                AL.DistanceModel(ALDistanceModel.InverseDistance);
-                break;
-            case Attenuation.InverseDistanceClamped:
-                AL.DistanceModel(ALDistanceModel.InverseDistanceClamped);
-                break;
-            case Attenuation.LinearDistance:
-                AL.DistanceModel(ALDistanceModel.LinearDistance);
-                break;
-            case Attenuation.LinearDistanceClamped:
-                AL.DistanceModel(ALDistanceModel.LinearDistanceClamped);
-                break;
-            case Attenuation.ExponentDistance:
-                AL.DistanceModel(ALDistanceModel.ExponentDistance);
-                break;
-            case Attenuation.ExponentDistanceClamped:
-                AL.DistanceModel(ALDistanceModel.ExponentDistanceClamped);
-                break;
-            default:
-                throw new ArgumentOutOfRangeException($"No implementation to set {attenuation.ToString()} for DistanceModel!");
-        }
-
-        _attenuation = attenuation;
-        OpenALSawmill.Info($"Set audio attenuation to {attenuation.ToString()}");
-    }
-
-    internal void RemoveAudioSource(int handle)
-    {
-        _audioSources.Remove(handle);
-    }
-
-    internal void RemoveBufferedAudioSource(int handle)
-    {
-        _bufferedAudioSources.Remove(handle);
-    }
-
-    public IAudioSource? CreateAudioSource(AudioStream stream)
-    {
-        var source = AL.GenSource();
-
-        if (!AL.IsSource(source))
-        {
-            OpenALSawmill.Error("Failed to generate source. Too many simultaneous audio streams? {0}", Environment.StackTrace);
-            return null;
-        }
-
-        // ReSharper disable once PossibleInvalidOperationException
-        // TODO: This really shouldn't be indexing based on the ClydeHandle...
-        AL.Source(source, ALSourcei.Buffer, _audioSampleBuffers[(int) stream.ClydeHandle!.Value].BufferHandle);
-
-        var audioSource = new AudioSource(this, source, stream);
-        _audioSources.Add(source, new WeakReference<BaseAudioSource>(audioSource));
-        return audioSource;
-    }
-
-    public IBufferedAudioSource CreateBufferedAudioSource(int buffers, bool floatAudio=false)
-    {
-        var source = AL.GenSource();
-
-        if (!AL.IsSource(source))
-        {
-            OpenALSawmill.Error("Failed to generate source. Too many simultaneous audio streams? {0}", Environment.StackTrace);
-        }
-
-        // ReSharper disable once PossibleInvalidOperationException
-
-        var audioSource = new BufferedAudioSource(this, source, AL.GenBuffers(buffers), floatAudio);
-        _bufferedAudioSources.Add(source, new WeakReference<BufferedAudioSource>(audioSource));
-        return audioSource;
-    }
-
-    /// <inheritdoc />
-    public void StopAllAudio()
-    {
-        foreach (var source in _audioSources.Values)
-        {
-            if (source.TryGetTarget(out var target))
-            {
-                target.Playing = false;
-            }
-        }
-
-        foreach (var source in _bufferedAudioSources.Values)
-        {
-            if (source.TryGetTarget(out var target))
-            {
-                target.Playing = false;
-            }
-        }
-    }
-
-    public void DisposeAllAudio()
-    {
-        // TODO: Do we even need to stop?
-        foreach (var source in _audioSources.Values)
-        {
-            if (source.TryGetTarget(out var target))
-            {
-                target.Playing = false;
-                target.Dispose();
-            }
-        }
-
-        _audioSources.Clear();
-
-        foreach (var source in _bufferedAudioSources.Values)
-        {
-            if (source.TryGetTarget(out var target))
-            {
-                target.Playing = false;
-                target.Dispose();
-            }
-        }
-
-        _bufferedAudioSources.Clear();
-    }
-}

Robust.Client/Audio/AudioManager.cs

@@ -1,161 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using OpenTK.Audio.OpenAL;
-using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
-using Robust.Client.Audio.Sources;
-using Robust.Shared;
-using Robust.Shared.Audio;
-using Robust.Shared.Configuration;
-using Robust.Shared.Log;
-using Robust.Shared.Utility;
-
-namespace Robust.Client.Audio;
-
-internal sealed partial class AudioManager : IAudioInternal
-{
-    [Shared.IoC.Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Shared.IoC.Dependency] private readonly ILogManager _logMan = default!;
-
-    private Thread? _gameThread;
-
-    private ALDevice _openALDevice;
-    private ALContext _openALContext;
-
-    private readonly List<LoadedAudioSample> _audioSampleBuffers = new();
-
-    private readonly Dictionary<int, WeakReference<BaseAudioSource>> _audioSources =
-        new();
-
-    private readonly Dictionary<int, WeakReference<BufferedAudioSource>> _bufferedAudioSources =
-        new();
-
-    private readonly HashSet<string> _alcDeviceExtensions = new();
-    private readonly HashSet<string> _alContextExtensions = new();
-    private Attenuation _attenuation;
-
-    public bool HasAlDeviceExtension(string extension) => _alcDeviceExtensions.Contains(extension);
-    public bool HasAlContextExtension(string extension) => _alContextExtensions.Contains(extension);
-
-    internal bool IsEfxSupported;
-
-    internal ISawmill OpenALSawmill = default!;
-
-    private void _audioCreateContext()
-    {
-        unsafe
-        {
-            _openALContext = ALC.CreateContext(_openALDevice, (int*) 0);
-        }
-
-        ALC.MakeContextCurrent(_openALContext);
-        _checkAlcError(_openALDevice);
-        _checkAlError();
-
-        // Load up AL context extensions.
-        var s = ALC.GetString(ALDevice.Null, AlcGetString.Extensions) ?? "";
-        foreach (var extension in s.Split(' '))
-        {
-            _alContextExtensions.Add(extension);
-        }
-
-        OpenALSawmill.Debug("OpenAL Vendor: {0}", AL.Get(ALGetString.Vendor));
-        OpenALSawmill.Debug("OpenAL Renderer: {0}", AL.Get(ALGetString.Renderer));
-        OpenALSawmill.Debug("OpenAL Version: {0}", AL.Get(ALGetString.Version));
-    }
-
-    private bool _audioOpenDevice()
-    {
-        var preferredDevice = _cfg.GetCVar(CVars.AudioDevice);
-
-        // Open device.
-        if (!string.IsNullOrEmpty(preferredDevice))
-        {
-            _openALDevice = ALC.OpenDevice(preferredDevice);
-            if (_openALDevice == IntPtr.Zero)
-            {
-                OpenALSawmill.Warning("Unable to open preferred audio device '{0}': {1}. Falling back default.",
-                    preferredDevice, ALC.GetError(ALDevice.Null));
-
-                _openALDevice = ALC.OpenDevice(null);
-            }
-        }
-        else
-        {
-            _openALDevice = ALC.OpenDevice(null);
-        }
-
-        _checkAlcError(_openALDevice);
-
-        if (_openALDevice == IntPtr.Zero)
-        {
-            OpenALSawmill.Error("Unable to open OpenAL device! {1}", ALC.GetError(ALDevice.Null));
-            return false;
-        }
-
-        // Load up ALC extensions.
-        var s = ALC.GetString(_openALDevice, AlcGetString.Extensions) ?? "";
-        foreach (var extension in s.Split(' '))
-        {
-            _alcDeviceExtensions.Add(extension);
-        }
-        return true;
-    }
-
-    private void InitializeAudio()
-    {
-        OpenALSawmill = _logMan.GetSawmill("clyde.oal");
-
-        if (!_audioOpenDevice())
-            return;
-
-        // Create OpenAL context.
-        _audioCreateContext();
-
-        IsEfxSupported = HasAlDeviceExtension("ALC_EXT_EFX");
-
-        _cfg.OnValueChanged(CVars.AudioMasterVolume, SetMasterVolume, true);
-    }
-
-    internal bool IsMainThread()
-    {
-        return Thread.CurrentThread == _gameThread;
-    }
-
-    private static void RemoveEfx((int sourceHandle, int filterHandle) handles)
-    {
-        if (handles.filterHandle != 0)
-            EFX.DeleteFilter(handles.filterHandle);
-    }
-
-    private void _checkAlcError(ALDevice device,
-        [CallerMemberName] string callerMember = "",
-        [CallerLineNumber] int callerLineNumber = -1)
-    {
-        var error = ALC.GetError(device);
-        if (error != AlcError.NoError)
-        {
-            OpenALSawmill.Error("[{0}:{1}] ALC error: {2}", callerMember, callerLineNumber, error);
-        }
-    }
-
-    public void _checkAlError([CallerMemberName] string callerMember = "", [CallerLineNumber] int callerLineNumber = -1)
-    {
-        var error = AL.GetError();
-        if (error != ALError.NoError)
-        {
-            OpenALSawmill.Error("[{0}:{1}] AL error: {2}", callerMember, callerLineNumber, error);
-        }
-    }
-
-    private sealed class LoadedAudioSample
-    {
-        public readonly int BufferHandle;
-
-        public LoadedAudioSample(int bufferHandle)
-        {
-            BufferHandle = bufferHandle;
-        }
-    }
-}

Robust.Client/Audio/AudioOverlay.cs

@@ -1,89 +0,0 @@
-using System.Numerics;
-using System.Text;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Player;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.Audio;
-using Robust.Shared.Enums;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using AudioComponent = Robust.Shared.Audio.Components.AudioComponent;
-
-namespace Robust.Client.Audio;
-
-/// <summary>
-/// Debug overlay for audio.
-/// </summary>
-public sealed class AudioOverlay : Overlay
-{
-    public override OverlaySpace Space => OverlaySpace.ScreenSpace;
-
-    private IEntityManager _entManager;
-    private IPlayerManager _playerManager;
-    private AudioSystem _audio;
-    private SharedTransformSystem _transform;
-
-    private Font _font;
-
-    public AudioOverlay(IEntityManager entManager, IPlayerManager playerManager, IResourceCache cache, AudioSystem audio, SharedTransformSystem transform)
-    {
-        _entManager = entManager;
-        _playerManager = playerManager;
-        _audio = audio;
-        _transform = transform;
-
-        _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
-    }
-
-    protected internal override void Draw(in OverlayDrawArgs args)
-    {
-        var localPlayer = _playerManager.LocalPlayer?.ControlledEntity;
-
-        if (args.ViewportControl == null || localPlayer == null)
-            return;
-
-        var screenHandle = args.ScreenHandle;
-        var output = new StringBuilder();
-        var listenerPos = _entManager.GetComponent<TransformComponent>(localPlayer.Value).MapPosition;
-
-        if (listenerPos.MapId != args.MapId)
-            return;
-
-        var query = _entManager.AllEntityQueryEnumerator<AudioComponent>();
-
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            var mapId = MapId.Nullspace;
-            var audioPos = Vector2.Zero;
-
-            if (_entManager.TryGetComponent<TransformComponent>(uid, out var xform))
-            {
-                mapId = xform.MapID;
-                audioPos = _transform.GetWorldPosition(uid);
-            }
-
-            if (mapId != args.MapId)
-                continue;
-
-            var screenPos = args.ViewportControl.WorldToScreen(audioPos);
-            var distance = audioPos - listenerPos.Position;
-            var posOcclusion = _audio.GetOcclusion(listenerPos, distance, distance.Length(), uid);
-
-            output.Clear();
-            output.AppendLine("Audio Source");
-            output.AppendLine("Runtime:");
-            output.AppendLine($"- Occlusion: {posOcclusion:0.0000}");
-            output.AppendLine("Params:");
-            output.AppendLine($"- Volume: {comp.Volume:0.0000}");
-            output.AppendLine($"- Reference distance: {comp.ReferenceDistance}");
-            output.AppendLine($"- Max distance: {comp.MaxDistance}");
-            var outputText = output.ToString().Trim();
-            var dimensions = screenHandle.GetDimensions(_font, outputText, 1f);
-            var buffer = new Vector2(3f, 3f);
-            screenHandle.DrawRect(new UIBox2(screenPos - buffer, screenPos + dimensions + buffer), new Color(39, 39, 48));
-            screenHandle.DrawString(_font, screenPos, outputText);
-        }
-    }
-}

Robust.Client/Audio/AudioStream.cs

@@ -1,21 +1,18 @@
 using System;
-using Robust.Shared.Graphics;
+using Robust.Client.Graphics;
 
 namespace Robust.Client.Audio;
 
-/// <summary>
-/// Has the metadata for a particular audio stream as well as the relevant internal handle to it.
-/// </summary>
 public sealed class AudioStream
 {
     public TimeSpan Length { get; }
-    internal IClydeHandle? ClydeHandle { get; }
+    internal ClydeHandle? ClydeHandle { get; }
     public string? Name { get; }
     public string? Title { get; }
     public string? Artist { get; }
     public int ChannelCount { get; }
 
-    internal AudioStream(IClydeHandle? handle, TimeSpan length, int channelCount, string? name = null, string? title = null, string? artist = null)
+    internal AudioStream(ClydeHandle handle, TimeSpan length, int channelCount, string? name = null, string? title = null, string? artist = null)
     {
         ClydeHandle = handle;
         Length = length;

Robust.Client/Audio/AudioSystem.Effects.cs

@@ -1,76 +0,0 @@
-using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
-using Robust.Client.Audio.Effects;
-using Robust.Shared.Audio.Components;
-using Robust.Shared.GameObjects;
-
-namespace Robust.Client.Audio;
-
-public sealed partial class AudioSystem
-{
-    protected override void InitializeEffect()
-    {
-        base.InitializeEffect();
-        SubscribeLocalEvent<AudioEffectComponent, ComponentAdd>(OnEffectAdd);
-        SubscribeLocalEvent<AudioEffectComponent, ComponentShutdown>(OnEffectShutdown);
-
-        SubscribeLocalEvent<AudioAuxiliaryComponent, ComponentAdd>(OnAuxiliaryAdd);
-        SubscribeLocalEvent<AudioAuxiliaryComponent, AfterAutoHandleStateEvent>(OnAuxiliaryAuto);
-    }
-
-    private void OnEffectAdd(EntityUid uid, AudioEffectComponent component, ComponentAdd args)
-    {
-        var effect = new AudioEffect(_audio);
-        component.Effect = effect;
-    }
-
-    private void OnEffectShutdown(EntityUid uid, AudioEffectComponent component, ComponentShutdown args)
-    {
-        if (component.Effect is AudioEffect effect)
-        {
-            effect.Dispose();
-        }
-    }
-
-    private void OnAuxiliaryAdd(EntityUid uid, AudioAuxiliaryComponent component, ComponentAdd args)
-    {
-        component.Auxiliary = new AuxiliaryAudio();
-    }
-
-    private void OnAuxiliaryAuto(EntityUid uid, AudioAuxiliaryComponent component, ref AfterAutoHandleStateEvent args)
-    {
-        if (TryComp<AudioEffectComponent>(component.Effect, out var effectComp))
-        {
-            component.Auxiliary.SetEffect(effectComp.Effect);
-        }
-        else
-        {
-            component.Auxiliary.SetEffect(null);
-        }
-    }
-
-    public override void SetAuxiliary(EntityUid uid, AudioComponent audio, EntityUid? auxUid)
-    {
-        base.SetAuxiliary(uid, audio, auxUid);
-        if (TryComp<AudioAuxiliaryComponent>(audio.Auxiliary, out var auxComp))
-        {
-            audio.Source.SetAuxiliary(auxComp.Auxiliary);
-        }
-        else
-        {
-            audio.Source.SetAuxiliary(null);
-        }
-    }
-
-    public override void SetEffect(EntityUid auxUid, AudioAuxiliaryComponent aux, EntityUid? effectUid)
-    {
-        base.SetEffect(auxUid, aux, effectUid);
-        if (TryComp<AudioEffectComponent>(aux.Effect, out var effectComp))
-        {
-            aux.Auxiliary.SetEffect(effectComp.Effect);
-        }
-        else
-        {
-            aux.Auxiliary.SetEffect(null);
-        }
-    }
-}

Robust.Client/Audio/AudioSystem.cs

@@ -1,609 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Numerics;
-using System.Threading.Tasks;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Shared;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Components;
-using Robust.Shared.Audio.Sources;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Exceptions;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
-using Robust.Shared.Replays;
-using Robust.Shared.Threading;
-using Robust.Shared.Utility;
-using AudioComponent = Robust.Shared.Audio.Components.AudioComponent;
-
-namespace Robust.Client.Audio;
-
-public sealed partial class AudioSystem : SharedAudioSystem
-{
-    /*
-     * There's still a lot more OpenAL can do in terms of filters, auxiliary slots, etc.
-     * but exposing the whole thing in an easy way is a lot of effort.
-     */
-
-    [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
-    [Dependency] private readonly IEyeManager _eyeManager = default!;
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    [Dependency] private readonly IParallelManager _parMan = default!;
-    [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
-    [Dependency] private readonly IAudioInternal _audio = default!;
-    [Dependency] private readonly SharedTransformSystem _xformSys = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-
-    /// <summary>
-    /// Per-tick cache of relevant streams.
-    /// </summary>
-    private readonly List<(EntityUid Entity, AudioComponent Component, TransformComponent Xform)> _streams = new();
-    private EntityUid? _listenerGrid;
-
-    private EntityQuery<MapGridComponent> _gridQuery;
-    private EntityQuery<PhysicsComponent> _physicsQuery;
-    private EntityQuery<TransformComponent> _xformQuery;
-
-    private float _maxRayLength;
-
-    /// <inheritdoc />
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        UpdatesOutsidePrediction = true;
-        // Need to run after Eye updates so we have an accurate listener position.
-        UpdatesAfter.Add(typeof(EyeSystem));
-
-        _gridQuery = GetEntityQuery<MapGridComponent>();
-        _physicsQuery = GetEntityQuery<PhysicsComponent>();
-        _xformQuery = GetEntityQuery<TransformComponent>();
-
-        SubscribeLocalEvent<AudioComponent, ComponentStartup>(OnAudioStartup);
-        SubscribeLocalEvent<AudioComponent, ComponentShutdown>(OnAudioShutdown);
-        SubscribeLocalEvent<AudioComponent, EntityPausedEvent>(OnAudioPaused);
-        SubscribeLocalEvent<AudioComponent, AfterAutoHandleStateEvent>(OnAudioState);
-
-        // Replay stuff
-        SubscribeNetworkEvent<PlayAudioGlobalMessage>(OnGlobalAudio);
-        SubscribeNetworkEvent<PlayAudioEntityMessage>(OnEntityAudio);
-        SubscribeNetworkEvent<PlayAudioPositionalMessage>(OnEntityCoordinates);
-
-        CfgManager.OnValueChanged(CVars.AudioAttenuation, OnAudioAttenuation, true);
-        CfgManager.OnValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
-    }
-
-    private void OnAudioState(EntityUid uid, AudioComponent component, ref AfterAutoHandleStateEvent args)
-    {
-        ApplyAudioParams(component.Params, component);
-        component.Source.Global = component.Global;
-
-        if (TryComp<AudioAuxiliaryComponent>(component.Auxiliary, out var auxComp))
-        {
-            component.Source.SetAuxiliary(auxComp.Auxiliary);
-        }
-        else
-        {
-            component.Source.SetAuxiliary(null);
-        }
-    }
-
-    /// <summary>
-    /// Sets the volume for the entire game.
-    /// </summary>
-    public void SetMasterVolume(float value)
-    {
-        _audio.SetMasterVolume(value);
-    }
-
-    protected override void SetZOffset(float value)
-    {
-        base.SetZOffset(value);
-        _audio.SetZOffset(value);
-    }
-
-    public override void Shutdown()
-    {
-        CfgManager.UnsubValueChanged(CVars.AudioAttenuation, OnAudioAttenuation);
-        CfgManager.UnsubValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged);
-        base.Shutdown();
-    }
-
-    private void OnAudioPaused(EntityUid uid, AudioComponent component, ref EntityPausedEvent args)
-    {
-        component.Pause();
-    }
-
-    protected override void OnAudioUnpaused(EntityUid uid, AudioComponent component, ref EntityUnpausedEvent args)
-    {
-        base.OnAudioUnpaused(uid, component, ref args);
-        component.StartPlaying();
-    }
-
-    private void OnAudioStartup(EntityUid uid, AudioComponent component, ComponentStartup args)
-    {
-        if (!Timing.ApplyingState && !Timing.IsFirstTimePredicted)
-        {
-            return;
-        }
-
-        if (!TryGetAudio(component.FileName, out var audioResource))
-        {
-            Log.Error($"Error creating audio source for {audioResource}, can't find file {component.FileName}");
-            return;
-        }
-
-        var source = _audio.CreateAudioSource(audioResource);
-
-        if (source == null)
-        {
-            Log.Error($"Error creating audio source for {audioResource}");
-            DebugTools.Assert(false);
-            source = component.Source;
-        }
-
-        component.Source = source;
-
-        // Need to set all initial data for first frame.
-        ApplyAudioParams(component.Params, component);
-        source.Global = component.Global;
-
-        // Don't play until first frame so occlusion etc. are correct.
-        component.Gain = 0f;
-
-        // If audio came into range then start playback at the correct position.
-        var offset = (Timing.CurTime - component.AudioStart).TotalSeconds % GetAudioLength(component.FileName).TotalSeconds;
-
-        if (offset > 0)
-        {
-            component.PlaybackPosition = (float) offset;
-        }
-    }
-
-    private void OnAudioShutdown(EntityUid uid, AudioComponent component, ComponentShutdown args)
-    {
-        // Breaks with prediction?
-        component.Source.Dispose();
-    }
-
-    private void OnAudioAttenuation(int obj)
-    {
-        _audio.SetAttenuation((Attenuation) obj);
-    }
-
-    private void OnRaycastLengthChanged(float value)
-    {
-        _maxRayLength = value;
-    }
-
-    public override void FrameUpdate(float frameTime)
-    {
-        var eye = _eyeManager.CurrentEye;
-        _audio.SetRotation(eye.Rotation);
-        _audio.SetPosition(eye.Position.Position);
-
-        var ourPos = GetListenerCoordinates();
-        var opts = new ParallelOptions { MaxDegreeOfParallelism = _parMan.ParallelProcessCount };
-
-        var query = AllEntityQuery<AudioComponent, TransformComponent>();
-        _streams.Clear();
-
-        while (query.MoveNext(out var uid, out var comp, out var xform))
-        {
-            _streams.Add((uid, comp, xform));
-        }
-
-        _mapManager.TryFindGridAt(ourPos, out var gridUid, out _);
-        _listenerGrid = gridUid == EntityUid.Invalid ? null : gridUid;
-
-        try
-        {
-            Parallel.ForEach(_streams, opts, comp => ProcessStream(comp.Entity, comp.Component, comp.Xform, ourPos));
-        }
-        catch (Exception e)
-        {
-            Log.Error($"Caught exception while processing entity streams.");
-            _runtimeLog.LogException(e, $"{nameof(AudioSystem)}.{nameof(FrameUpdate)}");
-        }
-    }
-
-    public MapCoordinates GetListenerCoordinates()
-    {
-        return _eyeManager.CurrentEye.Position;
-    }
-
-    private void ProcessStream(EntityUid entity, AudioComponent component, TransformComponent xform, MapCoordinates listener)
-    {
-        // TODO:
-        // I Originally tried to be fancier here but it caused audio issues so just trying
-        // to replicate the old behaviour for now.
-        if (!component.Started)
-        {
-            component.Started = true;
-            component.StartPlaying();
-        }
-
-        // If it's global but on another map (that isn't nullspace) then stop playing it.
-        if (component.Global)
-        {
-            if (xform.MapID != MapId.Nullspace && listener.MapId != xform.MapID)
-            {
-                component.Gain = 0f;
-                return;
-            }
-
-            // Resume playing.
-            component.Volume = component.Params.Volume;
-            return;
-        }
-
-        // Non-global sounds, stop playing if on another map.
-        // Not relevant to us.
-        if (listener.MapId != xform.MapID)
-        {
-            component.Gain = 0f;
-            return;
-        }
-
-        Vector2 worldPos;
-        var gridUid = xform.ParentUid;
-
-        // Handle grid audio differently by using nearest-edge instead of entity centre.
-        if (_gridQuery.HasComponent(gridUid))
-        {
-            // It's our grid so max volume.
-            if (_listenerGrid == gridUid)
-            {
-                component.Volume = component.Params.Volume;
-                component.Occlusion = 0f;
-                component.Position = listener.Position;
-                return;
-            }
-
-            // TODO: Need a grid-optimised version because this is gonna be expensive.
-            // Just to avoid clipping on and off grid or nearestPoint changing we'll
-            // always set the sound to listener's pos, we'll just manually do gain ourselves.
-            if (_physics.TryGetNearest(gridUid, listener, out _, out var gridDistance))
-            {
-                // Out of range
-                if (gridDistance > component.MaxDistance)
-                {
-                    component.Gain = 0f;
-                    return;
-                }
-
-                var paramsGain = MathF.Pow(10, component.Params.Volume / 10);
-
-                // Thought I'd never have to manually calculate gain again but this is the least
-                // unpleasant audio I could get at the moment.
-                component.Gain = paramsGain * _audio.GetAttenuationGain(
-                    gridDistance,
-                    component.Params.RolloffFactor,
-                    component.Params.ReferenceDistance,
-                    component.Params.MaxDistance);
-                component.Position = listener.Position;
-                return;
-            }
-
-            // Can't get nearest point so don't play anymore.
-            component.Gain = 0f;
-            return;
-        }
-
-        worldPos = _xformSys.GetWorldPosition(entity);
-        component.Volume = component.Params.Volume;
-
-        // Max distance check
-        var delta = worldPos - listener.Position;
-        var distance = delta.Length();
-
-        // Out of range so just clip it for us.
-        if (distance > component.MaxDistance)
-        {
-            // Still keeps the source playing, just with no volume.
-            component.Gain = 0f;
-            return;
-        }
-
-        // Update audio occlusion
-        var occlusion = GetOcclusion(listener, delta, distance, entity);
-        component.Occlusion = occlusion;
-
-        // Update audio positions.
-        component.Position = worldPos;
-
-        // Make race cars go NYYEEOOOOOMMMMM
-        if (_physicsQuery.TryGetComponent(entity, out var physicsComp))
-        {
-            // This actually gets the tracked entity's xform & iterates up though the parents for the second time. Bit
-            // inefficient.
-            var velocity = _physics.GetMapLinearVelocity(entity, physicsComp, xform);
-            component.Velocity = velocity;
-        }
-    }
-
-    /// <summary>
-    /// Gets the audio occlusion from the target audio entity to the listener's position.
-    /// </summary>
-    public float GetOcclusion(MapCoordinates listener, Vector2 delta, float distance, EntityUid? ignoredEnt = null)
-    {
-        float occlusion = 0;
-
-        if (distance > 0.1)
-        {
-            var rayLength = MathF.Min(distance, _maxRayLength);
-            var ray = new CollisionRay(listener.Position, delta / distance, OcclusionCollisionMask);
-            occlusion = _physics.IntersectRayPenetration(listener.MapId, ray, rayLength, ignoredEnt);
-        }
-
-        return occlusion;
-    }
-
-    private bool TryGetAudio(string filename, [NotNullWhen(true)] out AudioResource? audio)
-    {
-        if (_resourceCache.TryGetResource(new ResPath(filename), out audio))
-            return true;
-
-        Log.Error($"Server tried to play audio file {filename} which does not exist.");
-        return false;
-    }
-
-    private bool TryCreateAudioSource(AudioStream stream, [NotNullWhen(true)] out IAudioSource? source)
-    {
-        if (!Timing.IsFirstTimePredicted)
-        {
-            source = null;
-            Log.Error($"Tried to create audio source outside of prediction!");
-            DebugTools.Assert(false);
-            return false;
-        }
-
-        source = _audio.CreateAudioSource(stream);
-        return source != null;
-    }
-
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string filename, EntityCoordinates coordinates,
-        AudioParams? audioParams = null)
-    {
-        return PlayStatic(filename, Filter.Local(), coordinates, true, audioParams);
-    }
-
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string filename, EntityUid uid, AudioParams? audioParams = null)
-    {
-        return PlayEntity(filename, Filter.Local(), uid, true, audioParams);
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayPredicted(SoundSpecifier? sound, EntityUid source, EntityUid? user, AudioParams? audioParams = null)
-    {
-        if (Timing.IsFirstTimePredicted || sound == null)
-            return PlayEntity(sound, Filter.Local(), source, false, audioParams);
-
-        return null; // uhh Lets hope predicted audio never needs to somehow store the playing audio....
-    }
-
-    public override (EntityUid Entity, AudioComponent Component)? PlayPredicted(SoundSpecifier? sound, EntityCoordinates coordinates, EntityUid? user, AudioParams? audioParams = null)
-    {
-        if (Timing.IsFirstTimePredicted || sound == null)
-            return PlayStatic(sound, Filter.Local(), coordinates, false, audioParams);
-
-        return null;
-    }
-
-    /// <summary>
-    ///     Play an audio file globally, without position.
-    /// </summary>
-    /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
-    /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, AudioParams? audioParams = null, bool recordReplay = true)
-    {
-        if (recordReplay && _replayRecording.IsRecording)
-        {
-            _replayRecording.RecordReplayMessage(new PlayAudioGlobalMessage
-            {
-                FileName = filename,
-                AudioParams = audioParams ?? AudioParams.Default
-            });
-        }
-
-        return TryGetAudio(filename, out var audio) ? PlayGlobal(audio, audioParams) : default;
-    }
-
-    /// <summary>
-    ///     Play an audio stream globally, without position.
-    /// </summary>
-    /// <param name="stream">The audio stream to play.</param>
-    /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayGlobal(AudioStream stream, AudioParams? audioParams = null)
-    {
-        var (entity, component) = CreateAndStartPlayingStream(audioParams, stream);
-        component.Global = true;
-        component.Source.Global = true;
-        Dirty(entity, component);
-        return (entity, component);
-    }
-
-    /// <summary>
-    ///     Play an audio file following an entity.
-    /// </summary>
-    /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
-    /// <param name="entity">The entity "emitting" the audio.</param>
-    private (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, EntityUid entity, AudioParams? audioParams = null, bool recordReplay = true)
-    {
-        if (recordReplay && _replayRecording.IsRecording)
-        {
-            _replayRecording.RecordReplayMessage(new PlayAudioEntityMessage
-            {
-                FileName = filename,
-                NetEntity = GetNetEntity(entity),
-                AudioParams = audioParams ?? AudioParams.Default
-            });
-        }
-
-        return TryGetAudio(filename, out var audio) ? PlayEntity(audio, entity, audioParams) : default;
-    }
-
-    /// <summary>
-    ///     Play an audio stream following an entity.
-    /// </summary>
-    /// <param name="stream">The audio stream to play.</param>
-    /// <param name="entity">The entity "emitting" the audio.</param>
-    /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayEntity(AudioStream stream, EntityUid entity, AudioParams? audioParams = null)
-    {
-        var playing = CreateAndStartPlayingStream(audioParams, stream);
-        _xformSys.SetCoordinates(playing.Entity, new EntityCoordinates(entity, Vector2.Zero));
-
-        return playing;
-    }
-
-    /// <summary>
-    ///     Play an audio file at a static position.
-    /// </summary>
-    /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
-    /// <param name="coordinates">The coordinates at which to play the audio.</param>
-    /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, EntityCoordinates coordinates, AudioParams? audioParams = null, bool recordReplay = true)
-    {
-        if (recordReplay && _replayRecording.IsRecording)
-        {
-            _replayRecording.RecordReplayMessage(new PlayAudioPositionalMessage
-            {
-                FileName = filename,
-                Coordinates = GetNetCoordinates(coordinates),
-                AudioParams = audioParams ?? AudioParams.Default
-            });
-        }
-
-        return TryGetAudio(filename, out var audio) ? PlayStatic(audio, coordinates, audioParams) : default;
-    }
-
-    /// <summary>
-    ///     Play an audio stream at a static position.
-    /// </summary>
-    /// <param name="stream">The audio stream to play.</param>
-    /// <param name="coordinates">The coordinates at which to play the audio.</param>
-    /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayStatic(AudioStream stream, EntityCoordinates coordinates, AudioParams? audioParams = null)
-    {
-        var playing = CreateAndStartPlayingStream(audioParams, stream);
-        _xformSys.SetCoordinates(playing.Entity, coordinates);
-        return playing;
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
-    {
-        return PlayGlobal(filename, audioParams);
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
-    {
-        return PlayEntity(filename, entity, audioParams);
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
-    {
-        return PlayStatic(filename, coordinates, audioParams);
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, ICommonSession recipient, AudioParams? audioParams = null)
-    {
-        return PlayGlobal(filename, audioParams);
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, EntityUid recipient, AudioParams? audioParams = null)
-    {
-        return PlayGlobal(filename, audioParams);
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
-    {
-        return PlayEntity(filename, uid, audioParams);
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
-    {
-        return PlayEntity(filename, uid, audioParams);
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
-    {
-        return PlayStatic(filename, coordinates, audioParams);
-    }
-
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
-    {
-        return PlayStatic(filename, coordinates, audioParams);
-    }
-
-    private (EntityUid Entity, AudioComponent Component) CreateAndStartPlayingStream(AudioParams? audioParams, AudioStream stream)
-    {
-        var audioP = audioParams ?? AudioParams.Default;
-        var entity = EntityManager.CreateEntityUninitialized("Audio", MapCoordinates.Nullspace);
-        var comp = SetupAudio(entity, stream.Name!, audioP);
-        EntityManager.InitializeAndStartEntity(entity);
-        var source = comp.Source;
-
-        // TODO clamp the offset inside of SetPlaybackPosition() itself.
-        var offset = audioP.PlayOffsetSeconds;
-        offset = Math.Clamp(offset, 0f, (float) stream.Length.TotalSeconds - 0.01f);
-        source.PlaybackPosition = offset;
-
-        ApplyAudioParams(audioP, comp);
-        comp.Params = audioP;
-        source.StartPlaying();
-        return (entity, comp);
-    }
-
-    /// <summary>
-    /// Applies the audioparams to the underlying audio source.
-    /// </summary>
-    private void ApplyAudioParams(AudioParams audioParams, IAudioSource source)
-    {
-        source.Pitch = audioParams.Pitch;
-        source.Volume = audioParams.Volume;
-        source.RolloffFactor = audioParams.RolloffFactor;
-        source.MaxDistance = audioParams.MaxDistance;
-        source.ReferenceDistance = audioParams.ReferenceDistance;
-        source.Looping = audioParams.Loop;
-    }
-
-    private void OnEntityCoordinates(PlayAudioPositionalMessage ev)
-    {
-        PlayStatic(ev.FileName, GetCoordinates(ev.Coordinates), ev.AudioParams, false);
-    }
-
-    private void OnEntityAudio(PlayAudioEntityMessage ev)
-    {
-        PlayEntity(ev.FileName, GetEntity(ev.NetEntity), ev.AudioParams, false);
-    }
-
-    private void OnGlobalAudio(PlayAudioGlobalMessage ev)
-    {
-        PlayGlobal(ev.FileName, ev.AudioParams, false);
-    }
-
-    protected override TimeSpan GetAudioLengthImpl(string filename)
-    {
-        return _resourceCache.GetResource<AudioResource>(filename).AudioStream.Length;
-    }
-}

Robust.Client/Audio/Effects/AudioEffect.cs

@@ -1,455 +0,0 @@
-using System;
-using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Effects;
-using Robust.Shared.Maths;
-
-namespace Robust.Client.Audio.Effects;
-
-/// <inheritdoc />
-internal sealed class AudioEffect : IAudioEffect
-{
-    internal int Handle;
-
-    private readonly IAudioInternal _master;
-
-    public AudioEffect(IAudioInternal manager)
-    {
-        Handle = EFX.GenEffect();
-        _master = manager;
-        EFX.Effect(Handle, EffectInteger.EffectType, (int) EffectType.EaxReverb);
-    }
-
-    public void Dispose()
-    {
-        if (Handle != 0)
-        {
-            EFX.DeleteEffect(Handle);
-            Handle = 0;
-        }
-    }
-
-    private void _checkDisposed()
-    {
-        if (Handle == -1)
-        {
-            throw new ObjectDisposedException(nameof(AudioEffect));
-        }
-    }
-
-    /// <inheritdoc />
-    public float Density
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbDensity, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbDensity, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float Diffusion
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbDiffusion, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbDiffusion, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float Gain
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbGain, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbGain, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float GainHF
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbGainHF, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbGainHF, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float GainLF
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbGainLF, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbGainLF, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float DecayTime
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbDecayTime, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbDecayTime, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float DecayHFRatio
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbDecayHFRatio, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbDecayHFRatio, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float DecayLFRatio
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbDecayLFRatio, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbDecayLFRatio, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float ReflectionsGain
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbReflectionsGain, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbReflectionsGain, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float ReflectionsDelay
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbReflectionsDelay, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbReflectionsDelay, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public Vector3 ReflectionsPan
-    {
-        get
-        {
-            _checkDisposed();
-            var value = EFX.GetEffect(Handle, EffectVector3.EaxReverbReflectionsPan);
-            _master._checkAlError();
-            return new Vector3(value.X, value.Z, value.Y);
-        }
-        set
-        {
-            _checkDisposed();
-            var openVec = new OpenTK.Mathematics.Vector3(value.X, value.Y, value.Z);
-            EFX.Effect(Handle, EffectVector3.EaxReverbReflectionsPan, ref openVec);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float LateReverbGain
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbLateReverbGain, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbLateReverbGain, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float LateReverbDelay
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbLateReverbDelay, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbLateReverbDelay, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public Vector3 LateReverbPan
-    {
-        get
-        {
-            _checkDisposed();
-            var value = EFX.GetEffect(Handle, EffectVector3.EaxReverbLateReverbPan);
-            _master._checkAlError();
-            return new Vector3(value.X, value.Z, value.Y);
-        }
-        set
-        {
-            _checkDisposed();
-            var openVec = new OpenTK.Mathematics.Vector3(value.X, value.Y, value.Z);
-            EFX.Effect(Handle, EffectVector3.EaxReverbLateReverbPan, ref openVec);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float EchoTime
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbEchoTime, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbEchoTime, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float EchoDepth
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbEchoDepth, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbEchoDepth, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float ModulationTime
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbModulationTime, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbModulationTime, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float ModulationDepth
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbModulationDepth, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbModulationDepth, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float AirAbsorptionGainHF
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbAirAbsorptionGainHF, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbAirAbsorptionGainHF, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float HFReference
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbHFReference, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbHFReference, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float LFReference
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbLFReference, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbLFReference, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float RoomRolloffFactor
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectFloat.EaxReverbRoomRolloffFactor, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectFloat.EaxReverbRoomRolloffFactor, value);
-            _master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public int DecayHFLimit
-    {
-        get
-        {
-            _checkDisposed();
-            EFX.GetEffect(Handle, EffectInteger.EaxReverbDecayHFLimit, out var value);
-            _master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            EFX.Effect(Handle, EffectInteger.EaxReverbDecayHFLimit, value);
-            _master._checkAlError();
-        }
-    }
-}

Robust.Client/Audio/Effects/AuxiliaryAudio.cs

@@ -1,32 +0,0 @@
-using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
-using Robust.Shared.Audio.Effects;
-
-namespace Robust.Client.Audio.Effects;
-
-/// <inheritdoc />
-internal sealed class AuxiliaryAudio : IAuxiliaryAudio
-{
-    internal int Handle = EFX.GenAuxiliaryEffectSlot();
-
-    public void Dispose()
-    {
-        if (Handle != -1)
-        {
-            EFX.DeleteAuxiliaryEffectSlot(Handle);
-            Handle = -1;
-        }
-    }
-
-    /// <inheritdoc />
-    public void SetEffect(IAudioEffect? effect)
-    {
-        if (effect is AudioEffect audEffect)
-        {
-            EFX.AuxiliaryEffectSlot(Handle, EffectSlotInteger.Effect, audEffect.Handle);
-        }
-        else
-        {
-            EFX.AuxiliaryEffectSlot(Handle, EffectSlotInteger.Effect, 0);
-        }
-    }
-}

Robust.Client/Audio/HeadlessAudioManager.cs

@@ -1,106 +0,0 @@
-using System;
-using System.IO;
-using System.Numerics;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.AudioLoading;
-using Robust.Shared.Audio.Sources;
-using Robust.Shared.Maths;
-
-namespace Robust.Client.Audio;
-
-/// <summary>
-/// Headless client audio.
-/// </summary>
-internal sealed class HeadlessAudioManager : IAudioInternal
-{
-    /// <inheritdoc />
-    public void InitializePostWindowing()
-    {
-    }
-
-    /// <inheritdoc />
-    public void Shutdown()
-    {
-    }
-
-    /// <inheritdoc />
-    public void FlushALDisposeQueues()
-    {
-    }
-
-    /// <inheritdoc />
-    public IAudioSource CreateAudioSource(AudioStream stream)
-    {
-        return DummyAudioSource.Instance;
-    }
-
-    /// <inheritdoc />
-    public IBufferedAudioSource CreateBufferedAudioSource(int buffers, bool floatAudio = false)
-    {
-        return DummyBufferedAudioSource.Instance;
-    }
-
-    /// <inheritdoc />
-    public void SetPosition(Vector2 position)
-    {
-    }
-
-    /// <inheritdoc />
-    public void SetRotation(Angle angle)
-    {
-    }
-
-    /// <inheritdoc />
-    public void SetMasterVolume(float value)
-    {
-    }
-
-    /// <inheritdoc />
-    public void SetAttenuation(Attenuation attenuation)
-    {
-    }
-
-    /// <inheritdoc />
-    public void StopAllAudio()
-    {
-    }
-
-    /// <inheritdoc />
-    public void SetZOffset(float f)
-    {
-    }
-
-    /// <inheritdoc />
-    public void _checkAlError(string callerMember = "", int callerLineNumber = -1)
-    {
-    }
-
-    /// <inheritdoc />
-    public float GetAttenuationGain(float distance, float rolloffFactor, float referenceDistance, float maxDistance)
-    {
-        return 0f;
-    }
-
-    public AudioStream LoadAudioOggVorbis(Stream stream, string? name = null)
-    {
-        var metadata = AudioLoaderOgg.LoadAudioMetadata(stream);
-        return AudioStreamFromMetadata(metadata, name);
-    }
-
-    public AudioStream LoadAudioWav(Stream stream, string? name = null)
-    {
-        var metadata = AudioLoaderWav.LoadAudioMetadata(stream);
-        return AudioStreamFromMetadata(metadata, name);
-    }
-
-    public AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null)
-    {
-        var length = TimeSpan.FromSeconds((double) samples.Length / channels / sampleRate);
-        return new AudioStream(null, length, channels, name);
-    }
-
-    private static AudioStream AudioStreamFromMetadata(AudioMetadata metadata, string? name)
-    {
-        return new AudioStream(null, metadata.Length, metadata.ChannelCount, name, metadata.Title, metadata.Artist);
-    }
-}

Robust.Client/Audio/IAudioInternal.cs

@@ -1,63 +0,0 @@
-using System;
-using System.IO;
-using System.Numerics;
-using System.Runtime.CompilerServices;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Sources;
-using Robust.Shared.Maths;
-
-namespace Robust.Client.Audio;
-
-/// <summary>
-/// Handles clientside audio.
-/// </summary>
-internal interface IAudioInternal
-{
-    void InitializePostWindowing();
-    void Shutdown();
-
-    /// <summary>
-    /// Flushes all pending queues for disposing of AL sources.
-    /// </summary>
-    void FlushALDisposeQueues();
-
-    IAudioSource? CreateAudioSource(AudioStream stream);
-
-    IBufferedAudioSource CreateBufferedAudioSource(int buffers, bool floatAudio=false);
-
-    /// <summary>
-    /// Sets position for the audio listener.
-    /// </summary>
-    void SetPosition(Vector2 position);
-
-    /// <summary>
-    /// Sets rotation for the audio listener.
-    /// </summary>
-    void SetRotation(Angle angle);
-
-    void SetMasterVolume(float value);
-    void SetAttenuation(Attenuation attenuation);
-
-    /// <summary>
-    /// Stops all audio from playing.
-    /// </summary>
-    void StopAllAudio();
-
-    /// <summary>
-    /// Sets the Z-offset for the audio listener.
-    /// </summary>
-    void SetZOffset(float f);
-
-    void _checkAlError([CallerMemberName] string callerMember = "", [CallerLineNumber] int callerLineNumber = -1);
-
-    /// <summary>
-    /// Manually calculates the specified gain for an attenuation source with the specified distance.
-    /// </summary>
-    float GetAttenuationGain(float distance, float rolloffFactor, float referenceDistance, float maxDistance);
-
-    AudioStream LoadAudioOggVorbis(Stream stream, string? name = null);
-
-    AudioStream LoadAudioWav(Stream stream, string? name = null);
-
-    AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null);
-}

Robust.Client/Audio/Midi/IMidiRenderer.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using Robust.Client.Graphics;
 using Robust.Shared.Audio.Midi;
-using Robust.Shared.Audio.Sources;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
@@ -21,7 +20,7 @@ public interface IMidiRenderer : IDisposable
     /// <summary>
     ///     The buffered audio source of this renderer.
     /// </summary>
-    internal IBufferedAudioSource Source { get; }
+    internal IClydeBufferedAudioSource Source { get; }
 
     /// <summary>
     ///     Whether this renderer has been disposed or not.

Robust.Client/Audio/Midi/MidiManager.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,9 +10,7 @@ using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared;
 using Robust.Shared.Asynchronous;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Midi;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Exceptions;
@@ -37,20 +34,24 @@ internal sealed partial class MidiManager : IMidiManager
     public const string SoundfontEnvironmentVariable = "ROBUST_SOUNDFONT_OVERRIDE";
 
     private int _minRendererParallel;
+    private float _occlusionUpdateDelay;
+    private float _positionUpdateDelay;
 
-    [Dependency] private readonly IResourceManager _resourceManager = default!;
+    [ViewVariables] private TimeSpan _nextOcclusionUpdate = TimeSpan.Zero;
+    [ViewVariables] private TimeSpan _nextPositionUpdate = TimeSpan.Zero;
+
+    [Dependency] private readonly IEyeManager _eyeManager = default!;
+    [Dependency] private readonly IResourceCacheInternal _resourceManager = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IConfigurationManager _cfgMan = default!;
-    [Dependency] private readonly IAudioInternal _audio = default!;
+    [Dependency] private readonly IClydeAudio _clydeAudio = default!;
     [Dependency] private readonly ITaskManager _taskManager = default!;
     [Dependency] private readonly ILogManager _logger = default!;
     [Dependency] private readonly IParallelManager _parallel = default!;
     [Dependency] private readonly IRuntimeLog _runtime = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    private AudioSystem _audioSys = default!;
     private SharedPhysicsSystem _broadPhaseSystem = default!;
-    private SharedTransformSystem _xformSystem = default!;
 
     public IReadOnlyList<IMidiRenderer> Renderers
     {
@@ -154,6 +155,12 @@ internal sealed partial class MidiManager : IMidiManager
         _cfgMan.OnValueChanged(CVars.MidiMinRendererParallel,
             value => _minRendererParallel = value, true);
 
+        _cfgMan.OnValueChanged(CVars.MidiOcclusionUpdateDelay,
+            value => _occlusionUpdateDelay = value, true);
+
+        _cfgMan.OnValueChanged(CVars.MidiPositionUpdateDelay,
+            value => _positionUpdateDelay = value, true);
+
         _midiSawmill = _logger.GetSawmill("midi");
 #if DEBUG
         _midiSawmill.Level = LogLevel.Debug;
@@ -207,11 +214,7 @@ internal sealed partial class MidiManager : IMidiManager
         _midiThread = new Thread(ThreadUpdate);
         _midiThread.Start();
 
-        _audioSys = _entityManager.EntitySysManager.GetEntitySystem<AudioSystem>();
         _broadPhaseSystem = _entityManager.EntitySysManager.GetEntitySystem<SharedPhysicsSystem>();
-        _xformSystem = _entityManager.System<SharedTransformSystem>();
-        _entityManager.GetEntityQuery<PhysicsComponent>();
-        _entityManager.GetEntityQuery<TransformComponent>();
         _cfgMan.OnValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
 
         FluidsynthInitialized = true;
@@ -270,7 +273,7 @@ internal sealed partial class MidiManager : IMidiManager
         {
             soundfontLoader.SetCallbacks(_soundfontLoaderCallbacks);
 
-            var renderer = new MidiRenderer(_settings!, soundfontLoader, mono, this, _audio, _taskManager, _midiSawmill);
+            var renderer = new MidiRenderer(_settings!, soundfontLoader, mono, this, _clydeAudio, _taskManager, _midiSawmill);
 
             _midiSawmill.Debug($"Loading fallback soundfont {FallbackSoundfont}");
             // Since the last loaded soundfont takes priority, we load the fallback soundfont before the soundfont.
@@ -348,7 +351,7 @@ internal sealed partial class MidiManager : IMidiManager
                 renderer.LoadSoundfont(file.ToString());
             }
 
-            renderer.Source.Volume = _volume;
+            renderer.Source.SetVolume(Volume);
 
             lock (_renderers)
             {
@@ -371,119 +374,110 @@ internal sealed partial class MidiManager : IMidiManager
 
         // Update positions of streams every frame.
         // This has a lot of code duplication with AudioSystem.FrameUpdate(), and they should probably be combined somehow.
-        // so TRUE
 
         lock (_renderers)
         {
             if (_renderers.Count == 0)
                 return;
 
+            var transQuery = _entityManager.GetEntityQuery<TransformComponent>();
+            var physicsQuery = _entityManager.GetEntityQuery<PhysicsComponent>();
             var opts = new ParallelOptions { MaxDegreeOfParallelism = _parallel.ParallelProcessCount };
-            var ourPos = _audioSys.GetListenerCoordinates();
 
             if (_renderers.Count > _minRendererParallel)
             {
-                Parallel.ForEach(_renderers, opts, renderer => UpdateRenderer(renderer, ourPos));
+                Parallel.ForEach(_renderers, opts, renderer => UpdateRenderer(renderer, transQuery, physicsQuery));
             }
             else
             {
                 foreach (var renderer in _renderers)
                 {
-                    UpdateRenderer(renderer, ourPos);
+                    UpdateRenderer(renderer, transQuery, physicsQuery);
                 }
             }
 
         }
 
+        if (_nextOcclusionUpdate < _timing.RealTime)
+            _nextOcclusionUpdate = _timing.RealTime.Add(TimeSpan.FromSeconds(_occlusionUpdateDelay));
+
+        if (_nextPositionUpdate < _timing.RealTime)
+            _nextPositionUpdate = _timing.RealTime.Add(TimeSpan.FromSeconds(_positionUpdateDelay));
+
         _volumeDirty = false;
     }
-    private void UpdateRenderer(IMidiRenderer renderer, MapCoordinates listener)
+    private void UpdateRenderer(IMidiRenderer renderer, EntityQuery<TransformComponent> transQuery,
+        EntityQuery<PhysicsComponent> physicsQuery)
     {
-        // TODO: This should be sharing more code with AudioSystem.
         try
         {
             if (renderer.Disposed)
                 return;
 
             if (_volumeDirty)
-            {
-                renderer.Source.Volume = Volume;
-            }
+                renderer.Source.SetVolume(Volume);
 
             if (!renderer.Mono)
             {
-                renderer.Source.Global = true;
+                renderer.Source.SetGlobal();
                 return;
             }
 
-            MapCoordinates mapPos;
-
-            if (renderer.TrackingEntity is {} trackedEntity && !_entityManager.Deleted(trackedEntity))
+            if (_nextPositionUpdate < _timing.RealTime)
             {
-                renderer.TrackingCoordinates = _xformSystem.GetMapCoordinates(renderer.TrackingEntity.Value);
-
-                // Pause it if the attached entity is paused.
-                if (_entityManager.IsPaused(renderer.TrackingEntity))
+                if (renderer.TrackingEntity is {} trackedEntity && !_entityManager.Deleted(trackedEntity))
+                {
+                    renderer.TrackingCoordinates = transQuery.GetComponent(renderer.TrackingEntity!.Value).MapPosition;
+                }
+                else if (renderer.TrackingCoordinates == null)
                 {
-                    renderer.Source.Pause();
                     return;
                 }
-            }
-            else if (renderer.TrackingCoordinates == null)
-            {
-                renderer.Source.Pause();
-                return;
+
+                if (!renderer.Source.SetPosition(renderer.TrackingCoordinates.Value.Position))
+                {
+                    return;
+                }
+
+                var vel = _broadPhaseSystem.GetMapLinearVelocity(renderer.TrackingEntity!.Value,
+                    xformQuery: transQuery, physicsQuery: physicsQuery);
+                renderer.Source.SetVelocity(vel);
             }
 
-            mapPos = renderer.TrackingCoordinates.Value;
-
-            // If it's on a different map then just mute it, not pause.
-            if (mapPos.MapId == MapId.Nullspace)
+            if (renderer.TrackingCoordinates != null && renderer.TrackingCoordinates.Value.MapId == _eyeManager.CurrentMap)
             {
-                renderer.Source.Gain = 0f;
-                return;
-            }
+                if (_nextOcclusionUpdate >= _timing.RealTime)
+                    return;
 
-            // Was previously muted maybe so try unmuting it?
-            if (renderer.Source.Gain == 0f)
-            {
-                renderer.Source.Volume = Volume;
-            }
+                var pos = renderer.TrackingCoordinates.Value;
 
-            var worldPos = mapPos.Position;
-            var delta = worldPos - listener.Position;
-            var distance = delta.Length();
+                var sourceRelative = pos.Position - _eyeManager.CurrentEye.Position.Position;
+                var occlusion = 0f;
+                if (sourceRelative.Length() > 0)
+                {
+                    occlusion = _broadPhaseSystem.IntersectRayPenetration(
+                        pos.MapId,
+                        new CollisionRay(
+                            _eyeManager.CurrentEye.Position.Position,
+                            sourceRelative.Normalized(),
+                            OcclusionCollisionMask),
+                        MathF.Min(sourceRelative.Length(), _maxCastLength),
+                        renderer.TrackingEntity);
+                }
 
-            // Update position
-            // Out of range so just clip it for us.
-            if (distance > renderer.Source.MaxDistance)
-            {
-                // Still keeps the source playing, just with no volume.
-                renderer.Source.Gain = 0f;
-                return;
-            }
-
-            renderer.Source.Position = worldPos;
-
-            // Update velocity (doppler).
-            if (renderer.TrackingEntity != null)
-            {
-                var velocity = _broadPhaseSystem.GetMapLinearVelocity(renderer.TrackingEntity.Value);
-                renderer.Source.Velocity = velocity;
+                renderer.Source.SetOcclusion(occlusion);
             }
             else
             {
-                renderer.Source.Velocity = Vector2.Zero;
+                renderer.Source.SetOcclusion(float.MaxValue);
             }
 
-            // Update occlusion
-            var occlusion = _audioSys.GetOcclusion(listener, delta, distance, renderer.TrackingEntity);
-            renderer.Source.Occlusion = occlusion;
         }
         catch (Exception ex)
         {
             _runtime.LogException(ex, _midiSawmill.Name);
         }
+
     }
 
     /// <summary>

Robust.Client/Audio/Midi/MidiRenderer.cs

@@ -4,9 +4,7 @@ using JetBrains.Annotations;
 using NFluidsynth;
 using Robust.Client.Graphics;
 using Robust.Shared.Asynchronous;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Midi;
-using Robust.Shared.Audio.Sources;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
@@ -54,8 +52,8 @@ internal sealed class MidiRenderer : IMidiRenderer
 
     private IMidiRenderer? _master;
     public MidiRendererState RendererState => _rendererState;
-    public IBufferedAudioSource Source { get; set; }
-    IBufferedAudioSource IMidiRenderer.Source => Source;
+    public IClydeBufferedAudioSource Source { get; set; }
+    IClydeBufferedAudioSource IMidiRenderer.Source => Source;
 
     [ViewVariables]
     public bool Disposed { get; private set; } = false;
@@ -249,7 +247,7 @@ internal sealed class MidiRenderer : IMidiRenderer
     public event Action? OnMidiPlayerFinished;
 
     internal MidiRenderer(Settings settings, SoundFontLoader soundFontLoader, bool mono,
-        IMidiManager midiManager, IAudioInternal clydeAudio, ITaskManager taskManager, ISawmill midiSawmill)
+        IMidiManager midiManager, IClydeAudio clydeAudio, ITaskManager taskManager, ISawmill midiSawmill)
     {
         _midiManager = midiManager;
         _taskManager = taskManager;
@@ -490,7 +488,7 @@ internal sealed class MidiRenderer : IMidiRenderer
             }
         }
 
-        Source.StartPlaying();
+        if (!Source.IsPlaying) Source.StartPlaying();
     }
 
     public void ApplyState(MidiRendererState state, bool filterChannels = false)

Robust.Client/Audio/ShowAudioCommand.cs

@@ -1,34 +0,0 @@
-using Robust.Client.Audio;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Player;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-
-namespace Robust.Client.Commands;
-
-/// <summary>
-/// Shows a debug overlay for audio sources.
-/// </summary>
-public sealed class ShowAudioCommand : LocalizedCommands
-{
-    [Dependency] private readonly IResourceCache _client = default!;
-    [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IOverlayManager _overlayManager = default!;
-    [Dependency] private readonly IPlayerManager _playerMgr = default!;
-    public override string Command => "showaudio";
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (_overlayManager.HasOverlay<AudioOverlay>())
-            _overlayManager.RemoveOverlay<AudioOverlay>();
-        else
-            _overlayManager.AddOverlay(new AudioOverlay(
-                _entManager,
-                _playerMgr,
-                _client,
-                _entManager.System<AudioSystem>(),
-                _entManager.System<SharedTransformSystem>()));
-    }
-}

Robust.Client/Audio/Sources/AudioSource.cs

@@ -1,90 +0,0 @@
-using System;
-using System.Numerics;
-using OpenTK.Audio.OpenAL;
-using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
-using Robust.Shared.Audio;
-using Robust.Shared.Maths;
-using Robust.Shared.Utility;
-
-namespace Robust.Client.Audio.Sources;
-
-internal sealed class AudioSource : BaseAudioSource
-{
-    /// <summary>
-    /// Underlying stream to the audio.
-    /// </summary>
-    private readonly AudioStream _sourceStream;
-
-#if DEBUG
-    private bool _didPositionWarning;
-#endif
-
-    public AudioSource(AudioManager master, int sourceHandle, AudioStream sourceStream) : base(master, sourceHandle)
-    {
-        _sourceStream = sourceStream;
-    }
-
-    /// <inheritdoc />
-    public override Vector2 Position
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSource3f.Position, out var x, out var y, out _);
-            Master._checkAlError();
-            return new Vector2(x, y);
-        }
-        set
-        {
-            _checkDisposed();
-
-            var (x, y) = value;
-
-            if (!AreFinite(x, y))
-            {
-                return;
-            }
-#if DEBUG
-            // OpenAL doesn't seem to want to play stereo positionally.
-            // Log a warning if people try to.
-            if (_sourceStream.ChannelCount > 1 && !_didPositionWarning)
-            {
-                _didPositionWarning = true;
-                Master.OpenALSawmill.Warning("Attempting to set position on audio source with multiple audio channels! Stream: '{0}'.  Make sure the audio is MONO, not stereo.",
-                    _sourceStream.Name);
-                // warning isn't enough, people just ignore it :(
-                DebugTools.Assert(false, $"Attempting to set position on audio source with multiple audio channels! Stream: '{_sourceStream.Name}'. Make sure the audio is MONO, not stereo.");
-            }
-#endif
-
-            AL.Source(SourceHandle, ALSource3f.Position, x, y, 0);
-            Master._checkAlError();
-        }
-    }
-
-    ~AudioSource()
-    {
-        Dispose(false);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        if (!disposing)
-        {
-            // We can't run this code inside the finalizer thread so tell Clyde to clear it up later.
-            Master.DeleteSourceOnMainThread(SourceHandle, FilterHandle);
-        }
-        else
-        {
-            if (FilterHandle != 0)
-                EFX.DeleteFilter(FilterHandle);
-
-            AL.DeleteSource(SourceHandle);
-            Master.RemoveAudioSource(SourceHandle);
-            Master._checkAlError();
-        }
-
-        FilterHandle = 0;
-        SourceHandle = -1;
-    }
-}

Robust.Client/Audio/Sources/BaseAudioSource.cs

@@ -1,391 +0,0 @@
-using System;
-using System.Numerics;
-using OpenTK.Audio.OpenAL;
-using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
-using Robust.Client.Audio.Effects;
-using Robust.Shared.Audio.Effects;
-using Robust.Shared.Audio.Sources;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Maths;
-
-namespace Robust.Client.Audio.Sources;
-
-internal abstract class BaseAudioSource : IAudioSource
-{
-    /*
-     * This may look weird having all these methods here however
-     * we need to handle disposing plus checking for errors hence we get this.
-     */
-
-    /// <summary>
-    /// Handle to the AL source.
-    /// </summary>
-    protected int SourceHandle;
-
-    /// <summary>
-    /// Source to the EFX filter if applicable.
-    /// </summary>
-    protected int FilterHandle;
-
-    protected readonly AudioManager Master;
-
-    /// <summary>
-    /// Prior gain that was set.
-    /// </summary>
-    private float _gain;
-
-    private bool IsEfxSupported => Master.IsEfxSupported;
-
-    protected BaseAudioSource(AudioManager master, int sourceHandle)
-    {
-        Master = master;
-        SourceHandle = sourceHandle;
-        AL.GetSource(SourceHandle, ALSourcef.Gain, out _gain);
-    }
-
-    public void Pause()
-    {
-        AL.SourcePause(SourceHandle);
-    }
-
-    /// <inheritdoc />
-    public void StartPlaying()
-    {
-        if (Playing)
-            return;
-
-        Playing = true;
-    }
-
-    /// <inheritdoc />
-    public void StopPlaying()
-    {
-        if (!Playing)
-            return;
-
-        Playing = false;
-    }
-
-    /// <inheritdoc />
-    public virtual bool Playing
-    {
-        get
-        {
-            _checkDisposed();
-            var state = AL.GetSourceState(SourceHandle);
-            Master._checkAlError();
-            return state == ALSourceState.Playing;
-        }
-        set
-        {
-            _checkDisposed();
-
-            if (value)
-            {
-                AL.SourcePlay(SourceHandle);
-            }
-            else
-            {
-                AL.SourceStop(SourceHandle);
-            }
-
-
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public bool Looping
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSourceb.Looping, out var ret);
-            Master._checkAlError();
-            return ret;
-        }
-        set
-        {
-            _checkDisposed();
-            AL.Source(SourceHandle, ALSourceb.Looping, value);
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public bool Global
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSourceb.SourceRelative, out var value);
-            Master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            AL.Source(SourceHandle, ALSourceb.SourceRelative, value);
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public virtual Vector2 Position
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSource3f.Position, out var x, out var y, out _);
-            Master._checkAlError();
-            return new Vector2(x, y);
-        }
-        set
-        {
-            _checkDisposed();
-
-            var (x, y) = value;
-
-            if (!AreFinite(x, y))
-            {
-                return;
-            }
-
-            AL.Source(SourceHandle, ALSource3f.Position, x, y, 0);
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float Pitch { get; set; }
-
-    /// <inheritdoc />
-    public float Volume
-    {
-        get
-        {
-            var gain = Gain;
-            var volume = SharedAudioSystem.GainToVolume(gain);
-            return volume;
-        }
-        set => Gain = SharedAudioSystem.VolumeToGain(value);
-    }
-
-    /// <inheritdoc />
-    public float Gain
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSourcef.Gain, out var gain);
-            Master._checkAlError();
-            return gain;
-        }
-        set
-        {
-            _checkDisposed();
-            var priorOcclusion = 1f;
-            if (!IsEfxSupported)
-            {
-                AL.GetSource(SourceHandle, ALSourcef.Gain, out var priorGain);
-                priorOcclusion = priorGain / _gain;
-            }
-
-            _gain = value;
-            AL.Source(SourceHandle, ALSourcef.Gain, _gain * priorOcclusion);
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float MaxDistance
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSourcef.MaxDistance, out var value);
-            Master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            AL.Source(SourceHandle, ALSourcef.MaxDistance, value);
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float RolloffFactor
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSourcef.RolloffFactor, out var value);
-            Master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            AL.Source(SourceHandle, ALSourcef.RolloffFactor, value);
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float ReferenceDistance
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSourcef.ReferenceDistance, out var value);
-            Master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            AL.Source(SourceHandle, ALSourcef.ReferenceDistance, value);
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float Occlusion
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSourcef.MaxDistance, out var value);
-            Master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            var cutoff = MathF.Exp(-value * 1);
-            var gain = MathF.Pow(cutoff, 0.1f);
-            if (IsEfxSupported)
-            {
-                SetOcclusionEfx(gain, cutoff);
-            }
-            else
-            {
-                gain *= gain * gain;
-                AL.Source(SourceHandle, ALSourcef.Gain, _gain * gain);
-            }
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public float PlaybackPosition
-    {
-        get
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSourcef.SecOffset, out var value);
-            Master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            AL.Source(SourceHandle, ALSourcef.SecOffset, value);
-            Master._checkAlError();
-        }
-    }
-
-    /// <inheritdoc />
-    public Vector2 Velocity
-    {
-        get
-        {
-            _checkDisposed();
-
-            AL.GetSource(SourceHandle, ALSource3f.Velocity, out var x, out var y, out _);
-            Master._checkAlError();
-            return new Vector2(x, y);
-        }
-        set
-        {
-            _checkDisposed();
-
-            var (x, y) = value;
-
-            if (!AreFinite(x, y))
-            {
-                return;
-            }
-
-            AL.Source(SourceHandle, ALSource3f.Velocity, x, y, 0);
-            Master._checkAlError();
-        }
-    }
-
-    public void SetAuxiliary(IAuxiliaryAudio? audio)
-    {
-        _checkDisposed();
-
-        if (audio is AuxiliaryAudio impAudio)
-        {
-            EFX.Source(SourceHandle, EFXSourceInteger3.AuxiliarySendFilter, impAudio.Handle, 0, 0);
-        }
-        else
-        {
-            EFX.Source(SourceHandle, EFXSourceInteger3.AuxiliarySendFilter, 0, 0, 0);
-        }
-
-        Master._checkAlError();
-    }
-
-    private void SetOcclusionEfx(float gain, float cutoff)
-    {
-        if (FilterHandle == 0)
-        {
-            FilterHandle = EFX.GenFilter();
-            EFX.Filter(FilterHandle, FilterInteger.FilterType, (int) FilterType.Lowpass);
-        }
-
-        EFX.Filter(FilterHandle, FilterFloat.LowpassGain, gain);
-        EFX.Filter(FilterHandle, FilterFloat.LowpassGainHF, cutoff);
-        AL.Source(SourceHandle, ALSourcei.EfxDirectFilter, FilterHandle);
-    }
-
-    protected static bool AreFinite(float x, float y)
-    {
-        if (float.IsFinite(x) && float.IsFinite(y))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    ~BaseAudioSource()
-    {
-        Dispose(false);
-    }
-
-    public void Dispose()
-    {
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
-
-    protected abstract void Dispose(bool disposing);
-
-    protected bool _isDisposed()
-    {
-        return SourceHandle == -1;
-    }
-
-    protected void _checkDisposed()
-    {
-        if (SourceHandle == -1)
-        {
-            throw new ObjectDisposedException(nameof(BaseAudioSource));
-        }
-    }
-}

Robust.Client/Audio/Sources/BufferedAudioSource.cs

@@ -1,225 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Numerics;
-using OpenTK.Audio.OpenAL;
-using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
-using Robust.Client.Graphics;
-using Robust.Shared.Audio.Sources;
-using Robust.Shared.Maths;
-
-namespace Robust.Client.Audio.Sources;
-
-internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSource
-{
-    private int? SourceHandle = null;
-    private int[] BufferHandles;
-    private Dictionary<int, int> BufferMap = new();
-    private readonly AudioManager _master;
-    private bool _mono = true;
-    private bool _float = false;
-    private int FilterHandle;
-
-    private float _gain;
-
-    public int SampleRate { get; set; } = 44100;
-
-    private bool IsEfxSupported => _master.IsEfxSupported;
-
-    public BufferedAudioSource(AudioManager master, int sourceHandle, int[] bufferHandles, bool floatAudio = false) : base(master, sourceHandle)
-    {
-        _master = master;
-        SourceHandle = sourceHandle;
-        BufferHandles = bufferHandles;
-        for (int i = 0; i < BufferHandles.Length; i++)
-        {
-            var bufferHandle = BufferHandles[i];
-            BufferMap[bufferHandle] = i;
-        }
-        _float = floatAudio;
-        AL.GetSource(sourceHandle, ALSourcef.Gain, out _gain);
-    }
-
-    /// <inheritdoc />
-    public override bool Playing
-    {
-        get
-        {
-            _checkDisposed();
-            var state = AL.GetSourceState(SourceHandle!.Value);
-            _master._checkAlError();
-            return state == ALSourceState.Playing;
-        }
-        set
-        {
-            if (value)
-            {
-                _checkDisposed();
-                // IDK why this stackallocs but gonna leave it for now.
-                AL.SourcePlay(stackalloc int[] {SourceHandle!.Value});
-                _master._checkAlError();
-            }
-            else
-            {
-                if (_isDisposed())
-                    return;
-
-                AL.SourceStop(SourceHandle!.Value);
-                _master._checkAlError();
-            }
-        }
-    }
-
-    ~BufferedAudioSource()
-    {
-        Dispose(false);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        if (SourceHandle == null)
-            return;
-
-        if (!_master.IsMainThread())
-        {
-            // We can't run this code inside another thread so tell Clyde to clear it up later.
-            _master.DeleteBufferedSourceOnMainThread(SourceHandle.Value, FilterHandle);
-
-            foreach (var handle in BufferHandles)
-            {
-                _master.DeleteAudioBufferOnMainThread(handle);
-            }
-        }
-        else
-        {
-            if (FilterHandle != 0)
-                EFX.DeleteFilter(FilterHandle);
-
-            AL.DeleteSource(SourceHandle.Value);
-            AL.DeleteBuffers(BufferHandles);
-            _master.RemoveBufferedAudioSource(SourceHandle.Value);
-            _master._checkAlError();
-        }
-
-        FilterHandle = 0;
-        SourceHandle = null;
-    }
-
-    public int GetNumberOfBuffersProcessed()
-    {
-        _checkDisposed();
-        // ReSharper disable once PossibleInvalidOperationException
-        AL.GetSource(SourceHandle!.Value, ALGetSourcei.BuffersProcessed, out var buffersProcessed);
-        return buffersProcessed;
-    }
-
-    public unsafe void GetBuffersProcessed(Span<int> handles)
-    {
-        _checkDisposed();
-        var entries = Math.Min(Math.Min(handles.Length, BufferHandles.Length), GetNumberOfBuffersProcessed());
-        fixed (int* ptr = handles)
-        {
-            AL.SourceUnqueueBuffers(SourceHandle!.Value, entries, ptr);
-        }
-
-        for (var i = 0; i < entries; i++)
-        {
-            handles[i] = BufferMap[handles[i]];
-        }
-    }
-
-    public unsafe void WriteBuffer(int handle, ReadOnlySpan<ushort> data)
-    {
-        _checkDisposed();
-
-        if(_float)
-            throw new InvalidOperationException("Can't write ushort numbers to buffers when buffer type is float!");
-
-        if (handle >= BufferHandles.Length)
-        {
-            throw new ArgumentOutOfRangeException(nameof(handle),
-                $"Got {handle}. Expected less than {BufferHandles.Length}");
-        }
-
-        fixed (ushort* ptr = data)
-        {
-            AL.BufferData(BufferHandles[handle], _mono ? ALFormat.Mono16 : ALFormat.Stereo16, (IntPtr) ptr,
-                _mono ? data.Length / 2 * sizeof(ushort) : data.Length * sizeof(ushort), SampleRate);
-        }
-    }
-
-    public unsafe void WriteBuffer(int handle, ReadOnlySpan<float> data)
-    {
-        _checkDisposed();
-
-        if(!_float)
-            throw new InvalidOperationException("Can't write float numbers to buffers when buffer type is ushort!");
-
-        if (handle >= BufferHandles.Length)
-        {
-            throw new ArgumentOutOfRangeException(nameof(handle),
-                $"Got {handle}. Expected less than {BufferHandles.Length}");
-        }
-
-        fixed (float* ptr = data)
-        {
-            AL.BufferData(BufferHandles[handle], _mono ? ALFormat.MonoFloat32Ext : ALFormat.StereoFloat32Ext, (IntPtr) ptr,
-                _mono ? data.Length / 2 * sizeof(float) : data.Length * sizeof(float), SampleRate);
-        }
-    }
-
-    public unsafe void QueueBuffers(ReadOnlySpan<int> handles)
-    {
-        _checkDisposed();
-
-        Span<int> realHandles = stackalloc int[handles.Length];
-        handles.CopyTo(realHandles);
-
-        for (var i = 0; i < realHandles.Length; i++)
-        {
-            var handle = realHandles[i];
-            if (handle >= BufferHandles.Length)
-                throw new ArgumentOutOfRangeException(nameof(handles), $"Invalid handle with index {i}!");
-            realHandles[i] = BufferHandles[handle];
-        }
-
-        fixed (int* ptr = realHandles)
-            // ReSharper disable once PossibleInvalidOperationException
-        {
-            AL.SourceQueueBuffers(SourceHandle!.Value, handles.Length, ptr);
-        }
-    }
-
-    public unsafe void EmptyBuffers()
-    {
-        _checkDisposed();
-        var length = SampleRate / BufferHandles.Length * (_mono ? 1 : 2);
-
-        Span<int> handles = stackalloc int[BufferHandles.Length];
-
-        if (_float)
-        {
-            var empty = new float[length];
-            var span = (Span<float>) empty;
-
-            for (var i = 0; i < BufferHandles.Length; i++)
-            {
-                WriteBuffer(BufferMap[BufferHandles[i]], span);
-                handles[i] = BufferMap[BufferHandles[i]];
-            }
-        }
-        else
-        {
-            var empty = new ushort[length];
-            var span = (Span<ushort>) empty;
-
-            for (var i = 0; i < BufferHandles.Length; i++)
-            {
-                WriteBuffer(BufferMap[BufferHandles[i]], span);
-                handles[i] = BufferMap[BufferHandles[i]];
-            }
-        }
-
-        QueueBuffers(handles);
-    }
-}

Robust.Client/BaseClient.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Linq;
 using System.Net;
 using Robust.Client.Configuration;
+using Robust.Client.Debugging;
 using Robust.Client.GameObjects;
 using Robust.Client.GameStates;
 using Robust.Client.Player;
@@ -8,12 +10,13 @@ using Robust.Client.Utility;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -62,12 +65,12 @@ namespace Robust.Client
 
             _configManager.OnValueChanged(CVars.NetTickrate, TickRateChanged, invokeImmediately: true);
 
-            _playMan.Initialize(0);
+            _playMan.Initialize();
             _playMan.PlayerListUpdated += OnPlayerListUpdated;
             Reset();
         }
 
-        private void OnPlayerListUpdated()
+        private void OnPlayerListUpdated(object? sender, EventArgs e)
         {
             var serverPlayers = _playMan.PlayerCount;
             if (_net.ServerChannel != null && GameInfo != null && _net.IsConnected)
@@ -127,10 +130,9 @@ namespace Robust.Client
         {
             DebugTools.Assert(RunLevel < ClientRunLevel.Connecting);
             DebugTools.Assert(!_net.IsConnected);
-            var name = PlayerNameOverride ?? _configManager.GetCVar(CVars.PlayerName);
-            _playMan.SetupSinglePlayer(name);
+            _playMan.Startup();
+            _playMan.LocalPlayer!.Name = PlayerNameOverride ?? _configManager.GetCVar(CVars.PlayerName);
             OnRunLevelChanged(ClientRunLevel.SinglePlayerGame);
-            _playMan.JoinGame(_playMan.LocalSession!);
             GameStartedSetup();
         }
 
@@ -171,14 +173,22 @@ namespace Robust.Client
                 info.ServerName = serverName;
             }
 
-            var channel = _net.ServerChannel!;
+            var maxPlayers = _configManager.GetCVar<int>("game.maxplayers");
+            info.ServerMaxPlayers = maxPlayers;
+
+            var userName = _net.ServerChannel!.UserName;
+            var userId = _net.ServerChannel.UserId;
 
             // start up player management
-            _playMan.SetupMultiplayer(channel);
-            _playMan.PlayerStatusChanged += OnStatusChanged;
+            _playMan.Startup();
+
+            _playMan.LocalPlayer!.UserId = userId;
+            _playMan.LocalPlayer.Name = userName;
+
+            _playMan.LocalPlayer.StatusChanged += OnLocalStatusChanged;
 
             var serverPlayers = _playMan.PlayerCount;
-            _discord.Update(info.ServerName, channel.UserName, info.ServerMaxPlayers.ToString(), serverPlayers.ToString());
+            _discord.Update(info.ServerName, userName, info.ServerMaxPlayers.ToString(), serverPlayers.ToString());
 
         }
 
@@ -211,8 +221,6 @@ namespace Robust.Client
 
         private void Reset()
         {
-            _configManager.ReceivedInitialNwVars -= OnReceivedClientData;
-            _playMan.PlayerStatusChanged -= OnStatusChanged;
             _configManager.ClearReceivedInitialNwVars();
             OnRunLevelChanged(ClientRunLevel.Initialize);
         }
@@ -255,17 +263,19 @@ namespace Robust.Client
             Reset();
         }
 
-        private void OnStatusChanged(object? sender, SessionStatusEventArgs e)
+        private void OnLocalStatusChanged(object? obj, StatusEventArgs eventArgs)
         {
-            if (e.Session != _playMan.LocalSession)
-                return;
-
             // player finished fully connecting to the server.
             // OldStatus is used here because it can go from connecting-> connected or connecting-> ingame
-            if (e.OldStatus == SessionStatus.Connecting)
-                OnPlayerJoinedServer(e.Session);
-            else if (e.NewStatus == SessionStatus.InGame)
-                OnPlayerJoinedGame(e.Session);
+            if (eventArgs.OldStatus == SessionStatus.Connecting)
+            {
+                OnPlayerJoinedServer(_playMan.LocalPlayer!.Session);
+            }
+
+            if (eventArgs.NewStatus == SessionStatus.InGame)
+            {
+                OnPlayerJoinedGame(_playMan.LocalPlayer!.Session);
+            }
         }
 
         private void OnRunLevelChanged(ClientRunLevel newRunLevel)

Robust.Client/ClientIoC.cs

@@ -1,5 +1,4 @@
 using System;
-using Robust.Client.Audio;
 using Robust.Client.Audio.Midi;
 using Robust.Client.Configuration;
 using Robust.Client.Console;
@@ -7,6 +6,7 @@ using Robust.Client.Debugging;
 using Robust.Client.GameObjects;
 using Robust.Client.GameStates;
 using Robust.Client.Graphics;
+using Robust.Client.Graphics.Audio;
 using Robust.Client.Graphics.Clyde;
 using Robust.Client.Input;
 using Robust.Client.Map;
@@ -37,7 +37,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Physics;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
 using Robust.Shared.Replays;
@@ -107,7 +107,8 @@ namespace Robust.Client
                     deps.Register<IClyde, ClydeHeadless>();
                     deps.Register<IClipboardManager, ClydeHeadless>();
                     deps.Register<IClydeInternal, ClydeHeadless>();
-                    deps.Register<IAudioInternal, HeadlessAudioManager>();
+                    deps.Register<IClydeAudio, ClydeAudioHeadless>();
+                    deps.Register<IClydeAudioInternal, ClydeAudioHeadless>();
                     deps.Register<IInputManager, InputManager>();
                     deps.Register<IFileDialogManager, DummyFileDialogManager>();
                     deps.Register<IUriOpener, UriOpenerDummy>();
@@ -116,7 +117,8 @@ namespace Robust.Client
                     deps.Register<IClyde, Clyde>();
                     deps.Register<IClipboardManager, Clyde>();
                     deps.Register<IClydeInternal, Clyde>();
-                    deps.Register<IAudioInternal, AudioManager>();
+                    deps.Register<IClydeAudio, FallbackProxyClydeAudio>();
+                    deps.Register<IClydeAudioInternal, FallbackProxyClydeAudio>();
                     deps.Register<IInputManager, ClydeInputManager>();
                     deps.Register<IFileDialogManager, FileDialogManager>();
                     deps.Register<IUriOpener, UriOpener>();

Robust.Client/Console/ClientConsoleHost.cs

@@ -13,7 +13,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Reflection;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;

Robust.Client/Console/Commands/AddCompCommand.cs

@@ -26,7 +26,10 @@ namespace Robust.Client.Console.Commands
             var entity = _entityManager.GetEntity(netEntity);
             var componentName = args[1];
 
-            var component = _componentFactory.GetComponent(componentName);
+            var component = (Component) _componentFactory.GetComponent(componentName);
+
+            component.Owner = entity;
+
             _entityManager.AddComponent(entity, component);
         }
     }

Robust.Client/Console/Commands/Debug.cs

@@ -15,7 +15,6 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Asynchronous;
-using Robust.Shared.Audio;
 using Robust.Shared.Console;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
@@ -459,13 +458,13 @@ namespace Robust.Client.Console.Commands
     internal sealed class GuiDumpCommand : LocalizedCommands
     {
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
-        [Dependency] private readonly IResourceManager _resManager = default!;
+        [Dependency] private readonly IResourceCache _res = default!;
 
         public override string Command => "guidump";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            using var writer = _resManager.UserData.OpenWriteText(new ResPath("/guidump.txt"));
+            using var writer = _res.UserData.OpenWriteText(new ResPath("/guidump.txt"));
 
             foreach (var root in _ui.AllRoots)
             {
@@ -645,8 +644,7 @@ namespace Robust.Client.Console.Commands
 
     internal sealed class ReloadShadersCommand : LocalizedCommands
     {
-        [Dependency] private readonly IResourceCache _cache = default!;
-        [Dependency] private readonly IResourceManagerInternal _resManager = default!;
+        [Dependency] private readonly IResourceCacheInternal _res = default!;
         [Dependency] private readonly ITaskManager _taskManager = default!;
 
         public override string Command => "rldshader";
@@ -657,7 +655,7 @@ namespace Robust.Client.Console.Commands
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var resC = _resManager;
+            var resC = _res;
             if (args.Length == 1)
             {
                 if (args[0] == "+watch")
@@ -681,9 +679,9 @@ namespace Robust.Client.Console.Commands
                     var shaderCount = 0;
                     var created = 0;
                     var dirs = new ConcurrentDictionary<string, SortedSet<string>>(stringComparer);
-                    foreach (var (path, src) in _cache.GetAllResources<ShaderSourceResource>())
+                    foreach (var (path, src) in resC.GetAllResources<ShaderSourceResource>())
                     {
-                        if (!_resManager.TryGetDiskFilePath(path, out var fullPath))
+                        if (!resC.TryGetDiskFilePath(path, out var fullPath))
                         {
                             throw new NotImplementedException();
                         }
@@ -732,7 +730,7 @@ namespace Robust.Client.Console.Commands
                                     {
                                         try
                                         {
-                                            _cache.ReloadResource<ShaderSourceResource>(resPath);
+                                            resC.ReloadResource<ShaderSourceResource>(resPath);
                                             shell.WriteLine($"Reloaded shader: {resPath}");
                                         }
                                         catch (Exception)
@@ -793,11 +791,11 @@ namespace Robust.Client.Console.Commands
 
             shell.WriteLine("Reloading content shader resources...");
 
-            foreach (var (path, _) in _cache.GetAllResources<ShaderSourceResource>())
+            foreach (var (path, _) in resC.GetAllResources<ShaderSourceResource>())
             {
                 try
                 {
-                    _cache.ReloadResource<ShaderSourceResource>(path);
+                    resC.ReloadResource<ShaderSourceResource>(path);
                 }
                 catch (Exception)
                 {

Robust.Client/Debugging/DebugAnchoringSystem.cs

@@ -1,7 +1,6 @@
 #if DEBUG
 using System.Numerics;
 using System.Text;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
@@ -9,6 +8,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 
 namespace Robust.Client.Debugging
@@ -19,7 +19,6 @@ namespace Robust.Client.Debugging
         [Dependency] private readonly IInputManager _inputManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterface = default!;
-        [Dependency] private readonly MapSystem _mapSystem = default!;
 
         private Label? _label;
 
@@ -71,7 +70,7 @@ namespace Robust.Client.Debugging
                 return;
             }
 
-            var tile = _mapSystem.GetTileRef(gridUid, grid, spot);
+            var tile = grid.GetTileRef(spot);
             _label.Position = mouseSpot.Position + new Vector2(32, 0);
 
             if (_hovered?.GridId == gridUid && _hovered?.Tile == tile) return;
@@ -80,7 +79,7 @@ namespace Robust.Client.Debugging
 
             var text = new StringBuilder();
 
-            foreach (var ent in _mapSystem.GetAnchoredEntities(gridUid, grid, spot))
+            foreach (var ent in grid.GetAnchoredEntities(spot))
             {
                 if (EntityManager.TryGetComponent<MetaDataComponent>(ent, out var meta))
                 {

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -46,6 +46,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -206,7 +207,6 @@ namespace Robust.Client.Debugging
         private readonly Font _font;
 
         private HashSet<Joint> _drawnJoints = new();
-        private List<Entity<MapGridComponent>> _grids = new();
 
         public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem)
         {
@@ -231,33 +231,32 @@ namespace Robust.Client.Debugging
             {
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
-                    if (_entityManager.HasComponent<MapGridComponent>(physBody)) continue;
+                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner)) continue;
 
-                    var xform = _physicsSystem.GetPhysicsTransform(physBody);
-                    var comp = physBody.Comp;
+                    var xform = _physicsSystem.GetPhysicsTransform(physBody.Owner);
 
                     const float AlphaModifier = 0.2f;
 
-                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody).Fixtures.Values)
+                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody.Owner).Fixtures.Values)
                     {
                         // Invalid shape - Box2D doesn't check for IsSensor but we will for sanity.
-                        if (comp.BodyType == BodyType.Dynamic && fixture.Density == 0f && fixture.Hard)
+                        if (physBody.BodyType == BodyType.Dynamic && fixture.Density == 0f && fixture.Hard)
                         {
                             DrawShape(worldHandle, fixture, xform, Color.Red.WithAlpha(AlphaModifier));
                         }
-                        else if (!comp.CanCollide)
+                        else if (!physBody.CanCollide)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.5f, 0.5f, 0.3f).WithAlpha(AlphaModifier));
                         }
-                        else if (comp.BodyType == BodyType.Static)
+                        else if (physBody.BodyType == BodyType.Static)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.5f, 0.9f, 0.5f).WithAlpha(AlphaModifier));
                         }
-                        else if ((comp.BodyType & (BodyType.Kinematic | BodyType.KinematicController)) != 0x0)
+                        else if ((physBody.BodyType & (BodyType.Kinematic | BodyType.KinematicController)) != 0x0)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.5f, 0.5f, 0.9f).WithAlpha(AlphaModifier));
                         }
-                        else if (!comp.Awake)
+                        else if (!physBody.Awake)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.6f, 0.6f, 0.6f).WithAlpha(AlphaModifier));
                         }
@@ -276,18 +275,15 @@ namespace Robust.Client.Debugging
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
                     var color = Color.Purple.WithAlpha(Alpha);
-                    var transform = _physicsSystem.GetPhysicsTransform(physBody);
-                    worldHandle.DrawCircle(Transform.Mul(transform, physBody.Comp.LocalCenter), 0.2f, color);
+                    var transform = _physicsSystem.GetPhysicsTransform(physBody.Owner);
+                    worldHandle.DrawCircle(Transform.Mul(transform, physBody.LocalCenter), 0.2f, color);
                 }
 
-                _grids.Clear();
-                _mapManager.FindGridsIntersecting(mapId, viewBounds, ref _grids);
-
-                foreach (var grid in _grids)
+                foreach (var grid in _mapManager.FindGridsIntersecting(mapId, viewBounds))
                 {
-                    var physBody = _entityManager.GetComponent<PhysicsComponent>(grid);
+                    var physBody = _entityManager.GetComponent<PhysicsComponent>(grid.Owner);
                     var color = Color.Orange.WithAlpha(Alpha);
-                    var transform = _physicsSystem.GetPhysicsTransform(grid);
+                    var transform = _physicsSystem.GetPhysicsTransform(grid.Owner);
                     worldHandle.DrawCircle(Transform.Mul(transform, physBody.LocalCenter), 1f, color);
                 }
             }
@@ -296,14 +292,14 @@ namespace Robust.Client.Debugging
             {
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
-                    if (_entityManager.HasComponent<MapGridComponent>(physBody)) continue;
+                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner)) continue;
 
-                    var xform = _physicsSystem.GetPhysicsTransform(physBody);
+                    var xform = _physicsSystem.GetPhysicsTransform(physBody.Owner);
 
                     const float AlphaModifier = 0.2f;
                     Box2? aabb = null;
 
-                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody).Fixtures.Values)
+                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody.Owner).Fixtures.Values)
                     {
                         for (var i = 0; i < fixture.Shape.ChildCount; i++)
                         {
@@ -322,11 +318,10 @@ namespace Robust.Client.Debugging
             {
                 _drawnJoints.Clear();
 
-                var query = _entityManager.AllEntityQueryEnumerator<JointComponent>();
-                while (query.MoveNext(out var uid, out var jointComponent))
+                foreach (var jointComponent in _entityManager.EntityQuery<JointComponent>(true))
                 {
                     if (jointComponent.JointCount == 0 ||
-                        !_entityManager.TryGetComponent(uid, out TransformComponent? xf1) ||
+                        !_entityManager.TryGetComponent(jointComponent.Owner, out TransformComponent? xf1) ||
                         !viewAABB.Contains(xf1.WorldPosition)) continue;
 
                     foreach (var (_, joint) in jointComponent.Joints)
@@ -366,9 +361,6 @@ namespace Robust.Client.Debugging
 
                 _debugPhysicsSystem.PointCount = 0;
             }
-
-            worldHandle.UseShader(null);
-            worldHandle.SetTransform(Matrix3.Identity);
         }
 
         private void DrawScreen(DrawingHandleScreen screenHandle, OverlayDrawArgs args)
@@ -378,31 +370,28 @@ namespace Robust.Client.Debugging
 
             if ((_debugPhysicsSystem.Flags & PhysicsDebugFlags.ShapeInfo) != 0x0)
             {
-                var hoverBodies = new List<Entity<PhysicsComponent>>();
+                var hoverBodies = new List<PhysicsComponent>();
                 var bounds = Box2.UnitCentered.Translated(_eyeManager.PixelToMap(mousePos.Position).Position);
 
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, bounds))
                 {
-                    var uid = physBody.Owner;
-                    if (_entityManager.HasComponent<MapGridComponent>(uid)) continue;
-                    hoverBodies.Add((uid, physBody));
+                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner)) continue;
+                    hoverBodies.Add(physBody);
                 }
 
                 var lineHeight = _font.GetLineHeight(1f);
                 var drawPos = mousePos.Position + new Vector2(20, 0) + new Vector2(0, -(hoverBodies.Count * 4 * lineHeight / 2f));
                 int row = 0;
 
-                foreach (var bodyEnt in hoverBodies)
+                foreach (var body in hoverBodies)
                 {
-                    if (bodyEnt != hoverBodies[0])
+                    if (body != hoverBodies[0])
                     {
                         screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), "------");
                         row++;
                     }
 
-                    var body = bodyEnt.Comp;
-
-                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {bodyEnt.Owner}");
+                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {body.Owner}");
                     row++;
                     screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Layer: {Convert.ToString(body.CollisionLayer, 2)}");
                     row++;
@@ -441,9 +430,6 @@ namespace Robust.Client.Debugging
                     }
                 }
             }
-
-            screenHandle.UseShader(null);
-            screenHandle.SetTransform(Matrix3.Identity);
         }
 
         protected internal override void Draw(in OverlayDrawArgs args)
@@ -465,26 +451,11 @@ namespace Robust.Client.Debugging
         {
             switch (fixture.Shape)
             {
-                case ChainShape cShape:
-                {
-                    var count = cShape.Count;
-                    var vertices = cShape.Vertices;
-
-                    var v1 = Transform.Mul(xform, vertices[0]);
-                    for (var i = 1; i < count; ++i)
-                    {
-                        var v2 = Transform.Mul(xform, vertices[i]);
-                        worldHandle.DrawLine(v1, v2, color);
-                        v1 = v2;
-                    }
-                }
-                    break;
                 case PhysShapeCircle circle:
                     var center = Transform.Mul(xform, circle.Position);
                     worldHandle.DrawCircle(center, circle.Radius, color);
                     break;
                 case EdgeShape edge:
-                {
                     var v1 = Transform.Mul(xform, edge.Vertex1);
                     var v2 = Transform.Mul(xform, edge.Vertex2);
                     worldHandle.DrawLine(v1, v2, color);
@@ -494,7 +465,6 @@ namespace Robust.Client.Debugging
                         worldHandle.DrawCircle(v1, 0.1f, color);
                         worldHandle.DrawCircle(v2, 0.1f, color);
                     }
-                }
 
                     break;
                 case PolygonShape poly:

Robust.Client/GameController/GameController.RobustModules.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Reflection;
 using System.Runtime.Loader;
 using Robust.Client.WebViewHook;
-using Robust.Shared.ContentPack;
 using Robust.Shared.Log;
 using Robust.Shared.Utility;
 

Robust.Client/GameController/GameController.Standalone.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using Robust.Client.Timing;
 using Robust.LoaderApi;
@@ -71,27 +70,6 @@ namespace Robust.Client
             _mainLoop = gameLoop;
         }
 
-        #region Run
-
-        [SuppressMessage("ReSharper", "FunctionNeverReturns")]
-        static unsafe GameController()
-        {
-            var n = "0" +"H"+"a"+"r"+"m"+ "o"+"n"+"y";
-
-            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-            {
-                if (assembly.GetName().Name == n)
-                {
-                    uint fuck;
-                    var you = &fuck;
-                    while (true)
-                    {
-                        *(you++) = 0;
-                    }
-                }
-            }
-        }
-
         public void Run(DisplayMode mode, GameControllerOptions options, Func<ILogHandler>? logHandlerFactory = null)
         {
             if (!StartupSystemSplash(options, logHandlerFactory))
@@ -134,8 +112,6 @@ namespace Robust.Client
             _dependencyCollection.Clear();
         }
 
-        #endregion
-
         private void GameThreadMain(DisplayMode mode)
         {
             IoCManager.InitThread(_dependencyCollection);

Robust.Client/GameController/GameController.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Net;
 using System.Runtime;
 using System.Threading.Tasks;
-using Robust.Client.Audio;
 using Robust.Client.Audio.Midi;
 using Robust.Client.Console;
 using Robust.Client.GameObjects;
@@ -25,7 +24,6 @@ using Robust.Client.WebViewHook;
 using Robust.LoaderApi;
 using Robust.Shared;
 using Robust.Shared.Asynchronous;
-using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Exceptions;
@@ -51,7 +49,6 @@ namespace Robust.Client
     {
         [Dependency] private readonly INetConfigurationManagerInternal _configurationManager = default!;
         [Dependency] private readonly IResourceCacheInternal _resourceCache = default!;
-        [Dependency] private readonly IResourceManagerInternal _resManager = default!;
         [Dependency] private readonly IRobustSerializer _serializer = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientNetManager _networkManager = default!;
@@ -71,7 +68,7 @@ namespace Robust.Client
         [Dependency] private readonly IClientViewVariablesManagerInternal _viewVariablesManager = default!;
         [Dependency] private readonly IDiscordRichPresence _discord = default!;
         [Dependency] private readonly IClydeInternal _clyde = default!;
-        [Dependency] private readonly IAudioInternal _audio = default!;
+        [Dependency] private readonly IClydeAudioInternal _clydeAudio = default!;
         [Dependency] private readonly IFontManagerInternal _fontManager = default!;
         [Dependency] private readonly IModLoaderInternal _modLoader = default!;
         [Dependency] private readonly IScriptClient _scriptClient = default!;
@@ -114,7 +111,7 @@ namespace Robust.Client
             DebugTools.AssertNotNull(_resourceManifest);
 
             _clyde.InitializePostWindowing();
-            _audio.InitializePostWindowing();
+            _clydeAudio.InitializePostWindowing();
             _clyde.SetWindowTitle(
                 Options.DefaultWindowTitle ?? _resourceManifest!.DefaultWindowTitle ?? "RobustToolbox");
 
@@ -151,7 +148,7 @@ namespace Robust.Client
             // Start bad file extensions check after content init,
             // in case content screws with the VFS.
             var checkBadExtensions = ProgramShared.CheckBadFileExtensions(
-                _resManager,
+                _resourceCache,
                 _configurationManager,
                 _logManager.GetSawmill("res"));
 
@@ -290,6 +287,78 @@ namespace Robust.Client
             return true;
         }
 
+        private ResourceManifestData LoadResourceManifest()
+        {
+            // Parses /manifest.yml for game-specific settings that cannot be exclusively set up by content code.
+            if (!_resourceCache.TryContentFileRead("/manifest.yml", out var stream))
+                return ResourceManifestData.Default;
+
+            var yamlStream = new YamlStream();
+            using (stream)
+            {
+                using var streamReader = new StreamReader(stream, EncodingHelpers.UTF8);
+                yamlStream.Load(streamReader);
+            }
+
+            if (yamlStream.Documents.Count == 0)
+                return ResourceManifestData.Default;
+
+            if (yamlStream.Documents.Count != 1 || yamlStream.Documents[0].RootNode is not YamlMappingNode mapping)
+            {
+                throw new InvalidOperationException(
+                    "Expected a single YAML document with root mapping for /manifest.yml");
+            }
+
+            var modules = ReadStringArray(mapping, "modules") ?? Array.Empty<string>();
+
+            string? assemblyPrefix = null;
+            if (mapping.TryGetNode("assemblyPrefix", out var prefixNode))
+                assemblyPrefix = prefixNode.AsString();
+
+            string? defaultWindowTitle = null;
+            if (mapping.TryGetNode("defaultWindowTitle", out var winTitleNode))
+                defaultWindowTitle = winTitleNode.AsString();
+
+            string? windowIconSet = null;
+            if (mapping.TryGetNode("windowIconSet", out var iconSetNode))
+                windowIconSet = iconSetNode.AsString();
+
+            string? splashLogo = null;
+            if (mapping.TryGetNode("splashLogo", out var splashNode))
+                splashLogo = splashNode.AsString();
+
+            bool autoConnect = true;
+            if (mapping.TryGetNode("autoConnect", out var autoConnectNode))
+                autoConnect = autoConnectNode.AsBool();
+
+            var clientAssemblies = ReadStringArray(mapping, "clientAssemblies");
+
+            return new ResourceManifestData(
+                modules,
+                assemblyPrefix,
+                defaultWindowTitle,
+                windowIconSet,
+                splashLogo,
+                autoConnect,
+                clientAssemblies
+            );
+
+            static string[]? ReadStringArray(YamlMappingNode mapping, string key)
+            {
+                if (!mapping.TryGetNode(key, out var node))
+                    return null;
+
+                var sequence = (YamlSequenceNode)node;
+                var array = new string[sequence.Children.Count];
+                for (var i = 0; i < array.Length; i++)
+                {
+                    array[i] = sequence[i].AsString();
+                }
+
+                return array;
+            }
+        }
+
         internal bool StartupSystemSplash(
             GameControllerOptions options,
             Func<ILogHandler>? logHandlerFactory,
@@ -363,13 +432,13 @@ namespace Robust.Client
             _parallelMgr.Initialize();
             _prof.Initialize();
 
-            _resManager.Initialize(Options.LoadConfigAndUserData ? userDataDir : null);
+            _resourceCache.Initialize(Options.LoadConfigAndUserData ? userDataDir : null);
 
             var mountOptions = _commandLineArgs != null
                 ? MountOptions.Merge(_commandLineArgs.MountOptions, Options.MountOptions)
                 : Options.MountOptions;
 
-            ProgramShared.DoMounts(_resManager, mountOptions, Options.ContentBuildDirectory,
+            ProgramShared.DoMounts(_resourceCache, mountOptions, Options.ContentBuildDirectory,
                 Options.AssemblyDirectory,
                 Options.LoadContentResources, _loaderArgs != null && !Options.ResourceMountDisabled, ContentStart);
 
@@ -379,16 +448,16 @@ namespace Robust.Client
                 {
                     foreach (var (api, prefix) in mounts)
                     {
-                        _resourceCache.MountLoaderApi(_resManager, api, "", new(prefix));
+                        _resourceCache.MountLoaderApi(api, "", new(prefix));
                     }
                 }
 
                 _stringSerializer.EnableCaching = false;
-                _resourceCache.MountLoaderApi(_resManager, _loaderArgs.FileApi, "Resources/");
+                _resourceCache.MountLoaderApi(_loaderArgs.FileApi, "Resources/");
                 _modLoader.VerifierExtraLoadHandler = VerifierExtraLoadHandler;
             }
 
-            _resourceManifest = ResourceManifestData.LoadResourceManifest(_resManager);
+            _resourceManifest = LoadResourceManifest();
 
             {
                 // Handle GameControllerOptions implicit CVar overrides.
@@ -570,6 +639,11 @@ namespace Robust.Client
                 }
             }
 
+            using (_prof.Group("ClydeAudio"))
+            {
+                _clydeAudio.FrameProcess(frameEventArgs);
+            }
+
             using (_prof.Group("Clyde"))
             {
                 _clyde.FrameProcess(frameEventArgs);
@@ -630,6 +704,7 @@ namespace Robust.Client
             logManager.GetSawmill("ogl.debug.other").Level = LogLevel.Warning;
             logManager.GetSawmill("gdparse").Level = LogLevel.Error;
             logManager.GetSawmill("discord").Level = LogLevel.Warning;
+            logManager.GetSawmill("net.predict").Level = LogLevel.Info;
             logManager.GetSawmill("szr").Level = LogLevel.Info;
             logManager.GetSawmill("loc").Level = LogLevel.Warning;
 
@@ -708,7 +783,21 @@ namespace Robust.Client
         internal void CleanupWindowThread()
         {
             _clyde.Shutdown();
-            _audio.Shutdown();
+            _clydeAudio.Shutdown();
+        }
+
+        private sealed record ResourceManifestData(
+            string[] Modules,
+            string? AssemblyPrefix,
+            string? DefaultWindowTitle,
+            string? WindowIconSet,
+            string? SplashLogo,
+            bool AutoConnect,
+            string[]? ClientAssemblies
+        )
+        {
+            public static readonly ResourceManifestData Default =
+                new ResourceManifestData(Array.Empty<string>(), null, null, null, null, true, null);
         }
 
         public event Action<FrameEventArgs>? TickUpdateOverride;

Robust.Client/GameObjects/ClientEntityManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Prometheus;
 using Robust.Client.GameStates;
 using Robust.Client.Player;
@@ -42,9 +43,9 @@ namespace Robust.Client.GameObjects
             base.FlushEntities();
         }
 
-        EntityUid IClientEntityManagerInternal.CreateEntity(string? prototypeName, out MetaDataComponent metadata)
+        EntityUid IClientEntityManagerInternal.CreateEntity(string? prototypeName)
         {
-            return base.CreateEntity(prototypeName, out metadata);
+            return base.CreateEntity(prototypeName);
         }
 
         void IClientEntityManagerInternal.InitializeEntity(EntityUid entity, MetaDataComponent? meta)
@@ -85,23 +86,21 @@ namespace Robust.Client.GameObjects
         }
 
         /// <inheritdoc />
-        public override void Dirty(EntityUid uid, IComponent component, MetaDataComponent? meta = null)
-        {
-            Dirty(new Entity<IComponent>(uid, component), meta);
-        }
-
-        /// <inheritdoc />
-        public override void Dirty<T>(Entity<T> ent, MetaDataComponent? meta = null)
+        public override void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null)
         {
             //  Client only dirties during prediction
             if (_gameTiming.InPrediction)
-                base.Dirty(ent, meta);
+                base.Dirty(uid, component, meta);
         }
 
-        public override EntityStringRepresentation ToPrettyString(EntityUid uid, MetaDataComponent? metaDataComponent = null)
+        [return: NotNullIfNotNull("uid")]
+        public override EntityStringRepresentation? ToPrettyString(EntityUid? uid)
         {
+            if (uid == null)
+                return null;
+
             if (_playerManager.LocalPlayer?.ControlledEntity == uid)
-                return base.ToPrettyString(uid) with { Session = _playerManager.LocalPlayer.Session };
+                return base.ToPrettyString(uid).Value with { Session = _playerManager.LocalPlayer.Session };
 
             return base.ToPrettyString(uid);
         }
@@ -170,7 +169,7 @@ namespace Robust.Client.GameObjects
         }
 
         /// <inheritdoc />
-        public void SendSystemNetworkMessage(EntityEventArgs message, INetChannel? channel)
+        public void SendSystemNetworkMessage(EntityEventArgs message, INetChannel channel)
         {
             throw new NotSupportedException();
         }

Robust.Client/GameObjects/Components/Animations/AnimationPlayerComponent.cs

@@ -1,6 +1,8 @@
+using System;
 using System.Collections.Generic;
 using Robust.Client.Animations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using static Robust.Client.Animations.AnimationPlaybackShared;
 
 namespace Robust.Client.GameObjects
@@ -19,5 +21,42 @@ namespace Robust.Client.GameObjects
             = new();
 
         internal bool HasPlayingAnimation = false;
+
+        /// <summary>
+        ///     Start playing an animation.
+        /// </summary>
+        /// <param name="animation">The animation to play.</param>
+        /// <param name="key">
+        ///     The key for this animation play. This key can be used to stop playback short later.
+        /// </param>
+        [Obsolete("Use AnimationPlayerSystem.Play() instead")]
+        public void Play(Animation animation, string key)
+        {
+            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AnimationPlayerSystem>().AddComponent(this);
+            var playback = new AnimationPlayback(animation);
+
+            PlayingAnimations.Add(key, playback);
+        }
+
+        [Obsolete("Use AnimationPlayerSystem.HasRunningAnimation() instead")]
+        public bool HasRunningAnimation(string key)
+        {
+            return PlayingAnimations.ContainsKey(key);
+        }
+
+        [Obsolete("Use AnimationPlayerSystem.Stop() instead")]
+        public void Stop(string key)
+        {
+            PlayingAnimations.Remove(key);
+        }
+
+        [Obsolete("Temporary method until the event is replaced with eventbus")]
+        internal void AnimationComplete(string key)
+        {
+            AnimationCompleted?.Invoke(key);
+        }
+
+        [Obsolete("Use AnimationCompletedEvent instead")]
+        public event Action<string>? AnimationCompleted;
     }
 }

Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs

@@ -1,19 +1,23 @@
-using System;
 using System.Collections.Generic;
 using Robust.Client.Animations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Utility;
+using TerraFX.Interop.Windows;
 
 namespace Robust.Client.GameObjects
 {
-    public sealed class AnimationPlayerSystem : EntitySystem
+    public sealed class AnimationPlayerSystem : EntitySystem, IPostInjectInit
     {
-        private readonly List<Entity<AnimationPlayerComponent>> _activeAnimations = new();
+        private readonly List<AnimationPlayerComponent> _activeAnimations = new();
 
         private EntityQuery<MetaDataComponent> _metaQuery;
 
         [Dependency] private readonly IComponentFactory _compFact = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
+        private ISawmill _sawmill = default!;
 
         public override void Initialize()
         {
@@ -35,22 +39,22 @@ namespace Robust.Client.GameObjects
                     continue;
                 }
 
-                if (!Update(uid, anim.Comp, frameTime))
+                if (!Update(uid, anim, frameTime))
                 {
                     continue;
                 }
 
                 _activeAnimations.RemoveSwap(i);
                 i--;
-                anim.Comp.HasPlayingAnimation = false;
+                anim.HasPlayingAnimation = false;
             }
         }
 
-        internal void AddComponent(Entity<AnimationPlayerComponent> ent)
+        internal void AddComponent(AnimationPlayerComponent component)
         {
-            if (ent.Comp.HasPlayingAnimation) return;
-            _activeAnimations.Add(ent);
-            ent.Comp.HasPlayingAnimation = true;
+            if (component.HasPlayingAnimation) return;
+            _activeAnimations.Add(component);
+            component.HasPlayingAnimation = true;
         }
 
         private bool Update(EntityUid uid, AnimationPlayerComponent component, float frameTime)
@@ -75,6 +79,7 @@ namespace Robust.Client.GameObjects
             {
                 component.PlayingAnimations.Remove(key);
                 EntityManager.EventBus.RaiseLocalEvent(uid, new AnimationCompletedEvent {Uid = uid, Key = key}, true);
+                component.AnimationComplete(key);
             }
 
             return false;
@@ -85,29 +90,22 @@ namespace Robust.Client.GameObjects
         /// </summary>
         public void Play(EntityUid uid, Animation animation, string key)
         {
-            var component = EnsureComp<AnimationPlayerComponent>(uid);
-            Play(new Entity<AnimationPlayerComponent>(uid, component), animation, key);
+            var component = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
+            Play(component, animation, key);
         }
 
-        [Obsolete("Use Play(EntityUid<AnimationPlayerComponent> ent, Animation animation, string key) instead")]
         public void Play(EntityUid uid, AnimationPlayerComponent? component, Animation animation, string key)
         {
             component ??= EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
-            Play(new Entity<AnimationPlayerComponent>(uid, component), animation, key);
+            Play(component, animation, key);
         }
 
         /// <summary>
         ///     Start playing an animation.
         /// </summary>
-        [Obsolete("Use Play(EntityUid<AnimationPlayerComponent> ent, Animation animation, string key) instead")]
         public void Play(AnimationPlayerComponent component, Animation animation, string key)
         {
-            Play(new Entity<AnimationPlayerComponent>(component.Owner, component), animation, key);
-        }
-
-        public void Play(Entity<AnimationPlayerComponent> ent, Animation animation, string key)
-        {
-            AddComponent(ent);
+            AddComponent(component);
             var playback = new AnimationPlaybackShared.AnimationPlayback(animation);
 
 #if DEBUG
@@ -119,18 +117,18 @@ namespace Robust.Client.GameObjects
 
                 if (compTrack.ComponentType == null)
                 {
-                    Log.Error("Attempted to play a component animation without any component specified.");
+                    _sawmill.Error($"Attempted to play a component animation without any component specified.");
                     return;
                 }
 
-                if (!EntityManager.TryGetComponent(ent, compTrack.ComponentType, out var animatedComp))
+                if (!EntityManager.TryGetComponent(component.Owner, compTrack.ComponentType, out var animatedComp))
                 {
-                    Log.Error(
-                        $"Attempted to play a component animation, but the entity {ToPrettyString(ent)} does not have the component to be animated: {compTrack.ComponentType}.");
+                    _sawmill.Error(
+                        $"Attempted to play a component animation, but the entity {ToPrettyString(component.Owner)} does not have the component to be animated: {compTrack.ComponentType}.");
                     return;
                 }
 
-                if (IsClientSide(ent) || !animatedComp.NetSyncEnabled)
+                if (IsClientSide(component.Owner) || !animatedComp.NetSyncEnabled)
                     continue;
 
                 var reg = _compFact.GetRegistration(animatedComp);
@@ -138,18 +136,12 @@ namespace Robust.Client.GameObjects
                 // In principle there is nothing wrong with this, as long as the property of the component being
                 // animated is not part of the networked state and setting it does not dirty the component. Hence only a
                 // warning in debug mode.
-                if (reg.NetID != null && compTrack.Property != null)
-                {
-                    if (animatedComp.GetType().GetProperty(compTrack.Property) is { } property &&
-                        property.HasCustomAttribute<AutoNetworkedFieldAttribute>())
-                    {
-                        Log.Warning($"Playing a component animation on a networked component {reg.Name} belonging to {ToPrettyString(ent)}");
-                    }
-                }
+                if (reg.NetID != null)
+                    _sawmill.Warning($"Playing a component animation on a networked component {reg.Name} belonging to {ToPrettyString(component.Owner)}");
             }
 #endif
 
-            ent.Comp.PlayingAnimations.Add(key, playback);
+            component.PlayingAnimations.Add(key, playback);
         }
 
         public bool HasRunningAnimation(EntityUid uid, string key)
@@ -178,19 +170,20 @@ namespace Robust.Client.GameObjects
 
         public void Stop(EntityUid uid, string key)
         {
-            if (!TryComp<AnimationPlayerComponent>(uid, out var player))
-                return;
-
+            if (!TryComp<AnimationPlayerComponent>(uid, out var player)) return;
             player.PlayingAnimations.Remove(key);
         }
 
         public void Stop(EntityUid uid, AnimationPlayerComponent? component, string key)
         {
-            if (!Resolve(uid, ref component, false))
-                return;
-
+            if (!Resolve(uid, ref component, false)) return;
             component.PlayingAnimations.Remove(key);
         }
+
+        void IPostInjectInit.PostInject()
+        {
+            _sawmill = _logManager.GetSawmill("anim");
+        }
     }
 
     public sealed class AnimationCompletedEvent : EntityEventArgs

Robust.Client/GameObjects/EntitySystems/AudioSystem.cs

@@ -0,0 +1,627 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Robust.Client.Audio;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared;
+using Robust.Shared.Audio;
+using Robust.Shared.Exceptions;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.Map;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Players;
+using Robust.Shared.Random;
+using Robust.Shared.Replays;
+using Robust.Shared.Threading;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Robust.Client.GameObjects;
+
+[UsedImplicitly]
+public sealed class AudioSystem : SharedAudioSystem
+{
+    [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
+    [Dependency] private readonly SharedPhysicsSystem _broadPhaseSystem = default!;
+    [Dependency] private readonly IClydeAudio _clyde = default!;
+    [Dependency] private readonly IEyeManager _eyeManager = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IParallelManager _parMan = default!;
+    [Dependency] private readonly SharedTransformSystem _xformSys = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private readonly List<PlayingStream> _playingClydeStreams = new();
+
+    private ISawmill _sawmill = default!;
+
+    private float _maxRayLength;
+
+    /// <inheritdoc />
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeNetworkEvent<PlayAudioEntityMessage>(PlayAudioEntityHandler);
+        SubscribeNetworkEvent<PlayAudioGlobalMessage>(PlayAudioGlobalHandler);
+        SubscribeNetworkEvent<PlayAudioPositionalMessage>(PlayAudioPositionalHandler);
+        SubscribeNetworkEvent<StopAudioMessageClient>(StopAudioMessageHandler);
+
+        _sawmill = _logManager.GetSawmill("audio");
+
+        CfgManager.OnValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
+    }
+
+    public override void Shutdown()
+    {
+        CfgManager.UnsubValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged);
+        foreach (var stream in _playingClydeStreams)
+        {
+            stream.Source.Dispose();
+        }
+        _playingClydeStreams.Clear();
+
+        base.Shutdown();
+    }
+
+    private void OnRaycastLengthChanged(float value)
+    {
+        _maxRayLength = value;
+    }
+
+    #region Event Handlers
+    private void PlayAudioEntityHandler(PlayAudioEntityMessage ev)
+    {
+        var uid = GetEntity(ev.NetEntity);
+        var coords = GetCoordinates(ev.Coordinates);
+        var fallback = GetCoordinates(ev.FallbackCoordinates);
+
+        var stream = EntityManager.EntityExists(uid)
+            ? (PlayingStream?) Play(ev.FileName, uid, fallback, ev.AudioParams, false)
+            : (PlayingStream?) Play(ev.FileName, coords, fallback, ev.AudioParams, false);
+
+        if (stream != null)
+            stream.NetIdentifier = ev.Identifier;
+    }
+
+    private void PlayAudioGlobalHandler(PlayAudioGlobalMessage ev)
+    {
+        var stream = (PlayingStream?) Play(ev.FileName, ev.AudioParams, false);
+        if (stream != null)
+            stream.NetIdentifier = ev.Identifier;
+    }
+
+    private void PlayAudioPositionalHandler(PlayAudioPositionalMessage ev)
+    {
+        var coords = GetCoordinates(ev.Coordinates);
+        var fallback = GetCoordinates(ev.FallbackCoordinates);
+
+        var stream = (PlayingStream?) Play(ev.FileName, coords, fallback, ev.AudioParams, false);
+        if (stream != null)
+            stream.NetIdentifier = ev.Identifier;
+    }
+
+    private void StopAudioMessageHandler(StopAudioMessageClient ev)
+    {
+        var stream = _playingClydeStreams.Find(p => p.NetIdentifier == ev.Identifier);
+        if (stream == null)
+            return;
+
+        stream.Done = true;
+        stream.Source.Dispose();
+        _playingClydeStreams.Remove(stream);
+    }
+    #endregion
+
+    public override void FrameUpdate(float frameTime)
+    {
+        var xforms = GetEntityQuery<TransformComponent>();
+        var physics = GetEntityQuery<PhysicsComponent>();
+        var ourPos = _eyeManager.CurrentEye.Position;
+        var opts = new ParallelOptions { MaxDegreeOfParallelism = _parMan.ParallelProcessCount };
+
+        try
+        {
+            Parallel.ForEach(_playingClydeStreams, opts, (stream) => ProcessStream(stream, ourPos, xforms, physics));
+        }
+        catch (Exception e)
+        {
+            _sawmill.Error($"Caught exception while processing entity streams.");
+            _runtimeLog.LogException(e, $"{nameof(AudioSystem)}.{nameof(FrameUpdate)}");
+        }
+        finally
+        {
+
+            for (var i = _playingClydeStreams.Count - 1; i >= 0; i--)
+            {
+                var stream = _playingClydeStreams[i];
+                if (stream.Done)
+                {
+                    stream.Source.Dispose();
+                    _playingClydeStreams.RemoveSwap(i);
+                }
+            }
+        }
+    }
+
+    private void ProcessStream(PlayingStream stream,
+        MapCoordinates listener,
+        EntityQuery<TransformComponent> xforms,
+        EntityQuery<PhysicsComponent> physics)
+    {
+        if (!stream.Source.IsPlaying)
+        {
+            stream.Done = true;
+            return;
+        }
+
+        if (stream.Source.IsGlobal)
+        {
+            DebugTools.Assert(stream.TrackingCoordinates == null
+                && stream.TrackingEntity == null
+                && stream.TrackingFallbackCoordinates == null);
+
+            return;
+        }
+
+        DebugTools.Assert(stream.TrackingCoordinates != null
+            || stream.TrackingEntity != null
+            || stream.TrackingFallbackCoordinates != null);
+
+        // Get audio Position
+        if (!TryGetStreamPosition(stream, xforms, out var mapPos)
+            || mapPos == MapCoordinates.Nullspace
+            || mapPos.Value.MapId != listener.MapId)
+        {
+            stream.Done = true;
+            return;
+        }
+
+        // Max distance check
+        var delta = mapPos.Value.Position - listener.Position;
+        var distance = delta.Length();
+        if (distance > stream.MaxDistance)
+        {
+            stream.Source.SetVolumeDirect(0);
+            return;
+        }
+
+        // Update audio occlusion
+        float occlusion = 0;
+        if (distance > 0.1)
+        {
+            var rayLength = MathF.Min(distance, _maxRayLength);
+            var ray = new CollisionRay(listener.Position, delta/distance, OcclusionCollisionMask);
+            occlusion = _broadPhaseSystem.IntersectRayPenetration(listener.MapId, ray, rayLength, stream.TrackingEntity);
+        }
+        stream.Source.SetOcclusion(occlusion);
+
+        // Update attenuation dependent volume.
+        UpdatePositionalVolume(stream, distance);
+
+        // Update audio positions.
+        var audioPos = stream.Attenuation != Attenuation.NoAttenuation ? mapPos.Value : listener;
+        if (!stream.Source.SetPosition(audioPos.Position))
+        {
+            _sawmill.Warning("Interrupting positional audio, can't set position.");
+            stream.Source.StopPlaying();
+            return;
+        }
+
+        // Make race cars go NYYEEOOOOOMMMMM
+        if (stream.TrackingEntity != null && physics.TryGetComponent(stream.TrackingEntity, out var physicsComp))
+        {
+            // This actually gets the tracked entity's xform & iterates up though the parents for the second time. Bit
+            // inefficient.
+            var velocity = _physics.GetMapLinearVelocity(stream.TrackingEntity.Value, physicsComp, null, xforms, physics);
+            stream.Source.SetVelocity(velocity);
+        }
+    }
+
+    private void UpdatePositionalVolume(PlayingStream stream, float distance)
+    {
+        // OpenAL also limits the distance to <= AL_MAX_DISTANCE, but since we cull
+        // sources that are further away than stream.MaxDistance, we don't do that.
+        distance = MathF.Max(stream.ReferenceDistance, distance);
+        float gain;
+
+        // Technically these are formulas for gain not decibels but EHHHHHHHH.
+        switch (stream.Attenuation)
+        {
+            case Attenuation.Default:
+                gain = 1f;
+                break;
+            // You thought I'd implement clamping per source? Hell no that's just for the overall OpenAL setting
+            // I didn't even wanna implement this much for linear but figured it'd be cleaner.
+            case Attenuation.InverseDistanceClamped:
+            case Attenuation.InverseDistance:
+                gain = stream.ReferenceDistance
+                        / (stream.ReferenceDistance
+                            + stream.RolloffFactor * (distance - stream.ReferenceDistance));
+
+                break;
+            case Attenuation.LinearDistanceClamped:
+            case Attenuation.LinearDistance:
+                gain = 1f
+                        - stream.RolloffFactor
+                        * (distance - stream.ReferenceDistance)
+                        / (stream.MaxDistance - stream.ReferenceDistance);
+
+                break;
+            case Attenuation.ExponentDistanceClamped:
+            case Attenuation.ExponentDistance:
+                gain = MathF.Pow(distance / stream.ReferenceDistance, -stream.RolloffFactor);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(
+                    $"No implemented attenuation for {stream.Attenuation}");
+        }
+
+        var volume = MathF.Pow(10, stream.Volume / 10);
+        var actualGain = MathF.Max(0f, volume * gain);
+        stream.Source.SetVolumeDirect(actualGain);
+    }
+
+    private bool TryGetStreamPosition(PlayingStream stream, EntityQuery<TransformComponent> xformQuery, [NotNullWhen(true)] out MapCoordinates? mapPos)
+    {
+        if (stream.TrackingCoordinates != null)
+        {
+            mapPos = stream.TrackingCoordinates.Value.ToMap(EntityManager);
+            if (mapPos != MapCoordinates.Nullspace)
+                return true;
+        }
+
+        if (xformQuery.TryGetComponent(stream.TrackingEntity, out var xform)
+            && xform.MapID != MapId.Nullspace)
+        {
+            mapPos = new MapCoordinates(_xformSys.GetWorldPosition(xform, xformQuery), xform.MapID);
+            return true;
+        }
+
+        if (stream.TrackingFallbackCoordinates != null)
+        {
+            mapPos = stream.TrackingFallbackCoordinates.Value.ToMap(EntityManager);
+            return mapPos != MapCoordinates.Nullspace;
+        }
+
+        mapPos = MapCoordinates.Nullspace;
+        return false;
+    }
+
+    #region Play AudioStream
+    private bool TryGetAudio(string filename, [NotNullWhen(true)] out AudioResource? audio)
+    {
+        if (_resourceCache.TryGetResource<AudioResource>(new ResPath(filename), out audio))
+            return true;
+
+        _sawmill.Error($"Server tried to play audio file {filename} which does not exist.");
+        return false;
+    }
+
+    private bool TryCreateAudioSource(AudioStream stream, [NotNullWhen(true)] out IClydeAudioSource? source)
+    {
+        if (!_timing.IsFirstTimePredicted)
+        {
+            source = null;
+            _sawmill.Error($"Tried to create audio source outside of prediction!");
+            DebugTools.Assert(false);
+            return false;
+        }
+
+        source = _clyde.CreateAudioSource(stream);
+        return source != null;
+    }
+
+    private PlayingStream CreateAndStartPlayingStream(IClydeAudioSource source, AudioParams? audioParams, AudioStream stream)
+    {
+        ApplyAudioParams(audioParams, source, stream);
+        source.StartPlaying();
+        var playing = new PlayingStream
+        {
+            Source = source,
+            Attenuation = audioParams?.Attenuation ?? Attenuation.Default,
+            MaxDistance = audioParams?.MaxDistance ?? float.MaxValue,
+            ReferenceDistance = audioParams?.ReferenceDistance ?? 1f,
+            RolloffFactor = audioParams?.RolloffFactor ?? 1f,
+            Volume = audioParams?.Volume ?? 0
+        };
+        _playingClydeStreams.Add(playing);
+        return playing;
+    }
+
+    /// <summary>
+    ///     Play an audio file globally, without position.
+    /// </summary>
+    /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
+    /// <param name="audioParams"></param>
+    private IPlayingAudioStream? Play(string filename, AudioParams? audioParams = null, bool recordReplay = true)
+    {
+        if (recordReplay && _replayRecording.IsRecording)
+        {
+            _replayRecording.RecordReplayMessage(new PlayAudioGlobalMessage
+            {
+                FileName = filename,
+                AudioParams = audioParams ?? AudioParams.Default
+            });
+        }
+
+        return TryGetAudio(filename, out var audio) ? Play(audio, audioParams) : default;
+    }
+
+    /// <summary>
+    ///     Play an audio stream globally, without position.
+    /// </summary>
+    /// <param name="stream">The audio stream to play.</param>
+    /// <param name="audioParams"></param>
+    private IPlayingAudioStream? Play(AudioStream stream, AudioParams? audioParams = null)
+    {
+        if (!TryCreateAudioSource(stream, out var source))
+        {
+            _sawmill.Error($"Error setting up global audio for {stream.Name}: {0}", Environment.StackTrace);
+            return null;
+        }
+
+        source.SetGlobal();
+
+        return CreateAndStartPlayingStream(source, audioParams, stream);
+    }
+
+    /// <summary>
+    ///     Play an audio file following an entity.
+    /// </summary>
+    /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
+    /// <param name="entity">The entity "emitting" the audio.</param>
+    /// <param name="fallbackCoordinates">The map or grid coordinates at which to play the audio when entity is invalid.</param>
+    /// <param name="audioParams"></param>
+    private IPlayingAudioStream? Play(string filename, EntityUid entity, EntityCoordinates? fallbackCoordinates,
+        AudioParams? audioParams = null, bool recordReplay = true)
+    {
+        if (recordReplay && _replayRecording.IsRecording)
+        {
+            _replayRecording.RecordReplayMessage(new PlayAudioEntityMessage
+            {
+                FileName = filename,
+                NetEntity = GetNetEntity(entity),
+                FallbackCoordinates = GetNetCoordinates(fallbackCoordinates) ?? default,
+                AudioParams = audioParams ?? AudioParams.Default
+            });
+        }
+
+        return TryGetAudio(filename, out var audio) ? Play(audio, entity, fallbackCoordinates, audioParams) : default;
+    }
+
+    /// <summary>
+    ///     Play an audio stream following an entity.
+    /// </summary>
+    /// <param name="stream">The audio stream to play.</param>
+    /// <param name="entity">The entity "emitting" the audio.</param>
+    /// <param name="fallbackCoordinates">The map or grid coordinates at which to play the audio when entity is invalid.</param>
+    /// <param name="audioParams"></param>
+    private IPlayingAudioStream? Play(AudioStream stream, EntityUid entity, EntityCoordinates? fallbackCoordinates = null,
+        AudioParams? audioParams = null)
+    {
+        if (!TryCreateAudioSource(stream, out var source))
+        {
+            _sawmill.Error($"Error setting up entity audio for {stream.Name} / {ToPrettyString(entity)}: {0}", Environment.StackTrace);
+            return null;
+        }
+
+        var query = GetEntityQuery<TransformComponent>();
+        var xform = query.GetComponent(entity);
+        var worldPos = _xformSys.GetWorldPosition(xform, query);
+        fallbackCoordinates ??= GetFallbackCoordinates(new MapCoordinates(worldPos, xform.MapID));
+
+        if (!source.SetPosition(worldPos))
+            return Play(stream, fallbackCoordinates.Value, fallbackCoordinates.Value, audioParams);
+
+        var playing = CreateAndStartPlayingStream(source, audioParams, stream);
+        playing.TrackingEntity = entity;
+        playing.TrackingFallbackCoordinates = fallbackCoordinates != EntityCoordinates.Invalid ? fallbackCoordinates : null;
+        return playing;
+    }
+
+    /// <summary>
+    ///     Play an audio file at a static position.
+    /// </summary>
+    /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
+    /// <param name="coordinates">The coordinates at which to play the audio.</param>
+    /// <param name="fallbackCoordinates">The map or grid coordinates at which to play the audio when coordinates are invalid.</param>
+    /// <param name="audioParams"></param>
+    private IPlayingAudioStream? Play(string filename, EntityCoordinates coordinates,
+        EntityCoordinates fallbackCoordinates, AudioParams? audioParams = null, bool recordReplay = true)
+    {
+        if (recordReplay && _replayRecording.IsRecording)
+        {
+            _replayRecording.RecordReplayMessage(new PlayAudioPositionalMessage
+            {
+                FileName = filename,
+                Coordinates = GetNetCoordinates(coordinates),
+                FallbackCoordinates = GetNetCoordinates(fallbackCoordinates),
+                AudioParams = audioParams ?? AudioParams.Default
+            });
+        }
+
+        return TryGetAudio(filename, out var audio) ? Play(audio, coordinates, fallbackCoordinates, audioParams) : default;
+    }
+
+    /// <summary>
+    ///     Play an audio stream at a static position.
+    /// </summary>
+    /// <param name="stream">The audio stream to play.</param>
+    /// <param name="coordinates">The coordinates at which to play the audio.</param>
+    /// <param name="fallbackCoordinates">The map or grid coordinates at which to play the audio when coordinates are invalid.</param>
+    /// <param name="audioParams"></param>
+    private IPlayingAudioStream? Play(AudioStream stream, EntityCoordinates coordinates,
+        EntityCoordinates fallbackCoordinates, AudioParams? audioParams = null)
+    {
+        if (!TryCreateAudioSource(stream, out var source))
+        {
+            _sawmill.Error($"Error setting up coordinates audio for {stream.Name} / {coordinates}: {0}", Environment.StackTrace);
+            return null;
+        }
+
+        if (!source.SetPosition(fallbackCoordinates.Position))
+        {
+            source.Dispose();
+            _sawmill.Warning($"Can't play positional audio \"{stream.Name}\", can't set position.");
+            return null;
+        }
+
+        var playing = CreateAndStartPlayingStream(source, audioParams, stream);
+        playing.TrackingCoordinates = coordinates;
+        playing.TrackingFallbackCoordinates = fallbackCoordinates != EntityCoordinates.Invalid ? fallbackCoordinates : null;
+        return playing;
+    }
+    #endregion
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? PlayPredicted(SoundSpecifier? sound, EntityUid source, EntityUid? user,
+        AudioParams? audioParams = null)
+    {
+        if (_timing.IsFirstTimePredicted || sound == null)
+            return Play(sound, Filter.Local(), source, false, audioParams);
+        return null; // uhh Lets hope predicted audio never needs to somehow store the playing audio....
+    }
+
+    public override IPlayingAudioStream? PlayPredicted(SoundSpecifier? sound, EntityCoordinates coordinates, EntityUid? user,
+        AudioParams? audioParams = null)
+    {
+        if (_timing.IsFirstTimePredicted || sound == null)
+            return Play(sound, Filter.Local(), coordinates, false, audioParams);
+        return null;
+    }
+
+    private void ApplyAudioParams(AudioParams? audioParams, IClydeAudioSource source, AudioStream audio)
+    {
+        if (!audioParams.HasValue)
+            return;
+
+        if (audioParams.Value.Variation.HasValue)
+            source.SetPitch(audioParams.Value.PitchScale
+                            * (float) RandMan.NextGaussian(1, audioParams.Value.Variation.Value));
+        else
+            source.SetPitch(audioParams.Value.PitchScale);
+
+        source.SetVolume(audioParams.Value.Volume);
+        source.SetRolloffFactor(audioParams.Value.RolloffFactor);
+        source.SetMaxDistance(audioParams.Value.MaxDistance);
+        source.SetReferenceDistance(audioParams.Value.ReferenceDistance);
+        source.IsLooping = audioParams.Value.Loop;
+
+        // TODO clamp the offset inside of SetPlaybackPosition() itself.
+        var offset = audioParams.Value.PlayOffsetSeconds;
+        offset = Math.Clamp(offset, 0f, (float) audio.Length.TotalSeconds);
+        source.SetPlaybackPosition(offset);
+    }
+
+    public sealed class PlayingStream : IPlayingAudioStream
+    {
+        public uint? NetIdentifier;
+        public IClydeAudioSource Source = default!;
+        public EntityUid? TrackingEntity;
+        public EntityCoordinates? TrackingCoordinates;
+        public EntityCoordinates? TrackingFallbackCoordinates;
+        public bool Done;
+
+        public float Volume
+        {
+            get => _volume;
+            set
+            {
+                _volume = value;
+                Source.SetVolume(value);
+            }
+        }
+
+        private float _volume;
+
+        public float MaxDistance;
+        public float ReferenceDistance;
+        public float RolloffFactor;
+
+        public Attenuation Attenuation
+        {
+            get => _attenuation;
+            set
+            {
+                if (value == _attenuation) return;
+                _attenuation = value;
+                if (_attenuation != Attenuation.Default)
+                {
+                    // Need to disable default attenuation when using a custom one
+                    // Damn Sloth wanting linear ambience sounds so they smoothly cut-off and are short-range
+                    Source.SetRolloffFactor(0f);
+                }
+            }
+        }
+        private Attenuation _attenuation = Attenuation.Default;
+
+        public void Stop()
+        {
+            Source.StopPlaying();
+        }
+    }
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? PlayGlobal(string filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
+    {
+        return Play(filename, audioParams);
+    }
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? Play(string filename, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
+    {
+        return Play(filename, entity, null, audioParams);
+    }
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? Play(string filename, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
+    {
+        return Play(filename, coordinates, GetFallbackCoordinates(coordinates.ToMap(EntityManager)), audioParams);
+    }
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? PlayGlobal(string filename, ICommonSession recipient, AudioParams? audioParams = null)
+    {
+        return Play(filename, audioParams);
+    }
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? PlayGlobal(string filename, EntityUid recipient, AudioParams? audioParams = null)
+    {
+        return Play(filename, audioParams);
+    }
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? PlayEntity(string filename, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
+    {
+        return Play(filename, uid, null, audioParams);
+    }
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? PlayEntity(string filename, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
+    {
+        return Play(filename, uid, null, audioParams);
+    }
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? PlayStatic(string filename, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    {
+        return Play(filename, coordinates, GetFallbackCoordinates(coordinates.ToMap(EntityManager)), audioParams);
+    }
+
+    /// <inheritdoc />
+    public override IPlayingAudioStream? PlayStatic(string filename, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    {
+        return Play(filename, coordinates, GetFallbackCoordinates(coordinates.ToMap(EntityManager)), audioParams);
+    }
+}

Robust.Client/GameObjects/EntitySystems/EyeSystem.cs

@@ -1,8 +1,9 @@
 using Robust.Client.Graphics;
 using Robust.Client.Physics;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
-using Robust.Shared.Player;
 
 namespace Robust.Client.GameObjects;
 
@@ -14,8 +15,8 @@ public sealed class EyeSystem : SharedEyeSystem
     {
         base.Initialize();
         SubscribeLocalEvent<EyeComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<EyeComponent, LocalPlayerDetachedEvent>(OnEyeDetached);
-        SubscribeLocalEvent<EyeComponent, LocalPlayerAttachedEvent>(OnEyeAttached);
+        SubscribeLocalEvent<EyeComponent, PlayerDetachedEvent>(OnEyeDetached);
+        SubscribeLocalEvent<EyeComponent, PlayerAttachedEvent>(OnEyeAttached);
         SubscribeLocalEvent<EyeComponent, AfterAutoHandleStateEvent>(OnEyeAutoState);
 
         // Make sure this runs *after* entities have been moved by interpolation and movement.
@@ -25,25 +26,35 @@ public sealed class EyeSystem : SharedEyeSystem
 
     private void OnEyeAutoState(EntityUid uid, EyeComponent component, ref AfterAutoHandleStateEvent args)
     {
-        UpdateEye((uid, component));
+        UpdateEye(component);
     }
 
-    private void OnEyeAttached(EntityUid uid, EyeComponent component, LocalPlayerAttachedEvent args)
+    private void OnEyeAttached(EntityUid uid, EyeComponent component, PlayerAttachedEvent args)
     {
-        UpdateEye((uid, component));
-        _eyeManager.CurrentEye = component.Eye;
+        // TODO: This probably shouldn't be nullable bruv.
+        if (component._eye != null)
+        {
+            _eyeManager.CurrentEye = component._eye;
+        }
+
         var ev = new EyeAttachedEvent(uid, component);
         RaiseLocalEvent(uid, ref ev, true);
     }
 
-    private void OnEyeDetached(EntityUid uid, EyeComponent component, LocalPlayerDetachedEvent args)
+    private void OnEyeDetached(EntityUid uid, EyeComponent component, PlayerDetachedEvent args)
     {
         _eyeManager.ClearCurrentEye();
     }
 
     private void OnInit(EntityUid uid, EyeComponent component, ComponentInit args)
     {
-        UpdateEye((uid, component));
+        component._eye = new Eye
+        {
+            Position = Transform(uid).MapPosition,
+            Zoom = component.Zoom,
+            DrawFov = component.DrawFov,
+            Rotation = component.Rotation,
+        };
     }
 
     /// <inheritdoc />
@@ -53,7 +64,7 @@ public sealed class EyeSystem : SharedEyeSystem
 
         while (query.MoveNext(out var uid, out var eyeComponent))
         {
-            if (eyeComponent.Eye == null)
+            if (eyeComponent._eye == null)
                 continue;
 
             if (!TryComp<TransformComponent>(eyeComponent.Target, out var xform))
@@ -62,7 +73,7 @@ public sealed class EyeSystem : SharedEyeSystem
                 eyeComponent.Target = null;
             }
 
-            eyeComponent.Eye.Position = xform.MapPosition;
+            eyeComponent._eye.Position = xform.MapPosition;
         }
     }
 }

Robust.Client/GameObjects/EntitySystems/GridChunkBoundsDebugSystem.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
@@ -59,8 +58,6 @@ namespace Robust.Client.GameObjects
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-        private List<Entity<MapGridComponent>> _grids = new();
-
         public GridChunkBoundsOverlay(IEntityManager entManager, IEyeManager eyeManager, IMapManager mapManager)
         {
             _entityManager = entManager;
@@ -74,15 +71,13 @@ namespace Robust.Client.GameObjects
             var viewport = args.WorldBounds;
             var worldHandle = args.WorldHandle;
 
-            _grids.Clear();
-            _mapManager.FindGridsIntersecting(currentMap, viewport, ref _grids);
-            foreach (var grid in _grids)
+            foreach (var grid in _mapManager.FindGridsIntersecting(currentMap, viewport))
             {
-                var worldMatrix = _entityManager.GetComponent<TransformComponent>(grid).WorldMatrix;
+                var worldMatrix = _entityManager.GetComponent<TransformComponent>(grid.Owner).WorldMatrix;
                 worldHandle.SetTransform(worldMatrix);
                 var transform = new Transform(Vector2.Zero, Angle.Zero);
 
-                var chunkEnumerator = grid.Comp.GetMapChunks(viewport);
+                var chunkEnumerator = grid.GetMapChunks(viewport);
 
                 while (chunkEnumerator.MoveNext(out var chunk))
                 {

Robust.Client/GameObjects/EntitySystems/InputSystem.cs

@@ -3,13 +3,16 @@ using System.Numerics;
 using Robust.Client.GameStates;
 using Robust.Client.Input;
 using Robust.Client.Player;
+using Robust.Shared;
+using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Player;
+using Robust.Shared.Maths;
+using Robust.Shared.Players;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -128,7 +131,7 @@ namespace Robust.Client.GameObjects
 
         public override void Initialize()
         {
-            SubscribeLocalEvent<LocalPlayerAttachedEvent>(OnAttachedEntityChanged);
+            SubscribeLocalEvent<PlayerAttachSysMessage>(OnAttachedEntityChanged);
 
             _conHost.RegisterCommand("incmd",
                 "Inserts an input command into the simulation",
@@ -168,11 +171,11 @@ namespace Robust.Client.GameObjects
             HandleInputCommand(localPlayer.Session, keyFunction, message);
         }
 
-        private void OnAttachedEntityChanged(LocalPlayerAttachedEvent message)
+        private void OnAttachedEntityChanged(PlayerAttachSysMessage message)
         {
-            if (message.Entity != default) // attach
+            if (message.AttachedEntity != default) // attach
             {
-                SetEntityContextActive(_inputManager, message.Entity);
+                SetEntityContextActive(_inputManager, message.AttachedEntity);
             }
             else // detach
             {
@@ -224,4 +227,44 @@ namespace Robust.Client.GameObjects
             _sawmillInputContext = _logManager.GetSawmill("input.context");
         }
     }
+
+    /// <summary>
+    ///     Entity system message that is raised when the player changes attached entities.
+    /// </summary>
+    public sealed class PlayerAttachSysMessage : EntityEventArgs
+    {
+        /// <summary>
+        ///     New entity the player is attached to.
+        /// </summary>
+        public EntityUid AttachedEntity { get; }
+
+        /// <summary>
+        ///     Creates a new instance of <see cref="PlayerAttachSysMessage"/>.
+        /// </summary>
+        /// <param name="attachedEntity">New entity the player is attached to.</param>
+        public PlayerAttachSysMessage(EntityUid attachedEntity)
+        {
+            AttachedEntity = attachedEntity;
+        }
+    }
+
+    public sealed class PlayerAttachedEvent : EntityEventArgs
+    {
+        public PlayerAttachedEvent(EntityUid entity)
+        {
+            Entity = entity;
+        }
+
+        public EntityUid Entity { get; }
+    }
+
+    public sealed class PlayerDetachedEvent : EntityEventArgs
+    {
+        public PlayerDetachedEvent(EntityUid entity)
+        {
+            Entity = entity;
+        }
+
+        public EntityUid Entity { get; }
+    }
 }

Robust.Client/GameObjects/EntitySystems/MidiSystem.cs

@@ -1,4 +1,3 @@
-using Robust.Client.Audio;
 using Robust.Client.Audio.Midi;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -9,13 +8,6 @@ namespace Robust.Client.GameObjects
     {
         [Dependency] private readonly IMidiManager _midiManager = default!;
 
-        public override void Initialize()
-        {
-            base.Initialize();
-            // AudioSystem sets eye position and rotation so rely on those.
-            UpdatesAfter.Add(typeof(AudioSystem));
-        }
-
         public override void FrameUpdate(float frameTime)
         {
             base.FrameUpdate(frameTime);

Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs

@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
 using JetBrains.Annotations;
 using Robust.Client.ComponentTrees;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
-using Robust.Client.Utility;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Graphics.RSI;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
@@ -18,7 +15,6 @@ using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 using static Robust.Client.GameObjects.SpriteComponent;
 
 namespace Robust.Client.GameObjects
@@ -187,48 +183,6 @@ namespace Robust.Client.GameObjects
         {
             _queuedFrameUpdate.Add(uid);
         }
-
-        /// <summary>
-        /// Gets the specified frame for this sprite at the specified time.
-        /// </summary>
-        public Texture GetFrame(SpriteSpecifier spriteSpec, TimeSpan curTime)
-        {
-            Texture? sprite = null;
-
-            switch (spriteSpec)
-            {
-                case SpriteSpecifier.Rsi rsi:
-                    var rsiActual = _resourceCache.GetResource<RSIResource>(rsi.RsiPath).RSI;
-                    rsiActual.TryGetState(rsi.RsiState, out var state);
-                    var frames = state!.GetFrames(RsiDirection.South);
-                    var delays = state.GetDelays();
-                    var totalDelay = delays.Sum();
-                    var time = curTime.TotalSeconds % totalDelay;
-                    var delaySum = 0f;
-
-                    for (var i = 0; i < delays.Length; i++)
-                    {
-                        var delay = delays[i];
-                        delaySum += delay;
-
-                        if (time > delaySum)
-                            continue;
-
-                        sprite = frames[i];
-                        break;
-                    }
-
-                    sprite ??= Frame0(spriteSpec);
-                    break;
-                case SpriteSpecifier.Texture texture:
-                    sprite = texture.GetTexture(_resourceCache);
-                    break;
-                default:
-                    throw new NotImplementedException();
-            }
-
-            return sprite;
-        }
     }
 
     /// <summary>

Robust.Client/GameObjects/EntitySystems/TransformSystem.Component.cs

@@ -1,41 +1,51 @@
 using System.Numerics;
-using Robust.Client.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.GameObjects;
 
 public sealed partial class TransformSystem
 {
-    public override void SetLocalPosition(EntityUid uid, Vector2 value, TransformComponent? xform = null)
+    public override void SetLocalPosition(TransformComponent xform, Vector2 value)
     {
-        if (!XformQuery.Resolve(uid, ref xform))
-            return;
-
+        xform.PrevPosition = xform._localPosition;
         xform.NextPosition = value;
-        ActivateLerp(uid, xform);
-        base.SetLocalPosition(uid, value, xform);
+        xform.LerpParent = xform.ParentUid;
+        base.SetLocalPosition(xform, value);
+        ActivateLerp(xform);
     }
 
-    public override void SetLocalRotation(EntityUid uid, Angle value, TransformComponent? xform = null)
+    public override void SetLocalPositionNoLerp(TransformComponent xform, Vector2 value)
     {
-        if (!XformQuery.Resolve(uid, ref xform))
-            return;
-
-        xform.NextRotation = value;
-        ActivateLerp(uid, xform);
-        base.SetLocalRotation(uid, value, xform);
+        xform.NextPosition = null;
+        xform.LerpParent = EntityUid.Invalid;
+        base.SetLocalPositionNoLerp(xform, value);
     }
 
-    public override void SetLocalPositionRotation(EntityUid uid, Vector2 pos, Angle rot, TransformComponent? xform = null)
+    public override void SetLocalRotationNoLerp(TransformComponent xform, Angle angle)
     {
-        if (!XformQuery.Resolve(uid, ref xform))
-            return;
+        xform.NextRotation = null;
+        xform.LerpParent = EntityUid.Invalid;
+        base.SetLocalRotationNoLerp(xform, angle);
+    }
 
+    public override void SetLocalRotation(TransformComponent xform, Angle angle)
+    {
+        xform.PrevRotation = xform._localRotation;
+        xform.NextRotation = angle;
+        xform.LerpParent = xform.ParentUid;
+        base.SetLocalRotation(xform, angle);
+        ActivateLerp(xform);
+    }
+
+    public override void SetLocalPositionRotation(TransformComponent xform, Vector2 pos, Angle rot)
+    {
+        xform.PrevPosition = xform._localPosition;
         xform.NextPosition = pos;
+        xform.PrevRotation = xform._localRotation;
         xform.NextRotation = rot;
-        ActivateLerp(uid, xform);
-        base.SetLocalPositionRotation(uid, pos, rot, xform);
+        xform.LerpParent = xform.ParentUid;
+        base.SetLocalPositionRotation(xform, pos, rot);
+        ActivateLerp(xform);
     }
 }

Robust.Client/GameObjects/EntitySystems/TransformSystem.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Numerics;
 using JetBrains.Annotations;
@@ -24,15 +25,20 @@ namespace Robust.Client.GameObjects
         private const float MinInterpolationDistance = 0.001f;
         private const float MinInterpolationDistanceSquared = MinInterpolationDistance * MinInterpolationDistance;
 
+        private const double MinInterpolationAngle = Math.PI / 720;
+
+        // 45 degrees.
+        private const double MaxInterpolationAngle = Math.PI / 4;
+
         [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         // Only keep track of transforms actively lerping.
         // Much faster than iterating 3000+ transforms every frame.
-        [ViewVariables] private readonly List<Entity<TransformComponent>> _lerpingTransforms = new();
+        [ViewVariables] private readonly List<TransformComponent> _lerpingTransforms = new();
 
         public void Reset()
         {
-            foreach (var (_, xform) in _lerpingTransforms)
+            foreach (var xform in _lerpingTransforms)
             {
                 xform.ActivelyLerping = false;
                 xform.NextPosition = null;
@@ -42,78 +48,21 @@ namespace Robust.Client.GameObjects
             _lerpingTransforms.Clear();
         }
 
-        public override void ActivateLerp(EntityUid uid, TransformComponent xform)
+        public override void ActivateLerp(TransformComponent xform)
         {
-            // This lerping logic is pretty convoluted and generally assumes that the client does not mispredict.
-            // A more foolproof solution would be to just cache the coordinates at which any given entity was most
-            // recently rendered and using that as the lerp origin. However that'd require enumerating over all entities
-            // every tick which is pretty icky.
-
-            // The general considerations are:
-            // - If the client receives a server state for an entity moving from a->b and predicts nothing else, then it
-            //   should show the entity lerping.
-            // - If the client predicts an entity will move while already lerping due to a state-application, it should
-            //   clear the state's lerp, under the assumption that the client predicted the state and already rendered
-            //   the entity in the state's final position.
-            // - If the client predicts that an entity moves, then we only lerp if this is the first time that the tick
-            //   was predicted. I.e., we assume the entity was already rendered in the final position that was
-            //   previously predicted.
-            // - If the client predicts that an entity should lerp twice in the same tick, then we need to combine them.
-            //   I.e. moving from a->b then b->c, the client should lerp from a->c.
-
-            // If the client predicts an entity moves while already lerping, it should clear the
-            // predict a->b, lerp a->b
-            // predicted a->b, then predict b->c. Lerp b->c
-            // predicted a->b, then predict b->c. Lerp b->c
-            // predicted a->b, predicted b->c, then predict c->d. Lerp c->d
-            // server state a->b, then predicted b->c, lerp b->c
-            // server state a->b, then predicted b->c, then predict d, lerp b->c
-
-            if (_gameTiming.ApplyingState)
-            {
-                if (xform.ActivelyLerping)
-                {
-                    // This should not happen, but can happen if some bad component state application code modifies an entity's coordinates.
-                    Log.Error($"Entity {(ToPrettyString(uid))} tried to lerp twice while applying component states.");
-                    return;
-                }
-
-                _lerpingTransforms.Add((uid, xform));
-                xform.ActivelyLerping = true;
-                xform.PredictedLerp = false;
-                xform.LerpParent = xform.ParentUid;
-                xform.PrevRotation = xform._localRotation;
-                xform.PrevPosition = xform._localPosition;
-                xform.LastLerp = _gameTiming.CurTick;
+            if (xform.ActivelyLerping)
                 return;
-            }
 
-            xform.LastLerp = _gameTiming.CurTick;
-            if (!_gameTiming.IsFirstTimePredicted)
-            {
-                xform.ActivelyLerping = false;
-                return;
-            }
+            xform.ActivelyLerping = true;
+            _lerpingTransforms.Add(xform);
+        }
 
-            if (!xform.ActivelyLerping)
-            {
-                _lerpingTransforms.Add((uid, xform));
-                xform.ActivelyLerping = true;
-                xform.PredictedLerp = true;
-                xform.PrevRotation = xform._localRotation;
-                xform.PrevPosition = xform._localPosition;
-                xform.LerpParent = xform.ParentUid;
-                return;
-            }
-
-            if (!xform.PredictedLerp || xform.LerpParent != xform.ParentUid)
-            {
-                // Existing lerp was not due to prediction, but due to state application. That lerp should already
-                // have been rendered, so we will start a new lerp from the current position.
-                xform.PrevRotation = xform._localRotation;
-                xform.PrevPosition = xform._localPosition;
-                xform.LerpParent = xform.ParentUid;
-            }
+        public override void DeactivateLerp(TransformComponent component)
+        {
+            // this should cause the lerp to do nothing
+            component.NextPosition = null;
+            component.NextRotation = null;
+            component.LerpParent = EntityUid.Invalid;
         }
 
         public override void FrameUpdate(float frameTime)
@@ -124,13 +73,12 @@ namespace Robust.Client.GameObjects
 
             for (var i = 0; i < _lerpingTransforms.Count; i++)
             {
-                var (uid, transform) = _lerpingTransforms[i];
+                var transform = _lerpingTransforms[i];
                 var found = false;
 
                 // Only lerp if parent didn't change.
                 // E.g. entering lockers would do it.
-                if (transform.ActivelyLerping
-                    && transform.LerpParent == transform.ParentUid
+                if (transform.LerpParent == transform.ParentUid
                     && transform.ParentUid.IsValid()
                     && !transform.Deleted)
                 {
@@ -142,7 +90,8 @@ namespace Robust.Client.GameObjects
 
                         if (distance is > MinInterpolationDistanceSquared and < MaxInterpolationDistanceSquared)
                         {
-                            SetLocalPositionNoLerp(uid, Vector2.Lerp(lerpSource, lerpDest, step), transform);
+                            transform.LocalPosition = Vector2.Lerp(lerpSource, lerpDest, step);
+                            // Setting LocalPosition clears LerpPosition so fix that.
                             transform.NextPosition = lerpDest;
                             found = true;
                         }
@@ -152,9 +101,15 @@ namespace Robust.Client.GameObjects
                     {
                         var lerpDest = transform.NextRotation.Value;
                         var lerpSource = transform.PrevRotation;
-                        SetLocalRotationNoLerp(uid, Angle.Lerp(lerpSource, lerpDest, step), transform);
-                        transform.NextRotation = lerpDest;
-                        found = true;
+                        var distance = Math.Abs(Angle.ShortestDistance(lerpDest, lerpSource));
+
+                        if (distance is > MinInterpolationAngle and < MaxInterpolationAngle)
+                        {
+                            transform.LocalRotation = Angle.Lerp(lerpSource, lerpDest, step);
+                            // Setting LocalRotation clears LerpAngle so fix that.
+                            transform.NextRotation = lerpDest;
+                            found = true;
+                        }
                     }
                 }
 

Robust.Client/GameObjects/IClientEntityManagerInternal.cs

@@ -6,7 +6,7 @@ namespace Robust.Client.GameObjects
     {
         // These methods are used by the Game State Manager.
 
-        EntityUid CreateEntity(string? prototypeName, out MetaDataComponent metadata);
+        EntityUid CreateEntity(string? prototypeName);
 
         void InitializeEntity(EntityUid entity, MetaDataComponent? meta = null);
 

Robust.Client/GameStates/ClientGameStateManager.cs

@@ -6,7 +6,6 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
 using JetBrains.Annotations;
-using Microsoft.Extensions.ObjectPool;
 using Robust.Client.GameObjects;
 using Robust.Client.Input;
 using Robust.Client.Physics;
@@ -26,6 +25,8 @@ using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Profiling;
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
@@ -35,7 +36,7 @@ namespace Robust.Client.GameStates
 {
     /// <inheritdoc />
     [UsedImplicitly]
-    public sealed class ClientGameStateManager : IClientGameStateManager
+    public sealed class ClientGameStateManager : IClientGameStateManager, IPostInjectInit
     {
         private GameStateProcessor _processor = default!;
 
@@ -51,14 +52,6 @@ namespace Robust.Client.GameStates
         private readonly Dictionary<NetEntity, EntityState> _toCreate = new();
         private readonly Dictionary<ushort, (IComponent Component, ComponentState? curState, ComponentState? nextState)> _compStateWork = new();
         private readonly Dictionary<EntityUid, HashSet<Type>> _pendingReapplyNetStates = new();
-        private readonly HashSet<NetEntity> _stateEnts = new();
-        private readonly List<EntityUid> _toDelete = new();
-        private readonly List<IComponent> _toRemove = new();
-        private readonly Dictionary<NetEntity, Dictionary<ushort, ComponentState>> _outputData = new();
-        private readonly List<(EntityUid, TransformComponent)> _queuedBroadphaseUpdates = new();
-
-        private readonly ObjectPool<Dictionary<ushort, ComponentState>> _compDataPool =
-            new DefaultObjectPool<Dictionary<ushort, ComponentState>>(new DictPolicy<ushort, ComponentState>(), 256);
 
         private uint _metaCompNetId;
 
@@ -80,13 +73,6 @@ namespace Robust.Client.GameStates
 
         private ISawmill _sawmill = default!;
 
-        /// <summary>
-        /// If we are waiting for a full game state from the server, we will automatically re-send full state requests
-        /// if they do not arrive in time. Ideally this should never happen, this here just in case a client gets
-        /// stuck waiting for a full state that the server doesn't know the client even wants.
-        /// </summary>
-        public static readonly TimeSpan FullStateTimeout = TimeSpan.FromSeconds(10);
-
         /// <inheritdoc />
         public int MinBufferSize => _processor.MinBufferSize;
 
@@ -94,8 +80,7 @@ namespace Robust.Client.GameStates
         public int TargetBufferSize => _processor.TargetBufferSize;
 
         /// <inheritdoc />
-        public int GetApplicableStateCount() => _processor.GetApplicableStateCount();
-        public int StateCount => _processor.StateCount;
+        public int CurrentBufferSize => _processor.CalculateBufferSize(_timing.LastRealTick);
 
         public bool IsPredictionEnabled { get; private set; }
         public bool PredictionNeedsResetting { get; private set; }
@@ -117,22 +102,10 @@ namespace Robust.Client.GameStates
 
         public event Action<MsgStateLeavePvs>? PvsLeave;
 
-#if DEBUG
-        /// <summary>
-        /// If true, this will cause received game states to be ignored. Used by integration tests.
-        /// </summary>
-        public bool DropStates;
-#endif
-
-        private bool _resettingPredictedEntities;
-
         /// <inheritdoc />
         public void Initialize()
         {
-            _sawmill = _logMan.GetSawmill("state");
-            _sawmill.Level = LogLevel.Info;
-
-            _processor = new GameStateProcessor(this, _timing, _sawmill);
+            _processor = new GameStateProcessor(_timing);
 
             _network.RegisterNetMessage<MsgState>(HandleStateMessage);
             _network.RegisterNetMessage<MsgStateLeavePvs>(HandlePvsLeaveMessage);
@@ -148,7 +121,6 @@ namespace Robust.Client.GameStates
             _config.OnValueChanged(CVars.NetPredictLagBias, i => PredictLagBias = i, true);
             _config.OnValueChanged(CVars.NetStateBufMergeThreshold, i => StateBufferMergeThreshold = i, true);
             _config.OnValueChanged(CVars.NetPVSEntityExitBudget, i => _pvsDetachBudget = i, true);
-            _config.OnValueChanged(CVars.NetMaxBufferSize, i => _processor.MaxBufferSize = i, true);
 
             _processor.Interpolation = _config.GetCVar(CVars.NetInterp);
             _processor.BufferSize = _config.GetCVar(CVars.NetBufferSize);
@@ -163,8 +135,6 @@ namespace Robust.Client.GameStates
             _conHost.RegisterCommand("localdelete", Loc.GetString("cmd-local-delete-desc"), Loc.GetString("cmd-local-delete-help"), LocalDeleteEntCommand);
             _conHost.RegisterCommand("fullstatereset", Loc.GetString("cmd-full-state-reset-desc"), Loc.GetString("cmd-full-state-reset-help"), (_,_,_) => RequestFullState());
 
-            _entities.ComponentAdded += OnComponentAdded;
-
             var metaId = _compFactory.GetRegistration(typeof(MetaDataComponent)).NetID;
             if (!metaId.HasValue)
                 throw new InvalidOperationException("MetaDataComponent does not have a NetId.");
@@ -172,23 +142,6 @@ namespace Robust.Client.GameStates
             _metaCompNetId = metaId.Value;
         }
 
-        private void OnComponentAdded(AddedComponentEventArgs args)
-        {
-            if (_resettingPredictedEntities)
-            {
-                var comp = args.ComponentType;
-
-                if (comp.NetID == null)
-                    return;
-
-                _sawmill.Error($"""
-                    Added component {comp.Name} with net id {comp.NetID} while resetting predicted entities.
-                    Stack trace:
-                    {Environment.StackTrace}
-                    """);
-            }
-        }
-
         /// <inheritdoc />
         public void Reset()
         {
@@ -241,10 +194,6 @@ namespace Robust.Client.GameStates
 
         private void HandleStateMessage(MsgState message)
         {
-#if DEBUG
-            if (DropStates)
-                return;
-#endif
             // We ONLY ack states that are definitely going to get applied. Otherwise the sever might assume that we
             // applied a state containing entity-creation information, which it would then no longer send to us when
             // we re-encounter this entity
@@ -276,19 +225,9 @@ namespace Robust.Client.GameStates
         /// <inheritdoc />
         public void ApplyGameState()
         {
-            // If we have been waiting for a full state for a long time, re-request a full state.
-            if (_processor.WaitingForFull
-                && _processor.LastFullStateRequested is {} last
-                && DateTime.UtcNow - last.Time > FullStateTimeout)
-            {
-                // Re-request a full state.
-                // We use the previous from-tick, just in case the full state is already on the way,
-                RequestFullState(null, last.Tick);
-            }
-
             // Calculate how many states we need to apply this tick.
             // Always at least one, but can be more based on StateBufferMergeThreshold.
-            var curBufSize = GetApplicableStateCount();
+            var curBufSize = CurrentBufferSize;
             var targetBufSize = TargetBufferSize;
 
             var bufferOverflow = curBufSize - targetBufSize - StateBufferMergeThreshold;
@@ -329,21 +268,24 @@ namespace Robust.Client.GameStates
                     continue;
                 }
 
-                try
+                if (PredictionNeedsResetting)
                 {
-                    ResetPredictedEntities();
-                }
-                catch (Exception e)
-                {
-                    // avoid exception spam from repeatedly trying to reset the same entity.
-                    _entitySystemManager.GetEntitySystem<ClientDirtySystem>().Reset();
-                    _runtimeLog.LogException(e, "ResetPredictedEntities");
+                    try
+                    {
+                        ResetPredictedEntities();
+                    }
+                    catch (Exception e)
+                    {
+                        // avoid exception spam from repeatedly trying to reset the same entity.
+                        _entitySystemManager.GetEntitySystem<ClientDirtySystem>().Reset();
+                        _runtimeLog.LogException(e, "ResetPredictedEntities");
+                    }
                 }
 
                 // If we were waiting for a new state, we are now applying it.
-                if (_processor.WaitingForFull)
+                if (_processor.LastFullStateRequested.HasValue)
                 {
-                    _processor.OnFullStateReceived();
+                    _processor.LastFullStateRequested = null;
                     _timing.LastProcessedTick = curState.ToSequence;
                     DebugTools.Assert(curState.FromSequence == GameTick.Zero);
                     PartialStateReset(curState, true);
@@ -408,7 +350,7 @@ namespace Robust.Client.GameStates
             if (_processor.WaitingForFull)
                 _timing.TickTimingAdjustment = 0f;
             else
-                _timing.TickTimingAdjustment = (GetApplicableStateCount() - (float)TargetBufferSize) * 0.10f;
+                _timing.TickTimingAdjustment = (CurrentBufferSize - (float)TargetBufferSize) * 0.10f;
 
             // If we are about to process an another tick in the same frame, lets not bother unnecessarily running prediction ticks
             // Really the main-loop ticking just needs to be more specialized for clients.
@@ -453,11 +395,11 @@ namespace Robust.Client.GameStates
             }
         }
 
-        public void RequestFullState(NetEntity? missingEntity = null, GameTick? tick = null)
+        public void RequestFullState(NetEntity? missingEntity = null)
         {
             _sawmill.Info("Requesting full server state");
             _network.ClientSendMessage(new MsgStateRequestFull { Tick = _timing.LastRealTick , MissingEntity = missingEntity ?? NetEntity.Invalid });
-            _processor.OnFullStateRequested(tick ?? _timing.LastRealTick);
+            _processor.RequestFullState();
         }
 
         public void PredictTicks(GameTick predictionTarget)
@@ -526,21 +468,19 @@ namespace Robust.Client.GameStates
 
         public void ResetPredictedEntities()
         {
+            PredictionNeedsResetting = false;
+
             using var _ = _prof.Group("ResetPredictedEntities");
             using var __ = _timing.StartStateApplicationArea();
 
-            // This is terrible, and I hate it. This also needs to run even when prediction is disabled.
-            _entitySystemManager.GetEntitySystem<SharedGridTraversalSystem>().QueuedEvents.Clear();
-            _entitySystemManager.GetEntitySystem<TransformSystem>().Reset();
-
-            if (!PredictionNeedsResetting)
-                return;
-
-            PredictionNeedsResetting = false;
             var countReset = 0;
             var system = _entitySystemManager.GetEntitySystem<ClientDirtySystem>();
             var metaQuery = _entityManager.GetEntityQuery<MetaDataComponent>();
-            RemQueue<IComponent> toRemove = new();
+            RemQueue<Component> toRemove = new();
+
+            // This is terrible, and I hate it.
+            _entitySystemManager.GetEntitySystem<SharedGridTraversalSystem>().QueuedEvents.Clear();
+            _entitySystemManager.GetEntitySystem<TransformSystem>().Reset();
 
             foreach (var entity in system.DirtyEntities)
             {
@@ -558,50 +498,40 @@ namespace Robust.Client.GameStates
 
                 countReset += 1;
 
-                try
+                foreach (var (netId, comp) in meta.NetComponents)
                 {
-                    _resettingPredictedEntities = true;
+                    if (!comp.NetSyncEnabled)
+                        continue;
 
-                    foreach (var (netId, comp) in meta.NetComponents)
+                    // Was this component added during prediction?
+                    if (comp.CreationTick > _timing.LastRealTick)
                     {
-                        if (!comp.NetSyncEnabled)
-                            continue;
-
-                        // Was this component added during prediction?
-                        if (comp.CreationTick > _timing.LastRealTick)
+                        if (last.ContainsKey(netId))
                         {
-                            if (last.ContainsKey(netId))
-                            {
-                                // Component was probably removed and then re-addedd during a single prediction run
-                                // Just reset state as normal.
-                                comp.ClearCreationTick();
-                            }
-                            else
-                            {
-                                toRemove.Add(comp);
-                                if (_sawmill.Level <= LogLevel.Debug)
-                                    _sawmill.Debug($"  A new component was added: {comp.GetType()}");
-                                continue;
-                            }
+                            // Component was probably removed and then re-addedd during a single prediction run
+                            // Just reset state as normal.
+                            comp.ClearCreationTick();
                         }
-
-                        if (comp.LastModifiedTick <= _timing.LastRealTick ||
-                            !last.TryGetValue(netId, out var compState))
+                        else
                         {
+                            toRemove.Add(comp);
+                            if (_sawmill.Level <= LogLevel.Debug)
+                                _sawmill.Debug($"  A new component was added: {comp.GetType()}");
                             continue;
                         }
-
-                        if (_sawmill.Level <= LogLevel.Debug)
-                            _sawmill.Debug($"  A component was dirtied: {comp.GetType()}");
-
-                        var handleState = new ComponentHandleState(compState, null);
-                        _entities.EventBus.RaiseComponentEvent(comp, ref handleState);
-                        comp.LastModifiedTick = _timing.LastRealTick;
                     }
-                }
-                finally
-                {
-                    _resettingPredictedEntities = false;
+
+                    if (comp.LastModifiedTick <= _timing.LastRealTick || !last.TryGetValue(netId, out var compState))
+                    {
+                        continue;
+                    }
+
+                    if (_sawmill.Level <= LogLevel.Debug)
+                        _sawmill.Debug($"  A component was dirtied: {comp.GetType()}");
+
+                    var handleState = new ComponentHandleState(compState, null);
+                    _entities.EventBus.RaiseComponentEvent(comp, ref handleState);
+                    comp.LastModifiedTick = _timing.LastRealTick;
                 }
 
                 // Remove predicted component additions
@@ -655,17 +585,18 @@ namespace Robust.Client.GameStates
         ///     Whenever a new entity is created, the server doesn't send full state data, given that much of the data
         ///     can simply be obtained from the entity prototype information. This function basically creates a fake
         ///     initial server state for any newly created entity. It does this by simply using the standard <see
-        ///     cref="IEntityManager.GetComponentState"/>.
+        ///     cref="IEntityManager.GetComponentState(IEventBus, IComponent)"/>.
         /// </remarks>
         private void MergeImplicitData(IEnumerable<NetEntity> createdEntities)
         {
+            var outputData = new Dictionary<NetEntity, Dictionary<ushort, ComponentState>>();
             var bus = _entityManager.EventBus;
 
             foreach (var netEntity in createdEntities)
             {
                 var (createdEntity, meta) = _entityManager.GetEntityData(netEntity);
-                var compData = _compDataPool.Get();
-                _outputData.Add(netEntity, compData);
+                var compData = new Dictionary<ushort, ComponentState>();
+                outputData.Add(netEntity, compData);
 
                 foreach (var (netId, component) in meta.NetComponents)
                 {
@@ -678,14 +609,7 @@ namespace Robust.Client.GameStates
                 }
             }
 
-            _processor.MergeImplicitData(_outputData);
-
-            foreach (var data in _outputData.Values)
-            {
-                _compDataPool.Return(data);
-            }
-
-            _outputData.Clear();
+            _processor.MergeImplicitData(outputData);
         }
 
         private void AckGameState(GameTick sequence)
@@ -721,7 +645,7 @@ namespace Robust.Client.GameStates
 
             using (_prof.Group("Player"))
             {
-                _players.ApplyPlayerStates(curState.PlayerStates.Value ?? Array.Empty<SessionState>());
+                _players.ApplyPlayerStates(curState.PlayerStates.Value ?? Array.Empty<PlayerState>());
             }
 
             using (_prof.Group("Callback"))
@@ -763,10 +687,12 @@ namespace Robust.Client.GameStates
                     if (metaState == null)
                         throw new MissingMetadataException(es.NetEntity);
 
-                    var uid = _entities.CreateEntity(metaState.PrototypeId, out var newMeta);
+                    var uid = _entities.CreateEntity(metaState.PrototypeId);
                     _toCreate.Add(es.NetEntity, es);
+                    var newMeta = metas.GetComponent(uid);
                     _toApply.Add(uid, (es.NetEntity, newMeta, false, GameTick.Zero, es, null));
 
+
                     // Client creates a client-side net entity for the newly created entity.
                     // We need to clear this mapping before assigning the real net id.
                     // TODO NetEntity Jank: prevent the client from creating this in the first place.
@@ -796,7 +722,9 @@ namespace Robust.Client.GameStates
                 if (_toCreate.ContainsKey(es.NetEntity))
                     continue;
 
-                if (!_entityManager.TryGetEntityData(es.NetEntity, out var uid, out var meta))
+                var uid = _entityManager.GetEntity(es.NetEntity);
+
+                if (!metas.TryGetComponent(uid, out var meta))
                     continue;
 
                 bool isEnteringPvs = (meta.Flags & MetaDataFlags.Detached) != 0;
@@ -811,7 +739,7 @@ namespace Robust.Client.GameStates
                     continue;
                 }
 
-                _toApply.Add(uid.Value, (es.NetEntity, meta, isEnteringPvs, meta.LastStateApplied, es, null));
+                _toApply.Add(uid, (es.NetEntity, meta, isEnteringPvs, meta.LastStateApplied, es, null));
                 meta.LastStateApplied = curState.ToSequence;
             }
 
@@ -857,7 +785,7 @@ namespace Robust.Client.GameStates
                 state = (meta.NetEntity, meta, false, GameTick.Zero, null, null);
             }
 
-            _queuedBroadphaseUpdates.Clear();
+            var queuedBroadphaseUpdates = new List<(EntityUid, TransformComponent)>(enteringPvs);
 
             // Apply entity states.
             using (_prof.Group("Apply States"))
@@ -877,7 +805,7 @@ namespace Robust.Client.GameStates
                     DebugTools.Assert(xform.Broadphase == BroadphaseData.Invalid);
                     xform.Broadphase = null;
                     if (!_toApply.TryGetValue(xform.ParentUid, out var parent) || !parent.EnteringPvs)
-                        _queuedBroadphaseUpdates.Add((entity, xform));
+                        queuedBroadphaseUpdates.Add((entity, xform));
                 }
 
                 _prof.WriteValue("Count", ProfData.Int32(_toApply.Count));
@@ -888,7 +816,7 @@ namespace Robust.Client.GameStates
             {
                 try
                 {
-                    foreach (var (uid, xform) in _queuedBroadphaseUpdates)
+                    foreach (var (uid, xform) in queuedBroadphaseUpdates)
                     {
                         lookupSys.FindAndAddToEntityTree(uid, true, xform);
                     }
@@ -905,7 +833,7 @@ namespace Robust.Client.GameStates
             {
                 try
                 {
-                    ProcessDeletions(delSpan, xforms, xformSys);
+                    ProcessDeletions(delSpan, xforms, metas, xformSys);
                 }
                 catch (Exception e)
                 {
@@ -942,17 +870,17 @@ namespace Robust.Client.GameStates
             _sawmill.Info($"Resetting all entity states to tick {state.ToSequence}.");
 
             // Construct hashset for set.Contains() checks.
-            _stateEnts.Clear();
             var entityStates = state.EntityStates.Span;
+            var stateEnts = new HashSet<NetEntity>();
             foreach (var entState in entityStates)
             {
-                _stateEnts.Add(entState.NetEntity);
+                stateEnts.Add(entState.NetEntity);
             }
 
             var xforms = _entities.GetEntityQuery<TransformComponent>();
             var xformSys = _entitySystemManager.GetEntitySystem<SharedTransformSystem>();
 
-            _toDelete.Clear();
+            var toDelete = new List<EntityUid>(Math.Max(64, _entities.EntityCount - stateEnts.Count));
 
             // Client side entities won't need the transform, but that should always be a tiny minority of entities
             var metaQuery = _entityManager.AllEntityQueryEnumerator<MetaDataComponent, TransformComponent>();
@@ -963,16 +891,14 @@ namespace Robust.Client.GameStates
                 if (metadata.NetEntity.IsClientSide())
                 {
                     if (deleteClientEntities)
-                        _toDelete.Add(ent);
-
+                        toDelete.Add(ent);
                     continue;
                 }
 
-                if (_stateEnts.Contains(netEnt))
+                if (stateEnts.Contains(netEnt))
                 {
                     if (resetAllEntities || metadata.LastStateApplied > state.ToSequence)
                         metadata.LastStateApplied = GameTick.Zero; // TODO track last-state-applied for individual components? Is it even worth it?
-
                     continue;
                 }
 
@@ -990,14 +916,13 @@ namespace Robust.Client.GameStates
                         && !deleteClientEntities // don't add duplicates
                         && _entities.IsClientSide(child.Value))
                     {
-                        _toDelete.Add(child.Value);
+                        toDelete.Add(child.Value);
                     }
                 }
-
-                _toDelete.Add(ent);
+                toDelete.Add(ent);
             }
 
-            foreach (var ent in _toDelete)
+            foreach (var ent in toDelete)
             {
                 _entities.DeleteEntity(ent);
             }
@@ -1006,6 +931,7 @@ namespace Robust.Client.GameStates
         private void ProcessDeletions(
             ReadOnlySpan<NetEntity> delSpan,
             EntityQuery<TransformComponent> xforms,
+            EntityQuery<MetaDataComponent> metas,
             SharedTransformSystem xformSys)
         {
             // Processing deletions is non-trivial, because by default deletions will also delete all child entities.
@@ -1076,7 +1002,6 @@ namespace Robust.Client.GameStates
             // things like container insertion and ejection.
 
             using var _ = _prof.Group("Leave PVS");
-            detached.EnsureCapacity(toDetach.Count);
 
             foreach (var (tick, ents) in toDetach)
             {
@@ -1099,7 +1024,9 @@ namespace Robust.Client.GameStates
         {
             foreach (var netEntity in entities)
             {
-                if (!_entityManager.TryGetEntityData(netEntity, out var ent, out var meta))
+                var ent = _entityManager.GetEntity(netEntity);
+
+                if (!metas.TryGetComponent(ent, out var meta))
                     continue;
 
                 if (meta.LastStateApplied > maxTick)
@@ -1115,10 +1042,10 @@ namespace Robust.Client.GameStates
                 if (lastStateApplied.HasValue)
                     meta.LastStateApplied = lastStateApplied.Value;
 
-                var xform = xforms.GetComponent(ent.Value);
+                var xform = xforms.GetComponent(ent);
                 if (xform.ParentUid.IsValid())
                 {
-                    lookupSys.RemoveFromEntityTree(ent.Value, xform);
+                    lookupSys.RemoveFromEntityTree(ent, xform);
                     xform.Broadphase = BroadphaseData.Invalid;
 
                     // In some cursed scenarios an entity inside of a container can leave PVS without the container itself leaving PVS.
@@ -1127,13 +1054,13 @@ namespace Robust.Client.GameStates
                     if ((meta.Flags & MetaDataFlags.InContainer) != 0 &&
                         metas.TryGetComponent(xform.ParentUid, out var containerMeta) &&
                         (containerMeta.Flags & MetaDataFlags.Detached) == 0 &&
-                        containerSys.TryGetContainingContainer(xform.ParentUid, ent.Value, out container, null, true))
+                        containerSys.TryGetContainingContainer(xform.ParentUid, ent, out container, null, true))
                     {
-                        container.Remove(ent.Value, _entities, xform, meta, false, true);
+                        container.Remove(ent, _entities, xform, meta, false, true);
                     }
 
                     meta._flags |= MetaDataFlags.Detached;
-                    xformSys.DetachParentToNull(ent.Value, xform);
+                    xformSys.DetachParentToNull(ent, xform);
                     DebugTools.Assert((meta.Flags & MetaDataFlags.InContainer) == 0);
 
                     if (container != null)
@@ -1213,15 +1140,14 @@ namespace Robust.Client.GameStates
             // First remove any deleted components
             if (curState?.NetComponents != null)
             {
-                _toRemove.Clear();
-
+                RemQueue<Component> toRemove = new();
                 foreach (var (id, comp) in meta.NetComponents)
                 {
                     if (comp.NetSyncEnabled && !curState.NetComponents.Contains(id))
-                        _toRemove.Add(comp);
+                        toRemove.Add(comp);
                 }
 
-                foreach (var comp in _toRemove)
+                foreach (var comp in toRemove)
                 {
                     _entities.RemoveComponent(uid, comp, meta);
                 }
@@ -1238,7 +1164,8 @@ namespace Robust.Client.GameStates
                 {
                     if (!meta.NetComponents.TryGetValue(id, out var comp))
                     {
-                        comp = _compFactory.GetComponent(id);
+                        comp = (Component) _compFactory.GetComponent(id);
+                        comp.Owner = uid;
                         _entityManager.AddComponent(uid, comp, true, metadata: meta);
                     }
 
@@ -1251,7 +1178,8 @@ namespace Robust.Client.GameStates
                 {
                     if (!meta.NetComponents.TryGetValue(compChange.NetID, out var comp))
                     {
-                        comp = _compFactory.GetComponent(compChange.NetID);
+                        comp = (Component) _compFactory.GetComponent(compChange.NetID);
+                        comp.Owner = uid;
                         _entityManager.AddComponent(uid, comp, true, metadata:meta);
                     }
                     else if (compChange.LastModifiedTick <= lastApplied && lastApplied != GameTick.Zero)
@@ -1321,9 +1249,7 @@ namespace Robust.Client.GameStates
                     var handleState = new ComponentHandleState(cur, next);
                     bus.RaiseComponentEvent(comp, ref handleState);
                 }
-#pragma warning disable CS0168 // Variable is declared but never used
                 catch (Exception e)
-#pragma warning restore CS0168 // Variable is declared but never used
                 {
 #if EXCEPTION_TOLERANCE
                     _sawmill.Error($"Failed to apply comp state: entity={_entities.ToPrettyString(uid)}, comp={comp.GetType()}");
@@ -1479,7 +1405,8 @@ namespace Robust.Client.GameStates
             {
                 if (!meta.NetComponents.TryGetValue(id, out var comp))
                 {
-                    comp = _compFactory.GetComponent(id);
+                    comp = (Component) _compFactory.GetComponent(id);
+                    comp.Owner = uid;
                     _entityManager.AddComponent(uid, comp, true, meta);
                 }
 
@@ -1488,23 +1415,24 @@ namespace Robust.Client.GameStates
             }
 
             // ensure we don't have any extra components
-            _toRemove.Clear();
-
+            RemQueue<Component> toRemove = new();
             foreach (var (id, comp) in meta.NetComponents)
             {
                 if (comp.NetSyncEnabled && !lastState.ContainsKey(id))
-                    _toRemove.Add(comp);
+                    toRemove.Add(comp);
             }
 
-            foreach (var comp in _toRemove)
+            foreach (var comp in toRemove)
             {
                 _entities.RemoveComponent(uid, comp);
             }
         }
         #endregion
 
-        public bool IsQueuedForDetach(NetEntity entity)
-            => _processor.IsQueuedForDetach(entity);
+        void IPostInjectInit.PostInject()
+        {
+            _sawmill = _logMan.GetSawmill(CVars.NetPredict.Name);
+        }
     }
 
     public sealed class GameStateAppliedArgs : EventArgs

Robust.Client/GameStates/GameStateProcessor.cs

@@ -1,33 +1,46 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using Robust.Client.Timing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
+using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Network.Messages;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Robust.Client.GameStates
 {
     /// <inheritdoc />
-    internal sealed class GameStateProcessor : IGameStateProcessor
+    internal sealed class GameStateProcessor : IGameStateProcessor, IPostInjectInit
     {
+        [Dependency] private ILogManager _logMan = default!;
+
         private readonly IClientGameTiming _timing;
-        private readonly IClientGameStateManager _state;
-        private readonly ISawmill _logger;
 
         private readonly List<GameState> _stateBuffer = new();
 
         private readonly Dictionary<GameTick, List<NetEntity>> _pvsDetachMessages = new();
+
+        private ISawmill _logger = default!;
+        private ISawmill _stateLogger = default!;
+
         public GameState? LastFullState { get; private set; }
         public bool WaitingForFull => LastFullStateRequested.HasValue;
-        public (GameTick Tick, DateTime Time)? LastFullStateRequested { get; private set; } = (GameTick.Zero, DateTime.MaxValue);
+        public GameTick? LastFullStateRequested
+        {
+            get => _lastFullStateRequested;
+            set
+            {
+                _lastFullStateRequested = value;
+                LastFullState = null;
+            }
+        }
+
+        public GameTick? _lastFullStateRequested = GameTick.Zero;
 
         private int _bufferSize;
-        private int _maxBufferSize = 512;
-        public const int MinimumMaxBufferSize = 256;
 
         /// <summary>
         /// This dictionary stores the full most recently received server state of any entity. This is used whenever predicted entities get reset.
@@ -48,14 +61,7 @@ namespace Robust.Client.GameStates
         public int BufferSize
         {
             get => _bufferSize;
-            set => _bufferSize = Math.Max(value, 0);
-        }
-
-        public int MaxBufferSize
-        {
-            get => _maxBufferSize;
-            // We place a lower bound on the maximum size to avoid spamming servers with full game state requests.
-            set => _maxBufferSize = Math.Max(value, MinimumMaxBufferSize);
+            set => _bufferSize = value < 0 ? 0 : value;
         }
 
         /// <inheritdoc />
@@ -65,12 +71,9 @@ namespace Robust.Client.GameStates
         ///     Constructs a new instance of <see cref="GameStateProcessor"/>.
         /// </summary>
         /// <param name="timing">Timing information of the current state.</param>
-        /// <param name="clientGameStateManager"></param>
-        public GameStateProcessor(IClientGameStateManager state, IClientGameTiming timing, ISawmill logger)
+        public GameStateProcessor(IClientGameTiming timing)
         {
             _timing = timing;
-            _state = state;
-            _logger = logger;
         }
 
         /// <inheritdoc />
@@ -80,7 +83,7 @@ namespace Robust.Client.GameStates
             if (state.ToSequence <= _timing.LastRealTick)
             {
                 if (Logging)
-                    _logger.Debug($"Received Old GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
+                    _stateLogger.Debug($"Received Old GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
 
                 return false;
             }
@@ -92,7 +95,7 @@ namespace Robust.Client.GameStates
                     continue;
 
                 if (Logging)
-                    _logger.Debug($"Received Dupe GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
+                    _stateLogger.Debug($"Received Dupe GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
 
                 return false;
             }
@@ -101,68 +104,34 @@ namespace Robust.Client.GameStates
             if (!WaitingForFull)
             {
                 // This is a good state that we will be using.
-                TryAdd(state);
+                _stateBuffer.Add(state);
                 if (Logging)
-                    _logger.Debug($"Received New GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
+                    _stateLogger.Debug($"Received New GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
                 return true;
             }
 
-            if (LastFullState == null && state.FromSequence == GameTick.Zero)
+            if (LastFullState == null && state.FromSequence == GameTick.Zero && state.ToSequence >= LastFullStateRequested!.Value)
             {
-                if (state.ToSequence >= LastFullStateRequested!.Value.Tick)
-                {
-                    LastFullState = state;
-                    _logger.Info($"Received Full GameState: to={state.ToSequence}, sz={state.PayloadSize}");
-                    return true;
-                }
+                LastFullState = state;
 
-                _logger.Info($"Received a late full game state. Received: {state.ToSequence}. Requested: {LastFullStateRequested.Value.Tick}");
+                if (Logging)
+                    _logger.Info($"Received Full GameState: to={state.ToSequence}, sz={state.PayloadSize}");
+
+                return true;
             }
 
             if (LastFullState != null && state.ToSequence <= LastFullState.ToSequence)
             {
-                _logger.Info($"While waiting for full, received late GameState with lower to={state.ToSequence} than the last full state={LastFullState.ToSequence}");
+                if (Logging)
+                    _logger.Info($"While waiting for full, received late GameState with lower to={state.ToSequence} than the last full state={LastFullState.ToSequence}");
+
                 return false;
             }
 
-            TryAdd(state);
+            _stateBuffer.Add(state);
             return true;
         }
 
-        public void TryAdd(GameState state)
-        {
-            if (_stateBuffer.Count <= MaxBufferSize)
-            {
-                _stateBuffer.Add(state);
-                return;
-            }
-
-            // This can happen if a required state gets dropped somehow and the client keeps receiving future
-            // game states that they can't apply. I.e., GetApplicableStateCount() is zero, even though there are many
-            // states in the list.
-            //
-            // This can seemingly happen when the server sends ""reliable"" game states while the client is paused?
-            // For example, when debugging the client, while the server is running:
-            // - The client stops sending acks for states that the server sends out.
-            // - Thus the client will exceed the net.force_ack_threshold cvar
-            // - The server starts sending some packets ""reliably"" and just force updates the clients last ack.
-            //
-            // What should happen is that when the client resumes, it receives the reliably sent states and can just
-            // resume. However, even though the packets are sent ""reliably"", they just seem to get dropped.
-            // I don't quite understand how/why yet, but this ensures the client doesn't get stuck.
-#if FULL_RELEASE
-            _logger.Warning(@$"Exceeded maximum state buffer size!
-Tick: {_timing.CurTick}/{_timing.LastProcessedTick}/{_timing.LastRealTick}
-Size: {_stateBuffer.Count}
-Applicable states: {GetApplicableStateCount()}
-Was waiting for full: {WaitingForFull} {LastFullStateRequested}
-Had full state: {LastFullState != null}"
-            );
-#endif
-
-            _state.RequestFullState();
-        }
-
         /// <summary>
         ///     Attempts to get the current and next states to apply.
         /// </summary>
@@ -183,7 +152,7 @@ Had full state: {LastFullState != null}"
                     "Tried to apply a non-extrapolated state that has too high of a FromSequence!");
 
                 if (Logging)
-                    _logger.Debug($"Applying State:  cTick={_timing.LastProcessedTick}, fSeq={curState.FromSequence}, tSeq={curState.ToSequence}, buf={_stateBuffer.Count}");
+                    _stateLogger.Debug($"Applying State:  cTick={_timing.LastProcessedTick}, fSeq={curState.FromSequence}, tSeq={curState.ToSequence}, buf={_stateBuffer.Count}");
             }
 
             return applyNextState;
@@ -375,20 +344,14 @@ Had full state: {LastFullState != null}"
         {
             _stateBuffer.Clear();
             LastFullState = null;
-            LastFullStateRequested = (GameTick.Zero, DateTime.MaxValue);
+            LastFullStateRequested = GameTick.Zero;
         }
 
-        public void OnFullStateRequested(GameTick tick)
+        public void RequestFullState()
         {
             _stateBuffer.Clear();
             LastFullState = null;
-            LastFullStateRequested = (tick, DateTime.UtcNow);
-        }
-
-        public void OnFullStateReceived()
-        {
-            LastFullState = null;
-            LastFullStateRequested = null;
+            LastFullStateRequested = _timing.LastRealTick;
         }
 
         public void MergeImplicitData(Dictionary<NetEntity, Dictionary<ushort, ComponentState>> implicitData)
@@ -441,23 +404,10 @@ Had full state: {LastFullState != null}"
             return _lastStateFullRep.TryGetValue(entity, out dictionary);
         }
 
-        public bool IsQueuedForDetach(NetEntity entity)
+        public int CalculateBufferSize(GameTick fromTick)
         {
-            // This isn't fast, but its just meant for use in tests & debug asserts.
-            foreach (var msg in _pvsDetachMessages.Values)
-            {
-                if (msg.Contains(entity))
-                    return true;
-            }
-
-            return false;
-        }
-
-        public int GetApplicableStateCount(GameTick? fromTick = null)
-        {
-            fromTick ??= _timing.LastRealTick;
             bool foundState;
-            var nextTick = fromTick.Value;
+            var nextTick = fromTick;
 
             do
             {
@@ -475,9 +425,13 @@ Had full state: {LastFullState != null}"
             }
             while (foundState);
 
-            return (int) (nextTick.Value - fromTick.Value.Value);
+            return (int) (nextTick.Value - fromTick.Value);
         }
 
-        public int StateCount => _stateBuffer.Count;
+        void IPostInjectInit.PostInject()
+        {
+            _logger = _logMan.GetSawmill("net");
+            _stateLogger = _logMan.GetSawmill("net.state");
+        }
     }
 }

Robust.Client/GameStates/IClientGameStateManager.cs

@@ -32,15 +32,7 @@ namespace Robust.Client.GameStates
         /// <summary>
         ///     Number of applicable game states currently in the state buffer.
         /// </summary>
-        int GetApplicableStateCount();
-
-        [Obsolete("use GetApplicableStateCount()")]
-        int CurrentBufferSize => GetApplicableStateCount();
-
-        /// <summary>
-        ///     Total number of game states currently in the state buffer.
-        /// </summary>
-        int StateCount { get; }
+        int CurrentBufferSize { get; }
 
         /// <summary>
         ///     If the buffer size is this many states larger than the target buffer size,
@@ -99,7 +91,7 @@ namespace Robust.Client.GameStates
         /// <summary>
         ///     Requests a full state from the server. This should override even implicit entity data.
         /// </summary>
-        void RequestFullState(NetEntity? missingEntity = null, GameTick? tick = null);
+        void RequestFullState(NetEntity? missingEntity = null);
 
         uint SystemMessageDispatched<T>(T message) where T : EntityEventArgs;
 

Robust.Client/GameStates/IGameStateProcessor.cs

@@ -96,7 +96,7 @@ namespace Robust.Client.GameStates
         ///     This includes only applicable states. If there is a gap, future buffers are not included.
         /// </summary>
         /// <param name="fromTick">The tick to calculate from.</param>
-        int GetApplicableStateCount(GameTick? fromTick);
+        int CalculateBufferSize(GameTick fromTick);
 
         bool TryGetLastServerStates(NetEntity entity,
             [NotNullWhen(true)] out Dictionary<ushort, ComponentState>? dictionary);

Robust.Client/GameStates/NetGraphOverlay.cs

@@ -68,7 +68,7 @@ namespace Robust.Client.GameStates
             var lag = _netManager.ServerChannel!.Ping;
 
             // calc interp info
-            var buffer = _gameStateManager.GetApplicableStateCount();
+            var buffer = _gameStateManager.CurrentBufferSize;
 
             _totalHistoryPayload += sz;
             _history.Add((toSeq, sz, lag, buffer));
@@ -268,7 +268,7 @@ namespace Robust.Client.GameStates
                 handle.DrawString(_font, new Vector2(LeftMargin + width, lastLagY), $"{lastLagMs.ToString()}ms");
 
             // buffer text
-            handle.DrawString(_font, new Vector2(LeftMargin, height + LowerGraphOffset), $"{_gameStateManager.GetApplicableStateCount().ToString()} states");
+            handle.DrawString(_font, new Vector2(LeftMargin, height + LowerGraphOffset), $"{_gameStateManager.CurrentBufferSize.ToString()} states");
         }
 
         protected override void DisposeBehavior()

Robust.Client/GameStates/NetInterpOverlay.cs

@@ -1,19 +1,19 @@
-using System;
 using Robust.Shared.Enums;
 using Robust.Client.Graphics;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Containers;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 
 namespace Robust.Client.GameStates
 {
     internal sealed class NetInterpOverlay : Overlay
     {
-        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -24,11 +24,6 @@ namespace Robust.Client.GameStates
         private readonly SharedContainerSystem _container;
         private readonly SharedTransformSystem _xform;
 
-        /// <summary>
-        /// When an entity stops lerping the overlay will continue to draw a box around the entity for this amount of time.
-        /// </summary>
-        public static readonly TimeSpan Delay = TimeSpan.FromSeconds(2f);
-
         public NetInterpOverlay(EntityLookupSystem lookup)
         {
             IoCManager.InjectDependencies(this);
@@ -45,8 +40,8 @@ namespace Robust.Client.GameStates
             var worldHandle = (DrawingHandleWorld) handle;
             var viewport = args.WorldAABB;
 
-            var query = _entityManager.AllEntityQueryEnumerator<TransformComponent>();
-            while (query.MoveNext(out var uid, out var transform))
+            var query = _entityManager.AllEntityQueryEnumerator<PhysicsComponent, TransformComponent>();
+            while (query.MoveNext(out var uid, out var physics, out var transform))
             {
                 // if not on the same map, continue
                 if (transform.MapID != _eyeManager.CurrentMap || _container.IsEntityInContainer(uid))
@@ -55,8 +50,8 @@ namespace Robust.Client.GameStates
                 if (transform.GridUid == uid)
                     continue;
 
-                var delta = (_timing.CurTick.Value - transform.LastLerp.Value) * _timing.TickPeriod;
-                if(!transform.ActivelyLerping && delta > Delay)
+                // This entity isn't lerping, no need to draw debug info for it
+                if(transform.NextPosition == null)
                     continue;
 
                 var aabb = _lookup.GetWorldAABB(uid);
@@ -66,9 +61,7 @@ namespace Robust.Client.GameStates
                     continue;
 
                 var (pos, rot) = _xform.GetWorldPositionRotation(transform, _entityManager.GetEntityQuery<TransformComponent>());
-                var boxOffset = transform.NextPosition != null
-                    ? transform.NextPosition.Value - transform.LocalPosition
-                    : default;
+                var boxOffset = transform.NextPosition.Value - transform.LocalPosition;
                 var worldOffset = (rot - transform.LocalRotation).RotateVec(boxOffset);
 
                 var nextPos = pos + worldOffset;

Robust.Client/Graphics/Audio/ClydeAudio.ALDisposeQueues.cs

@@ -0,0 +1,59 @@
+using System.Collections.Concurrent;
+using OpenTK.Audio.OpenAL;
+
+namespace Robust.Client.Graphics.Audio
+{
+    internal partial class ClydeAudio
+    {
+        // Used to track audio sources that were disposed in the finalizer thread,
+        // so we need to properly send them off in the main thread.
+        private readonly ConcurrentQueue<(int sourceHandle, int filterHandle)> _sourceDisposeQueue = new();
+        private readonly ConcurrentQueue<(int sourceHandle, int filterHandle)> _bufferedSourceDisposeQueue = new();
+        private readonly ConcurrentQueue<int> _bufferDisposeQueue = new();
+
+        private void _flushALDisposeQueues()
+        {
+            // Clear out finalized audio sources.
+            while (_sourceDisposeQueue.TryDequeue(out var handles))
+            {
+                OpenALSawmill.Debug("Cleaning out source {0} which finalized in another thread.", handles.sourceHandle);
+                if (IsEfxSupported) RemoveEfx(handles);
+                AL.DeleteSource(handles.sourceHandle);
+                _checkAlError();
+                _audioSources.Remove(handles.sourceHandle);
+            }
+
+            // Clear out finalized buffered audio sources.
+            while (_bufferedSourceDisposeQueue.TryDequeue(out var handles))
+            {
+                OpenALSawmill.Debug("Cleaning out buffered source {0} which finalized in another thread.", handles.sourceHandle);
+                if (IsEfxSupported) RemoveEfx(handles);
+                AL.DeleteSource(handles.sourceHandle);
+                _checkAlError();
+                _bufferedAudioSources.Remove(handles.sourceHandle);
+            }
+
+            // Clear out finalized audio buffers.
+            while (_bufferDisposeQueue.TryDequeue(out var handle))
+            {
+                AL.DeleteBuffer(handle);
+                _checkAlError();
+            }
+        }
+
+        private void DeleteSourceOnMainThread(int sourceHandle, int filterHandle)
+        {
+            _sourceDisposeQueue.Enqueue((sourceHandle, filterHandle));
+        }
+
+        private void DeleteBufferedSourceOnMainThread(int bufferedSourceHandle, int filterHandle)
+        {
+            _bufferedSourceDisposeQueue.Enqueue((bufferedSourceHandle, filterHandle));
+        }
+
+        private void DeleteAudioBufferOnMainThread(int bufferHandle)
+        {
+            _bufferDisposeQueue.Enqueue(bufferHandle);
+        }
+    }
+}

Robust.Client/Graphics/Audio/ClydeAudio.AudioSources.cs

@@ -0,0 +1,680 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using OpenTK.Audio.OpenAL;
+using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
+using OpenTK.Mathematics;
+using Robust.Client.Audio;
+using Robust.Shared;
+using Robust.Shared.Configuration;
+using Robust.Shared.IoC;
+using Robust.Shared.Audio;
+using Robust.Shared.Log;
+using Robust.Shared.Maths;
+using Vector2 = System.Numerics.Vector2;
+using Robust.Shared.Utility;
+
+namespace Robust.Client.Graphics.Audio
+{
+    internal partial class ClydeAudio
+    {
+        private sealed class AudioSource : IClydeAudioSource
+        {
+            private int SourceHandle;
+            private readonly ClydeAudio _master;
+            private readonly AudioStream _sourceStream;
+            private int FilterHandle;
+#if DEBUG
+            private bool _didPositionWarning;
+#endif
+
+            private float _gain;
+
+            private bool IsEfxSupported => _master.IsEfxSupported;
+
+            public AudioSource(ClydeAudio master, int sourceHandle, AudioStream sourceStream)
+            {
+                _master = master;
+                SourceHandle = sourceHandle;
+                _sourceStream = sourceStream;
+                AL.GetSource(SourceHandle, ALSourcef.Gain, out _gain);
+            }
+
+            public void StartPlaying()
+            {
+                _checkDisposed();
+                AL.SourcePlay(SourceHandle);
+                _master._checkAlError();
+            }
+
+            public void StopPlaying()
+            {
+                if (_isDisposed()) return;
+                AL.SourceStop(SourceHandle);
+                _master._checkAlError();
+            }
+
+            public bool IsPlaying
+            {
+                get
+                {
+                    _checkDisposed();
+                    var state = AL.GetSourceState(SourceHandle);
+                    return state == ALSourceState.Playing;
+                }
+            }
+
+            public bool IsLooping
+            {
+                get
+                {
+                    _checkDisposed();
+                    AL.GetSource(SourceHandle, ALSourceb.Looping, out var ret);
+                    _master._checkAlError();
+                    return ret;
+                }
+                set
+                {
+                    _checkDisposed();
+                    AL.Source(SourceHandle, ALSourceb.Looping, value);
+                    _master._checkAlError();
+                }
+            }
+
+            public bool IsGlobal
+            {
+                get
+                {
+                    _checkDisposed();
+                    AL.GetSource(SourceHandle, ALSourceb.SourceRelative, out var value);
+                    _master._checkAlError();
+                    return value;
+                }
+            }
+
+            public void SetGlobal()
+            {
+                _checkDisposed();
+                AL.Source(SourceHandle, ALSourceb.SourceRelative, true);
+                _master._checkAlError();
+            }
+
+            public void SetVolume(float decibels)
+            {
+                _checkDisposed();
+                var priorOcclusion = 1f;
+                if (!IsEfxSupported)
+                {
+                    AL.GetSource(SourceHandle, ALSourcef.Gain, out var priorGain);
+                    priorOcclusion = priorGain / _gain;
+                }
+                _gain =  MathF.Pow(10, decibels / 10);
+                AL.Source(SourceHandle, ALSourcef.Gain, _gain * priorOcclusion);
+                _master._checkAlError();
+            }
+
+            public void SetVolumeDirect(float gain)
+            {
+                _checkDisposed();
+                var priorOcclusion = 1f;
+                if (!IsEfxSupported)
+                {
+                    AL.GetSource(SourceHandle, ALSourcef.Gain, out var priorGain);
+                    priorOcclusion = priorGain / _gain;
+                }
+                _gain = gain;
+                AL.Source(SourceHandle, ALSourcef.Gain, _gain * priorOcclusion);
+                _master._checkAlError();
+            }
+
+            public void SetMaxDistance(float distance)
+            {
+                _checkDisposed();
+                AL.Source(SourceHandle, ALSourcef.MaxDistance, distance);
+                _master._checkAlError();
+            }
+
+            public void SetRolloffFactor(float rolloffFactor)
+            {
+                _checkDisposed();
+                AL.Source(SourceHandle, ALSourcef.RolloffFactor, rolloffFactor);
+                _master._checkAlError();
+            }
+
+            public void SetReferenceDistance(float refDistance)
+            {
+                _checkDisposed();
+                AL.Source(SourceHandle, ALSourcef.ReferenceDistance, refDistance);
+                _master._checkAlError();
+            }
+
+            public void SetOcclusion(float blocks)
+            {
+                _checkDisposed();
+                var cutoff = MathF.Exp(-blocks * 1);
+                var gain = MathF.Pow(cutoff, 0.1f);
+                if (IsEfxSupported)
+                {
+                    SetOcclusionEfx(gain, cutoff);
+                }
+                else
+                {
+                    gain *= gain * gain;
+                    AL.Source(SourceHandle, ALSourcef.Gain, _gain * gain);
+                }
+                _master._checkAlError();
+            }
+
+            private void SetOcclusionEfx(float gain, float cutoff)
+            {
+                if (FilterHandle == 0)
+                {
+                    FilterHandle = EFX.GenFilter();
+                    EFX.Filter(FilterHandle, FilterInteger.FilterType, (int) FilterType.Lowpass);
+                }
+
+                EFX.Filter(FilterHandle, FilterFloat.LowpassGain, gain);
+                EFX.Filter(FilterHandle, FilterFloat.LowpassGainHF, cutoff);
+                AL.Source(SourceHandle, ALSourcei.EfxDirectFilter, FilterHandle);
+            }
+
+            public void SetPlaybackPosition(float seconds)
+            {
+                _checkDisposed();
+                AL.Source(SourceHandle, ALSourcef.SecOffset, seconds);
+                _master._checkAlError();
+            }
+
+            public bool SetPosition(Vector2 position)
+            {
+                _checkDisposed();
+
+                var (x, y) = position;
+
+                if (!AreFinite(x, y))
+                {
+                    return false;
+                }
+#if DEBUG
+                // OpenAL doesn't seem to want to play stereo positionally.
+                // Log a warning if people try to.
+                if (_sourceStream.ChannelCount > 1 && !_didPositionWarning)
+                {
+                    _didPositionWarning = true;
+                    _master.OpenALSawmill.Warning("Attempting to set position on audio source with multiple audio channels! Stream: '{0}'.  Make sure the audio is MONO, not stereo.",
+                        _sourceStream.Name);
+                    // warning isn't enough, people just ignore it :(
+                    DebugTools.Assert(false, $"Attempting to set position on audio source with multiple audio channels! Stream: '{_sourceStream.Name}'. Make sure the audio is MONO, not stereo.");
+                }
+#endif
+
+                AL.Source(SourceHandle, ALSource3f.Position, x, y, 0);
+                _master._checkAlError();
+                return true;
+            }
+
+            private static bool AreFinite(float x, float y)
+            {
+                if (float.IsFinite(x) && float.IsFinite(y))
+                {
+                    return true;
+                }
+
+                return false;
+            }
+
+            public void SetVelocity(Vector2 velocity)
+            {
+                _checkDisposed();
+
+                var (x, y) = velocity;
+
+                if (!AreFinite(x, y))
+                {
+                    return;
+                }
+
+                AL.Source(SourceHandle, ALSource3f.Velocity, x, y, 0);
+
+                _master._checkAlError();
+            }
+
+            public void SetPitch(float pitch)
+            {
+                _checkDisposed();
+                AL.Source(SourceHandle, ALSourcef.Pitch, pitch);
+                _master._checkAlError();
+            }
+
+            ~AudioSource()
+            {
+                Dispose(false);
+            }
+
+            public void Dispose()
+            {
+                Dispose(true);
+                GC.SuppressFinalize(this);
+            }
+
+            private void Dispose(bool disposing)
+            {
+                if (!disposing)
+                {
+                    // We can't run this code inside the finalizer thread so tell Clyde to clear it up later.
+                    _master.DeleteSourceOnMainThread(SourceHandle, FilterHandle);
+                }
+                else
+                {
+                    if (FilterHandle != 0) EFX.DeleteFilter(FilterHandle);
+                    AL.DeleteSource(SourceHandle);
+                    _master._audioSources.Remove(SourceHandle);
+                    _master._checkAlError();
+                }
+
+                SourceHandle = -1;
+            }
+
+            private bool _isDisposed()
+            {
+                return SourceHandle == -1;
+            }
+
+            private void _checkDisposed()
+            {
+                if (SourceHandle == -1)
+                {
+                    throw new ObjectDisposedException(nameof(AudioSource));
+                }
+            }
+        }
+
+        private sealed class BufferedAudioSource : IClydeBufferedAudioSource
+        {
+            private int? SourceHandle = null;
+            private int[] BufferHandles;
+            private Dictionary<int, int> BufferMap = new();
+            private readonly ClydeAudio _master;
+            private bool _mono = true;
+            private bool _float = false;
+            private int FilterHandle;
+
+            private float _gain;
+
+            public int SampleRate { get; set; } = 44100;
+
+            private bool IsEfxSupported => _master.IsEfxSupported;
+
+            public BufferedAudioSource(ClydeAudio master, int sourceHandle, int[] bufferHandles, bool floatAudio = false)
+            {
+                _master = master;
+                SourceHandle = sourceHandle;
+                BufferHandles = bufferHandles;
+                for (int i = 0; i < BufferHandles.Length; i++)
+                {
+                    var bufferHandle = BufferHandles[i];
+                    BufferMap[bufferHandle] = i;
+                }
+                _float = floatAudio;
+                AL.GetSource(sourceHandle, ALSourcef.Gain, out _gain);
+            }
+
+            public void StartPlaying()
+            {
+                _checkDisposed();
+                // ReSharper disable once PossibleInvalidOperationException
+                AL.SourcePlay(stackalloc int[] {SourceHandle!.Value});
+                _master._checkAlError();
+            }
+
+            public void StopPlaying()
+            {
+                if (_isDisposed()) return;
+                // ReSharper disable once PossibleInvalidOperationException
+                AL.SourceStop(SourceHandle!.Value);
+                _master._checkAlError();
+            }
+
+            public bool IsPlaying
+            {
+                get
+                {
+                    _checkDisposed();
+                    // ReSharper disable once PossibleInvalidOperationException
+                    var state = AL.GetSourceState(SourceHandle!.Value);
+                    return state == ALSourceState.Playing;
+                }
+            }
+
+            public bool IsLooping
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+
+            public void SetGlobal()
+            {
+                _checkDisposed();
+                _mono = false;
+                // ReSharper disable once PossibleInvalidOperationException
+                AL.Source(SourceHandle!.Value, ALSourceb.SourceRelative, true);
+                _master._checkAlError();
+            }
+
+            public void SetLooping()
+            {
+                // TODO?waaaaddDDDDD
+            }
+
+            public void SetVolume(float decibels)
+            {
+                _checkDisposed();
+                var priorOcclusion = 1f;
+                if (!IsEfxSupported)
+                {
+                    AL.GetSource(SourceHandle!.Value, ALSourcef.Gain, out var priorGain);
+                    priorOcclusion = priorGain / _gain;
+                }
+                _gain =  MathF.Pow(10, decibels / 10);
+                AL.Source(SourceHandle!.Value, ALSourcef.Gain, _gain * priorOcclusion);
+                _master._checkAlError();
+            }
+
+            public void SetVolumeDirect(float gain)
+            {
+                _checkDisposed();
+                var priorOcclusion = 1f;
+                if (!IsEfxSupported)
+                {
+                    AL.GetSource(SourceHandle!.Value, ALSourcef.Gain, out var priorGain);
+                    priorOcclusion = priorGain / _gain;
+                }
+                _gain = gain;
+                AL.Source(SourceHandle!.Value, ALSourcef.Gain, _gain * priorOcclusion);
+                _master._checkAlError();
+            }
+
+            public void SetMaxDistance(float distance)
+            {
+                _checkDisposed();
+                AL.Source(SourceHandle!.Value, ALSourcef.MaxDistance, distance);
+                _master._checkAlError();
+            }
+
+            public void SetRolloffFactor(float rolloffFactor)
+            {
+                _checkDisposed();
+                AL.Source(SourceHandle!.Value, ALSourcef.RolloffFactor, rolloffFactor);
+                _master._checkAlError();
+            }
+
+            public void SetReferenceDistance(float refDistance)
+            {
+                _checkDisposed();
+                AL.Source(SourceHandle!.Value, ALSourcef.ReferenceDistance, refDistance);
+                _master._checkAlError();
+            }
+
+            public void SetOcclusion(float blocks)
+            {
+                _checkDisposed();
+                var cutoff = MathF.Exp(-blocks * 1.5f);
+                var gain = MathF.Pow(cutoff, 0.1f);
+                if (IsEfxSupported)
+                {
+                    SetOcclusionEfx(gain, cutoff);
+                }
+                else
+                {
+                    gain *= gain * gain;
+                    AL.Source(SourceHandle!.Value, ALSourcef.Gain, gain * _gain);
+                }
+
+                _master._checkAlError();
+            }
+
+            private void SetOcclusionEfx(float gain, float cutoff)
+            {
+                if (FilterHandle == 0)
+                {
+                    FilterHandle = EFX.GenFilter();
+                    EFX.Filter(FilterHandle, FilterInteger.FilterType, (int) FilterType.Lowpass);
+                }
+                EFX.Filter(FilterHandle, FilterFloat.LowpassGain, gain);
+                EFX.Filter(FilterHandle, FilterFloat.LowpassGainHF, cutoff);
+                AL.Source(SourceHandle!.Value, ALSourcei.EfxDirectFilter, FilterHandle);
+            }
+
+            public void SetPlaybackPosition(float seconds)
+            {
+                _checkDisposed();
+                // ReSharper disable once PossibleInvalidOperationException
+                AL.Source(SourceHandle!.Value, ALSourcef.SecOffset, seconds);
+                _master._checkAlError();
+            }
+
+            public bool IsGlobal
+            {
+                get
+                {
+                    _checkDisposed();
+                    AL.GetSource(SourceHandle!.Value, ALSourceb.SourceRelative, out var value);
+                    _master._checkAlError();
+                    return value;
+                }
+            }
+
+            public bool SetPosition(Vector2 position)
+            {
+                _checkDisposed();
+
+                var (x, y) = position;
+
+                if (!AreFinite(x, y))
+                {
+                    return false;
+                }
+
+                _mono = true;
+                // ReSharper disable once PossibleInvalidOperationException
+                AL.Source(SourceHandle!.Value, ALSource3f.Position, x, y, 0);
+                _master._checkAlError();
+                return true;
+            }
+
+            private static bool AreFinite(float x, float y)
+            {
+                if (float.IsFinite(x) && float.IsFinite(y))
+                {
+                    return true;
+                }
+
+                return false;
+            }
+
+            public void SetVelocity(Vector2 velocity)
+            {
+                _checkDisposed();
+
+                var (x, y) = velocity;
+
+                if (!AreFinite(x, y))
+                {
+                    return;
+                }
+
+                AL.Source(SourceHandle!.Value, ALSource3f.Velocity, x, y, 0);
+
+                _master._checkAlError();
+            }
+
+            public void SetPitch(float pitch)
+            {
+                _checkDisposed();
+                // ReSharper disable once PossibleInvalidOperationException
+                AL.Source(SourceHandle!.Value, ALSourcef.Pitch, pitch);
+                _master._checkAlError();
+            }
+
+            ~BufferedAudioSource()
+            {
+                Dispose(false);
+            }
+
+            public void Dispose()
+            {
+                Dispose(true);
+                GC.SuppressFinalize(this);
+            }
+
+            private void Dispose(bool disposing)
+            {
+                if (SourceHandle == null) return;
+
+                if (!_master.IsMainThread())
+                {
+                    // We can't run this code inside another thread so tell Clyde to clear it up later.
+                    _master.DeleteBufferedSourceOnMainThread(SourceHandle.Value, FilterHandle);
+                    for (var i = 0; i < BufferHandles.Length; i++)
+                        _master.DeleteAudioBufferOnMainThread(BufferHandles[i]);
+                }
+                else
+                {
+                    if (FilterHandle != 0) EFX.DeleteFilter(FilterHandle);
+                    AL.DeleteSource(SourceHandle.Value);
+                    AL.DeleteBuffers(BufferHandles);
+                    _master._bufferedAudioSources.Remove(SourceHandle.Value);
+                    _master._checkAlError();
+                }
+
+                SourceHandle = null;
+            }
+
+            private bool _isDisposed()
+            {
+                return SourceHandle == null;
+            }
+
+            private void _checkDisposed()
+            {
+                if (SourceHandle == null)
+                {
+                    throw new ObjectDisposedException(nameof(AudioSource));
+                }
+            }
+
+            public int GetNumberOfBuffersProcessed()
+            {
+                _checkDisposed();
+                // ReSharper disable once PossibleInvalidOperationException
+                AL.GetSource(SourceHandle!.Value, ALGetSourcei.BuffersProcessed, out var buffersProcessed);
+                return buffersProcessed;
+            }
+
+            public unsafe void GetBuffersProcessed(Span<int> handles)
+            {
+                _checkDisposed();
+                var entries = Math.Min(Math.Min(handles.Length, BufferHandles.Length), GetNumberOfBuffersProcessed());
+                fixed (int* ptr = handles)
+                    // ReSharper disable once PossibleInvalidOperationException
+                    AL.SourceUnqueueBuffers(SourceHandle!.Value, entries, ptr);
+
+                for (var i = 0; i < entries; i++)
+                    handles[i] = BufferMap[handles[i]];
+            }
+
+            public unsafe void WriteBuffer(int handle, ReadOnlySpan<ushort> data)
+            {
+                _checkDisposed();
+
+                if(_float)
+                    throw new InvalidOperationException("Can't write ushort numbers to buffers when buffer type is float!");
+
+                if (handle >= BufferHandles.Length)
+                    throw new ArgumentOutOfRangeException(nameof(handle),
+                        $"Got {handle}. Expected less than {BufferHandles.Length}");
+
+                fixed (ushort* ptr = data)
+                {
+                    AL.BufferData(BufferHandles[handle], _mono ? ALFormat.Mono16 : ALFormat.Stereo16, (IntPtr) ptr,
+                        _mono ? data.Length / 2 * sizeof(ushort) : data.Length * sizeof(ushort), SampleRate);
+                }
+            }
+
+            public unsafe void WriteBuffer(int handle, ReadOnlySpan<float> data)
+            {
+                _checkDisposed();
+
+                if(!_float)
+                    throw new InvalidOperationException("Can't write float numbers to buffers when buffer type is ushort!");
+
+                if (handle >= BufferHandles.Length)
+                    throw new ArgumentOutOfRangeException(nameof(handle),
+                        $"Got {handle}. Expected less than {BufferHandles.Length}");
+
+                fixed (float* ptr = data)
+                {
+                    AL.BufferData(BufferHandles[handle], _mono ? ALFormat.MonoFloat32Ext : ALFormat.StereoFloat32Ext, (IntPtr) ptr,
+                        _mono ? data.Length / 2 * sizeof(float) : data.Length * sizeof(float), SampleRate);
+                }
+            }
+
+            public unsafe void QueueBuffers(ReadOnlySpan<int> handles)
+            {
+                _checkDisposed();
+
+                Span<int> realHandles = stackalloc int[handles.Length];
+                handles.CopyTo(realHandles);
+
+                for (var i = 0; i < realHandles.Length; i++)
+                {
+                    var handle = realHandles[i];
+                    if (handle >= BufferHandles.Length)
+                        throw new ArgumentOutOfRangeException(nameof(handles), $"Invalid handle with index {i}!");
+                    realHandles[i] = BufferHandles[handle];
+                }
+
+                fixed (int* ptr = realHandles)
+                    // ReSharper disable once PossibleInvalidOperationException
+                    AL.SourceQueueBuffers(SourceHandle!.Value, handles.Length, ptr);
+            }
+
+            public unsafe void EmptyBuffers()
+            {
+                _checkDisposed();
+                var length = (SampleRate / BufferHandles.Length) * (_mono ? 1 : 2);
+
+                Span<int> handles = stackalloc int[BufferHandles.Length];
+
+                if (_float)
+                {
+                    var empty = new float[length];
+                    var span = (Span<float>) empty;
+
+                    for (var i = 0; i < BufferHandles.Length; i++)
+                    {
+                        WriteBuffer(BufferMap[BufferHandles[i]], span);
+                        handles[i] = BufferMap[BufferHandles[i]];
+                    }
+                }
+                else
+                {
+                    var empty = new ushort[length];
+                    var span = (Span<ushort>) empty;
+
+                    for (var i = 0; i < BufferHandles.Length; i++)
+                    {
+                        WriteBuffer(BufferMap[BufferHandles[i]], span);
+                        handles[i] = BufferMap[BufferHandles[i]];
+                    }
+                }
+
+                QueueBuffers(handles);
+            }
+        }
+    }
+}

Robust.Client/Graphics/Audio/ClydeAudio.Formats.OggVorbis.cs

@@ -0,0 +1,54 @@
+using System;
+using System.IO;
+
+namespace Robust.Client.Graphics.Audio
+{
+    internal partial class ClydeAudio
+    {
+        private OggVorbisData _readOggVorbis(Stream stream)
+        {
+            using (var vorbis = new NVorbis.VorbisReader(stream, false))
+            {
+                var sampleRate = vorbis.SampleRate;
+                var channels = vorbis.Channels;
+                var totalSamples = vorbis.TotalSamples;
+
+                var readSamples = 0;
+                var buffer = new float[totalSamples * channels];
+
+                while (readSamples < totalSamples)
+                {
+                    var read = vorbis.ReadSamples(buffer, readSamples * channels, buffer.Length - readSamples);
+                    if (read == 0)
+                    {
+                        break;
+                    }
+
+                    readSamples += read;
+                }
+
+                return new OggVorbisData(totalSamples, sampleRate, channels, buffer, vorbis.Tags.Title, vorbis.Tags.Artist);
+            }
+        }
+
+        private readonly struct OggVorbisData
+        {
+            public readonly long TotalSamples;
+            public readonly long SampleRate;
+            public readonly long Channels;
+            public readonly ReadOnlyMemory<float> Data;
+            public readonly string Title;
+            public readonly string Artist;
+
+            public OggVorbisData(long totalSamples, long sampleRate, long channels, ReadOnlyMemory<float> data, string title, string artist)
+            {
+                TotalSamples = totalSamples;
+                SampleRate = sampleRate;
+                Channels = channels;
+                Data = data;
+                Title = title;
+                Artist = artist;
+            }
+        }
+    }
+}

Robust.Client/Graphics/Audio/ClydeAudio.Formats.Wav.cs

@@ -0,0 +1,144 @@
+using System;
+using System.IO;
+using JetBrains.Annotations;
+using Robust.Shared.Utility;
+
+namespace Robust.Client.Graphics.Audio
+{
+    internal partial class ClydeAudio
+    {
+        /// <summary>
+        ///     Load up a WAVE file.
+        /// </summary>
+        private static WavData _readWav(Stream stream)
+        {
+            var reader = new BinaryReader(stream, EncodingHelpers.UTF8, true);
+
+            void SkipChunk()
+            {
+                var length = reader.ReadUInt32();
+                stream.Position += length;
+            }
+
+            // Read outer most chunks.
+            Span<byte> fourCc = stackalloc byte[4];
+            while (true)
+            {
+                _readFourCC(reader, fourCc);
+
+                if (!fourCc.SequenceEqual("RIFF"u8))
+                {
+                    SkipChunk();
+                    continue;
+                }
+
+                return _readRiffChunk(reader);
+            }
+        }
+
+        private static void _skipChunk(BinaryReader reader)
+        {
+            var length = reader.ReadUInt32();
+            reader.BaseStream.Position += length;
+        }
+
+        private static void _readFourCC(BinaryReader reader, Span<byte> fourCc)
+        {
+            fourCc[0] = reader.ReadByte();
+            fourCc[1] = reader.ReadByte();
+            fourCc[2] = reader.ReadByte();
+            fourCc[3] = reader.ReadByte();
+        }
+
+        private static WavData _readRiffChunk(BinaryReader reader)
+        {
+            Span<byte> format = stackalloc byte[4];
+            reader.ReadUInt32();
+            _readFourCC(reader, format);
+            if (!format.SequenceEqual("WAVE"u8))
+            {
+                throw new InvalidDataException("File is not a WAVE file.");
+            }
+
+            _readFourCC(reader, format);
+            if (!format.SequenceEqual("fmt "u8))
+            {
+                throw new InvalidDataException("Expected fmt chunk.");
+            }
+
+            // Read fmt chunk.
+
+            var size = reader.ReadInt32();
+            var afterFmtPos = reader.BaseStream.Position + size;
+
+            var audioType = (WavAudioFormatType) reader.ReadInt16();
+            var channels = reader.ReadInt16();
+            var sampleRate = reader.ReadInt32();
+            var byteRate = reader.ReadInt32();
+            var blockAlign = reader.ReadInt16();
+            var bitsPerSample = reader.ReadInt16();
+
+            if (audioType != WavAudioFormatType.PCM)
+            {
+                throw new NotImplementedException("Unable to support audio types other than PCM.");
+            }
+
+            DebugTools.Assert(byteRate == sampleRate * channels * bitsPerSample / 8);
+
+            // Fmt is not of guaranteed size, so use the size header to skip to the end.
+            reader.BaseStream.Position = afterFmtPos;
+
+            while (true)
+            {
+                _readFourCC(reader, format);
+                if (!format.SequenceEqual("data"u8))
+                {
+                    _skipChunk(reader);
+                    continue;
+                }
+
+                break;
+            }
+
+            // We are in the data chunk.
+            size = reader.ReadInt32();
+            var data = reader.ReadBytes(size);
+
+            return new WavData(audioType, channels, sampleRate, byteRate, blockAlign, bitsPerSample, data);
+        }
+
+        /// <summary>
+        ///     See http://soundfile.sapp.org/doc/WaveFormat/ for reference.
+        /// </summary>
+        [PublicAPI]
+        private readonly struct WavData
+        {
+            public readonly WavAudioFormatType AudioType;
+            public readonly short NumChannels;
+            public readonly int SampleRate;
+            public readonly int ByteRate;
+            public readonly short BlockAlign;
+            public readonly short BitsPerSample;
+            public readonly ReadOnlyMemory<byte> Data;
+
+            public WavData(WavAudioFormatType audioType, short numChannels, int sampleRate, int byteRate,
+                short blockAlign, short bitsPerSample, ReadOnlyMemory<byte> data)
+            {
+                AudioType = audioType;
+                NumChannels = numChannels;
+                SampleRate = sampleRate;
+                ByteRate = byteRate;
+                BlockAlign = blockAlign;
+                BitsPerSample = bitsPerSample;
+                Data = data;
+            }
+        }
+
+        private enum WavAudioFormatType : short
+        {
+            Unknown = 0,
+            PCM = 1,
+            // There's a bunch of other types, those are all unsupported.
+        }
+    }
+}

Robust.Client/Graphics/Audio/ClydeAudio.IoC.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using OpenTK.Audio.OpenAL;
+using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
+using OpenTK.Mathematics;
+using Robust.Client.Audio;
+using Robust.Shared;
+using Robust.Shared.Configuration;
+using Robust.Shared.IoC;
+using Robust.Shared.Audio;
+using Robust.Shared.Log;
+using Robust.Shared.Timing;
+using Vector2 = System.Numerics.Vector2;
+
+namespace Robust.Client.Graphics.Audio
+{
+    internal partial class ClydeAudio
+    {
+        [Robust.Shared.IoC.Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Robust.Shared.IoC.Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Robust.Shared.IoC.Dependency] private readonly ILogManager _logMan = default!;
+
+        private Thread? _gameThread;
+
+        public bool InitializePostWindowing()
+        {
+            _gameThread = Thread.CurrentThread;
+            return _initializeAudio();
+        }
+
+        public void FrameProcess(FrameEventArgs eventArgs)
+        {
+            _updateAudio();
+        }
+
+        public void Shutdown()
+        {
+            _shutdownAudio();
+        }
+
+        private bool IsMainThread()
+        {
+            return Thread.CurrentThread == _gameThread;
+        }
+    }
+}

Robust.Client/Graphics/Audio/ClydeAudio.cs

@@ -0,0 +1,432 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.CompilerServices;
+using OpenTK.Audio.OpenAL;
+using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
+using OpenTK.Mathematics;
+using Robust.Client.Audio;
+using Robust.Shared;
+using Robust.Shared.Audio;
+using Robust.Shared.Log;
+
+namespace Robust.Client.Graphics.Audio
+{
+    internal sealed partial class ClydeAudio : IClydeAudio, IClydeAudioInternal
+    {
+        private ALDevice _openALDevice;
+        private ALContext _openALContext;
+
+        private readonly List<LoadedAudioSample> _audioSampleBuffers = new();
+
+        private readonly Dictionary<int, WeakReference<AudioSource>> _audioSources =
+            new();
+
+        private readonly Dictionary<int, WeakReference<BufferedAudioSource>> _bufferedAudioSources =
+            new();
+
+        private readonly HashSet<string> _alcDeviceExtensions = new();
+        private readonly HashSet<string> _alContextExtensions = new();
+
+        // The base gain value for a listener, used to boost the default volume.
+        private const float _baseGain = 2f;
+
+        public bool HasAlDeviceExtension(string extension) => _alcDeviceExtensions.Contains(extension);
+        public bool HasAlContextExtension(string extension) => _alContextExtensions.Contains(extension);
+
+        internal bool IsEfxSupported;
+
+        internal ISawmill OpenALSawmill = default!;
+
+        private bool _initializeAudio()
+        {
+            OpenALSawmill = _logMan.GetSawmill("clyde.oal");
+
+            if (!_audioOpenDevice())
+                return false;
+
+            // Create OpenAL context.
+            _audioCreateContext();
+
+            IsEfxSupported = HasAlDeviceExtension("ALC_EXT_EFX");
+
+            _cfg.OnValueChanged(CVars.AudioMasterVolume, SetMasterVolume, true);
+            _cfg.OnValueChanged(CVars.AudioAttenuation, SetAudioAttenuation, true);
+            return true;
+        }
+
+        private void _audioCreateContext()
+        {
+            unsafe
+            {
+                _openALContext = ALC.CreateContext(_openALDevice, (int*) 0);
+            }
+
+            ALC.MakeContextCurrent(_openALContext);
+            _checkAlcError(_openALDevice);
+            _checkAlError();
+
+            // Load up AL context extensions.
+            var s = ALC.GetString(ALDevice.Null, AlcGetString.Extensions) ?? "";
+            foreach (var extension in s.Split(' '))
+            {
+                _alContextExtensions.Add(extension);
+            }
+
+            OpenALSawmill.Debug("OpenAL Vendor: {0}", AL.Get(ALGetString.Vendor));
+            OpenALSawmill.Debug("OpenAL Renderer: {0}", AL.Get(ALGetString.Renderer));
+            OpenALSawmill.Debug("OpenAL Version: {0}", AL.Get(ALGetString.Version));
+        }
+
+        private bool _audioOpenDevice()
+        {
+            var preferredDevice = _cfg.GetCVar(CVars.AudioDevice);
+
+            // Open device.
+            if (!string.IsNullOrEmpty(preferredDevice))
+            {
+                _openALDevice = ALC.OpenDevice(preferredDevice);
+                if (_openALDevice == IntPtr.Zero)
+                {
+                    OpenALSawmill.Warning("Unable to open preferred audio device '{0}': {1}. Falling back default.",
+                        preferredDevice, ALC.GetError(ALDevice.Null));
+
+                    _openALDevice = ALC.OpenDevice(null);
+                }
+            }
+            else
+            {
+                _openALDevice = ALC.OpenDevice(null);
+            }
+
+            _checkAlcError(_openALDevice);
+
+            if (_openALDevice == IntPtr.Zero)
+            {
+                OpenALSawmill.Error("Unable to open OpenAL device! {1}", ALC.GetError(ALDevice.Null));
+                return false;
+            }
+
+            // Load up ALC extensions.
+            var s = ALC.GetString(_openALDevice, AlcGetString.Extensions) ?? "";
+            foreach (var extension in s.Split(' '))
+            {
+                _alcDeviceExtensions.Add(extension);
+            }
+            return true;
+        }
+
+        public void StopAllAudio()
+        {
+            foreach (var (key, source) in _audioSources)
+            {
+                if (source.TryGetTarget(out var target))
+                {
+                    target.StopPlaying();
+                }
+            }
+
+            foreach (var (key, source) in _bufferedAudioSources)
+            {
+                if (source.TryGetTarget(out var target))
+                {
+                    target.StopPlaying();
+                }
+            }
+        }
+
+        public void DisposeAllAudio()
+        {
+            foreach (var (key, source) in _audioSources)
+            {
+                if (source.TryGetTarget(out var target))
+                {
+                    target.Dispose();
+                }
+            }
+            _audioSources.Clear();
+
+            foreach (var (key, source) in _bufferedAudioSources)
+            {
+                if (source.TryGetTarget(out var target))
+                {
+                    target.StopPlaying();
+                    target.Dispose();
+                }
+            }
+            _bufferedAudioSources.Clear();
+        }
+
+        private void _shutdownAudio()
+        {
+            DisposeAllAudio();
+
+            if (_openALContext != ALContext.Null)
+            {
+                ALC.MakeContextCurrent(ALContext.Null);
+
+                ALC.DestroyContext(_openALContext);
+            }
+
+            if (_openALDevice != IntPtr.Zero)
+            {
+                ALC.CloseDevice(_openALDevice);
+            }
+        }
+
+        private void _updateAudio()
+        {
+            var eye = _eyeManager.CurrentEye;
+            var vec = eye.Position.Position;
+            AL.Listener(ALListener3f.Position, vec.X, vec.Y, -5);
+            var rot2d = eye.Rotation.ToVec();
+            AL.Listener(ALListenerfv.Orientation, new []{0, 0, -1, rot2d.X, rot2d.Y, 0});
+
+            // Default orientation: at: (0, 0, -1)  up: (0, 1, 0)
+            var rot = eye.Rotation.ToVec();
+            var at = new Vector3(0f, 0f, -1f);
+            var up = new Vector3(rot.Y, rot.X, 0f);
+            AL.Listener(ALListenerfv.Orientation, ref at, ref up);
+
+            _flushALDisposeQueues();
+        }
+
+        private static void RemoveEfx((int sourceHandle, int filterHandle) handles)
+        {
+            if (handles.filterHandle != 0) EFX.DeleteFilter(handles.filterHandle);
+        }
+
+        public void SetMasterVolume(float newVolume)
+        {
+            AL.Listener(ALListenerf.Gain, _baseGain * newVolume);
+        }
+
+        public void SetAudioAttenuation(int value)
+        {
+            var attenuation = (Attenuation) value;
+
+            switch (attenuation)
+            {
+                case Attenuation.NoAttenuation:
+                    AL.DistanceModel(ALDistanceModel.None);
+                    break;
+                case Attenuation.InverseDistance:
+                    AL.DistanceModel(ALDistanceModel.InverseDistance);
+                    break;
+                case Attenuation.Default:
+                case Attenuation.InverseDistanceClamped:
+                    AL.DistanceModel(ALDistanceModel.InverseDistanceClamped);
+                    break;
+                case Attenuation.LinearDistance:
+                    AL.DistanceModel(ALDistanceModel.LinearDistance);
+                    break;
+                case Attenuation.LinearDistanceClamped:
+                    AL.DistanceModel(ALDistanceModel.LinearDistanceClamped);
+                    break;
+                case Attenuation.ExponentDistance:
+                    AL.DistanceModel(ALDistanceModel.ExponentDistance);
+                    break;
+                case Attenuation.ExponentDistanceClamped:
+                    AL.DistanceModel(ALDistanceModel.ExponentDistanceClamped);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException($"No implementation to set {attenuation.ToString()} for DistanceModel!");
+            }
+
+            var attToString = attenuation == Attenuation.Default ? Attenuation.InverseDistanceClamped : attenuation;
+
+            OpenALSawmill.Info($"Set audio attenuation to {attToString.ToString()}");
+        }
+
+        public IClydeAudioSource? CreateAudioSource(AudioStream stream)
+        {
+            var source = AL.GenSource();
+
+            if (!AL.IsSource(source))
+            {
+                OpenALSawmill.Error("Failed to generate source. Too many simultaneous audio streams? {0}", Environment.StackTrace);
+                return null;
+            }
+
+            // ReSharper disable once PossibleInvalidOperationException
+            // TODO: This really shouldn't be indexing based on the ClydeHandle...
+            AL.Source(source, ALSourcei.Buffer, _audioSampleBuffers[(int) stream.ClydeHandle!.Value.Value].BufferHandle);
+
+            var audioSource = new AudioSource(this, source, stream);
+            _audioSources.Add(source, new WeakReference<AudioSource>(audioSource));
+            return audioSource;
+        }
+
+        public IClydeBufferedAudioSource CreateBufferedAudioSource(int buffers, bool floatAudio=false)
+        {
+            var source = AL.GenSource();
+
+            if (!AL.IsSource(source))
+                throw new Exception("Failed to generate source. Too many simultaneous audio streams?");
+
+            // ReSharper disable once PossibleInvalidOperationException
+
+            var audioSource = new BufferedAudioSource(this, source, AL.GenBuffers(buffers), floatAudio);
+            _bufferedAudioSources.Add(source, new WeakReference<BufferedAudioSource>(audioSource));
+            return audioSource;
+        }
+
+        private void _checkAlcError(ALDevice device,
+            [CallerMemberName] string callerMember = "",
+            [CallerLineNumber] int callerLineNumber = -1)
+        {
+            var error = ALC.GetError(device);
+            if (error != AlcError.NoError)
+            {
+                OpenALSawmill.Error("[{0}:{1}] ALC error: {2}", callerMember, callerLineNumber, error);
+            }
+        }
+
+        private void _checkAlError([CallerMemberName] string callerMember = "",
+            [CallerLineNumber] int callerLineNumber = -1)
+        {
+            var error = AL.GetError();
+            if (error != ALError.NoError)
+            {
+                OpenALSawmill.Error("[{0}:{1}] AL error: {2}", callerMember, callerLineNumber, error);
+            }
+        }
+
+        public AudioStream LoadAudioOggVorbis(Stream stream, string? name = null)
+        {
+            var vorbis = _readOggVorbis(stream);
+
+            var buffer = AL.GenBuffer();
+
+            ALFormat format;
+            // NVorbis only supports loading into floats.
+            // If this becomes a problem due to missing extension support (doubt it but ok),
+            // check the git history, I originally used libvorbisfile which worked and loaded 16 bit LPCM.
+            if (vorbis.Channels == 1)
+            {
+                format = ALFormat.MonoFloat32Ext;
+            }
+            else if (vorbis.Channels == 2)
+            {
+                format = ALFormat.StereoFloat32Ext;
+            }
+            else
+            {
+                throw new InvalidOperationException("Unable to load audio with more than 2 channels.");
+            }
+
+            unsafe
+            {
+                fixed (float* ptr = vorbis.Data.Span)
+                {
+                    AL.BufferData(buffer, format, (IntPtr) ptr, vorbis.Data.Length * sizeof(float),
+                        (int) vorbis.SampleRate);
+                }
+            }
+
+            _checkAlError();
+
+            var handle = new ClydeHandle(_audioSampleBuffers.Count);
+            _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
+            var length = TimeSpan.FromSeconds(vorbis.TotalSamples / (double) vorbis.SampleRate);
+            return new AudioStream(handle, length, (int) vorbis.Channels, name, vorbis.Title, vorbis.Artist);
+        }
+
+        public AudioStream LoadAudioWav(Stream stream, string? name = null)
+        {
+            var wav = _readWav(stream);
+
+            var buffer = AL.GenBuffer();
+
+            ALFormat format;
+            if (wav.BitsPerSample == 16)
+            {
+                if (wav.NumChannels == 1)
+                {
+                    format = ALFormat.Mono16;
+                }
+                else if (wav.NumChannels == 2)
+                {
+                    format = ALFormat.Stereo16;
+                }
+                else
+                {
+                    throw new InvalidOperationException("Unable to load audio with more than 2 channels.");
+                }
+            }
+            else if (wav.BitsPerSample == 8)
+            {
+                if (wav.NumChannels == 1)
+                {
+                    format = ALFormat.Mono8;
+                }
+                else if (wav.NumChannels == 2)
+                {
+                    format = ALFormat.Stereo8;
+                }
+                else
+                {
+                    throw new InvalidOperationException("Unable to load audio with more than 2 channels.");
+                }
+            }
+            else
+            {
+                throw new InvalidOperationException("Unable to load wav with bits per sample different from 8 or 16");
+            }
+
+            unsafe
+            {
+                fixed (byte* ptr = wav.Data.Span)
+                {
+                    AL.BufferData(buffer, format, (IntPtr) ptr, wav.Data.Length, wav.SampleRate);
+                }
+            }
+
+            _checkAlError();
+
+            var handle = new ClydeHandle(_audioSampleBuffers.Count);
+            _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
+            var length = TimeSpan.FromSeconds(wav.Data.Length / (double) wav.BlockAlign / wav.SampleRate);
+            return new AudioStream(handle, length, wav.NumChannels, name);
+        }
+
+        public AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null)
+        {
+            var fmt = channels switch
+            {
+                1 => ALFormat.Mono16,
+                2 => ALFormat.Stereo16,
+                _ => throw new ArgumentOutOfRangeException(
+                    nameof(channels), "Only stereo and mono is currently supported")
+            };
+
+            var buffer = AL.GenBuffer();
+            _checkAlError();
+
+            unsafe
+            {
+                fixed (short* ptr = samples)
+                {
+                    AL.BufferData(buffer, fmt, (IntPtr) ptr, samples.Length * sizeof(short), sampleRate);
+                }
+            }
+
+            _checkAlError();
+
+            var handle = new ClydeHandle(_audioSampleBuffers.Count);
+            var length = TimeSpan.FromSeconds((double) samples.Length / channels / sampleRate);
+            _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
+            return new AudioStream(handle, length, channels, name);
+        }
+
+        private sealed class LoadedAudioSample
+        {
+            public readonly int BufferHandle;
+
+            public LoadedAudioSample(int bufferHandle)
+            {
+                BufferHandle = bufferHandle;
+            }
+        }
+    }
+}

Robust.Client/Graphics/Audio/ClydeAudioHeadless.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Robust.Client.Audio;
+using Robust.Client.Input;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Timing;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using Color = Robust.Shared.Maths.Color;
+
+namespace Robust.Client.Graphics.Audio
+{
+    /// <summary>
+    ///     Hey look, it's ClydeAudio's evil twin brother!
+    /// </summary>
+    [UsedImplicitly]
+    internal sealed class ClydeAudioHeadless : IClydeAudio, IClydeAudioInternal
+    {
+        public bool InitializePostWindowing()
+        {
+            return true;
+        }
+
+        public void FrameProcess(FrameEventArgs eventArgs)
+        {
+        }
+
+        public void Shutdown()
+        {
+        }
+
+        public AudioStream LoadAudioOggVorbis(Stream stream, string? name = null)
+        {
+            // TODO: Might wanna actually load this so the length gets reported correctly.
+            return new(default, default, 1, name);
+        }
+
+        public AudioStream LoadAudioWav(Stream stream, string? name = null)
+        {
+            // TODO: Might wanna actually load this so the length gets reported correctly.
+            return new(default, default, 1, name);
+        }
+
+        public AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null)
+        {
+            // TODO: Might wanna actually load this so the length gets reported correctly.
+            return new(default, default, channels, name);
+        }
+
+        public IClydeAudioSource CreateAudioSource(AudioStream stream)
+        {
+            return DummyAudioSource.Instance;
+        }
+
+        public IClydeBufferedAudioSource CreateBufferedAudioSource(int buffers, bool floatAudio = false)
+        {
+            return DummyBufferedAudioSource.Instance;
+        }
+
+        public void SetMasterVolume(float newVolume)
+        {
+            // Nada.
+        }
+
+        public void DisposeAllAudio()
+        {
+            // Nada.
+        }
+
+        public void StopAllAudio()
+        {
+            // Nada.
+        }
+    }
+}

Robust.Client/Graphics/Audio/DummyAudioSource.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Numerics;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Robust.Client.Audio;
+using Robust.Client.Input;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Timing;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using Color = Robust.Shared.Maths.Color;
+
+namespace Robust.Client.Graphics.Audio
+{
+    /// <summary>
+    ///     Hey look, it's ClydeAudio.AudioSource's evil twin brother!
+    /// </summary>
+    [Virtual]
+    internal class DummyAudioSource : IClydeAudioSource
+    {
+        public static DummyAudioSource Instance { get; } = new();
+
+        public bool IsPlaying => default;
+        public bool IsLooping { get; set; }
+
+        public void Dispose()
+        {
+            // Nada.
+        }
+
+        public void StartPlaying()
+        {
+            // Nada.
+        }
+
+        public void StopPlaying()
+        {
+            // Nada.
+        }
+
+        public bool IsGlobal { get; }
+
+        public bool SetPosition(Vector2 position)
+        {
+            return true;
+        }
+
+        public void SetPitch(float pitch)
+        {
+            // Nada.
+        }
+
+        public void SetGlobal()
+        {
+            // Nada.
+        }
+
+        public void SetVolume(float decibels)
+        {
+            // Nada.
+        }
+
+        public void SetVolumeDirect(float gain)
+        {
+            // Nada.
+        }
+
+        public void SetMaxDistance(float maxDistance)
+        {
+            // Nada.
+        }
+
+        public void SetRolloffFactor(float rolloffFactor)
+        {
+            // Nada.
+        }
+
+        public void SetReferenceDistance(float refDistance)
+        {
+            // Nada.
+        }
+
+        public void SetOcclusion(float blocks)
+        {
+            // Nada.
+        }
+
+        public void SetPlaybackPosition(float seconds)
+        {
+            // Nada.
+        }
+
+        public void SetVelocity(Vector2 velocity)
+        {
+            // Nada.
+        }
+    }
+}

Robust.Client/Graphics/Audio/DummyBufferedAudioSource.cs

@@ -1,11 +1,24 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Robust.Client.Audio;
+using Robust.Client.Input;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Timing;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using Color = Robust.Shared.Maths.Color;
 
-namespace Robust.Shared.Audio.Sources
+namespace Robust.Client.Graphics.Audio
 {
     /// <summary>
-    ///     Hey look, it's Audio.BufferedAudioSource's evil twin brother!
+    ///     Hey look, it's ClydeAudio.BufferedAudioSource's evil twin brother!
     /// </summary>
-    internal sealed class DummyBufferedAudioSource : DummyAudioSource, IBufferedAudioSource
+    internal sealed class DummyBufferedAudioSource : DummyAudioSource, IClydeBufferedAudioSource
     {
         public new static DummyBufferedAudioSource Instance { get; } = new();
         public int SampleRate { get; set; } = 0;

Robust.Client/Graphics/Audio/FallbackProxyClydeAudio.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Robust.Client.Audio;
+using Robust.Client.Input;
+using Robust.Shared.Timing;
+using Robust.Shared.IoC;
+
+namespace Robust.Client.Graphics.Audio
+{
+    /// <summary>
+    ///     For "start ss14 with no audio devices" Smugleaf
+    /// </summary>
+    [UsedImplicitly]
+    internal sealed class FallbackProxyClydeAudio : ProxyClydeAudio
+    {
+        [Dependency] private readonly IDependencyCollection _deps = default!;
+
+        public override bool InitializePostWindowing()
+        {
+            // Deliberate lack of base call here (see base implementation for comments as to why there even is a base)
+
+            ActualImplementation = new ClydeAudio();
+            _deps.InjectDependencies(ActualImplementation, true);
+            if (ActualImplementation.InitializePostWindowing())
+                return true;
+
+            // If we get here, that failed, so use the fallback
+            ActualImplementation = new ClydeAudioHeadless();
+            _deps.InjectDependencies(ActualImplementation, true);
+            return ActualImplementation.InitializePostWindowing();
+        }
+    }
+}

Robust.Client/Graphics/Audio/ProxyClydeAudio.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Robust.Client.Audio;
+using Robust.Client.Input;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Timing;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using Color = Robust.Shared.Maths.Color;
+
+namespace Robust.Client.Graphics.Audio
+{
+    /// <summary>
+    ///     For "start ss14 with no audio devices" Smugleaf
+    /// </summary>
+    [UsedImplicitly]
+    internal abstract class ProxyClydeAudio : IClydeAudio, IClydeAudioInternal
+    {
+        protected IClydeAudioInternal ActualImplementation = default!;
+
+        public virtual bool InitializePostWindowing()
+        {
+            // This particular implementation exists to be overridden because removing this method causes C# to complain
+            return ActualImplementation.InitializePostWindowing();
+        }
+
+        public void FrameProcess(FrameEventArgs eventArgs)
+        {
+            ActualImplementation.FrameProcess(eventArgs);
+        }
+
+        public void Shutdown()
+        {
+            ActualImplementation.Shutdown();
+        }
+
+        public AudioStream LoadAudioOggVorbis(Stream stream, string? name = null)
+        {
+            return ActualImplementation.LoadAudioOggVorbis(stream, name);
+        }
+
+        public AudioStream LoadAudioWav(Stream stream, string? name = null)
+        {
+            return ActualImplementation.LoadAudioWav(stream, name);
+        }
+
+        public AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null)
+        {
+            return ActualImplementation.LoadAudioRaw(samples, channels, sampleRate, name);
+        }
+
+        public IClydeAudioSource? CreateAudioSource(AudioStream stream)
+        {
+            return ActualImplementation.CreateAudioSource(stream);
+        }
+
+        public IClydeBufferedAudioSource CreateBufferedAudioSource(int buffers, bool floatAudio = false)
+        {
+            return ActualImplementation.CreateBufferedAudioSource(buffers, floatAudio);
+        }
+
+        public void SetMasterVolume(float newVolume)
+        {
+            ActualImplementation.SetMasterVolume(newVolume);
+        }
+
+        public void DisposeAllAudio()
+        {
+            ActualImplementation.DisposeAllAudio();
+        }
+
+        public void StopAllAudio()
+        {
+            ActualImplementation.StopAllAudio();
+        }
+    }
+}

Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs

@@ -4,6 +4,7 @@ using OpenToolkit.Graphics.OpenGL4;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
@@ -40,28 +41,22 @@ namespace Robust.Client.Graphics.Clyde
             gridProgram.SetUniformTextureMaybe(UniILightTexture, TextureUnit.Texture1);
             gridProgram.SetUniform(UniIModUV, new Vector4(0, 0, 1, 1));
 
-            var grids = new List<Entity<MapGridComponent>>();
-            _mapManager.FindGridsIntersecting(mapId, worldBounds, ref grids);
-            foreach (var mapGrid in grids)
+            foreach (var mapGrid in _mapManager.FindGridsIntersecting(mapId, worldBounds))
             {
-                if (!_mapChunkData.ContainsKey(mapGrid))
+                if (!_mapChunkData.ContainsKey(mapGrid.Owner))
                     continue;
 
-                var transform = _entityManager.GetComponent<TransformComponent>(mapGrid);
+                var transform = _entityManager.GetComponent<TransformComponent>(mapGrid.Owner);
                 gridProgram.SetUniform(UniIModelMatrix, transform.WorldMatrix);
-                var enumerator = mapGrid.Comp.GetMapChunks(worldBounds);
-                var data = _mapChunkData[mapGrid];
+                var enumerator = mapGrid.GetMapChunks(worldBounds);
 
                 while (enumerator.MoveNext(out var chunk))
                 {
-                    DebugTools.Assert(chunk.FilledTiles > 0);
-                    if (!data.TryGetValue(chunk.Indices, out MapChunkData? datum))
-                        data[chunk.Indices] = datum = _initChunkBuffers(mapGrid, chunk);
+                    if (_isChunkDirty(mapGrid, chunk))
+                        _updateChunkMesh(mapGrid, chunk);
 
-                    if (datum.Dirty)
-                        _updateChunkMesh(mapGrid, chunk, datum);
+                    var datum = _mapChunkData[mapGrid.Owner][chunk.Indices];
 
-                    DebugTools.Assert(datum.TileCount > 0);
                     if (datum.TileCount == 0)
                         continue;
 
@@ -73,36 +68,22 @@ namespace Robust.Client.Graphics.Clyde
                     CheckGlError();
                 }
             }
-
-            CullEmptyChunks();
         }
 
-        private void CullEmptyChunks()
+        private void _updateChunkMesh(MapGridComponent grid, MapChunk chunk)
         {
-            foreach (var (grid, chunks) in _mapChunkData)
+            var data = _mapChunkData[grid.Owner];
+
+            if (!data.TryGetValue(chunk.Indices, out var datum))
             {
-                var gridComp = _mapManager.GetGridComp(grid);
-                foreach (var (index, chunk) in chunks)
-                {
-                    if (!chunk.Dirty || gridComp.Chunks.ContainsKey(index))
-                    {
-                        DebugTools.Assert(gridComp.Chunks[index].FilledTiles > 0);
-                        continue;
-                    }
-
-                    DeleteChunk(chunk);
-                    chunks.Remove(index);
-                }
+                datum = _initChunkBuffers(grid, chunk);
             }
-        }
 
-        private void _updateChunkMesh(Entity<MapGridComponent> grid, MapChunk chunk, MapChunkData datum)
-        {
             Span<ushort> indexBuffer = stackalloc ushort[_indicesPerChunk(chunk)];
             Span<Vertex2D> vertexBuffer = stackalloc Vertex2D[_verticesPerChunk(chunk)];
 
             var i = 0;
-            var cSz = grid.Comp.ChunkSize;
+            var cSz = grid.ChunkSize;
             var cScaled = chunk.Indices * cSz;
             for (ushort x = 0; x < cSz; x++)
             {
@@ -149,7 +130,7 @@ namespace Robust.Client.Graphics.Clyde
             datum.TileCount = i;
         }
 
-        private unsafe MapChunkData _initChunkBuffers(Entity<MapGridComponent> grid, MapChunk chunk)
+        private unsafe MapChunkData _initChunkBuffers(MapGridComponent grid, MapChunk chunk)
         {
             var vao = GenVertexArray();
             BindVertexArray(vao);
@@ -177,22 +158,41 @@ namespace Robust.Client.Graphics.Clyde
                 Dirty = true
             };
 
+            _mapChunkData[grid.Owner].Add(chunk.Indices, datum);
             return datum;
         }
 
-        private void DeleteChunk(MapChunkData data)
+        private bool _isChunkDirty(MapGridComponent grid, MapChunk chunk)
         {
-            DeleteVertexArray(data.VAO);
-            CheckGlError();
-            data.VBO.Delete();
-            data.EBO.Delete();
+            var data = _mapChunkData[grid.Owner];
+            return !data.TryGetValue(chunk.Indices, out var datum) || datum.Dirty;
+        }
+
+        public void _setChunkDirty(MapGridComponent grid, Vector2i chunk)
+        {
+            var data = _mapChunkData.GetOrNew(grid.Owner);
+            if (data.TryGetValue(chunk, out var datum))
+            {
+                datum.Dirty = true;
+            }
+            // Don't need to set it if we don't have an entry since lack of an entry is treated as dirty.
+        }
+
+        private void _updateOnGridModified(GridModifiedEvent args)
+        {
+            foreach (var (pos, _) in args.Modified)
+            {
+                var grid = args.Grid;
+                var chunk = grid.GridTileToChunkIndices(pos);
+                _setChunkDirty(grid, chunk);
+            }
         }
 
         private void _updateTileMapOnUpdate(ref TileChangedEvent args)
         {
-            var gridData = _mapChunkData.GetOrNew(args.Entity);
-            if (gridData.TryGetValue(args.ChunkIndex, out var data))
-                data.Dirty = true;
+            var grid = _mapManager.GetGrid(args.NewTile.GridUid);
+            var chunk = grid.GridTileToChunkIndices(new Vector2i(args.NewTile.X, args.NewTile.Y));
+            _setChunkDirty(grid, chunk);
         }
 
         private void _updateOnGridCreated(GridStartupEvent ev)
@@ -208,7 +208,10 @@ namespace Robust.Client.Graphics.Clyde
             var data = _mapChunkData[gridId];
             foreach (var chunkDatum in data.Values)
             {
-                DeleteChunk(chunkDatum);
+                DeleteVertexArray(chunkDatum.VAO);
+                CheckGlError();
+                chunkDatum.VBO.Delete();
+                chunkDatum.EBO.Delete();
             }
 
             _mapChunkData.Remove(gridId);

Robust.Client/Graphics/Clyde/Clyde.HLR.cs

@@ -350,7 +350,7 @@ namespace Robust.Client.Graphics.Clyde
                         _renderHandle.Viewport(Box2i.FromDimensions(-flippedPos, screenSize));
 
                         if (entry.Sprite.RaiseShaderEvent)
-                            _entityManager.EventBus.RaiseLocalEvent(entry.Uid,
+                            _entityManager.EventBus.RaiseLocalEvent(entry.Sprite.Owner,
                                 new BeforePostShaderRenderEvent(entry.Sprite, viewport), false);
                     }
                 }
@@ -512,7 +512,7 @@ namespace Robust.Client.Graphics.Clyde
                         RenderOverlays(viewport, OverlaySpace.WorldSpaceBelowFOV, worldAABB, worldBounds);
                     }
 
-                    if (_lightManager.Enabled && _lightManager.DrawHardFov && eye.DrawLight && eye.DrawFov)
+                    if (_lightManager.Enabled && _lightManager.DrawHardFov && eye.DrawFov)
                     {
                         ApplyFovToBuffer(viewport, eye);
                     }

Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs

@@ -97,9 +97,6 @@ namespace Robust.Client.Graphics.Clyde
 
         private (PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot)[] _lightsToRenderList = default!;
 
-        private LightCapacityComparer _lightCap = new();
-        private ShadowCapacityComparer _shadowCap = new ShadowCapacityComparer();
-
         private unsafe void InitLighting()
         {
 
@@ -335,18 +332,16 @@ namespace Robust.Client.Graphics.Clyde
 
         private void DrawLightsAndFov(Viewport viewport, Box2Rotated worldBounds, Box2 worldAABB, IEye eye)
         {
-            if (!_lightManager.Enabled || !eye.DrawLight)
+            if (!_lightManager.Enabled)
             {
                 return;
             }
 
             var mapId = eye.Position.MapId;
-            if (mapId == MapId.Nullspace)
-                return;
 
             // If this map has lighting disabled, return
             var mapUid = _mapManager.GetMapEntityId(mapId);
-            if (!_entityManager.TryGetComponent<MapComponent>(mapUid, out var map) || !map.LightingEnabled)
+            if (!_entityManager.GetComponent<MapComponent>(mapUid).LightingEnabled)
             {
                 return;
             }
@@ -573,28 +568,6 @@ namespace Robust.Client.Graphics.Clyde
             return true;
         }
 
-        private sealed class LightCapacityComparer : IComparer<(PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot)>
-        {
-            public int Compare(
-                (PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) x,
-                (PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) y)
-            {
-                if (x.light.CastShadows && !y.light.CastShadows) return 1;
-                if (!x.light.CastShadows && y.light.CastShadows) return -1;
-                return 0;
-            }
-        }
-
-        private sealed class ShadowCapacityComparer : IComparer<(PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot)>
-        {
-            public int Compare(
-                (PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) x,
-                (PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) y)
-            {
-                return x.distanceSquared.CompareTo(y.distanceSquared);
-            }
-        }
-
         private (int count, Box2 expandedBounds) GetLightsToRender(
             MapId map,
             in Box2Rotated worldBounds,
@@ -620,10 +593,20 @@ namespace Robust.Client.Graphics.Clyde
 
                 // First, partition the array based on whether the lights are shadow casting or not
                 // (non shadow casting lights should be the first partition, shadow casting lights the second)
-                Array.Sort(_lightsToRenderList, 0, state.count, _lightCap);
+                Array.Sort(_lightsToRenderList, 0, state.count,
+                    Comparer<(PointLightComponent light, Vector2 pos, float distanceSquared)>.Create((x, y) =>
+                    {
+                        if (x.light.CastShadows && !y.light.CastShadows) return 1;
+                        else if (!x.light.CastShadows && y.light.CastShadows) return -1;
+                        else return 0;
+                    }));
 
                 // Next, sort just the shadow casting lights by distance.
-                Array.Sort(_lightsToRenderList, state.count - state.shadowCastingCount, state.shadowCastingCount, _shadowCap);
+                Array.Sort(_lightsToRenderList, state.count - state.shadowCastingCount, state.shadowCastingCount,
+                    Comparer<(PointLightComponent light, Vector2 pos, float distanceSquared)>.Create((x, y) =>
+                    {
+                        return x.distanceSquared.CompareTo(y.distanceSquared);
+                    }));
 
                 // Then effectively delete the furthest lights, by setting the end of the array to exclude N
                 // number of shadow casting lights (where N is the number above the max number per scene.)

Robust.Client/Graphics/Clyde/Clyde.Sprite.cs

@@ -1,3 +1,11 @@
+using Robust.Client.ComponentTrees;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Physics;
+using Robust.Shared.Threading;
+using Robust.Shared.Utility;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
@@ -6,15 +14,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 using System.Threading.Tasks;
-using Robust.Client.ComponentTrees;
-using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Graphics;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using Robust.Shared.Physics;
-using Robust.Shared.Threading;
-using Robust.Shared.Utility;
 
 namespace Robust.Client.Graphics.Clyde;
 
@@ -260,7 +260,7 @@ internal partial class Clyde
             if (cmp != 0)
                 return cmp;
 
-            return a.Uid.CompareTo(b.Uid);
+            return a.Sprite.Owner.CompareTo(b.Sprite.Owner);
         }
     }
 }

Robust.Client/Graphics/Clyde/Clyde.Windowing.cs

@@ -260,14 +260,14 @@ namespace Robust.Client.Graphics.Clyde
                 yield break;
             }
 
-            foreach (var file in _resManager.ContentFindFiles(_windowIconPath))
+            foreach (var file in _resourceCache.ContentFindFiles(_windowIconPath))
             {
                 if (file.Extension != "png")
                 {
                     continue;
                 }
 
-                using var stream = _resManager.ContentFileRead(file);
+                using var stream = _resourceCache.ContentFileRead(file);
                 yield return Image.Load<Rgba32>(stream);
             }
         }

Robust.Client/Graphics/Clyde/Clyde.cs

@@ -11,16 +11,17 @@ using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Shared;
 using Robust.Shared.Configuration;
-using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Profiling;
 using Robust.Shared.Timing;
+using SixLabors.ImageSharp;
+using Color = Robust.Shared.Maths.Color;
+using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute;
 using TextureWrapMode = Robust.Shared.Graphics.TextureWrapMode;
 
 namespace Robust.Client.Graphics.Clyde
@@ -37,7 +38,6 @@ namespace Robust.Client.Graphics.Clyde
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] private readonly IResourceCache _resourceCache = default!;
-        [Dependency] private readonly IResourceManager _resManager = default!;
         [Dependency] private readonly IUserInterfaceManagerInternal _userInterfaceManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
@@ -175,6 +175,7 @@ namespace Robust.Client.Graphics.Clyde
             _entityManager.EventBus.SubscribeEvent<TileChangedEvent>(EventSource.Local, this, _updateTileMapOnUpdate);
             _entityManager.EventBus.SubscribeEvent<GridStartupEvent>(EventSource.Local, this, _updateOnGridCreated);
             _entityManager.EventBus.SubscribeEvent<GridRemovalEvent>(EventSource.Local, this, _updateOnGridRemoved);
+            _entityManager.EventBus.SubscribeEvent<GridModifiedEvent>(EventSource.Local, this, _updateOnGridModified);
         }
 
         public void ShutdownGridEcsEvents()
@@ -182,6 +183,7 @@ namespace Robust.Client.Graphics.Clyde
             _entityManager.EventBus.UnsubscribeEvent<TileChangedEvent>(EventSource.Local, this);
             _entityManager.EventBus.UnsubscribeEvent<GridStartupEvent>(EventSource.Local, this);
             _entityManager.EventBus.UnsubscribeEvent<GridRemovalEvent>(EventSource.Local, this);
+            _entityManager.EventBus.UnsubscribeEvent<GridModifiedEvent>(EventSource.Local, this);
         }
 
         private void GLInitBindings(bool gles)

Robust.Client/Graphics/Clyde/ClydeHeadless.cs

@@ -292,6 +292,123 @@ namespace Robust.Client.Graphics.Clyde
             }
         }
 
+        [Virtual]
+        private class DummyAudioSource : IClydeAudioSource
+        {
+            public static DummyAudioSource Instance { get; } = new();
+
+            public bool IsPlaying => default;
+            public bool IsLooping { get; set; }
+
+            public void Dispose()
+            {
+                // Nada.
+            }
+
+            public void StartPlaying()
+            {
+                // Nada.
+            }
+
+            public void StopPlaying()
+            {
+                // Nada.
+            }
+
+            public bool IsGlobal { get; }
+
+            public bool SetPosition(Vector2 position)
+            {
+                return true;
+            }
+
+            public void SetPitch(float pitch)
+            {
+                // Nada.
+            }
+
+            public void SetGlobal()
+            {
+                // Nada.
+            }
+
+            public void SetVolume(float decibels)
+            {
+                // Nada.
+            }
+
+            public void SetVolumeDirect(float gain)
+            {
+                // Nada.
+            }
+
+            public void SetMaxDistance(float maxDistance)
+            {
+                // Nada.
+            }
+
+            public void SetRolloffFactor(float rolloffFactor)
+            {
+                // Nada.
+            }
+
+            public void SetReferenceDistance(float refDistance)
+            {
+                // Nada.
+            }
+
+            public void SetOcclusion(float blocks)
+            {
+                // Nada.
+            }
+
+            public void SetPlaybackPosition(float seconds)
+            {
+                // Nada.
+            }
+
+            public void SetVelocity(Vector2 velocity)
+            {
+                // Nada.
+            }
+        }
+
+        private sealed class DummyBufferedAudioSource : DummyAudioSource, IClydeBufferedAudioSource
+        {
+            public new static DummyBufferedAudioSource Instance { get; } = new();
+            public int SampleRate { get; set; } = 0;
+
+            public void WriteBuffer(int handle, ReadOnlySpan<ushort> data)
+            {
+                // Nada.
+            }
+
+            public void WriteBuffer(int handle, ReadOnlySpan<float> data)
+            {
+                // Nada.
+            }
+
+            public void QueueBuffers(ReadOnlySpan<int> handles)
+            {
+                // Nada.
+            }
+
+            public void EmptyBuffers()
+            {
+                // Nada.
+            }
+
+            public void GetBuffersProcessed(Span<int> handles)
+            {
+                // Nada.
+            }
+
+            public int GetNumberOfBuffersProcessed()
+            {
+                return 0;
+            }
+        }
+
         private sealed class DummyTexture : OwnedTexture
         {
             public DummyTexture(Vector2i size) : base(size)

Robust.Client/Graphics/ClydeHandle.cs

@@ -1,54 +1,54 @@
 using System;
-using Robust.Shared.Graphics;
 
-namespace Robust.Client.Graphics;
-
-internal readonly struct ClydeHandle : IEquatable<ClydeHandle>, IClydeHandle
+namespace Robust.Client.Graphics
 {
-    public ClydeHandle(long value)
+    internal struct ClydeHandle : IEquatable<ClydeHandle>
     {
-        Value = value;
-    }
+        public ClydeHandle(long value)
+        {
+            Value = value;
+        }
 
-    public long Value { get; }
+        public readonly long Value;
 
-    public static explicit operator ClydeHandle(long x)
-    {
-        return new(x);
-    }
+        public static explicit operator ClydeHandle(long x)
+        {
+            return new(x);
+        }
 
-    public static explicit operator long(ClydeHandle h)
-    {
-        return h.Value;
-    }
+        public static explicit operator long(ClydeHandle h)
+        {
+            return h.Value;
+        }
 
-    public bool Equals(ClydeHandle other)
-    {
-        return Value == other.Value;
-    }
+        public bool Equals(ClydeHandle other)
+        {
+            return Value == other.Value;
+        }
 
-    public override bool Equals(object? obj)
-    {
-        return obj is ClydeHandle other && Equals(other);
-    }
+        public override bool Equals(object? obj)
+        {
+            return obj is ClydeHandle other && Equals(other);
+        }
 
-    public override int GetHashCode()
-    {
-        return Value.GetHashCode();
-    }
+        public override int GetHashCode()
+        {
+            return Value.GetHashCode();
+        }
 
-    public static bool operator ==(ClydeHandle left, ClydeHandle right)
-    {
-        return left.Value == right.Value;
-    }
+        public static bool operator ==(ClydeHandle left, ClydeHandle right)
+        {
+            return left.Value == right.Value;
+        }
 
-    public static bool operator !=(ClydeHandle left, ClydeHandle right)
-    {
-        return left.Value != right.Value;
-    }
+        public static bool operator !=(ClydeHandle left, ClydeHandle right)
+        {
+            return left.Value != right.Value;
+        }
 
-    public override string ToString()
-    {
-        return $"ClydeHandle {Value}";
+        public override string ToString()
+        {
+            return $"ClydeHandle {Value}";
+        }
     }
 }

Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs

@@ -114,10 +114,9 @@ namespace Robust.Client.Graphics
             {
                 if (rune == new Rune('\n'))
                 {
+                    baseLine.X = 0f;
                     baseLine.Y += lineHeight;
                     advanceTotal.Y += lineHeight;
-                    advanceTotal.X = Math.Max(advanceTotal.X, baseLine.X);
-                    baseLine.X = 0f;
                     continue;
                 }
 
@@ -127,6 +126,7 @@ namespace Robust.Client.Graphics
                     continue;
 
                 var advance = metrics.Value.Advance;
+                advanceTotal.X += advance;
                 baseLine += new Vector2(advance, 0);
             }
 

Robust.Client/Graphics/IClydeAudio.cs

@@ -0,0 +1,23 @@
+using System;
+using System.IO;
+using Robust.Client.Audio;
+
+namespace Robust.Client.Graphics
+{
+    public interface IClydeAudio
+    {
+        // AUDIO SYSTEM DOWN BELOW.
+        AudioStream LoadAudioOggVorbis(Stream stream, string? name = null);
+        AudioStream LoadAudioWav(Stream stream, string? name = null);
+        AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null);
+
+        void SetMasterVolume(float newVolume);
+
+        void DisposeAllAudio();
+
+        void StopAllAudio();
+
+        IClydeAudioSource? CreateAudioSource(AudioStream stream);
+        IClydeBufferedAudioSource CreateBufferedAudioSource(int buffers, bool floatAudio=false);
+    }
+}

Robust.Client/Graphics/IClydeAudioInternal.cs

@@ -0,0 +1,16 @@
+using System;
+using Robust.Client.Input;
+using Robust.Client.UserInterface;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Timing;
+
+namespace Robust.Client.Graphics
+{
+    internal interface IClydeAudioInternal : IClydeAudio
+    {
+        bool InitializePostWindowing();
+        void FrameProcess(FrameEventArgs eventArgs);
+        void Shutdown();
+    }
+}

Robust.Client/Graphics/IClydeAudioSource.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Numerics;
+using JetBrains.Annotations;
+using Robust.Shared.Maths;
+
+namespace Robust.Client.Graphics
+{
+    public interface IClydeAudioSource : IDisposable
+    {
+        void StartPlaying();
+        void StopPlaying();
+
+        bool IsPlaying { get; }
+
+        bool IsLooping { get; set; }
+        bool IsGlobal { get; }
+
+        [MustUseReturnValue]
+        bool SetPosition(Vector2 position);
+        void SetPitch(float pitch);
+        void SetGlobal();
+        void SetVolume(float decibels);
+        void SetVolumeDirect(float gain);
+        void SetMaxDistance(float maxDistance);
+        void SetRolloffFactor(float rolloffFactor);
+        void SetReferenceDistance(float refDistance);
+        void SetOcclusion(float blocks);
+        void SetPlaybackPosition(float seconds);
+        void SetVelocity(Vector2 velocity);
+    }
+}

Robust.Client/Graphics/IClydeBufferedAudioSource.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace Robust.Client.Graphics
+{
+    public interface IClydeBufferedAudioSource : IClydeAudioSource
+    {
+        int SampleRate { get; set; }
+        int GetNumberOfBuffersProcessed();
+        void GetBuffersProcessed(Span<int> handles);
+        void WriteBuffer(int handle, ReadOnlySpan<ushort> data);
+        void WriteBuffer(int handle, ReadOnlySpan<float> data);
+        void QueueBuffers(ReadOnlySpan<int> handles);
+        void EmptyBuffers();
+    }
+}

Robust.Client/Graphics/Overlays/IOverlayManager.cs

@@ -4,29 +4,32 @@ using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Robust.Shared.Timing;
 
-namespace Robust.Client.Graphics;
-
-[PublicAPI]
-public interface IOverlayManager
+namespace Robust.Client.Graphics
 {
-    bool AddOverlay(Overlay overlay);
 
-    bool RemoveOverlay(Overlay overlay);
-    bool RemoveOverlay(Type overlayClass);
-    bool RemoveOverlay<T>() where T : Overlay;
-    bool TryGetOverlay(Type overlayClass, [NotNullWhen(true)] out Overlay? overlay);
-    bool TryGetOverlay<T>([NotNullWhen(true)] out T? overlay) where T : Overlay;
+    [PublicAPI]
+    public interface IOverlayManager
+    {
+        bool AddOverlay(Overlay overlay);
 
-    Overlay GetOverlay(Type overlayClass);
-    T GetOverlay<T>() where T : Overlay;
+        bool RemoveOverlay(Overlay overlay);
+        bool RemoveOverlay(Type overlayClass);
+        bool RemoveOverlay<T>() where T : Overlay;
 
-    bool HasOverlay(Type overlayClass);
-    bool HasOverlay<T>() where T : Overlay;
+        bool TryGetOverlay(Type overlayClass, [NotNullWhen(true)] out Overlay? overlay);
+        bool TryGetOverlay<T>([NotNullWhen(true)] out T? overlay) where T : Overlay;
 
-    IEnumerable<Overlay> AllOverlays { get; }
-}
-
-internal interface IOverlayManagerInternal : IOverlayManager
-{
-    void FrameUpdate(FrameEventArgs args);
+        Overlay GetOverlay(Type overlayClass);
+        T GetOverlay<T>() where T : Overlay;
+
+        bool HasOverlay(Type overlayClass);
+        bool HasOverlay<T>() where T : Overlay;
+
+        IEnumerable<Overlay> AllOverlays { get; }
+    }
+
+    internal interface IOverlayManagerInternal : IOverlayManager
+    {
+        void FrameUpdate(FrameEventArgs args);
+    }
 }

Robust.Client/Graphics/Overlays/OverlayManager.cs

@@ -6,106 +6,107 @@ using Robust.Shared.Log;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Robust.Client.Graphics;
-
-internal sealed class OverlayManager : IOverlayManagerInternal, IPostInjectInit
+namespace Robust.Client.Graphics
 {
-    [Dependency] private readonly ILogManager _logMan = default!;
-
-    [ViewVariables]
-    private readonly Dictionary<Type, Overlay> _overlays = new Dictionary<Type, Overlay>();
-    private ISawmill _logger = default!;
-
-    public IEnumerable<Overlay> AllOverlays => _overlays.Values;
-
-    public void FrameUpdate(FrameEventArgs args)
+    internal sealed class OverlayManager : IOverlayManagerInternal, IPostInjectInit
     {
-        foreach (var overlay in _overlays.Values)
+        [Dependency] private readonly ILogManager _logMan = default!;
+
+        [ViewVariables]
+        private readonly Dictionary<Type, Overlay> _overlays = new Dictionary<Type, Overlay>();
+        private ISawmill _logger = default!;
+
+        public IEnumerable<Overlay> AllOverlays => _overlays.Values;
+
+        public void FrameUpdate(FrameEventArgs args)
         {
-            overlay.FrameUpdate(args);
-        }
-    }
-
-    public bool AddOverlay(Overlay overlay)
-    {
-        if (_overlays.ContainsKey(overlay.GetType()))
-            return false;
-        _overlays.Add(overlay.GetType(), overlay);
-        return true;
-    }
-
-    public bool RemoveOverlay(Type overlayClass)
-    {
-        if (!overlayClass.IsSubclassOf(typeof(Overlay)))
-        {
-            _logger.Error($"RemoveOverlay was called with arg: {overlayClass}, which is not a subclass of Overlay!");
-            return false;
+            foreach (var overlay in _overlays.Values)
+            {
+                overlay.FrameUpdate(args);
+            }
         }
 
-        return _overlays.Remove(overlayClass);
-    }
-
-    public bool RemoveOverlay<T>() where T : Overlay
-    {
-        return RemoveOverlay(typeof(T));
-    }
-
-    public bool RemoveOverlay(Overlay overlay)
-    {
-        return _overlays.Remove(overlay.GetType());
-    }
-
-    public bool TryGetOverlay(Type overlayClass, [NotNullWhen(true)] out Overlay? overlay)
-    {
-        overlay = null;
-        if (!overlayClass.IsSubclassOf(typeof(Overlay)))
+        public bool AddOverlay(Overlay overlay)
         {
-            _logger.Error($"TryGetOverlay was called with arg: {overlayClass}, which is not a subclass of Overlay!");
-            return false;
-        }
-
-        return _overlays.TryGetValue(overlayClass, out overlay);
-    }
-
-    public bool TryGetOverlay<T>([NotNullWhen(true)] out T? overlay) where T : Overlay
-    {
-        overlay = null;
-        if (_overlays.TryGetValue(typeof(T), out Overlay? toReturn))
-        {
-            overlay = (T)toReturn;
+            if (_overlays.ContainsKey(overlay.GetType()))
+                return false;
+            _overlays.Add(overlay.GetType(), overlay);
             return true;
         }
 
-        return false;
-    }
-
-    public Overlay GetOverlay(Type overlayClass)
-    {
-        return _overlays[overlayClass];
-    }
-
-    public T GetOverlay<T>() where T : Overlay
-    {
-        return (T)_overlays[typeof(T)];
-    }
-
-    public bool HasOverlay(Type overlayClass)
-    {
-        if (!overlayClass.IsSubclassOf(typeof(Overlay)))
+        public bool RemoveOverlay(Type overlayClass)
         {
-            _logger.Error($"HasOverlay was called with arg: {overlayClass}, which is not a subclass of Overlay!");
+            if (!overlayClass.IsSubclassOf(typeof(Overlay)))
+            {
+                _logger.Error($"RemoveOverlay was called with arg: {overlayClass}, which is not a subclass of Overlay!");
+                return false;
+            }
+
+            return _overlays.Remove(overlayClass);
         }
 
-        return _overlays.ContainsKey(overlayClass);
-    }
+        public bool RemoveOverlay<T>() where T : Overlay
+        {
+            return RemoveOverlay(typeof(T));
+        }
 
-    public bool HasOverlay<T>() where T : Overlay
-    {
-        return _overlays.ContainsKey(typeof(T));
-    }
+        public bool RemoveOverlay(Overlay overlay)
+        {
+            return _overlays.Remove(overlay.GetType());
+        }
 
-    void IPostInjectInit.PostInject()
-    {
-        _logger = _logMan.GetSawmill("overlay");
+        public bool TryGetOverlay(Type overlayClass, [NotNullWhen(true)] out Overlay? overlay)
+        {
+            overlay = null;
+            if (!overlayClass.IsSubclassOf(typeof(Overlay)))
+            {
+                _logger.Error($"TryGetOverlay was called with arg: {overlayClass}, which is not a subclass of Overlay!");
+                return false;
+            }
+
+            return _overlays.TryGetValue(overlayClass, out overlay);
+        }
+
+        public bool TryGetOverlay<T>([NotNullWhen(true)] out T? overlay) where T : Overlay
+        {
+            overlay = null;
+            if (_overlays.TryGetValue(typeof(T), out Overlay? toReturn))
+            {
+                overlay = (T)toReturn;
+                return true;
+            }
+
+            return false;
+        }
+
+        public Overlay GetOverlay(Type overlayClass)
+        {
+            return _overlays[overlayClass];
+        }
+
+        public T GetOverlay<T>() where T : Overlay
+        {
+            return (T)_overlays[typeof(T)];
+        }
+
+        public bool HasOverlay(Type overlayClass)
+        {
+            if (!overlayClass.IsSubclassOf(typeof(Overlay)))
+            {
+                _logger.Error($"HasOverlay was called with arg: {overlayClass}, which is not a subclass of Overlay!");
+            }
+
+            return _overlays.ContainsKey(overlayClass);
+        }
+
+        public bool HasOverlay<T>() where T : Overlay
+        {
+            return _overlays.ContainsKey(typeof(T));
+        }
+
+        void IPostInjectInit.PostInject()
+        {
+            _logger = _logMan.GetSawmill("overlay");
+        }
     }
 }

Robust.Client/Map/ClydeTileDefinitionManager.cs

@@ -7,7 +7,6 @@ using Robust.Client.Map;
 using Robust.Client.ResourceManagement;
 using Robust.Client.Utility;
 using Robust.Shared.Console;
-using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
@@ -23,7 +22,7 @@ namespace Robust.Client.Map
 {
     internal sealed class ClydeTileDefinitionManager : TileDefinitionManager, IClydeTileDefinitionManager
     {
-        [Dependency] private readonly IResourceManager _manager = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
 
         private Texture? _tileTextureAtlas;
 
@@ -87,7 +86,7 @@ namespace Robust.Client.Map
                     0, (h - EyeManager.PixelsPerMeter) / h,
                     tileSize / w, tileSize / h);
                 Image<Rgba32> image;
-                using (var stream = _manager.ContentFileRead("/Textures/noTile.png"))
+                using (var stream = _resourceCache.ContentFileRead("/Textures/noTile.png"))
                 {
                     image = Image.Load<Rgba32>(stream);
                 }
@@ -111,7 +110,7 @@ namespace Robust.Client.Map
                 // Already know it's not null above
                 var path = def.Sprite!.Value;
 
-                using (var stream = _manager.ContentFileRead(path))
+                using (var stream = _resourceCache.ContentFileRead(path))
                 {
                     image = Image.Load<Rgba32>(stream);
                 }

Robust.Client/Map/TileEdgeOverlay.cs

@@ -1,13 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
+using Direction = Robust.Shared.Maths.Direction;
 
 namespace Robust.Client.Map;
 
@@ -23,8 +22,6 @@ public sealed class TileEdgeOverlay : Overlay
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
 
-    private List<Entity<MapGridComponent>> _grids = new();
-
     public TileEdgeOverlay(IEntityManager entManager, IMapManager mapManager, IResourceCache resource, ITileDefinitionManager tileDefManager)
     {
         _entManager = entManager;
@@ -39,23 +36,16 @@ public sealed class TileEdgeOverlay : Overlay
         if (args.MapId == MapId.Nullspace)
             return;
 
-        _grids.Clear();
-        _mapManager.FindGridsIntersecting(args.MapId, args.WorldBounds, ref _grids);
+        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
 
-        var mapSystem = _entManager.System<SharedMapSystem>();
-        var xformSystem = _entManager.System<SharedTransformSystem>();
-
-        foreach (var grid in _grids)
+        foreach (var grid in _mapManager.FindGridsIntersecting(args.MapId, args.WorldBounds))
         {
-            var tileSize = grid.Comp.TileSize;
+            var tileSize = grid.TileSize;
             var tileDimensions = new Vector2(tileSize, tileSize);
-            var (_, _, worldMatrix, invMatrix) = xformSystem.GetWorldPositionRotationMatrixWithInv(grid.Owner);
-            args.WorldHandle.SetTransform(worldMatrix);
-            var localAABB = invMatrix.TransformBox(args.WorldBounds);
+            var xform = xformQuery.GetComponent(grid.Owner);
+            args.WorldHandle.SetTransform(xform.WorldMatrix);
 
-            var enumerator = mapSystem.GetLocalTilesEnumerator(grid.Owner, grid.Comp, localAABB, false);
-
-            while (enumerator.MoveNext(out var tileRef))
+            foreach (var tileRef in grid.GetTilesIntersecting(args.WorldBounds, false))
             {
                 var tileDef = _tileDefManager[tileRef.Tile.TypeId];
 
@@ -71,7 +61,7 @@ public sealed class TileEdgeOverlay : Overlay
                             continue;
 
                         var neighborIndices = new Vector2i(tileRef.GridIndices.X + x, tileRef.GridIndices.Y + y);
-                        var neighborTile = mapSystem.GetTileRef(grid.Owner, grid.Comp, neighborIndices);
+                        var neighborTile = grid.GetTileRef(neighborIndices);
                         var neighborDef = _tileDefManager[neighborTile.Tile.TypeId];
 
                         // If it's the same tile then no edge to be drawn.
@@ -123,9 +113,9 @@ public sealed class TileEdgeOverlay : Overlay
                         }
 
                         if (angle == Angle.Zero)
-                            args.WorldHandle.DrawTextureRect(texture.Texture, box);
+                            args.WorldHandle.DrawTextureRect(texture, box);
                         else
-                            args.WorldHandle.DrawTextureRect(texture.Texture, new Box2Rotated(box, angle, box.Center));
+                            args.WorldHandle.DrawTextureRect(texture, new Box2Rotated(box, angle, box.Center));
                     }
                 }
             }

Robust.Client/Physics/PhysicsSystem.Predict.cs

@@ -1,5 +1,6 @@
 using System.Buffers;
 using System.Collections.Generic;
+using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
@@ -7,7 +8,6 @@ using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Physics.Dynamics.Contacts;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Robust.Client.Physics;
@@ -20,8 +20,8 @@ public sealed partial class PhysicsSystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<LocalPlayerAttachedEvent>(OnAttach);
-        SubscribeLocalEvent<LocalPlayerDetachedEvent>(OnDetach);
+        SubscribeLocalEvent<PlayerAttachedEvent>(OnAttach);
+        SubscribeLocalEvent<PlayerDetachedEvent>(OnDetach);
         SubscribeLocalEvent<PhysicsComponent, JointAddedEvent>(OnJointAdded);
         SubscribeLocalEvent<PhysicsComponent, JointRemovedEvent>(OnJointRemoved);
     }
@@ -63,12 +63,12 @@ public sealed partial class PhysicsSystem
         UpdateIsPredicted(args.Joint.BodyBUid);
     }
 
-    private void OnAttach(LocalPlayerAttachedEvent ev)
+    private void OnAttach(PlayerAttachedEvent ev)
     {
         UpdateIsPredicted(ev.Entity);
     }
 
-    private void OnDetach(LocalPlayerDetachedEvent ev)
+    private void OnDetach(PlayerDetachedEvent ev)
     {
         UpdateIsPredicted(ev.Entity);
     }

Robust.Client/Physics/PhysicsSystem.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
+using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Physics;
@@ -25,7 +26,7 @@ namespace Robust.Client.Physics
 
         protected override void Cleanup(PhysicsMapComponent component, float frameTime)
         {
-            var toRemove = new List<Entity<PhysicsComponent>>();
+            var toRemove = new List<PhysicsComponent>();
 
             // Because we're not predicting 99% of bodies its sleep timer never gets incremented so we'll just do it ourselves.
             // (and serializing it over the network isn't necessary?)
@@ -37,13 +38,13 @@ namespace Robust.Client.Physics
                 body.SleepTime += frameTime;
                 if (body.SleepTime > TimeToSleep)
                 {
-                    toRemove.Add(new Entity<PhysicsComponent>(body.Owner, body));
+                    toRemove.Add(body);
                 }
             }
 
             foreach (var body in toRemove)
             {
-                SetAwake(body, false);
+                SetAwake(body.Owner, body, false);
             }
 
             base.Cleanup(component, frameTime);
@@ -81,8 +82,11 @@ namespace Robust.Client.Physics
                     continue;
                 }
 
-                // Transform system will handle lerping.
-                _transform.SetLocalPositionRotation(uid, xform.LocalPosition, xform.LocalRotation, xform);
+                xform.PrevPosition = position;
+                xform.PrevRotation = rotation;
+                xform.LerpParent = parentUid;
+                xform.NextPosition = xform.LocalPosition;
+                xform.NextRotation = xform.LocalRotation;
             }
 
             component.LerpData.Clear();

Robust.Client/Placement/PlacementManager.cs

@@ -8,6 +8,7 @@ using Robust.Client.Player;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Graphics;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
@@ -286,17 +287,23 @@ namespace Robust.Client.Placement
                     }, outsidePrediction: true))
                 .Register<PlacementManager>();
 
-            PlayerManager.LocalPlayerDetached += OnDetached;
+            var localPlayer = PlayerManager.LocalPlayer;
+            localPlayer!.EntityAttached += OnEntityAttached;
         }
 
         private void TearDownInput()
         {
             CommandBinds.Unregister<PlacementManager>();
-            PlayerManager.LocalPlayerDetached -= OnDetached;
+
+            if (PlayerManager.LocalPlayer != null)
+            {
+                PlayerManager.LocalPlayer.EntityAttached -= OnEntityAttached;
+            }
         }
 
-        private void OnDetached(EntityUid obj)
+        private void OnEntityAttached(EntityAttachedEventArgs eventArgs)
         {
+            // player attached to a new entity, basically disable the editor
             Clear();
         }
 

Robust.Client/Player/IPlayerManager.cs

@@ -1,52 +1,44 @@
 using System;
 using System.Collections.Generic;
-using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.Network;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
+using Robust.Shared.ViewVariables;
 
-namespace Robust.Client.Player;
-
-public interface IPlayerManager : ISharedPlayerManager
+namespace Robust.Client.Player
 {
-    /// <summary>
-    /// Invoked when the list of sessions/players gets updated.
-    /// </summary>
-    event Action? PlayerListUpdated;
+    public interface IPlayerManager : ISharedPlayerManager
+    {
+        new IEnumerable<ICommonSession> Sessions { get; }
 
-    /// <summary>
-    /// Invoked when <see cref="ISharedPlayerManager.LocalSession"/> gets attached to a new entity, or when the local
-    /// session gets updated. See also <see cref="LocalPlayerAttachedEvent"/>
-    /// </summary>
-    event Action<EntityUid>? LocalPlayerAttached;
+        [ViewVariables]
+        IReadOnlyDictionary<NetUserId, ICommonSession> SessionsDict { get; }
 
-    /// <summary>
-    /// Invoked when <see cref="ISharedPlayerManager.LocalSession"/> gets detached from an entity, or when the local
-    /// session gets updated. See also <see cref="LocalPlayerDetachedEvent"/>
-    /// </summary>
-    event Action<EntityUid>? LocalPlayerDetached;
+        [ViewVariables]
+        LocalPlayer? LocalPlayer { get; }
 
-    /// <summary>
-    /// Invoked whenever <see cref="ISharedPlayerManager.LocalSession"/> changes.
-    /// </summary>
-    event Action<(ICommonSession? Old, ICommonSession? New)>? LocalSessionChanged;
+        /// <summary>
+        /// Invoked after LocalPlayer is changed
+        /// </summary>
+        event Action<LocalPlayerChangedEventArgs>? LocalPlayerChanged;
 
-    void ApplyPlayerStates(IReadOnlyCollection<SessionState> list);
+        event EventHandler PlayerListUpdated;
 
-    /// <summary>
-    /// Sets up a single player game. This creates a dummy <see cref="ISharedPlayerManager.LocalSession"/>  without an
-    /// <see cref="INetChannel"/>.
-    /// </summary>
-    void SetupSinglePlayer(string name);
+        void Initialize();
+        void Startup();
+        void Shutdown();
 
-    /// <summary>
-    /// Sets up the manager for a multiplayer game. This creates a <see cref="ISharedPlayerManager.LocalSession"/>
-    /// using the given <see cref="INetChannel"/>.
-    /// </summary>
-    void SetupMultiplayer(INetChannel channel);
+        void ApplyPlayerStates(IReadOnlyCollection<PlayerState> list);
+    }
 
-    void SetLocalSession(ICommonSession session);
-
-    [Obsolete("Use LocalSession instead")]
-    LocalPlayer? LocalPlayer { get;}
+    public sealed class LocalPlayerChangedEventArgs : EventArgs
+    {
+        public readonly LocalPlayer? OldPlayer;
+        public readonly LocalPlayer? NewPlayer;
+        public LocalPlayerChangedEventArgs(LocalPlayer? oldPlayer, LocalPlayer? newPlayer)
+        {
+            OldPlayer = oldPlayer;
+            NewPlayer = newPlayer;
+        }
+    }
 }

Robust.Client/Player/LocalPlayer.cs

@@ -1,6 +1,11 @@
+using System;
+using Robust.Client.GameObjects;
+using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Network;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Client.Player
@@ -10,30 +15,163 @@ namespace Robust.Client.Player
     /// </summary>
     public sealed class LocalPlayer
     {
-        public LocalPlayer(ICommonSession session)
-        {
-            Session = session;
-        }
+        /// <summary>
+        ///     An entity has been attached to the local player.
+        /// </summary>
+        public event Action<EntityAttachedEventArgs>? EntityAttached;
+
+        /// <summary>
+        ///     An entity has been detached from the local player.
+        /// </summary>
+        public event Action<EntityDetachedEventArgs>? EntityDetached;
 
         /// <summary>
         ///     Game entity that the local player is controlling. If this is default, the player is not attached to any
         ///     entity at all.
         /// </summary>
-        [ViewVariables]
-        public EntityUid? ControlledEntity => Session.AttachedEntity;
+        [ViewVariables] public EntityUid? ControlledEntity { get; private set; }
 
+        [ViewVariables] public NetUserId UserId { get; set; }
+
+        /// <summary>
+        ///     Session of the local client.
+        /// </summary>
         [ViewVariables]
-        public NetUserId UserId => Session.UserId;
+        public ICommonSession Session => InternalSession;
+
+        internal PlayerSession InternalSession { get; set; } = default!;
 
         /// <summary>
         ///     OOC name of the local player.
         /// </summary>
         [ViewVariables]
-        public string Name => Session.Name;
+        public string Name { get; set; } = default!;
 
         /// <summary>
-        ///     Session of the local client.
+        ///     The status of the client's session has changed.
         /// </summary>
-        public  ICommonSession Session;
+        public event EventHandler<StatusEventArgs>? StatusChanged;
+
+        /// <summary>
+        ///     Attaches a client to an entity.
+        /// </summary>
+        /// <param name="entity">Entity to attach the client to.</param>
+        public void AttachEntity(EntityUid entity, IEntityManager entMan, IBaseClient client)
+        {
+            if (ControlledEntity == entity)
+                return;
+
+            // Detach and cleanup first
+            DetachEntity();
+
+            if (!entMan.EntityExists(entity))
+            {
+                Logger.Error($"Attempting to attach player to non-existent entity {entity}!");
+                return;
+            }
+
+            ControlledEntity = entity;
+            InternalSession.AttachedEntity = entity;
+
+            if (!entMan.TryGetComponent<EyeComponent?>(entity, out var eye))
+            {
+                eye = entMan.AddComponent<EyeComponent>(entity);
+
+                if (client.RunLevel != ClientRunLevel.SinglePlayerGame)
+                {
+                    Logger.Warning($"Attaching local player to an entity {entMan.ToPrettyString(entity)} without an eye. This eye will not be netsynced and may cause issues.");
+                }
+                eye.NetSyncEnabled = false;
+            }
+
+            EntityAttached?.Invoke(new EntityAttachedEventArgs(entity));
+
+            // notify ECS Systems
+            var eventBus = entMan.EventBus;
+            eventBus.RaiseEvent(EventSource.Local, new PlayerAttachSysMessage(entity));
+            eventBus.RaiseLocalEvent(entity, new PlayerAttachedEvent(entity), true);
+        }
+
+        /// <summary>
+        ///     Detaches the client from an entity.
+        /// </summary>
+        public void DetachEntity()
+        {
+            var entMan = IoCManager.Resolve<IEntityManager>();
+            var previous = ControlledEntity;
+
+            ControlledEntity = null;
+            InternalSession.AttachedEntity = null;
+
+            if (previous != null)
+            {
+                entMan.EventBus.RaiseEvent(EventSource.Local, new PlayerAttachSysMessage(default));
+                entMan.EventBus.RaiseLocalEvent(previous.Value, new PlayerDetachedEvent(previous.Value), true);
+                EntityDetached?.Invoke(new EntityDetachedEventArgs(previous.Value));
+            }
+        }
+
+        /// <summary>
+        ///     Changes the state of the session.
+        /// </summary>
+        public void SwitchState(SessionStatus newStatus)
+        {
+            SwitchState(Session.Status, newStatus);
+        }
+
+        /// <summary>
+        ///     Changes the state of the session. This overload allows you to spoof the oldStatus, use with caution.
+        /// </summary>
+        public void SwitchState(SessionStatus oldStatus, SessionStatus newStatus)
+        {
+            var args = new StatusEventArgs(oldStatus, newStatus);
+            Session.Status = newStatus;
+            StatusChanged?.Invoke(this, args);
+        }
+    }
+
+    /// <summary>
+    ///     Event arguments for when the status of a session changes.
+    /// </summary>
+    public sealed class StatusEventArgs : EventArgs
+    {
+        /// <summary>
+        ///     Status that the session switched from.
+        /// </summary>
+        public SessionStatus OldStatus { get; }
+
+        /// <summary>
+        ///     Status that the session switched to.
+        /// </summary>
+        public SessionStatus NewStatus { get; }
+
+        /// <summary>
+        ///     Constructs a new instance of the class.
+        /// </summary>
+        public StatusEventArgs(SessionStatus oldStatus, SessionStatus newStatus)
+        {
+            OldStatus = oldStatus;
+            NewStatus = newStatus;
+        }
+    }
+
+    public sealed class EntityDetachedEventArgs : EventArgs
+    {
+        public EntityDetachedEventArgs(EntityUid oldEntity)
+        {
+            OldEntity = oldEntity;
+        }
+
+        public EntityUid OldEntity { get; }
+    }
+
+    public sealed class EntityAttachedEventArgs : EventArgs
+    {
+        public EntityAttachedEventArgs(EntityUid newEntity)
+        {
+            NewEntity = newEntity;
+        }
+
+        public EntityUid NewEntity { get; }
     }
 }

Robust.Client/Player/PlayerManager.cs

@@ -2,13 +2,16 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Utility;
+using Robust.Shared.ViewVariables;
 
 namespace Robust.Client.Player
 {
@@ -17,212 +20,154 @@ namespace Robust.Client.Player
     ///     Why not just attach the inputs directly? It's messy! This makes the whole thing nicely encapsulated.
     ///     This class also communicates with the server to let the server control what entity it is attached to.
     /// </summary>
-    internal sealed class PlayerManager : SharedPlayerManager, IPlayerManager
+    public sealed class PlayerManager : IPlayerManager
     {
         [Dependency] private readonly IClientNetManager _network = default!;
         [Dependency] private readonly IBaseClient _client = default!;
+        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly ILogManager _logMan = default!;
 
         /// <summary>
-        /// Received player states that had an unknown <see cref="NetEntity"/>.
+        ///     Active sessions of connected clients to the server.
         /// </summary>
-        private Dictionary<NetUserId, SessionState> _pendingStates = new ();
-        private List<SessionState> _pending = new();
+        private readonly Dictionary<NetUserId, ICommonSession> _sessions = new();
 
         /// <inheritdoc />
-        public override ICommonSession[] NetworkedSessions
+        public IEnumerable<ICommonSession> NetworkedSessions
         {
             get
             {
-                return LocalSession != null
-                    ? new [] { LocalSession }
-                    : Array.Empty<ICommonSession>();
+                if (LocalPlayer is not null)
+                    return new[] {LocalPlayer.Session};
+
+                return Enumerable.Empty<ICommonSession>();
             }
         }
 
         /// <inheritdoc />
-        public override int MaxPlayers => _client.GameInfo?.ServerMaxPlayers ?? -1;
-
-        public LocalPlayer? LocalPlayer { get; private set; }
-
-        public event Action<SessionStatusEventArgs>? LocalStatusChanged;
-        public event Action? PlayerListUpdated;
-        public event Action<EntityUid>? LocalPlayerDetached;
-        public event Action<EntityUid>? LocalPlayerAttached;
-        public event Action<(ICommonSession? Old, ICommonSession? New)>? LocalSessionChanged;
+        IEnumerable<ICommonSession> ISharedPlayerManager.Sessions => _sessions.Values;
 
         /// <inheritdoc />
-        public override void Initialize(int maxPlayers)
+        public int PlayerCount => _sessions.Values.Count;
+
+        /// <inheritdoc />
+        public int MaxPlayers => _client.GameInfo?.ServerMaxPlayers ?? 0;
+
+        public ICommonSession? LocalSession => LocalPlayer?.Session;
+
+        /// <inheritdoc />
+        [ViewVariables]
+        public LocalPlayer? LocalPlayer
         {
-            base.Initialize(maxPlayers);
+            get => _localPlayer;
+            private set
+            {
+                if (_localPlayer == value) return;
+                var oldValue = _localPlayer;
+                _localPlayer = value;
+                LocalPlayerChanged?.Invoke(new LocalPlayerChangedEventArgs(oldValue, _localPlayer));
+            }
+        }
+        private LocalPlayer? _localPlayer;
+        private ISawmill _sawmill = default!;
+
+        public event Action<LocalPlayerChangedEventArgs>? LocalPlayerChanged;
+
+        /// <inheritdoc />
+        [ViewVariables]
+        IEnumerable<ICommonSession> IPlayerManager.Sessions => _sessions.Values;
+
+        /// <inheritdoc />
+        public IReadOnlyDictionary<NetUserId, ICommonSession> SessionsDict => _sessions;
+
+        /// <inheritdoc />
+        public event EventHandler? PlayerListUpdated;
+
+        /// <inheritdoc />
+        public void Initialize()
+        {
+            _client.RunLevelChanged += OnRunLevelChanged;
+
+            _sawmill = _logMan.GetSawmill("player");
             _network.RegisterNetMessage<MsgPlayerListReq>();
             _network.RegisterNetMessage<MsgPlayerList>(HandlePlayerList);
-            PlayerStatusChanged += StatusChanged;
-        }
-
-        private void StatusChanged(object? sender, SessionStatusEventArgs e)
-        {
-            if (e.Session == LocalPlayer?.Session)
-                LocalStatusChanged?.Invoke(e);
-        }
-
-        public void SetupSinglePlayer(string name)
-        {
-            if (LocalSession != null)
-                throw new InvalidOperationException($"Player manager already running?");
-
-            var session = CreateAndAddSession(default, name);
-            session.ClientSide = true;
-            SetLocalSession(session);
-            Startup();
-            PlayerListUpdated?.Invoke();
-        }
-
-        public void SetupMultiplayer(INetChannel channel)
-        {
-            if (LocalSession != null)
-                throw new InvalidOperationException($"Player manager already running?");
-
-            SetLocalSession(CreateAndAddSession(channel));
-            Startup();
-            _network.ClientSendMessage(new MsgPlayerListReq());
-        }
-
-        public void SetLocalSession(ICommonSession? session)
-        {
-            if (session == LocalSession)
-                return;
-
-            var old = LocalSession;
-
-            if (old?.AttachedEntity is {} oldUid)
-            {
-                LocalSession = null;
-                LocalPlayer = null;
-                Sawmill.Info($"Detaching local player from {EntManager.ToPrettyString(oldUid)}.");
-                EntManager.EventBus.RaiseLocalEvent(oldUid, new LocalPlayerDetachedEvent(oldUid), true);
-                LocalPlayerDetached?.Invoke(oldUid);
-            }
-
-            LocalSession = session;
-            LocalPlayer = session == null ? null : new LocalPlayer(session);
-            Sawmill.Info($"Changing local session from {old?.ToString() ?? "null"} to {session?.ToString() ?? "null"}.");
-            LocalSessionChanged?.Invoke((old, LocalSession));
-
-            if (session?.AttachedEntity is {} newUid)
-            {
-                Sawmill.Info($"Attaching local player to {EntManager.ToPrettyString(newUid)}.");
-                EntManager.EventBus.RaiseLocalEvent(newUid, new LocalPlayerAttachedEvent(newUid), true);
-                LocalPlayerAttached?.Invoke(newUid);
-            }
         }
 
         /// <inheritdoc />
-        public override void Shutdown()
+        public void Startup()
         {
-            SetAttachedEntity(LocalSession, null, out _);
+            DebugTools.Assert(LocalPlayer == null);
+            LocalPlayer = new LocalPlayer();
+
+            var msgList = new MsgPlayerListReq();
+            // message is empty
+            _network.ClientSendMessage(msgList);
+        }
+
+        /// <inheritdoc />
+        public void Shutdown()
+        {
+            LocalPlayer?.DetachEntity();
             LocalPlayer = null;
-            LocalSession = null;
-            _pendingStates.Clear();
-            base.Shutdown();
-            PlayerListUpdated?.Invoke();
+            _sessions.Clear();
         }
 
-        public override bool SetAttachedEntity(ICommonSession? session, EntityUid? uid, out ICommonSession? kicked, bool force = false)
-        {
-            kicked = null;
-            if (session == null)
-                return false;
-
-            if (session.AttachedEntity == uid)
-                return true;
-
-            var old = session.AttachedEntity;
-            if (!base.SetAttachedEntity(session, uid, out kicked, force))
-                return false;
-
-            if (session != LocalSession)
-                return true;
-
-            if (old.HasValue)
-            {
-                Sawmill.Info($"Detaching local player from {EntManager.ToPrettyString(old)}.");
-                EntManager.EventBus.RaiseLocalEvent(old.Value, new LocalPlayerDetachedEvent(old.Value), true);
-                LocalPlayerDetached?.Invoke(old.Value);
-            }
-
-            if (uid == null)
-            {
-                Sawmill.Info($"Local player is no longer attached to any entity.");
-                return true;
-            }
-
-            if (!EntManager.EntityExists(uid))
-            {
-                Sawmill.Error($"Attempted to attach player to non-existent entity {uid}!");
-                return true;
-            }
-
-            if (!EntManager.EnsureComponent(uid.Value, out EyeComponent eye))
-            {
-                if (_client.RunLevel != ClientRunLevel.SinglePlayerGame)
-                    Sawmill.Warning($"Attaching local player to an entity {EntManager.ToPrettyString(uid)} without an eye. This eye will not be netsynced and may cause issues.");
-                eye.NetSyncEnabled = false;
-            }
-
-            Sawmill.Info($"Attaching local player to {EntManager.ToPrettyString(uid)}.");
-            EntManager.EventBus.RaiseLocalEvent(uid.Value, new LocalPlayerAttachedEvent(uid.Value), true);
-            LocalPlayerAttached?.Invoke(uid.Value);
-            return true;
-        }
-
-        public void ApplyPlayerStates(IReadOnlyCollection<SessionState> list)
-        {
-            var dirty = ApplyStates(list, true);
-
-            if (_pendingStates.Count == 0)
-            {
-                // This is somewhat inefficient as it might try to re-apply states that failed just a moment ago.
-                _pending.Clear();
-                _pending.AddRange(_pendingStates.Values);
-                _pendingStates.Clear();
-                dirty |= ApplyStates(_pending, false);
-            }
-
-            if (dirty)
-                PlayerListUpdated?.Invoke();
-        }
-
-        private bool ApplyStates(IReadOnlyCollection<SessionState> list, bool fullList)
+        /// <inheritdoc />
+        public void ApplyPlayerStates(IReadOnlyCollection<PlayerState> list)
         {
             if (list.Count == 0)
-                return false;
-
+            {
+                // This happens when the server says "nothing changed!"
+                return;
+            }
             DebugTools.Assert(_network.IsConnected ||  _client.RunLevel == ClientRunLevel.SinglePlayerGame // replays use state application.
                 , "Received player state without being connected?");
-            DebugTools.Assert(LocalSession != null, "Received player state before Session finished setup.");
+            DebugTools.Assert(LocalPlayer != null, "Call Startup()");
+            DebugTools.Assert(LocalPlayer!.Session != null, "Received player state before Session finished setup.");
 
-            var state = list.FirstOrDefault(s => s.UserId == LocalSession.UserId);
+            var myState = list.FirstOrDefault(s => s.UserId == LocalPlayer.UserId);
 
-            bool dirty = false;
-            if (state != null)
+            if (myState != null)
             {
-                dirty = true;
-                if (!EntManager.TryGetEntity(state.ControlledEntity, out var uid)
-                    && state.ControlledEntity is { Valid:true } )
+                var uid = _entManager.GetEntity(myState.ControlledEntity);
+                if (myState.ControlledEntity is {Valid: true} && !_entManager.EntityExists(uid))
                 {
-                    Sawmill.Error($"Received player state for local player with an unknown net entity!");
-                    _pendingStates[state.UserId] = state;
-                }
-                else
-                {
-                    _pendingStates.Remove(state.UserId);
+                    _sawmill.Error($"Received player state for local player with an unknown net entity!");
                 }
 
-                SetAttachedEntity(LocalSession, uid, out _, true);
-                SetStatus(LocalSession, state.Status);
+                UpdateAttachedEntity(uid);
+                UpdateSessionStatus(myState.Status);
             }
 
-            return UpdatePlayerList(list, fullList) || dirty;
+            UpdatePlayerList(list);
+        }
+
+        /// <summary>
+        ///     Compares the server sessionStatus to the client one, and updates if needed.
+        /// </summary>
+        private void UpdateSessionStatus(SessionStatus myStateStatus)
+        {
+            if (LocalPlayer!.Session.Status != myStateStatus)
+                LocalPlayer.SwitchState(myStateStatus);
+        }
+
+        /// <summary>
+        ///     Compares the server attachedEntity to the client one, and updates if needed.
+        /// </summary>
+        /// <param name="entity">AttachedEntity in the server session.</param>
+        private void UpdateAttachedEntity(EntityUid? entity)
+        {
+            if (LocalPlayer!.ControlledEntity == entity)
+            {
+                return;
+            }
+            if (entity == null)
+            {
+                LocalPlayer.DetachEntity();
+                return;
+            }
+
+            LocalPlayer.AttachEntity(entity.Value, _entManager, _client);
         }
 
         /// <summary>
@@ -230,88 +175,117 @@ namespace Robust.Client.Player
         /// </summary>
         private void HandlePlayerList(MsgPlayerList msg)
         {
-            ApplyPlayerStates(msg.Plyrs);
+            UpdatePlayerList(msg.Plyrs);
         }
 
         /// <summary>
         ///     Compares the server player list to the client one, and updates if needed.
         /// </summary>
-        private bool UpdatePlayerList(IEnumerable<SessionState> remotePlayers, bool fullList)
+        private void UpdatePlayerList(IEnumerable<PlayerState> remotePlayers)
         {
             var dirty = false;
-            var users = new List<NetUserId>();
+
+            var hitSet = new List<NetUserId>();
+
             foreach (var state in remotePlayers)
             {
-                users.Add(state.UserId);
+                hitSet.Add(state.UserId);
 
-                if (!EntManager.TryGetEntity(state.ControlledEntity, out var controlled)
-                    && state.ControlledEntity is {Valid: true})
+                if (_sessions.TryGetValue(state.UserId, out var session))
                 {
-                    _pendingStates[state.UserId] = state;
+                    var local = (PlayerSession) session;
+                    var controlled = _entManager.GetEntity(state.ControlledEntity);
+
+                    // Exists, update data.
+                    if (local.Name == state.Name
+                        && local.Status == state.Status
+                        && local.Ping == state.Ping
+                        && local.AttachedEntity == controlled)
+                    {
+                        continue;
+                    }
+
+                    dirty = true;
+                    local.Name = state.Name;
+                    local.Status = state.Status;
+                    local.Ping = state.Ping;
+                    local.AttachedEntity = controlled;
                 }
                 else
                 {
-                    _pendingStates.Remove(state.UserId);
-                }
-
-                if (!InternalSessions.TryGetValue(state.UserId, out var session))
-                {
-                    // This is a new userid, so we create a new session.
-                    DebugTools.Assert(state.UserId != LocalPlayer?.UserId);
-                    var newSession = (CommonSession) CreateAndAddSession(state.UserId, state.Name);
-                    newSession.Ping = state.Ping;
-                    SetStatus(newSession, state.Status);
-                    SetAttachedEntity(newSession, controlled, out _, true);
+                    // New, give him a slot.
                     dirty = true;
-                    continue;
-                }
 
-                // Check if the data is actually different
-                if (session.Name == state.Name
-                    && session.Status == state.Status
-                    && session.Ping == state.Ping
-                    && session.AttachedEntity == controlled)
-                {
-                    continue;
+                    var newSession = new PlayerSession(state.UserId)
+                    {
+                        Name = state.Name,
+                        Status = state.Status,
+                        Ping = state.Ping,
+                        AttachedEntity = _entManager.GetEntity(state.ControlledEntity),
+                    };
+                    _sessions.Add(state.UserId, newSession);
+                    if (state.UserId == LocalPlayer!.UserId)
+                    {
+                        LocalPlayer.InternalSession = newSession;
+                        newSession.ConnectedClient = _network.ServerChannel!;
+                        // We just connected to the server, hurray!
+                        LocalPlayer.SwitchState(SessionStatus.Connecting, newSession.Status);
+                    }
                 }
-
-                dirty = true;
-                var local = (CommonSession) session;
-                local.Name = state.Name;
-                local.Ping = state.Ping;
-                SetStatus(local, state.Status);
-                SetAttachedEntity(local, controlled, out _, true);
             }
 
-            // Remove old users. This only works if the provided state is a list of all players
-            if (fullList)
+            foreach (var existing in _sessions.Keys.ToArray())
             {
-                foreach (var oldUser in InternalSessions.Keys.ToArray())
+                // clear slot, player left
+                if (!hitSet.Contains(existing))
                 {
-                    if (users.Contains(oldUser))
-                        continue;
-
-                    if (InternalSessions[oldUser].ClientSide)
-                        continue;
-
-                    DebugTools.Assert(oldUser != LocalUser
-                                      || LocalUser == null
-                                      || LocalUser == default(NetUserId),
-                        "Client is still connected to the server but not in the list of players?");
-                    RemoveSession(oldUser);
-                    _pendingStates.Remove(oldUser);
+                    DebugTools.Assert(LocalPlayer!.UserId != existing || _client.RunLevel == ClientRunLevel.SinglePlayerGame, // replays apply player states.
+                        "I'm still connected to the server, but i left?");
+                    _sessions.Remove(existing);
                     dirty = true;
                 }
             }
 
-            return dirty;
+            if (dirty)
+            {
+                PlayerListUpdated?.Invoke(this, EventArgs.Empty);
+            }
         }
 
-        public override bool TryGetSessionByEntity(EntityUid uid, [NotNullWhen(true)] out ICommonSession? session)
+        private void OnRunLevelChanged(object? sender, RunLevelChangedEventArgs e)
         {
-            if (LocalEntity == uid)
+            if (e.NewLevel != ClientRunLevel.SinglePlayerGame)
+                return;
+
+            DebugTools.AssertNotNull(LocalPlayer);
+
+            // We do some further setup steps for singleplayer here...
+
+            // The local player's GUID in singleplayer will always be the default.
+            var guid = default(NetUserId);
+
+            var session = new PlayerSession(guid)
             {
-                session = LocalSession!;
+                Name = LocalPlayer!.Name,
+                Ping = 0,
+            };
+
+            LocalPlayer.UserId = guid;
+            LocalPlayer.InternalSession = session;
+
+            // Add the local session to the list.
+            _sessions.Add(guid, session);
+
+            LocalPlayer.SwitchState(SessionStatus.InGame);
+
+            PlayerListUpdated?.Invoke(this, EventArgs.Empty);
+        }
+
+        public bool TryGetSessionByEntity(EntityUid uid, [NotNullWhen(true)] out ICommonSession? session)
+        {
+            if (LocalPlayer?.ControlledEntity == uid)
+            {
+                session = LocalPlayer.Session;
                 return true;
             }
 

Robust.Client/Player/PlayerSession.cs

@@ -0,0 +1,60 @@
+using Robust.Shared.Enums;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Network;
+using Robust.Shared.Players;
+using Robust.Shared.ViewVariables;
+
+namespace Robust.Client.Player
+{
+    internal sealed class PlayerSession : ICommonSession
+    {
+        internal SessionStatus Status { get; set; } = SessionStatus.Connecting;
+
+        /// <inheritdoc />
+        SessionStatus ICommonSession.Status
+        {
+            get => this.Status;
+            set => this.Status = value;
+        }
+
+        /// <inheritdoc />
+        [ViewVariables]
+        public EntityUid? AttachedEntity { get; set; }
+
+        /// <inheritdoc />
+        [ViewVariables]
+        public NetUserId UserId { get; }
+
+        [ViewVariables]
+        internal string Name { get; set; } = "<Unknown>";
+
+        /// <inheritdoc />
+        string ICommonSession.Name
+        {
+            get => this.Name;
+            set => this.Name = value;
+        }
+
+        [ViewVariables]
+        internal short Ping { get; set; }
+
+        /// <inheritdoc />
+        [ViewVariables]
+        public INetChannel ConnectedClient { get; internal set; } = null!;
+
+        /// <inheritdoc />
+        short ICommonSession.Ping
+        {
+            get => this.Ping;
+            set => this.Ping = value;
+        }
+
+        /// <summary>
+        ///     Creates an instance of a PlayerSession.
+        /// </summary>
+        public PlayerSession(NetUserId user)
+        {
+            UserId = user;
+        }
+    }
+}

Robust.Client/Replays/Loading/ReplayLoadManager.Checkpoints.cs

@@ -7,6 +7,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using System.Threading.Tasks;
+using Robust.Client.Upload.Commands;
 using Robust.Shared;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Replays;
@@ -100,7 +101,7 @@ public sealed partial class ReplayLoadManager
 
         await callback(0, states.Count, LoadingState.ProcessingFiles, true);
         var playerSpan = state0.PlayerStates.Value;
-        Dictionary<NetUserId, SessionState> playerStates = new(playerSpan.Count);
+        Dictionary<NetUserId, PlayerState> playerStates = new(playerSpan.Count);
         foreach (var player in playerSpan)
         {
             playerStates.Add(player.UserId, player);
@@ -390,7 +391,7 @@ public sealed partial class ReplayLoadManager
         return new EntityState(newState.NetEntity, combined, newState.EntityLastModified, newState.NetComponents ?? oldNetComps);
     }
 
-    private void UpdatePlayerStates(ReadOnlySpan<SessionState> span, Dictionary<NetUserId, SessionState> playerStates)
+    private void UpdatePlayerStates(ReadOnlySpan<PlayerState> span, Dictionary<NetUserId, PlayerState> playerStates)
     {
         foreach (var player in span)
         {

Robust.Client/Replays/Playback/IReplayPlaybackManager.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
 using Robust.Shared.Network;
 using Robust.Shared.Replays;
 using Robust.Shared.Serialization.Markdown.Mapping;
@@ -129,11 +128,6 @@ public interface IReplayPlaybackManager
     /// </summary>
     event Action? ReplayUnpaused;
 
-    /// <summary>
-    /// Invoked just before a replay applies a game state.
-    /// </summary>
-    event Action<(GameState Current, GameState? Next)>? BeforeApplyState;
-
     /// <summary>
     /// If currently replaying a client-side recording, this is the user that recorded the replay.
     /// Useful for setting default observer spawn positions.
@@ -143,5 +137,5 @@ public interface IReplayPlaybackManager
     /// <summary>
     /// Fetches the entity that the <see cref="Recorder"/> is currently attached to.
     /// </summary>
-    bool TryGetRecorderEntity([NotNullWhen(true)] out EntityUid? uid);
+    public bool TryGetRecorderEntity([NotNullWhen(true)] out EntityUid? uid);
 }

Robust.Client/Replays/Playback/ReplayPlaybackManager.Checkpoint.cs

@@ -66,7 +66,6 @@ internal sealed partial class ReplayPlaybackManager
         _gameState.ClearDetachQueue();
         EnsureDetachedExist(checkpoint);
         _gameState.DetachImmediate(checkpoint.Detached);
-        BeforeApplyState?.Invoke((checkpoint.State, next));
         _gameState.ApplyGameState(checkpoint.State, next);
     }
 

Robust.Client/Replays/Playback/ReplayPlaybackManager.Time.cs

@@ -1,5 +1,4 @@
 using System;
-using Robust.Client.GameObjects;
 using Robust.Client.GameStates;
 using Robust.Shared.Utility;
 
@@ -59,13 +58,7 @@ internal sealed partial class ReplayPlaybackManager
 
             _timing.LastRealTick = _timing.LastProcessedTick = _timing.CurTick = Replay.CurTick;
             _gameState.UpdateFullRep(state, cloneDelta: true);
-
-            // Clear existing lerps
-            _entMan.EntitySysManager.GetEntitySystem<TransformSystem>().Reset();
-
-            var next = Replay.NextState;
-            BeforeApplyState?.Invoke((state, next));
-            _gameState.ApplyGameState(state, next);
+            _gameState.ApplyGameState(state, Replay.NextState);
             ProcessMessages(Replay.CurMessages, skipEffectEvents);
 
             // TODO REPLAYS block audio

Robust.Client/Replays/Playback/ReplayPlaybackManager.Update.cs

@@ -42,9 +42,7 @@ internal sealed partial class ReplayPlaybackManager
         {
             var state = Replay.CurState;
             _gameState.UpdateFullRep(state, cloneDelta: true);
-            var next = Replay.NextState;
-            BeforeApplyState?.Invoke((state, next));
-            _gameState.ApplyGameState(state, next);
+            _gameState.ApplyGameState(state, Replay.NextState);
             DebugTools.Assert(Replay.LastApplied >= state.FromSequence);
             DebugTools.Assert(Replay.LastApplied + 1 <= state.ToSequence);
             Replay.LastApplied = state.ToSequence;

Robust.Client/Replays/Playback/ReplayPlaybackManager.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Robust.Client.Audio;
 using Robust.Client.Audio.Midi;
 using Robust.Client.Configuration;
 using Robust.Client.GameObjects;
@@ -11,10 +10,8 @@ using Robust.Client.Player;
 using Robust.Client.Timing;
 using Robust.Client.Upload;
 using Robust.Shared;
-using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Network;
@@ -30,7 +27,7 @@ internal sealed partial class ReplayPlaybackManager : IReplayPlaybackManager
     [Dependency] private readonly IBaseClient _client = default!;
     [Dependency] private readonly IMidiManager _midi = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
-    [Dependency] private readonly IAudioInternal _clydeAudio = default!;
+    [Dependency] private readonly IClydeAudio _clydeAudio = default!;
     [Dependency] private readonly IClientGameTiming _timing = default!;
     [Dependency] private readonly IClientNetManager _netMan = default!;
     [Dependency] private readonly IComponentFactory _factory = default!;
@@ -47,7 +44,6 @@ internal sealed partial class ReplayPlaybackManager : IReplayPlaybackManager
     public event Action? ReplayPlaybackStopped;
     public event Action? ReplayPaused;
     public event Action? ReplayUnpaused;
-    public event Action<(GameState Current, GameState? Next)>? BeforeApplyState;
 
     public ReplayData? Replay { get; private set; }
     public NetUserId? Recorder => Replay?.Recorder;

Robust.Client/Replays/ReplayRecordingManager.cs

@@ -9,7 +9,7 @@ using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Replays;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Value;
@@ -138,9 +138,9 @@ internal sealed class ReplayRecordingManager : SharedReplayRecordingManager
         return (state, detachMsg);
     }
 
-    private SessionState GetPlayerState(ICommonSession session)
+    private PlayerState GetPlayerState(ICommonSession session)
     {
-        return new SessionState
+        return new PlayerState
         {
             UserId = session.UserId,
             Status = session.Status,

Robust.Client/ResourceManagement/BaseResource.cs

@@ -1,34 +1,36 @@
-using System;
+using System;
 using System.Threading;
-using Robust.Shared.IoC;
 using Robust.Shared.Utility;
 
-namespace Robust.Client.ResourceManagement;
-
-/// <summary>
-///     Base resource for the cache.
-/// </summary>
-public abstract class BaseResource : IDisposable
+namespace Robust.Client.ResourceManagement
 {
     /// <summary>
-    ///     Fallback resource path if this one does not exist.
+    ///     Base resource for the cache.
     /// </summary>
-    public virtual ResPath? Fallback => null;
-
-    /// <summary>
-    ///     Disposes this resource.
-    /// </summary>
-    public virtual void Dispose()
+    public abstract class BaseResource : IDisposable
     {
-    }
+        /// <summary>
+        ///     Fallback resource path if this one does not exist.
+        /// </summary>
+        public virtual ResPath? Fallback => null;
 
-    /// <summary>
-    ///     Deserializes the resource from the VFS.
-    /// </summary>
-    public abstract void Load(IDependencyCollection dependencies, ResPath path);
+        /// <summary>
+        ///     Disposes this resource.
+        /// </summary>
+        public virtual void Dispose()
+        {
+        }
 
-    public virtual void Reload(IDependencyCollection dependencies, ResPath path, CancellationToken ct = default)
-    {
+        /// <summary>
+        ///     Deserializes the resource from the VFS.
+        /// </summary>
+        /// <param name="cache">ResourceCache this resource is being loaded into.</param>
+        /// <param name="path">Path of the resource requested on the VFS.</param>
+        public abstract void Load(IResourceCache cache, ResPath path);
 
+        public virtual void Reload(IResourceCache cache, ResPath path, CancellationToken ct = default)
+        {
+
+        }
     }
 }

Robust.Client/ResourceManagement/IResourceCache.cs

@@ -1,51 +1,49 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Robust.Client.Graphics;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Utility;
 
-namespace Robust.Client.ResourceManagement;
-
-/// <summary>
-/// Handles caching of <see cref="BaseResource"/>
-/// </summary>
-public interface IResourceCache : IResourceManager
+namespace Robust.Client.ResourceManagement
 {
-    T GetResource<T>(string path, bool useFallback = true)
-        where T : BaseResource, new();
+    public interface IResourceCache : IResourceManager
+    {
+        T GetResource<T>(string path, bool useFallback = true)
+            where T : BaseResource, new();
 
-    T GetResource<T>(ResPath path, bool useFallback = true)
-        where T : BaseResource, new();
+        T GetResource<T>(ResPath path, bool useFallback = true)
+            where T : BaseResource, new();
 
-    bool TryGetResource<T>(string path, [NotNullWhen(true)] out T? resource)
-        where T : BaseResource, new();
+        bool TryGetResource<T>(string path, [NotNullWhen(true)] out T? resource)
+            where T : BaseResource, new();
 
-    bool TryGetResource<T>(ResPath path, [NotNullWhen(true)] out T? resource)
-        where T : BaseResource, new();
+        bool TryGetResource<T>(ResPath path, [NotNullWhen(true)] out T? resource)
+            where T : BaseResource, new();
 
-    void ReloadResource<T>(string path)
-        where T : BaseResource, new();
+        void ReloadResource<T>(string path)
+            where T : BaseResource, new();
 
-    void ReloadResource<T>(ResPath path)
-        where T : BaseResource, new();
+        void ReloadResource<T>(ResPath path)
+            where T : BaseResource, new();
 
-    void CacheResource<T>(string path, T resource)
-        where T : BaseResource, new();
+        void CacheResource<T>(string path, T resource)
+            where T : BaseResource, new();
 
-    void CacheResource<T>(ResPath path, T resource)
-        where T : BaseResource, new();
+        void CacheResource<T>(ResPath path, T resource)
+            where T : BaseResource, new();
 
-    T GetFallback<T>()
-        where T : BaseResource, new();
+        T GetFallback<T>()
+            where T : BaseResource, new();
 
-    IEnumerable<KeyValuePair<ResPath, T>> GetAllResources<T>() where T : BaseResource, new();
+        IEnumerable<KeyValuePair<ResPath, T>> GetAllResources<T>() where T : BaseResource, new();
 
-    // Resource load callbacks so content can hook stuff like click maps.
-    event Action<TextureLoadedEventArgs> OnRawTextureLoaded;
-    event Action<RsiLoadedEventArgs> OnRsiLoaded;
-
-    IClyde Clyde { get; }
-    IFontManager FontManager { get; }
+        // Resource load callbacks so content can hook stuff like click maps.
+        event Action<TextureLoadedEventArgs> OnRawTextureLoaded;
+        event Action<RsiLoadedEventArgs> OnRsiLoaded;
+        
+        IClyde Clyde { get; }
+        IClydeAudio ClydeAudio { get; }
+        IFontManager FontManager { get; }
+    }
 }
-