Version: 167.0.2

(cherry picked from commit 6211cf2e03)

.editorconfig

@@ -10,8 +10,5 @@ charset = utf-8
 [*.{csproj,xml,yml,dll.config,targets,props}]
 indent_size = 2
 
-[nuget.config]
-indent_size = 2
-
 [*.gdsl]
 indent_style = tab

.github/CODEOWNERS

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

.github/workflows/build-docfx.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 7.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/build-test.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/publish-client.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 7.0.x
 
     - name: Package client
       run: Tools/package_client_build.py -p windows mac linux

.github/workflows/test-content.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 7.0.x
     - name: Disable submodule autoupdate
       run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
 

Directory.Packages.props

@@ -1,64 +0,0 @@
-<Project>
-  <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
-    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageVersion Include="ILReader.Core" Version="1.0.0.4" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
-    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.0" />
-    <PackageVersion Include="Linguini.Bundle" Version="0.1.3" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.1"/>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit" Version="1.1.1"/>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeCoverage" Version="17.8.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24059.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.ILVerification" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
-    <PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageVersion Include="Moq" Version="4.20.70" />
-    <PackageVersion Include="NUnit" Version="4.0.1" />
-    <PackageVersion Include="NUnit.Analyzers" Version="3.10.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageVersion Include="Nett" Version="0.15.0" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
-    <PackageVersion Include="OpenTK.OpenAL" Version="4.7.7" />
-    <PackageVersion Include="OpenToolkit.Graphics" Version="4.0.0-pre9.1" />
-    <PackageVersion Include="Pidgin" Version="3.2.2" />
-    <PackageVersion Include="Robust.Natives" Version="0.1.1" />
-    <PackageVersion Include="Robust.Natives.Cef" Version="120.1.9" />
-    <PackageVersion Include="Robust.Shared.AuthLib" Version="0.1.2" />
-    <PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.7" />
-    <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.7" />
-    <PackageVersion Include="Serilog" Version="3.1.1" />
-    <PackageVersion Include="Serilog.Sinks.Loki" Version="4.0.0-beta3" />
-    <PackageVersion Include="SharpZstd.Interop" Version="1.5.2-beta2" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.3" />
-    <PackageVersion Include="SpaceWizards.HttpListener" Version="0.1.0" />
-    <PackageVersion Include="SpaceWizards.NFluidsynth" Version="0.1.1" />
-    <PackageVersion Include="SpaceWizards.SharpFont" Version="1.0.2" />
-    <PackageVersion Include="SpaceWizards.Sodium" Version="0.2.1" />
-    <PackageVersion Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageVersion Include="System.Memory" Version="4.5.5" />
-    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.22621.5" />
-    <PackageVersion Include="TerraFX.Interop.Xlib" Version="6.4.0" />
-    <PackageVersion Include="VorbisPizza" Version="1.3.0" />
-    <PackageVersion Include="YamlDotNet" Version="13.7.1" />
-    <PackageVersion Include="prometheus-net" Version="8.2.1" />
-    <PackageVersion Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
-    <PackageVersion Include="PolySharp" Version="1.14.1" />
-  </ItemGroup>
-</Project>

Lidgren.Network/CursedHorrorsBeyondOurWildestImagination.cs

@@ -1,9 +0,0 @@
-using System.Runtime.CompilerServices;
-
-// So I wanted to mess with NetIncomingMessage and NetOutgoingMessage from tests.
-// Now.. the instructors are internal...
-// Unless...
-// I mean we have this project here from the weird way we're compiling Lidgren.
-// I could just put this in here... it wouldn't touch the main Lidgren repo at all...
-[assembly: InternalsVisibleTo("Robust.UnitTesting")]
-

Lidgren.Network/Lidgren.Network.csproj

@@ -10,14 +10,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
     <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
-
-    <Nullable>enable</Nullable>
-    <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="CursedHorrorsBeyondOurWildestImagination.cs" />
-
     <Compile Include="Lidgren.Network\Lidgren.Network\**\*.cs">
      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>

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 -->
 

MSBuild/Robust.Engine.props

@@ -1,8 +1,8 @@
 <Project>
     <!-- Engine-specific properties. Content should not use this file. -->
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <LangVersion>12</LangVersion>
+        <TargetFramework>net7.0</TargetFramework>
+        <LangVersion>11</LangVersion>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
     </PropertyGroup>

MSBuild/Robust.Properties.targets

@@ -3,8 +3,7 @@
   <!-- Import this at the end of any project files in Robust and Content. -->
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <Import Project="Robust.Custom.targets" Condition="Exists('Robust.Custom.targets')"/>
@@ -28,5 +27,5 @@
   <Import Project="Robust.Analyzers.targets" Condition="'$(SkipRobustAnalyzer)' != 'true'" />
 
   <!-- serialization generator -->
-  <Import Project="Robust.Serialization.Generator.targets" Condition="'$(SkipRobustAnalyzer)' != 'true'" />
+  <Import Project="Robust.Serialization.Generator.targets" />
 </Project>

MSBuild/XamlIL.targets

@@ -24,16 +24,12 @@
     <RobustInjectorsConfiguration>$(Configuration)</RobustInjectorsConfiguration>
     <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'DebugOpt'">Debug</RobustInjectorsConfiguration>
     <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'Tools'">Release</RobustInjectorsConfiguration>
-    <RobustInjectorsConfiguration Condition="'$(UseArtifactsOutput)' == 'true' And '$(RuntimeIdentifier)' != ''">$(RobustInjectorsConfiguration)_$(RuntimeIdentifier)</RobustInjectorsConfiguration>
-    <RobustInjectorsConfiguration Condition="'$(UseArtifactsOutput)' == 'true'">$(RobustInjectorsConfiguration.ToLower())</RobustInjectorsConfiguration>
-    <CompileRobustXamlTaskAssemblyFile Condition="'$(UseArtifactsOutput)' != 'true'">$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(RobustInjectorsConfiguration)\netstandard2.0\Robust.Client.Injectors.dll</CompileRobustXamlTaskAssemblyFile>
-    <CompileRobustXamlTaskAssemblyFile Condition="'$(UseArtifactsOutput)' == 'true'">$(MSBuildThisFileDirectory)\..\..\artifacts\bin\Robust.Client.Injectors\$(RobustInjectorsConfiguration)\Robust.Client.Injectors.dll</CompileRobustXamlTaskAssemblyFile>
   </PropertyGroup>
 
   <UsingTask
     Condition="'$(_RobustUseExternalMSBuild)' != 'true' And $(DesignTimeBuild) != true"
     TaskName="CompileRobustXamlTask"
-    AssemblyFile="$(CompileRobustXamlTaskAssemblyFile)"/>
+    AssemblyFile="$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(RobustInjectorsConfiguration)\netstandard2.0\Robust.Client.Injectors.dll"/>
   <Target
     Name="CompileRobustXaml"
     Condition="Exists('@(IntermediateAssembly)')"

OpenToolkit.GraphicsLibraryFramework/GLFWException.cs

@@ -61,5 +61,18 @@ namespace OpenToolkit.GraphicsLibraryFramework
             : base(message, innerException)
         {
         }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GLFWException"/> class with the specified context
+        /// and the serialization information.
+        /// </summary>
+        /// <param name="info">The <see cref="SerializationInfo"/> associated with this exception.</param>
+        /// <param name="context">
+        /// A <see cref="StreamingContext"/> that represents the context of this exception.
+        /// </param>
+        protected GLFWException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }

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/EnginePrototypes/Shaders/stockshaders.yml

@@ -12,8 +12,3 @@
   id: bgra
   kind: source
   path: "/Shaders/Internal/bgra.swsl"
-
-- type: shader
-  id: ColorPicker
-  kind: source
-  path: "/Shaders/color_picker.swsl"

Resources/Locale/en-US/commands.ftl

@@ -9,7 +9,6 @@ cmd-parse-failure-float = {$arg} is not a valid float.
 cmd-parse-failure-bool = {$arg} is not a valid bool.
 cmd-parse-failure-uid = {$arg} is not a valid entity UID.
 cmd-parse-failure-mapid = {$arg} is not a valid MapId.
-cmd-parse-failure-grid = {$arg} is not a valid grid.
 cmd-parse-failure-entity-exist = UID {$arg} does not correspond to an existing entity.
 
 cmd-error-file-not-found = Could not find file: {$file}.
@@ -18,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.
@@ -490,7 +489,7 @@ cmd-net_entityreport-help = Usage: net_entityreport
 cmd-net_refresh-desc = Requests a full server state.
 cmd-net_refresh-help = Usage: net_refresh
 
-cmd-net_graph-desc = Toggles the net statistics panel.
+cmd-net_graph-desc = Toggles the net statistics pannel.
 cmd-net_graph-help = Usage: net_graph
 
 cmd-net_watchent-desc = Dumps all network updates for an EntityId to the console.
@@ -562,13 +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>
-
-## PVS
-cmd-pvs-override-info-desc = Prints information about any PVS overrides associated with an entity.
-cmd-pvs-override-info-empty = Entity {$nuid} has no PVS overrides.
-cmd-pvs-override-info-global = Entity {$nuid} has a global override.
-cmd-pvs-override-info-clients = Entity {$nuid} has a session override for {$clients}.

Resources/Locale/en-US/physics/grid_merging.ftl

@@ -1,8 +0,0 @@
-cmd-merge_grids-desc = Combines 2 grids into 1 grid
-cmd-merge_grids-help = merge_grids <gridUid1> <gridUid2> <offsetX> <offsetY> [angle]
-
-cmd-merge_grids-hintA = Grid A
-cmd-merge_grids-hintB = Grid B
-cmd-merge_grids-xOffset = X offset
-cmd-merge_grids-yOffset = Y offset
-cmd-merge_grids-angle = [Angle]

Resources/Locale/en-US/toolshed-commands.ftl

@@ -70,9 +70,9 @@ command-description-ls-in =
 command-description-methods-get =
     Returns all methods associated with the input type.
 command-description-methods-overrides =
-    Returns all methods overridden on the input type.
+    Returns all methods overriden on the input type.
 command-description-methods-overridesfrom =
-    Returns all methods overridden from the given type on the input type.
+    Returns all methods overriden from the given type on the input type.
 command-description-cmd-moo =
     Asks the important questions.
 command-description-cmd-descloc =
@@ -418,6 +418,6 @@ command-description-tee =
     This essentially lets you have a branch in your code to do multiple operations on one value.
 command-description-cmd-info =
     Returns a CommandSpec for the given command.
-    On its own, this means it'll print the command's help message.
+    On it's own, this means it'll print the comamnd's help message.
 command-description-comp-rm =
     Removes the given component from the entity.

Resources/Shaders/color_picker.swsl

@@ -1,46 +0,0 @@
-// Simple shader for creating a box with colours varying along the x and y axes.
-
-uniform highp vec2 size;
-uniform highp vec2 offset;
-
-uniform highp vec4 xAxis;
-uniform highp vec4 yAxis;
-uniform highp vec4 baseColor;
-
-uniform bool hsv;
-
-void fragment() 
-{
-    // Calculate local uv coordinates.
-    // I.e., if using this shader to draw a box to the screen, (0,0) is the bottom left of the box.
-    
-    highp float yCoords = 1.0/SCREEN_PIXEL_SIZE.y - FRAGCOORD.y;
-    highp vec2 uv = vec2(FRAGCOORD.x - offset.x,  yCoords - offset.y);
-    uv /= size;
-    uv.y = 1.0 - uv.y;
-    
-    highp vec4 modulate = baseColor + uv.x * xAxis + uv.y * yAxis;
-    
-    if (hsv)
-    {
-        modulate.xyz = hsv2rgb(modulate.xyz);
-    }
-    
-    // The UV used for the texture lookup is the TEXTURE UV coordinate, which is different from the coordinates computed above.
-	COLOR = zTexture(UV) * modulate;
-}
-
-
-// hsv to RGB conversion taken from www.shadertoy.com/view/MsS3Wc
-
-// The MIT License
-// Copyright © 2014 Inigo Quilez
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// https://www.youtube.com/c/InigoQuilez
-// https://iquilezles.org
-
-highp vec3 hsv2rgb( in highp vec3 c )
-{
-    highp vec3 rgb = clamp( abs(mod(c.x*6.0+vec3(0.0,4.0,2.0),6.0)-3.0)-1.0, 0.0, 1.0 );
-	return c.z * mix( vec3(1.0), rgb, c.y);
-}

Robust.Analyzers.Tests/Aliases.cs

@@ -1,8 +0,0 @@
-// OH BOY. TURNS OUT IT GETS EVEN MORE CURSED.
-//
-// So because we're compiling a copy of Robust.Roslyn.Shared into every analyzer project,
-// the test project sees multiple copies of it. This would make it impossible to use.
-// UNLESS you use this obscure C# feature called "extern alias"
-// that I guarantee you you've never heard of before, and are now concerned about.
-
-extern alias SerializationGenerator;

Robust.Analyzers.Tests/ComponentPauseGeneratorTest.cs

@@ -1,340 +0,0 @@
-extern alias SerializationGenerator;
-using System.Linq;
-using System.Reflection;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Text;
-using NUnit.Framework;
-using SerializationGenerator::Robust.Roslyn.Shared;
-using SerializationGenerator::Robust.Serialization.Generator;
-
-namespace Robust.Analyzers.Tests;
-
-[TestFixture]
-[TestOf(typeof(ComponentPauseGenerator))]
-[Parallelizable(ParallelScope.All)]
-public sealed class ComponentPauseGeneratorTest
-{
-    private const string TypesCode = """
-        global using System;
-        global using Robust.Shared.Analyzers;
-        global using Robust.Shared.GameObjects;
-
-        namespace Robust.Shared.Analyzers
-        {
-            [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-            public sealed class AutoGenerateComponentPauseAttribute : Attribute
-            {
-                public bool Dirty = false;
-            }
-
-            [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-            public sealed class AutoPausedFieldAttribute : Attribute;
-
-            [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-            public sealed class AutoNetworkedFieldAttribute : Attribute
-            {
-            }
-        }
-
-        namespace Robust.Shared.GameObjects
-        {
-            public interface IComponent;
-        }
-        """;
-
-    [Test]
-    public void TestBasic()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    component.Foo += args.PausedTime;
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestNullable()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan? Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    if (component.Foo.HasValue)
-                        component.Foo = component.Foo.Value + args.PausedTime;
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestAutoState()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField, AutoNetworkedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    component.Foo += args.PausedTime;
-                    Dirty(uid, component);
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestExplicitDirty()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause(Dirty = true)]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    component.Foo += args.PausedTime;
-                    Dirty(uid, component);
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestDiagnosticNotIComponent()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseNotComponent, new LinePositionSpan(new LinePosition(1, 28), new LinePosition(1, 40)))
-        ]);
-    }
-
-    [Test]
-    public void TestDiagnosticNoFields()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseNoFields, new LinePositionSpan(new LinePosition(1, 28), new LinePosition(1, 40)))
-        ]);
-    }
-
-    [Test]
-    public void TestDiagnosticNoParentAttribute()
-    {
-        var result = RunGenerator("""
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo, Fooz;
-
-                [AutoPausedField]
-                public TimeSpan Bar { get; set; }
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseNoParentAttribute, new LinePositionSpan(new LinePosition(3, 20), new LinePosition(3, 23))),
-            (Diagnostics.IdComponentPauseNoParentAttribute, new LinePositionSpan(new LinePosition(3, 25), new LinePosition(3, 29))),
-            (Diagnostics.IdComponentPauseNoParentAttribute, new LinePositionSpan(new LinePosition(6, 20), new LinePosition(6, 23)))
-        ]);
-    }
-
-    [Test]
-    public void TestDiagnosticWrongType()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public int Foo, Fooz;
-
-                [AutoPausedField]
-                public int Bar { get; set; }
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseWrongTypeAttribute, new LinePositionSpan(new LinePosition(4, 15), new LinePosition(4, 18))),
-            (Diagnostics.IdComponentPauseWrongTypeAttribute, new LinePositionSpan(new LinePosition(4, 20), new LinePosition(4, 24))),
-            (Diagnostics.IdComponentPauseWrongTypeAttribute, new LinePositionSpan(new LinePosition(7, 15), new LinePosition(7, 18)))
-        ]);
-    }
-
-    private static void ExpectSource(GeneratorRunResult result, string expected)
-    {
-        Assert.That(result.GeneratedSources, Has.Length.EqualTo(1));
-
-        var source = result.GeneratedSources[0];
-
-        Assert.That(source.SourceText.ToString(), Is.EqualTo(expected));
-    }
-
-    private static void ExpectNoSource(GeneratorRunResult result)
-    {
-        Assert.That(result.GeneratedSources, Is.Empty);
-    }
-
-    private static void ExpectNoDiagnostics(GeneratorRunResult result)
-    {
-        Assert.That(result.Diagnostics, Is.Empty);
-    }
-
-    private static void ExpectDiagnostics(GeneratorRunResult result, (string code, LinePositionSpan span)[] diagnostics)
-    {
-        Assert.Multiple(() =>
-        {
-            Assert.That(result.Diagnostics, Has.Length.EqualTo(diagnostics.Length));
-            foreach (var (code, span) in diagnostics)
-            {
-                Assert.That(
-                    result.Diagnostics.Any(x => x.Id == code && x.Location.GetLineSpan().Span == span),
-                    $"Expected diagnostic with code {code} and location {span}");
-            }
-        });
-    }
-
-    private static GeneratorRunResult RunGenerator(string source)
-    {
-        var compilation = (Compilation)CSharpCompilation.Create("compilation",
-            new[]
-            {
-                CSharpSyntaxTree.ParseText(source, path: "Source.cs"),
-                CSharpSyntaxTree.ParseText(TypesCode, path: "Types.cs")
-            },
-            new[] { MetadataReference.CreateFromFile(typeof(Binder).GetTypeInfo().Assembly.Location) },
-            new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
-
-        var generator = new ComponentPauseGenerator();
-        GeneratorDriver driver = CSharpGeneratorDriver.Create(generator);
-        driver = driver.RunGeneratorsAndUpdateCompilation(compilation, out var newCompilation, out _);
-        var result = driver.GetRunResult();
-
-        return result.Results[0];
-    }
-}

Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj

@@ -1,32 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
-  </PropertyGroup>
-
-  <Import Project="..\MSBuild\Robust.Properties.targets"/>
-  <Import Project="..\MSBuild\Robust.Engine.props"/>
-
+  <Import Project="..\MSBuild\Robust.Properties.targets" />
+  <Import Project="..\MSBuild\Robust.Engine.props" />
+  
   <PropertyGroup>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <PackageVersion Update="NUnit" Version="3.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.1"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit" Version="1.1.1"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1"/>
+    <PackageReference Include="NUnit" Version="3.13.2"/>
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0"/>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1"/>
+    <PackageReference Include="NUnit.Analyzers" Version="3.3.0"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"/>
-    <PackageReference Include="NUnit"/>
-    <PackageReference Include="NUnit3TestAdapter"/>
-    <PackageReference Include="NUnit.Analyzers"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
-  </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\Robust.Analyzers\Robust.Analyzers.csproj"/>
-    <ProjectReference Include="..\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj" Aliases="SerializationGenerator" />
   </ItemGroup>
 </Project>

Robust.Analyzers/AccessAnalyzer.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 using Robust.Shared.Analyzers.Implementation;
 
 namespace Robust.Analyzers

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 using static Microsoft.CodeAnalysis.SymbolEqualityComparer;
 
 namespace Robust.Analyzers;
@@ -17,17 +16,27 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor ByRefEventSubscribedByValueRule = new(
         Diagnostics.IdByRefEventSubscribedByValue,
         "By-ref event subscribed to by value",
-        "Tried to subscribe to a by-ref event '{0}' by value",
+        "Tried to subscribe to a by-ref event '{0}' by value.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
         "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",
-        "Tried to raise a by-ref event '{0}' by value",
+        "Tried to raise a by-ref event '{0}' by value.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -37,7 +46,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
         Diagnostics.IdValueEventRaisedByRef,
         "Value event raised by-ref",
-        "Tried to raise a value event '{0}' by-ref",
+        "Tried to raise a value event '{0}' by-ref.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -46,6 +55,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
 
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
         ByRefEventSubscribedByValueRule,
+        ByValueEventSubscribedByRefRule,
         ByRefEventRaisedByValueRule,
         ByValueEventRaisedByRefRule
     );
@@ -54,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/DataDefinitionAnalyzer.cs

@@ -5,7 +5,6 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 
@@ -19,7 +18,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor DataDefinitionPartialRule = new(
         Diagnostics.IdDataDefinitionPartial,
         "Type must be partial",
-        "Type {0} is a DataDefinition but is not partial",
+        "Type {0} is a DataDefinition but is not partial.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -29,7 +28,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor NestedDataDefinitionPartialRule = new(
         Diagnostics.IdNestedDataDefinitionPartial,
         "Type must be partial",
-        "Type {0} contains nested data definition {1} but is not partial",
+        "Type {0} contains nested data definition {1} but is not partial.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -39,7 +38,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor DataFieldWritableRule = new(
         Diagnostics.IdDataFieldWritable,
         "Data field must not be readonly",
-        "Data field {0} in data definition {1} is readonly",
+        "Data field {0} in data definition {1} is readonly.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -49,7 +48,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor DataFieldPropertyWritableRule = new(
         Diagnostics.IdDataFieldPropertyWritable,
         "Data field property must have a setter",
-        "Data field property {0} in data definition {1} does not have a setter",
+        "Data field property {0} in data definition {1} does not have a setter.",
         "Usage",
         DiagnosticSeverity.Error,
         true,

Robust.Analyzers/DataDefinitionFixer.cs

@@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxKind;
-using static Robust.Roslyn.Shared.Diagnostics;
+using static Robust.Analyzers.Diagnostics;
 
 namespace Robust.Analyzers;
 

Robust.Analyzers/Diagnostics.cs

@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis;
 
-namespace Robust.Roslyn.Shared;
+namespace Robust.Analyzers;
 
 public static class Diagnostics
 {
@@ -18,16 +18,13 @@ 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";
     public const string IdNestedDataDefinitionPartial = "RA0018";
     public const string IdDataFieldWritable = "RA0019";
     public const string IdDataFieldPropertyWritable = "RA0020";
-    public const string IdComponentPauseNotComponent = "RA0021";
-    public const string IdComponentPauseNoFields = "RA0022";
-    public const string IdComponentPauseNoParentAttribute = "RA0023";
-    public const string IdComponentPauseWrongTypeAttribute = "RA0024";
 
     public static SuppressionDescriptor MeansImplicitAssignment =>
         new SuppressionDescriptor("RADC1000", "CS0649", "Marked as implicitly assigned.");

Robust.Analyzers/ExplicitInterfaceAnalyzer.cs

@@ -10,7 +10,6 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 using Document = Microsoft.CodeAnalysis.Document;
 
 namespace Robust.Analyzers

Robust.Analyzers/ExplicitVirtualAnalyzer.cs

@@ -5,7 +5,6 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 

Robust.Analyzers/MeansImplicitAssigmentSuppressor.cs

@@ -2,7 +2,6 @@ using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers
 {

Robust.Analyzers/NotNullableFlagAnalyzer.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 
@@ -32,7 +31,7 @@ public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
 
     private static readonly DiagnosticDescriptor InvalidNotNullableImplementationRule = new (
         Diagnostics.IdInvalidNotNullableFlagImplementation,
-        "Invalid NotNullable flag implementation",
+        "Invalid NotNullable flag implementation.",
         "NotNullable flag is either not typed as bool, or does not have a default value equaling false",
         "Usage",
         DiagnosticSeverity.Error,
@@ -42,7 +41,7 @@ public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor InvalidNotNullableTypeRule = new (
         Diagnostics.IdInvalidNotNullableFlagType,
         "Failed to resolve type parameter",
-        "Failed to resolve type parameter \"{0}\"",
+        "Failed to resolve type parameter \"{0}\".",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -50,7 +49,7 @@ public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
 
     private static readonly DiagnosticDescriptor NotNullableFlagValueTypeRule = new (
         Diagnostics.IdNotNullableFlagValueType,
-        "NotNullable flag not supported for value types",
+        "NotNullable flag not supported for value types.",
         "Value types as generic arguments are not supported for NotNullable flags",
         "Usage",
         DiagnosticSeverity.Error,

Robust.Analyzers/PreferGenericVariantAnalyzer.cs

@@ -11,7 +11,6 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 

Robust.Analyzers/Robust.Analyzers.csproj

@@ -1,10 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>10</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <!-- Needed for NotNullableFlagAnalyzer. -->
     <Compile Include="..\Robust.Shared\Analyzers\NotNullableFlagAttribute.cs" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <!-- Needed for FriendAnalyzer. -->
     <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" />
@@ -16,10 +27,4 @@
     <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" />
   </ItemGroup>
 
-  <Import Project="../Robust.Roslyn.Shared/Robust.Roslyn.Shared.props" />
-
-  <PropertyGroup>
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
-
 </Project>

Robust.Analyzers/SerializableAnalyzer.cs

@@ -10,7 +10,6 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers
 {

Robust.Analyzers/TaskResultAnalyzer.cs

@@ -3,7 +3,6 @@ using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 

Robust.Benchmarks/Configs/DefaultSQLConfig.cs

@@ -1,18 +1,15 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using BenchmarkDotNet.Analysers;
 using BenchmarkDotNet.Columns;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
-using BenchmarkDotNet.EventProcessors;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Filters;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Order;
 using BenchmarkDotNet.Reports;
-using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Validators;
 using Robust.Benchmarks.Exporters;
 
@@ -47,16 +44,10 @@ public sealed class DefaultSQLConfig : IConfig
 
     public IEnumerable<BenchmarkLogicalGroupRule> GetLogicalGroupRules() => DefaultConfig.Instance.GetLogicalGroupRules();
 
-    public IEnumerable<EventProcessor> GetEventProcessors() => DefaultConfig.Instance.GetEventProcessors();
-
-    public IEnumerable<IColumnHidingRule> GetColumnHidingRules() => DefaultConfig.Instance.GetColumnHidingRules();
     public IOrderer Orderer => DefaultConfig.Instance.Orderer!;
-    public ICategoryDiscoverer? CategoryDiscoverer => DefaultConfig.Instance.CategoryDiscoverer;
     public SummaryStyle SummaryStyle => DefaultConfig.Instance.SummaryStyle;
     public ConfigUnionRule UnionRule => DefaultConfig.Instance.UnionRule;
     public string ArtifactsPath => DefaultConfig.Instance.ArtifactsPath;
     public CultureInfo CultureInfo => DefaultConfig.Instance.CultureInfo!;
     public ConfigOptions Options => DefaultConfig.Instance.Options;
-    public TimeSpan BuildTimeout => DefaultConfig.Instance.BuildTimeout;
-    public IReadOnlyList<Conclusion> ConfigAnalysisConclusion => DefaultConfig.Instance.ConfigAnalysisConclusion;
 }

Robust.Benchmarks/Robust.Benchmarks.csproj

@@ -13,12 +13,12 @@
     <ProjectReference Include="..\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
   </ItemGroup>
 
   <Import Project="..\MSBuild\Robust.Properties.targets" />

Robust.Benchmarks/Transform/RecursiveMoveBenchmark.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Numerics;
-using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Robust.Server.Containers;
 using Robust.Server.GameStates;
@@ -12,9 +11,7 @@ using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
-using Robust.UnitTesting;
+using Robust.UnitTesting.Server;
 
 namespace Robust.Benchmarks.Transform;
 
@@ -22,177 +19,114 @@ namespace Robust.Benchmarks.Transform;
 /// This benchmark tests various transform/move related functions with an entity that has many children.
 /// </summary>
 [Virtual, MemoryDiagnoser]
-public class RecursiveMoveBenchmark : RobustIntegrationTest
+public class RecursiveMoveBenchmark
 {
+    private ISimulation _simulation = default!;
     private IEntityManager _entMan = default!;
     private SharedTransformSystem _transform = default!;
     private ContainerSystem _container = default!;
     private PvsSystem _pvs = default!;
     private EntityCoordinates _mapCoords;
     private EntityCoordinates _gridCoords;
-    private EntityCoordinates _gridCoords2;
     private EntityUid _ent;
     private EntityUid _child;
     private TransformComponent _childXform = default!;
     private EntityQuery<TransformComponent> _query;
-    private ICommonSession[] _players = default!;
-    private PvsSession _session = default!;
 
     [GlobalSetup]
     public void GlobalSetup()
     {
-        ProgramShared.PathOffset = "../../../../";
-        var server = StartServer();
-        var client = StartClient();
+        _simulation = RobustServerSimulation
+            .NewSimulation()
+            .InitializeInstance();
 
-        Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()).Wait();
-
-        var mapMan = server.ResolveDependency<IMapManager>();
-        _entMan = server.ResolveDependency<IEntityManager>();
-        var confMan = server.ResolveDependency<IConfigurationManager>();
-        var sPlayerMan = server.ResolveDependency<ISharedPlayerManager>();
+        if (!_simulation.Resolve<IConfigurationManager>().GetCVar(CVars.NetPVS))
+            throw new InvalidOperationException("PVS must be enabled");
 
+        _entMan = _simulation.Resolve<IEntityManager>();
         _transform = _entMan.System<SharedTransformSystem>();
         _container = _entMan.System<ContainerSystem>();
         _pvs = _entMan.System<PvsSystem>();
         _query = _entMan.GetEntityQuery<TransformComponent>();
+
+        // Create map & grid
+        var mapMan = _simulation.Resolve<IMapManager>();
         var mapSys = _entMan.System<SharedMapSystem>();
+        var mapId = mapMan.CreateMap();
+        var map = mapMan.GetMapEntityId(mapId);
+        var gridComp = mapMan.CreateGrid(mapId);
+        var grid = gridComp.Owner;
+        _gridCoords = new EntityCoordinates(grid, .5f, .5f);
+        _mapCoords = new EntityCoordinates(map, 100, 100);
+        mapSys.SetTile(grid, gridComp, Vector2i.Zero, new Tile(1));
 
-        var netMan = client.ResolveDependency<IClientNetManager>();
-        client.SetConnectTarget(server);
-        client.Post(() => netMan.ClientConnect(null!, 0, null!));
-        server.Post(() => confMan.SetCVar(CVars.NetPVS, true));
+        // Next, we will spawn our test entity. This entity will have a  complex transform/container hierarchy.
+        // This is intended to be representative of a typical SS14 player entity, with organs. clothing, and a full backpack.
+        _ent = _entMan.Spawn();
 
-        for (int i = 0; i < 10; i++)
+        // Quick check that SetCoordinates actually changes the parent as expected
+        // I.e., ensure that grid-traversal code doesn't just dump the entity on the map.
+        _transform.SetCoordinates(_ent, _gridCoords);
+        if (_query.GetComponent(_ent).ParentUid != _gridCoords.EntityId)
+            throw new Exception("Grid traversal error.");
+
+        _transform.SetCoordinates(_ent, _mapCoords);
+        if (_query.GetComponent(_ent).ParentUid != _mapCoords.EntityId)
+            throw new Exception("Grid traversal error.");
+
+        // Add 5 direct children in slots to represent clothing.
+        for (var i = 0; i < 5; i++)
         {
-            server.WaitRunTicks(1).Wait();
-            client.WaitRunTicks(1).Wait();
+            var id = $"inventory{i}";
+            _container.EnsureContainer<ContainerSlot>(_ent, id);
+            if (!_entMan.TrySpawnInContainer(null, _ent, id, out _))
+                throw new Exception($"Failed to setup entity");
         }
 
-        // Ensure client & server ticks are synced.
-        // Client runs 1 tick ahead
+        // body parts
+        _container.EnsureContainer<Container>(_ent, "body");
+        for (var i = 0; i < 5; i++)
         {
-            var sTick = (int)server.Timing.CurTick.Value;
-            var cTick = (int)client.Timing.CurTick.Value;
-            var delta = cTick - sTick;
-
-            if (delta > 1)
-                server.WaitRunTicks(delta - 1).Wait();
-            else if (delta < 1)
-                client.WaitRunTicks(1 - delta).Wait();
-
-            sTick = (int)server.Timing.CurTick.Value;
-            cTick = (int)client.Timing.CurTick.Value;
-            delta = cTick - sTick;
-            if (delta != 1)
-                throw new Exception("Failed setup");
-        }
-
-        // Set up map and spawn player
-        server.WaitPost(() =>
-        {
-            var mapId = mapMan.CreateMap();
-            var map = mapMan.GetMapEntityId(mapId);
-            var gridComp = mapMan.CreateGridEntity(mapId);
-            var grid = gridComp.Owner;
-            mapSys.SetTile(grid, gridComp, Vector2i.Zero, new Tile(1));
-            _gridCoords = new EntityCoordinates(grid, .5f, .5f);
-            _gridCoords2 = new EntityCoordinates(grid, .5f, .6f);
-            _mapCoords = new EntityCoordinates(map, 100, 100);
-
-            var playerUid = _entMan.SpawnEntity(null, _mapCoords);
-
-            // Attach player.
-            var session = sPlayerMan.Sessions.First();
-            server.PlayerMan.SetAttachedEntity(session, playerUid);
-            sPlayerMan.JoinGame(session);
-
-            // Next, we will spawn our test entity. This entity will have a  complex transform/container hierarchy.
-            // This is intended to be representative of a typical SS14 player entity, with organs. clothing, and a full backpack.
-            _ent = _entMan.Spawn();
-
-            // Quick check that SetCoordinates actually changes the parent as expected
-            // I.e., ensure that grid-traversal code doesn't just dump the entity on the map.
-            _transform.SetCoordinates(_ent, _gridCoords);
-            if (_query.GetComponent(_ent).ParentUid != _gridCoords.EntityId)
-                throw new Exception("Grid traversal error.");
-
-            _transform.SetCoordinates(_ent, _mapCoords);
-            if (_query.GetComponent(_ent).ParentUid != _mapCoords.EntityId)
-                throw new Exception("Grid traversal error.");
-
-            // Add 5 direct children in slots to represent clothing.
-            for (var i = 0; i < 5; i++)
-            {
-                var id = $"inventory{i}";
-                _container.EnsureContainer<ContainerSlot>(_ent, id);
-                if (!_entMan.TrySpawnInContainer(null, _ent, id, out _))
-                    throw new Exception($"Failed to setup entity");
-            }
-
-            // body parts
-            _container.EnsureContainer<Container>(_ent, "body");
-            for (var i = 0; i < 5; i++)
-            {
-                // Simple organ
-                if (!_entMan.TrySpawnInContainer(null, _ent, "body", out _))
-                    throw new Exception($"Failed to setup entity");
-
-                // body part that has another body part / limb
-                if (!_entMan.TrySpawnInContainer(null, _ent, "body", out var limb))
-                    throw new Exception($"Failed to setup entity");
-
-                _container.EnsureContainer<ContainerSlot>(limb.Value, "limb");
-                if (!_entMan.TrySpawnInContainer(null, limb.Value, "limb", out _))
-                    throw new Exception($"Failed to setup entity");
-            }
-
-            // Backpack
-            _container.EnsureContainer<ContainerSlot>(_ent, "inventory-backpack");
-            if (!_entMan.TrySpawnInContainer(null, _ent, "inventory-backpack", out var backpack))
+            // Simple organ
+            if (!_entMan.TrySpawnInContainer(null, _ent, "body", out _))
                 throw new Exception($"Failed to setup entity");
 
-            // Misc backpack contents.
-            var backpackStorage = _container.EnsureContainer<Container>(backpack.Value, "storage");
-            for (var i = 0; i < 10; i++)
-            {
-                if (!_entMan.TrySpawnInContainer(null, backpack.Value, "storage", out _))
-                    throw new Exception($"Failed to setup entity");
-            }
+            // body part that has another body part / limb
+            if (!_entMan.TrySpawnInContainer(null, _ent, "body", out var limb))
+                throw new Exception($"Failed to setup entity");
 
-            // Emergency box inside of the backpack
-            var box = backpackStorage.ContainedEntities.First();
-            var boxContainer = _container.EnsureContainer<Container>(box, "storage");
-            for (var i = 0; i < 10; i++)
-            {
-                if (!_entMan.TrySpawnInContainer(null, box, "storage", out _))
-                    throw new Exception($"Failed to setup entity");
-            }
-
-            // Deepest child.
-            _child = boxContainer.ContainedEntities.First();
-            _childXform = _query.GetComponent(_child);
-
-            _players = new[] {session};
-            _session = _pvs.PlayerData[session];
-        }).Wait();
-
-        for (int i = 0; i < 10; i++)
-        {
-            server.WaitRunTicks(1).Wait();
-            client.WaitRunTicks(1).Wait();
+            _container.EnsureContainer<ContainerSlot>(limb.Value, "limb");
+            if (!_entMan.TrySpawnInContainer(null, limb.Value, "limb", out _))
+                throw new Exception($"Failed to setup entity");
         }
 
-        PvsTick();
-        PvsTick();
-    }
+        // Backpack
+        _container.EnsureContainer<ContainerSlot>(_ent, "inventory-backpack");
+        if (!_entMan.TrySpawnInContainer(null, _ent, "inventory-backpack", out var backpack))
+            throw new Exception($"Failed to setup entity");
 
-    private void PvsTick()
-    {
-        _session.ClearState();
-        _pvs.CacheSessionData(_players);
-        _pvs.GetVisibleChunks();
-        _pvs.ProcessVisibleChunksSequential();
+        // Misc backpack contents.
+        var backpackStorage = _container.EnsureContainer<Container>(backpack.Value, "storage");
+        for (var i = 0; i < 10; i++)
+        {
+            if (!_entMan.TrySpawnInContainer(null, backpack.Value, "storage", out _))
+                throw new Exception($"Failed to setup entity");
+        }
+
+        // Emergency box inside of the backpack
+        var box = backpackStorage.ContainedEntities.First();
+        var boxContainer = _container.EnsureContainer<Container>(box, "storage");
+        for (var i = 0; i < 10; i++)
+        {
+            if (!_entMan.TrySpawnInContainer(null, box, "storage", out _))
+                throw new Exception($"Failed to setup entity");
+        }
+
+        // Deepest child.
+        _child = boxContainer.ContainedEntities.First();
+        _childXform = _query.GetComponent(_child);
+
+        _pvs.ProcessCollections();
     }
 
     /// <summary>
@@ -206,13 +140,6 @@ public class RecursiveMoveBenchmark : RobustIntegrationTest
         _transform.SetCoordinates(_ent, _mapCoords);
     }
 
-    [Benchmark]
-    public void MoveEntityASmidge()
-    {
-        _transform.SetCoordinates(_ent, _gridCoords);
-        _transform.SetCoordinates(_ent, _gridCoords2);
-    }
-
     /// <summary>
     /// Like <see cref="MoveEntity"/>, but also processes queued PVS chunk updates.
     /// </summary>
@@ -220,18 +147,9 @@ public class RecursiveMoveBenchmark : RobustIntegrationTest
     public void MoveAndUpdateChunks()
     {
         _transform.SetCoordinates(_ent, _gridCoords);
-        PvsTick();
+        _pvs.ProcessCollections();
         _transform.SetCoordinates(_ent, _mapCoords);
-        PvsTick();
-    }
-
-    [Benchmark]
-    public void MoveASmidgeAndUpdateChunk()
-    {
-        _transform.SetCoordinates(_ent, _gridCoords);
-        PvsTick();
-        _transform.SetCoordinates(_ent, _gridCoords2);
-        PvsTick();
+        _pvs.ProcessCollections();
     }
 
     [Benchmark]

Robust.Client.Injectors/Robust.Client.Injectors.csproj

@@ -6,8 +6,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" />
-      <PackageReference Include="Mono.Cecil" Version="0.11.5" />
+      <PackageReference Include="Microsoft.Build.Framework" Version="17.0.0" />
+      <PackageReference Include="Mono.Cecil" Version="0.11.3" />
       <PackageReference Include="Pidgin" Version="2.5.0" />
     </ItemGroup>
 

Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj

@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Link="XamlX\filename" Include="../XamlX/src/XamlX/**/*.cs" />
     <Compile Remove="../XamlX/src/XamlX/**/SreTypeSystem.cs" />
     <Compile Remove="../XamlX/src/XamlX/obj/**" />
     <Compile Include="..\Robust.Client\UserInterface\ControlPropertyAccess.cs" />
   </ItemGroup>
-
-  <Import Project="../Robust.Roslyn.Shared/Robust.Roslyn.Shared.props" />
-
-  <PropertyGroup>
-    <!-- XamlX doesn't do NRTs. -->
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
-
 </Project>

Robust.Client.WebView/Cef/BaseRobustCefClient.cs

@@ -1,85 +0,0 @@
-using Xilium.CefGlue;
-
-namespace Robust.Client.WebView.Cef;
-
-/// <summary>
-/// Shared functionality for all <see cref="CefClient"/> implementations.
-/// </summary>
-/// <remarks>
-/// Locks down a bunch of CEF functionality we absolutely do not need content to do right now.
-/// </remarks>
-internal abstract class BaseRobustCefClient : CefClient
-{
-    private readonly RobustCefPrintHandler _printHandler = new();
-    private readonly RobustCefPermissionHandler _permissionHandler = new();
-    private readonly RobustCefDialogHandler _dialogHandler = new();
-    private readonly RobustCefDragHandler _dragHandler = new();
-
-    protected override CefPrintHandler GetPrintHandler() => _printHandler;
-    protected override CefPermissionHandler GetPermissionHandler() => _permissionHandler;
-    protected override CefDialogHandler GetDialogHandler() => _dialogHandler;
-    protected override CefDragHandler GetDragHandler() => _dragHandler;
-
-    private sealed class RobustCefPrintHandler : CefPrintHandler
-    {
-        protected override void OnPrintSettings(CefBrowser browser, CefPrintSettings settings, bool getDefaults)
-        {
-        }
-
-        protected override bool OnPrintDialog(CefBrowser browser, bool hasSelection, CefPrintDialogCallback callback)
-        {
-            return false;
-        }
-
-        protected override bool OnPrintJob(CefBrowser browser, string documentName, string pdfFilePath, CefPrintJobCallback callback)
-        {
-            return false;
-        }
-
-        protected override void OnPrintReset(CefBrowser browser)
-        {
-        }
-    }
-
-    private sealed class RobustCefPermissionHandler : CefPermissionHandler
-    {
-        protected override bool OnRequestMediaAccessPermission(
-            CefBrowser browser,
-            CefFrame frame,
-            string requestingOrigin,
-            CefMediaAccessPermissionTypes requestedPermissions,
-            CefMediaAccessCallback callback)
-        {
-            callback.Cancel();
-
-            return true;
-        }
-    }
-
-    private sealed class RobustCefDialogHandler : CefDialogHandler
-    {
-        protected override bool OnFileDialog(
-            CefBrowser browser,
-            CefFileDialogMode mode,
-            string title,
-            string defaultFilePath,
-            string[] acceptFilters,
-            CefFileDialogCallback callback)
-        {
-            callback.Cancel();
-            return true;
-        }
-    }
-
-    private sealed class RobustCefDragHandler : CefDragHandler
-    {
-        protected override bool OnDragEnter(CefBrowser browser, CefDragData dragData, CefDragOperationsMask mask)
-        {
-            return true;
-        }
-
-        protected override void OnDraggableRegionsChanged(CefBrowser browser, CefFrame frame, CefDraggableRegion[] regions)
-        {
-        }
-    }
-}

Robust.Client.WebView/Cef/Program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Threading;
 using Xilium.CefGlue;
 
 namespace Robust.Client.WebView.Cef
@@ -22,8 +19,6 @@ namespace Robust.Client.WebView.Cef
 
             var mainArgs = new CefMainArgs(argv);
 
-            StartWatchThread();
-
             // This will block executing until the subprocess is shut down.
             var code = CefRuntime.ExecuteProcess(mainArgs, new RobustCefApp(null), IntPtr.Zero);
 
@@ -34,44 +29,5 @@ namespace Robust.Client.WebView.Cef
 
             return code;
         }
-
-        private static void StartWatchThread()
-        {
-            //
-            // CEF has this nasty habit of not shutting down all its processes if the parent crashes.
-            // Great!
-            //
-            // We use a separate thread in each CEF child process to watch the main PID.
-            // If it exits, we kill ourselves after a couple seconds.
-            //
-
-            if (Environment.GetEnvironmentVariable("ROBUST_CEF_BROWSER_PROCESS_ID") is not { } parentIdString)
-                return;
-
-            if (Environment.GetEnvironmentVariable("ROBUST_CEF_BROWSER_PROCESS_MODULE") is not { } parentModuleString)
-                return;
-
-            if (!int.TryParse(parentIdString, CultureInfo.InvariantCulture, out var parentId))
-                return;
-
-            var process = Process.GetProcessById(parentId);
-            if ((process.MainModule?.FileName ?? "") != parentModuleString)
-            {
-                process.Dispose();
-                return;
-            }
-
-            new Thread(() => WatchThread(process)) { Name = "CEF Watch Thread", IsBackground = true }
-                .Start();
-        }
-
-        private static void WatchThread(Process p)
-        {
-            p.WaitForExit();
-
-            Thread.Sleep(3000);
-
-            Environment.Exit(1);
-        }
     }
 }

Robust.Client.WebView/Cef/RequestResults.cs

@@ -76,9 +76,12 @@ namespace Robust.Client.WebView.Cef
                 return true;
             }
 
-            protected override bool Read(Span<byte> response, out int bytesRead, CefResourceReadCallback callback)
+            protected override unsafe bool Read(IntPtr dataOut, int bytesToRead, out int bytesRead, CefResourceReadCallback callback)
             {
-                bytesRead = _stream.Read(response);
+                var byteSpan = new Span<byte>((void*) dataOut, bytesToRead);
+
+                bytesRead = _stream.Read(byteSpan);
+
                 return bytesRead != 0;
             }
 

Robust.Client.WebView/Cef/RobustCefApp.cs

@@ -31,12 +31,10 @@ namespace Robust.Client.WebView.Cef
             // Disable zygote on Linux.
             commandLine.AppendSwitch("--no-zygote");
 
-            // Work around https://github.com/chromiumembedded/cef/issues/3213
+            // Work around https://bitbucket.org/chromiumembedded/cef/issues/3213/ozone-egl-initialization-does-not-have
             // Desktop GL force makes Chromium not try to load its own ANGLE/Swiftshader so load paths aren't problematic.
-            // UPDATE: That bug got fixed and now this workaround breaks CEF.
-            // Keeping all this comment history in case I ever wanan remember what the `--use-gl` flag is.
-            //if (OperatingSystem.IsLinux())
-            //    commandLine.AppendSwitch("--use-gl", "desktop");
+            if (OperatingSystem.IsLinux())
+                commandLine.AppendSwitch("--use-gl", "desktop");
 
             // commandLine.AppendSwitch("--single-process");
 

Robust.Client.WebView/Cef/RobustCefClient.cs

@@ -3,7 +3,7 @@ using Xilium.CefGlue;
 namespace Robust.Client.WebView.Cef
 {
     // Simple CEF client.
-    internal sealed class RobustCefClient : BaseRobustCefClient
+    internal sealed class RobustCefClient : CefClient
     {
         private readonly CefRenderHandler _renderHandler;
         private readonly CefRequestHandler _requestHandler;

Robust.Client.WebView/Cef/WebViewManagerCef.BrowserWindow.cs

@@ -150,7 +150,7 @@ namespace Robust.Client.WebView.Cef
             }
         }
 
-        private sealed class WindowCefClient : BaseRobustCefClient
+        private sealed class WindowCefClient : CefClient
         {
             private readonly CefLifeSpanHandler _lifeSpanHandler;
             private readonly CefRequestHandler _requestHandler;

Robust.Client.WebView/Cef/WebViewManagerCef.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Reflection;
@@ -86,10 +85,6 @@ namespace Robust.Client.WebView.Cef
 
             _app = new RobustCefApp(_sawmill);
 
-            var process = Process.GetCurrentProcess();
-            Environment.SetEnvironmentVariable("ROBUST_CEF_BROWSER_PROCESS_ID", process.Id.ToString());
-            Environment.SetEnvironmentVariable("ROBUST_CEF_BROWSER_PROCESS_MODULE", process.MainModule?.FileName ?? "");
-
             // So these arguments look like nonsense, but it turns out CEF is just *like that*.
             // The first argument is literally nonsense, but it needs to be there as otherwise the second argument doesn't apply
             // The second argument turns off CEF's bullshit error handling, which breaks dotnet's error handling.

Robust.Client.WebView/Robust.Client.WebView.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
-    <PackageReference Include="Robust.Natives.Cef" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
+    <PackageReference Include="Robust.Natives.Cef" Version="102.0.9" />
   </ItemGroup>
 
   <ItemGroup>

Robust.Client.WebView/TestBrowseWindow.cs

@@ -1,28 +0,0 @@
-using System.Numerics;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Console;
-
-namespace Robust.Client.WebView;
-
-internal sealed class TestBrowseWindow : DefaultWindow
-{
-    protected override Vector2 ContentsMinimumSize => new Vector2(640, 480);
-
-    public TestBrowseWindow()
-    {
-        var wv = new WebViewControl();
-        wv.Url = "https://spacestation14.io";
-
-        Contents.AddChild(wv);
-    }
-}
-
-internal sealed class TestBrowseWindowCommand : LocalizedCommands
-{
-    public override string Command => "test_browse_window";
-
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        new TestBrowseWindow().Open();
-    }
-}

Robust.Client.WebView/WebViewManager.cs

@@ -5,7 +5,6 @@ using Robust.Client.WebView.Headless;
 using Robust.Client.WebViewHook;
 using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
-using Robust.Shared.Reflection;
 using Robust.Shared.Utility;
 
 [assembly: WebViewManagerImpl(typeof(WebViewManager))]
@@ -23,9 +22,6 @@ namespace Robust.Client.WebView
             var cfg = dependencies.Resolve<IConfigurationManagerInternal>();
             cfg.LoadCVarsFromAssembly(typeof(WebViewManager).Assembly);
 
-            var refl = dependencies.Resolve<IReflectionManager>();
-            refl.LoadAssemblies(typeof(WebViewManager).Assembly);
-
             dependencies.RegisterInstance<IWebViewManager>(this);
             dependencies.RegisterInstance<IWebViewManagerInternal>(this);
 

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,374 +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 SetVelocity(Vector2 velocity)
-    {
-        AL.Listener(ALListener3f.Velocity, velocity.X, velocity.Y, 0f);
-    }
-
-    /// <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.Mono16;
-        }
-        else if (vorbis.Channels == 2)
-        {
-            format = ALFormat.Stereo16;
-        }
-        else
-        {
-            throw new InvalidOperationException("Unable to load audio with more than 2 channels.");
-        }
-
-        unsafe
-        {
-            fixed (short* ptr = vorbis.Data.Span)
-            {
-                AL.BufferData(buffer, format, (IntPtr) ptr, vorbis.Data.Length * sizeof(short),
-                    (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 SetMasterGain(float newGain)
-    {
-        if (newGain < 0f)
-        {
-            OpenALSawmill.Error("Tried to set master gain below 0, clamping to 0");
-            AL.Listener(ALListenerf.Gain, 0f);
-            return;
-        }
-
-
-        #region Platform hack for MacOS
-        // HACK/BUG: Apple's OpenAL implementation has a bug where values of 0f for listener gain don't actually
-        // HACK/BUG: prevent sound playback. Workaround is to cap the minimum gain at a value just above 0.
-        if (OperatingSystem.IsMacOS() && newGain == 0f)
-        {
-            OpenALSawmill.Verbose("Not setting gain to 0 because Apple can't write an OpenAL implementation");
-            AL.Listener(ALListenerf.Gain, float.Epsilon);
-            return;
-        }
-        #endregion Platform hack for MacOS
-
-        AL.Listener(ALListenerf.Gain, newGain);
-    }
-
-    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));
-        ApplyDefaultParams(audioSource);
-        return audioSource;
-    }
-
-    /// <inheritdoc/>
-    IBufferedAudioSource? IAudioInternal.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);
-            return null;
-        }
-
-        // ReSharper disable once PossibleInvalidOperationException
-
-        var audioSource = new BufferedAudioSource(this, source, AL.GenBuffers(buffers), floatAudio);
-        _bufferedAudioSources.Add(source, new WeakReference<BufferedAudioSource>(audioSource));
-        ApplyDefaultParams(audioSource);
-        return audioSource;
-    }
-
-    private void ApplyDefaultParams(IAudioSource source)
-    {
-        source.MaxDistance = AudioParams.Default.MaxDistance;
-        source.Pitch = AudioParams.Default.Pitch;
-        source.ReferenceDistance = AudioParams.Default.ReferenceDistance;
-        source.RolloffFactor = AudioParams.Default.RolloffFactor;
-    }
-
-    /// <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.Dispose();
-            }
-        }
-
-        _audioSources.Clear();
-
-        foreach (var source in _bufferedAudioSources.Values)
-        {
-            if (source.TryGetTarget(out var target))
-            {
-                target.Dispose();
-            }
-        }
-
-        _bufferedAudioSources.Clear();
-    }
-}

Robust.Client/Audio/AudioManager.cs

@@ -1,173 +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, SetMasterGain, 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);
-        }
-    }
-
-    /// <summary>
-    /// Like _checkAlError but allows custom data to be passed in as relevant.
-    /// </summary>
-    internal void LogALError(string message, [CallerMemberName] string callerMember = "", [CallerLineNumber] int callerLineNumber = -1)
-    {
-        var error = AL.GetError();
-        if (error != ALError.NoError)
-        {
-            OpenALSawmill.Error("[{0}:{1}] AL error: {2}, {3}. Stacktrace is {4}", callerMember, callerLineNumber, error, message, Environment.StackTrace);
-        }
-    }
-
-    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.LocalEntity;
-
-        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.Limits.cs

@@ -1,57 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using Robust.Shared;
-using Robust.Shared.GameObjects;
-
-namespace Robust.Client.Audio;
-
-public sealed partial class AudioSystem
-{
-    /*
-     * Handles limiting concurrent sounds for audio to avoid blowing the source budget on one sound getting spammed.
-     */
-
-    private readonly Dictionary<string, int> _playingCount = new();
-
-    private int _maxConcurrent;
-
-    private void InitializeLimit()
-    {
-        Subs.CVar(CfgManager, CVars.AudioDefaultConcurrent, SetConcurrentLimit, true);
-    }
-
-    private void SetConcurrentLimit(int obj)
-    {
-        _maxConcurrent = obj;
-    }
-
-    private bool TryAudioLimit(string sound)
-    {
-        if (string.IsNullOrEmpty(sound))
-            return true;
-
-        ref var count = ref CollectionsMarshal.GetValueRefOrAddDefault(_playingCount, sound, out _);
-
-        if (count >= _maxConcurrent)
-            return false;
-
-        count++;
-        return true;
-    }
-
-    private void RemoveAudioLimit(string sound)
-    {
-        if (!_playingCount.TryGetValue(sound, out var count))
-            return;
-
-        count--;
-
-        if (count <= 0)
-        {
-            _playingCount.Remove(sound);
-            return;
-        }
-
-        _playingCount[sound] = count;
-    }
-}

Robust.Client/Audio/AudioSystem.cs

@@ -1,708 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Numerics;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Player;
-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;
-
-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 IPlayerManager _playerManager = default!;
-    [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 MetaDataSystem _metadata = 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 UpdateAudioJob _updateAudioJob;
-
-
-    private EntityQuery<PhysicsComponent> _physicsQuery;
-
-    private float _maxRayLength;
-
-    public override float ZOffset
-    {
-        get => _zOffset;
-        protected set
-        {
-            _zOffset = value;
-            _audio.SetZOffset(value);
-
-            var query = AllEntityQuery<AudioComponent>();
-
-            while (query.MoveNext(out var audio))
-            {
-                // Pythagoras back to normal then adjust.
-                var maxDistance = GetAudioDistance(audio.Params.MaxDistance);
-                var refDistance = GetAudioDistance(audio.Params.ReferenceDistance);
-
-                audio.MaxDistance = maxDistance;
-                audio.ReferenceDistance = refDistance;
-            }
-        }
-    }
-
-    private float _zOffset;
-
-    /// <inheritdoc />
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _updateAudioJob = new UpdateAudioJob
-        {
-            System = this,
-            Streams = _streams,
-        };
-
-        UpdatesOutsidePrediction = true;
-        // Need to run after Eye updates so we have an accurate listener position.
-        UpdatesAfter.Add(typeof(EyeSystem));
-
-        _physicsQuery = GetEntityQuery<PhysicsComponent>();
-
-        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);
-
-        Subs.CVar(CfgManager, CVars.AudioAttenuation, OnAudioAttenuation, true);
-        Subs.CVar(CfgManager, CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
-        InitializeLimit();
-    }
-
-    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.SetMasterGain(value);
-    }
-
-    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;
-        }
-
-        // Source has already been set
-        if (component.Loaded)
-        {
-            return;
-        }
-
-        if (!TryGetAudio(component.FileName, out var audioResource))
-        {
-            Log.Error($"Error creating audio source for {audioResource}, can't find file {component.FileName}");
-            return;
-        }
-
-        SetupSource((uid, component), audioResource);
-        component.Loaded = true;
-    }
-
-    private void SetupSource(Entity<AudioComponent> entity, AudioResource audioResource, TimeSpan? length = null)
-    {
-        var component = entity.Comp;
-    
-        if (TryAudioLimit(component.FileName))
-        {
-            var newSource = _audio.CreateAudioSource(audioResource);
-
-            if (newSource == null)
-            {
-                Log.Error($"Error creating audio source for {audioResource}");
-                DebugTools.Assert(false);
-            }
-            else
-            {
-                component.Source = newSource;
-            }
-        }
-
-        if ((component.Flags & AudioFlags.GridAudio) != 0x0)
-        {
-            _metadata.SetFlag(entity.Owner, MetaDataFlags.Undetachable, true);
-        }
-
-        // Need to set all initial data for first frame.
-        ApplyAudioParams(component.Params, component);
-        component.Source.Global = component.Global;
-
-        // Don't play until first frame so occlusion etc. are correct.
-        component.Gain = 0f;
-
-        length ??= GetAudioLength(component.FileName);
-
-        // If audio came into range then start playback at the correct position.
-        var offset = (Timing.CurTime - component.AudioStart).TotalSeconds % length.Value.TotalSeconds;
-
-        if (offset > 0)
-        {
-            component.PlaybackPosition = (float) offset;
-        }
-    }
-
-    private void OnAudioShutdown(EntityUid uid, AudioComponent component, ComponentShutdown args)
-    {
-        // Breaks with prediction?
-        component.Source.Dispose();
-
-        RemoveAudioLimit(component.FileName);
-    }
-
-    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;
-        var localEntity = _playerManager.LocalEntity;
-        Vector2 listenerVelocity;
-
-        if (localEntity != null)
-            listenerVelocity = _physics.GetMapLinearVelocity(localEntity.Value);
-        else
-            listenerVelocity = Vector2.Zero;
-
-        _audio.SetVelocity(listenerVelocity);
-        _audio.SetRotation(eye.Rotation);
-        _audio.SetPosition(eye.Position.Position);
-
-        var ourPos = GetListenerCoordinates();
-
-        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
-        {
-            _updateAudioJob.OurPosition = ourPos;
-            _parMan.ProcessNow(_updateAudioJob, _streams.Count);
-        }
-        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 ((component.Flags & AudioFlags.GridAudio) != 0x0)
-        {
-            // 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 = VolumeToGain(component.Params.Volume);
-
-                // 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;
-        }
-
-        if (distance > 0f && distance < 0.01f)
-        {
-            worldPos = listener.Position;
-            delta = Vector2.Zero;
-            distance = 0f;
-        }
-
-        // 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 TryGetAudio(AudioStream stream, [NotNullWhen(true)] out AudioResource? audio)
-    {
-        if (_resourceCache.TryGetResource(stream, out audio))
-            return true;
-
-        Log.Error($"Server failed to play audio stream {stream.Title}.");
-        return false;
-    }
-
-    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>
-    public (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>
-    public (EntityUid Entity, AudioComponent Component)? PlayEntity(AudioStream stream, EntityUid entity, AudioParams? audioParams = null)
-    {
-        if (TerminatingOrDeleted(entity))
-        {
-            Log.Error($"Tried to play coordinates audio on a terminating / deleted entity {ToPrettyString(entity)}");
-            return 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>
-    public (EntityUid Entity, AudioComponent Component)? PlayStatic(AudioStream stream, EntityCoordinates coordinates, AudioParams? audioParams = null)
-    {
-        if (TerminatingOrDeleted(coordinates.EntityId))
-        {
-            Log.Error($"Tried to play coordinates audio on a terminating / deleted entity {ToPrettyString(coordinates.EntityId)}");
-            return 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);
-    }
-
-    public override void LoadStream<T>(Entity<AudioComponent> entity, T stream)
-    {
-        if (stream is AudioStream audioStream)
-        {
-            TryGetAudio(audioStream, out var audio);
-            SetupSource(entity, audio!, audioStream.Length);
-            entity.Comp.Loaded = true;
-        }
-    }
-
-    /// <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, null, audioP, stream.Length);
-        LoadStream((entity, comp), stream);
-        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;
-
-        // For server we will rely on the adjusted one but locally we will have to adjust it ourselves.
-        ApplyAudioParams(comp.Params, comp);
-        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 = GetAudioDistance(audioParams.MaxDistance);
-        source.ReferenceDistance = GetAudioDistance(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;
-    }
-
-    #region Jobs
-
-    private record struct UpdateAudioJob : IParallelRobustJob
-    {
-        public int BatchSize => 2;
-
-        public AudioSystem System;
-
-        public MapCoordinates OurPosition;
-        public List<(EntityUid Entity, AudioComponent Component, TransformComponent Xform)> Streams;
-
-        public void Execute(int index)
-        {
-            var comp = Streams[index];
-
-            System.ProcessStream(comp.Entity, comp.Component, comp.Xform, OurPosition);
-        }
-    }
-
-    #endregion
-}

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,111 +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 SetVelocity(Vector2 velocity)
-    {
-    }
-
-    /// <inheritdoc />
-    public void SetPosition(Vector2 position)
-    {
-    }
-
-    /// <inheritdoc />
-    public void SetRotation(Angle angle)
-    {
-    }
-
-    /// <inheritdoc />
-    public void SetMasterGain(float newGain)
-    {
-    }
-
-    /// <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 : IAudioManager
-{
-    void InitializePostWindowing();
-    void Shutdown();
-
-    /// <summary>
-    /// Flushes all pending queues for disposing of AL sources.
-    /// </summary>
-    void FlushALDisposeQueues();
-
-    /// <summary>
-    /// Returns a buffered audio source.
-    /// </summary>
-    /// <returns>null if unable to create the source.</returns>
-    IBufferedAudioSource? CreateBufferedAudioSource(int buffers, bool floatAudio=false);
-
-    /// <summary>
-    /// Sets the velocity for the audio listener.
-    /// </summary>
-    void SetVelocity(Vector2 velocity);
-
-    /// <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 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);
-}

Robust.Client/Audio/IAudioManager.cs

@@ -1,22 +0,0 @@
-using System;
-using System.IO;
-using Robust.Client.Audio.Sources;
-using Robust.Shared.Audio.Sources;
-
-namespace Robust.Client.Audio;
-
-/// <summary>
-/// Public audio API for stuff that can't go through <see cref="AudioSystem"/>
-/// </summary>
-public interface IAudioManager
-{
-    IAudioSource? CreateAudioSource(AudioStream stream);
-  
-    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 SetMasterGain(float gain);
-}

Robust.Client/Audio/Midi/IMidiManager.cs

@@ -17,9 +17,11 @@ public interface IMidiManager
     bool IsAvailable { get; }
 
     /// <summary>
-    ///     Gain of audio.
+    ///     Volume, in db.
     /// </summary>
-    float Gain { get; set; }
+    float Volume { get; set; }
+
+    public int OcclusionCollisionMask { get; set; }
 
     /// <summary>
     ///     This method tries to return a midi renderer ready to be used.

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,15 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using NFluidsynth;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
 using Robust.Shared;
 using Robust.Shared.Asynchronous;
 using Robust.Shared.Audio.Midi;
-using Robust.Shared.Collections;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Exceptions;
@@ -18,6 +19,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Threading;
@@ -31,19 +33,25 @@ internal sealed partial class MidiManager : IMidiManager
 {
     public const string SoundfontEnvironmentVariable = "ROBUST_SOUNDFONT_OVERRIDE";
 
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IResourceManager _resourceManager = default!;
+    private int _minRendererParallel;
+    private float _occlusionUpdateDelay;
+    private float _positionUpdateDelay;
+
+    [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
     {
@@ -70,32 +78,24 @@ internal sealed partial class MidiManager : IMidiManager
 
     [ViewVariables] private readonly List<IMidiRenderer> _renderers = new();
 
-    // To avoid lock contention until some kind of MIDI refactor.
-    private TimeSpan _nextUpdate;
-    private TimeSpan _updateFrequency = TimeSpan.FromSeconds(0.25f);
-
-    private SemaphoreSlim _updateSemaphore = new(1);
-
     private bool _alive = true;
     [ViewVariables] private Settings? _settings;
     private Thread? _midiThread;
     private ISawmill _midiSawmill = default!;
-    private float _gain = 0f;
+    private float _volume = 0f;
     private bool _volumeDirty = true;
 
     // Not reliable until Fluidsynth is initialized!
     [ViewVariables(VVAccess.ReadWrite)]
-    public float Gain
+    public float Volume
     {
-        get => _gain;
+        get => _volume;
         set
         {
-            var clamped = Math.Clamp(value, 0f, 1f);
-
-            if (MathHelper.CloseToPercent(_gain, clamped))
+            if (MathHelper.CloseToPercent(_volume, value))
                 return;
 
-            _cfgMan.SetCVar(CVars.MidiVolume, clamped);
+            _cfgMan.SetCVar(CVars.MidiVolume, value);
             _volumeDirty = true;
         }
     }
@@ -114,7 +114,7 @@ internal sealed partial class MidiManager : IMidiManager
         "/usr/share/sounds/sf2/TimGM6mb.sf2",
     };
 
-    private static readonly string WindowsSoundfont = $@"{Environment.GetEnvironmentVariable("SystemRoot")}\system32\drivers\gm.dls";
+    private const string WindowsSoundfont = @"C:\WINDOWS\system32\drivers\gm.dls";
 
     private const string OsxSoundfont =
         "/System/Library/Components/CoreAudio.component/Contents/Resources/gs_instruments.dls";
@@ -132,9 +132,10 @@ internal sealed partial class MidiManager : IMidiManager
 
     private NFluidsynth.Logger.LoggerDelegate _loggerDelegate = default!;
     private ISawmill _fluidsynthSawmill = default!;
+    private float _maxCastLength;
 
-    private MidiUpdateJob _updateJob;
-
+    [ViewVariables(VVAccess.ReadWrite)]
+    public int OcclusionCollisionMask { get; set; }
 
     public MidiManager()
     {
@@ -147,10 +148,19 @@ internal sealed partial class MidiManager : IMidiManager
 
         _cfgMan.OnValueChanged(CVars.MidiVolume, value =>
         {
-            _gain = value;
+            _volume = value;
             _volumeDirty = true;
         }, true);
 
+        _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;
@@ -192,12 +202,7 @@ internal sealed partial class MidiManager : IMidiManager
             _settings["synth.midi-bank-select"].StringValue = "gm";
             //_settings["synth.verbose"].IntValue = 1; // Useful for debugging.
 
-            var midiParallel = _cfgMan.GetCVar(CVars.MidiParallelism);
-            _settings["synth.polyphony"].IntValue = Math.Clamp(1024 + (int)(Math.Log2(midiParallel) * 2048), 1, 65535);
-            _settings["synth.cpu-cores"].IntValue = Math.Clamp(midiParallel, 1, 256);
-
-            _midiSawmill.Debug($"Synth Cores: {_settings["synth.cpu-cores"].IntValue}");
-            _midiSawmill.Debug($"Synth Polyphony: {_settings["synth.polyphony"].IntValue}");
+            _parallel.AddAndInvokeParallelCountChanged(UpdateParallelCount);
         }
         catch (Exception e)
         {
@@ -206,27 +211,32 @@ internal sealed partial class MidiManager : IMidiManager
             return;
         }
 
-        _midiThread = new Thread(ThreadUpdate)
-        {
-            Name = "RobustToolbox MIDI Thread"
-        };
+        _midiThread = new Thread(ThreadUpdate);
         _midiThread.Start();
 
-        _updateJob = new MidiUpdateJob()
-        {
-            Manager = this,
-            Renderers = _renderers,
-        };
-
-        _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;
     }
 
+    private void UpdateParallelCount()
+    {
+        if (_settings == null)
+            return;
+
+        _settings["synth.polyphony"].IntValue = Math.Clamp(1024 + (int)(Math.Log2(_parallel.ParallelProcessCount) * 2048), 1, 65535);
+        _settings["synth.cpu-cores"].IntValue = Math.Clamp(_parallel.ParallelProcessCount, 1, 256);
+
+        _midiSawmill.Debug($"Synth Cores: {_settings["synth.cpu-cores"].IntValue}");
+        _midiSawmill.Debug($"Synth Polyphony: {_settings["synth.polyphony"].IntValue}");
+    }
+
+    private void OnRaycastLengthChanged(float value)
+    {
+        _maxCastLength = value;
+    }
+
     private void LoggerDelegate(NFluidsynth.Logger.LogLevel level, string message, IntPtr data)
     {
         var rLevel = level switch
@@ -263,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.
@@ -341,7 +351,7 @@ internal sealed partial class MidiManager : IMidiManager
                 renderer.LoadSoundfont(file.ToString());
             }
 
-            renderer.Source.Gain = _gain;
+            renderer.Source.SetVolume(Volume);
 
             lock (_renderers)
             {
@@ -362,125 +372,112 @@ internal sealed partial class MidiManager : IMidiManager
             return;
         }
 
-        if (_nextUpdate > _timing.RealTime)
-            return;
-
-        _nextUpdate = _timing.RealTime + _updateFrequency;
-
-        // Update positions of streams occasionally.
+        // 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
 
-        _updateJob.OurPosition = _audioSys.GetListenerCoordinates();
+        lock (_renderers)
+        {
+            if (_renderers.Count == 0)
+                return;
 
-        // This semaphore is here to avoid lock contention as much as possible.
-        _updateSemaphore.Wait();
+            var transQuery = _entityManager.GetEntityQuery<TransformComponent>();
+            var physicsQuery = _entityManager.GetEntityQuery<PhysicsComponent>();
+            var opts = new ParallelOptions { MaxDegreeOfParallelism = _parallel.ParallelProcessCount };
 
-        // The ONLY time this should be contested is with ThreadUpdate.
-        // If that becomes NOT the case then just lock this, remove the semaphore, and drop the update frequency even harder.
-        // ReSharper disable once InconsistentlySynchronizedField
-        _parallel.ProcessNow(_updateJob, _renderers.Count);
+            if (_renderers.Count > _minRendererParallel)
+            {
+                Parallel.ForEach(_renderers, opts, renderer => UpdateRenderer(renderer, transQuery, physicsQuery));
+            }
+            else
+            {
+                foreach (var renderer in _renderers)
+                {
+                    UpdateRenderer(renderer, transQuery, physicsQuery);
+                }
+            }
 
-        _updateSemaphore.Release();
+        }
+
+        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.Gain = Gain;
-            }
+                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 || mapPos.MapId != listener.MapId)
+            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.Gain = Gain;
-            }
+                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;
-            }
-
-            // Same imprecision suppression as audiosystem.
-            if (distance > 0f && distance < 0.01f)
-            {
-                worldPos = listener.Position;
-                delta = Vector2.Zero;
-                distance = 0f;
-            }
-
-            renderer.Source.Position = worldPos;
-
-            // Update velocity (doppler).
-            if (!_entityManager.Deleted(renderer.TrackingEntity))
-            {
-                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>
@@ -492,39 +489,21 @@ internal sealed partial class MidiManager : IMidiManager
         {
             lock (_renderers)
             {
-                var toRemove = new ValueList<IMidiRenderer>();
-
                 for (var i = 0; i < _renderers.Count; i++)
                 {
                     var renderer = _renderers[i];
-
-                    lock (renderer)
+                    if (!renderer.Disposed)
                     {
-                        if (!renderer.Disposed)
-                        {
-                            if (renderer.Master is { Disposed: true })
-                                renderer.Master = null;
+                        if (renderer.Master is { Disposed: true })
+                            renderer.Master = null;
 
-                            renderer.Render();
-                        }
-                        else
-                        {
-                            toRemove.Add(renderer);
-                        }
+                        renderer.Render();
                     }
-                }
-
-                if (toRemove.Count > 0)
-                {
-                    _updateSemaphore.Wait();
-
-                    foreach (var renderer in toRemove)
+                    else
                     {
                         renderer.InternalDispose();
                         _renderers.Remove(renderer);
                     }
-
-                    _updateSemaphore.Release();
                 }
             }
 
@@ -695,31 +674,4 @@ internal sealed partial class MidiManager : IMidiManager
 
         }
     }
-
-    #region Jobs
-
-    private record struct MidiUpdateJob : IParallelRobustJob
-    {
-        public int MinimumBatchParallel => 2;
-
-        public int BatchSize => 1;
-
-        public MidiManager Manager;
-
-        public MapCoordinates OurPosition;
-        public List<IMidiRenderer> Renderers;
-
-        public void Execute(int index)
-        {
-            // The indices shouldn't be able to be touched while this job is running, just the renderer itself getting locked.
-            var renderer = Renderers[index];
-
-            lock (renderer)
-            {
-                Manager.UpdateRenderer(renderer, OurPosition);
-            }
-        }
-    }
-
-    #endregion
 }

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;
@@ -38,7 +36,6 @@ internal sealed class MidiRenderer : IMidiRenderer
     private readonly Synth _synth;
     private readonly Sequencer _sequencer;
     private NFluidsynth.Player? _player;
-    private int _playerTotalTicks;
     private MidiDriver? _driver;
     private byte _midiProgram = 1;
     private byte _midiBank = 1;
@@ -55,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;
@@ -145,21 +142,7 @@ internal sealed class MidiRenderer : IMidiRenderer
     public bool DisableProgramChangeEvent { get; set; } = true;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public int PlayerTotalTick
-    {
-        get
-        {
-            // GetTotalTicks is really expensive (has to iterate the entire file, not cached).
-            // Slight problem with caching it ourselves: the value only becomes available when the player loads the MIDI file.
-            // And that only happens after playback really starts, with the timer and synth and all that stuff.
-            // So we cache it "as soon as it's available", i.e. not 0.
-            // We don't care about playlists and such, so it shouldn't change anymore after.
-            if (_playerTotalTicks != 0)
-                return _playerTotalTicks;
-
-            return _playerTotalTicks = _player?.GetTotalTicks ?? 0;
-        }
-    }
+    public int PlayerTotalTick => _player?.GetTotalTicks ?? 0;
 
     [ViewVariables(VVAccess.ReadWrite)]
     public int PlayerTick
@@ -264,13 +247,13 @@ 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;
         _midiSawmill = midiSawmill;
 
-        Source = clydeAudio.CreateBufferedAudioSource(Buffers, true) ?? DummyBufferedAudioSource.Instance;
+        Source = clydeAudio.CreateBufferedAudioSource(Buffers, true);
         Source.SampleRate = SampleRate;
         _settings = settings;
         _soundFontLoader = soundFontLoader;
@@ -354,7 +337,6 @@ internal sealed class MidiRenderer : IMidiRenderer
                 return false;
             }
 
-            _playerTotalTicks = 0;
             _player?.Dispose();
             _player = new NFluidsynth.Player(_synth);
             _player.SetPlaybackCallback(MidiPlayerEventHandler);
@@ -393,7 +375,6 @@ internal sealed class MidiRenderer : IMidiRenderer
             _player?.Join();
             _player?.Dispose();
             _player = null;
-            _playerTotalTicks = 0;
         }
 
         StopAllNotes();
@@ -507,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,415 +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;
-
-public 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;
-
-    internal readonly AudioManager Master;
-
-    /// <summary>
-    /// Prior gain that was set.
-    /// </summary>
-    private float _gain;
-
-    private float _occlusion;
-
-    private bool IsEfxSupported => Master.IsEfxSupported;
-
-    internal BaseAudioSource(AudioManager master, int sourceHandle)
-    {
-        Master = master;
-        SourceHandle = sourceHandle;
-        AL.GetSource(SourceHandle, ALSourcef.Gain, out _gain);
-    }
-
-    /// <inheritdoc />
-    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 void Restart()
-    {
-        AL.SourceRewind(SourceHandle);
-        StartPlaying();
-    }
-
-    /// <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
-        {
-            _checkDisposed();
-            AL.GetSource(SourceHandle, ALSourcef.Pitch, out var value);
-            Master._checkAlError();
-            return value;
-        }
-        set
-        {
-            _checkDisposed();
-            AL.Source(SourceHandle, ALSourcef.Pitch, value);
-            Master._checkAlError();
-        }
-    }
-
-    /// <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);
-                // Default to 0 to avoid spiking audio, just means it will be muted for a frame in this case.
-                priorOcclusion = _gain == 0 ? 1f : priorGain / _gain;
-            }
-
-            _gain = value;
-            AL.Source(SourceHandle, ALSourcef.Gain, _gain * priorOcclusion);
-            Master.LogALError($"Gain is {_gain:0.00} and priorOcclusion is {priorOcclusion:0.00}. EFX supported: {IsEfxSupported}");
-        }
-    }
-
-    /// <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.LogALError($"MaxDistance is {value:0.00}");
-        }
-    }
-
-    /// <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.LogALError($"RolloffFactor is {value:0.00}");
-        }
-    }
-
-    /// <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.LogALError($"ReferenceDistance is {value:0.00}");
-        }
-    }
-
-    /// <inheritdoc />
-    public float Occlusion
-    {
-        get => _occlusion;
-        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);
-            }
-
-            _occlusion = value;
-            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($"Tried to set invalid playback position of {value:0.00}");
-        }
-    }
-
-    /// <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();
-        }
-    }
-
-    void IAudioSource.SetAuxiliary(IAuxiliaryAudio? audio)
-    {
-        _checkDisposed();
-        if (!IsEfxSupported)
-            return;
-
-        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,222 +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;
-
-    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;
-    }
-
-    /// <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);
         }
@@ -229,7 +237,7 @@ namespace Robust.Client
 
             // Don't invoke PlayerLeaveServer if PlayerJoinedServer & GameStartedSetup hasn't been called yet.
             if (RunLevel > ClientRunLevel.Connecting)
-                PlayerLeaveServer?.Invoke(this, new PlayerEventArgs(_playMan.LocalSession));
+                PlayerLeaveServer?.Invoke(this, new PlayerEventArgs(_playMan.LocalPlayer?.Session));
 
             LastDisconnectReason = args.Reason;
             GameStoppedReset();
@@ -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,8 +107,8 @@ namespace Robust.Client
                     deps.Register<IClyde, ClydeHeadless>();
                     deps.Register<IClipboardManager, ClydeHeadless>();
                     deps.Register<IClydeInternal, ClydeHeadless>();
-                    deps.Register<IAudioManager, HeadlessAudioManager>();
-                    deps.Register<IAudioInternal, HeadlessAudioManager>();
+                    deps.Register<IClydeAudio, ClydeAudioHeadless>();
+                    deps.Register<IClydeAudioInternal, ClydeAudioHeadless>();
                     deps.Register<IInputManager, InputManager>();
                     deps.Register<IFileDialogManager, DummyFileDialogManager>();
                     deps.Register<IUriOpener, UriOpenerDummy>();
@@ -117,8 +117,8 @@ namespace Robust.Client
                     deps.Register<IClyde, Clyde>();
                     deps.Register<IClipboardManager, Clyde>();
                     deps.Register<IClydeInternal, Clyde>();
-                    deps.Register<IAudioManager, AudioManager>();
-                    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.Completions.cs

@@ -8,7 +8,7 @@ using Robust.Shared.Network.Messages;
 
 namespace Robust.Client.Console;
 
-internal partial class ClientConsoleHost
+internal sealed partial class ClientConsoleHost
 {
     private readonly Dictionary<int, PendingCompletion> _completionsPending = new();
     private int _completionSeq;

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;
@@ -47,8 +47,7 @@ namespace Robust.Client.Console
     }
 
     /// <inheritdoc cref="IClientConsoleHost" />
-    [Virtual]
-    internal partial class ClientConsoleHost : ConsoleHost, IClientConsoleHost, IConsoleHostInternal, IPostInjectInit
+    internal sealed partial class ClientConsoleHost : ConsoleHost, IClientConsoleHost, IConsoleHostInternal, IPostInjectInit
     {
         [Dependency] private readonly IClientConGroupController _conGroup = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
@@ -188,7 +187,7 @@ namespace Robust.Client.Console
             }
 
             args.RemoveAt(0);
-            var shell = new ConsoleShell(this, session ?? _player.LocalSession, session == null);
+            var shell = new ConsoleShell(this, session ?? _player.LocalPlayer?.Session, session == null);
             var cmdArgs = args.ToArray();
 
             AnyCommandExecuted?.Invoke(shell, commandName, command, cmdArgs);
@@ -200,7 +199,8 @@ namespace Robust.Client.Console
             // When not connected to a server, you can run all local commands.
             // When connected to a server, you can only run commands according to the con group controller.
 
-            return _player.LocalSession is not { Status: > SessionStatus.Connecting }
+            return _player.LocalPlayer == null
+                   || _player.LocalPlayer.Session.Status <= SessionStatus.Connecting
                    || _conGroup.CanCommand(cmdName);
         }
 

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/ClientSpawnCommand.cs

@@ -16,7 +16,8 @@ namespace Robust.Client.Console.Commands
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            if (_playerManager.LocalEntity is not { } controlled)
+            var controlled = _playerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
+            if (controlled == EntityUid.Invalid)
             {
                 shell.WriteLine("You don't have an attached entity.");
                 return;

Robust.Client/Console/Commands/Debug.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Runtime;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -16,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;
@@ -199,7 +197,6 @@ namespace Robust.Client.Console.Commands
         }
     }
 
-#if DEBUG
     internal sealed class ShowRayCommand : LocalizedCommands
     {
         [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
@@ -226,7 +223,6 @@ namespace Robust.Client.Console.Commands
             mgr.DebugRayLifetime = TimeSpan.FromSeconds(duration);
         }
     }
-#endif
 
     internal sealed class DisconnectCommand : LocalizedCommands
     {
@@ -462,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)
             {
@@ -495,9 +491,9 @@ namespace Robust.Client.Console.Commands
             }
         }
 
-        internal static List<MemberInfo> GetAllMembers(Control control)
+        internal static List<(string, string)> PropertyValuesFor(Control control)
         {
-            var members = new List<MemberInfo>();
+            var members = new List<(string, string)>();
             var type = control.GetType();
 
             foreach (var fieldInfo in type.GetAllFields())
@@ -507,7 +503,7 @@ namespace Robust.Client.Console.Commands
                     continue;
                 }
 
-                members.Add(fieldInfo);
+                members.Add((fieldInfo.Name, fieldInfo.GetValue(control)?.ToString() ?? "null"));
             }
 
             foreach (var propertyInfo in type.GetAllProperties())
@@ -517,19 +513,7 @@ namespace Robust.Client.Console.Commands
                     continue;
                 }
 
-                members.Add(propertyInfo);
-            }
-
-            return members;
-        }
-
-        internal static List<(string, string)> PropertyValuesFor(Control control)
-        {
-            var members = new List<(string, string)>();
-
-            foreach (var fieldInfo in GetAllMembers(control))
-            {
-                members.Add((fieldInfo.Name, fieldInfo.GetValue(control)?.ToString() ?? "null"));
+                members.Add((propertyInfo.Name, propertyInfo.GetValue(control)?.ToString() ?? "null"));
             }
 
             foreach (var (attachedProperty, value) in control.AllAttachedProperties)
@@ -541,35 +525,6 @@ namespace Robust.Client.Console.Commands
             members.Sort((a, b) => string.Compare(a.Item1, b.Item1, StringComparison.Ordinal));
             return members;
         }
-
-        internal static Dictionary<string, List<(string, string)>> PropertyValuesForInheritance(Control control)
-        {
-            var returnVal = new Dictionary<string, List<(string, string)>>();
-            var engine = typeof(Control).Assembly;
-
-            foreach (var member in GetAllMembers(control))
-            {
-                var type = member.DeclaringType!;
-                var cname = type.Assembly == engine ? type.Name : type.ToString();
-
-                if (type != typeof(Control))
-                    cname = $"Control > {cname}";
-
-                returnVal.GetOrNew(cname).Add((member.Name, member.GetValue(control)?.ToString() ?? "null"));
-            }
-
-            foreach (var (attachedProperty, value) in control.AllAttachedProperties)
-            {
-                var cname = $"Attached > {attachedProperty.OwningType.Name}";
-                returnVal.GetOrNew(cname).Add((attachedProperty.Name, value?.ToString() ?? "null"));
-            }
-
-            foreach (var v in returnVal.Values)
-            {
-                v.Sort((a, b) => string.Compare(a.Item1, b.Item1, StringComparison.Ordinal));
-            }
-            return returnVal;
-        }
     }
 
     internal sealed class SetClipboardCommand : LocalizedCommands
@@ -689,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";
@@ -701,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")
@@ -725,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();
                         }
@@ -776,7 +730,7 @@ namespace Robust.Client.Console.Commands
                                     {
                                         try
                                         {
-                                            _cache.ReloadResource<ShaderSourceResource>(resPath);
+                                            resC.ReloadResource<ShaderSourceResource>(resPath);
                                             shell.WriteLine($"Reloaded shader: {resPath}");
                                         }
                                         catch (Exception)
@@ -837,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/Console/Commands/ProfileEntitySpawningCommand.cs

@@ -43,7 +43,6 @@ public sealed class ProfileEntitySpawningCommand : IConsoleCommand
 
         GC.Collect();
 
-        Span<EntityUid> ents = stackalloc EntityUid[amount];
         var stopwatch = new Stopwatch();
         stopwatch.Start();
 
@@ -51,17 +50,12 @@ public sealed class ProfileEntitySpawningCommand : IConsoleCommand
 
         for (var i = 0; i < amount; i++)
         {
-            ents[i] = _entities.SpawnEntity(prototype, MapCoordinates.Nullspace);
+            _entities.SpawnEntity(prototype, MapCoordinates.Nullspace);
         }
 
         MeasureProfiler.SaveData();
 
         shell.WriteLine($"Client: Profiled spawning {amount} entities in {stopwatch.Elapsed.TotalMilliseconds:N3} ms");
-
-        foreach (var ent in ents)
-        {
-            _entities.DeleteEntity(ent);
-        }
     }
 }
 #endif

Robust.Client/Console/Commands/UITestCommand.cs

@@ -165,7 +165,7 @@ Suspendisse hendrerit blandit urna ut laoreet. Suspendisse ac elit at erat males
     {
         var textEdit = new TextEdit
         {
-            Placeholder = new Rope.Leaf("You deleted the lipsum\nOwO")
+            Placeholder = new Rope.Leaf("You deleted the lipsum OwO")
         };
         TabContainer.SetTabTitle(textEdit, "TextEdit");
 

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++;
@@ -420,7 +409,7 @@ namespace Robust.Client.Debugging
                 if (mapPos.MapId != args.MapId)
                     return;
 
-                var player = _playerManager.LocalEntity;
+                var player = _playerManager.LocalPlayer?.ControlledEntity;
 
                 if (!_entityManager.TryGetComponent<TransformComponent>(player, out var playerXform) ||
                     playerXform.MapID != args.MapId)
@@ -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/Debugging/DebugRayDrawingSystem.cs

@@ -4,17 +4,18 @@ using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Debugging;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
+using Robust.Shared.Physics;
 using Robust.Shared.Timing;
 
 namespace Robust.Client.Debugging
 {
     internal sealed class DebugRayDrawingSystem : SharedDebugRayDrawingSystem
     {
-#if DEBUG
         [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] private readonly IGameTiming _gameTimer = default!;
 
@@ -27,8 +28,6 @@ namespace Robust.Client.Debugging
             public Vector2 RayHit;
             public TimeSpan LifeTime;
             public bool DidActuallyHit;
-            public bool Server;
-            public MapId Map;
         }
 
         public bool DebugDrawRays
@@ -74,8 +73,7 @@ namespace Robust.Client.Debugging
                 DidActuallyHit = ev.Results != null,
                 RayOrigin = ev.Ray.Position,
                 RayHit = ev.Results?.HitPos ?? ev.Ray.Direction * ev.MaxLength + ev.Ray.Position,
-                LifeTime = _gameTimer.RealTime + DebugRayLifetime,
-                Map = ev.Map
+                LifeTime = _gameTimer.RealTime + DebugRayLifetime
             };
 
             _raysWithLifeTime.Add(newRayWithLifetime);
@@ -95,9 +93,7 @@ namespace Robust.Client.Debugging
                 DidActuallyHit = msg.DidHit,
                 RayOrigin = msg.RayOrigin,
                 RayHit = msg.RayHit,
-                LifeTime = _gameTimer.RealTime + DebugRayLifetime,
-                Server = true,
-                Map = msg.Map
+                LifeTime = _gameTimer.RealTime + DebugRayLifetime
             };
 
             _raysWithLifeTime.Add(newRayWithLifetime);
@@ -118,20 +114,10 @@ namespace Robust.Client.Debugging
                 var handle = args.WorldHandle;
                 foreach (var ray in _owner._raysWithLifeTime)
                 {
-                    if (args.MapId != ray.Map)
-                        continue;
-
-                    Color color;
-                    if (ray.Server)
-                        color = ray.DidActuallyHit ? Color.Cyan : Color.Orange;
-                    else
-                        color = ray.DidActuallyHit ? Color.Blue : Color.Red;
-
                     handle.DrawLine(
                         ray.RayOrigin,
                         ray.RayHit,
-                        color
-                        );
+                        ray.DidActuallyHit ? Color.Yellow : Color.Magenta);
                 }
             }
 
@@ -142,6 +128,5 @@ namespace Robust.Client.Debugging
                 _owner._raysWithLifeTime.RemoveAll(r => r.LifeTime < _owner._gameTimer.RealTime);
             }
         }
-#endif
     }
 }

Robust.Client/FodyWeavers.xsd

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="InlineIL" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="SequencePoints">
+              <xs:annotation>
+                <xs:documentation>Defines if sequence points should be generated for each emitted IL instruction. Default value: Debug</xs:documentation>
+              </xs:annotation>
+              <xs:simpleType>
+                <xs:restriction base="xs:string">
+                  <xs:enumeration value="Debug">
+                    <xs:annotation>
+                      <xs:documentation>Insert sequence points in Debug builds only (this is the default).</xs:documentation>
+                    </xs:annotation>
+                  </xs:enumeration>
+                  <xs:enumeration value="Release">
+                    <xs:annotation>
+                      <xs:documentation>Insert sequence points in Release builds only.</xs:documentation>
+                    </xs:annotation>
+                  </xs:enumeration>
+                  <xs:enumeration value="True">
+                    <xs:annotation>
+                      <xs:documentation>Always insert sequence points.</xs:documentation>
+                    </xs:annotation>
+                  </xs:enumeration>
+                  <xs:enumeration value="False">
+                    <xs:annotation>
+                      <xs:documentation>Never insert sequence points.</xs:documentation>
+                    </xs:annotation>
+                  </xs:enumeration>
+                </xs:restriction>
+              </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="Warnings">
+              <xs:annotation>
+                <xs:documentation>Defines how warnings should be handled. Default value: Warnings</xs:documentation>
+              </xs:annotation>
+              <xs:simpleType>
+                <xs:restriction base="xs:string">
+                  <xs:enumeration value="Warnings">
+                    <xs:annotation>
+                      <xs:documentation>Emit build warnings (this is the default).</xs:documentation>
+                    </xs:annotation>
+                  </xs:enumeration>
+                  <xs:enumeration value="Ignore">
+                    <xs:annotation>
+                      <xs:documentation>Do not emit warnings.</xs:documentation>
+                    </xs:annotation>
+                  </xs:enumeration>
+                  <xs:enumeration value="Errors">
+                    <xs:annotation>
+                      <xs:documentation>Treat warnings as errors.</xs:documentation>
+                    </xs:annotation>
+                  </xs:enumeration>
+                </xs:restriction>
+              </xs:simpleType>
+            </xs:attribute>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

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;
@@ -35,6 +34,8 @@ namespace Robust.Client
                 throw new InvalidOperationException("Cannot start twice!");
             }
 
+            GlibcBug.Check();
+
             _hasStarted = true;
 
             if (CommandLineArgs.TryParse(args, out var parsed))
@@ -69,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))
@@ -107,15 +87,9 @@ namespace Robust.Client
                 {
                     IsBackground = false,
                     Priority = priority,
-                    Name = "Game thread"
+                    Name = "Game thread",
                 };
 
-                if (OperatingSystem.IsWindows())
-                {
-                    // Necessary for CEF to not complain when using CEF debug binaries.
-                    _gameThread.SetApartmentState(ApartmentState.STA);
-                }
-
                 _gameThread.Start();
 
                 // Will block until game exit
@@ -138,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,12 +111,11 @@ namespace Robust.Client
             DebugTools.AssertNotNull(_resourceManifest);
 
             _clyde.InitializePostWindowing();
-            _audio.InitializePostWindowing();
+            _clydeAudio.InitializePostWindowing();
             _clyde.SetWindowTitle(
                 Options.DefaultWindowTitle ?? _resourceManifest!.DefaultWindowTitle ?? "RobustToolbox");
 
             _taskManager.Initialize();
-            _parallelMgr.Initialize();
             _fontManager.SetFontDpi((uint)_configurationManager.GetCVar(CVars.DisplayFontDpi));
 
             // Load optional Robust modules.
@@ -152,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"));
 
@@ -291,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,
@@ -361,15 +429,16 @@ namespace Robust.Client
 
             ProfileOptSetup.Setup(_configurationManager);
 
+            _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.Network.cs

@@ -42,8 +42,6 @@ public sealed partial class ClientEntityManager
         var pending = PendingNetEntityStates.GetOrNew(nEntity);
         pending.Add((typeof(T), callerEntity));
 
-
-
         return entity.Item1;
     }
 

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;
@@ -8,7 +9,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
-using Robust.Shared.Player;
 using Robust.Shared.Replays;
 using Robust.Shared.Utility;
 
@@ -68,7 +68,7 @@ namespace Robust.Client.GameObjects
 
         public override void QueueDeleteEntity(EntityUid? uid)
         {
-            if (uid == null || uid == EntityUid.Invalid)
+            if (uid == null)
                 return;
 
             if (IsClientSide(uid.Value))
@@ -86,73 +86,36 @@ 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);
         }
 
-        /// <inheritdoc />
-        public override void Dirty<T1, T2>(Entity<T1, T2> ent, MetaDataComponent? meta = null)
+        public override EntityStringRepresentation ToPrettyString(EntityUid uid, MetaDataComponent? metaDataComponent = null)
         {
-            if (_gameTiming.InPrediction)
-                base.Dirty(ent, meta);
-        }
+            if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+                return base.ToPrettyString(uid) with { Session = _playerManager.LocalPlayer.Session };
 
-        /// <inheritdoc />
-        public override void Dirty<T1, T2, T3>(Entity<T1, T2, T3> ent, MetaDataComponent? meta = null)
-        {
-            if (_gameTiming.InPrediction)
-                base.Dirty(ent, meta);
-        }
-
-        /// <inheritdoc />
-        public override void Dirty<T1, T2, T3, T4>(Entity<T1, T2, T3, T4> ent, MetaDataComponent? meta = null)
-        {
-            if (_gameTiming.InPrediction)
-                base.Dirty(ent, meta);
+            return base.ToPrettyString(uid);
         }
 
         public override void RaisePredictiveEvent<T>(T msg)
         {
-            var session = _playerManager.LocalSession;
-            DebugTools.AssertNotNull(session);
+            var localPlayer = _playerManager.LocalPlayer;
+            DebugTools.AssertNotNull(localPlayer);
 
             var sequence = _stateMan.SystemMessageDispatched(msg);
             EntityNetManager?.SendSystemNetworkMessage(msg, sequence);
 
             DebugTools.Assert(!_stateMan.IsPredictionEnabled || _gameTiming.InPrediction && _gameTiming.IsFirstTimePredicted || _client.RunLevel != ClientRunLevel.Connected);
 
-            var eventArgs = new EntitySessionEventArgs(session!);
+            var eventArgs = new EntitySessionEventArgs(localPlayer!.Session);
             EventBus.RaiseEvent(EventSource.Local, msg);
             EventBus.RaiseEvent(EventSource.Local, new EntitySessionMessage<T>(eventArgs, msg));
         }
 
-        /// <inheritdoc />
-        public override void RaiseSharedEvent<T>(T message, EntityUid? user = null)
-        {
-            if (user == null || user != _playerManager.LocalEntity || !_gameTiming.IsFirstTimePredicted)
-                return;
-
-            EventBus.RaiseEvent(EventSource.Local, ref message);
-        }
-
-        /// <inheritdoc />
-        public override void RaiseSharedEvent<T>(T message, ICommonSession? user = null)
-        {
-            if (user == null || user != _playerManager.LocalSession || !_gameTiming.IsFirstTimePredicted)
-                return;
-
-            EventBus.RaiseEvent(EventSource.Local, ref message);
-        }
-
         #region IEntityNetworkManager impl
 
         public override IEntityNetworkManager EntityNetManager => this;
@@ -202,7 +165,7 @@ namespace Robust.Client.GameObjects
         }
 
         /// <inheritdoc />
-        public void SendSystemNetworkMessage(EntityEventArgs message, INetChannel? channel)
+        public void SendSystemNetworkMessage(EntityEventArgs message, INetChannel channel)
         {
             throw new NotSupportedException();
         }
@@ -240,7 +203,7 @@ namespace Robust.Client.GameObjects
         public void DispatchReceivedNetworkMsg(EntityEventArgs msg)
         {
             var sessionType = typeof(EntitySessionMessage<>).MakeGenericType(msg.GetType());
-            var sessionMsg = Activator.CreateInstance(sessionType, new EntitySessionEventArgs(_playerManager.LocalSession!), msg)!;
+            var sessionMsg = Activator.CreateInstance(sessionType, new EntitySessionEventArgs(_playerManager.LocalPlayer!.Session), msg)!;
             ReceivedSystemMessage?.Invoke(this, msg);
             ReceivedSystemMessage?.Invoke(this, sessionMsg);
         }

Robust.Client/GameObjects/ComponentStateApplyException.cs

@@ -18,5 +18,11 @@ namespace Robust.Client.GameObjects
         public ComponentStateApplyException(string message, Exception inner) : base(message, inner)
         {
         }
+
+        protected ComponentStateApplyException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
     }
 }

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/Components/Renderable/SpriteComponent.cs

@@ -319,7 +319,6 @@ namespace Robust.Client.GameObjects
                         Scale = Vector2.One,
                         Visible = true,
                         RenderingStrategy = LayerRenderingStrategy.UseSpriteStrategy,
-                        Cycle = false,
                     });
                     state = null;
                     texture = null;
@@ -795,7 +794,6 @@ namespace Robust.Client.GameObjects
             }
 
             layer.RenderingStrategy = layerDatum.RenderingStrategy ?? layer.RenderingStrategy;
-            layer.Cycle = layerDatum.Cycle;
 
             layer.Color = layerDatum.Color ?? layer.Color;
             layer._rotation = layerDatum.Rotation ?? layer._rotation;
@@ -1517,19 +1515,6 @@ namespace Robust.Client.GameObjects
             [ViewVariables] public float AnimationTime;
             [ViewVariables] public int AnimationFrame;
 
-            /// <summary>
-            /// Is the animation currently playing in reverse.
-            /// </summary>
-            [ViewVariables] public bool Reversed { get; internal set; }
-
-            /// <summary>
-            /// If every animation delay finishes do we reverse it.
-            /// </summary>
-            /// <remarks>
-            /// Only applies if the state is auto-animated.
-            /// </remarks>
-            [ViewVariables] public bool Cycle;
-
             private RSI.State? _actualState;
             [ViewVariables] public RSI.State? ActualState => _actualState;
 
@@ -2048,49 +2033,15 @@ namespace Robust.Client.GameObjects
 
             internal void AdvanceFrameAnimation(RSI.State state)
             {
-                // Can't advance frames without more than 1 delay which is already checked above.
                 var delayCount = state.DelayCount;
                 while (AnimationTimeLeft < 0)
                 {
-                    if (Reversed)
+                    AnimationFrame += 1;
+
+                    if (AnimationFrame >= delayCount)
                     {
-                        AnimationFrame -= 1;
-
-                        // Animation finished, do we cycle back to positive or reset.
-                        if (AnimationFrame < 0)
-                        {
-                            if (Cycle)
-                            {
-                                AnimationFrame = 1;
-                                Reversed = false;
-                            }
-                            else
-                            {
-                                AnimationFrame = delayCount - 1;
-                            }
-
-                            AnimationTime = -AnimationTimeLeft;
-                        }
-                    }
-                    else
-                    {
-                        AnimationFrame += 1;
-
-                        // Animation finished, do we reverse or reset.
-                        if (AnimationFrame >= delayCount)
-                        {
-                            if (Cycle)
-                            {
-                                AnimationFrame = delayCount - 2;
-                                Reversed = true;
-                            }
-                            else
-                            {
-                                AnimationFrame = 0;
-                            }
-
-                            AnimationTime = -AnimationTimeLeft;
-                        }
+                        AnimationFrame = 0;
+                        AnimationTime = -AnimationTimeLeft;
                     }
 
                     AnimationTimeLeft += state.GetDelay(AnimationFrame);

Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs

@@ -1,19 +1,22 @@
-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;
 
 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 +38,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 +78,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 +89,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 +116,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);
@@ -143,13 +140,13 @@ namespace Robust.Client.GameObjects
                     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)}");
+                        _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 +175,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);
+    }
+}