Version: 226.2.2

frick me

(cherry picked from commit 0284eb0430)

.github/workflows/build-docfx.yml

@@ -5,30 +5,30 @@ on:
     - cron: "0 0 * * 0"
 jobs:
   docfx:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+   runs-on: ubuntu-latest
+   steps:
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
 
-      - name: Install dependencies
-        run: dotnet restore
+    - name: Install dependencies
+      run: dotnet restore
 
-      - name: Build Project
-        run: dotnet build --no-restore /p:WarningsAsErrors=nullable
+    - name: Build Project
+      run: dotnet build --no-restore /p:WarningsAsErrors=nullable
 
-      - name: Build DocFX
-        uses: nikeee/docfx-action@v1.0.0
-        with:
-          args: Robust.Docfx/docfx.json
+    - name: Build DocFX
+      uses: nikeee/docfx-action@v1.0.0
+      with:
+        args: Robust.Docfx/docfx.json
 
-      - name: Publish Docfx Documentation on GitHub Pages
-        uses: maxheld83/ghpages@master
-        env:
-          BUILD_DIR: Robust.Docfx/_robust-site
-          GH_PAT: ${{ secrets.GH_PAT }}
+    - name: Publish Docfx Documentation on GitHub Pages
+      uses: maxheld83/ghpages@master
+      env:
+        BUILD_DIR: Robust.Docfx/_robust-site
+        GH_PAT: ${{ secrets.GH_PAT }}

.github/workflows/build-test.yml

@@ -2,32 +2,33 @@ name: Build & Test
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest] # , macos-latest] - temporarily disabled due to libfreetype.dll errors.
+        os: [ubuntu-latest, windows-latest ] # , macos-latest] - temporarily disabled due to libfreetype.dll errors.
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore /p:WarningsAsErrors=nullable
+    - name: Robust.UnitTesting
+      run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
+    - name: Robust.Analyzers.Tests
+      run: dotnet test --no-build Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj -- NUnit.ConsoleOut=0
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --no-restore /p:WarningsAsErrors=nullable
-      - name: Robust.UnitTesting
-        run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
-      - name: Robust.Analyzers.Tests
-        run: dotnet test --no-build Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj -- NUnit.ConsoleOut=0

.github/workflows/codeql-analysis.yml

@@ -11,8 +11,14 @@
 #
 name: "CodeQL"
 
-on:
-  workflow_dispatch
+#on:
+#  push:
+#    branches: [ master ]
+#  pull_request:
+#    # The branches below must be a subset of the branches above
+#    branches: [ master ]
+#  schedule:
+#    - cron: '30 18 * * 6'
 
 jobs:
   analyze:
@@ -22,50 +28,50 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["csharp"]
+        language: [ 'csharp' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+    - name: Checkout repository
+      uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 7.0.x
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 7.0.x
 
-      - name: Build
-        run: dotnet build
+    - name: Build
+      run: dotnet build
 
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
 
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
 
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
 
-      #- run: |
-      #   make bootstrap
-      #   make release
+    #- run: |
+    #   make bootstrap
+    #   make release
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/publish-client.yml

@@ -3,50 +3,51 @@
 on:
   push:
     tags:
-      - "v*"
+    - 'v*'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Parse version
-        id: parse_version
-        shell: pwsh
-        run: |
-          $ver = [regex]::Match($env:GITHUB_REF, "refs/tags/v?(.+)").Groups[1].Value
-          echo ("::set-output name=version::{0}" -f $ver)
+    - name: Parse version
+      id: parse_version
+      shell: pwsh
+      run: |
+        $ver = [regex]::Match($env:GITHUB_REF, "refs/tags/v?(.+)").Groups[1].Value
+        echo ("::set-output name=version::{0}" -f $ver)
 
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
 
-      - name: Package client
-        run: Tools/package_client_build.py -p windows mac linux
+    - name: Package client
+      run: Tools/package_client_build.py -p windows mac linux
 
-      - name: Shuffle files around
-        run: |
-          mkdir "release/${{ steps.parse_version.outputs.version }}"
-          mv release/*.zip "release/${{ steps.parse_version.outputs.version }}"
+    - name: Shuffle files around
+      run: |
+        mkdir "release/${{ steps.parse_version.outputs.version }}"
+        mv release/*.zip "release/${{ steps.parse_version.outputs.version }}"
 
-      - name: Upload files to Suns
-        uses: appleboy/scp-action@master
-        with:
-          host: suns.spacestation14.com
-          username: robust-build-push
-          key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
-          source: "release/${{ steps.parse_version.outputs.version }}"
-          target: "/var/lib/robust-builds/builds/"
-          strip_components: 1
+    - name: Upload files to Suns
+      uses: appleboy/scp-action@master
+      with:
+        host: suns.spacestation14.com
+        username: robust-build-push
+        key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
+        source: "release/${{ steps.parse_version.outputs.version }}"
+        target: "/var/lib/robust-builds/builds/"
+        strip_components: 1
+
+    - name: Update manifest JSON
+      uses: appleboy/ssh-action@master
+      with:
+        host: suns.spacestation14.com
+        username: robust-build-push
+        key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
+        script: /home/robust-build-push/push.ps1 ${{ steps.parse_version.outputs.version }}
 
-      - name: Update manifest JSON
-        uses: appleboy/ssh-action@master
-        with:
-          host: suns.spacestation14.com
-          username: robust-build-push
-          key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
-          script: /home/robust-build-push/push.ps1 ${{ steps.parse_version.outputs.version }}

.github/workflows/test-content.yml

@@ -2,39 +2,40 @@ name: Test content master against engine
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out content
-        uses: actions/checkout@v4.2.2
-        with:
-          repository: space-wizards/space-station-14
-          submodules: recursive
+    - name: Check out content
+      uses: actions/checkout@v3.6.0
+      with:
+        repository: space-wizards/space-station-14
+        submodules: recursive
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
-      - name: Disable submodule autoupdate
-        run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
+    - name: Disable submodule autoupdate
+      run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
 
-      - name: Check out engine version
-        run: |
-          cd RobustToolbox
-          git fetch origin ${{ github.sha }}
-          git checkout FETCH_HEAD
-          git submodule update --init --recursive
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --configuration Tools --no-restore
-      - name: Content.Tests
-        run: dotnet test --no-build Content.Tests/Content.Tests.csproj -v n
-      - name: Content.IntegrationTests
-        run: COMPlus_gcServer=1 dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n
+    - name: Check out engine version
+      run: |
+        cd RobustToolbox
+        git fetch origin ${{ github.sha }}
+        git checkout FETCH_HEAD
+        git submodule update --init --recursive
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --configuration Tools --no-restore
+    - name: Content.Tests
+      run: dotnet test --no-build Content.Tests/Content.Tests.csproj -v n
+    - name: Content.IntegrationTests
+      run: COMPlus_gcServer=1 dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n

Directory.Packages.props

@@ -10,69 +10,65 @@
     <ManagePackageVersionsCentrally />
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
-    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.8" />
+    <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.8.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeCoverage" Version="17.12.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
+    <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="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.ILVerification" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-    <PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <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.72" />
-    <PackageVersion Include="NUnit" Version="4.3.2" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.5.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.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="9.0.2" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
     <PackageVersion Include="OpenTK.OpenAL" Version="4.7.7" />
     <PackageVersion Include="OpenToolkit.Graphics" Version="4.0.0-pre9.1" />
-    <PackageVersion Include="Pidgin" Version="3.3.0" />
+    <PackageVersion Include="Pidgin" Version="3.2.2" />
     <PackageVersion Include="Robust.Natives" Version="0.1.1" />
-    <PackageVersion Include="Robust.Natives.Cef" Version="131.3.5" />
+    <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.10" />
-    <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
-    <PackageVersion Include="Serilog" Version="4.2.0" />
+    <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.7" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
     <PackageVersion Include="SpaceWizards.HttpListener" Version="0.1.1" />
-    <PackageVersion Include="SpaceWizards.NFluidsynth" Version="0.2.2" />
+    <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="TerraFX.Interop.Windows" Version="10.0.26100.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="16.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.15.0" />
-
-    <!-- Transitive deps that we need to pin versions for to avoid NuGet warnings. -->
-    <PackageVersion Include="System.Formats.Asn1" Version="9.0.0" />
-    <PackageVersion Include="System.Reflection.Metadata" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0" />
+    <PackageVersion Include="PolySharp" Version="1.14.1" />
   </ItemGroup>
 </Project>

Lidgren.Network/Lidgren.Network.csproj

@@ -12,7 +12,7 @@
     <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
 
     <Nullable>enable</Nullable>
-    <LangVersion>13.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

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>net9.0</TargetFramework>
-        <LangVersion>13</LangVersion>
+        <TargetFramework>net8.0</TargetFramework>
+        <LangVersion>12</LangVersion>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
     </PropertyGroup>

MSBuild/Robust.Properties.targets

@@ -3,7 +3,7 @@
   <!-- Import this at the end of any project files in Robust and Content. -->
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 

Resources/EnginePrototypes/Shaders/stockshaders.yml

@@ -4,12 +4,6 @@
   kind: canvas
   light_mode: unshaded
 
-# Simple mix blend
-- type: shader
-  id: Mix
-  kind: canvas
-  blend_mode: Mix
-
 - type: shader
   id: shaded
   kind: canvas

Resources/EnginePrototypes/entityCategory.yml

@@ -18,9 +18,3 @@
   description: entity-category-desc-hide
   hideSpawnMenu: true
   inheritable: false
-
-# Entity prototypes added by the fork. With CVar you can hide all entities without this category
-- type: entityCategory
-  id: ForkFiltered
-  name: entity-category-name-fork
-  description: entity-category-desc-fork

Resources/Locale/en-US/_engine_lib.ftl

@@ -20,15 +20,6 @@ zzzz-object-pronoun = { GENDER($ent) ->
    *[neuter] it
    }
 
-# Used internally by the DAT-OBJ() function.
-# Not used in en-US. Created for supporting other languages.
-zzzz-dat-object = { GENDER($ent) ->
-    [male] him
-    [female] her
-    [epicene] them
-   *[neuter] it
-   }
-
 # Used internally by the POSS-PRONOUN() function.
 zzzz-possessive-pronoun = { GENDER($ent) ->
     [male] his

Resources/Locale/en-US/commands.ftl

@@ -11,7 +11,6 @@ cmd-parse-failure-uid = {$arg} is not a valid entity UID.
 cmd-parse-failure-mapid = {$arg} is not a valid MapId.
 cmd-parse-failure-enum = {$arg} is not a {$enum} Enum.
 cmd-parse-failure-grid = {$arg} is not a valid grid.
-cmd-parse-failure-cultureinfo = "{$arg}" is not valid CultureInfo.
 cmd-parse-failure-entity-exist = UID {$arg} does not correspond to an existing entity.
 cmd-parse-failure-session = There is no session with username: {$username}
 
@@ -157,7 +156,6 @@ cmd-savemap-not-exist = Target map does not exist.
 cmd-savemap-init-warning = Attempted to save a post-init map without forcing the save.
 cmd-savemap-attempt = Attempting to save map {$mapId} to {$path}.
 cmd-savemap-success = Map successfully saved.
-cmd-savemap-error = Could not save map! See server log for details.
 cmd-hint-savemap-id = <MapID>
 cmd-hint-savemap-path = <Path>
 cmd-hint-savemap-force = [bool]
@@ -295,7 +293,7 @@ cmd-lsgrid-desc = Lists grids.
 cmd-lsgrid-help = lsgrid
 
 cmd-addmap-desc = Adds a new empty map to the round. If the mapID already exists, this command does nothing.
-cmd-addmap-help = addmap <mapID> [pre-init]
+cmd-addmap-help = addmap <mapID> [initialize]
 
 cmd-rmmap-desc = Removes a map from the world. You cannot remove nullspace.
 cmd-rmmap-help = rmmap <mapId>
@@ -429,20 +427,11 @@ cmd-entfo-help = Usage: entfo <entityuid>
     The entity UID can be prefixed with 'c' to convert it to a client entity UID.
 
 cmd-fuck-desc = Throws an exception
-cmd-fuck-help = Usage: fuck
+cmd-fuck-help = Throws an exception
 
-cmd-showpos-desc = Show the position of all entities on the screen.
+cmd-showpos-desc = Enables debug drawing over all entity positions in the game.
 cmd-showpos-help = Usage: showpos
 
-cmd-showrot-desc = Show the rotation of all entities on the screen.
-cmd-showrot-help = Usage: showrot
-
-cmd-showvel-desc = Show the local velocity of all entites on the screen.
-cmd-showvel-help = Usage: showvel
-
-cmd-showangvel-desc = Show the angular velocity of all entities on the screen.
-cmd-showangvel-help = Usage: showangvel
-
 cmd-sggcell-desc = Lists entities on a snap grid cell.
 cmd-sggcell-help = Usage: sggcell <gridID> <vector2i>\nThat vector2i param is in the form x<int>,y<int>.
 
@@ -573,8 +562,3 @@ cmd-pvs-override-info-desc = Prints information about any PVS overrides associat
 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}.
-
-cmd-localization_set_culture-desc = Set DefaultCulture for the client LocalizationManager
-cmd-localization_set_culture-help = Usage: localization_set_culture <cultureName>
-cmd-localization_set_culture-culture-name = <cultureName>
-cmd-localization_set_culture-changed = Localization changed to { $code } ({ $nativeName } / { $englishName })

Resources/Locale/en-US/custom-controls.ftl

@@ -4,20 +4,9 @@ entity-spawn-window-title = Entity Spawn Panel
 entity-spawn-window-search-bar-placeholder = search
 entity-spawn-window-clear-button = Clear
 entity-spawn-window-replace-button-text = Replace
+entity-spawn-window-erase-button-text = Erase Mode
 entity-spawn-window-override-menu-tooltip = Override placement
 
-## TileSpawnWindow
-
-tile-spawn-window-title = Place Tiles
-
 ## Console
 
 console-line-edit-placeholder = Command Here
-
-## OutputPanel
-
-output-panel-scroll-down-button-text = Scroll Down
-
-## Common Used
-
-window-erase-button-text = Erase Mode

Resources/Locale/en-US/entity-category.ftl

@@ -7,6 +7,3 @@ entity-category-desc-spawner = Entity prototypes that spawn other entities.
 
 entity-category-name-hide = Hidden
 entity-category-desc-hide = Entity prototypes that should be hidden from entity spawn menus
-
-entity-category-name-fork = Fork Filtered
-entity-category-desc-fork = Entity prototypes added by the fork. With CVar you can hide all entities without this category

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

@@ -1,8 +1,4 @@
-command-help-usage =
-    Usage:
-command-help-invertible =
-    The behaviour of this command can be inverted using the "not" prefix.
-command-description-tpto =
+command-description-tpto =
     Teleport the given entities to some target entity.
 command-description-player-list =
     Returns a list of all player sessions.
@@ -23,7 +19,7 @@ command-description-buildinfo =
 command-description-cmd-list =
     Returns a list of all commands, for this side.
 command-description-explain =
-    Explains the given expression, providing command descriptions and signatures. This only works for valid expressions, it can't explain commands that it fails to parse.
+    Explains the given expression, providing command descriptions and signatures.
 command-description-search =
     Searches through the input for the provided value.
 command-description-stopwatch =
@@ -42,7 +38,8 @@ command-description-as =
 command-description-count =
     Counts the amount of entries in it's input, returning an integer.
 command-description-map =
-    Maps the input over the given block.
+    Maps the input over the given block, with the provided expected return type.
+    This command may be modified to not need an explicit return type in the future.
 command-description-select =
     Selects N objects or N% of objects from the input.
     One can additionally invert this command with not to make it select everything except N objects instead.
@@ -56,8 +53,10 @@ command-description-entities =
     Returns all entities on the server.
 command-description-paused =
     Filters the input entities by whether or not they are paused.
+    This command can be inverted with not.
 command-description-with =
     Filters the input entities by whether or not they have the given component.
+    This command can be inverted with not.
 command-description-fuck =
     Throws an exception.
 command-description-ecscomp-listty =
@@ -96,8 +95,6 @@ command-description-vars =
     Provides a list of all variables set in this session.
 command-description-any =
     Returns true if there's any values in the input, otherwise false.
-command-description-contains =
-    Returns whether the input enumerable contains the specified value.
 command-description-ArrowCommand =
     Assigns the input to a variable.
 command-description-isempty =
@@ -122,8 +119,6 @@ command-description-splat =
     "Splats" a block, value, or variable, creating N copies of it in a list.
 command-description-val =
     Casts the given value, block, or variable to the given type. This is mostly a workaround for current limitations of variables.
-command-description-var =
-    Returns the contents of the given variable. This will attempt to automatically infer a variables type. Compound commands that modify a variable may need to use the 'val' command instead.
 command-description-actor-controlled =
     Filters entities by whether or not they're actively controlled.
 command-description-actor-session =
@@ -148,7 +143,7 @@ command-description-max =
     Returns the maximum of two values.
 command-description-BitAndCommand =
     Performs bitwise AND.
-command-description-bitor =
+command-description-BitOrCommand =
     Performs bitwise OR.
 command-description-BitXorCommand =
     Performs bitwise XOR.
@@ -202,11 +197,11 @@ command-description-mappos =
 command-description-pos =
     Returns an entity's coordinates.
 command-description-tp-coords =
-    Teleports the given entities to the target coordinates.
+    Teleports the target to the given coordinates.
 command-description-tp-to =
-    Teleports the given entities to the target entity.
+    Teleports the target to the given other entity.
 command-description-tp-into =
-    Teleports the given entities "into" the target entity, attaching it at (0 0) relative to it.
+    Teleports the target "into" the given other entity, attaching it at (0 0) relative to it.
 command-description-comp-get =
     Gets the given component from the given entity.
 command-description-comp-add =
@@ -224,9 +219,9 @@ command-description-MulVecCommand =
 command-description-DivVecCommand =
     Divides every element in the input by a scalar (single value).
 command-description-rng-to =
-    Returns a number between the input (inclusive) and the argument (exclusive).
+    Returns a number from its input to its argument (i.e. n..m inclusive)
 command-description-rng-from =
-    Returns a number between the argument (inclusive) and the input (exclusive))
+    Returns a number to its input from its argument (i.e. m..n inclusive)
 command-description-rng-prob =
     Returns a boolean based on the input probability/chance (from 0 to 1)
 command-description-sum =
@@ -276,7 +271,7 @@ command-description-ModVecCommand =
     Performs the modulus operation over the input with the given constant right-hand value.
 command-description-BitAndNotCommand =
     Performs bitwise AND-NOT over the input.
-command-description-bitornot =
+command-description-BitOrNotCommand =
     Performs bitwise OR-NOT over the input.
 command-description-BitXnorCommand =
     Performs bitwise XNOR over the input.

Resources/Locale/en-US/userinterface.ftl

@@ -1,2 +0,0 @@
-popup-copy-button = Copy
-popup-title = Alert!

Resources/Locale/pt-BR/commands.ftl

@@ -136,7 +136,6 @@ cmd-savemap-not-exist = O mapa de destino não existe.
 cmd-savemap-init-warning = Tentativa de salvar um mapa pós-inicialização sem forçar o salvamento.
 cmd-savemap-attempt = Tentando salvar o mapa {$mapId} em {$path}.
 cmd-savemap-success = Mapa salvo com sucesso.
-cmd-savemap-error = Não foi possível salvar o mapa! Consulte o log do servidor para obter detalhes.
 cmd-hint-savemap-id = <MapID>
 cmd-hint-savemap-path = <Path>
 cmd-hint-savemap-force = [bool]

Robust.Analyzers.Tests/AccessAnalyzer_Test.cs

@@ -1,8 +1,12 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
-using VerifyCS = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.AccessAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+using Robust.Analyzers;
+
+using VerifyCS = Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.AccessAnalyzer>;
+using static Microsoft.CodeAnalysis.Testing.DiagnosticResult;
 
 namespace Robust.Analyzers.Tests;
 
@@ -12,7 +16,7 @@ public sealed class AccessAnalyzer_Test
 {
     public Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<AccessAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<AccessAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/ByRefEventAnalyzerTest.cs

@@ -1,114 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.ByRefEventAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture, TestOf(typeof(ByRefEventAnalyzer))]
-public sealed class ByRefEventAnalyzerTest
-{
-    private const string EventBusDef = """
-        namespace Robust.Shared.GameObjects;
-
-        public readonly struct EntityUid;
-
-        public sealed class EntitySystem
-        {
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, ref TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-        }
-
-        public sealed class EntityEventBus
-        {
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, ref TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-        }
-        """;
-
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<ByRefEventAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.GameObjects.EventBusAttributes.cs"
-        );
-
-        test.TestState.Sources.Add(("EntityEventBus.cs", EventBusDef));
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task TestSuccess()
-    {
-        const string code = """
-            using Robust.Shared.GameObjects;
-
-            [ByRefEvent]
-            public readonly struct RefEvent;
-            public readonly struct ValueEvent;
-
-            public static class Foo
-            {
-                public static void Bar(EntityEventBus bus)
-                {
-                    bus.RaiseLocalEvent(default(EntityUid), new ValueEvent());
-                    var refEv = new RefEvent();
-                    bus.RaiseLocalEvent(default(EntityUid), ref refEv);
-                }
-            }
-            """;
-
-        await Verifier(code);
-    }
-
-    [Test]
-    public async Task TestWrong()
-    {
-        const string code = """
-            using Robust.Shared.GameObjects;
-
-            [ByRefEvent]
-            public readonly struct RefEvent;
-            public readonly struct ValueEvent;
-
-            public static class Foo
-            {
-                public static void Bar(EntityEventBus bus)
-                {
-                    bus.RaiseLocalEvent(default(EntityUid), new RefEvent());
-                    var valueEv = new ValueEvent();
-                    bus.RaiseLocalEvent(default(EntityUid), ref valueEv);
-                }
-            }
-            """;
-
-        await Verifier(
-            code,
-            // /0/Test0.cs(11,49): error RA0015: Tried to raise a by-ref event 'RefEvent' by value
-            VerifyCS.Diagnostic(ByRefEventAnalyzer.ByRefEventRaisedByValueRule).WithSpan(11, 49, 11, 63).WithArguments("RefEvent"),
-            // /0/Test0.cs(13,49): error RA0016: Tried to raise a value event 'ValueEvent' by-ref
-            VerifyCS.Diagnostic(ByRefEventAnalyzer.ByValueEventRaisedByRefRule).WithSpan(13, 49, 13, 60).WithArguments("ValueEvent")
-        );
-    }
-}

Robust.Analyzers.Tests/ComponentPauseGeneratorTest.cs

@@ -66,7 +66,6 @@ public sealed class ComponentPauseGeneratorTest
             public partial class FooComponent
             {
             [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             public sealed class FooComponent_AutoPauseSystem : EntitySystem
             {
                 public override void Initialize()
@@ -107,7 +106,6 @@ public sealed class ComponentPauseGeneratorTest
             public partial class FooComponent
             {
             [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             public sealed class FooComponent_AutoPauseSystem : EntitySystem
             {
                 public override void Initialize()
@@ -149,7 +147,6 @@ public sealed class ComponentPauseGeneratorTest
             public partial class FooComponent
             {
             [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             public sealed class FooComponent_AutoPauseSystem : EntitySystem
             {
                 public override void Initialize()
@@ -191,7 +188,6 @@ public sealed class ComponentPauseGeneratorTest
             public partial class FooComponent
             {
             [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             public sealed class FooComponent_AutoPauseSystem : EntitySystem
             {
                 public override void Initialize()

Robust.Analyzers.Tests/DataDefinitionAnalyzerTest.cs

@@ -1,90 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.DataDefinitionAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class DataDefinitionAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<DataDefinitionAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using System;
-            using Robust.Shared.ViewVariables;
-            using Robust.Shared.Serialization.Manager.Attributes;
-
-            namespace Robust.Shared.ViewVariables
-            {
-                public sealed class ViewVariablesAttribute : Attribute
-                {
-                    public readonly VVAccess Access = VVAccess.ReadOnly;
-
-                    public ViewVariablesAttribute() { }
-
-                    public ViewVariablesAttribute(VVAccess access)
-                    {
-                        Access = access;
-                    }
-                }
-                public enum VVAccess : byte
-                {
-                    ReadOnly = 0,
-                    ReadWrite = 1,
-                }
-            }
-
-            namespace Robust.Shared.Serialization.Manager.Attributes
-            {
-                public class DataFieldBaseAttribute : Attribute;
-                public class DataFieldAttribute : DataFieldBaseAttribute;
-                public sealed class DataDefinitionAttribute : Attribute;
-            }
-
-            [DataDefinition]
-            public sealed partial class Foo
-            {
-                [DataField, ViewVariables(VVAccess.ReadWrite)]
-                public int Bad;
-
-                [DataField]
-                public int Good;
-
-                [DataField, ViewVariables]
-                public int Good2;
-
-                [DataField, ViewVariables(VVAccess.ReadOnly)]
-                public int Good3;
-
-                [ViewVariables]
-                public int Good4;
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(35,17): info RA0028: Data field Bad in data definition Foo has ViewVariables attribute with ReadWrite access, which is redundant
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldNoVVReadWriteRule).WithSpan(35, 17, 35, 50).WithArguments("Bad", "Foo")
-        );
-    }
-}

Robust.Analyzers.Tests/DependencyAssignAnalyzerTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.DependencyAssignAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.DependencyAssignAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -13,7 +14,7 @@ public sealed class DependencyAssignAnalyzerTest
 {
     private static Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<DependencyAssignAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<DependencyAssignAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/DuplicateDependencyAnalyzerTest.cs

@@ -1,62 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.DuplicateDependencyAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-[TestOf(typeof(DuplicateDependencyAnalyzer))]
-public sealed class DuplicateDependencyAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<DuplicateDependencyAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.IoC.DependencyAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.IoC;
-
-            public sealed class Foo
-            {
-                [Dependency]
-                private object? Field;
-
-                [Dependency]
-                private object? Field2;
-
-                [Dependency]
-                private string? DifferentField;
-
-                private string? NonDependency1;
-                private string? NonDependency2;
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(9,21): warning RA0032: Another [Dependency] field of type 'object?' already exists in this type as field 'Field'
-            VerifyCS.Diagnostic().WithSpan(9, 21, 9, 27).WithArguments("object?", "Field"));
-    }
-}

Robust.Analyzers.Tests/ForbidLiteralAnalyzerTest.cs

@@ -1,189 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.ForbidLiteralAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class ForbidLiteralAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<ForbidLiteralAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.ForbidLiteralAttribute.cs"
-        );
-
-        test.TestState.Sources.Add(("TestTypeDefs.cs", TestTypeDefs));
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    private const string TestTypeDefs = """
-        using System.Collections.Generic;
-        using Robust.Shared.Analyzers;
-
-        public sealed class TestClass
-        {
-            public static void OneParameterForbidden([ForbidLiteral] string value) { }
-            public static void TwoParametersFirstForbidden([ForbidLiteral] string first, string second) { }
-            public static void TwoParametersBothForbidden([ForbidLiteral] string first, [ForbidLiteral] string second) { }
-            public static void ListParameterForbidden([ForbidLiteral] List<string> values) { }
-            public static void ParamsListParameterForbidden([ForbidLiteral] params List<string> values) { }
-        }
-
-        public record struct StringWrapper(string value)
-        {
-            private readonly string _value = value;
-
-            public static implicit operator string(StringWrapper wrapper)
-            {
-                return wrapper._value;
-            }
-        }
-    """;
-
-    [Test]
-    public async Task TestOneParameter()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-                private static readonly StringWrapper WrappedValue = new("biz");
-
-                public void Test()
-                {
-                    TestClass.OneParameterForbidden(_constValue);
-                    TestClass.OneParameterForbidden(StaticValue);
-                    TestClass.OneParameterForbidden(WrappedValue);
-                    TestClass.OneParameterForbidden("baz");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(12,41): error RA0033: The "value" parameter of OneParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(12, 41, 12, 46).WithArguments("value", "OneParameterForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestTwoParametersFirstForbidden()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-
-                public void Test()
-                {
-                    TestClass.TwoParametersFirstForbidden(_constValue, "whatever");
-                    TestClass.TwoParametersFirstForbidden(_constValue, _constValue);
-                    TestClass.TwoParametersFirstForbidden("foo", "whatever");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(9,47): error RA0033: The "first" parameter of TwoParametersFirstForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(9, 47, 9, 52).WithArguments("first", "TwoParametersFirstForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestTwoParametersBothForbidden()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-
-                public void Test()
-                {
-                    TestClass.TwoParametersBothForbidden(_constValue, _constValue);
-                    TestClass.TwoParametersBothForbidden(_constValue, StaticValue);
-                    TestClass.TwoParametersBothForbidden(_constValue, "whatever");
-                    TestClass.TwoParametersBothForbidden("whatever", _constValue);
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,59): error RA0033: The "second" parameter of TwoParametersBothForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 59, 10, 69).WithArguments("second", "TwoParametersBothForbidden"),
-            // /0/Test0.cs(11,46): error RA0033: The "first" parameter of TwoParametersBothForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(11, 46, 11, 56).WithArguments("first", "TwoParametersBothForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestListParameter()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-                private static readonly StringWrapper WrappedValue = new("biz");
-
-                public void Test()
-                {
-                    TestClass.ListParameterForbidden([_constValue, StaticValue, WrappedValue]);
-                    TestClass.ListParameterForbidden(["foo", _constValue, "bar"]);
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,43): warning RA0033: The "values" parameter of ListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 43, 10, 48).WithArguments("values", "ListParameterForbidden"),
-            // /0/Test0.cs(10,63): warning RA0033: The "values" parameter of ListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 63, 10, 68).WithArguments("values", "ListParameterForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestParamsListParameter()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-                private static readonly StringWrapper WrappedValue = new("biz");
-
-                public void Test()
-                {
-                    TestClass.ParamsListParameterForbidden(_constValue, StaticValue, WrappedValue);
-                    TestClass.ParamsListParameterForbidden("foo", _constValue, "bar");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,48): warning RA0033: The "values" parameter of ParamsListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 48, 10, 53).WithArguments("values", "ParamsListParameterForbidden"),
-            // /0/Test0.cs(10,68): warning RA0033: The "values" parameter of ParamsListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 68, 10, 73).WithArguments("values", "ParamsListParameterForbidden")
-        );
-    }
-}

Robust.Analyzers.Tests/MustCallBaseAnalyzerTest.cs

@@ -1,91 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.MustCallBaseAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class MustCallBaseAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<MustCallBaseAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.IoC.MustCallBaseAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class Foo
-            {
-                [MustCallBase]
-                public virtual void Function()
-                {
-
-                }
-
-                [MustCallBase(true)]
-                public virtual void Function2()
-                {
-
-                }
-            }
-
-            public class Bar : Foo
-            {
-                public override void Function()
-                {
-
-                }
-
-                public override void Function2()
-                {
-
-                }
-            }
-
-            public class Baz : Foo
-            {
-                public override void Function()
-                {
-                    base.Function();
-                }
-            }
-
-            public class Bal : Bar
-            {
-                public override void Function2()
-                {
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(20,26): warning RA0028: Overriders of this function must always call the base function
-            VerifyCS.Diagnostic().WithSpan(20, 26, 20, 34),
-            // /0/Test0.cs(41,26): warning RA0028: Overriders of this function must always call the base function
-            VerifyCS.Diagnostic().WithSpan(41, 26, 41, 35));
-    }
-}

Robust.Analyzers.Tests/NoUncachedRegexAnalyzerTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.NoUncachedRegexAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.NoUncachedRegexAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -13,7 +14,7 @@ public sealed class NoUncachedRegexAnalyzerTest
 {
     private static Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<NoUncachedRegexAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<NoUncachedRegexAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/PreferNonGenericVariantForTest.cs

@@ -1,70 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PreferNonGenericVariantForAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class PreferNonGenericVariantForTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<PreferNonGenericVariantForAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class Bar { };
-            public class Baz { };
-            public class Okay { };
-
-            public static class Foo
-            {
-                [PreferNonGenericVariantFor(typeof(Bar), typeof(Baz))]
-                public static void DoFoo<T>() { }
-            }
-
-            public class Test
-            {
-                public void DoBad()
-                {
-                    Foo.DoFoo<Bar>();
-                }
-
-                public void DoGood()
-                {
-                    Foo.DoFoo<Okay>();
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(17,9): warning RA0029: Use the non-generic variant of this method for type Bar
-            VerifyCS.Diagnostic().WithSpan(17, 9, 17, 25).WithArguments("Bar")
-        );
-    }
-}

Robust.Analyzers.Tests/PreferOtherTypeAnalyzerTest.cs

@@ -1,61 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class PreferOtherTypeAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<PreferOtherTypeAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class EntityPrototype { };
-            public class EntProtoId { };
-            public class ReagentPrototype { };
-
-            [PreferOtherType(typeof(EntityPrototype), typeof(EntProtoId))]
-            public class ProtoId<T> { };
-
-            public class Test
-            {
-                public ProtoId<EntityPrototype> Bad = new();
-
-                public ProtoId<ReagentPrototype> Good = new();
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(12,12): warning RA0031: Use the specific type EntProtoId instead of ProtoId when the type argument is EntityPrototype
-            VerifyCS.Diagnostic().WithSpan(12, 12, 12, 48).WithArguments("EntProtoId", "ProtoId", "EntityPrototype")
-        );
-    }
-}

Robust.Analyzers.Tests/PreferOtherTypeFixerTest.cs

@@ -1,80 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-public sealed class PreferOtherTypeFixerTest
-{
-    private static Task Verifier(string code, string fixedCode, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpCodeFixTest<PreferOtherTypeAnalyzer, PreferOtherTypeFixer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-            FixedState =
-            {
-                Sources = { fixedCode },
-            }
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs"
-        );
-
-        TestHelper.AddEmbeddedSources(
-            test.FixedState,
-            "Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs"
-        );
-
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class EntityPrototype { };
-            public class EntProtoId { };
-            public class ReagentPrototype { };
-
-            [PreferOtherType(typeof(EntityPrototype), typeof(EntProtoId))]
-            public class ProtoId<T> { };
-
-            public class Test
-            {
-                public ProtoId<EntityPrototype> Foo = new();
-            }
-            """;
-
-        const string fixedCode = """
-            using Robust.Shared.Analyzers;
-
-            public class EntityPrototype { };
-            public class EntProtoId { };
-            public class ReagentPrototype { };
-
-            [PreferOtherType(typeof(EntityPrototype), typeof(EntProtoId))]
-            public class ProtoId<T> { };
-
-            public class Test
-            {
-                public EntProtoId Foo = new();
-            }
-            """;
-
-        await Verifier(code, fixedCode,
-        // /0/Test0.cs(12,12): error RA0031: Use the specific type EntProtoId instead of ProtoId when the type argument is EntityPrototype
-        VerifyCS.Diagnostic().WithSpan(12, 12, 12, 48).WithArguments("EntProtoId", "ProtoId", "EntityPrototype"));
-    }
-}

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

@@ -10,12 +10,7 @@
   <ItemGroup>
     <EmbeddedResource Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" LogicalName="Robust.Shared.Analyzers.AccessAttribute.cs" LinkBase="Implementations" />
     <EmbeddedResource Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" LogicalName="Robust.Shared.Analyzers.AccessPermissions.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\MustCallBaseAttribute.cs" LogicalName="Robust.Shared.IoC.MustCallBaseAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\PreferNonGenericVariantForAttribute.cs" LogicalName="Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\PreferOtherTypeAttribute.cs" LogicalName="Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\ForbidLiteralAttribute.cs" LogicalName="Robust.Shared.Analyzers.ForbidLiteralAttribute.cs" LinkBase="Implementations" />
     <EmbeddedResource Include="..\Robust.Shared\IoC\DependencyAttribute.cs" LogicalName="Robust.Shared.IoC.DependencyAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\GameObjects\EventBusAttributes.cs" LogicalName="Robust.Shared.GameObjects.EventBusAttributes.cs" LinkBase="Implementations" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -29,17 +24,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing"/>
+    <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"/>
-
-    <!-- Needed to fix transitive dependency versions -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-    <PackageReference Include="System.Formats.Asn1" />
   </ItemGroup>
 
   <ItemGroup>

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
@@ -24,7 +24,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
         "Make sure that methods subscribing to a ref event have the ref keyword for the event argument."
     );
 
-    public static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
+    private static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
         Diagnostics.IdByRefEventRaisedByValue,
         "By-ref event raised by value",
         "Tried to raise a by-ref event '{0}' by value",
@@ -34,7 +34,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
         "Make sure to use the ref keyword when raising ref events."
     );
 
-    public static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
+    private static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
         Diagnostics.IdValueEventRaisedByRef,
         "Value event raised by-ref",
         "Tried to raise a value event '{0}' by-ref",
@@ -54,44 +54,32 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     {
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
         context.EnableConcurrentExecution();
-        context.RegisterCompilationStartAction(compilationContext =>
-        {
-            var raiseMethods = compilationContext.Compilation
-                .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
-                .GetMembers()
-                .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
-                .Cast<IMethodSymbol>();
-
-            var busRaiseMethods = compilationContext.Compilation
-                .GetTypeByMetadataName("Robust.Shared.GameObjects.EntityEventBus")?
-                .GetMembers()
-                .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
-                .Cast<IMethodSymbol>();
-
-            if (raiseMethods == null)
-                return;
-
-            if (busRaiseMethods != null)
-                raiseMethods = raiseMethods.Concat(busRaiseMethods);
-
-            var raiseMethodsArray = raiseMethods.ToArray();
-
-            compilationContext.RegisterOperationAction(
-                ctx => CheckEventRaise(ctx, raiseMethodsArray),
-                OperationKind.Invocation);
-        });
+        context.RegisterOperationAction(CheckEventRaise, OperationKind.Invocation);
     }
 
-    private static void CheckEventRaise(
-        OperationAnalysisContext context,
-        IReadOnlyCollection<IMethodSymbol> raiseMethods)
+    private void CheckEventRaise(OperationAnalysisContext context)
     {
         if (context.Operation is not IInvocationOperation operation)
             return;
 
-        if (!operation.TargetMethod.Name.Contains("RaiseLocalEvent"))
+        var raiseMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
+            .Cast<IMethodSymbol>();
+
+        var busRaiseMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntityEventBus")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
+            .Cast<IMethodSymbol>();
+
+        if (raiseMethods == null)
             return;
 
+        if (busRaiseMethods != null)
+            raiseMethods = raiseMethods.Concat(busRaiseMethods);
+
         if (!raiseMethods.Any(m => m.Equals(operation.TargetMethod.OriginalDefinition, Default)))
         {
             // If you try to do this normally by concatenating like busRaiseMethods above

Robust.Analyzers/DataDefinitionAnalyzer.cs

@@ -7,7 +7,6 @@ using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Robust.Roslyn.Shared;
 using Robust.Shared.Serialization.Manager.Definition;
-using Robust.Shared.ViewVariables;
 
 namespace Robust.Analyzers;
 
@@ -17,9 +16,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private const string DataDefinitionNamespace = "Robust.Shared.Serialization.Manager.Attributes.DataDefinitionAttribute";
     private const string ImplicitDataDefinitionNamespace = "Robust.Shared.Serialization.Manager.Attributes.ImplicitDataDefinitionForInheritorsAttribute";
     private const string DataFieldBaseNamespace = "Robust.Shared.Serialization.Manager.Attributes.DataFieldBaseAttribute";
-    private const string ViewVariablesNamespace = "Robust.Shared.ViewVariables.ViewVariablesAttribute";
-    private const string DataFieldAttributeName = "DataField";
-    private const string ViewVariablesAttributeName = "ViewVariables";
 
     private static readonly DiagnosticDescriptor DataDefinitionPartialRule = new(
         Diagnostics.IdDataDefinitionPartial,
@@ -70,20 +66,9 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         true,
         "Make sure to remove the tag string from the data field attribute."
     );
-
-    public static readonly DiagnosticDescriptor DataFieldNoVVReadWriteRule = new(
-        Diagnostics.IdDataFieldNoVVReadWrite,
-        "Data field has VV ReadWrite",
-        "Data field {0} in data definition {1} has ViewVariables attribute with ReadWrite access, which is redundant",
-        "Usage",
-        DiagnosticSeverity.Info,
-        true,
-        "Make sure to remove the ViewVariables attribute."
-    );
-
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
         DataDefinitionPartialRule, NestedDataDefinitionPartialRule, DataFieldWritableRule, DataFieldPropertyWritableRule,
-        DataFieldRedundantTagRule, DataFieldNoVVReadWriteRule
+        DataFieldRedundantTagRule
     );
 
     public override void Initialize(AnalysisContext context)
@@ -154,14 +139,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
 
             if (HasRedundantTag(fieldSymbol))
             {
-                TryGetAttributeLocation(field, DataFieldAttributeName, out var location);
-                context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, location, fieldSymbol.Name, type.Name));
-            }
-
-            if (HasVVReadWrite(fieldSymbol))
-            {
-                TryGetAttributeLocation(field, ViewVariablesAttributeName, out var location);
-                context.ReportDiagnostic(Diagnostic.Create(DataFieldNoVVReadWriteRule, location, fieldSymbol.Name, type.Name));
+                context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, context.Node.GetLocation(), fieldSymbol.Name, type.Name));
             }
         }
     }
@@ -190,14 +168,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
 
         if (HasRedundantTag(propertySymbol))
         {
-            TryGetAttributeLocation(property, DataFieldAttributeName, out var location);
-            context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, location, propertySymbol.Name, type.Name));
-        }
-
-        if (HasVVReadWrite(propertySymbol))
-        {
-            TryGetAttributeLocation(property, ViewVariablesAttributeName, out var location);
-            context.ReportDiagnostic(Diagnostic.Create(DataFieldNoVVReadWriteRule, location, propertySymbol.Name, type.Name));
+            context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, context.Node.GetLocation(), propertySymbol.Name, type.Name));
         }
     }
 
@@ -267,24 +238,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         return false;
     }
 
-    private static bool TryGetAttributeLocation(MemberDeclarationSyntax syntax, string attributeName, out Location location)
-    {
-        foreach (var attributeList in syntax.AttributeLists)
-        {
-            foreach (var attribute in attributeList.Attributes)
-            {
-                if (attribute.Name.ToString() != attributeName)
-                    continue;
-
-                location = attribute.GetLocation();
-                return true;
-            }
-        }
-        // Default to the declaration syntax's location
-        location = syntax.GetLocation();
-        return false;
-    }
-
     private static bool IsReadOnlyMember(ITypeSymbol type, ISymbol member)
     {
         if (member is IFieldSymbol field)
@@ -339,34 +292,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         return explicitName == automaticName;
     }
 
-    private static bool HasVVReadWrite(ISymbol symbol)
-    {
-        if (!IsDataField(symbol, out _, out _))
-            return false;
-
-        // Make sure it has ViewVariablesAttribute
-        AttributeData? viewVariablesAttribute = null;
-        foreach (var attr in symbol.GetAttributes())
-        {
-            if (attr.AttributeClass?.ToDisplayString() == ViewVariablesNamespace)
-            {
-                viewVariablesAttribute = attr;
-            }
-        }
-        if (viewVariablesAttribute == null)
-            return false;
-
-        // Default is ReadOnly, which is fine
-        if (viewVariablesAttribute.ConstructorArguments.Length == 0)
-            return false;
-
-        var accessArgument = viewVariablesAttribute.ConstructorArguments[0];
-        if (accessArgument.Value is not byte accessByte)
-            return false;
-
-        return (VVAccess)accessByte == VVAccess.ReadWrite;
-    }
-
     private static bool IsImplicitDataDefinition(ITypeSymbol type)
     {
         if (HasAttribute(type, ImplicitDataDefinitionNamespace))

Robust.Analyzers/DataDefinitionFixer.cs

@@ -15,11 +15,9 @@ public sealed class DefinitionFixer : CodeFixProvider
 {
     private const string DataFieldAttributeName = "DataField";
 
-    private const string ViewVariablesAttributeName = "ViewVariables";
-
     public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(
         IdDataDefinitionPartial, IdNestedDataDefinitionPartial, IdDataFieldWritable, IdDataFieldPropertyWritable,
-        IdDataFieldRedundantTag, IdDataFieldNoVVReadWrite
+        IdDataFieldRedundantTag
     );
 
     public override Task RegisterCodeFixesAsync(CodeFixContext context)
@@ -38,8 +36,6 @@ public sealed class DefinitionFixer : CodeFixProvider
                     return RegisterDataFieldPropertyFix(context, diagnostic);
                 case IdDataFieldRedundantTag:
                     return RegisterRedundantTagFix(context, diagnostic);
-                case IdDataFieldNoVVReadWrite:
-                    return RegisterVVReadWriteFix(context, diagnostic);
             }
         }
 
@@ -140,48 +136,6 @@ public sealed class DefinitionFixer : CodeFixProvider
         return document.WithSyntaxRoot(root);
     }
 
-    private static async Task RegisterVVReadWriteFix(CodeFixContext context, Diagnostic diagnostic)
-    {
-        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
-        var span = diagnostic.Location.SourceSpan;
-        var token = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<MemberDeclarationSyntax>().First();
-
-        if (token == null)
-            return;
-
-        context.RegisterCodeFix(CodeAction.Create(
-            "Remove ViewVariables attribute",
-            c => RemoveVVAttribute(context.Document, token, c),
-            "Remove ViewVariables attribute"
-        ), diagnostic);
-    }
-
-    private static async Task<Document> RemoveVVAttribute(Document document, MemberDeclarationSyntax syntax, CancellationToken cancellation)
-    {
-        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
-
-        var newLists = new SyntaxList<AttributeListSyntax>();
-        foreach (var attributeList in syntax.AttributeLists)
-        {
-            var attributes = new SeparatedSyntaxList<AttributeSyntax>();
-            foreach (var attribute in attributeList.Attributes)
-            {
-                if (attribute.Name.ToString() != ViewVariablesAttributeName)
-                {
-                    attributes = attributes.Add(attribute);
-                }
-            }
-            // Don't add empty lists []
-            if (attributes.Count > 0)
-                newLists = newLists.Add(attributeList.WithAttributes(attributes));
-        }
-        var newSyntax = syntax.WithAttributeLists(newLists);
-
-        root = root!.ReplaceNode(syntax, newSyntax);
-
-        return document.WithSyntaxRoot(root);
-    }
-
     private static async Task RegisterDataFieldFix(CodeFixContext context, Diagnostic diagnostic)
     {
         var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);

Robust.Analyzers/DuplicateDependencyAnalyzer.cs

@@ -1,126 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-#nullable enable
-
-/// <summary>
-/// Analyzer that detects duplicate <c>[Dependency]</c> fields inside a single type.
-/// </summary>
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class DuplicateDependencyAnalyzer : DiagnosticAnalyzer
-{
-    private const string DependencyAttributeType = "Robust.Shared.IoC.DependencyAttribute";
-
-    private static readonly DiagnosticDescriptor Rule = new(
-        Diagnostics.IdDuplicateDependency,
-        "Duplicate dependency field",
-        "Another [Dependency] field of type '{0}' already exists in this type with field '{1}'",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.EnableConcurrentExecution();
-        context.RegisterCompilationStartAction(compilationContext =>
-        {
-            var dependencyAttributeType = compilationContext.Compilation.GetTypeByMetadataName(DependencyAttributeType);
-            if (dependencyAttributeType == null)
-                return;
-
-            compilationContext.RegisterSymbolStartAction(symbolContext =>
-                {
-                    var typeSymbol = (INamedTypeSymbol)symbolContext.Symbol;
-                    // Only deal with non-static classes, doesn't make sense to have dependencies in anything else.
-                    if (typeSymbol.TypeKind != TypeKind.Class || typeSymbol.IsStatic)
-                        return;
-
-                    var state = new AnalyzerState(dependencyAttributeType);
-                    symbolContext.RegisterSyntaxNodeAction(state.AnalyzeField, SyntaxKind.FieldDeclaration);
-                    symbolContext.RegisterSymbolEndAction(state.End);
-                },
-                SymbolKind.NamedType);
-        });
-    }
-
-    private sealed class AnalyzerState(INamedTypeSymbol dependencyAttributeType)
-    {
-        private readonly Dictionary<ITypeSymbol, List<IFieldSymbol>> _dependencyFields = new(SymbolEqualityComparer.Default);
-
-        public void AnalyzeField(SyntaxNodeAnalysisContext context)
-        {
-            var field = (FieldDeclarationSyntax)context.Node;
-            if (field.AttributeLists.Count == 0)
-                return;
-
-            if (context.ContainingSymbol is not IFieldSymbol fieldSymbol)
-                return;
-
-            // Can't have [Dependency]s for non-reference types.
-            if (!fieldSymbol.Type.IsReferenceType)
-                return;
-
-            if (!IsDependency(context.ContainingSymbol))
-                return;
-
-            lock (_dependencyFields)
-            {
-                if (!_dependencyFields.TryGetValue(fieldSymbol.Type, out var dependencyFields))
-                {
-                    dependencyFields = [];
-                    _dependencyFields.Add(fieldSymbol.Type, dependencyFields);
-                }
-
-                dependencyFields.Add(fieldSymbol);
-            }
-        }
-
-        private bool IsDependency(ISymbol symbol)
-        {
-            foreach (var attributeData in symbol.GetAttributes())
-            {
-                if (SymbolEqualityComparer.Default.Equals(attributeData.AttributeClass, dependencyAttributeType))
-                    return true;
-            }
-
-            return false;
-        }
-
-        public void End(SymbolAnalysisContext context)
-        {
-            lock (_dependencyFields)
-            {
-                foreach (var pair in _dependencyFields)
-                {
-                    var fieldType = pair.Key;
-                    var fields = pair.Value;
-                    if (fields.Count <= 1)
-                        continue;
-
-                    // Sort so we can have deterministic order to skip reporting for a single field.
-                    // Whichever sorts first doesn't get reported.
-                    fields.Sort(static (a, b) => string.Compare(a.Name, b.Name, StringComparison.Ordinal));
-
-                    // Start at index 1 to skip first field.
-                    var firstField = fields[0];
-                    for (var i = 1; i < fields.Count; i++)
-                    {
-                        var field = fields[i];
-
-                        context.ReportDiagnostic(
-                            Diagnostic.Create(Rule, field.Locations[0], fieldType.ToDisplayString(), firstField.Name));
-                    }
-                }
-            }
-        }
-    }
-}

Robust.Analyzers/ForbidLiteralAnalyzer.cs

@@ -1,101 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class ForbidLiteralAnalyzer : DiagnosticAnalyzer
-{
-    private const string ForbidLiteralType = "Robust.Shared.Analyzers.ForbidLiteralAttribute";
-
-    public static DiagnosticDescriptor ForbidLiteralRule = new(
-        Diagnostics.IdForbidLiteral,
-        "Parameter forbids literal values",
-        "The {0} parameter of {1} forbids literal values",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true,
-        "Pass in a validated wrapper type like ProtoId, or a const or static value."
-    );
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [ForbidLiteralRule];
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
-        context.EnableConcurrentExecution();
-        context.RegisterOperationAction(AnalyzeOperation, OperationKind.Invocation);
-    }
-
-    private void AnalyzeOperation(OperationAnalysisContext context)
-    {
-        if (context.Operation is not IInvocationOperation invocationOperation)
-            return;
-
-        // Check each parameter of the method invocation
-        foreach (var argumentOperation in invocationOperation.Arguments)
-        {
-            // Check for our attribute on the parameter
-            if (!AttributeHelper.HasAttribute(argumentOperation.Parameter, ForbidLiteralType, out _))
-                continue;
-
-            // Handle parameters using the params keyword
-            if (argumentOperation.Syntax is InvocationExpressionSyntax subExpressionSyntax)
-            {
-                // Check each param value
-                foreach (var subArgument in subExpressionSyntax.ArgumentList.Arguments)
-                {
-                    CheckArgumentSyntax(context, argumentOperation, subArgument);
-                }
-                continue;
-            }
-
-            // Not params, so just check the single parameter
-            if (argumentOperation.Syntax is not ArgumentSyntax argumentSyntax)
-                continue;
-
-            CheckArgumentSyntax(context, argumentOperation, argumentSyntax);
-        }
-    }
-
-    private void CheckArgumentSyntax(OperationAnalysisContext context, IArgumentOperation operation, ArgumentSyntax argumentSyntax)
-    {
-        // Handle collection types
-        if (argumentSyntax.Expression is CollectionExpressionSyntax collectionExpressionSyntax)
-        {
-            // Check each value of the collection
-            foreach (var elementSyntax in collectionExpressionSyntax.Elements)
-            {
-                if (elementSyntax is not ExpressionElementSyntax expressionSyntax)
-                    continue;
-
-                // Check if a literal was passed in
-                if (expressionSyntax.Expression is not LiteralExpressionSyntax)
-                    continue;
-
-                context.ReportDiagnostic(Diagnostic.Create(ForbidLiteralRule,
-                    expressionSyntax.GetLocation(),
-                    operation.Parameter.Name,
-                    (context.Operation as IInvocationOperation).TargetMethod.Name
-                ));
-            }
-            return;
-        }
-
-        // Not a collection, just a single value to check
-        // Check if it's a literal
-        if (argumentSyntax.Expression is not LiteralExpressionSyntax)
-            return;
-
-        context.ReportDiagnostic(Diagnostic.Create(ForbidLiteralRule,
-            argumentSyntax.GetLocation(),
-            operation.Parameter.Name,
-            (context.Operation as IInvocationOperation).TargetMethod.Name
-        ));
-    }
-}

Robust.Analyzers/MustCallBaseAnalyzer.cs

@@ -1,111 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-#nullable enable
-
-/// <summary>
-/// Enforces <c>MustCallBaseAttribute</c>.
-/// </summary>
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class MustCallBaseAnalyzer : DiagnosticAnalyzer
-{
-    private const string Attribute = "Robust.Shared.Analyzers.MustCallBaseAttribute";
-
-    private static readonly DiagnosticDescriptor Rule = new(
-        Diagnostics.IdMustCallBase,
-        "No base call in overriden function",
-        "Overriders of this function must always call the base function",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.EnableConcurrentExecution();
-        context.RegisterSymbolAction(AnalyzeSymbol, SymbolKind.Method);
-    }
-
-    private static void AnalyzeSymbol(SymbolAnalysisContext context)
-    {
-        if (context.Symbol is not IMethodSymbol { IsOverride: true } method)
-            return;
-
-        var attrSymbol = context.Compilation.GetTypeByMetadataName(Attribute);
-        if (attrSymbol == null)
-            return;
-
-        if (DoesMethodOverriderHaveAttribute(method, attrSymbol) is not { } data)
-            return;
-
-        if (data is { onlyOverrides: true, depth: < 2 })
-            return;
-
-        var syntax = (MethodDeclarationSyntax) method.DeclaringSyntaxReferences[0].GetSyntax();
-        if (HasBaseCall(syntax))
-            return;
-
-        var diag = Diagnostic.Create(Rule, syntax.Identifier.GetLocation());
-        context.ReportDiagnostic(diag);
-    }
-
-    private static (int depth, bool onlyOverrides)? DoesMethodOverriderHaveAttribute(
-        IMethodSymbol method,
-        INamedTypeSymbol attributeSymbol)
-    {
-        var depth = 0;
-        while (method.OverriddenMethod != null)
-        {
-            depth += 1;
-            method = method.OverriddenMethod;
-            if (GetAttribute(method, attributeSymbol) is not { } attribute)
-                continue;
-
-            var onlyOverrides = attribute.ConstructorArguments is [{Kind: TypedConstantKind.Primitive, Value: true}];
-            return (depth, onlyOverrides);
-        }
-
-        return null;
-    }
-
-    private static bool HasBaseCall(MethodDeclarationSyntax syntax)
-    {
-        return syntax.Accept(new BaseCallLocator());
-    }
-
-    private static AttributeData? GetAttribute(ISymbol namedTypeSymbol, INamedTypeSymbol attrSymbol)
-    {
-        return namedTypeSymbol.GetAttributes()
-            .SingleOrDefault(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, attrSymbol));
-    }
-
-    private sealed class BaseCallLocator : CSharpSyntaxVisitor<bool>
-    {
-        public override bool VisitBaseExpression(BaseExpressionSyntax node)
-        {
-            return true;
-        }
-
-        public override bool DefaultVisit(SyntaxNode node)
-        {
-            foreach (var childNode in node.ChildNodes())
-            {
-                if (childNode is not CSharpSyntaxNode cSharpSyntax)
-                    continue;
-
-                if (cSharpSyntax.Accept(this))
-                    return true;
-            }
-
-            return false;
-        }
-    }
-}

Robust.Analyzers/PreferNonGenericVariantForAnalyzer.cs

@@ -1,65 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class PreferNonGenericVariantForAnalyzer : DiagnosticAnalyzer
-{
-    private const string AttributeType = "Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute";
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
-        UseNonGenericVariantDescriptor
-    );
-
-    private static readonly DiagnosticDescriptor UseNonGenericVariantDescriptor = new(
-        Diagnostics.IdUseNonGenericVariant,
-        "Consider using the non-generic variant of this method",
-        "Use the non-generic variant of this method for type {0}",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true,
-        "Use the generic variant of this method.");
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.ReportDiagnostics | GeneratedCodeAnalysisFlags.Analyze);
-        context.EnableConcurrentExecution();
-        context.RegisterOperationAction(CheckForNonGenericVariant, OperationKind.Invocation);
-    }
-
-    private void CheckForNonGenericVariant(OperationAnalysisContext obj)
-    {
-        if (obj.Operation is not IInvocationOperation invocationOperation) return;
-
-        var preferNonGenericAttribute = obj.Compilation.GetTypeByMetadataName(AttributeType);
-
-        HashSet<ITypeSymbol> forTypes = [];
-        foreach (var attribute in invocationOperation.TargetMethod.GetAttributes())
-        {
-            if (!SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, preferNonGenericAttribute))
-                continue;
-
-            foreach (var type in attribute.ConstructorArguments[0].Values)
-                forTypes.Add((ITypeSymbol)type.Value);
-
-            break;
-        }
-
-        if (forTypes == null)
-            return;
-
-        foreach (var typeArg in invocationOperation.TargetMethod.TypeArguments)
-        {
-            if (forTypes.Contains(typeArg))
-            {
-                obj.ReportDiagnostic(
-                Diagnostic.Create(UseNonGenericVariantDescriptor,
-                    invocationOperation.Syntax.GetLocation(), typeArg.Name));
-            }
-        }
-    }
-}

Robust.Analyzers/PreferOtherTypeAnalyzer.cs

@@ -1,75 +0,0 @@
-#nullable enable
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class PreferOtherTypeAnalyzer : DiagnosticAnalyzer
-{
-    private const string AttributeType = "Robust.Shared.Analyzers.PreferOtherTypeAttribute";
-
-    private static readonly DiagnosticDescriptor PreferOtherTypeDescriptor = new(
-        Diagnostics.IdPreferOtherType,
-        "Use the specific type",
-        "Use the specific type {0} instead of {1} when the type argument is {2}",
-        "Usage",
-        DiagnosticSeverity.Error,
-        true,
-        "Use the specific type.");
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
-        PreferOtherTypeDescriptor
-    );
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.ReportDiagnostics | GeneratedCodeAnalysisFlags.Analyze);
-        context.EnableConcurrentExecution();
-        context.RegisterSyntaxNodeAction(AnalyzeField, SyntaxKind.VariableDeclaration);
-    }
-
-    private void AnalyzeField(SyntaxNodeAnalysisContext context)
-    {
-        if (context.Node is not VariableDeclarationSyntax node)
-            return;
-
-        // Get the type of the generic being used
-        if (node.Type is not GenericNameSyntax genericName)
-            return;
-        var genericSyntax = genericName.TypeArgumentList.Arguments[0];
-        if (context.SemanticModel.GetSymbolInfo(genericSyntax).Symbol is not { } genericType)
-            return;
-
-        // Look for the PreferOtherTypeAttribute
-        var symbolInfo = context.SemanticModel.GetSymbolInfo(node.Type);
-        if (symbolInfo.Symbol?.GetAttributes() is not { } attributes)
-            return;
-
-        var preferOtherTypeAttribute = context.Compilation.GetTypeByMetadataName(AttributeType);
-
-        foreach (var attribute in attributes)
-        {
-            if (!SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, preferOtherTypeAttribute))
-                continue;
-
-            // See if the generic type argument matches the type the attribute specifies
-            if (attribute.ConstructorArguments[0].Value is not ITypeSymbol checkedType)
-                return;
-            if (!SymbolEqualityComparer.Default.Equals(checkedType, genericType))
-                continue;
-
-            if (attribute.ConstructorArguments[1].Value is not ITypeSymbol replacementType)
-                continue;
-            context.ReportDiagnostic(Diagnostic.Create(PreferOtherTypeDescriptor,
-                context.Node.GetLocation(),
-                replacementType.Name,
-                symbolInfo.Symbol.Name,
-                genericType.Name));
-        }
-    }
-}

Robust.Analyzers/PreferOtherTypeFixer.cs

@@ -1,97 +0,0 @@
-#nullable enable
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using static Robust.Roslyn.Shared.Diagnostics;
-
-namespace Robust.Analyzers;
-
-[ExportCodeFixProvider(LanguageNames.CSharp)]
-public sealed class PreferOtherTypeFixer : CodeFixProvider
-{
-    private const string PreferOtherTypeAttributeName = "PreferOtherTypeAttribute";
-
-    public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(
-        IdPreferOtherType
-    );
-
-    public override FixAllProvider GetFixAllProvider()
-    {
-        return WellKnownFixAllProviders.BatchFixer;
-    }
-
-    public override Task RegisterCodeFixesAsync(CodeFixContext context)
-    {
-        foreach (var diagnostic in context.Diagnostics)
-        {
-            switch (diagnostic.Id)
-            {
-                case IdPreferOtherType:
-                    return RegisterReplaceType(context, diagnostic);
-            }
-        }
-
-        return Task.CompletedTask;
-    }
-
-    private static async Task RegisterReplaceType(CodeFixContext context, Diagnostic diagnostic)
-    {
-        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
-        var span = diagnostic.Location.SourceSpan;
-        var token = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<VariableDeclarationSyntax>().First();
-
-        if (token == null)
-            return;
-
-        context.RegisterCodeFix(CodeAction.Create(
-            "Replace type",
-            c => ReplaceType(context.Document, token, c),
-            "Replace type"
-        ), diagnostic);
-    }
-
-    private static async Task<Document> ReplaceType(Document document, VariableDeclarationSyntax syntax, CancellationToken cancellation)
-    {
-        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
-        var model = await document.GetSemanticModelAsync(cancellation);
-
-        if (model == null)
-            return document;
-
-        if (syntax.Type is not GenericNameSyntax genericNameSyntax)
-            return document;
-        var genericTypeSyntax = genericNameSyntax.TypeArgumentList.Arguments[0];
-        if (model.GetSymbolInfo(genericTypeSyntax).Symbol is not {} genericTypeSymbol)
-            return document;
-
-        var symbolInfo = model.GetSymbolInfo(syntax.Type);
-        if (symbolInfo.Symbol?.GetAttributes() is not { } attributes)
-            return document;
-
-        foreach (var attribute in attributes)
-        {
-            if (attribute.AttributeClass?.Name != PreferOtherTypeAttributeName)
-                continue;
-
-            if (attribute.ConstructorArguments[0].Value is not ITypeSymbol checkedTypeSymbol)
-                continue;
-
-            if (!SymbolEqualityComparer.Default.Equals(checkedTypeSymbol, genericTypeSymbol))
-                continue;
-
-            if (attribute.ConstructorArguments[1].Value is not ITypeSymbol replacementTypeSymbol)
-                continue;
-
-            var replacementIdentifier = SyntaxFactory.IdentifierName(replacementTypeSymbol.Name);
-            var replacementSyntax = syntax.WithType(replacementIdentifier);
-
-            root = root!.ReplaceNode(syntax, replacementSyntax);
-            return document.WithSyntaxRoot(root);
-        }
-
-        return document;
-    }
-}

Robust.Analyzers/Robust.Analyzers.csproj

@@ -16,21 +16,9 @@
     <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" LinkBase="Implementations" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!-- Needed for PreferNonGenericVariantAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\PreferNonGenericVariantForAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Needed for PreferOtherTypeAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\PreferOtherTypeAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
   <ItemGroup>
     <!-- Needed for DataDefinitionAnalyzer. -->
     <Compile Include="..\Robust.Shared\Serialization\Manager\Definition\DataDefinitionUtility.cs" LinkBase="Implementations" />
-    <Compile Include="..\Robust.Shared\ViewVariables\ViewVariablesAttribute.cs" LinkBase="Implementations" />
-    <Compile Include="..\Robust.Shared\Serialization\NetSerializableAttribute.cs" LinkBase="Implementations" />
   </ItemGroup>
 
   <Import Project="../Robust.Roslyn.Shared/Robust.Roslyn.Shared.props" />

Robust.Benchmarks/EntityManager/HasComponentBenchmark.cs

@@ -1,96 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Engines;
-using JetBrains.Annotations;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.EntityManager;
-
-[Virtual]
-public partial class HasComponentBenchmark
-{
-    private static readonly Consumer Consumer = new();
-
-    private ISimulation _simulation = default!;
-    private IEntityManager _entityManager = default!;
-
-    private ComponentRegistration _compReg = default!;
-
-    private A _dummyA = new();
-
-    [UsedImplicitly]
-    [Params(1, 10, 100, 1000)]
-    public int N;
-
-    [GlobalSetup]
-    public void GlobalSetup()
-    {
-        _simulation = RobustServerSimulation
-            .NewSimulation()
-            .RegisterComponents(f => f.RegisterClass<A>())
-            .InitializeInstance();
-
-        _entityManager = _simulation.Resolve<IEntityManager>();
-        var map = _simulation.CreateMap().Uid;
-        var coords = new EntityCoordinates(map, default);
-        _compReg = _entityManager.ComponentFactory.GetRegistration(typeof(A));
-
-        for (var i = 0; i < N; i++)
-        {
-            var uid = _entityManager.SpawnEntity(null, coords);
-            _entityManager.AddComponent<A>(uid);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentGeneric()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var result = _entityManager.HasComponent<A>(uid);
-            Consumer.Consume(result);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentCompReg()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var result = _entityManager.HasComponent(uid, _compReg);
-            Consumer.Consume(result);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentType()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var result = _entityManager.HasComponent(uid, typeof(A));
-            Consumer.Consume(result);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentGetType()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var type = _dummyA.GetType();
-            var result = _entityManager.HasComponent(uid, type);
-            Consumer.Consume(result);
-        }
-    }
-
-    [ComponentProtoName("A")]
-    public sealed partial class A : Component
-    {
-    }
-}

Robust.Benchmarks/Physics/BoxStackBenchmark.cs

@@ -1,96 +0,0 @@
-using System;
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Microsoft.Extensions.Configuration;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-[MediumRunJob]
-public class PhysicsBoxStackBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 30; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    [Benchmark]
-    public void BoxStack()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 10000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-
-        var horizontal = new EdgeShape(new Vector2(-40, 0), new Vector2(40, 0));
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(horizontal, 2, 2, true), body: ground);
-
-        var vertical = new EdgeShape(new Vector2(10, 0), new Vector2(10, 10));
-        fixtures.CreateFixture(groundUid, "fix2", new Fixture(vertical, 2, 2, true), body: ground);
-
-        var xs = new[]
-        {
-            0.0f, -10.0f, -5.0f, 5.0f, 10.0f
-        };
-
-        var columnCount = 1;
-        var rowCount = 15;
-        PolygonShape shape;
-
-        for (var j = 0; j < columnCount; j++)
-        {
-            for (var i = 0; i < rowCount; i++)
-            {
-                var x = 0.0f;
-
-                var boxUid = entManager.SpawnEntity(null,
-                    new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 1.1f * i), mapId));
-                var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-
-                physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-
-                shape = new PolygonShape();
-                shape.SetAsBox(0.5f, 0.5f);
-                physics.SetFixedRotation(boxUid, false, body: box);
-                fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true), body: box);
-
-                physics.WakeBody(boxUid, body: box);
-                physics.SetSleepingAllowed(boxUid, box, false);
-            }
-        }
-
-        physics.WakeBody(groundUid, body: ground);
-    }
-}

Robust.Benchmarks/Physics/CircleStackBenchmark.cs

@@ -1,92 +0,0 @@
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-public class PhysicsCircleStackBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 30; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    [Benchmark]
-    public void CircleStack()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 10000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-
-        var horizontal = new EdgeShape(new Vector2(-40, 0), new Vector2(40, 0));
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(horizontal, 2, 2, true), body: ground);
-
-        var vertical = new EdgeShape(new Vector2(20, 0), new Vector2(20, 20));
-        fixtures.CreateFixture(groundUid, "fix2", new Fixture(vertical, 2, 2, true), body: ground);
-
-        var xs = new[]
-        {
-            0.0f, -10.0f, -5.0f, 5.0f, 10.0f
-        };
-
-        var columnCount = 1;
-        var rowCount = 15;
-        PhysShapeCircle shape;
-
-        for (var j = 0; j < columnCount; j++)
-        {
-            for (var i = 0; i < rowCount; i++)
-            {
-                var x = 0.0f;
-
-                var boxUid = entManager.SpawnEntity(null,
-                    new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId));
-                var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-
-                physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-                shape = new PhysShapeCircle(0.5f);
-                physics.SetFixedRotation(boxUid, false, body: box);
-                // TODO: Need to detect shape and work out if we need to use fixedrotation
-
-                fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true, 5f));
-                physics.WakeBody(boxUid, body: box);
-                physics.SetSleepingAllowed(boxUid, box, false);
-            }
-        }
-
-        physics.WakeBody(groundUid, body: ground);
-    }
-}

Robust.Benchmarks/Physics/PyramidBenchmark.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-public class PhysicsPyramidBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 300; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    [Benchmark]
-    public void Pyramid()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 5000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        const byte count = 20;
-
-        // Setup ground
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-
-        var horizontal = new EdgeShape(new Vector2(40, 0), new Vector2(-40, 0));
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(horizontal, 2, 2, true), body: ground);
-        physics.WakeBody(groundUid, body: ground);
-
-        // Setup boxes
-        float a = 0.5f;
-        PolygonShape shape = new();
-        shape.SetAsBox(a, a);
-
-        var x = new Vector2(-7.0f, 0.75f);
-        Vector2 y;
-        Vector2 deltaX = new Vector2(0.5625f, 1.25f);
-        Vector2 deltaY = new Vector2(1.125f, 0.0f);
-
-        for (var i = 0; i < count; ++i)
-        {
-            y = x;
-
-            for (var j = i; j < count; ++j)
-            {
-                var boxUid = entManager.SpawnEntity(null, new MapCoordinates(y, mapId));
-                var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-                physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-
-                fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true, 5f), body: box);
-                y += deltaY;
-
-                physics.WakeBody(boxUid, body: box);
-                physics.SetSleepingAllowed(boxUid, box, false);
-            }
-
-            x += deltaX;
-        }
-    }
-}

Robust.Benchmarks/Physics/TumblerBenchmark.cs

@@ -1,108 +0,0 @@
-using System;
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-public class PhysicsTumblerBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-        var mapUid = entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 300; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-            var boxUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 10f, mapId));
-            var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-            physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-            physics.SetFixedRotation(boxUid, false, body: box);
-            var shape = new PolygonShape();
-            shape.SetAsBox(0.125f, 0.125f);
-            fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true, 0.0625f), body: box);
-            physics.WakeBody(boxUid, body: box);
-            physics.SetSleepingAllowed(boxUid, box, false);
-        }
-
-        if (entManager.TryGetComponent(mapUid, out BroadphaseComponent? mapBroadphase))
-            entManager.System<SharedBroadphaseSystem>().RebuildBottomUp(mapBroadphase);
-    }
-
-    [Benchmark]
-    public void Tumbler()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 1000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-        var joints = entManager.System<SharedJointSystem>();
-
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 0f, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-        // Due to lookup changes fixtureless bodies are invalid, so
-        var cShape = new PhysShapeCircle(1f);
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(cShape, 0, 0, false));
-
-        var bodyUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 10f, mapId));
-        var body = entManager.AddComponent<PhysicsComponent>(bodyUid);
-
-        physics.SetBodyType(bodyUid, BodyType.Dynamic, body: body);
-        physics.SetSleepingAllowed(bodyUid, body, false);
-        physics.SetFixedRotation(bodyUid, false, body: body);
-
-
-        // TODO: Box2D just deref, bleh shape structs someday
-        var shape1 = new PolygonShape();
-        shape1.SetAsBox(0.5f, 10.0f, new Vector2(10.0f, 0.0f), 0.0f);
-        fixtures.CreateFixture(bodyUid, "fix1", new Fixture(shape1, 2, 0, true, 20f));
-
-        var shape2 = new PolygonShape();
-        shape2.SetAsBox(0.5f, 10.0f, new Vector2(-10.0f, 0.0f), 0f);
-        fixtures.CreateFixture(bodyUid, "fix2", new Fixture(shape2, 2, 0, true, 20f));
-
-        var shape3 = new PolygonShape();
-        shape3.SetAsBox(10.0f, 0.5f, new Vector2(0.0f, 10.0f), 0f);
-        fixtures.CreateFixture(bodyUid, "fix3", new Fixture(shape3, 2, 0, true, 20f));
-
-        var shape4 = new PolygonShape();
-        shape4.SetAsBox(10.0f, 0.5f, new Vector2(0.0f, -10.0f), 0f);
-        fixtures.CreateFixture(bodyUid, "fix4", new Fixture(shape4, 2, 0, true, 20f));
-
-        physics.WakeBody(groundUid, body: ground);
-        physics.WakeBody(bodyUid, body: body);
-        var revolute = joints.CreateRevoluteJoint(groundUid, bodyUid);
-        revolute.LocalAnchorA = new Vector2(0f, 10f);
-        revolute.LocalAnchorB = new Vector2(0f, 0f);
-        revolute.ReferenceAngle = 0f;
-        revolute.MotorSpeed = 0.05f * MathF.PI;
-        revolute.MaxMotorTorque = 100000000f;
-        revolute.EnableMotor = true;
-    }
-}

Robust.Benchmarks/Robust.Benchmarks.csproj

@@ -19,10 +19,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
-
-    <!-- Needed to pin transitive dependency versions. -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
-    <PackageReference Include="System.Formats.Asn1" />
   </ItemGroup>
 
   <Import Project="..\MSBuild\Robust.Properties.targets" />

Robust.Client.Injectors/CompileRobustXamlTask.cs

@@ -1,8 +1,8 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Microsoft.Build.Framework;
-using Robust.Xaml;
 
 namespace Robust.Build.Tasks
 {
@@ -37,12 +37,10 @@ namespace Robust.Build.Tasks
             var msg = $"CompileRobustXamlTask -> AssemblyFile:{AssemblyFile}, ProjectDirectory:{ProjectDirectory}, OutputPath:{OutputPath}";
             BuildEngine.LogMessage(msg, MessageImportance.High);
 
-            var res = XamlAotCompiler.Compile(
-                BuildEngine, input,
+            var res = XamlCompiler.Compile(BuildEngine, input,
                 File.ReadAllLines(ReferencesFilePath).Where(l => !string.IsNullOrWhiteSpace(l)).ToArray(),
-                 OutputPath,
-                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null
-            );
+                ProjectDirectory, OutputPath,
+                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null);
             if (!res.success)
                 return false;
             if (!res.writtentofile)
@@ -67,24 +65,22 @@ namespace Robust.Build.Tasks
             return true;
         }
 
-        // PYREX NOTE: This project was comically null-unsafe before I touched it. I'm just marking what it did accurately
         [Required]
-        public string ReferencesFilePath { get; set; } = null!;
+        public string ReferencesFilePath { get; set; }
 
         [Required]
-
-        public string ProjectDirectory { get; set; } = null!;
+        public string ProjectDirectory { get; set; }
 
         [Required]
-        public string AssemblyFile { get; set; } = null!;
+        public string AssemblyFile { get; set; }
 
         [Required]
-        public string? OriginalCopyPath { get; set; } = null;
+        public string OriginalCopyPath { get; set; }
 
-        public string? OutputPath { get; set; }
-        public string UpdateBuildIndicator { get; set; } = null!;
+        public string OutputPath { get; set; }
+        public string UpdateBuildIndicator { get; set; }
 
-        public string AssemblyOriginatorKeyFile { get; set; } = null!;
+        public string AssemblyOriginatorKeyFile { get; set; }
         public bool SignAssembly { get; set; }
         public bool DelaySign { get; set; }
 
@@ -99,7 +95,7 @@ namespace Robust.Build.Tasks
             return rv;
         }
 
-        public IBuildEngine BuildEngine { get; set; } = null!;
-        public ITaskHost HostObject { get; set; } = null!;
+        public IBuildEngine BuildEngine { get; set; }
+        public ITaskHost HostObject { get; set; }
     }
 }

Robust.Client.Injectors/Extensions.cs

@@ -1,11 +1,11 @@
 using Microsoft.Build.Framework;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     /// <summary>
     /// Taken from https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/Extensions.cs
     /// </summary>
-    internal static class Extensions
+    public static class Extensions
     {
         //shamefully copied from avalonia
         public static void LogMessage(this IBuildEngine engine, string message, MessageImportance imp)

Robust.Client.Injectors/MathParsing.cs

@@ -0,0 +1,37 @@
+using System.Linq;
+using Pidgin;
+using static Pidgin.Parser;
+
+
+namespace Robust.Build.Tasks
+{
+    public static class MathParsing
+    {
+        public static Parser<char, float> Single { get; } = Real.Select(c => (float) c);
+
+        public static Parser<char, float> Single1 { get; }
+            = Single.Between(SkipWhitespaces);
+
+        public static Parser<char, (float, float)> Single2 { get; }
+            = Single.Before(SkipWhitespaces).Repeat(2).Select(e =>
+            {
+                var arr = e.ToArray();
+                return (arr[0], arr[1]);
+            });
+
+        public static Parser<char, (float, float, float, float)> Single4 { get; }
+            = Single.Before(SkipWhitespaces).Repeat(4).Select(e =>
+            {
+                var arr = e.ToArray();
+                return (arr[0], arr[1], arr[2], arr[3]);
+            });
+
+        public static Parser<char, float[]> Thickness { get; }
+            = SkipWhitespaces.Then(
+                OneOf(
+                    Try(Single4.Select(c => new[] {c.Item1, c.Item2, c.Item3, c.Item4})),
+                    Try(Single2.Select(c => new[] {c.Item1, c.Item2})),
+                    Try(Single1.Select(c => new[] {c}))
+                ));
+    }
+}

Robust.Client.Injectors/Program.cs

@@ -55,11 +55,9 @@ namespace Robust.Build.Tasks
         public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties,
             IDictionary targetOutputs) => throw new NotSupportedException();
 
-        // PYREX NOTE: This project was extremely null-unsafe before I touched it. I'm just marking what it did already
-        // Here's the broken interface of IBuildEngine that we started with
-        public bool ContinueOnError => default;
-        public int LineNumberOfTaskNode => default;
-        public int ColumnNumberOfTaskNode => default;
-        public string ProjectFileOfTaskNode => null!;
+        public bool ContinueOnError { get; }
+        public int LineNumberOfTaskNode { get; }
+        public int ColumnNumberOfTaskNode { get; }
+        public string ProjectFileOfTaskNode { get; }
     }
 }

Robust.Client.Injectors/RXamlColorAstNode.cs

@@ -1,9 +1,10 @@
-using XamlX.Ast;
+using System.Reflection.Emit;
+using XamlX.Ast;
 using XamlX.Emit;
 using XamlX.IL;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     internal class RXamlColorAstNode
         : XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode

Robust.Client.Injectors/RXamlVecLikeConstAstNode.cs

@@ -6,9 +6,9 @@ using XamlX.Emit;
 using XamlX.IL;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
-    internal abstract class RXamlVecLikeConstAstNode<T>
+    public abstract class RXamlVecLikeConstAstNode<T>
         : XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode
         where T : unmanaged
     {
@@ -47,7 +47,7 @@ namespace Robust.Xaml
         }
     }
 
-    internal sealed class RXamlSingleVecLikeConstAstNode : RXamlVecLikeConstAstNode<float>
+    public sealed class RXamlSingleVecLikeConstAstNode : RXamlVecLikeConstAstNode<float>
     {
         public RXamlSingleVecLikeConstAstNode(
             IXamlLineInfo lineInfo,
@@ -69,7 +69,7 @@ namespace Robust.Xaml
         }
     }
 
-    internal sealed class RXamlInt32VecLikeConstAstNode : RXamlVecLikeConstAstNode<int>
+    public sealed class RXamlInt32VecLikeConstAstNode : RXamlVecLikeConstAstNode<int>
     {
         public RXamlInt32VecLikeConstAstNode(
             IXamlLineInfo lineInfo,

Robust.Client.Injectors/RXamlWellKnownTypes.cs

@@ -2,9 +2,9 @@
 using XamlX.Transform;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
-    internal class RXamlWellKnownTypes
+    class RXamlWellKnownTypes
     {
         public XamlTypeWellKnownTypes XamlIlTypes { get; }
         public IXamlType Single { get; }

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

@@ -1,30 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\MSBuild\Robust.Engine.props" />
 
-    <!--
-    PJB3005 (2024-08-24)
-    So the reason that Robust.Client.Injectors is NS2.0 is that Visual Studio 
-    still ships a .NET FX based MSBuild for some godforsaken reason. This means 
-    that when having Robust.Client.Injectors loaded directly by the main MSBuild 
-    process... that would break.
-
-    Except we don't do that anyways right now due to file locking issues, so maybe 
-    it's fine to give up on that. Whatever. 
-    -->
     <PropertyGroup>
-      <TargetFramework>netstandard2.0</TargetFramework>
-      <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-      <LangVersion>8.0</LangVersion>
-      <Nullable>enable</Nullable>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" />
       <PackageReference Include="Mono.Cecil" Version="0.11.5" />
+      <PackageReference Include="Pidgin" Version="2.5.0" />
     </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj" />
-      <ProjectReference Include="..\Robust.Xaml\Robust.Xaml.csproj" />
     </ItemGroup>
 </Project>

Robust.Client.Injectors/RobustXamlILCompiler.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Diagnostics;
+using System.Linq;
 using XamlX;
 using XamlX.Ast;
 using XamlX.Emit;
@@ -6,7 +7,7 @@ using XamlX.IL;
 using XamlX.Transform;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     /// <summary>
     /// Emitters & Transformers based on:
@@ -14,7 +15,7 @@ namespace Robust.Xaml
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AddNameScopeRegistration.cs
     /// - https://github.com/AvaloniaUI/Avalonia/blob/afb8ae6f3c517dae912729511483995b16cb31af/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/IgnoredDirectivesTransformer.cs
     /// </summary>
-    internal class RobustXamlILCompiler : XamlILCompiler
+    public class RobustXamlILCompiler : XamlILCompiler
     {
         public RobustXamlILCompiler(TransformerConfiguration configuration, XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings, bool fillWithDefaults) : base(configuration, emitMappings, fillWithDefaults)
         {
@@ -40,9 +41,8 @@ namespace Robust.Xaml
                             && mg.Children.OfType<RobustNameScopeRegistrationXamlIlNode>().Any())
                             return node;
 
-                        IXamlAstValueNode? value = null;
+                        IXamlAstValueNode value = null;
                         for (var c = 0; c < pa.Values.Count; c++)
-                        {
                             if (pa.Values[c].Type.GetClrType().Equals(context.Configuration.WellKnownTypes.String))
                             {
                                 value = pa.Values[c];
@@ -57,7 +57,6 @@ namespace Robust.Xaml
 
                                 break;
                             }
-                        }
 
                         if (value != null)
                         {
@@ -85,9 +84,9 @@ namespace Robust.Xaml
             class RobustNameScopeRegistrationXamlIlNode : XamlAstNode, IXamlAstManipulationNode
             {
                 public IXamlAstValueNode Name { get; set; }
-                public IXamlType? TargetType { get; }
+                public IXamlType TargetType { get; }
 
-                public RobustNameScopeRegistrationXamlIlNode(IXamlAstValueNode name, IXamlType? targetType) : base(name)
+                public RobustNameScopeRegistrationXamlIlNode(IXamlAstValueNode name, IXamlType targetType) : base(name)
                 {
                     TargetType = targetType;
                     Name = name;
@@ -105,7 +104,7 @@ namespace Robust.Xaml
                     {
 
                         var scopeField = context.RuntimeContext.ContextType.Fields.First(f =>
-                            f.Name == XamlCustomizations.ContextNameScopeFieldName);
+                            f.Name == XamlCompiler.ContextNameScopeFieldName);
                         var namescopeRegisterFunction = context.Configuration.TypeSystem
                             .FindType("Robust.Client.UserInterface.XAML.NameScope").Methods
                             .First(m => m.Name == "Register");
@@ -129,7 +128,7 @@ namespace Robust.Xaml
 
                         return XamlILNodeEmitResult.Void(1);
                     }
-                    return default!;  // PYREX NOTE: This doesn't seem safe! But it's what we were doing before Nullable
+                    return default;
                 }
             }
         }
@@ -162,7 +161,7 @@ namespace Robust.Xaml
                 {
                     if (!(node is HandleRootObjectScopeNode))
                     {
-                        return null!;  // PYREX NOTE: This doesn't seem safe, but it predates Nullable on this file
+                        return null;
                     }
 
                     var controlType = context.Configuration.TypeSystem.FindType("Robust.Client.UserInterface.Control");
@@ -171,7 +170,7 @@ namespace Robust.Xaml
                     var dontAbsorb = codeGen.DefineLabel();
                     var end = codeGen.DefineLabel();
                     var contextScopeField = context.RuntimeContext.ContextType.Fields.First(f =>
-                        f.Name == XamlCustomizations.ContextNameScopeFieldName);
+                        f.Name == XamlCompiler.ContextNameScopeFieldName);
                     var controlNameScopeField = controlType.Fields.First(f => f.Name == "NameScope");
                     var nameScopeType = context.Configuration.TypeSystem
                         .FindType("Robust.Client.UserInterface.XAML.NameScope");

Robust.Client.Injectors/XamlCompiler.Helpers.cs

@@ -1,23 +1,33 @@
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Mono.Collections.Generic;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     /// <summary>
-    /// Helpers taken from AvaloniaUI on GitHub.
-    /// </summary>
-    /// <remarks>
+    /// Helpers taken from:
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs
-    /// </remarks>
-    internal partial class XamlAotCompiler
+    /// </summary>
+    public partial class XamlCompiler
     {
-        private static readonly string[] NameSuffixes = {".xaml", ".paml", ".axaml"};
+        static bool CheckXamlName(IResource r) => r.Name.ToLowerInvariant().EndsWith(".xaml")
+                                                  || r.Name.ToLowerInvariant().EndsWith(".paml")
+                                                  || r.Name.ToLowerInvariant().EndsWith(".axaml");
 
-        static bool CheckXamlName(IResource r) =>
-            NameSuffixes.Any(suffix => r.Name.ToLowerInvariant().EndsWith(suffix));
+        private static bool MatchThisCall(Collection<Instruction> instructions, int idx)
+        {
+            var i = instructions[idx];
+            // A "normal" way of passing `this` to a static method:
+
+            // ldarg.0
+            // call void [Avalonia.Markup.Xaml]Avalonia.Markup.Xaml.AvaloniaXamlLoader::Load(object)
+
+            return i.OpCode == OpCodes.Ldarg_0 || (i.OpCode == OpCodes.Ldarg && i.Operand?.Equals(0) == true);
+        }
 
         interface IResource : IFileSource
         {

Robust.Client.Injectors/XamlCompiler.cs

@@ -0,0 +1,389 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Framework;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Mono.Cecil.Rocks;
+using Pidgin;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Parsers;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Robust.Build.Tasks
+{
+    /// <summary>
+    /// Based on https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+    /// Adjusted for our UI-Framework
+    /// </summary>
+    public partial class XamlCompiler
+    {
+        public static (bool success, bool writtentofile) Compile(IBuildEngine engine, string input, string[] references,
+            string projectDirectory, string output, string strongNameKey)
+        {
+            var typeSystem = new CecilTypeSystem(references
+                .Where(r => !r.ToLowerInvariant().EndsWith("robust.build.tasks.dll"))
+                .Concat(new[] { input }), input);
+
+            var asm = typeSystem.TargetAssemblyDefinition;
+
+            if (asm.MainModule.GetType("CompiledRobustXaml", "XamlIlContext") != null)
+            {
+                // If this type exists, the assembly has already been processed by us.
+                // Do not run again, it would corrupt the file.
+                // This *shouldn't* be possible due to Inputs/Outputs dependencies in the build system,
+                // but better safe than sorry eh?
+                engine.LogWarningEvent(new BuildWarningEventArgs("XAMLIL", "", "", 0, 0, 0, 0, "Ran twice on same assembly file; ignoring.", "", ""));
+                return (true, false);
+            }
+
+            var compileRes = CompileCore(engine, typeSystem);
+            if (compileRes == null)
+                return (true, false);
+            if (compileRes == false)
+                return (false, false);
+
+            var writerParameters = new WriterParameters { WriteSymbols = asm.MainModule.HasSymbols };
+            if (!string.IsNullOrWhiteSpace(strongNameKey))
+                writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey);
+
+            asm.Write(output, writerParameters);
+
+            return (true, true);
+
+        }
+
+        static bool? CompileCore(IBuildEngine engine, CecilTypeSystem typeSystem)
+        {
+            var asm = typeSystem.TargetAssemblyDefinition;
+            var embrsc = new EmbeddedResources(asm);
+
+            if (embrsc.Resources.Count(CheckXamlName) == 0)
+                // Nothing to do
+                return null;
+
+            var xamlLanguage = new XamlLanguageTypeMappings(typeSystem)
+            {
+                XmlnsAttributes =
+                {
+                    typeSystem.GetType("Avalonia.Metadata.XmlnsDefinitionAttribute"),
+
+                },
+                ContentAttributes =
+                {
+                    typeSystem.GetType("Avalonia.Metadata.ContentAttribute")
+                },
+                UsableDuringInitializationAttributes =
+                {
+                    typeSystem.GetType("Robust.Client.UserInterface.XAML.UsableDuringInitializationAttribute")
+                },
+                DeferredContentPropertyAttributes =
+                {
+                    typeSystem.GetType("Robust.Client.UserInterface.XAML.DeferredContentAttribute")
+                },
+                RootObjectProvider = typeSystem.GetType("Robust.Client.UserInterface.XAML.ITestRootObjectProvider"),
+                UriContextProvider = typeSystem.GetType("Robust.Client.UserInterface.XAML.ITestUriContext"),
+                ProvideValueTarget = typeSystem.GetType("Robust.Client.UserInterface.XAML.ITestProvideValueTarget"),
+            };
+            var emitConfig = new XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult>
+            {
+                ContextTypeBuilderCallback = (b,c) => EmitNameScopeField(xamlLanguage, typeSystem, b, c)
+            };
+
+            var transformerconfig = new TransformerConfiguration(
+                typeSystem,
+                typeSystem.TargetAssembly,
+                xamlLanguage,
+                XamlXmlnsMappings.Resolve(typeSystem, xamlLanguage), CustomValueConverter);
+
+            var contextDef = new TypeDefinition("CompiledRobustXaml", "XamlIlContext",
+                TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
+            asm.MainModule.Types.Add(contextDef);
+            var contextClass = XamlILContextDefinition.GenerateContextClass(typeSystem.CreateTypeBuilder(contextDef), typeSystem,
+                xamlLanguage, emitConfig);
+
+            var compiler =
+                new RobustXamlILCompiler(transformerconfig, emitConfig, true);
+
+            bool CompileGroup(IResourceGroup group)
+            {
+                var typeDef = new TypeDefinition("CompiledRobustXaml", "!" + group.Name, TypeAttributes.Class,
+                    asm.MainModule.TypeSystem.Object);
+
+                //typeDef.CustomAttributes.Add(new CustomAttribute(ed));
+                asm.MainModule.Types.Add(typeDef);
+                var builder = typeSystem.CreateTypeBuilder(typeDef);
+
+                foreach (var res in group.Resources.Where(CheckXamlName))
+                {
+                    try
+                    {
+                        engine.LogMessage($"XAMLIL: {res.Name} -> {res.Uri}", MessageImportance.Low);
+
+                        var xaml = new StreamReader(new MemoryStream(res.FileContents)).ReadToEnd();
+                        var parsed = XDocumentXamlParser.Parse(xaml);
+
+                        var initialRoot = (XamlAstObjectNode) parsed.Root;
+
+                        var classDirective = initialRoot.Children.OfType<XamlAstXmlDirective>()
+                            .FirstOrDefault(d => d.Namespace == XamlNamespaces.Xaml2006 && d.Name == "Class");
+                        string classname;
+                        if (classDirective != null && classDirective.Values[0] is XamlAstTextNode tn)
+                        {
+                            classname = tn.Text;
+                        }
+                        else
+                        {
+                            classname = res.Name.Replace(".xaml","");
+                        }
+
+                        var classType = typeSystem.TargetAssembly.FindType(classname);
+                        if (classType == null)
+                            throw new Exception($"Unable to find type '{classname}'");
+
+                        compiler.Transform(parsed);
+
+                        var populateName = $"Populate:{res.Name}";
+                        var buildName = $"Build:{res.Name}";
+
+                        var classTypeDefinition = typeSystem.GetTypeReference(classType).Resolve();
+
+                        var populateBuilder = typeSystem.CreateTypeBuilder(classTypeDefinition);
+
+                        compiler.Compile(parsed, contextClass,
+                            compiler.DefinePopulateMethod(populateBuilder, parsed, populateName,
+                                classTypeDefinition == null),
+                            compiler.DefineBuildMethod(builder, parsed, buildName, true),
+                            null,
+                            (closureName, closureBaseType) =>
+                                populateBuilder.DefineSubType(closureBaseType, closureName, false),
+                            res.Uri, res
+                        );
+
+                        //add compiled populate method
+                        var compiledPopulateMethod = typeSystem.GetTypeReference(populateBuilder).Resolve().Methods
+                            .First(m => m.Name == populateName);
+
+                        const string TrampolineName = "!XamlIlPopulateTrampoline";
+                        var trampoline = new MethodDefinition(TrampolineName,
+                            MethodAttributes.Static | MethodAttributes.Private, asm.MainModule.TypeSystem.Void);
+                        trampoline.Parameters.Add(new ParameterDefinition(classTypeDefinition));
+                        classTypeDefinition.Methods.Add(trampoline);
+
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Ldnull));
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Ldarg_0));
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Call, compiledPopulateMethod));
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
+
+                        var foundXamlLoader = false;
+                        // Find RobustXamlLoader.Load(this) and replace it with !XamlIlPopulateTrampoline(this)
+                        foreach (var method in classTypeDefinition.Methods
+                            .Where(m => !m.Attributes.HasFlag(MethodAttributes.Static)))
+                        {
+                            var i = method.Body.Instructions;
+                            for (var c = 1; c < i.Count; c++)
+                            {
+                                if (i[c].OpCode == OpCodes.Call)
+                                {
+                                    var op = i[c].Operand as MethodReference;
+
+                                    if (op != null
+                                        && op.Name == TrampolineName)
+                                    {
+                                        foundXamlLoader = true;
+                                        break;
+                                    }
+
+                                    if (op != null
+                                        && op.Name == "Load"
+                                        && op.Parameters.Count == 1
+                                        && op.Parameters[0].ParameterType.FullName == "System.Object"
+                                        && op.DeclaringType.FullName == "Robust.Client.UserInterface.XAML.RobustXamlLoader")
+                                    {
+                                        if (MatchThisCall(i, c - 1))
+                                        {
+                                            i[c].Operand = trampoline;
+                                            foundXamlLoader = true;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        if (!foundXamlLoader)
+                        {
+                            var ctors = classTypeDefinition.GetConstructors()
+                                .Where(c => !c.IsStatic).ToList();
+                            // We can inject xaml loader into default constructor
+                            if (ctors.Count == 1 && ctors[0].Body.Instructions.Count(o=>o.OpCode != OpCodes.Nop) == 3)
+                            {
+                                var i = ctors[0].Body.Instructions;
+                                var retIdx = i.IndexOf(i.Last(x => x.OpCode == OpCodes.Ret));
+                                i.Insert(retIdx, Instruction.Create(OpCodes.Call, trampoline));
+                                i.Insert(retIdx, Instruction.Create(OpCodes.Ldarg_0));
+                            }
+                            else
+                            {
+                                throw new InvalidProgramException(
+                                    $"No call to RobustXamlLoader.Load(this) call found anywhere in the type {classType.FullName} and type seems to have custom constructors.");
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        engine.LogErrorEvent(new BuildErrorEventArgs("XAMLIL", "", res.FilePath, 0, 0, 0, 0,
+                            $"{res.FilePath}: {e.Message}", "", "CompileRobustXaml"));
+                    }
+                    res.Remove();
+                }
+                return true;
+            }
+
+            if (embrsc.Resources.Count(CheckXamlName) != 0)
+            {
+                if (!CompileGroup(embrsc))
+                    return false;
+            }
+
+            return true;
+        }
+
+        private static bool CustomValueConverter(
+            AstTransformationContext context,
+            IXamlAstValueNode node,
+            IXamlType type,
+            out IXamlAstValueNode result)
+        {
+            if (!(node is XamlAstTextNode textNode))
+            {
+                result = null;
+                return false;
+            }
+
+            var text = textNode.Text;
+            var types = context.GetRobustTypes();
+
+            if (type.Equals(types.Vector2))
+            {
+                var foo = MathParsing.Single2.Parse(text);
+
+                if (!foo.Success)
+                    throw new XamlLoadException($"Unable to parse \"{text}\" as a Vector2", node);
+
+                var (x, y) = foo.Value;
+
+                result = new RXamlSingleVecLikeConstAstNode(
+                    node,
+                    types.Vector2, types.Vector2ConstructorFull,
+                    types.Single, new[] {x, y});
+                return true;
+            }
+
+            if (type.Equals(types.Thickness))
+            {
+                var foo = MathParsing.Thickness.Parse(text);
+
+                if (!foo.Success)
+                    throw new XamlLoadException($"Unable to parse \"{text}\" as a Thickness", node);
+
+                var val = foo.Value;
+                float[] full;
+                if (val.Length == 1)
+                {
+                    var u = val[0];
+                    full = new[] {u, u, u, u};
+                }
+                else if (val.Length == 2)
+                {
+                    var h = val[0];
+                    var v = val[1];
+                    full = new[] {h, v, h, v};
+                }
+                else // 4
+                {
+                    full = val;
+                }
+
+                result = new RXamlSingleVecLikeConstAstNode(
+                    node,
+                    types.Thickness, types.ThicknessConstructorFull,
+                    types.Single, full);
+                return true;
+            }
+
+            if (type.Equals(types.Thickness))
+            {
+                var foo = MathParsing.Thickness.Parse(text);
+
+                if (!foo.Success)
+                    throw new XamlLoadException($"Unable to parse \"{text}\" as a Thickness", node);
+
+                var val = foo.Value;
+                float[] full;
+                if (val.Length == 1)
+                {
+                    var u = val[0];
+                    full = new[] {u, u, u, u};
+                }
+                else if (val.Length == 2)
+                {
+                    var h = val[0];
+                    var v = val[1];
+                    full = new[] {h, v, h, v};
+                }
+                else // 4
+                {
+                    full = val;
+                }
+
+                result = new RXamlSingleVecLikeConstAstNode(
+                    node,
+                    types.Thickness, types.ThicknessConstructorFull,
+                    types.Single, full);
+                return true;
+            }
+
+            if (type.Equals(types.Color))
+            {
+                // TODO: Interpret these colors at XAML compile time instead of at runtime.
+                result = new RXamlColorAstNode(node, types, text);
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
+        public const string ContextNameScopeFieldName = "RobustNameScope";
+
+        private static void EmitNameScopeField(XamlLanguageTypeMappings xamlLanguage, CecilTypeSystem typeSystem, IXamlTypeBuilder<IXamlILEmitter> typeBuilder, IXamlILEmitter constructor)
+        {
+            var nameScopeType = typeSystem.FindType("Robust.Client.UserInterface.XAML.NameScope");
+            var field = typeBuilder.DefineField(nameScopeType,
+                ContextNameScopeFieldName, true, false);
+            constructor
+                .Ldarg_0()
+                .Newobj(nameScopeType.GetConstructor())
+                .Stfld(field);
+        }
+    }
+
+    interface IResource : IFileSource
+    {
+        string Uri { get; }
+        string Name { get; }
+        void Remove();
+
+    }
+
+    interface IResourceGroup
+    {
+        string Name { get; }
+        IEnumerable<IResource> Resources { get; }
+    }
+}

Robust.Client.NameGenerator/XamlUiPartialClassGenerator.cs

@@ -15,9 +15,6 @@ using XamlX.Transform;
 using XamlX.Transform.Transformers;
 using XamlX.TypeSystem;
 
-// Yes dude I know this source generator isn't incremental, I'll fix it eventually.
-#pragma warning disable RS1035
-
 namespace Robust.Client.NameGenerator
 {
     /// <summary>

Robust.Client.WebView/Cef/BaseRobustCefClient.cs

@@ -64,8 +64,6 @@ internal abstract class BaseRobustCefClient : CefClient
             string title,
             string defaultFilePath,
             string[] acceptFilters,
-            string[] acceptExtensions,
-            string[] acceptDescriptions,
             CefFileDialogCallback callback)
         {
             callback.Cancel();

Robust.Client.WebView/Cef/Program.cs

@@ -6,7 +6,7 @@ using Xilium.CefGlue;
 
 namespace Robust.Client.WebView.Cef
 {
-    internal static class Program
+    public static class Program
     {
         // This was supposed to be the main entry for the subprocess program... It doesn't work.
         public static int Main(string[] args)

Robust.Client.WebView/Cef/RobustCefApp.cs

@@ -44,8 +44,6 @@ namespace Robust.Client.WebView.Cef
             //commandLine.AppendSwitch("--disable-gpu-compositing");
             //commandLine.AppendSwitch("--in-process-gpu");
 
-            commandLine.AppendSwitch("--off-screen-rendering-enabled");
-
             commandLine.AppendSwitch("disable-threaded-scrolling", "1");
             commandLine.AppendSwitch("disable-features", "TouchpadAndWheelScrollLatching,AsyncWheelEvents");
 

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

@@ -23,7 +23,6 @@ namespace Robust.Client.WebView.Cef
             var info = CefWindowInfo.Create();
             info.Bounds = new CefRectangle(0, 0, createParams.Width, createParams.Height);
             info.SetAsPopup(mainHWnd, "ss14cef");
-             info.RuntimeStyle = CefRuntimeStyle.Alloy;
 
             var impl = new WebViewWindowImpl(this);
 

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

@@ -484,27 +484,27 @@ namespace Robust.Client.WebView.Cef
             public void FocusEntered()
             {
                 if (_textInputActive)
-                    Owner.Root?.Window?.TextInputStart();
+                    _clyde.TextInputStart();
             }
 
             public void FocusExited()
             {
                 if (_textInputActive)
-                    Owner.Root?.Window?.TextInputStop();
+                    _clyde.TextInputStop();
             }
 
             public void TextInputStart()
             {
                 _textInputActive = true;
                 if (Owner.HasKeyboardFocus())
-                    Owner.Root?.Window?.TextInputStart();
+                    _clyde.TextInputStart();
             }
 
             public void TextInputStop()
             {
                 _textInputActive = false;
                 if (Owner.HasKeyboardFocus())
-                    Owner.Root?.Window?.TextInputStop();
+                    _clyde.TextInputStop();
             }
 
             private sealed class LiveData
@@ -587,11 +587,8 @@ namespace Robust.Client.WebView.Cef
                 }
             }
 
-            protected override void OnAcceleratedPaint(
-                CefBrowser browser,
-                CefPaintElementType type,
-                CefRectangle[] dirtyRects,
-                in CefAcceleratedPaintInfo info)
+            protected override void OnAcceleratedPaint(CefBrowser browser, CefPaintElementType type,
+                CefRectangle[] dirtyRects, IntPtr sharedHandle)
             {
                 // Unused, but we're forced to implement it so.. NOOP.
             }

Robust.Client.WebView/Cef/WebViewManagerCef.cs

@@ -5,7 +5,6 @@ using System.Net;
 using System.Reflection;
 using System.Text;
 using Robust.Client.Console;
-using Robust.Client.Utility;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.IoC;
@@ -25,7 +24,6 @@ namespace Robust.Client.WebView.Cef
 
         [Dependency] private readonly IDependencyCollection _dependencyCollection = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IGameControllerInternal _gameController = default!;
         [Dependency] private readonly IResourceManagerInternal _resourceManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
@@ -63,10 +61,7 @@ namespace Robust.Client.WebView.Cef
 
             var cachePath = "";
             if (_resourceManager.UserData is WritableDirProvider userData)
-            {
-                var rootDir = UserDataDir.GetRootUserDataDir(_gameController);
-                cachePath = Path.Combine(rootDir, "cef_cache", "0");
-            }
+                cachePath = userData.GetFullPath(new ResPath("/cef_cache"));
 
             var settings = new CefSettings()
             {

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

@@ -5,7 +5,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>WinExe</OutputType>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
-    <CETCompat>false</CETCompat>
   </PropertyGroup>
 
   <ItemGroup>

Robust.Client/Animations/AnimationTrackPlaySound.cs

@@ -40,7 +40,11 @@ namespace Robust.Client.Animations
                 var keyFrame = KeyFrames[keyFrameIndex];
 
                 var audioParams = keyFrame.AudioParamsFunc.Invoke();
-                IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AudioSystem>().PlayEntity(keyFrame.Specifier, Filter.Local(), entity, true, audioParams);
+                var audio = new SoundPathSpecifier(keyFrame.Resource)
+                {
+                    Params = audioParams
+                };
+                IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AudioSystem>().PlayEntity(audio, Filter.Local(), entity, true);
             }
 
             return (keyFrameIndex, playingTime);
@@ -51,7 +55,7 @@ namespace Robust.Client.Animations
             /// <summary>
             ///     The RSI state to play when this keyframe gets triggered.
             /// </summary>
-            public readonly ResolvedSoundSpecifier Specifier;
+            public readonly string Resource;
 
             /// <summary>
             ///     A function that returns the audio parameter to be used.
@@ -65,9 +69,9 @@ namespace Robust.Client.Animations
             /// </summary>
             public readonly float KeyTime;
 
-            public KeyFrame(ResolvedSoundSpecifier specifier, float keyTime, Func<AudioParams>? audioParams = null)
+            public KeyFrame(string resource, float keyTime, Func<AudioParams>? audioParams = null)
             {
-                Specifier = specifier;
+                Resource = resource;
                 KeyTime = keyTime;
                 AudioParamsFunc = audioParams ?? (() => AudioParams.Default);
             }

Robust.Client/Audio/AudioManager.Public.cs

@@ -84,19 +84,6 @@ internal partial class AudioManager
         AL.Listener(ALListenerfv.Orientation, ref at, ref up);
     }
 
-    void IAudioInternal.Remove(AudioStream stream)
-    {
-        if (stream.ClydeHandle == null)
-            return;
-
-        if (!_audioSampleBuffers.Remove(stream.BufferId))
-        {
-            return;
-        }
-
-        AL.DeleteBuffer(stream.BufferId);
-    }
-
     /// <inheritdoc/>
     public AudioStream LoadAudioOggVorbis(Stream stream, string? name = null)
     {
@@ -133,9 +120,9 @@ internal partial class AudioManager
         _checkAlError();
 
         var handle = new ClydeHandle(_audioSampleBuffers.Count);
-        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
+        _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
         var length = TimeSpan.FromSeconds(vorbis.TotalSamples / (double) vorbis.SampleRate);
-        return new AudioStream(this, buffer, handle, length, (int) vorbis.Channels, name, vorbis.Title, vorbis.Artist);
+        return new AudioStream(handle, length, (int) vorbis.Channels, name, vorbis.Title, vorbis.Artist);
     }
 
     /// <inheritdoc/>
@@ -192,9 +179,9 @@ internal partial class AudioManager
         _checkAlError();
 
         var handle = new ClydeHandle(_audioSampleBuffers.Count);
-        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
+        _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
         var length = TimeSpan.FromSeconds(wav.Data.Length / (double) wav.BlockAlign / wav.SampleRate);
-        return new AudioStream(this, buffer, handle, length, wav.NumChannels, name);
+        return new AudioStream(handle, length, wav.NumChannels, name);
     }
 
     /// <inheritdoc/>
@@ -223,8 +210,8 @@ internal partial class AudioManager
 
         var handle = new ClydeHandle(_audioSampleBuffers.Count);
         var length = TimeSpan.FromSeconds((double) samples.Length / channels / sampleRate);
-        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
-        return new AudioStream(this, buffer, handle, length, channels, name);
+        _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
+        return new AudioStream(handle, length, channels, name);
     }
 
     public void SetMasterGain(float newGain)
@@ -306,7 +293,7 @@ internal partial class AudioManager
 
         // ReSharper disable once PossibleInvalidOperationException
         // TODO: This really shouldn't be indexing based on the ClydeHandle...
-        AL.Source(source, ALSourcei.Buffer, _audioSampleBuffers[stream.BufferId].BufferHandle);
+        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));
@@ -315,7 +302,7 @@ internal partial class AudioManager
     }
 
     /// <inheritdoc/>
-    IBufferedAudioSource? IAudioInternal.CreateBufferedAudioSource(int buffers, bool floatAudio)
+    IBufferedAudioSource? IAudioInternal.CreateBufferedAudioSource(int buffers, bool floatAudio=false)
     {
         var source = AL.GenSource();
 
@@ -383,12 +370,5 @@ internal partial class AudioManager
         }
 
         _bufferedAudioSources.Clear();
-
-        foreach (var buffer in _audioSampleBuffers.Values)
-        {
-            DeleteAudioBufferOnMainThread(buffer.BufferHandle);
-        }
-
-        _audioSampleBuffers.Clear();
     }
 }

Robust.Client/Audio/AudioManager.cs

@@ -5,7 +5,6 @@ using System.Threading;
 using OpenTK.Audio.OpenAL;
 using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
 using Robust.Client.Audio.Sources;
-using Robust.Client.ResourceManagement;
 using Robust.Shared;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
@@ -18,15 +17,13 @@ internal sealed partial class AudioManager : IAudioInternal
 {
     [Shared.IoC.Dependency] private readonly IConfigurationManager _cfg = default!;
     [Shared.IoC.Dependency] private readonly ILogManager _logMan = default!;
-    [Shared.IoC.Dependency] private readonly IReloadManager _reload = default!;
-    [Shared.IoC.Dependency] private readonly IResourceCache _cache = default!;
 
     private Thread? _gameThread;
 
     private ALDevice _openALDevice;
     private ALContext _openALContext;
 
-    private readonly Dictionary<int, LoadedAudioSample> _audioSampleBuffers = new();
+    private readonly List<LoadedAudioSample> _audioSampleBuffers = new();
 
     private readonly Dictionary<int, WeakReference<BaseAudioSource>> _audioSources =
         new();
@@ -119,22 +116,6 @@ internal sealed partial class AudioManager : IAudioInternal
         IsEfxSupported = HasAlDeviceExtension("ALC_EXT_EFX");
 
         _cfg.OnValueChanged(CVars.AudioMasterVolume, SetMasterGain, true);
-
-        _reload.Register("/Audio", "*.ogg");
-        _reload.Register("/Audio", "*.wav");
-
-        _reload.OnChanged += OnReload;
-    }
-
-    private void OnReload(ResPath args)
-    {
-        if (args.Extension != "ogg" &&
-            args.Extension != "wav")
-        {
-            return;
-        }
-
-        _cache.ReloadResource<AudioResource>(args);
     }
 
     internal bool IsMainThread()
@@ -159,19 +140,15 @@ internal sealed partial class AudioManager : IAudioInternal
         }
     }
 
-    internal void LogError(string message)
-    {
-        OpenALSawmill.Error(message);
-    }
-
     /// <summary>
     /// Like _checkAlError but allows custom data to be passed in as relevant.
     /// </summary>
-    internal void LogALError(ALErrorInterpolatedStringHandler message, [CallerMemberName] string callerMember = "", [CallerLineNumber] int callerLineNumber = -1)
+    internal void LogALError(string message, [CallerMemberName] string callerMember = "", [CallerLineNumber] int callerLineNumber = -1)
     {
-        if (message.Error != ALError.NoError)
+        var error = AL.GetError();
+        if (error != ALError.NoError)
         {
-            OpenALSawmill.Error("[{0}:{1}] AL error: {2}, {3}. Stacktrace is {4}", callerMember, callerLineNumber, message.Error, message.ToStringAndClear(), Environment.StackTrace);
+            OpenALSawmill.Error("[{0}:{1}] AL error: {2}, {3}. Stacktrace is {4}", callerMember, callerLineNumber, error, message, Environment.StackTrace);
         }
     }
 
@@ -193,32 +170,4 @@ internal sealed partial class AudioManager : IAudioInternal
             BufferHandle = bufferHandle;
         }
     }
-
-    [InterpolatedStringHandler]
-    internal ref struct ALErrorInterpolatedStringHandler
-    {
-        private DefaultInterpolatedStringHandler _handler;
-        public ALError Error;
-
-        public ALErrorInterpolatedStringHandler(int literalLength, int formattedCount, out bool shouldAppend)
-        {
-            Error = AL.GetError();
-            if (Error == ALError.NoError)
-            {
-                shouldAppend = false;
-                _handler = default;
-            }
-            else
-            {
-                shouldAppend = true;
-                _handler = new DefaultInterpolatedStringHandler(literalLength, formattedCount);
-            }
-        }
-
-        public string ToStringAndClear() => _handler.ToStringAndClear();
-        public override string ToString() => _handler.ToString();
-        public void AppendLiteral(string value) => _handler.AppendLiteral(value);
-        public void AppendFormatted<T>(T value) => _handler.AppendFormatted(value);
-        public void AppendFormatted<T>(T value, string? format) => _handler.AppendFormatted(value, format);
-    }
 }

Robust.Client/Audio/AudioOverlay.cs

@@ -46,7 +46,7 @@ public sealed class AudioOverlay : Overlay
 
         var screenHandle = args.ScreenHandle;
         var output = new StringBuilder();
-        var listenerPos = _transform.GetMapCoordinates(_entManager.GetComponent<TransformComponent>(localPlayer.Value));
+        var listenerPos = _entManager.GetComponent<TransformComponent>(localPlayer.Value).MapPosition;
 
         if (listenerPos.MapId != args.MapId)
             return;

Robust.Client/Audio/AudioStream.cs

@@ -6,15 +6,8 @@ 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 : IDisposable
+public sealed class AudioStream
 {
-    private IAudioInternal _audio;
-
-    /// <summary>
-    /// Buffer ID for this audio in AL.
-    /// </summary>
-    internal int BufferId { get; }
-
     public TimeSpan Length { get; }
     internal IClydeHandle? ClydeHandle { get; }
     public string? Name { get; }
@@ -22,10 +15,8 @@ public sealed class AudioStream : IDisposable
     public string? Artist { get; }
     public int ChannelCount { get; }
 
-    internal AudioStream(IAudioInternal internalAudio, int bufferId, IClydeHandle? handle, TimeSpan length, int channelCount, string? name = null, string? title = null, string? artist = null)
+    internal AudioStream(IClydeHandle? handle, TimeSpan length, int channelCount, string? name = null, string? title = null, string? artist = null)
     {
-        _audio = internalAudio;
-        BufferId = bufferId;
         ClydeHandle = handle;
         Length = length;
         ChannelCount = channelCount;
@@ -33,9 +24,4 @@ public sealed class AudioStream : IDisposable
         Title = title;
         Artist = artist;
     }
-
-    public void Dispose()
-    {
-        _audio.Remove(this);
-    }
 }

Robust.Client/Audio/AudioSystem.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
-using OpenTK.Audio.OpenAL;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
@@ -38,6 +37,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
     [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!;
@@ -49,16 +49,13 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// 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 float _audioFrameTime;
-    private float _audioFrameTimeRemaining;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
 
     private float _maxRayLength;
-    private float _zOffset;
-    private float _audioEndBuffer;
 
     public override float ZOffset
     {
@@ -82,6 +79,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
         }
     }
 
+    private float _zOffset;
+
     /// <inheritdoc />
     public override void Initialize()
     {
@@ -109,31 +108,13 @@ public sealed partial class AudioSystem : SharedAudioSystem
         SubscribeNetworkEvent<PlayAudioEntityMessage>(OnEntityAudio);
         SubscribeNetworkEvent<PlayAudioPositionalMessage>(OnEntityCoordinates);
 
-        Subs.CVar(CfgManager, CVars.AudioEndBuffer, OnAudioBuffer, true);
         Subs.CVar(CfgManager, CVars.AudioAttenuation, OnAudioAttenuation, true);
         Subs.CVar(CfgManager, CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
-        Subs.CVar(CfgManager, CVars.AudioTickRate, OnAudioTickRate, true);
         InitializeLimit();
     }
 
-    private void OnAudioBuffer(float value)
+    private void OnAudioState(EntityUid uid, AudioComponent component, ref AfterAutoHandleStateEvent args)
     {
-        _audioEndBuffer = value;
-    }
-
-    private void OnAudioTickRate(int obj)
-    {
-        _audioFrameTime = 1f / obj;
-        _audioFrameTimeRemaining = MathF.Min(_audioFrameTimeRemaining, _audioFrameTime);
-    }
-
-    private void OnAudioState(Entity<AudioComponent> entity, ref AfterAutoHandleStateEvent args)
-    {
-        var component = entity.Comp;
-
-        if (component.LifeStage < ComponentLifeStage.Initialized)
-            return;
-
         ApplyAudioParams(component.Params, component);
         component.Source.Global = component.Global;
 
@@ -157,29 +138,21 @@ public sealed partial class AudioSystem : SharedAudioSystem
             case AudioState.Stopped:
                 component.StopPlaying();
                 component.PlaybackPosition = 0f;
-                return;
+                break;
         }
 
         // If playback position changed then update it.
-        var position = (float) ((entity.Comp.PauseTime ?? Timing.CurTime) - entity.Comp.AudioStart).TotalSeconds;
-        var currentPosition = entity.Comp.Source.PlaybackPosition;
-        var diff = Math.Abs(position - currentPosition);
-
-        // Don't try to set the audio too far ahead.
-        if (!string.IsNullOrEmpty(entity.Comp.FileName))
+        if (!string.IsNullOrEmpty(component.FileName))
         {
-            if (position > GetAudioLengthImpl(entity.Comp.FileName).TotalSeconds - _audioEndBuffer)
+            var position = (float) ((component.PauseTime ?? Timing.CurTime) - component.AudioStart).TotalSeconds;
+            var currentPosition = component.Source.PlaybackPosition;
+            var diff = Math.Abs(position - currentPosition);
+
+            if (diff > 0.1f)
             {
-                entity.Comp.StopPlaying();
-                return;
+                component.PlaybackPosition = position;
             }
         }
-
-        // If the difference is minor then we'll just keep playing it.
-        if (diff > 0.1f)
-        {
-            entity.Comp.PlaybackPosition = position;
-        }
     }
 
     /// <summary>
@@ -227,10 +200,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
     private void SetupSource(Entity<AudioComponent> entity, AudioResource audioResource, TimeSpan? length = null)
     {
         var component = entity.Comp;
-        length ??= GetAudioLength(component.FileName);
-
-        // If audio came into range then start playback at the correct position.
-        var offset = ((entity.Comp.PauseTime ?? Timing.CurTime) - component.AudioStart).TotalSeconds;
 
         if (TryAudioLimit(component.FileName))
         {
@@ -254,17 +223,10 @@ public sealed partial class AudioSystem : SharedAudioSystem
         // Don't play until first frame so occlusion etc. are correct.
         component.Gain = 0f;
 
-        // If the offset < buffer than just play it from the start.
-        if (offset < AudioDespawnBuffer)
-        {
-            offset = 0;
-        }
-        // Not enough audio to play
-        else if (offset > length.Value.TotalSeconds - _audioEndBuffer)
-        {
-            component.StopPlaying();
-            return;
-        }
+        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)
         {
@@ -292,13 +254,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
 
     public override void FrameUpdate(float frameTime)
     {
-        _audioFrameTimeRemaining -= frameTime;
-
-        if (_audioFrameTimeRemaining > 0f)
-            return;
-
-        // Clamp to 0 in case we have a really long frame.
-        _audioFrameTimeRemaining = MathF.Max(0f, _audioFrameTime + _audioFrameTimeRemaining);
         var eye = _eyeManager.CurrentEye;
         var localEntity = _playerManager.LocalEntity;
         Vector2 listenerVelocity;
@@ -322,6 +277,9 @@ public sealed partial class AudioSystem : SharedAudioSystem
             _streams.Add((uid, comp, xform));
         }
 
+        _mapManager.TryFindGridAt(ourPos, out var gridUid, out _);
+        _listenerGrid = gridUid == EntityUid.Invalid ? null : gridUid;
+
         try
         {
             _updateAudioJob.OurPosition = ourPos;
@@ -374,6 +332,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
 
         Vector2 worldPos;
         component.Volume = component.Params.Volume;
+        Vector2 delta;
 
         // Handle grid audio differently by using grid position.
         if ((component.Flags & AudioFlags.GridAudio) != 0x0)
@@ -387,7 +346,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
         }
 
         // Max distance check
-        var delta = worldPos - listener.Position;
+        delta = worldPos - listener.Position;
         var distance = delta.Length();
 
         // Out of range so just clip it for us.
@@ -446,16 +405,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
         return occlusion;
     }
 
-    private bool TryGetAudio(ResolvedSoundSpecifier specifier, [NotNullWhen(true)] out AudioResource? audio)
-    {
-        var filename = GetAudioPath(specifier);
-        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(string filename, [NotNullWhen(true)] out AudioResource? audio)
     {
         if (_resourceCache.TryGetResource(new ResPath(filename), out audio))
@@ -474,15 +423,15 @@ public sealed partial class AudioSystem : SharedAudioSystem
         return false;
     }
 
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(ResolvedSoundSpecifier? specifier, EntityCoordinates coordinates,
+    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string? filename, EntityCoordinates coordinates,
         AudioParams? audioParams = null)
     {
-        return PlayStatic(specifier, Filter.Local(), coordinates, true, audioParams);
+        return PlayStatic(filename, Filter.Local(), coordinates, true, audioParams);
     }
 
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(ResolvedSoundSpecifier? specifier, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string? filename, EntityUid uid, AudioParams? audioParams = null)
     {
-        return PlayEntity(specifier, Filter.Local(), uid, true, audioParams);
+        return PlayEntity(filename, Filter.Local(), uid, true, audioParams);
     }
 
     /// <inheritdoc />
@@ -494,17 +443,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
         return null; // uhh Lets hope predicted audio never needs to somehow store the playing audio....
     }
 
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayLocal(
-        SoundSpecifier? sound,
-        EntityUid source,
-        EntityUid? soundInitiator,
-        AudioParams? audioParams = null
-    )
-    {
-        return PlayPredicted(sound, source, soundInitiator, audioParams);
-    }
-
     public override (EntityUid Entity, AudioComponent Component)? PlayPredicted(SoundSpecifier? sound, EntityCoordinates coordinates, EntityUid? user, AudioParams? audioParams = null)
     {
         if (Timing.IsFirstTimePredicted && sound != null)
@@ -518,21 +456,21 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </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(ResolvedSoundSpecifier? specifier, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (specifier is null)
+        if (string.IsNullOrEmpty(filename))
             return null;
 
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioGlobalMessage
             {
-                Specifier = specifier,
+                FileName = filename,
                 AudioParams = audioParams ?? AudioParams.Default
             });
         }
 
-        return TryGetAudio(specifier, out var audio) ? PlayGlobal(audio, specifier, audioParams) : default;
+        return TryGetAudio(filename, out var audio) ? PlayGlobal(audio, audioParams) : default;
     }
 
     /// <summary>
@@ -540,12 +478,12 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </summary>
     /// <param name="stream">The audio stream to play.</param>
     /// <param name="audioParams"></param>
-    public (EntityUid Entity, AudioComponent Component)? PlayGlobal(AudioStream stream, ResolvedSoundSpecifier? specifier, AudioParams? audioParams = null)
+    public (EntityUid Entity, AudioComponent Component)? PlayGlobal(AudioStream stream, AudioParams? audioParams = null)
     {
-        var (entity, component) = CreateAndStartPlayingStream(audioParams, specifier, stream);
+        var (entity, component) = CreateAndStartPlayingStream(audioParams, stream);
         component.Global = true;
         component.Source.Global = true;
-        DirtyField(entity, component, nameof(AudioComponent.Global));
+        Dirty(entity, component);
         return (entity, component);
     }
 
@@ -554,22 +492,22 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </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(ResolvedSoundSpecifier? specifier, EntityUid entity, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, EntityUid entity, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (specifier is null)
+        if (string.IsNullOrEmpty(filename))
             return null;
 
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioEntityMessage
             {
-                Specifier = specifier,
+                FileName = filename,
                 NetEntity = GetNetEntity(entity),
                 AudioParams = audioParams ?? AudioParams.Default
             });
         }
 
-        return TryGetAudio(specifier, out var audio) ? PlayEntity(audio, entity, specifier, audioParams) : default;
+        return TryGetAudio(filename, out var audio) ? PlayEntity(audio, entity, audioParams) : default;
     }
 
     /// <summary>
@@ -578,7 +516,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// <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, ResolvedSoundSpecifier? specifier, AudioParams? audioParams = null)
+    public (EntityUid Entity, AudioComponent Component)? PlayEntity(AudioStream stream, EntityUid entity, AudioParams? audioParams = null)
     {
         if (TerminatingOrDeleted(entity))
         {
@@ -586,7 +524,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
             return null;
         }
 
-        var playing = CreateAndStartPlayingStream(audioParams, specifier, stream);
+        var playing = CreateAndStartPlayingStream(audioParams, stream);
         _xformSys.SetCoordinates(playing.Entity, new EntityCoordinates(entity, Vector2.Zero));
 
         return playing;
@@ -598,22 +536,22 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// <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(ResolvedSoundSpecifier? specifier, EntityCoordinates coordinates, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, EntityCoordinates coordinates, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (specifier is null)
+        if (string.IsNullOrEmpty(filename))
             return null;
 
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioPositionalMessage
             {
-                Specifier = specifier,
+                FileName = filename,
                 Coordinates = GetNetCoordinates(coordinates),
                 AudioParams = audioParams ?? AudioParams.Default
             });
         }
 
-        return TryGetAudio(specifier, out var audio) ? PlayStatic(audio, coordinates, specifier, audioParams) : default;
+        return TryGetAudio(filename, out var audio) ? PlayStatic(audio, coordinates, audioParams) : default;
     }
 
     /// <summary>
@@ -622,7 +560,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// <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, ResolvedSoundSpecifier? specifier, AudioParams? audioParams = null)
+    public (EntityUid Entity, AudioComponent Component)? PlayStatic(AudioStream stream, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
         if (TerminatingOrDeleted(coordinates.EntityId))
         {
@@ -630,33 +568,33 @@ public sealed partial class AudioSystem : SharedAudioSystem
             return null;
         }
 
-        var playing = CreateAndStartPlayingStream(audioParams, specifier, stream);
+        var playing = CreateAndStartPlayingStream(audioParams, stream);
         _xformSys.SetCoordinates(playing.Entity, coordinates);
         return playing;
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(ResolvedSoundSpecifier? specifier, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
     {
-        return PlayGlobal(specifier, audioParams);
+        return PlayGlobal(filename, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(ResolvedSoundSpecifier? specifier, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
     {
-        return PlayEntity(specifier, entity, audioParams);
+        return PlayEntity(filename, entity, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(ResolvedSoundSpecifier? specifier, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
     {
-        return PlayStatic(specifier, coordinates, audioParams);
+        return PlayStatic(filename, coordinates, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(ResolvedSoundSpecifier? specifier, ICommonSession recipient, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, ICommonSession recipient, AudioParams? audioParams = null)
     {
-        return PlayGlobal(specifier, audioParams);
+        return PlayGlobal(filename, audioParams);
     }
 
     public override void LoadStream<T>(Entity<AudioComponent> entity, T stream)
@@ -670,39 +608,39 @@ public sealed partial class AudioSystem : SharedAudioSystem
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(ResolvedSoundSpecifier? specifier, EntityUid recipient, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, EntityUid recipient, AudioParams? audioParams = null)
     {
-        return PlayGlobal(specifier, audioParams);
+        return PlayGlobal(filename, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(ResolvedSoundSpecifier? specifier, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
     {
-        return PlayEntity(specifier, uid, audioParams);
+        return PlayEntity(filename, uid, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(ResolvedSoundSpecifier? specifier, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
     {
-        return PlayEntity(specifier, uid, audioParams);
+        return PlayEntity(filename, uid, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(ResolvedSoundSpecifier? specifier, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
-        return PlayStatic(specifier, coordinates, audioParams);
+        return PlayStatic(filename, coordinates, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(ResolvedSoundSpecifier? specifier, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
-        return PlayStatic(specifier, coordinates, audioParams);
+        return PlayStatic(filename, coordinates, audioParams);
     }
 
-    private (EntityUid Entity, AudioComponent Component) CreateAndStartPlayingStream(AudioParams? audioParams, ResolvedSoundSpecifier? specifier, AudioStream stream)
+    private (EntityUid Entity, AudioComponent Component) CreateAndStartPlayingStream(AudioParams? audioParams, AudioStream stream)
     {
         var audioP = audioParams ?? AudioParams.Default;
-        var entity = SetupAudio(specifier, audioP, initialize: false, length: stream.Length);
+        var entity = SetupAudio(null, audioP, initialize: false, length: stream.Length);
         LoadStream(entity, stream);
         EntityManager.InitializeAndStartEntity(entity);
         var comp = entity.Comp;
@@ -710,8 +648,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
 
         // TODO clamp the offset inside of SetPlaybackPosition() itself.
         var offset = audioP.PlayOffsetSeconds;
-        var maxOffset = Math.Max((float) stream.Length.TotalSeconds - 0.01f, 0f);
-        offset = Math.Clamp(offset, 0f, maxOffset);
+        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.
@@ -735,17 +672,17 @@ public sealed partial class AudioSystem : SharedAudioSystem
 
     private void OnEntityCoordinates(PlayAudioPositionalMessage ev)
     {
-        PlayStatic(ev.Specifier, GetCoordinates(ev.Coordinates), ev.AudioParams, false);
+        PlayStatic(ev.FileName, GetCoordinates(ev.Coordinates), ev.AudioParams, false);
     }
 
     private void OnEntityAudio(PlayAudioEntityMessage ev)
     {
-        PlayEntity(ev.Specifier, GetEntity(ev.NetEntity), ev.AudioParams, false);
+        PlayEntity(ev.FileName, GetEntity(ev.NetEntity), ev.AudioParams, false);
     }
 
     private void OnGlobalAudio(PlayAudioGlobalMessage ev)
     {
-        PlayGlobal(ev.Specifier, ev.AudioParams, false);
+        PlayGlobal(ev.FileName, ev.AudioParams, false);
     }
 
     protected override TimeSpan GetAudioLengthImpl(string filename)

Robust.Client/Audio/HeadlessAudioManager.cs

@@ -13,8 +13,6 @@ namespace Robust.Client.Audio;
 /// </summary>
 internal sealed class HeadlessAudioManager : IAudioInternal
 {
-    private int _audioBuffer;
-
     /// <inheritdoc />
     public void InitializePostWindowing()
     {
@@ -67,11 +65,6 @@ internal sealed class HeadlessAudioManager : IAudioInternal
     {
     }
 
-    /// <inheritdoc />
-    public void Remove(AudioStream stream)
-    {
-    }
-
     /// <inheritdoc />
     public void StopAllAudio()
     {
@@ -108,11 +101,11 @@ internal sealed class HeadlessAudioManager : IAudioInternal
     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(this, _audioBuffer++, null, length, channels, name);
+        return new AudioStream(null, length, channels, name);
     }
 
-    private AudioStream AudioStreamFromMetadata(AudioMetadata metadata, string? name)
+    private static AudioStream AudioStreamFromMetadata(AudioMetadata metadata, string? name)
     {
-        return new AudioStream(this, _audioBuffer++, null, metadata.Length, metadata.ChannelCount, name, metadata.Title, metadata.Artist);
+        return new AudioStream(null, metadata.Length, metadata.ChannelCount, name, metadata.Title, metadata.Artist);
     }
 }

Robust.Client/Audio/IAudioInternal.cs

@@ -44,8 +44,6 @@ internal interface IAudioInternal : IAudioManager
 
     void SetAttenuation(Attenuation attenuation);
 
-    void Remove(AudioStream stream);
-
     /// <summary>
     /// Stops all audio from playing.
     /// </summary>

Robust.Client/Audio/IAudioManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Robust.Client.Audio.Sources;
 using Robust.Shared.Audio.Sources;
 
 namespace Robust.Client.Audio;
@@ -10,7 +11,7 @@ namespace Robust.Client.Audio;
 public interface IAudioManager
 {
     IAudioSource? CreateAudioSource(AudioStream stream);
-
+  
     AudioStream LoadAudioOggVorbis(Stream stream, string? name = null);
 
     AudioStream LoadAudioWav(Stream stream, string? name = null);

Robust.Client/Audio/Midi/IMidiRenderer.cs

@@ -33,6 +33,12 @@ public interface IMidiRenderer : IDisposable
     /// </summary>
     bool LoopMidi { get; set; }
 
+    /// <summary>
+    ///     This increases all note on velocities to 127.
+    /// </summary>
+    [Obsolete($"Use {nameof(VelocityOverride)} instead, you can set it to 127 to achieve the same effect.")]
+    bool VolumeBoost { get; set; }
+
     /// <summary>
     ///     The midi program (instrument) the renderer is using.
     /// </summary>

Robust.Client/Audio/Midi/MidiRenderer.cs

@@ -205,6 +205,14 @@ internal sealed class MidiRenderer : IMidiRenderer
         }
     }
 
+    [ViewVariables(VVAccess.ReadWrite)]
+    [Obsolete($"Use {nameof(VelocityOverride)} instead, you can set it to 127 to achieve the same effect.")]
+    public bool VolumeBoost
+    {
+        get => VelocityOverride == 127;
+        set => VelocityOverride = value ? 127 : null;
+    }
+
     [ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? TrackingEntity { get; set; } = null;
 

Robust.Client/Audio/Sources/AudioSource.cs

@@ -13,7 +13,7 @@ internal sealed class AudioSource : BaseAudioSource
     /// <summary>
     /// Underlying stream to the audio.
     /// </summary>
-    internal readonly AudioStream SourceStream;
+    private readonly AudioStream _sourceStream;
 
 #if DEBUG
     private bool _didPositionWarning;
@@ -21,7 +21,7 @@ internal sealed class AudioSource : BaseAudioSource
 
     public AudioSource(AudioManager master, int sourceHandle, AudioStream sourceStream) : base(master, sourceHandle)
     {
-        SourceStream = sourceStream;
+        _sourceStream = sourceStream;
     }
 
     /// <inheritdoc />
@@ -47,13 +47,13 @@ internal sealed class AudioSource : BaseAudioSource
 #if DEBUG
             // OpenAL doesn't seem to want to play stereo positionally.
             // Log a warning if people try to.
-            if (SourceStream.ChannelCount > 1 && !_didPositionWarning)
+            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);
+                    _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.");
+                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
 

Robust.Client/Audio/Sources/BaseAudioSource.cs

@@ -208,12 +208,6 @@ public abstract class BaseAudioSource : IAudioSource
         }
         set
         {
-            if (float.IsNaN(value))
-            {
-                Master.LogError($"Tried to set NaN gain, setting audio source to 0f: {Environment.StackTrace}");
-                value = 0f;
-            }
-
             _checkDisposed();
             var priorOcclusion = 1f;
             if (!IsEfxSupported)

Robust.Client/Audio/Sources/BufferedAudioSource.cs

@@ -1,18 +1,24 @@
 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;
 
@@ -37,7 +43,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
         get
         {
             _checkDisposed();
-            var state = AL.GetSourceState(SourceHandle);
+            var state = AL.GetSourceState(SourceHandle!.Value);
             _master._checkAlError();
             return state == ALSourceState.Playing;
         }
@@ -47,7 +53,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
             {
                 _checkDisposed();
                 // IDK why this stackallocs but gonna leave it for now.
-                AL.SourcePlay(stackalloc int[] {SourceHandle});
+                AL.SourcePlay(stackalloc int[] {SourceHandle!.Value});
                 _master._checkAlError();
             }
             else
@@ -55,7 +61,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
                 if (_isDisposed())
                     return;
 
-                AL.SourceStop(SourceHandle);
+                AL.SourceStop(SourceHandle!.Value);
                 _master._checkAlError();
             }
         }
@@ -68,13 +74,13 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
 
     protected override void Dispose(bool disposing)
     {
-        if (SourceHandle == -1)
+        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, FilterHandle);
+            _master.DeleteBufferedSourceOnMainThread(SourceHandle.Value, FilterHandle);
 
             foreach (var handle in BufferHandles)
             {
@@ -86,21 +92,21 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
             if (FilterHandle != 0)
                 EFX.DeleteFilter(FilterHandle);
 
-            AL.DeleteSource(SourceHandle);
+            AL.DeleteSource(SourceHandle.Value);
             AL.DeleteBuffers(BufferHandles);
-            _master.RemoveBufferedAudioSource(SourceHandle);
+            _master.RemoveBufferedAudioSource(SourceHandle.Value);
             _master._checkAlError();
         }
 
         FilterHandle = 0;
-        SourceHandle = -1;
+        SourceHandle = null;
     }
 
     public int GetNumberOfBuffersProcessed()
     {
         _checkDisposed();
         // ReSharper disable once PossibleInvalidOperationException
-        AL.GetSource(SourceHandle, ALGetSourcei.BuffersProcessed, out var buffersProcessed);
+        AL.GetSource(SourceHandle!.Value, ALGetSourcei.BuffersProcessed, out var buffersProcessed);
         return buffersProcessed;
     }
 
@@ -110,7 +116,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
         var entries = Math.Min(Math.Min(handles.Length, BufferHandles.Length), GetNumberOfBuffersProcessed());
         fixed (int* ptr = handles)
         {
-            AL.SourceUnqueueBuffers(SourceHandle, entries, ptr);
+            AL.SourceUnqueueBuffers(SourceHandle!.Value, entries, ptr);
         }
 
         for (var i = 0; i < entries; i++)
@@ -177,7 +183,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
         fixed (int* ptr = realHandles)
             // ReSharper disable once PossibleInvalidOperationException
         {
-            AL.SourceQueueBuffers(SourceHandle, handles.Length, ptr);
+            AL.SourceQueueBuffers(SourceHandle!.Value, handles.Length, ptr);
         }
     }
 

Robust.Client/BaseClient.cs

@@ -88,10 +88,10 @@ namespace Robust.Client
         {
             if (GameInfo != null)
             {
-                GameInfo.TickRate = (ushort) tickrate;
+                GameInfo.TickRate = (byte) tickrate;
             }
 
-            _timing.SetTickRateAt((ushort) tickrate, info.TickChanged);
+            _timing.SetTickRateAt((byte) tickrate, info.TickChanged);
             _logger.Info($"Tickrate changed to: {tickrate} on tick {_timing.CurTick}");
         }
 
@@ -115,6 +115,10 @@ namespace Robust.Client
         /// <inheritdoc />
         public void DisconnectFromServer(string reason)
         {
+            DebugTools.Assert(RunLevel > ClientRunLevel.Initialize);
+            DebugTools.Assert(_net.IsConnected);
+            // run level changed in OnNetDisconnect()
+            // are both of these *really* needed?
             _net.ClientDisconnect(reason);
         }
 
@@ -391,6 +395,6 @@ namespace Robust.Client
         /// </summary>
         public int ServerMaxPlayers { get; set; }
 
-        public uint TickRate { get; internal set; }
+        public byte TickRate { get; internal set; }
     }
 }

Robust.Client/ClientIoC.cs

@@ -8,7 +8,6 @@ using Robust.Client.GameObjects;
 using Robust.Client.GameStates;
 using Robust.Client.Graphics;
 using Robust.Client.Graphics.Clyde;
-using Robust.Client.HWId;
 using Robust.Client.Input;
 using Robust.Client.Map;
 using Robust.Client.Placement;
@@ -27,7 +26,6 @@ using Robust.Client.Upload;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.RichText;
 using Robust.Client.UserInterface.Themes;
-using Robust.Client.UserInterface.XAML.Proxy;
 using Robust.Client.Utility;
 using Robust.Client.ViewVariables;
 using Robust.Shared;
@@ -46,7 +44,6 @@ using Robust.Shared.Replays;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using Robust.Shared.Upload;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Client
@@ -103,7 +100,6 @@ namespace Robust.Client
             deps.Register<ProfViewManager>();
             deps.Register<IGamePrototypeLoadManager, GamePrototypeLoadManager>();
             deps.Register<NetworkResourceManager>();
-            deps.Register<IReloadManager, ReloadManager>();
 
             switch (mode)
             {
@@ -150,18 +146,7 @@ namespace Robust.Client
             deps.Register<IConfigurationManagerInternal, ClientNetConfigurationManager>();
             deps.Register<IClientNetConfigurationManager, ClientNetConfigurationManager>();
             deps.Register<INetConfigurationManagerInternal, ClientNetConfigurationManager>();
-
-#if TOOLS
-            deps.Register<IXamlProxyManager, XamlProxyManager>();
-            deps.Register<IXamlHotReloadManager, XamlHotReloadManager>();
-#else
-            deps.Register<IXamlProxyManager, XamlProxyManagerStub>();
-            deps.Register<IXamlHotReloadManager, XamlHotReloadManagerStub>();
-#endif
-
-            deps.Register<IXamlProxyHelper, XamlProxyHelper>();
             deps.Register<MarkupTagManager>();
-            deps.Register<IHWId, BasicHWId>();
         }
     }
 }

Robust.Client/Console/Commands/Debug.cs

@@ -173,51 +173,29 @@ namespace Robust.Client.Console.Commands
         }
     }
 
-    internal sealed class ShowPositionsCommand : LocalizedEntityCommands
+    internal sealed class ShowPositionsCommand : LocalizedCommands
     {
-        [Dependency] private readonly DebugDrawingSystem _debugDrawing = default!;
+        [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
 
         public override string Command => "showpos";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _debugDrawing.DebugPositions = !_debugDrawing.DebugPositions;
+            var mgr = _entitySystems.GetEntitySystem<DebugDrawingSystem>();
+            mgr.DebugPositions = !mgr.DebugPositions;
         }
     }
 
-    internal sealed class ShowRotationsCommand : LocalizedEntityCommands
+    internal sealed class ShowRotationsCommand : LocalizedCommands
     {
-        [Dependency] private readonly DebugDrawingSystem _debugDrawing = default!;
+        [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
 
         public override string Command => "showrot";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _debugDrawing.DebugRotations = !_debugDrawing.DebugRotations;
-        }
-    }
-
-    internal sealed class ShowVelocitiesCommand : LocalizedEntityCommands
-    {
-        [Dependency] private readonly DebugDrawingSystem _debugDrawing = default!;
-
-        public override string Command => "showvel";
-
-        public override void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            _debugDrawing.DebugVelocities = !_debugDrawing.DebugVelocities;
-        }
-    }
-
-    internal sealed class ShowAngularVelocitiesCommand : LocalizedEntityCommands
-    {
-        [Dependency] private readonly DebugDrawingSystem _debugDrawing = default!;
-
-        public override string Command => "showangvel";
-
-        public override void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            _debugDrawing.DebugAngularVelocities = !_debugDrawing.DebugAngularVelocities;
+            var mgr = _entitySystems.GetEntitySystem<DebugDrawingSystem>();
+            mgr.DebugRotations = !mgr.DebugRotations;
         }
     }
 
@@ -313,9 +291,9 @@ namespace Robust.Client.Console.Commands
         }
     }
 
-    internal sealed class SnapGridGetCell : LocalizedEntityCommands
+    internal sealed class SnapGridGetCell : LocalizedCommands
     {
-        [Dependency] private readonly SharedMapSystem _map = default!;
+        [Dependency] private readonly IEntityManager _entManager = default!;
 
         public override string Command => "sggcell";
 
@@ -341,10 +319,9 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            var gridEnt = EntityManager.GetEntity(gridNet);
-            if (EntityManager.TryGetComponent<MapGridComponent>(gridEnt, out var grid))
+            if (_entManager.TryGetComponent<MapGridComponent>(_entManager.GetEntity(gridNet), out var grid))
             {
-                foreach (var entity in _map.GetAnchoredEntities(gridEnt, grid, new Vector2i(
+                foreach (var entity in grid.GetAnchoredEntities(new Vector2i(
                              int.Parse(indices.Split(',')[0], CultureInfo.InvariantCulture),
                              int.Parse(indices.Split(',')[1], CultureInfo.InvariantCulture))))
                 {
@@ -448,9 +425,9 @@ namespace Robust.Client.Console.Commands
         }
     }
 
-    internal sealed class GridTileCount : LocalizedEntityCommands
+    internal sealed class GridTileCount : LocalizedCommands
     {
-        [Dependency] private readonly SharedMapSystem _map = default!;
+        [Dependency] private readonly IEntityManager _entManager = default!;
 
         public override string Command => "gridtc";
 
@@ -463,15 +440,15 @@ namespace Robust.Client.Console.Commands
             }
 
             if (!NetEntity.TryParse(args[0], out var gridUidNet) ||
-                !EntityManager.TryGetEntity(gridUidNet, out var gridUid))
+                !_entManager.TryGetEntity(gridUidNet, out var gridUid))
             {
                 shell.WriteLine($"{args[0]} is not a valid entity UID.");
                 return;
             }
 
-            if (EntityManager.TryGetComponent<MapGridComponent>(gridUid, out var grid))
+            if (_entManager.TryGetComponent<MapGridComponent>(gridUid, out var grid))
             {
-                shell.WriteLine(_map.GetAllTiles(gridUid.Value, grid).Count().ToString());
+                shell.WriteLine(grid.GetAllTiles().Count().ToString());
             }
             else
             {
@@ -601,20 +578,7 @@ namespace Robust.Client.Console.Commands
         private static string GetMemberValue(MemberInfo? member, Control control, string separator, string
                 wrap = "{0}")
         {
-            object? value = null;
-            try
-            {
-                value = member?.GetValue(control);
-            }
-            catch (TargetInvocationException exception)
-            {
-                var exceptionToPrint = exception.InnerException ?? exception;
-                value = $"{exceptionToPrint.GetType()}: {exceptionToPrint.Message}";
-            }
-            catch (Exception exception)
-            {
-                value = $"{exception.GetType()}: {exception.Message}";
-            }
+            var value = member?.GetValue(control);
             var o = value switch
             {
                 ICollection<Control> controls => string.Join(separator,
@@ -716,12 +680,12 @@ namespace Robust.Client.Console.Commands
         }
     }
 
-    internal sealed class ChunkInfoCommand : LocalizedEntityCommands
+    internal sealed class ChunkInfoCommand : LocalizedCommands
     {
+        [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IMapManager _map = default!;
         [Dependency] private readonly IEyeManager _eye = default!;
         [Dependency] private readonly IInputManager _input = default!;
-        [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
         public override string Command => "chunkinfo";
 
@@ -735,8 +699,8 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            var mapSystem = EntityManager.System<SharedMapSystem>();
-            var chunkIndex = mapSystem.LocalToChunkIndices(gridUid, grid, _mapSystem.MapToGrid(gridUid, mousePos));
+            var mapSystem = _entManager.System<SharedMapSystem>();
+            var chunkIndex = mapSystem.LocalToChunkIndices(gridUid, grid, grid.MapToGrid(mousePos));
             var chunk = mapSystem.GetOrAddChunk(gridUid, grid, chunkIndex);
 
             shell.WriteLine($"worldBounds: {mapSystem.CalcWorldAABB(gridUid, grid, chunk)} localBounds: {chunk.CachedBounds}");

Robust.Client/Console/Commands/GridChunkBBCommand.cs

@@ -1,19 +1,16 @@
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 
 namespace Robust.Client.Console.Commands
 {
-    public sealed class GridChunkBBCommand : LocalizedEntityCommands
+    public sealed class GridChunkBBCommand : LocalizedCommands
     {
-        [Dependency] private readonly GridChunkBoundsDebugSystem _system = default!;
-
         public override string Command => "showchunkbb";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _system.Enabled ^= true;
+            EntitySystem.Get<GridChunkBoundsDebugSystem>().Enabled ^= true;
         }
     }
 }

Robust.Client/Console/Commands/LauncherAuthCommand.cs

@@ -20,9 +20,8 @@ namespace Robust.Client.Console.Commands
         {
             var wantName = args.Length > 0 ? args[0] : null;
 
-            var basePath = UserDataDir.GetRootUserDataDir(_gameController);
-            var launcherDirName = Environment.GetEnvironmentVariable("SS14_LAUNCHER_APPDATA_NAME") ?? "launcher";
-            var dbPath = Path.Combine(basePath, launcherDirName, "settings.db");
+            var basePath = Path.GetDirectoryName(UserDataDir.GetUserDataDir(_gameController))!;
+            var dbPath = Path.Combine(basePath, "launcher", "settings.db");
 
 #if USE_SYSTEM_SQLITE
             SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());

Robust.Client/Console/Commands/LocalizationCommands.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using JetBrains.Annotations;
-using Robust.Shared.Console;
-using Robust.Shared.Localization;
-
-namespace Robust.Client.Console.Commands;
-
-[UsedImplicitly]
-internal sealed class LocalizationSetCulture : LocalizedCommands
-{
-    private const string Name = "localization_set_culture";
-    private const int ArgumentCount = 1;
-
-    public override string Command => Name;
-
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (args.Length != ArgumentCount)
-        {
-            shell.WriteError(Loc.GetString("cmd-invalid-arg-number-error"));
-            return;
-        }
-
-        CultureInfo culture;
-        try
-        {
-            culture = CultureInfo.GetCultureInfo(args[0], predefinedOnly: false);
-        }
-        catch (CultureNotFoundException)
-        {
-            shell.WriteError(Loc.GetString("cmd-parse-failure-cultureinfo", ("arg", args[0])));
-            return;
-        }
-
-        LocalizationManager.SetCulture(culture);
-        shell.WriteLine(LocalizationManager.GetString("cmd-localization_set_culture-changed",
-            ("code", culture.Name),
-            ("nativeName", culture.NativeName),
-            ("englishName", culture.EnglishName)));
-    }
-
-    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
-    {
-        return args.Length switch
-        {
-            1 => CompletionResult.FromHintOptions(GetCultureNames(),
-                LocalizationManager.GetString("cmd-localization_set_culture-culture-name")),
-            _ => CompletionResult.Empty
-        };
-    }
-
-    private static HashSet<string> GetCultureNames()
-    {
-        var cultureInfos = CultureInfo.GetCultures(CultureTypes.AllCultures)
-            .Where(x => !string.IsNullOrEmpty(x.Name))
-            .ToArray();
-
-        var allNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-        allNames.UnionWith(cultureInfos.Select(x => x.TwoLetterISOLanguageName));
-        allNames.UnionWith(cultureInfos.Select(x => x.Name));
-
-        return allNames;
-    }
-}

Robust.Client/Console/Commands/UITestCommand.cs

@@ -204,7 +204,7 @@ Suspendisse hendrerit blandit urna ut laoreet. Suspendisse ac elit at erat males
     private Control TabRichText()
     {
         var label = new RichTextLabel();
-        label.SetMessage(FormattedMessage.FromMarkupOrThrow(Lipsum));
+        label.SetMessage(FormattedMessage.FromMarkup(Lipsum));
 
         TabContainer.SetTabTitle(label, "RichText");
         return label;

Robust.Client/Console/Commands/VelocitiesCommand.cs

@@ -5,15 +5,15 @@ using Robust.Shared.IoC;
 
 namespace Robust.Client.Console.Commands
 {
-    public sealed class ShowPlayerVelocityCommand : LocalizedCommands
+    public sealed class VelocitiesCommand : LocalizedCommands
     {
         [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
 
-        public override string Command => "showplayervelocity";
+        public override string Command => "showvelocities";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _entitySystems.GetEntitySystem<ShowPlayerVelocityDebugSystem>().Enabled ^= true;
+            _entitySystems.GetEntitySystem<VelocityDebugSystem>().Enabled ^= true;
         }
     }
 }

Robust.Client/Credits/CreditsManager.cs

@@ -14,6 +14,15 @@ namespace Robust.Client.Credits
     /// </summary>
     public static class CreditsManager
     {
+        /// <summary>
+        ///     Gets a list of open source software used in the engine and their license.
+        /// </summary>
+        [Obsolete("Use overload that takes in an explicit resource manager instead.")]
+        public static IEnumerable<LicenseEntry> GetLicenses()
+        {
+            return GetLicenses(IoCManager.Resolve<IResourceManager>());
+        }
+
         /// <summary>
         ///     Gets a list of open source software used in the engine and their license.
         /// </summary>

Robust.Client/Debugging/DebugDrawingSystem.cs

@@ -1,221 +1,136 @@
+using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics.Components;
-using System.Numerics;
 
-namespace Robust.Client.Debugging;
-
-/// <summary>
-/// A collection of visual debug overlays for the client game.
-/// </summary>
-public sealed class DebugDrawingSystem : EntitySystem
+namespace Robust.Client.Debugging
 {
-    [Dependency] private readonly IOverlayManager _overlayManager = default!;
-    [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-
-    private bool _debugPositions;
-    private bool _debugRotations;
-    private bool _debugVelocities;
-    private bool _debugAngularVelocities;
-
     /// <summary>
-    /// Toggles the visual overlay of the local origin for each entity on screen.
+    /// A collection of visual debug overlays for the client game.
     /// </summary>
-    public bool DebugPositions
+    public sealed class DebugDrawingSystem : EntitySystem
     {
-        get => _debugPositions;
-        set
+        [Dependency] private readonly IOverlayManager _overlayManager = default!;
+        [Dependency] private readonly EntityLookupSystem _lookup = default!;
+
+        private bool _debugPositions;
+        private bool _debugRotations;
+
+        /// <summary>
+        /// Toggles the visual overlay of the local origin for each entity on screen.
+        /// </summary>
+        public bool DebugPositions
         {
-            if (value == DebugPositions)
+            get => _debugPositions;
+            set
             {
-                return;
-            }
+                if (value == DebugPositions)
+                {
+                    return;
+                }
 
-            _debugPositions = value;
+                _debugPositions = value;
 
-            if (value && !_overlayManager.HasOverlay<EntityPositionOverlay>())
-            {
-                _overlayManager.AddOverlay(new EntityPositionOverlay(_lookup, _transform));
-            }
-            else
-            {
-                _overlayManager.RemoveOverlay<EntityPositionOverlay>();
+                if (value && !_overlayManager.HasOverlay<EntityPositionOverlay>())
+                {
+                    _overlayManager.AddOverlay(new EntityPositionOverlay(_lookup, EntityManager));
+                }
+                else
+                {
+                    _overlayManager.RemoveOverlay<EntityPositionOverlay>();
+                }
             }
         }
-    }
 
-    /// <summary>
-    /// Toggles the visual overlay of the rotation for each entity on screen.
-    /// </summary>
-    public bool DebugRotations
-    {
-        get => _debugRotations;
-        set
+        /// <summary>
+        /// Toggles the visual overlay of the local rotation.
+        /// </summary>
+        public bool DebugRotations
         {
-            if (value == DebugRotations)
+            get => _debugRotations;
+            set
             {
-                return;
-            }
+                if (value == DebugRotations)
+                {
+                    return;
+                }
 
-            _debugRotations = value;
+                _debugRotations = value;
 
-            if (value && !_overlayManager.HasOverlay<EntityRotationOverlay>())
-            {
-                _overlayManager.AddOverlay(new EntityRotationOverlay(_lookup, _transform));
-            }
-            else
-            {
-                _overlayManager.RemoveOverlay<EntityRotationOverlay>();
+                if (value && !_overlayManager.HasOverlay<EntityRotationOverlay>())
+                {
+                    _overlayManager.AddOverlay(new EntityRotationOverlay(_lookup, EntityManager));
+                }
+                else
+                {
+                    _overlayManager.RemoveOverlay<EntityRotationOverlay>();
+                }
             }
         }
-    }
 
-    /// <summary>
-    /// Toggles the visual overlay of the local velocity for each entity on screen.
-    /// </summary>
-    public bool DebugVelocities
-    {
-        get => _debugVelocities;
-        set
+        private sealed class EntityPositionOverlay : Overlay
         {
-            if (value == DebugVelocities)
+            private readonly EntityLookupSystem _lookup;
+            private readonly IEntityManager _entityManager;
+
+            public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+            public EntityPositionOverlay(EntityLookupSystem lookup, IEntityManager entityManager)
             {
-                return;
+                _lookup = lookup;
+                _entityManager = entityManager;
             }
 
-            _debugVelocities = value;
+            protected internal override void Draw(in OverlayDrawArgs args)
+            {
+                const float stubLength = 0.25f;
 
-            if (value && !_overlayManager.HasOverlay<EntityVelocityOverlay>())
-            {
-                _overlayManager.AddOverlay(new EntityVelocityOverlay(EntityManager, _lookup, _transform));
-            }
-            else
-            {
-                _overlayManager.RemoveOverlay<EntityVelocityOverlay>();
+                var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
+                var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
+
+                foreach (var entity in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
+                {
+                    var (center, worldRotation) = xformQuery.GetComponent(entity).GetWorldPositionRotation();
+
+                    var xLine = worldRotation.RotateVec(Vector2.UnitX);
+                    var yLine = worldRotation.RotateVec(Vector2.UnitY);
+
+                    worldHandle.DrawLine(center, center + xLine * stubLength, Color.Red);
+                    worldHandle.DrawLine(center, center + yLine * stubLength, Color.Green);
+                }
             }
         }
-    }
 
-    /// <summary>
-    /// Toggles the visual overlay of the angular velocity for each entity on screen.
-    /// </summary>
-    public bool DebugAngularVelocities
-    {
-        get => _debugAngularVelocities;
-        set
+        private sealed class EntityRotationOverlay : Overlay
         {
-            if (value == DebugAngularVelocities)
+            private readonly EntityLookupSystem _lookup;
+            private readonly IEntityManager _entityManager;
+
+            public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+            public EntityRotationOverlay(EntityLookupSystem lookup, IEntityManager entityManager)
             {
-                return;
+                _lookup = lookup;
+                _entityManager = entityManager;
             }
 
-            _debugAngularVelocities = value;
-
-            if (value && !_overlayManager.HasOverlay<EntityAngularVelocityOverlay>())
+            protected internal override void Draw(in OverlayDrawArgs args)
             {
-                _overlayManager.AddOverlay(new EntityAngularVelocityOverlay(EntityManager, _lookup, _transform));
-            }
-            else
-            {
-                _overlayManager.RemoveOverlay<EntityAngularVelocityOverlay>();
-            }
-        }
-    }
-    private sealed class EntityPositionOverlay(EntityLookupSystem _lookup, SharedTransformSystem _transform) : Overlay
-    {
-        public override OverlaySpace Space => OverlaySpace.WorldSpace;
+                const float stubLength = 0.25f;
+                var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
+                var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
 
-        protected internal override void Draw(in OverlayDrawArgs args)
-        {
-            const float stubLength = 0.25f;
+                foreach (var entity in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
+                {
+                    var (center, worldRotation) = xformQuery.GetComponent(entity).GetWorldPositionRotation();
 
-            var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
+                    var drawLine = worldRotation.RotateVec(-Vector2.UnitY);
 
-            foreach (var uid in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
-            {
-                var (center, worldRotation) = _transform.GetWorldPositionRotation(uid);
-
-                var xLine = worldRotation.RotateVec(Vector2.UnitX);
-                var yLine = worldRotation.RotateVec(Vector2.UnitY);
-
-                worldHandle.DrawLine(center, center + xLine * stubLength, Color.Red);
-                worldHandle.DrawLine(center, center + yLine * stubLength, Color.Green);
-            }
-        }
-    }
-
-    private sealed class EntityRotationOverlay(EntityLookupSystem _lookup, SharedTransformSystem _transform) : Overlay
-    {
-        public override OverlaySpace Space => OverlaySpace.WorldSpace;
-
-        protected internal override void Draw(in OverlayDrawArgs args)
-        {
-            const float stubLength = 0.25f;
-            var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
-
-            foreach (var uid in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
-            {
-                var (center, worldRotation) = _transform.GetWorldPositionRotation(uid);
-
-                var drawLine = worldRotation.RotateVec(-Vector2.UnitY);
-
-                worldHandle.DrawLine(center, center + drawLine * stubLength, Color.Red);
-            }
-        }
-    }
-
-    private sealed class EntityVelocityOverlay(IEntityManager _entityManager, EntityLookupSystem _lookup, SharedTransformSystem _transform) : Overlay
-    {
-        public override OverlaySpace Space => OverlaySpace.WorldSpace;
-
-        protected internal override void Draw(in OverlayDrawArgs args)
-        {
-            const float multiplier = 0.2f;
-
-            var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
-
-            var physicsQuery = _entityManager.GetEntityQuery<PhysicsComponent>();
-            foreach (var uid in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
-            {
-                if(!physicsQuery.TryGetComponent(uid, out var physicsComp))
-                    continue;
-
-                var center = _transform.GetWorldPosition(uid);
-                var localVelocity = physicsComp.LinearVelocity;
-
-                if (localVelocity != Vector2.Zero)
-                    worldHandle.DrawLine(center, center + localVelocity * multiplier, Color.Yellow);
-            }
-        }
-    }
-
-    private sealed class EntityAngularVelocityOverlay(IEntityManager _entityManager, EntityLookupSystem _lookup, SharedTransformSystem _transform) : Overlay
-    {
-        public override OverlaySpace Space => OverlaySpace.WorldSpace;
-
-        protected internal override void Draw(in OverlayDrawArgs args)
-        {
-            const float multiplier = (float)(0.2 / (2 * System.Math.PI));
-
-            var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
-
-            var physicsQuery = _entityManager.GetEntityQuery<PhysicsComponent>();
-            foreach (var uid in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
-            {
-                if(!physicsQuery.TryGetComponent(uid, out var physicsComp))
-                    continue;
-
-                var center = _transform.GetWorldPosition(uid);
-                var angularVelocity = physicsComp.AngularVelocity;
-
-                if (angularVelocity != 0.0f)
-                    worldHandle.DrawCircle(center, angularVelocity * multiplier, angularVelocity > 0 ? Color.Magenta : Color.Blue, false);
+                    worldHandle.DrawLine(center, center + drawLine * stubLength, Color.Red);
+                }
             }
         }
     }
 }
-

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -47,7 +47,6 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
@@ -79,14 +78,6 @@ namespace Robust.Client.Debugging
         internal int PointCount;
 
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-        [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-        [Dependency] private readonly TransformSystem _transform = default!;
-        [Dependency] private readonly IOverlayManager _overlay = default!;
-        [Dependency] private readonly IEyeManager _eye = default!;
-        [Dependency] private readonly IInputManager _input = default!;
-        [Dependency] private readonly IMapManager _map = default!;
-        [Dependency] private readonly IPlayerManager _player = default!;
-        [Dependency] private readonly IResourceCache _resourceCache = default!;
 
         internal ContactPoint[] Points = new ContactPoint[MaxContactPoints];
 
@@ -98,21 +89,20 @@ namespace Robust.Client.Debugging
                 if (value == _flags) return;
 
                 if (_flags == PhysicsDebugFlags.None)
-                    _overlay.AddOverlay(
+                    IoCManager.Resolve<IOverlayManager>().AddOverlay(
                         new PhysicsDebugOverlay(
                             EntityManager,
-                            _eye,
-                            _input,
-                            _map,
-                            _player,
-                            _resourceCache,
+                            IoCManager.Resolve<IEyeManager>(),
+                            IoCManager.Resolve<IInputManager>(),
+                            IoCManager.Resolve<IMapManager>(),
+                            IoCManager.Resolve<IPlayerManager>(),
+                            IoCManager.Resolve<IResourceCache>(),
                             this,
-                            _entityLookup,
-                            _physics,
-                            _transform));
+                            Get<EntityLookupSystem>(),
+                            Get<SharedPhysicsSystem>()));
 
                 if (value == PhysicsDebugFlags.None)
-                    _overlay.RemoveOverlay(typeof(PhysicsDebugOverlay));
+                    IoCManager.Resolve<IOverlayManager>().RemoveOverlay(typeof(PhysicsDebugOverlay));
 
                 _flags = value;
             }
@@ -208,7 +198,6 @@ namespace Robust.Client.Debugging
         private readonly DebugPhysicsSystem _debugPhysicsSystem;
         private readonly EntityLookupSystem _lookup;
         private readonly SharedPhysicsSystem _physicsSystem;
-        private readonly SharedTransformSystem _transformSystem;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace | OverlaySpace.ScreenSpace;
 
@@ -219,7 +208,7 @@ namespace Robust.Client.Debugging
         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, SharedTransformSystem transformSystem)
+        public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem)
         {
             _entityManager = entityManager;
             _eyeManager = eyeManager;
@@ -229,7 +218,6 @@ namespace Robust.Client.Debugging
             _debugPhysicsSystem = system;
             _lookup = lookup;
             _physicsSystem = physicsSystem;
-            _transformSystem = transformSystem;
             _font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
         }
 
@@ -339,7 +327,7 @@ namespace Robust.Client.Debugging
                 {
                     if (jointComponent.JointCount == 0 ||
                         !_entityManager.TryGetComponent(uid, out TransformComponent? xf1) ||
-                        !viewAABB.Contains(_transformSystem.GetWorldPosition(xf1))) continue;
+                        !viewAABB.Contains(xf1.WorldPosition)) continue;
 
                     foreach (var (_, joint) in jointComponent.Joints)
                     {
@@ -413,9 +401,8 @@ namespace Robust.Client.Debugging
                     }
 
                     var body = bodyEnt.Comp;
-                    var meta = _entityManager.GetComponent<MetaDataComponent>(bodyEnt);
 
-                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {bodyEnt.Owner} ({meta.EntityName})");
+                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {bodyEnt.Owner}");
                     row++;
                     screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Layer: {Convert.ToString(body.CollisionLayer, 2)}");
                     row++;
@@ -530,8 +517,8 @@ namespace Robust.Client.Debugging
             if (!_entityManager.TryGetComponent(joint.BodyAUid, out TransformComponent? xform1) ||
                 !_entityManager.TryGetComponent(joint.BodyBUid, out TransformComponent? xform2)) return;
 
-            var matrix1 = _transformSystem.GetWorldMatrix(xform1);
-            var matrix2 = _transformSystem.GetWorldMatrix(xform2);
+            var matrix1 = xform1.WorldMatrix;
+            var matrix2 = xform2.WorldMatrix;
 
             var xf1 = new Vector2(matrix1.M31, matrix1.M32);
             var xf2 = new Vector2(matrix2.M31, matrix2.M32);
@@ -539,13 +526,13 @@ namespace Robust.Client.Debugging
             var p1 = Vector2.Transform(joint.LocalAnchorA, matrix1);
             var p2 = Vector2.Transform(joint.LocalAnchorB, matrix2);
 
-            var xfa = new Transform(xf1, _transformSystem.GetWorldRotation(xform1));
-            var xfb = new Transform(xf2, _transformSystem.GetWorldRotation(xform2));
+            var xfa = new Transform(xf1, xform1.WorldRotation);
+            var xfb = new Transform(xf2, xform2.WorldRotation);
 
             switch (joint)
             {
                 case DistanceJoint:
-                    worldHandle.DrawLine(p1, p2, JointColor);
+                    worldHandle.DrawLine(xf1, xf2, JointColor);
                     break;
                 case PrismaticJoint prisma:
                     var pA = Transform.Mul(xfa, joint.LocalAnchorA);

Robust.Client/GameController/GameController.Standalone.cs

@@ -23,7 +23,6 @@ namespace Robust.Client
         private Thread? _gameThread;
         private ISawmill _logger = default!;
 
-        [STAThread]
         public static void Main(string[] args)
         {
             Start(args, new GameControllerOptions());

Robust.Client/GameController/GameController.cs

@@ -19,7 +19,6 @@ using Robust.Client.State;
 using Robust.Client.Upload;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.RichText;
-using Robust.Client.UserInterface.XAML.Proxy;
 using Robust.Client.Utility;
 using Robust.Client.ViewVariables;
 using Robust.Client.WebViewHook;
@@ -54,8 +53,6 @@ namespace Robust.Client
         [Dependency] private readonly IResourceCacheInternal _resourceCache = default!;
         [Dependency] private readonly IResourceManagerInternal _resManager = default!;
         [Dependency] private readonly IRobustSerializer _serializer = default!;
-        [Dependency] private readonly IXamlProxyManager _xamlProxyManager = default!;
-        [Dependency] private readonly IXamlHotReloadManager _xamlHotReloadManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientNetManager _networkManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
@@ -93,7 +90,6 @@ namespace Robust.Client
         [Dependency] private readonly IReplayPlaybackManager _replayPlayback = default!;
         [Dependency] private readonly IReplayRecordingManagerInternal _replayRecording = default!;
         [Dependency] private readonly IReflectionManager _reflectionManager = default!;
-        [Dependency] private readonly IReloadManager _reload = default!;
 
         private IWebViewManagerHook? _webViewHook;
 
@@ -113,28 +109,14 @@ namespace Robust.Client
             _commandLineArgs = args;
         }
 
-        public string GameTitle()
-        {
-            return Options.DefaultWindowTitle ?? _resourceManifest!.DefaultWindowTitle ?? "RobustToolbox";
-        }
-
-        public string WindowIconSet()
-        {
-            return Options.WindowIconSet?.ToString() ?? _resourceManifest!.WindowIconSet ?? "";
-        }
-
-        public string SplashLogo()
-        {
-            return Options.SplashLogo?.ToString() ?? _resourceManifest!.SplashLogo ?? "";
-        }
-
         internal bool StartupContinue(DisplayMode displayMode)
         {
             DebugTools.AssertNotNull(_resourceManifest);
 
             _clyde.InitializePostWindowing();
             _audio.InitializePostWindowing();
-            _clyde.SetWindowTitle(GameTitle());
+            _clyde.SetWindowTitle(
+                Options.DefaultWindowTitle ?? _resourceManifest!.DefaultWindowTitle ?? "RobustToolbox");
 
             _taskManager.Initialize();
             _parallelMgr.Initialize();
@@ -186,12 +168,9 @@ namespace Robust.Client
             // before prototype load.
             ProgramShared.FinishCheckBadFileExtensions(checkBadExtensions);
 
-            _reload.Initialize();
             _reflectionManager.Initialize();
             _prototypeManager.Initialize();
             _prototypeManager.LoadDefaultPrototypes();
-            _xamlProxyManager.Initialize();
-            _xamlHotReloadManager.Initialize();
             _userInterfaceManager.Initialize();
             _eyeManager.Initialize();
             _entityManager.Initialize();
@@ -384,7 +363,7 @@ namespace Robust.Client
 
             _prof.Initialize();
 
-            _resManager.Initialize(Options.LoadConfigAndUserData ? userDataDir : null, hideUserDataDir: true);
+            _resManager.Initialize(Options.LoadConfigAndUserData ? userDataDir : null);
 
             var mountOptions = _commandLineArgs != null
                 ? MountOptions.Merge(_commandLineArgs.MountOptions, Options.MountOptions)
@@ -415,8 +394,10 @@ namespace Robust.Client
                 // Handle GameControllerOptions implicit CVar overrides.
                 _configurationManager.OverrideConVars(new[]
                 {
-                    (CVars.DisplayWindowIconSet.Name, WindowIconSet()),
-                    (CVars.DisplaySplashLogo.Name, SplashLogo())
+                    (CVars.DisplayWindowIconSet.Name,
+                        options.WindowIconSet?.ToString() ?? _resourceManifest.WindowIconSet ?? ""),
+                    (CVars.DisplaySplashLogo.Name,
+                        options.SplashLogo?.ToString() ?? _resourceManifest.SplashLogo ?? "")
                 });
             }
 

Robust.Client/GameObjects/ClientEntityManager.cs

@@ -26,9 +26,6 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IBaseClient _client = default!;
         [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
 
-        internal event Action? AfterStartup;
-        internal event Action? AfterShutdown;
-
         public override void Initialize()
         {
             SetupNetworking();
@@ -37,20 +34,6 @@ namespace Robust.Client.GameObjects
             base.Initialize();
         }
 
-        public override void Startup()
-        {
-            base.Startup();
-
-            AfterStartup?.Invoke();
-        }
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-
-            AfterShutdown?.Invoke();
-        }
-
         public override void FlushEntities()
         {
             // Server doesn't network deletions on client shutdown so we need to
@@ -65,6 +48,16 @@ namespace Robust.Client.GameObjects
             return base.CreateEntity(prototypeName, out metadata);
         }
 
+        void IClientEntityManagerInternal.InitializeEntity(EntityUid entity, MetaDataComponent? meta)
+        {
+            base.InitializeEntity(entity, meta);
+        }
+
+        void IClientEntityManagerInternal.StartEntity(EntityUid entity)
+        {
+            base.StartEntity(entity);
+        }
+
         /// <inheritdoc />
         public override void DirtyEntity(EntityUid uid, MetaDataComponent? meta = null)
         {
@@ -101,33 +94,11 @@ namespace Robust.Client.GameObjects
         /// <inheritdoc />
         public override void Dirty<T>(Entity<T> ent, MetaDataComponent? meta = null)
         {
-            // Client only dirties during prediction
+            //  Client only dirties during prediction
             if (_gameTiming.InPrediction)
                 base.Dirty(ent, meta);
         }
 
-        public override void DirtyField<T>(EntityUid uid, T comp, string fieldName, MetaDataComponent? metadata = null)
-        {
-            // TODO Prediction
-            // does the client actually need to dirty the field?
-            // I.e., can't it just dirty the whole component to trigger a reset?
-
-            // Client only dirties during prediction
-            if (_gameTiming.InPrediction)
-                base.DirtyField(uid, comp, fieldName, metadata);
-        }
-
-        public override void DirtyFields<T>(EntityUid uid, T comp, MetaDataComponent? meta, params string[] fields)
-        {
-            // TODO Prediction
-            // does the client actually need to dirty the field?
-            // I.e., can't it just dirty the whole component to trigger a reset?
-
-            // Client only dirties during prediction
-            if (_gameTiming.InPrediction)
-                base.DirtyFields(uid, comp, meta, fields);
-        }
-
         /// <inheritdoc />
         public override void Dirty<T1, T2>(Entity<T1, T2> ent, MetaDataComponent? meta = null)
         {
@@ -157,10 +128,7 @@ namespace Robust.Client.GameObjects
             var sequence = _stateMan.SystemMessageDispatched(msg);
             EntityNetManager?.SendSystemNetworkMessage(msg, sequence);
 
-            if (!_stateMan.IsPredictionEnabled && _client.RunLevel != ClientRunLevel.SinglePlayerGame)
-                return;
-
-            DebugTools.Assert(_gameTiming.InPrediction && _gameTiming.IsFirstTimePredicted || _client.RunLevel == ClientRunLevel.SinglePlayerGame);
+            DebugTools.Assert(!_stateMan.IsPredictionEnabled || _gameTiming.InPrediction && _gameTiming.IsFirstTimePredicted || _client.RunLevel != ClientRunLevel.Connected);
 
             var eventArgs = new EntitySessionEventArgs(session!);
             EventBus.RaiseEvent(EventSource.Local, msg);

Robust.Client/GameObjects/Components/Renderable/SpriteComponent.cs

@@ -30,7 +30,6 @@ using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth;
 using static Robust.Shared.Serialization.TypeSerializers.Implementations.SpriteSpecifierSerializer;
 using Direction = Robust.Shared.Maths.Direction;
 using Vector4 = Robust.Shared.Maths.Vector4;
-using SysVec4 = System.Numerics.Vector4;
 
 namespace Robust.Client.GameObjects
 {
@@ -754,20 +753,12 @@ namespace Robust.Client.GameObjects
                 if (layerDatum.Shader == string.Empty)
                 {
                     layer.ShaderPrototype = null;
-                    layer.UnShaded = false;
-                    layer.Shader = null;
-                }
-                else if (layerDatum.Shader == SpriteSystem.UnshadedId.Id)
-                {
-                    layer.ShaderPrototype = SpriteSystem.UnshadedId;
-                    layer.UnShaded = true;
                     layer.Shader = null;
                 }
                 else if (prototypes.TryIndex<ShaderPrototype>(layerDatum.Shader, out var prototype))
                 {
                     layer.ShaderPrototype = layerDatum.Shader;
                     layer.Shader = prototype.Instance();
-                    layer.UnShaded = false;
                 }
                 else
                 {
@@ -844,28 +835,11 @@ namespace Robust.Client.GameObjects
             if (!TryGetLayer(layer, out var theLayer, true))
                 return;
 
-            if (shader == null)
-            {
-                theLayer.UnShaded = false;
-                theLayer.Shader = null;
-                theLayer.ShaderPrototype = null;
-                return;
-            }
-
-            if (prototype == SpriteSystem.UnshadedId.Id)
-            {
-                theLayer.UnShaded = true;
-                theLayer.ShaderPrototype = SpriteSystem.UnshadedId;
-                theLayer.Shader = null;
-                return;
-            }
-
-            theLayer.UnShaded = false;
             theLayer.Shader = shader;
             theLayer.ShaderPrototype = prototype;
         }
 
-        public void LayerSetShader(object layerKey, ShaderInstance? shader, string? prototype = null)
+        public void LayerSetShader(object layerKey, ShaderInstance shader, string? prototype = null)
         {
             if (!LayerMapTryGet(layerKey, out var layer, true))
                 return;
@@ -1519,18 +1493,10 @@ namespace Robust.Client.GameObjects
         {
             [ViewVariables] private readonly SpriteComponent _parent;
 
-            [ViewVariables] public ProtoId<ShaderPrototype>? ShaderPrototype;
+            [ViewVariables] public string? ShaderPrototype;
             [ViewVariables] public ShaderInstance? Shader;
             [ViewVariables] public Texture? Texture;
 
-            /// <summary>
-            /// If true, then this layer is drawn without lighting applied.
-            /// Unshaded layers are given special treatment and don't just use the unshaded-shader to avoid having to
-            /// unnecessarily swap out the light texture. This helps the number of batches that need to be sent to the
-            /// GPU while drawing sprites.
-            /// </summary>
-            [ViewVariables] internal bool UnShaded;
-
             private RSI? _rsi;
             [ViewVariables] public RSI? RSI
             {
@@ -1697,7 +1663,6 @@ namespace Robust.Client.GameObjects
                 if (toClone.Shader != null)
                 {
                     Shader = toClone.Shader.Mutable ? toClone.Shader.Duplicate() : toClone.Shader;
-                    UnShaded = toClone.UnShaded;
                     ShaderPrototype = toClone.ShaderPrototype;
                 }
                 Texture = toClone.Texture;
@@ -2113,20 +2078,6 @@ namespace Robust.Client.GameObjects
                     drawingHandle.UseShader(Shader);
 
                 var layerColor = _parent.color * Color;
-
-                DebugTools.Assert(layerColor is {R: >= 0, G: >= 0, B: >= 0, A: >= 0}, "Negative colour modulation");
-
-                if (UnShaded)
-                {
-                    DebugTools.AssertNull(Shader);
-
-                    // Negative modulation values are used to disable light shading in the default shader.
-                    // Specifically we set colour = -1 - colour
-                    // This ensures that non-negative values become negative & is trivially invertible.
-                    // Alternatively we could just clamp the colour to [0,1] and subtract a constant.
-                    layerColor = new(new SysVec4(-1) - layerColor.RGBA);
-                }
-
                 var textureSize = texture.Size / (float)EyeManager.PixelsPerMeter;
                 var quad = Box2.FromDimensions(textureSize/-2, textureSize);
 

Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs

@@ -76,8 +76,7 @@ namespace Robust.Client.GameObjects
             foreach (var key in remie)
             {
                 component.PlayingAnimations.Remove(key);
-                var completedEvent = new AnimationCompletedEvent(uid, component, key, true);
-                EntityManager.EventBus.RaiseLocalEvent(uid, completedEvent, true);
+                EntityManager.EventBus.RaiseLocalEvent(uid, new AnimationCompletedEvent {Uid = uid, Key = key}, true);
             }
 
             return false;
@@ -99,6 +98,15 @@ namespace Robust.Client.GameObjects
             Play(new Entity<AnimationPlayerComponent>(uid, 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);
@@ -143,14 +151,6 @@ namespace Robust.Client.GameObjects
             }
 #endif
 
-            foreach (var track in animation.AnimationTracks)
-            {
-                if (track is not AnimationTrackSpriteFlick)
-                    continue;
-
-                track.AdvancePlayback(ent.Owner, 0, 0, 0f);
-            }
-
             ent.Comp.PlayingAnimations.Add(key, playback);
         }
 
@@ -187,8 +187,7 @@ namespace Robust.Client.GameObjects
                 return;
             }
 
-            var completedEvent = new AnimationCompletedEvent(entity.Owner, entity.Comp, key, false);
-            EntityManager.EventBus.RaiseLocalEvent(entity.Owner, completedEvent, true);
+            EntityManager.EventBus.RaiseLocalEvent(entity.Owner, new AnimationCompletedEvent {Uid = entity.Owner, Key = key}, true);
         }
 
         public void Stop(EntityUid uid, AnimationPlayerComponent? component, string key)
@@ -202,33 +201,7 @@ namespace Robust.Client.GameObjects
     /// </summary>
     public sealed class AnimationCompletedEvent : EntityEventArgs
     {
-        /// <summary>
-        /// The entity associated with the event.
-        /// </summary>
         public EntityUid Uid { get; init; }
-
-        /// <summary>
-        /// The animation player component associated with the entity this event was raised on.
-        /// </summary>
-        public AnimationPlayerComponent AnimationPlayer { get; init; }
-
-        /// <summary>
-        /// The key associated with the animation that was completed.
-        /// </summary>
         public string Key { get; init; } = string.Empty;
-
-        /// <summary>
-        /// If true, the animation finished by getting to its natural end.
-        /// If false, it was removed prematurely via <see cref="AnimationPlayerSystem.Stop(EntityUid,AnimationPlayerComponent,string)"/> or similar overloads.
-        /// </summary>
-        public bool Finished { get; init; }
-
-        public AnimationCompletedEvent(EntityUid uid, AnimationPlayerComponent animationPlayer, string key, bool finished = true)
-        {
-            Uid = uid;
-            AnimationPlayer = animationPlayer;
-            Key = key;
-            Finished = finished;
-        }
     }
 }

Robust.Client/GameObjects/EntitySystems/AppearanceSystem.cs

@@ -2,11 +2,8 @@ using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Serialization;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
-using Robust.Shared.Serialization.Manager;
 
 namespace Robust.Client.GameObjects
 {
@@ -14,7 +11,6 @@ namespace Robust.Client.GameObjects
     public sealed class AppearanceSystem : SharedAppearanceSystem
     {
         private readonly Queue<(EntityUid uid, AppearanceComponent)> _queuedUpdates = new();
-        [Dependency] private readonly ISerializationManager _serialization = default!;
 
         public override void Initialize()
         {
@@ -26,8 +22,6 @@ namespace Robust.Client.GameObjects
 
         protected override void OnAppearanceGetState(EntityUid uid, AppearanceComponent component, ref ComponentGetState args)
         {
-            // TODO Game State
-            // Force the client to serialize & de-serialize implicitly generated component states.
             var clone = CloneAppearanceData(component.AppearanceData);
             args.State = new AppearanceComponentState(clone);
         }
@@ -80,13 +74,10 @@ namespace Robust.Client.GameObjects
 
             foreach (var (key, value) in data)
             {
-                object? serializationObject;
                 if (value.GetType().IsValueType)
                     newDict[key] = value;
                 else if (value is ICloneable cloneable)
                     newDict[key] = cloneable.Clone();
-                else if ((serializationObject = _serialization.CreateCopy(value)) != null)
-                    newDict[key] = serializationObject;
                 else
                     throw new NotSupportedException("Invalid object in appearance data dictionary. Appearance data must be cloneable");
             }