Update and clean up Prototype manager methods

.github/CODEOWNERS

@@ -11,7 +11,7 @@
 /Robust.Analyzers @PaulRitter
 /Robust.*/GameStates @PaulRitter
 /Robust.Shared/Analyzers @PaulRitter
-/Robust.*/Serialization @PaulRitter @DrSmugleaf
+/Robust.*/Serialization @PaulRitter
 /Robust.*/Prototypes @PaulRitter
 /Robust.Shared/GameObjects/ComponentDependencies @PaulRitter
 /Robust.*/Containers @PaulRitter

.github/workflows/benchmarks.yml

@@ -1,35 +0,0 @@
-name: Benchmarks
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 5 * * *'
-  push:
-    tags:
-      - 'v*'
-
-concurrency: benchmarks
-
-env:
-  ROBUST_BENCHMARKS_ENABLE_SQL: 1
-  ROBUST_BENCHMARKS_SQL_ADDRESS: ${{ secrets.BENCHMARKS_WRITE_ADDRESS }}
-  ROBUST_BENCHMARKS_SQL_PORT: ${{ secrets.BENCHMARKS_WRITE_PORT }}
-  ROBUST_BENCHMARKS_SQL_USER: ${{ secrets.BENCHMARKS_WRITE_USER }}
-  ROBUST_BENCHMARKS_SQL_PASSWORD: ${{ secrets.BENCHMARKS_WRITE_PASSWORD }}
-  ROBUST_BENCHMARKS_SQL_DATABASE: benchmarks
-
-jobs:
-  benchmark:
-    name: Run Benchmarks
-    runs-on: ubuntu-latest
-    steps:
-    - name: Run script on centcomm
-      uses: appleboy/ssh-action@master
-      with:
-        host: centcomm.spacestation14.io
-        username: robust-benchmark-runner
-        key: ${{ secrets.CENTCOMM_ROBUST_BENCHMARK_RUNNER_KEY }}
-        command_timeout: 100000m 
-        script: |
-          wget https://raw.githubusercontent.com/space-wizards/RobustToolbox/${{ github.sha }}/Tools/run_benchmarks.py
-          python3 run_benchmarks.py "${{ secrets.BENCHMARKS_WRITE_ADDRESS }}" "${{ secrets.BENCHMARKS_WRITE_PORT }}" "${{ secrets.BENCHMARKS_WRITE_USER }}" "${{ secrets.BENCHMARKS_WRITE_PASSWORD }}" "${{ github.sha }}"
-          rm run_benchmarks.py

.github/workflows/build-docfx.yml

@@ -1,34 +0,0 @@
-name: Build & Publish DocFX
-
-on:
-  schedule:
-    - cron: "0 0 * * 0"
-jobs:
-  docfx:
-   runs-on: ubuntu-latest
-   steps: 
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.x
-        
-    - name: Install dependencies
-      run: dotnet restore
-      
-    - 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: 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

@@ -22,12 +22,10 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 6.0.100
     - name: Install dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore /p:WarningsAsErrors=nullable
     - name: Test Engine
-      run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
- 
-
+      run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -v n

.gitignore

@@ -76,5 +76,3 @@ MSBuild/Robust.Custom.targets
 
 
 release/
-Robust.Docfx/*-site
-Robust.Docfx/api

.gitmodules

@@ -10,6 +10,9 @@
 [submodule "Robust.LoaderApi"]
 	path = Robust.LoaderApi
 	url = https://github.com/space-wizards/Robust.LoaderApi.git
+[submodule "ManagedHttpListener"]
+	path = ManagedHttpListener
+	url = https://github.com/space-wizards/ManagedHttpListener.git
 [submodule "cefglue"]
 	path = cefglue
 	url = https://github.com/space-wizards/cefglue.git

MSBuild/Robust.Engine.Version.props

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

MSBuild/XamlIL.targets

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Avoid MSBuild adding a None entry for XAML files because they'd show up TWICE in the project view. -->
     <DefaultItemExcludes>**/*.xaml</DefaultItemExcludes>
-    <RobustUseExternalMSBuild>false</RobustUseExternalMSBuild>
+    <RobustUseExternalMSBuild>true</RobustUseExternalMSBuild>
     <_RobustUseExternalMSBuild>$(RobustUseExternalMSBuild)</_RobustUseExternalMSBuild>
     <_RobustUseExternalMSBuild Condition="'$(_RobustForceInternalMSBuild)' == 'true'">false</_RobustUseExternalMSBuild>
   </PropertyGroup>

Resources/Locale/en-US/commands.ftl

@@ -1,116 +0,0 @@
-### Localization for engine console commands
-
-## 'help' command
-cmd-help-desc = Display general help or help text for a specific command
-cmd-help-help = Usage: help [command name]
-    When no command name is provided, displays general-purpose help text. If a command name is provided, displays help text for that command.
-
-cmd-help-no-args = To display help for a specific command, write 'help <command>'. To list all available commands, write 'list'. To search for commands, use 'list <filter>'.
-cmd-help-unknown = Unknown command: { $command }
-cmd-help-top = { $command } - { $description }
-cmd-help-invalid-args = Invalid amount of arguments.
-cmd-help-arg-cmdname = [command name]
-
-## 'cvar' command
-cmd-cvar-desc = Gets or sets a CVar.
-cmd-cvar-help = Usage: cvar <name | ?> [value]
-    If a value is passed, the value is parsed and stored as the new value of the CVar.
-    If not, the current value of the CVar is displayed.
-    Use 'cvar ?' to get a list of all registered CVars.
-
-cmd-cvar-invalid-args = Must provide exactly one or two arguments.
-cmd-cvar-not-registered = CVar '{ $cvar }' is not registered. Use 'cvar ?' to get a list of all registered CVars.
-cmd-cvar-parse-error = Input value is in incorrect format for type { $type }
-cmd-cvar-compl-list = List available CVars
-cmd-cvar-arg-name = <name | ?>
-
-## 'list' command
-cmd-list-desc = Lists available commands, with optional search filter
-cmd-list-help = Usage: list [filter]
-    Lists all available commands. If an argument is provided, it will be used to filter commands by name.
-
-cmd-list-heading = SIDE NAME            DESC{"\u000A"}-------------------------{"\u000A"}
-
-cmd-list-arg-filter = [filter]
-
-## '>' command, aka remote exec
-cmd-remoteexec-desc = Executes server-side commands
-cmd-remoteexec-help = Usage: > <command> [arg] [arg] [arg...]
-    Executes a command on the server. This is necessary if a command with the same name exists on the client, as simply running the command would run the client command first.
-
-## 'gc' command
-cmd-gc-desc = Run the GC (Garbage Collector)
-cmd-gc-help = Usage: gc [generation]
-    Uses GC.Collect() to execute the Garbage Collector.
-    If an argument is provided, it is parsed as a GC generation number and GC.Collect(int) is used.
-    Use the 'gfc' command to do an LOH-compacting full GC.
-cmd-gc-failed-parse = Failed to parse argument.
-cmd-gc-arg-generation = [generation]
-
-## 'gcf' command
-cmd-gcf-desc = Run the GC, fully, compacting LOH and everything.
-cmd-gcf-help = Usage: gcf
-    Does a full GC.Collect(2, GCCollectionMode.Forced, true, true) while also compacting LOH.
-    This will probably lock up for hundreds of milliseconds, be warned.
-
-## 'gc_mode' command
-cmd-gc_mode-desc = Change/Read the GC Latency mode
-cmd-gc_mode-help = Usage: gc_mode [type]
-    If no argument is provided, returns the current GC latency mode.
-    If an argument is passed, it is parsed as GCLatencyMode and set as the GC latency mode.
-
-cmd-gc_mode-current = current gc latency mode: { $prevMode }
-cmd-gc_mode-possible = possible modes:
-cmd-gc_mode-option = - { $mode }
-cmd-gc_mode-unknown = unknown gc latency mode: { $arg }
-cmd-gc_mode-attempt = attempting gc latency mode change: { $prevMode } -> { $mode }
-cmd-gc_mode-result = resulting gc latency mode: { $mode }
-cmd-gc_mode-arg-type = [type]
-
-## 'mem' command
-cmd-mem-desc = Prints managed memory info
-cmd-mem-help = Usage: mem
-
-cmd-mem-report = Heap Size: { TOSTRING($heapSize, "N0") }
-    Total Allocated: { TOSTRING($totalAllocated, "N0") }
-
-## 'physics' command
-cmd-physics-overlay = {$overlay} is not a recognised overlay
-
-## 'lsasm' command
-cmd-lsasm-desc = Lists loaded assemblies by load context
-cmd-lsasm-help = Usage: lsasm
-
-## 'exec' command
-cmd-exec-desc = Executes a script file from the game's writeable user data
-cmd-exec-help = Usage: exec <fileName>
-    Each line in the file is executed as a single command, unless it starts with a #
-
-cmd-exec-arg-filename = <fileName>
-
-## 'dump_net_comps' command
-cmd-dump_net_comps-desc = Prints the table of networked components.
-cmd-dump_net_comps-help = Usage: dump_net-comps
-
-cmd-dump_net_comps-error-writeable = Registration still writeable, network ids have not been generated.
-cmd-dump_net_comps-header = Networked Component Registrations:
-
-## 'dump_event_tables' command
-cmd-dump_event_tables-desc = Prints directed event tables for an entity.
-cmd-dump_event_tables-help = Usage: dump_event_tables <entityUid>
-
-cmd-dump_event_tables-missing-arg-entity = Missing entity argument
-cmd-dump_event_tables-error-entity = Invalid entity
-cmd-dump_event_tables-arg-entity = <entityUid>
-
-## 'monitor' command
-cmd-monitor-desc = Toggles a debug monitor in the F3 menu.
-cmd-monitor-help = Usage: monitor <name>
-    Possible monitors are: { $monitors }
-    You can also use the special values "-all" and "+all" to hide or show all monitors, respectively.
-
-cmd-monitor-arg-monitor = <monitor>
-cmd-monitor-invalid-name = Invalid monitor name
-cmd-monitor-arg-count = Missing monitor argument
-cmd-monitor-minus-all-hint = Hides all monitors
-cmd-monitor-plus-all-hint = Shows all monitors

Resources/Locale/en-US/controls.ftl

@@ -1,10 +0,0 @@
-color-selector-sliders-red = R
-color-selector-sliders-green = G
-color-selector-sliders-blue = B
-color-selector-sliders-hue = H
-color-selector-sliders-saturation = S
-color-selector-sliders-value = V
-color-selector-sliders-alpha = A
-
-color-selector-sliders-rgb = RGB
-color-selector-sliders-hsv = HSV

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

@@ -1 +0,0 @@
-midi-panic-command-description = Turns off every note for every active MIDI renderer.

Robust.Analyzers/Robust.Analyzers.csproj

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="3.8.0" />
   </ItemGroup>
 
 </Project>

Robust.Benchmarks/Configs/DefaultSQLConfig.cs

@@ -1,53 +0,0 @@
-using System.Collections.Generic;
-using System.Globalization;
-using BenchmarkDotNet.Analysers;
-using BenchmarkDotNet.Columns;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnosers;
-using BenchmarkDotNet.Exporters;
-using BenchmarkDotNet.Filters;
-using BenchmarkDotNet.Jobs;
-using BenchmarkDotNet.Loggers;
-using BenchmarkDotNet.Order;
-using BenchmarkDotNet.Reports;
-using BenchmarkDotNet.Validators;
-using Robust.Benchmarks.Exporters;
-
-namespace Robust.Benchmarks.Configs;
-
-public sealed class DefaultSQLConfig : IConfig
-{
-    public static readonly IConfig Instance = new DefaultSQLConfig();
-
-    private DefaultSQLConfig(){}
-
-    public IEnumerable<IExporter> GetExporters()
-    {
-        yield return SQLExporter.Default;
-    }
-
-    public IEnumerable<IColumnProvider> GetColumnProviders() => DefaultConfig.Instance.GetColumnProviders();
-
-    public IEnumerable<ILogger> GetLoggers() => DefaultConfig.Instance.GetLoggers();
-
-    public IEnumerable<IDiagnoser> GetDiagnosers() => DefaultConfig.Instance.GetDiagnosers();
-
-    public IEnumerable<IAnalyser> GetAnalysers() => DefaultConfig.Instance.GetAnalysers();
-
-    public IEnumerable<Job> GetJobs() => DefaultConfig.Instance.GetJobs();
-
-    public IEnumerable<IValidator> GetValidators() => DefaultConfig.Instance.GetValidators();
-
-    public IEnumerable<HardwareCounter> GetHardwareCounters() => DefaultConfig.Instance.GetHardwareCounters();
-
-    public IEnumerable<IFilter> GetFilters() => DefaultConfig.Instance.GetFilters();
-
-    public IEnumerable<BenchmarkLogicalGroupRule> GetLogicalGroupRules() => DefaultConfig.Instance.GetLogicalGroupRules();
-
-    public IOrderer Orderer => DefaultConfig.Instance.Orderer!;
-    public SummaryStyle SummaryStyle => DefaultConfig.Instance.SummaryStyle;
-    public ConfigUnionRule UnionRule => DefaultConfig.Instance.UnionRule;
-    public string ArtifactsPath => DefaultConfig.Instance.ArtifactsPath;
-    public CultureInfo CultureInfo => DefaultConfig.Instance.CultureInfo!;
-    public ConfigOptions Options => DefaultConfig.Instance.Options;
-}

Robust.Benchmarks/EntityManager/AddRemoveComponentBenchmark.cs

@@ -1,54 +0,0 @@
-using BenchmarkDotNet.Attributes;
-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 class AddRemoveComponentBenchmark
-{
-    private ISimulation _simulation = default!;
-    private IEntityManager _entityManager = default!;
-
-    [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 coords = new MapCoordinates(0, 0, new MapId(1));
-        _simulation.AddMap(coords.MapId);
-
-        for (var i = 0; i < N; i++)
-        {
-            _entityManager.SpawnEntity(null, coords);
-        }
-    }
-
-    [Benchmark]
-    public void AddRemoveComponent()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            _entityManager.AddComponent<A>(uid);
-            _entityManager.RemoveComponent<A>(uid);
-        }
-    }
-
-    [ComponentProtoName("A")]
-    public sealed class A : Component
-    {
-    }
-}

Robust.Benchmarks/EntityManager/ComponentIndexBenchmark.cs

@@ -1,225 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.GameObjects;
-
-namespace Robust.Benchmarks.EntityManager;
-
-public class ComponentIndexBenchmark
-{
-    // Just a bunch of types to bloat the test lists.
-
-    private readonly CompIndexFetcher _compIndexFetcherDirect;
-    private readonly IFetcher _compIndexFetcher;
-    private readonly DictFetcher _dictFetcherDirect;
-    private readonly IFetcher _dictFetcher;
-
-
-    public ComponentIndexBenchmark()
-    {
-        _compIndexFetcherDirect = new CompIndexFetcher();
-        _compIndexFetcher = _compIndexFetcherDirect;
-        _dictFetcherDirect = new DictFetcher();
-        _dictFetcher = _dictFetcherDirect;
-    }
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        var types = typeof(ComponentIndexBenchmark)
-            .GetNestedTypes(BindingFlags.NonPublic)
-            .Where(t => t.Name.StartsWith("TestType"))
-            .ToArray();
-
-        _compIndexFetcher.Init(types);
-        _dictFetcher.Init(types);
-    }
-
-    [Benchmark]
-    public int BenchCompIndex() => _compIndexFetcher.Get<TestType50>();
-
-    [Benchmark]
-    public int BenchDict() => _dictFetcher.Get<TestType50>();
-
-    [Benchmark]
-    public int BenchCompIndexDirect() => _compIndexFetcherDirect.Get<TestType50>();
-
-    [Benchmark]
-    public int BenchDictDirect() => _dictFetcherDirect.Get<TestType50>();
-
-    private static CompIdx ArrayIndexFor<T>() => CompArrayIndex<T>.Idx;
-
-    private static int _compIndexMaster = -1;
-
-    private static class CompArrayIndex<T>
-    {
-        // ReSharper disable once StaticMemberInGenericType
-        public static readonly CompIdx Idx = new(Interlocked.Increment(ref _compIndexMaster));
-    }
-
-    private static CompIdx GetCompIdIndex(Type type)
-    {
-        return (CompIdx)typeof(CompArrayIndex<>)
-            .MakeGenericType(type)
-            .GetField(nameof(CompArrayIndex<int>.Idx), BindingFlags.Static | BindingFlags.Public)!
-            .GetValue(null)!;
-    }
-
-    private interface IFetcher
-    {
-        void Init(Type[] types);
-
-        int Get<T>();
-    }
-
-    private sealed class CompIndexFetcher : IFetcher
-    {
-        private int[] _values = Array.Empty<int>();
-
-        public void Init(Type[] types)
-        {
-            var max = types.Max(t => GetCompIdIndex(t).Value);
-
-            _values = new int[max + 1];
-
-            var i = 0;
-            foreach (var type in types)
-            {
-                _values[GetCompIdIndex(type).Value] = i++;
-            }
-        }
-
-        public int Get<T>()
-        {
-            return _values[CompArrayIndex<T>.Idx.Value];
-        }
-    }
-
-    private sealed class DictFetcher : IFetcher
-    {
-        private readonly Dictionary<Type, int> _values = new();
-
-        public void Init(Type[] types)
-        {
-            var i = 0;
-            foreach (var type in types)
-            {
-                _values[type] = i++;
-            }
-        }
-
-        public int Get<T>()
-        {
-            return _values[typeof(T)];
-        }
-    }
-
-    // Just a bunch of types to pad the size of the arrays and such.
-
-    // @formatter:off
-    // ReSharper disable UnusedType.Local
-    private sealed class TestType1{}
-    private sealed class TestType2{}
-    private sealed class TestType3{}
-    private sealed class TestType4{}
-    private sealed class TestType5{}
-    private sealed class TestType6{}
-    private sealed class TestType7{}
-    private sealed class TestType8{}
-    private sealed class TestType9{}
-    private sealed class TestType10{}
-    private sealed class TestType11{}
-    private sealed class TestType12{}
-    private sealed class TestType13{}
-    private sealed class TestType14{}
-    private sealed class TestType15{}
-    private sealed class TestType16{}
-    private sealed class TestType17{}
-    private sealed class TestType18{}
-    private sealed class TestType19{}
-    private sealed class TestType20{}
-    private sealed class TestType21{}
-    private sealed class TestType22{}
-    private sealed class TestType23{}
-    private sealed class TestType24{}
-    private sealed class TestType25{}
-    private sealed class TestType26{}
-    private sealed class TestType27{}
-    private sealed class TestType28{}
-    private sealed class TestType29{}
-    private sealed class TestType30{}
-    private sealed class TestType31{}
-    private sealed class TestType32{}
-    private sealed class TestType33{}
-    private sealed class TestType34{}
-    private sealed class TestType35{}
-    private sealed class TestType36{}
-    private sealed class TestType37{}
-    private sealed class TestType38{}
-    private sealed class TestType39{}
-    private sealed class TestType40{}
-    private sealed class TestType41{}
-    private sealed class TestType42{}
-    private sealed class TestType43{}
-    private sealed class TestType44{}
-    private sealed class TestType45{}
-    private sealed class TestType46{}
-    private sealed class TestType47{}
-    private sealed class TestType48{}
-    private sealed class TestType49{}
-    private sealed class TestType50{}
-    private sealed class TestType51{}
-    private sealed class TestType52{}
-    private sealed class TestType53{}
-    private sealed class TestType54{}
-    private sealed class TestType55{}
-    private sealed class TestType56{}
-    private sealed class TestType57{}
-    private sealed class TestType58{}
-    private sealed class TestType59{}
-    private sealed class TestType60{}
-    private sealed class TestType61{}
-    private sealed class TestType62{}
-    private sealed class TestType63{}
-    private sealed class TestType64{}
-    private sealed class TestType65{}
-    private sealed class TestType66{}
-    private sealed class TestType67{}
-    private sealed class TestType68{}
-    private sealed class TestType69{}
-    private sealed class TestType70{}
-    private sealed class TestType71{}
-    private sealed class TestType72{}
-    private sealed class TestType73{}
-    private sealed class TestType74{}
-    private sealed class TestType75{}
-    private sealed class TestType76{}
-    private sealed class TestType77{}
-    private sealed class TestType78{}
-    private sealed class TestType79{}
-    private sealed class TestType80{}
-    private sealed class TestType81{}
-    private sealed class TestType82{}
-    private sealed class TestType83{}
-    private sealed class TestType84{}
-    private sealed class TestType85{}
-    private sealed class TestType86{}
-    private sealed class TestType87{}
-    private sealed class TestType88{}
-    private sealed class TestType89{}
-    private sealed class TestType90{}
-    private sealed class TestType91{}
-    private sealed class TestType92{}
-    private sealed class TestType93{}
-    private sealed class TestType94{}
-    private sealed class TestType95{}
-    private sealed class TestType96{}
-    private sealed class TestType97{}
-    private sealed class TestType98{}
-    private sealed class TestType99{}
-    // ReSharper restore UnusedType.Local
-    // @formatter:on
-}

Robust.Benchmarks/EntityManager/GetComponentBenchmark.cs

@@ -1,61 +0,0 @@
-using System;
-using BenchmarkDotNet.Attributes;
-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 class GetComponentBenchmark
-{
-    private ISimulation _simulation = default!;
-    private IEntityManager _entityManager = default!;
-
-    [UsedImplicitly]
-    [Params(1, 10, 100, 1000)]
-    public int N;
-
-    public A[] Comps = default!;
-
-    [GlobalSetup]
-    public void GlobalSetup()
-    {
-        _simulation = RobustServerSimulation
-            .NewSimulation()
-            .RegisterComponents(f => f.RegisterClass<A>())
-            .InitializeInstance();
-
-        _entityManager = _simulation.Resolve<IEntityManager>();
-
-        Comps = new A[N+2];
-
-        var coords = new MapCoordinates(0, 0, new MapId(1));
-        _simulation.AddMap(coords.MapId);
-
-        for (var i = 0; i < N; i++)
-        {
-            var uid = _entityManager.SpawnEntity(null, coords);
-            _entityManager.AddComponent<A>(uid);
-        }
-    }
-
-    [Benchmark]
-    public A[] GetComponent()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            Comps[i] = _entityManager.GetComponent<A>(new EntityUid(i));
-        }
-
-        // Return something so the JIT doesn't optimize out all the GetComponent calls.
-        return Comps;
-    }
-
-    [ComponentProtoName("A")]
-    public sealed class A : Component
-    {
-    }
-}

Robust.Benchmarks/EntityManager/SpawnDeleteEntityBenchmark.cs

@@ -1,62 +0,0 @@
-using BenchmarkDotNet.Attributes;
-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 class SpawnDeleteEntityBenchmark
-{
-    private ISimulation _simulation = default!;
-    private IEntityManager _entityManager = default!;
-
-    private MapCoordinates _mapCoords = MapCoordinates.Nullspace;
-    private EntityCoordinates _entCoords = EntityCoordinates.Invalid;
-
-    [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>();
-
-        _mapCoords = new MapCoordinates(0, 0, new MapId(1));
-        var uid = _simulation.AddMap(_mapCoords.MapId);
-        _entCoords = new EntityCoordinates(uid, 0, 0);
-    }
-
-    [Benchmark(Baseline = true)]
-    public void SpawnDeleteEntityMapCoords()
-    {
-        for (var i = 0; i < N; i++)
-        {
-            var uid = _entityManager.SpawnEntity(null, _mapCoords);
-            _entityManager.DeleteEntity(uid);
-        }
-    }
-
-    [Benchmark]
-    public void SpawnDeleteEntityEntCoords()
-    {
-        for (var i = 0; i < N; i++)
-        {
-            var uid = _entityManager.SpawnEntity(null, _entCoords);
-            _entityManager.DeleteEntity(uid);
-        }
-    }
-
-    [ComponentProtoName("A")]
-    public sealed class A : Component
-    {
-    }
-}

Robust.Benchmarks/Exporters/SQLExporter.cs

@@ -1,195 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using BenchmarkDotNet.Exporters;
-using BenchmarkDotNet.Loggers;
-using BenchmarkDotNet.Mathematics;
-using BenchmarkDotNet.Reports;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-using Npgsql;
-using Npgsql.Internal;
-using Npgsql.Internal.TypeHandlers;
-using Npgsql.Internal.TypeHandling;
-
-namespace Robust.Benchmarks.Exporters;
-
-public sealed class SQLExporter : IExporter
-{
-    public static readonly IExporter Default = new SQLExporter();
-
-    private SQLExporter(){}
-
-    public void ExportToLog(Summary summary, ILogger logger)
-    {
-        Export(summary, logger);
-    }
-
-    public IEnumerable<string> ExportToFiles(Summary summary, ILogger consoleLogger)
-    {
-        Export(summary, consoleLogger);
-        return Array.Empty<string>();
-    }
-
-    private bool TryGetEnvironmentVariable(string name, ILogger logger, [NotNullWhen(true)] out string? value)
-    {
-        value = Environment.GetEnvironmentVariable(name);
-        if (value == null)
-            logger.WriteError($"ROBUST_BENCHMARKS_ENABLE_SQL is set, but {name} is missing.");
-        return value != null;
-    }
-
-    private void Export(Summary summary, ILogger logger)
-    {
-        if (!TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_ADDRESS", logger, out var address) ||
-            !TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_PORT", logger, out var rawPort) ||
-            !TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_USER", logger, out var user) ||
-            !TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_PASSWORD", logger, out var password) ||
-            !TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_DATABASE", logger, out var db) ||
-            !TryGetEnvironmentVariable("GITHUB_SHA", logger, out var gitHash))
-            return;
-
-        if (!int.TryParse(rawPort, out var port))
-        {
-            logger.WriteError("Failed parsing ROBUST_BENCHMARKS_SQL_PORT to int.");
-            return;
-        }
-
-        var builder = new DbContextOptionsBuilder<BenchmarkContext>();
-        var connectionString = new NpgsqlConnectionStringBuilder
-        {
-            Host = address,
-            Port = port,
-            Database = db,
-            Username = user,
-            Password = password
-        }.ConnectionString;
-        builder.UseNpgsql(connectionString);
-        using var ctx = new BenchmarkContext(builder.Options);
-        try
-        {
-            ctx.Database.OpenConnection();
-            var con = (NpgsqlConnection) ctx.Database.GetDbConnection();
-            con.TypeMapper.AddTypeResolverFactory(new JsonOverrideTypeHandlerResolverFactory(new JsonSerializerOptions
-            {
-                NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
-            }));
-
-            ctx.Database.Migrate();
-            ctx.BenchmarkRuns.Add(BenchmarkRun.FromSummary(summary, gitHash));
-            ctx.SaveChanges();
-        }
-        finally
-        {
-            ctx.Dispose();
-        }
-    }
-
-    public string Name => "sql";
-}
-
-// https://github.com/npgsql/efcore.pg/issues/1107#issuecomment-945126627
-class JsonOverrideTypeHandlerResolverFactory : TypeHandlerResolverFactory
-{
-    private readonly JsonSerializerOptions _options;
-
-    public JsonOverrideTypeHandlerResolverFactory(JsonSerializerOptions options)
-        => _options = options;
-
-    public override TypeHandlerResolver Create(NpgsqlConnector connector)
-        => new JsonOverrideTypeHandlerResolver(connector, _options);
-
-    public override string? GetDataTypeNameByClrType(Type clrType)
-        => null;
-
-    public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
-        => null;
-
-    class JsonOverrideTypeHandlerResolver : TypeHandlerResolver
-    {
-        readonly JsonHandler _jsonbHandler;
-
-        internal JsonOverrideTypeHandlerResolver(NpgsqlConnector connector, JsonSerializerOptions options)
-            => _jsonbHandler ??= new JsonHandler(
-                connector.DatabaseInfo.GetPostgresTypeByName("jsonb"),
-                connector.TextEncoding,
-                isJsonb: true,
-                options);
-
-        public override NpgsqlTypeHandler? ResolveByDataTypeName(string typeName)
-            => typeName == "jsonb" ? _jsonbHandler : null;
-
-        public override NpgsqlTypeHandler? ResolveByClrType(Type type)
-            // You can add any user-defined CLR types which you want mapped to jsonb
-            => type == typeof(JsonDocument) ? _jsonbHandler : null;
-
-        public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
-            => null; // Let the built-in resolver do this
-    }
-}
-public sealed class DesignTimeContextFactoryPostgres : IDesignTimeDbContextFactory<BenchmarkContext>
-{
-    public BenchmarkContext CreateDbContext(string[] args)
-    {
-        var optionsBuilder = new DbContextOptionsBuilder<BenchmarkContext>();
-        optionsBuilder.UseNpgsql("Server=localhost");
-        return new BenchmarkContext(optionsBuilder.Options);
-    }
-}
-
-public class BenchmarkContext : DbContext
-{
-    public DbSet<BenchmarkRun> BenchmarkRuns { get; set; } = default!;
-
-    public BenchmarkContext() { }
-    public BenchmarkContext(DbContextOptions<BenchmarkContext> options) : base(options) { }
-}
-
-public class BenchmarkRun
-{
-    public int Id { get; set; }
-    public string GitHash { get; set; } = string.Empty;
-
-    [Column(TypeName = "timestamptz")]
-    public DateTime RunDate { get; set; }
-
-    public string Name { get; set; } = string.Empty;
-
-    [Column(TypeName = "jsonb")]
-    public BenchmarkRunReport[] Reports { get; set; } = Array.Empty<BenchmarkRunReport>();
-
-    public static BenchmarkRun FromSummary(Summary summary, string gitHash)
-    {
-        return new BenchmarkRun
-        {
-            Reports = summary.Reports.Select(r => new BenchmarkRunReport
-            {
-                Parameters = r.BenchmarkCase.Parameters.Items.Select(p => new BenchmarkRunParameter
-                {
-                    Name = p.Name,
-                    Value = p.Value
-                }).ToArray(),
-                Statistics = r.ResultStatistics
-            }).ToArray(),
-            Name = summary.BenchmarksCases.First().FolderInfo,
-            RunDate = DateTime.UtcNow,
-            GitHash = gitHash
-        };
-    }
-}
-
-public class BenchmarkRunReport
-{
-    public BenchmarkRunParameter[] Parameters { get; set; } = Array.Empty<BenchmarkRunParameter>();
-    public Statistics Statistics { get; set; } = default!;
-}
-
-public class BenchmarkRunParameter
-{
-    public string Name { get; set; } = string.Empty;
-    public object Value { get; set; } = default!;
-}

Robust.Benchmarks/Migrations/20220328231938_InitialCreate.Designer.cs

@@ -1,55 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Robust.Benchmarks.Exporters;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    [DbContext(typeof(BenchmarkContext))]
-    [Migration("20220328231938_InitialCreate")]
-    partial class InitialCreate
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Robust.Benchmarks.Exporters.BenchmarkRun", b =>
-                {
-                    b.Property<decimal>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("numeric(20,0)");
-
-                    b.Property<string>("GitHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<BenchmarkRunReport[]>("Reports")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("RunDate")
-                        .HasColumnType("Date");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("BenchmarkRuns");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Robust.Benchmarks/Migrations/20220328231938_InitialCreate.cs

@@ -1,35 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Robust.Benchmarks.Exporters;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    public partial class InitialCreate : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "BenchmarkRuns",
-                columns: table => new
-                {
-                    Id = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
-                    GitHash = table.Column<string>(type: "text", nullable: false),
-                    RunDate = table.Column<DateTime>(type: "Date", nullable: false),
-                    Name = table.Column<string>(type: "text", nullable: false),
-                    Reports = table.Column<BenchmarkRunReport[]>(type: "jsonb", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BenchmarkRuns", x => x.Id);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "BenchmarkRuns");
-        }
-    }
-}

Robust.Benchmarks/Migrations/20220510131430_fix-pk.Designer.cs

@@ -1,57 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Robust.Benchmarks.Exporters;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    [DbContext(typeof(BenchmarkContext))]
-    [Migration("20220510131430_fix-pk")]
-    partial class fixpk
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Robust.Benchmarks.Exporters.BenchmarkRun", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("GitHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<BenchmarkRunReport[]>("Reports")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("RunDate")
-                        .HasColumnType("timestamptz");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("BenchmarkRuns");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Robust.Benchmarks/Migrations/20220510131430_fix-pk.cs

@@ -1,51 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    public partial class fixpk : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "RunDate",
-                table: "BenchmarkRuns",
-                type: "timestamptz",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldType: "Date");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "Id",
-                table: "BenchmarkRuns",
-                type: "integer",
-                nullable: false,
-                oldClrType: typeof(decimal),
-                oldType: "numeric(20,0)")
-                .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "RunDate",
-                table: "BenchmarkRuns",
-                type: "Date",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldType: "timestamptz");
-
-            migrationBuilder.AlterColumn<decimal>(
-                name: "Id",
-                table: "BenchmarkRuns",
-                type: "numeric(20,0)",
-                nullable: false,
-                oldClrType: typeof(int),
-                oldType: "integer")
-                .OldAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-        }
-    }
-}

Robust.Benchmarks/Migrations/BenchmarkContextModelSnapshot.cs

@@ -1,55 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Robust.Benchmarks.Exporters;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    [DbContext(typeof(BenchmarkContext))]
-    partial class BenchmarkContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Robust.Benchmarks.Exporters.BenchmarkRun", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("GitHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<BenchmarkRunReport[]>("Reports")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("RunDate")
-                        .HasColumnType("timestamptz");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("BenchmarkRuns");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Robust.Benchmarks/NumericsHelpers/AddBenchmark.cs

@@ -9,9 +9,6 @@ namespace Robust.Benchmarks.NumericsHelpers
         [Params(32, 128)]
         public int N { get; set; }
 
-        [Params(1,2)]
-        public int T { get; set; }
-
         private float[] _inputA = default!;
         private float[] _inputB = default!;
         private float[] _output = default!;

Robust.Benchmarks/Program.cs

@@ -1,8 +1,6 @@
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Running;
 using System;
-using Robust.Benchmarks.Configs;
-using Robust.Benchmarks.Exporters;
 
 namespace Robust.Benchmarks
 {
@@ -18,8 +16,7 @@ namespace Robust.Benchmarks
             Console.WriteLine("THE DEBUG BUILD IS ONLY GOOD FOR FIXING A CRASHING BENCHMARK\n");
             BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, new DebugInProcessConfig());
 #else
-            var config = Environment.GetEnvironmentVariable("ROBUST_BENCHMARKS_ENABLE_SQL") != null ? DefaultSQLConfig.Instance : null;
-            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, config);
+            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
 #endif
         }
     }

Robust.Benchmarks/Robust.Benchmarks.csproj

@@ -6,20 +6,13 @@
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <OutputPath>../bin/Benchmarks</OutputPath>
         <OutputType>Exe</OutputType>
-        <NoWarn>RA0003</NoWarn>
     </PropertyGroup>
     <ItemGroup>
       <ProjectReference Include="..\Robust.Server\Robust.Server.csproj" />
       <ProjectReference Include="..\Robust.Shared\Robust.Shared.csproj" />
-      <ProjectReference Include="..\Robust.UnitTesting\Robust.UnitTesting.csproj" />
     </ItemGroup>
     <ItemGroup>
       <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        <PrivateAssets>all</PrivateAssets>
-      </PackageReference>
-      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
     </ItemGroup>
     <Import Project="..\MSBuild\Robust.Engine.targets" />
 </Project>

Robust.Benchmarks/Serialization/BenchmarkIntSerializer.cs

@@ -1,6 +1,7 @@
 using System.Globalization;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Serialization.Manager.Result;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Validation;
 using Robust.Shared.Serialization.Markdown.Value;
@@ -18,10 +19,10 @@ namespace Robust.Benchmarks.Serialization
                 : new ErrorNode(node, $"Failed parsing int value: {node.Value}");
         }
 
-        public int Read(ISerializationManager serializationManager, ValueDataNode node,
-            IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null, int _ = default)
+        public DeserializationResult Read(ISerializationManager serializationManager, ValueDataNode node,
+            IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null)
         {
-            return int.Parse(node.Value, CultureInfo.InvariantCulture);
+            return new DeserializedValue<int>(int.Parse(node.Value, CultureInfo.InvariantCulture));
         }
 
         public DataNode Write(ISerializationManager serializationManager, int value, bool alwaysWrite = false,

Robust.Benchmarks/Serialization/Copy/SerializationCopyBenchmark.cs

@@ -28,7 +28,7 @@ namespace Robust.Benchmarks.Serialization.Copy
 
             var seedMapping = yamlStream.Documents[0].RootNode.ToDataNodeCast<SequenceDataNode>().Cast<MappingDataNode>(0);
 
-            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping);
+            Seed = SerializationManager.ReadValueOrThrow<SeedDataDefinition>(seedMapping);
         }
 
         private const string String = "ABC";

Robust.Benchmarks/Serialization/Definitions/SeedDataDefinition.cs

@@ -19,7 +19,6 @@ namespace Robust.Benchmarks.Serialization.Definitions
   name: tobacco
   seedName: tobacco
   displayName: tobacco plant
-  plantRsi: Objects/Specific/Hydroponics/tobacco.rsi
   productPrototypes:
     - LeavesTobacco
   harvestRepeat: Repeat
@@ -37,7 +36,7 @@ namespace Robust.Benchmarks.Serialization.Definitions
       Max: 10
       PotencyDivisor: 10";
 
-        [IdDataFieldAttribute] public string ID { get; set; } = default!;
+        [DataField("id", required: true)] public string ID { get; set; } = default!;
 
         #region Tracking
         [DataField("name")] public string Name { get; set; } = string.Empty;

Robust.Benchmarks/Serialization/Read/SerializationReadBenchmark.cs

@@ -2,6 +2,7 @@
 using BenchmarkDotNet.Attributes;
 using Robust.Benchmarks.Serialization.Definitions;
 using Robust.Shared.Analyzers;
+using Robust.Shared.Serialization.Manager.Result;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Sequence;
@@ -41,32 +42,32 @@ namespace Robust.Benchmarks.Serialization.Read
         private ValueDataNode FlagThirtyOne { get; } = new("ThirtyOne");
 
         [Benchmark]
-        public string ReadString()
+        public string? ReadString()
         {
-            return SerializationManager.Read<string>(StringNode);
+            return SerializationManager.ReadValue<string>(StringNode);
         }
 
         [Benchmark]
-        public int ReadInteger()
+        public int? ReadInteger()
         {
-            return SerializationManager.Read<int>(IntNode);
+            return SerializationManager.ReadValue<int>(IntNode);
         }
 
         [Benchmark]
-        public DataDefinitionWithString ReadDataDefinitionWithString()
+        public DataDefinitionWithString? ReadDataDefinitionWithString()
         {
-            return SerializationManager.Read<DataDefinitionWithString>(StringDataDefNode);
+            return SerializationManager.ReadValue<DataDefinitionWithString>(StringDataDefNode);
         }
 
         [Benchmark]
-        public SeedDataDefinition ReadSeedDataDefinition()
+        public SeedDataDefinition? ReadSeedDataDefinition()
         {
-            return SerializationManager.Read<SeedDataDefinition>(SeedNode);
+            return SerializationManager.ReadValue<SeedDataDefinition>(SeedNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("flag")]
-        public object? ReadFlagZero()
+        public DeserializationResult ReadFlagZero()
         {
             return SerializationManager.ReadWithTypeSerializer(
                 typeof(int),
@@ -76,7 +77,7 @@ namespace Robust.Benchmarks.Serialization.Read
 
         [Benchmark]
         [BenchmarkCategory("flag")]
-        public object? ReadThirtyOne()
+        public DeserializationResult ReadThirtyOne()
         {
             return SerializationManager.ReadWithTypeSerializer(
                 typeof(int),
@@ -86,7 +87,7 @@ namespace Robust.Benchmarks.Serialization.Read
 
         [Benchmark]
         [BenchmarkCategory("customTypeSerializer")]
-        public object? ReadIntegerCustomSerializer()
+        public DeserializationResult ReadIntegerCustomSerializer()
         {
             return SerializationManager.ReadWithTypeSerializer(
                 typeof(int),

Robust.Benchmarks/Serialization/SerializationArrayBenchmark.cs

@@ -46,84 +46,84 @@ namespace Robust.Benchmarks.Serialization
         [BenchmarkCategory("read")]
         public string[]? ReadEmptyString()
         {
-            return SerializationManager.Read<string[]>(EmptyNode);
+            return SerializationManager.ReadValue<string[]>(EmptyNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public string[]? ReadOneString()
         {
-            return SerializationManager.Read<string[]>(OneIntNode);
+            return SerializationManager.ReadValue<string[]>(OneIntNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public string[]? ReadTenStrings()
         {
-            return SerializationManager.Read<string[]>(TenIntsNode);
+            return SerializationManager.ReadValue<string[]>(TenIntsNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public int[]? ReadEmptyInt()
         {
-            return SerializationManager.Read<int[]>(EmptyNode);
+            return SerializationManager.ReadValue<int[]>(EmptyNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public int[]? ReadOneInt()
         {
-            return SerializationManager.Read<int[]>(OneIntNode);
+            return SerializationManager.ReadValue<int[]>(OneIntNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public int[]? ReadTenInts()
         {
-            return SerializationManager.Read<int[]>(TenIntsNode);
+            return SerializationManager.ReadValue<int[]>(TenIntsNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public DataDefinitionWithString[]? ReadEmptyStringDataDef()
         {
-            return SerializationManager.Read<DataDefinitionWithString[]>(EmptyNode);
+            return SerializationManager.ReadValue<DataDefinitionWithString[]>(EmptyNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public DataDefinitionWithString[]? ReadOneStringDataDef()
         {
-            return SerializationManager.Read<DataDefinitionWithString[]>(OneStringDefNode);
+            return SerializationManager.ReadValue<DataDefinitionWithString[]>(OneStringDefNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public DataDefinitionWithString[]? ReadTenStringDataDefs()
         {
-            return SerializationManager.Read<DataDefinitionWithString[]>(TenStringDefsNode);
+            return SerializationManager.ReadValue<DataDefinitionWithString[]>(TenStringDefsNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public SealedDataDefinitionWithString[]? ReadEmptySealedStringDataDef()
         {
-            return SerializationManager.Read<SealedDataDefinitionWithString[]>(EmptyNode);
+            return SerializationManager.ReadValue<SealedDataDefinitionWithString[]>(EmptyNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public SealedDataDefinitionWithString[]? ReadOneSealedStringDataDef()
         {
-            return SerializationManager.Read<SealedDataDefinitionWithString[]>(OneStringDefNode);
+            return SerializationManager.ReadValue<SealedDataDefinitionWithString[]>(OneStringDefNode);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public SealedDataDefinitionWithString[]? ReadTenSealedStringDataDefs()
         {
-            return SerializationManager.Read<SealedDataDefinitionWithString[]>(TenStringDefsNode);
+            return SerializationManager.ReadValue<SealedDataDefinitionWithString[]>(TenStringDefsNode);
         }
     }
 }

Robust.Benchmarks/Serialization/Write/SerializationWriteBenchmark.cs

@@ -28,7 +28,7 @@ namespace Robust.Benchmarks.Serialization.Write
 
             var seedMapping = yamlStream.Documents[0].RootNode.ToDataNodeCast<SequenceDataNode>().Cast<MappingDataNode>(0);
 
-            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping);
+            Seed = SerializationManager.ReadValueOrThrow<SeedDataDefinition>(seedMapping);
         }
 
         private const string String = "ABC";

Robust.Benchmarks/add-migration.ps1

@@ -1,11 +0,0 @@
-#!/usr/bin/env pwsh
-
-param([String]$name)
-
-if ($name -eq "")
-{
-    Write-Error "must specify migration name"
-    exit
-}
-
-dotnet ef migrations add --context BenchmarkContext -o Migrations $name

Robust.Benchmarks/add-migration.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$1" ] ; then
-    echo "Must specify migration name"
-    exit 1
-fi
-
-dotnet ef migrations add --context BenchmarkContext -o Migrations "$1"

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

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

Robust.Client.Injectors/XamlCompiler.cs

@@ -76,7 +76,7 @@ namespace Robust.Build.Tasks
                 },
                 ContentAttributes =
                 {
-                    typeSystem.GetType("Avalonia.Metadata.ContentAttribute")
+                    typeSystem.GetType("Robust.Client.UserInterface.XAML.ContentAttribute")
                 },
                 UsableDuringInitializationAttributes =
                 {

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

@@ -5,8 +5,8 @@
     </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

Robust.Client/Animations/AnimationTrackProperty.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Animations;
 using Robust.Shared.Maths;
@@ -101,7 +101,7 @@ namespace Robust.Client.Animations
                 case double d:
                     return MathHelper.Lerp(d, (double) b, t);
                 case Angle angle:
-                    return Angle.Lerp(angle, (Angle) b, t);
+                    return (Angle) MathHelper.Lerp(angle, (Angle) b, t);
                 case Color color:
                     return Color.InterpolateBetween(color, (Color) b, t);
                 case int i:

Robust.Client/Audio/Midi/Commands/MidiPanicCommand.cs

@@ -1,22 +0,0 @@
-using Robust.Shared.Console;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-
-namespace Robust.Client.Audio.Midi.Commands;
-
-public sealed class MidiPanicCommand : IConsoleCommand
-{
-    [Dependency] private readonly IMidiManager _midiManager = default!;
-
-    public string Command => "midipanic";
-    public string Description => Loc.GetString("midi-panic-command-description");
-    public string Help => $"{Command}";
-
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        foreach (var renderer in _midiManager.Renderers)
-        {
-            renderer.StopAllNotes();
-        }
-    }
-}

Robust.Client/Audio/Midi/IMidiManager.cs

@@ -1,62 +0,0 @@
-using System.Collections.Generic;
-using NFluidsynth;
-using Robust.Shared.Audio.Midi;
-
-namespace Robust.Client.Audio.Midi;
-
-public interface IMidiManager
-{
-    /// <summary>
-    ///     A read-only list of all existing MIDI Renderers.
-    /// </summary>
-    IReadOnlyList<IMidiRenderer> Renderers { get; }
-
-    /// <summary>
-    ///     If true, MIDI support is available.
-    /// </summary>
-    bool IsAvailable { get; }
-
-    /// <summary>
-    ///     Volume, in db.
-    /// </summary>
-    float Volume { get; set; }
-
-    public int OcclusionCollisionMask { get; set; }
-
-    /// <summary>
-    ///     This method tries to return a midi renderer ready to be used.
-    ///     You only need to set the <see cref="IMidiRenderer.MidiProgram"/> afterwards.
-    /// </summary>
-    /// <remarks>
-    ///     This method can fail if MIDI support is not available.
-    /// </remarks>
-    /// <returns>
-    ///     <c>null</c> if MIDI support is not available.
-    /// </returns>
-    IMidiRenderer? GetNewRenderer(bool mono = true);
-
-    /// <summary>
-    ///     Creates a <see cref="RobustMidiEvent"/> given a <see cref="MidiEvent"/> and a sequencer tick.
-    /// </summary>
-    RobustMidiEvent FromFluidEvent(MidiEvent midiEvent, uint tick);
-
-    /// <summary>
-    ///     Creates a <see cref="SequencerEvent"/> given a <see cref="RobustMidiEvent"/>.
-    ///     Be sure to dispose of the result after you've used it.
-    /// </summary>
-    SequencerEvent ToSequencerEvent(RobustMidiEvent midiEvent);
-
-    /// <summary>
-    ///     Creates a <see cref="RobustMidiEvent"/> given a <see cref="SequencerEvent"/> and a sequencer tick.
-    /// </summary>
-    RobustMidiEvent FromSequencerEvent(SequencerEvent midiEvent, uint tick);
-
-    /// <summary>
-    ///     Method called every frame.
-    ///     Should be used to update positional audio.
-    /// </summary>
-    /// <param name="frameTime"></param>
-    void FrameUpdate(float frameTime);
-
-    void Shutdown();
-}

Robust.Client/Audio/Midi/IMidiRenderer.cs

@@ -1,174 +0,0 @@
-using System;
-using Robust.Client.Graphics;
-using Robust.Shared.Audio.Midi;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-
-namespace Robust.Client.Audio.Midi;
-
-public enum MidiRendererStatus : byte
-{
-    None,
-    Input,
-    File,
-}
-
-public interface IMidiRenderer : IDisposable
-{
-
-    /// <summary>
-    ///     The buffered audio source of this renderer.
-    /// </summary>
-    internal IClydeBufferedAudioSource Source { get; }
-
-    /// <summary>
-    ///     Whether this renderer has been disposed or not.
-    /// </summary>
-    bool Disposed { get; }
-
-    /// <summary>
-    ///     This controls whether the midi file being played will loop or not.
-    /// </summary>
-    bool LoopMidi { get; set; }
-
-    /// <summary>
-    ///     This increases all note on velocities to 127.
-    /// </summary>
-    bool VolumeBoost { get; set; }
-
-    /// <summary>
-    ///     The midi program (instrument) the renderer is using.
-    /// </summary>
-    byte MidiProgram { get; set; }
-
-    /// <summary>
-    ///     The instrument bank the renderer is using.
-    /// </summary>
-    byte MidiBank { get; set; }
-
-    /// <summary>
-    ///     The soundfont currently selected by the renderer.
-    /// </summary>
-    uint MidiSoundfont { get; set; }
-
-    /// <summary>
-    ///     The current status of the renderer.
-    ///     "None" if the renderer isn't playing from input or a midi file.
-    ///     "Input" if the renderer is playing from midi input.
-    ///     "File" if the renderer is playing from a midi file.
-    /// </summary>
-    MidiRendererStatus Status { get; }
-
-    /// <summary>
-    ///     Whether the sound will play in stereo or mono.
-    /// </summary>
-    bool Mono { get; set; }
-
-    /// <summary>
-    ///     Whether to drop messages on the percussion channel.
-    /// </summary>
-    bool DisablePercussionChannel { get; set; }
-
-    /// <summary>
-    /// Whether to drop messages for program change events.
-    /// </summary>
-    bool DisableProgramChangeEvent { get; set; }
-
-    /// <summary>
-    ///     Gets the total number of ticks possible for the MIDI player.
-    /// </summary>
-    int PlayerTotalTick { get; }
-
-    /// <summary>
-    ///     Gets or sets (seeks) the current tick of the MIDI player.
-    /// </summary>
-    int PlayerTick { get; set; }
-
-    /// <summary>
-    ///     Gets the current tick of the sequencer.
-    /// </summary>
-    uint SequencerTick { get; }
-
-    /// <summary>
-    ///     Gets the Time Scale of the sequencer in ticks per second. Default is 1000 for 1 tick per millisecond.
-    /// </summary>
-    double SequencerTimeScale { get; }
-
-    /// <summary>
-    ///     Start listening for midi input.
-    /// </summary>
-    bool OpenInput();
-
-    /// <summary>
-    ///     Start playing a midi file.
-    /// </summary>
-    /// <param name="buffer">Bytes of the midi file</param>
-    bool OpenMidi(ReadOnlySpan<byte> buffer);
-
-    /// <summary>
-    ///     Stops listening for midi input.
-    /// </summary>
-    bool CloseInput();
-
-    /// <summary>
-    ///     Stops playing midi files.
-    /// </summary>
-    bool CloseMidi();
-
-    /// <summary>
-    ///     Stops all notes being played currently.
-    /// </summary>
-    void StopAllNotes();
-
-    /// <summary>
-    ///     Render and play MIDI to the audio source.
-    /// </summary>
-    internal void Render();
-
-    /// <summary>
-    ///     Loads a new soundfont into the renderer.
-    /// </summary>
-    void LoadSoundfont(string filename, bool resetPresets = false);
-
-    /// <summary>
-    ///     Invoked whenever a new midi event is registered.
-    /// </summary>
-    event Action<RobustMidiEvent> OnMidiEvent;
-
-    /// <summary>
-    ///     Invoked when the midi player finishes playing a song.
-    /// </summary>
-    event Action OnMidiPlayerFinished;
-
-    /// <summary>
-    ///     The entity whose position will be used for positional audio.
-    ///     This is only used if <see cref="Mono"/> is set to True.
-    /// </summary>
-    EntityUid? TrackingEntity { get; set; }
-
-    /// <summary>
-    ///     The position that will be used for positional audio.
-    ///     This is only used if <see cref="Mono"/> is set to True
-    ///     and <see cref="TrackingEntity"/> is null.
-    /// </summary>
-    EntityCoordinates? TrackingCoordinates { get; set; }
-
-    /// <summary>
-    ///     Send a midi event for the renderer to play.
-    /// </summary>
-    /// <param name="midiEvent">The midi event to be played</param>
-    void SendMidiEvent(RobustMidiEvent midiEvent);
-
-    /// <summary>
-    ///     Schedule a MIDI event to be played at a later time.
-    /// </summary>
-    /// <param name="midiEvent">the midi event in question</param>
-    /// <param name="time"></param>
-    /// <param name="absolute"></param>
-    void ScheduleMidiEvent(RobustMidiEvent midiEvent, uint time, bool absolute);
-
-    /// <summary>
-    ///     Actually disposes of this renderer. Do NOT use outside the MIDI thread.
-    /// </summary>
-    internal void InternalDispose();
-}

Robust.Client/Audio/Midi/MidiManager.Conversion.cs

@@ -1,155 +0,0 @@
-using NFluidsynth;
-using Robust.Shared.Audio.Midi;
-
-namespace Robust.Client.Audio.Midi;
-
-internal sealed partial class MidiManager
-{
-    public RobustMidiEvent FromFluidEvent(MidiEvent midiEvent, uint tick)
-    {
-        var status = RobustMidiEvent.MakeStatus((byte) midiEvent.Channel, (byte) midiEvent.Type);
-
-        // Control is always the first data byte. Value is always the second data byte. Fluidsynth's API ain't great.
-        var data1 = (byte) midiEvent.Control;
-        var data2 = (byte) midiEvent.Value;
-
-        // PitchBend is handled specially.
-        if (midiEvent.Type == (int) RobustMidiCommand.PitchBend)
-        {
-            // We pack pitch into both data values.
-            var pitch = (ushort) midiEvent.Pitch;
-            data1 = (byte) pitch;
-            data2 = (byte) (pitch >> 8);
-        }
-
-        return new RobustMidiEvent(status, data1, data2, tick);
-    }
-
-    public SequencerEvent ToSequencerEvent(RobustMidiEvent midiEvent)
-    {
-        var sequencerEvent = new SequencerEvent();
-
-        switch (midiEvent.MidiCommand)
-        {
-            case RobustMidiCommand.NoteOff:
-                sequencerEvent.NoteOff(midiEvent.Channel, midiEvent.Key);
-                break;
-
-            case RobustMidiCommand.NoteOn:
-                sequencerEvent.NoteOn(midiEvent.Channel, midiEvent.Key, midiEvent.Velocity);
-                break;
-
-            case RobustMidiCommand.AfterTouch:
-                sequencerEvent.KeyPressure(midiEvent.Channel, midiEvent.Key, midiEvent.Value);
-                break;
-
-            case RobustMidiCommand.ControlChange:
-                sequencerEvent.ControlChange(midiEvent.Channel, midiEvent.Control, midiEvent.Value);
-                break;
-
-            case RobustMidiCommand.ProgramChange:
-                sequencerEvent.ProgramChange(midiEvent.Channel, midiEvent.Program);
-                break;
-
-            case RobustMidiCommand.ChannelPressure:
-                sequencerEvent.ChannelPressure(midiEvent.Channel, midiEvent.Value);
-                break;
-
-            case RobustMidiCommand.PitchBend:
-                sequencerEvent.PitchBend(midiEvent.Channel, midiEvent.Pitch);
-                break;
-
-            case RobustMidiCommand.SystemMessage:
-                switch (midiEvent.Control)
-                {
-                    case 0x0 when midiEvent.Status == 0xFF:
-                        sequencerEvent.SystemReset();
-                        break;
-
-                    case 0x0B:
-                        sequencerEvent.AllNotesOff(midiEvent.Channel);
-                        break;
-
-                    default:
-                        _midiSawmill.Warning($"Tried to convert unsupported event to sequencer event:\n{midiEvent}");
-                        break;
-                }
-
-                break;
-
-            default:
-                _midiSawmill.Warning($"Tried to convert unsupported event to sequencer event:\n{midiEvent}");
-                break;
-        }
-
-        return sequencerEvent;
-    }
-
-    public RobustMidiEvent FromSequencerEvent(SequencerEvent midiEvent, uint tick)
-    {
-        byte channel = (byte) midiEvent.Channel;
-        RobustMidiCommand command = 0x0;
-        byte data1 = 0;
-        byte data2 = 0;
-
-        switch (midiEvent.Type)
-        {
-            case FluidSequencerEventType.NoteOn:
-                command = RobustMidiCommand.NoteOn;
-                data1 = (byte) midiEvent.Key;
-                data2 = (byte) midiEvent.Velocity;
-                break;
-
-            case FluidSequencerEventType.NoteOff:
-                command = RobustMidiCommand.NoteOff;
-                data1 = (byte) midiEvent.Key;
-                break;
-
-            case FluidSequencerEventType.PitchBend:
-                command = RobustMidiCommand.PitchBend;
-                // We pack pitch into both data values
-                var pitch = (ushort) midiEvent.Pitch;
-                data1 = (byte) pitch;
-                data2 = (byte) (pitch >> 8);
-                break;
-
-            case FluidSequencerEventType.ProgramChange:
-                command = RobustMidiCommand.ProgramChange;
-                data1 = (byte) midiEvent.Program;
-                break;
-
-            case FluidSequencerEventType.KeyPressure:
-                command = RobustMidiCommand.AfterTouch;
-                data1 = (byte) midiEvent.Key;
-                data2 = (byte) midiEvent.Value;
-                break;
-
-            case FluidSequencerEventType.ControlChange:
-                command = RobustMidiCommand.ControlChange;
-                data1 = (byte) midiEvent.Control;
-                data2 = (byte) midiEvent.Value;
-                break;
-
-            case FluidSequencerEventType.ChannelPressure:
-                command = RobustMidiCommand.ChannelPressure;
-                data1 = (byte) midiEvent.Value;
-                break;
-
-            case FluidSequencerEventType.AllNotesOff:
-                command = RobustMidiCommand.SystemMessage;
-                data1 = 0x0B;
-                break;
-
-            case FluidSequencerEventType.SystemReset:
-                command = RobustMidiCommand.SystemMessage;
-                channel = 0x0F;
-                break;
-
-            default:
-                _midiSawmill.Error($"Unsupported Sequencer Event: {tick:D8}: {SequencerEventToString(midiEvent)}");
-                break;
-        }
-
-        return new RobustMidiEvent(RobustMidiEvent.MakeStatus(channel, (byte)command), data1, data2, tick);
-    }
-}

Robust.Client/Audio/Midi/MidiManager.cs

@@ -7,7 +7,6 @@ using NFluidsynth;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared;
-using Robust.Shared.Asynchronous;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
@@ -16,440 +15,404 @@ using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
+using Robust.Shared.Physics.Broadphase;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
+using Logger = Robust.Shared.Log.Logger;
 
-namespace Robust.Client.Audio.Midi;
-
-internal sealed partial class MidiManager : IMidiManager
+namespace Robust.Client.Audio.Midi
 {
-    [Dependency] private readonly IEyeManager _eyeManager = default!;
-    [Dependency] private readonly IResourceManagerInternal _resourceManager = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly IConfigurationManager _cfgMan = default!;
-    [Dependency] private readonly IClydeAudio _clydeAudio = default!;
-    [Dependency] private readonly ITaskManager _taskManager = default!;
-    [Dependency] private readonly ILogManager _logger = default!;
-
-    private SharedPhysicsSystem _broadPhaseSystem = default!;
-
-    public IReadOnlyList<IMidiRenderer> Renderers
+    public interface IMidiManager
     {
-        get
+        /// <summary>
+        ///     This method tries to return a midi renderer ready to be used.
+        ///     You only need to set the <see cref="IMidiRenderer.MidiProgram"/> afterwards.
+        /// </summary>
+        /// <remarks>
+        ///     This method can fail if MIDI support is not available.
+        /// </remarks>
+        /// <returns>
+        ///     <c>null</c> if MIDI support is not available.
+        /// </returns>
+        IMidiRenderer? GetNewRenderer();
+
+        /// <summary>
+        ///     Method called every frame.
+        ///     Should be used to update positional audio.
+        /// </summary>
+        /// <param name="frameTime"></param>
+        void FrameUpdate(float frameTime);
+
+        /// <summary>
+        ///     Volume, in db.
+        /// </summary>
+        float Volume { get; set; }
+
+        /// <summary>
+        ///     If true, MIDI support is available.
+        /// </summary>
+        bool IsAvailable { get; }
+
+        public int OcclusionCollisionMask { get; set; }
+
+        void Shutdown();
+    }
+
+    internal sealed class MidiManager : IMidiManager
+    {
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Dependency] private readonly IResourceManagerInternal _resourceManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IConfigurationManager _cfgMan = default!;
+
+        private SharedPhysicsSystem _broadPhaseSystem = default!;
+
+        [ViewVariables]
+        public bool IsAvailable
         {
-            lock (_renderers)
+            get
             {
-                // Perform a copy. Sadly, we can't return a reference to the original list due to threading concerns.
-                return _renderers.ToArray();
+                InitializeFluidsynth();
+
+                return FluidsynthInitialized;
             }
         }
-    }
 
-    [ViewVariables]
-    public bool IsAvailable
-    {
-        get
+        [ViewVariables]
+        private readonly List<IMidiRenderer> _renderers = new();
+
+        private bool _alive = true;
+        private Settings? _settings;
+        private Thread? _midiThread;
+        private ISawmill _midiSawmill = default!;
+        private float _volume = 0f;
+        private bool _volumeDirty = true;
+
+        // Not reliable until Fluidsynth is initialized!
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float Volume
         {
-            InitializeFluidsynth();
+            get => _volume;
+            set
+            {
+                if (MathHelper.CloseToPercent(_volume, value))
+                    return;
 
-            return FluidsynthInitialized;
-        }
-    }
-
-    [ViewVariables]
-    private readonly List<IMidiRenderer> _renderers = new();
-
-    private bool _alive = true;
-    private Settings? _settings;
-    private Thread? _midiThread;
-    private ISawmill _midiSawmill = default!;
-    private float _volume = 0f;
-    private bool _volumeDirty = true;
-
-    // Not reliable until Fluidsynth is initialized!
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float Volume
-    {
-        get => _volume;
-        set
-        {
-            if (MathHelper.CloseToPercent(_volume, value))
-                return;
-
-            _cfgMan.SetCVar(CVars.MidiVolume, value);
-            _volumeDirty = true;
-        }
-    }
-
-    private static readonly string[] LinuxSoundfonts =
-    {
-        "/usr/share/soundfonts/default.sf2",
-        "/usr/share/soundfonts/default.dls",
-        "/usr/share/soundfonts/FluidR3_GM.sf2",
-        "/usr/share/soundfonts/freepats-general-midi.sf2",
-        "/usr/share/sounds/sf2/default.sf2",
-        "/usr/share/sounds/sf2/default.dls",
-        "/usr/share/sounds/sf2/FluidR3_GM.sf2",
-        "/usr/share/sounds/sf2/TimGM6mb.sf2",
-    };
-
-    private const string WindowsSoundfont = @"C:\WINDOWS\system32\drivers\gm.dls";
-
-    private const string OsxSoundfont =
-        "/System/Library/Components/CoreAudio.component/Contents/Resources/gs_instruments.dls";
-
-    private const string FallbackSoundfont = "/Midi/fallback.sf2";
-
-    private const float MaxDistanceForOcclusion = 1000;
-
-    private static ResourcePath CustomSoundfontDirectory = new ResourcePath("/soundfonts/");
-
-    private readonly ResourceLoaderCallbacks _soundfontLoaderCallbacks = new();
-
-    private bool FluidsynthInitialized;
-    private bool _failedInitialize;
-
-    private NFluidsynth.Logger.LoggerDelegate _loggerDelegate = default!;
-    private ISawmill _sawmill = default!;
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    public int OcclusionCollisionMask { get; set; }
-
-    private void InitializeFluidsynth()
-    {
-        if (FluidsynthInitialized || _failedInitialize) return;
-
-        _volume = _cfgMan.GetCVar(CVars.MidiVolume);
-        _cfgMan.OnValueChanged(CVars.MidiVolume, value =>
-        {
-            _volume = value;
-            _volumeDirty = true;
-        }, true);
-
-        _midiSawmill = _logger.GetSawmill("midi");
-        _midiSawmill.Level = LogLevel.Info;
-        _sawmill = _logger.GetSawmill("midi.fluidsynth");
-        _loggerDelegate = LoggerDelegate;
-
-        if (!_resourceManager.UserData.Exists(CustomSoundfontDirectory))
-        {
-            _resourceManager.UserData.CreateDir(CustomSoundfontDirectory);
-        }
-        // not a directory, preserve the old file and create an actual directory
-        else if (!_resourceManager.UserData.IsDir(CustomSoundfontDirectory))
-        {
-            _resourceManager.UserData.Rename(CustomSoundfontDirectory, CustomSoundfontDirectory.WithName(CustomSoundfontDirectory.Filename + ".old"));
-            _resourceManager.UserData.CreateDir(CustomSoundfontDirectory);
+                _cfgMan.SetCVar(CVars.MidiVolume, value);
+                _volumeDirty = true;
+            }
         }
 
-        try
+        private static readonly string[] LinuxSoundfonts =
         {
-            NFluidsynth.Logger.SetLoggerMethod(_loggerDelegate); // Will cause a safe DllNotFoundException if not available.
-
-            _settings = new Settings();
-            _settings["synth.sample-rate"].DoubleValue = 44100;
-            _settings["player.timing-source"].StringValue = "sample";
-            _settings["synth.lock-memory"].IntValue = 0;
-            _settings["synth.threadsafe-api"].IntValue = 1;
-            _settings["synth.gain"].DoubleValue = 1.0d;
-            _settings["synth.polyphony"].IntValue = 1024;
-            _settings["synth.cpu-cores"].IntValue = 2;
-            _settings["synth.midi-channels"].IntValue = 16;
-            _settings["synth.overflow.age"].DoubleValue = 3000;
-            _settings["audio.driver"].StringValue = "file";
-            _settings["audio.periods"].IntValue = 8;
-            _settings["audio.period-size"].IntValue = 4096;
-            _settings["midi.autoconnect"].IntValue = 1;
-            _settings["player.reset-synth"].IntValue = 0;
-            _settings["synth.midi-bank-select"].StringValue = "gm";
-            //_settings["synth.verbose"].IntValue = 1; // Useful for debugging.
-        }
-        catch (Exception e)
-        {
-            _midiSawmill.Warning(
-                "Failed to initialize fluidsynth due to exception, disabling MIDI support:\n{0}", e);
-            _failedInitialize = true;
-            return;
-        }
-
-        _midiThread = new Thread(ThreadUpdate);
-        _midiThread.Start();
-
-        _broadPhaseSystem = EntitySystem.Get<SharedPhysicsSystem>();
-        FluidsynthInitialized = true;
-    }
-
-    private void LoggerDelegate(NFluidsynth.Logger.LogLevel level, string message, IntPtr data)
-    {
-        var rLevel = level switch {
-            NFluidsynth.Logger.LogLevel.Panic => LogLevel.Error,
-            NFluidsynth.Logger.LogLevel.Error => LogLevel.Error,
-            NFluidsynth.Logger.LogLevel.Warning => LogLevel.Warning,
-            NFluidsynth.Logger.LogLevel.Information => LogLevel.Info,
-            NFluidsynth.Logger.LogLevel.Debug => LogLevel.Debug,
-            _ => LogLevel.Debug
+            "/usr/share/soundfonts/default.sf2",
+            "/usr/share/soundfonts/FluidR3_GM.sf2",
+            "/usr/share/soundfonts/freepats-general-midi.sf2",
+            "/usr/share/sounds/sf2/default.sf2",
+            "/usr/share/sounds/sf2/FluidR3_GM.sf2",
+            "/usr/share/sounds/sf2/TimGM6mb.sf2",
         };
-        _sawmill.Log(rLevel, message);
-    }
 
-    public IMidiRenderer? GetNewRenderer(bool mono = true)
-    {
-        if (!FluidsynthInitialized)
+        private const string WindowsSoundfont = @"C:\WINDOWS\system32\drivers\gm.dls";
+
+        private const string OsxSoundfont =
+            "/System/Library/Components/CoreAudio.component/Contents/Resources/gs_instruments.dls";
+
+        private const string FallbackSoundfont = "/Midi/fallback.sf2";
+
+        private readonly ResourceLoaderCallbacks _soundfontLoaderCallbacks = new();
+
+        private bool FluidsynthInitialized;
+        private bool _failedInitialize;
+
+        private NFluidsynth.Logger.LoggerDelegate _loggerDelegate = default!;
+        private ISawmill _sawmill = default!;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public int OcclusionCollisionMask { get; set; }
+
+        private void InitializeFluidsynth()
         {
-            InitializeFluidsynth();
+            if (FluidsynthInitialized || _failedInitialize) return;
 
-            if (!FluidsynthInitialized) // init failed
+            _volume = _cfgMan.GetCVar(CVars.MidiVolume);
+            _cfgMan.OnValueChanged(CVars.MidiVolume, value =>
             {
-                return null;
+                _volume = value;
+                _volumeDirty = true;
+            }, true);
+
+            _midiSawmill = Logger.GetSawmill("midi");
+            _sawmill = Logger.GetSawmill("midi.fluidsynth");
+            _loggerDelegate = LoggerDelegate;
+
+            try
+            {
+                NFluidsynth.Logger.SetLoggerMethod(_loggerDelegate); // Will cause a safe DllNotFoundException if not available.
+
+                _settings = new Settings();
+                _settings["synth.sample-rate"].DoubleValue = 44100;
+                _settings["player.timing-source"].StringValue = "sample";
+                _settings["synth.lock-memory"].IntValue = 0;
+                _settings["synth.threadsafe-api"].IntValue = 1;
+                _settings["synth.gain"].DoubleValue = 1.0d;
+                _settings["synth.polyphony"].IntValue = 1024;
+                _settings["synth.cpu-cores"].IntValue = 2;
+                _settings["synth.overflow.age"].DoubleValue = 3000;
+                _settings["audio.driver"].StringValue = "file";
+                _settings["audio.periods"].IntValue = 8;
+                _settings["audio.period-size"].IntValue = 4096;
+                _settings["midi.autoconnect"].IntValue = 1;
+                _settings["player.reset-synth"].IntValue = 0;
+                _settings["synth.midi-bank-select"].StringValue = "gm";
             }
+            catch (Exception e)
+            {
+                Logger.WarningS("midi",
+                    "Failed to initialize fluidsynth due to exception, disabling MIDI support:\n{0}", e);
+                _failedInitialize = true;
+                return;
+            }
+
+            _midiThread = new Thread(ThreadUpdate);
+            _midiThread.Start();
+
+            _broadPhaseSystem = EntitySystem.Get<SharedPhysicsSystem>();
+            FluidsynthInitialized = true;
         }
 
-        var soundfontLoader = SoundFontLoader.NewDefaultSoundFontLoader(_settings);
-
-        // Just making double sure these don't get GC'd.
-        // They shouldn't, MidiRenderer keeps a ref, but making sure...
-        var handle = GCHandle.Alloc(soundfontLoader);
-
-        try
+        private void LoggerDelegate(NFluidsynth.Logger.LogLevel level, string message, IntPtr data)
         {
-            soundfontLoader.SetCallbacks(_soundfontLoaderCallbacks);
+            var rLevel = level switch {
+                NFluidsynth.Logger.LogLevel.Panic => LogLevel.Error,
+                NFluidsynth.Logger.LogLevel.Error => LogLevel.Error,
+                NFluidsynth.Logger.LogLevel.Warning => LogLevel.Warning,
+                NFluidsynth.Logger.LogLevel.Information => LogLevel.Info,
+                NFluidsynth.Logger.LogLevel.Debug => LogLevel.Debug,
+                _ => LogLevel.Debug
+            };
+            _sawmill.Log(rLevel, message);
+        }
 
-            var renderer = new MidiRenderer(_settings!, soundfontLoader, mono, this, _clydeAudio, _taskManager, _midiSawmill);
-
-            // Since the last loaded soundfont takes priority, we load the fallback soundfont before the soundfont.
-            renderer.LoadSoundfont(FallbackSoundfont);
-
-            if (OperatingSystem.IsLinux())
+        public IMidiRenderer? GetNewRenderer()
+        {
+            if (!FluidsynthInitialized)
             {
-                foreach (var filepath in LinuxSoundfonts)
+                InitializeFluidsynth();
+
+                if (!FluidsynthInitialized) // init failed
                 {
-                    if (!File.Exists(filepath) || !SoundFont.IsSoundFont(filepath)) continue;
-
-                    try
-                    {
-                        renderer.LoadSoundfont(filepath, true);
-                    }
-                    catch (Exception)
-                    {
-                        continue;
-                    }
-
-                    break;
+                    return null;
                 }
             }
-            else if (OperatingSystem.IsMacOS())
+
+            var soundfontLoader = SoundFontLoader.NewDefaultSoundFontLoader(_settings);
+
+            // Just making double sure these don't get GC'd.
+            // They shouldn't, MidiRenderer keeps a ref, but making sure...
+            var handle = GCHandle.Alloc(soundfontLoader);
+
+            try
             {
-                if (File.Exists(OsxSoundfont) && SoundFont.IsSoundFont(OsxSoundfont))
-                    renderer.LoadSoundfont(OsxSoundfont, true);
-            }
-            else if (OperatingSystem.IsWindows())
-            {
-                if (File.Exists(WindowsSoundfont) && SoundFont.IsSoundFont(WindowsSoundfont))
-                    renderer.LoadSoundfont(WindowsSoundfont, true);
-            }
+                soundfontLoader.SetCallbacks(_soundfontLoaderCallbacks);
 
-            // Load content-specific custom soundfonts, which could override the system/fallback soundfont.
-            foreach (var file in _resourceManager.ContentFindFiles(("/Audio/MidiCustom/")))
-            {
-                if (file.Extension != "sf2" && file.Extension != "dls") continue;
-                renderer.LoadSoundfont(file.ToString());
-            }
+                var renderer = new MidiRenderer(_settings!, soundfontLoader);
 
-            // Load every soundfont from the user data directory last, since those may override any other soundfont.
-            _midiSawmill.Debug($"loading soundfonts from {CustomSoundfontDirectory.ToRelativePath().ToString()}/*");
-            var enumerator = _resourceManager.UserData.Find($"{CustomSoundfontDirectory.ToRelativePath().ToString()}/*").Item1;
-            foreach (var soundfont in enumerator)
-            {
-                if (soundfont.Extension != "sf2" && soundfont.Extension != "dls") continue;
-                _midiSawmill.Debug($"loading soundfont {soundfont}");
-                renderer.LoadSoundfont(soundfont.ToString());
-            }
+                foreach (var file in _resourceManager.ContentFindFiles(("/Audio/MidiCustom/")))
+                {
+                    if (file.Extension != "sf2" && file.Extension != "dls") continue;
+                    renderer.LoadSoundfont(file.ToString());
+                }
 
-            renderer.Source.SetVolume(Volume);
+                // Since the last loaded soundfont takes priority, we load the fallback soundfont before the soundfont.
+                renderer.LoadSoundfont(FallbackSoundfont);
 
-            lock (_renderers)
-            {
-                _renderers.Add(renderer);
-            }
-            return renderer;
-        }
-        finally
-        {
-            handle.Free();
-        }
-    }
+                if (OperatingSystem.IsLinux())
+                {
+                    foreach (var filepath in LinuxSoundfonts)
+                    {
+                        if (!File.Exists(filepath) || !SoundFont.IsSoundFont(filepath)) continue;
 
-    public void FrameUpdate(float frameTime)
-    {
-        if (!FluidsynthInitialized)
-        {
-            return;
-        }
+                        try
+                        {
+                            renderer.LoadSoundfont(filepath, true);
+                        }
+                        catch (Exception)
+                        {
+                            continue;
+                        }
 
-        // Update positions of streams every frame.
-        foreach (var renderer in _renderers)
-        {
-            if (renderer.Disposed)
-                continue;
+                        break;
+                    }
+                }
+                else if (OperatingSystem.IsMacOS())
+                {
+                    if (File.Exists(OsxSoundfont) && SoundFont.IsSoundFont(OsxSoundfont))
+                        renderer.LoadSoundfont(OsxSoundfont, true);
+                }
+                else if (OperatingSystem.IsWindows())
+                {
+                    if (File.Exists(WindowsSoundfont) && SoundFont.IsSoundFont(WindowsSoundfont))
+                        renderer.LoadSoundfont(WindowsSoundfont, true);
+                }
 
-            if(_volumeDirty)
                 renderer.Source.SetVolume(Volume);
 
-            if (!renderer.Mono)
-            {
-                renderer.Source.SetGlobal();
-                continue;
-            }
-
-            MapCoordinates? mapPos = null;
-            var trackingEntity = renderer.TrackingEntity != null && !_entityManager.Deleted(renderer.TrackingEntity);
-            if (trackingEntity)
-            {
-                renderer.TrackingCoordinates = _entityManager.GetComponent<TransformComponent>(renderer.TrackingEntity!.Value).Coordinates;
-            }
-
-            if (renderer.TrackingCoordinates != null)
-            {
-                mapPos = renderer.TrackingCoordinates.Value.ToMap(_entityManager);
-            }
-
-            if (mapPos != null && mapPos.Value.MapId == _eyeManager.CurrentMap)
-            {
-                var pos = mapPos.Value;
-
-                var sourceRelative = _eyeManager.CurrentEye.Position.Position - pos.Position;
-                var occlusion = 0f;
-                if (sourceRelative.Length > 0)
+                lock (_renderers)
                 {
-                    occlusion = _broadPhaseSystem.IntersectRayPenetration(
-                        pos.MapId,
-                        new CollisionRay(
-                            pos.Position,
-                            sourceRelative.Normalized,
-                            OcclusionCollisionMask),
-                        MathF.Min(sourceRelative.Length, MaxDistanceForOcclusion),
-                        renderer.TrackingEntity);
-                }
-
-                renderer.Source.SetOcclusion(occlusion);
-
-                if (!renderer.Source.SetPosition(pos.Position))
-                {
-                    return;
-                }
-
-                if (trackingEntity)
-                {
-                    renderer.Source.SetVelocity(renderer.TrackingEntity!.Value.GlobalLinearVelocity());
+                    _renderers.Add(renderer);
                 }
+                return renderer;
             }
-            else
+            finally
             {
-                renderer.Source.SetOcclusion(float.MaxValue);
+                handle.Free();
             }
         }
 
-        _volumeDirty = false;
-    }
-
-    /// <summary>
-    ///     Main method for the thread rendering the midi audio.
-    /// </summary>
-    private void ThreadUpdate()
-    {
-        while (_alive)
+        public void FrameUpdate(float frameTime)
         {
-            lock (_renderers)
+            if (!FluidsynthInitialized)
             {
-                for (var i = 0; i < _renderers.Count; i++)
-                {
-                    var renderer = _renderers[i];
-                    if (!renderer.Disposed)
-                        renderer.Render();
-                    else
-                    {
-                        renderer.InternalDispose();
-                        _renderers.Remove(renderer);
-                    }
-                }
+                return;
             }
 
-            Thread.Sleep(1);
-        }
-    }
-
-    public void Shutdown()
-    {
-        _alive = false;
-        _midiThread?.Join();
-        _settings?.Dispose();
-
-        lock (_renderers)
-        {
+            // Update positions of streams every frame.
             foreach (var renderer in _renderers)
             {
-                renderer?.Dispose();
+                if (renderer.Disposed)
+                    continue;
+
+                if(_volumeDirty)
+                    renderer.Source.SetVolume(Volume);
+
+                if (!renderer.Mono)
+                {
+                    renderer.Source.SetGlobal();
+                    continue;
+                }
+
+                MapCoordinates? mapPos = null;
+                var trackingEntity = renderer.TrackingEntity != null && !_entityManager.Deleted(renderer.TrackingEntity);
+                if (trackingEntity)
+                {
+                    renderer.TrackingCoordinates = _entityManager.GetComponent<TransformComponent>(renderer.TrackingEntity!.Value).Coordinates;
+                }
+
+                if (renderer.TrackingCoordinates != null)
+                {
+                    mapPos = renderer.TrackingCoordinates.Value.ToMap(_entityManager);
+                }
+
+                if (mapPos != null && mapPos.Value.MapId == _eyeManager.CurrentMap)
+                {
+                    var pos = mapPos.Value;
+
+                    var sourceRelative = _eyeManager.CurrentEye.Position.Position - pos.Position;
+                    var occlusion = 0f;
+                    if (sourceRelative.Length > 0)
+                    {
+                        occlusion = _broadPhaseSystem.IntersectRayPenetration(
+                            pos.MapId,
+                            new CollisionRay(
+                                pos.Position,
+                                sourceRelative.Normalized,
+                                OcclusionCollisionMask),
+                            sourceRelative.Length,
+                            renderer.TrackingEntity);
+                    }
+
+                    renderer.Source.SetOcclusion(occlusion);
+
+                    if (!renderer.Source.SetPosition(pos.Position))
+                    {
+                        return;
+                    }
+
+                    if (trackingEntity)
+                    {
+                        renderer.Source.SetVelocity(renderer.TrackingEntity!.Value.GlobalLinearVelocity());
+                    }
+                }
+                else
+                {
+                    renderer.Source.SetOcclusion(float.MaxValue);
+                }
+            }
+
+            _volumeDirty = false;
+        }
+
+        /// <summary>
+        ///     Main method for the thread rendering the midi audio.
+        /// </summary>
+        private void ThreadUpdate()
+        {
+            while (_alive)
+            {
+                lock (_renderers)
+                {
+                    for (var i = 0; i < _renderers.Count; i++)
+                    {
+                        var renderer = _renderers[i];
+                        if (!renderer.Disposed)
+                            renderer.Render();
+                        else
+                        {
+                            renderer.InternalDispose();
+                            _renderers.Remove(renderer);
+                        }
+                    }
+                }
+
+                Thread.Sleep(1);
             }
         }
 
-        if (FluidsynthInitialized && !_failedInitialize)
+        public void Shutdown()
         {
-            NFluidsynth.Logger.SetLoggerMethod(null);
-        }
-    }
+            _alive = false;
+            _midiThread?.Join();
+            _settings?.Dispose();
 
-    /// <summary>
-    ///     Internal method to get a human-readable representation of a <see cref="SequencerEvent"/>.
-    /// </summary>
-    internal static string SequencerEventToString(SequencerEvent midiEvent)
-    {
-        // ReSharper disable once UseStringInterpolation
-        return string.Format(
-            "{0} chan:{1:D2} key:{2:D5} bank:{3:D2} ctrl:{4:D5} dur:{5:D5} pitch:{6:D5} prog:{7:D3} val:{8:D5} vel:{9:D5}",
-            midiEvent.Type.ToString().PadLeft(22),
-            midiEvent.Channel,
-            midiEvent.Key,
-            midiEvent.Bank,
-            midiEvent.Control,
-            midiEvent.Duration,
-            midiEvent.Pitch,
-            midiEvent.Program,
-            midiEvent.Value,
-            midiEvent.Velocity);
-    }
-
-    /// <summary>
-    ///     This class is used to load soundfonts.
-    /// </summary>
-    private sealed class ResourceLoaderCallbacks : SoundFontLoaderCallbacks
-    {
-        private readonly Dictionary<int, Stream> _openStreams = new();
-        private int _nextStreamId = 1;
-
-        public override IntPtr Open(string filename)
-        {
-            if (string.IsNullOrEmpty(filename))
+            lock (_renderers)
             {
-                return IntPtr.Zero;
+                foreach (var renderer in _renderers)
+                {
+                    renderer?.Dispose();
+                }
             }
 
-            Stream? stream;
-            var resourceCache = IoCManager.Resolve<IResourceCache>();
-            var resourcePath = new ResourcePath(filename);
-
-            if (resourcePath.IsRooted)
+            if (FluidsynthInitialized && !_failedInitialize)
             {
-                // is it in content?
-                if (resourceCache.ContentFileExists(filename))
+                NFluidsynth.Logger.SetLoggerMethod(null);
+            }
+        }
+
+        /// <summary>
+        ///     This class is used to load soundfonts.
+        /// </summary>
+        private sealed class ResourceLoaderCallbacks : SoundFontLoaderCallbacks
+        {
+            private readonly Dictionary<int, Stream> _openStreams = new();
+            private int _nextStreamId = 1;
+
+            public override IntPtr Open(string filename)
+            {
+                if (string.IsNullOrEmpty(filename))
+                {
+                    return IntPtr.Zero;
+                }
+
+                Stream? stream;
+                var resourceCache = IoCManager.Resolve<IResourceCache>();
+                var resourcePath = new ResourcePath(filename);
+
+                if (resourcePath.IsRooted && resourceCache.ContentFileExists(filename))
                 {
                     if (!resourceCache.TryContentFileRead(filename, out stream))
                         return IntPtr.Zero;
                 }
-                // is it in userdata?
-                else if (resourceCache.UserData.Exists(resourcePath))
-                {
-                    stream = resourceCache.UserData.OpenRead(resourcePath);
-                }
                 else if (File.Exists(filename))
                 {
                     stream = File.OpenRead(filename);
@@ -458,81 +421,73 @@ internal sealed partial class MidiManager : IMidiManager
                 {
                     return IntPtr.Zero;
                 }
-            }
-            else if (File.Exists(filename))
-            {
-                stream = File.OpenRead(filename);
-            }
-            else
-            {
-                return IntPtr.Zero;
+
+                var id = _nextStreamId++;
+
+                _openStreams.Add(id, stream);
+
+                return (IntPtr) id;
             }
 
-            var id = _nextStreamId++;
-
-            _openStreams.Add(id, stream);
-
-            return (IntPtr) id;
-        }
-
-        public override unsafe int Read(IntPtr buf, long count, IntPtr sfHandle)
-        {
-            var length = (int) count;
-            var span = new Span<byte>(buf.ToPointer(), length);
-            var stream = _openStreams[(int) sfHandle];
-
-            // Fluidsynth's docs state that this method should leave the buffer unmodified if it fails. (returns -1)
-            try
+            public override unsafe int Read(IntPtr buf, long count, IntPtr sfHandle)
             {
-                // Fluidsynth does a LOT of tiny allocations (frankly, way too much).
-                if (count < 1024)
+                var length = (int) count;
+                var span = new Span<byte>(buf.ToPointer(), length);
+                var stream = _openStreams[(int) sfHandle];
+
+                // Fluidsynth's docs state that this method should leave the buffer unmodified if it fails. (returns -1)
+                try
                 {
-                    // ReSharper disable once SuggestVarOrType_Elsewhere
-                    Span<byte> buffer = stackalloc byte[(int)count];
+                    // Fluidsynth does a LOT of tiny allocations (frankly, way too much).
+                    if (count < 1024)
+                    {
+                        // ReSharper disable once SuggestVarOrType_Elsewhere
+                        Span<byte> buffer = stackalloc byte[(int)count];
 
-                    stream.ReadExact(buffer);
+                        stream.ReadExact(buffer);
 
-                    buffer.CopyTo(span);
+                        buffer.CopyTo(span);
+                    }
+                    else
+                    {
+                        var buffer = stream.ReadExact(length);
+
+                        buffer.CopyTo(span);
+                    }
                 }
-                else
+                catch (EndOfStreamException)
                 {
-                    var buffer = stream.ReadExact(length);
-
-                    buffer.CopyTo(span);
+                    return -1;
                 }
+
+                return 0;
             }
-            catch (EndOfStreamException)
+
+            public override int Seek(IntPtr sfHandle, int offset, SeekOrigin origin)
             {
-                return -1;
+                var stream = _openStreams[(int) sfHandle];
+
+                stream.Seek(offset, origin);
+
+                return 0;
             }
 
-            return 0;
-        }
+            public override int Tell(IntPtr sfHandle)
+            {
+                var stream = _openStreams[(int) sfHandle];
 
-        public override int Seek(IntPtr sfHandle, int offset, SeekOrigin origin)
-        {
-            var stream = _openStreams[(int) sfHandle];
+                return (int) stream.Position;
+            }
 
-            stream.Seek(offset, origin);
+            public override int Close(IntPtr sfHandle)
+            {
+                if (!_openStreams.Remove((int) sfHandle, out var stream))
+                    return -1;
 
-            return 0;
-        }
-
-        public override int Tell(IntPtr sfHandle)
-        {
-            var stream = _openStreams[(int) sfHandle];
-
-            return (int) stream.Position;
-        }
-
-        public override int Close(IntPtr sfHandle)
-        {
-            if (!_openStreams.Remove((int) sfHandle, out var stream))
-                return -1;
-
-            stream.Dispose();
-            return 0;
+                stream.Dispose();
+                return 0;
 
+            }
         }
     }
 }

Robust.Client/BaseClient.cs

@@ -13,7 +13,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
-using Robust.Shared.Network.Messages;
 using Robust.Shared.Players;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -27,6 +26,7 @@ namespace Robust.Client
         [Dependency] private readonly IPlayerManager _playMan = default!;
         [Dependency] private readonly INetConfigurationManager _configManager = default!;
         [Dependency] private readonly IClientEntityManager _entityManager = default!;
+        [Dependency] private readonly IEntityLookup _entityLookup = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IDiscordRichPresence _discord = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
@@ -46,8 +46,6 @@ namespace Robust.Client
 
         public string? LastDisconnectReason { get; private set; }
 
-        private (TimeSpan, GameTick) _timeBase;
-
         /// <inheritdoc />
         public void Initialize()
         {
@@ -55,34 +53,20 @@ namespace Robust.Client
             _net.ConnectFailed += OnConnectFailed;
             _net.Disconnect += OnNetDisconnect;
 
-            _net.RegisterNetMessage<MsgSyncTimeBase>(
-                SyncTimeBase,
-                NetMessageAccept.Handshake | NetMessageAccept.Client);
-
             _configManager.OnValueChanged(CVars.NetTickrate, TickRateChanged, invokeImmediately: true);
 
             _playMan.Initialize();
             Reset();
         }
 
-        private void SyncTimeBase(MsgSyncTimeBase message)
-        {
-            Logger.DebugS("client", $"Synchronized time base: {message.Tick}: {message.Time}");
-
-            if (RunLevel >= ClientRunLevel.Connected)
-                _timing.TimeBase = (message.Time, message.Tick);
-            else
-                _timeBase = (message.Time, message.Tick);
-        }
-
-        private void TickRateChanged(int tickrate, in CVarChangeInfo info)
+        private void TickRateChanged(int tickrate)
         {
             if (GameInfo != null)
             {
                 GameInfo.TickRate = (byte) tickrate;
             }
 
-            _timing.SetTickRateAt((byte) tickrate, info.TickChanged);
+            _timing.TickRate = (byte) tickrate;
             Logger.InfoS("client", $"Tickrate changed to: {tickrate} on tick {_timing.CurTick}");
         }
 
@@ -91,7 +75,7 @@ namespace Robust.Client
         {
             if (RunLevel == ClientRunLevel.Connecting)
             {
-                _net.Reset("Client mashing that connect button.");
+                _net.Shutdown("Client mashing that connect button.");
                 Reset();
             }
 
@@ -229,8 +213,9 @@ namespace Robust.Client
         {
             _entityManager.Startup();
             _mapManager.Startup();
+            _entityLookup.Startup();
 
-            _timing.ResetSimTime(_timeBase);
+            _timing.ResetSimTime();
             _timing.Paused = false;
         }
 
@@ -239,6 +224,7 @@ namespace Robust.Client
             IoCManager.Resolve<INetConfigurationManager>().FlushMessages();
             _gameStates.Reset();
             _playMan.Shutdown();
+            _entityLookup.Shutdown();
             _entityManager.Shutdown();
             _mapManager.Shutdown();
             _discord.ClearPresence();

Robust.Client/ClientIoC.cs

@@ -11,7 +11,6 @@ using Robust.Client.Input;
 using Robust.Client.Map;
 using Robust.Client.Placement;
 using Robust.Client.Player;
-using Robust.Client.Profiling;
 using Robust.Client.Prototypes;
 using Robust.Client.Reflection;
 using Robust.Client.ResourceManagement;
@@ -48,6 +47,7 @@ namespace Robust.Client
             IoCManager.Register<IMapManagerInternal, NetworkedMapManager>();
             IoCManager.Register<INetworkedMapManager, NetworkedMapManager>();
             IoCManager.Register<IEntityManager, ClientEntityManager>();
+            IoCManager.Register<IEntityLookup, EntityLookup>();
             IoCManager.Register<IReflectionManager, ClientReflectionManager>();
             IoCManager.Register<IConsoleHost, ClientConsoleHost>();
             IoCManager.Register<IClientConsoleHost, ClientConsoleHost>();
@@ -62,8 +62,6 @@ namespace Robust.Client
             IoCManager.Register<IResourceCache, ResourceCache>();
             IoCManager.Register<IResourceCacheInternal, ResourceCache>();
             IoCManager.Register<IClientNetManager, NetManager>();
-            IoCManager.Register<EntityManager, ClientEntityManager>();
-            IoCManager.Register<ClientEntityManager>();
             IoCManager.Register<IClientEntityManager, ClientEntityManager>();
             IoCManager.Register<IClientEntityManagerInternal, ClientEntityManager>();
             IoCManager.Register<IEntityNetworkManager, ClientEntityManager>();
@@ -74,11 +72,11 @@ namespace Robust.Client
             IoCManager.Register<IStateManager, StateManager>();
             IoCManager.Register<IUserInterfaceManager, UserInterfaceManager>();
             IoCManager.Register<IUserInterfaceManagerInternal, UserInterfaceManager>();
+            IoCManager.Register<IDebugDrawing, DebugDrawing>();
             IoCManager.Register<ILightManager, LightManager>();
             IoCManager.Register<IDiscordRichPresence, DiscordRichPresence>();
             IoCManager.Register<IMidiManager, MidiManager>();
             IoCManager.Register<IAuthManager, AuthManager>();
-            IoCManager.Register<ProfViewManager>();
             IoCManager.Register<IPhysicsManager, PhysicsManager>();
             switch (mode)
             {

Robust.Client/Console/ClientConsoleHost.Completions.cs

@@ -1,94 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Robust.Shared;
-using Robust.Shared.Console;
-using Robust.Shared.Network.Messages;
-
-namespace Robust.Client.Console;
-
-internal sealed partial class ClientConsoleHost
-{
-    private readonly Dictionary<int, PendingCompletion> _completionsPending = new();
-    private int _completionSeq;
-
-
-    public async Task<CompletionResult> GetCompletions(List<string> args, CancellationToken cancel)
-    {
-        // Last element is the command currently being typed. May be empty.
-
-        // Logger.Debug($"Running completions: {string.Join(", ", args)}");
-
-        var delay = _cfg.GetCVar(CVars.ConCompletionDelay);
-        if (delay > 0)
-            await Task.Delay((int)(delay * 1000), cancel);
-
-        return await CalcCompletions(args, cancel);
-    }
-
-    private Task<CompletionResult> CalcCompletions(List<string> args, CancellationToken cancel)
-    {
-        if (args.Count == 1)
-        {
-            // Typing out command name, handle this ourselves.
-            var cmdOptions = CompletionResult.FromOptions(
-                RegisteredCommands.Values.Select(c => new CompletionOption(c.Command, c.Description)));
-            return Task.FromResult(cmdOptions);
-        }
-
-        if (!RegisteredCommands.TryGetValue(args[0], out var cmd))
-            return Task.FromResult(CompletionResult.Empty);
-
-        return cmd.GetCompletionAsync(LocalShell, args.ToArray()[1..], cancel).AsTask();
-    }
-
-    private Task<CompletionResult> DoServerCompletions(List<string> args, CancellationToken cancel)
-    {
-        var tcs = new TaskCompletionSource<CompletionResult>();
-        var cts = CancellationTokenSource.CreateLinkedTokenSource(cancel);
-        var seq = _completionSeq++;
-
-        var pending = new PendingCompletion
-        {
-            Cts = cts,
-            Tcs = tcs
-        };
-
-        var msg = new MsgConCompletion
-        {
-            Args = args.ToArray(),
-            Seq = seq
-        };
-
-        cts.Token.Register(() =>
-        {
-            tcs.SetCanceled(cts.Token);
-            cts.Dispose();
-            _completionsPending.Remove(seq);
-        }, true);
-
-        NetManager.ClientSendMessage(msg);
-
-        _completionsPending.Add(seq, pending);
-
-        return tcs.Task;
-    }
-
-    private void ProcessCompletionResp(MsgConCompletionResp message)
-    {
-        if (!_completionsPending.TryGetValue(message.Seq, out var pending))
-            return;
-
-        pending.Cts.Dispose();
-        pending.Tcs.SetResult(message.Result);
-
-        _completionsPending.Remove(message.Seq);
-    }
-
-    private struct PendingCompletion
-    {
-        public TaskCompletionSource<CompletionResult> Tcs;
-        public CancellationTokenSource Cts;
-    }
-}

Robust.Client/Console/ClientConsoleHost.cs

@@ -1,15 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Robust.Client.Log;
 using Robust.Client.Player;
-using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
@@ -46,23 +41,18 @@ namespace Robust.Client.Console
     }
 
     /// <inheritdoc cref="IClientConsoleHost" />
-    internal sealed partial class ClientConsoleHost : ConsoleHost, IClientConsoleHost, IConsoleHostInternal
+    internal sealed class ClientConsoleHost : ConsoleHost, IClientConsoleHost
     {
         [Dependency] private readonly IClientConGroupController _conGroup = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
 
         private bool _requestedCommands;
 
-        public ClientConsoleHost() : base(isServer: false) {}
-
         /// <inheritdoc />
         public void Initialize()
         {
             NetManager.RegisterNetMessage<MsgConCmdReg>(HandleConCmdReg);
             NetManager.RegisterNetMessage<MsgConCmdAck>(HandleConCmdAck);
             NetManager.RegisterNetMessage<MsgConCmd>(ProcessCommand);
-            NetManager.RegisterNetMessage<MsgConCompletion>();
-            NetManager.RegisterNetMessage<MsgConCompletionResp>(ProcessCompletionResp);
 
             _requestedCommands = false;
             NetManager.Connected += OnNetworkConnected;
@@ -98,11 +88,6 @@ namespace Robust.Client.Console
             OutputText(text, true, true);
         }
 
-        public bool IsCmdServer(IConsoleCommand cmd)
-        {
-            return cmd is ServerDummyCommand;
-        }
-
         public override event ConAnyCommandCallback? AnyCommandExecuted;
 
         /// <inheritdoc />
@@ -123,14 +108,14 @@ namespace Robust.Client.Console
 
             if (AvailableCommands.ContainsKey(commandName))
             {
-#if FULL_RELEASE
                 var playerManager = IoCManager.Resolve<IPlayerManager>();
+
                 if (!_conGroup.CanCommand(commandName) && playerManager.LocalPlayer?.Session.Status > SessionStatus.Connecting)
                 {
                     WriteError(null, $"Insufficient perms for command: {commandName}");
                     return;
                 }
-#endif
+
                 var command1 = AvailableCommands[commandName];
                 args.RemoveAt(0);
                 var shell = new ConsoleShell(this, null);
@@ -149,7 +134,7 @@ namespace Robust.Client.Console
             if (!NetManager.IsConnected) // we don't care about session on client
                 return;
 
-            var msg = new MsgConCmd();
+            var msg = NetManager.CreateNetMessage<MsgConCmd>();
             msg.Text = command;
             NetManager.ClientSendMessage(msg);
         }
@@ -213,69 +198,36 @@ namespace Robust.Client.Console
             if (!NetManager.IsConnected)
                 return;
 
-            var msg = new MsgConCmdReg();
+            var msg = NetManager.CreateNetMessage<MsgConCmdReg>();
             NetManager.ClientSendMessage(msg);
 
             _requestedCommands = true;
         }
+    }
 
-        /// <summary>
-        /// These dummies are made purely so list and help can list server-side commands.
-        /// </summary>
-        [Reflect(false)]
-        private sealed class ServerDummyCommand : IConsoleCommand
+    /// <summary>
+    /// These dummies are made purely so list and help can list server-side commands.
+    /// </summary>
+    [Reflect(false)]
+    internal sealed class ServerDummyCommand : IConsoleCommand
+    {
+        internal ServerDummyCommand(string command, string help, string description)
         {
-            internal ServerDummyCommand(string command, string help, string description)
-            {
-                Command = command;
-                Help = help;
-                Description = description;
-            }
-
-            public string Command { get; }
-
-            public string Description { get; }
-
-            public string Help { get; }
-
-            // Always forward to server.
-            public void Execute(IConsoleShell shell, string argStr, string[] args)
-            {
-                shell.RemoteExecuteCommand(argStr);
-            }
-
-            public async ValueTask<CompletionResult> GetCompletionAsync(
-                IConsoleShell shell,
-                string[] args,
-                CancellationToken cancel)
-            {
-                var host = (ClientConsoleHost)shell.ConsoleHost;
-                var argsList = args.ToList();
-                argsList.Insert(0, Command);
-
-                return await host.DoServerCompletions(argsList, cancel);
-            }
+            Command = command;
+            Help = help;
+            Description = description;
         }
 
-        private sealed class RemoteExecCommand : IConsoleCommand
+        public string Command { get; }
+
+        public string Description { get; }
+
+        public string Help { get; }
+
+        // Always forward to server.
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            public string Command => ">";
-            public string Description => Loc.GetString("cmd-remoteexec-desc");
-            public string Help => Loc.GetString("cmd-remoteexec-help");
-
-            public void Execute(IConsoleShell shell, string argStr, string[] args)
-            {
-                shell.RemoteExecuteCommand(argStr["> ".Length..]);
-            }
-
-            public async ValueTask<CompletionResult> GetCompletionAsync(
-                IConsoleShell shell,
-                string[] args,
-                CancellationToken cancel)
-            {
-                var host = (ClientConsoleHost)shell.ConsoleHost;
-                return await host.DoServerCompletions(args.ToList(), cancel);
-            }
+            shell.RemoteExecuteCommand(argStr);
         }
     }
 }

Robust.Client/Console/Commands/ConfigurationCommands.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Linq;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
@@ -5,6 +7,57 @@ using Robust.Shared.IoC;
 
 namespace Robust.Client.Console.Commands
 {
+    [UsedImplicitly]
+    internal sealed class CVarCommand : SharedCVarCommand, IConsoleCommand
+    {
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length < 1 || args.Length > 2)
+            {
+                shell.WriteError("Must provide exactly one or two arguments.");
+                return;
+            }
+
+            var configManager = IoCManager.Resolve<IConfigurationManager>();
+            var name = args[0];
+
+            if (name == "?")
+            {
+                var cvars = configManager.GetRegisteredCVars().OrderBy(c => c);
+                shell.WriteLine(string.Join("\n", cvars));
+                return;
+            }
+
+            if (!configManager.IsCVarRegistered(name))
+            {
+                shell.WriteError($"CVar '{name}' is not registered. Use 'cvar ?' to get a list of all registered CVars.");
+                return;
+            }
+
+            if (args.Length == 1)
+            {
+                // Read CVar
+                var value = configManager.GetCVar<object>(name);
+                shell.WriteLine(value.ToString() ?? "");
+            }
+            else
+            {
+                // Write CVar
+                var value = args[1];
+                var type = configManager.GetCVarType(name);
+                try
+                {
+                    var parsed = ParseObject(type, value);
+                    configManager.SetCVar(name, parsed);
+                }
+                catch (FormatException)
+                {
+                    shell.WriteLine($"Input value is in incorrect format for type {type}");
+                }
+            }
+        }
+    }
+
     [UsedImplicitly]
     public sealed class SaveConfig : IConsoleCommand
     {

Robust.Client/Console/Commands/Debug.cs

@@ -19,7 +19,6 @@ using Robust.Shared.Console;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
@@ -98,72 +97,54 @@ namespace Robust.Client.Console.Commands
     {
         public string Command => "monitor";
 
-        public string Description => Loc.GetString("cmd-monitor-desc");
+        public string Help =>
+            "Usage: monitor <name>\nPossible monitors are: fps, net, bandwidth, coord, time, frames, mem, clyde, input";
 
-        public string Help
-        {
-            get
-            {
-                var monitors = string.Join(", ", Enum.GetNames<DebugMonitor>());
-                return Loc.GetString("cmd-monitor-help", ("monitors", monitors));
-            }
-        }
+        public string Description => "Toggles a debug monitor in the F3 menu.";
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var monitors = IoCManager.Resolve<IUserInterfaceManager>().DebugMonitors;
+            var monitor = IoCManager.Resolve<IUserInterfaceManager>().DebugMonitors;
 
             if (args.Length != 1)
             {
-                shell.WriteLine(Loc.GetString("cmd-monitor-arg-count"));
+                shell.WriteLine(Help);
                 return;
             }
 
-            var monitorArg = args[0];
-            if (monitorArg.Equals("-all", StringComparison.OrdinalIgnoreCase))
+            switch (args[0])
             {
-                foreach (var monitor in Enum.GetValues<DebugMonitor>())
-                {
-                    monitors.SetMonitor(monitor, false);
-                }
-
-                return;
+                case "fps":
+                    monitor.ShowFPS ^= true;
+                    break;
+                case "net":
+                    monitor.ShowNet ^= true;
+                    break;
+                case "bandwidth":
+                    monitor.ShowNetBandwidth ^= true;
+                    break;
+                case "coord":
+                    monitor.ShowCoords ^= true;
+                    break;
+                case "time":
+                    monitor.ShowTime ^= true;
+                    break;
+                case "frames":
+                    monitor.ShowFrameGraph ^= true;
+                    break;
+                case "mem":
+                    monitor.ShowMemory ^= true;
+                    break;
+                case "clyde":
+                    monitor.ShowClyde ^= true;
+                    break;
+                case "input":
+                    monitor.ShowInput ^= true;
+                    break;
+                default:
+                    shell.WriteLine($"Invalid key: {args[0]}");
+                    break;
             }
-
-            if (monitorArg.Equals("+all", StringComparison.OrdinalIgnoreCase))
-            {
-                foreach (var monitor in Enum.GetValues<DebugMonitor>())
-                {
-                    monitors.SetMonitor(monitor, true);
-                }
-
-                return;
-            }
-
-            if (!Enum.TryParse(monitorArg, true, out DebugMonitor parsedMonitor))
-            {
-                shell.WriteError(Loc.GetString("cmd-monitor-invalid-name"));
-                return;
-            }
-
-            monitors.ToggleMonitor(parsedMonitor);
-        }
-
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
-        {
-            if (args.Length == 1)
-            {
-                var allOptions = new CompletionOption[]
-                {
-                    new("-all", Loc.GetString("cmd-monitor-minus-all-hint")),
-                    new("+all", Loc.GetString("cmd-monitor-plus-all-hint"))
-                };
-
-                var options = allOptions.Concat(Enum.GetNames<DebugMonitor>().Select(c => new CompletionOption(c)));
-                return CompletionResult.FromHintOptions(options, Loc.GetString("cmd-monitor-arg-monitor"));
-            }
-
-            return CompletionResult.Empty;
         }
     }
 
@@ -187,7 +168,7 @@ namespace Robust.Client.Console.Commands
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var mgr = EntitySystem.Get<DebugDrawingSystem>();
+            var mgr = IoCManager.Resolve<IDebugDrawing>();
             mgr.DebugPositions = !mgr.DebugPositions;
         }
     }
@@ -758,6 +739,103 @@ namespace Robust.Client.Console.Commands
         }
     }
 
+    internal sealed class GcCommand : IConsoleCommand
+    {
+        public string Command => "gc";
+        public string Description => "Run the GC.";
+        public string Help => "gc [generation]";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length == 0)
+            {
+                GC.Collect();
+            }
+            else
+            {
+                if (int.TryParse(args[0], out int result))
+                    GC.Collect(result);
+                else
+                    shell.WriteError("Failed to parse argument.");
+            }
+        }
+    }
+
+    internal sealed class GcFullCommand : IConsoleCommand
+    {
+        public string Command => "gcf";
+        public string Description => "Run the GC, fully, compacting LOH and everything.";
+        public string Help => "gcf";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce;
+            GC.Collect(2, GCCollectionMode.Forced, true, true);
+        }
+    }
+
+    internal sealed class GcModeCommand : IConsoleCommand
+    {
+
+        public string Command => "gc_mode";
+
+        public string Description => "Change/Read the GC Latency mode.";
+
+        public string Help => "gc_mode\nSee current GC Latencymode\ngc_mode [type]\n Change GC Latency mode to [type]";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            var prevMode = GCSettings.LatencyMode;
+            if (args.Length == 0)
+            {
+                shell.WriteLine($"current gc latency mode: {(int) prevMode} ({prevMode})");
+                shell.WriteLine("possible modes:");
+                foreach (int mode in (int[]) Enum.GetValues(typeof(GCLatencyMode)))
+                {
+                    shell.WriteLine($" {mode}: {Enum.GetName(typeof(GCLatencyMode), mode)}");
+                }
+            }
+            else
+            {
+                GCLatencyMode mode;
+                if (char.IsDigit(args[0][0]) && int.TryParse(args[0], out var modeNum))
+                {
+                    mode = (GCLatencyMode) modeNum;
+                }
+                else if (!Enum.TryParse(args[0], true, out mode))
+                {
+                    shell.WriteLine($"unknown gc latency mode: {args[0]}");
+                    return;
+                }
+
+                shell.WriteLine($"attempting gc latency mode change: {(int) prevMode} ({prevMode}) -> {(int) mode} ({mode})");
+                GCSettings.LatencyMode = mode;
+                shell.WriteLine($"resulting gc latency mode: {(int) GCSettings.LatencyMode} ({GCSettings.LatencyMode})");
+            }
+        }
+
+    }
+
+    internal sealed class SerializeStatsCommand : IConsoleCommand
+    {
+
+        public string Command => "szr_stats";
+
+        public string Description => "Report serializer statistics.";
+
+        public string Help => "szr_stats";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+
+            shell.WriteLine($"serialized: {RobustSerializer.BytesSerialized} bytes, {RobustSerializer.ObjectsSerialized} objects");
+            shell.WriteLine($"largest serialized: {RobustSerializer.LargestObjectSerializedBytes} bytes, {RobustSerializer.LargestObjectSerializedType} objects");
+            shell.WriteLine($"deserialized: {RobustSerializer.BytesDeserialized} bytes, {RobustSerializer.ObjectsDeserialized} objects");
+            shell.WriteLine($"largest serialized: {RobustSerializer.LargestObjectDeserializedBytes} bytes, {RobustSerializer.LargestObjectDeserializedType} objects");
+        }
+
+    }
+
     internal sealed class ChunkInfoCommand : IConsoleCommand
     {
         public string Command => "chunkinfo";
@@ -783,7 +861,7 @@ namespace Robust.Client.Console.Commands
             var chunkIndex = grid.LocalToChunkIndices(grid.MapToGrid(mousePos));
             var chunk = internalGrid.GetChunk(chunkIndex);
 
-            shell.WriteLine($"worldBounds: {internalGrid.CalcWorldAABB(chunk)} localBounds: {chunk.CachedBounds}");
+            shell.WriteLine($"worldBounds: {chunk.CalcWorldAABB()} localBounds: {chunk.CalcLocalBounds()}");
         }
     }
 

Robust.Client/Console/Commands/HelpCommands.cs

@@ -0,0 +1,73 @@
+using System.Linq;
+using Robust.Shared.Console;
+using Robust.Shared.IoC;
+using Robust.Shared.Network;
+
+namespace Robust.Client.Console.Commands
+{
+    sealed class HelpCommand : IConsoleCommand
+    {
+        public string Command => "help";
+        public string Help => "When no arguments are provided, displays a generic help text. When an argument is passed, display the help text for the command with that name.";
+        public string Description => "Display help text.";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            switch (args.Length)
+            {
+                case 0:
+                    shell.WriteLine("To display help for a specific command, write 'help <command>'. To list all available commands, write 'list'.");
+                    break;
+
+                case 1:
+                    string commandname = args[0];
+                    if (!shell.ConsoleHost.RegisteredCommands.ContainsKey(commandname))
+                    {
+                        if (!IoCManager.Resolve<IClientNetManager>().IsConnected)
+                        {
+                            // No server so nothing to respond with unknown command.
+                            shell.WriteError("Unknown command: " + commandname);
+                            return;
+                        }
+                        // TODO: Maybe have a server side help?
+                        return;
+                    }
+                    IConsoleCommand command = shell.ConsoleHost.RegisteredCommands[commandname];
+                    shell.WriteLine(string.Format("{0} - {1}", command.Command, command.Description));
+                    shell.WriteLine(command.Help);
+                    break;
+
+                default:
+                    shell.WriteError("Invalid amount of arguments.");
+                    break;
+            }
+        }
+    }
+
+    sealed class ListCommand : IConsoleCommand
+    {
+        public string Command => "list";
+        public string Help => "Usage: list [filter]\n" +
+                              "Lists all available commands, and their short descriptions.\n" +
+                              "If a filter is provided, " +
+                              "only commands that contain the given string in their name will be listed.";
+        public string Description => "List all commands, optionally with a filter.";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            var filter = "";
+            if (args.Length == 1)
+            {
+                filter = args[0];
+            }
+
+            var conGroup = IoCManager.Resolve<IClientConGroupController>();
+            foreach (var command in shell.ConsoleHost.RegisteredCommands.Values
+                .Where(p => p.Command.Contains(filter) && (p is not ServerDummyCommand || conGroup.CanCommand(p.Command)))
+                .OrderBy(c => c.Command))
+            {
+                shell.WriteLine(command.Command + ": " + command.Description);
+            }
+        }
+    }
+}

Robust.Client/Console/Commands/ListAssembliesCommand.cs

@@ -0,0 +1,27 @@
+using System.Linq;
+using System.Runtime.Loader;
+using JetBrains.Annotations;
+using Robust.Shared.Console;
+
+namespace Robust.Client.Console.Commands
+{
+    [UsedImplicitly]
+    internal sealed class ListAssembliesCommand : IConsoleCommand
+    {
+        public string Command => "lsasm";
+        public string Description => "Lists loaded assemblies by load context.";
+        public string Help => Command;
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            foreach (var context in AssemblyLoadContext.All)
+            {
+                shell.WriteLine($"{context.Name}:");
+                foreach (var assembly in context.Assemblies.OrderBy(a => a.FullName))
+                {
+                    shell.WriteLine($"  {assembly.FullName}");
+                }
+            }
+        }
+    }
+}

Robust.Client/Console/Commands/LogCommands.cs

@@ -0,0 +1,73 @@
+using Robust.Shared.Log;
+using System;
+using Robust.Shared.Console;
+
+namespace Robust.Client.Console.Commands
+{
+    sealed class LogSetLevelCommand : IConsoleCommand
+    {
+        public string Command => "loglevel";
+        public string Description => "Changes the log level for a provided sawmill.";
+        public string Help => "Usage: loglevel <sawmill> <level>"
+                            + "\n    sawmill: A label prefixing log messages. This is the one you're setting the level for."
+                            + "\n    level: The log level. Must match one of the values of the LogLevel enum.";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length != 2)
+            {
+                shell.WriteError("Invalid argument amount. Expected 2 arguments.");
+                return;
+            }
+
+            var name = args[0];
+            var levelname = args[1];
+            LogLevel? level;
+            if (levelname == "null")
+            {
+                level = null;
+            }
+            else
+            {
+                if (!Enum.TryParse<LogLevel>(levelname, out var result))
+                {
+                    shell.WriteLine("Failed to parse 2nd argument. Must be one of the values of the LogLevel enum.");
+                    return;
+                }
+                level = result;
+            }
+            Logger.GetSawmill(name).Level = level;
+        }
+    }
+
+    sealed class TestLog : IConsoleCommand
+    {
+        public string Command => "testlog";
+        public string Description => "Writes a test log to a sawmill.";
+        public string Help => "Usage: testlog <sawmill> <level> <message>"
+                            + "\n    sawmill: A label prefixing the logged message."
+                            + "\n    level: The log level. Must match one of the values of the LogLevel enum."
+                            + "\n    message: The message to be logged. Wrap this in double quotes if you want to use spaces.";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length != 3)
+            {
+                shell.WriteError("Invalid argument amount. Expected 3 arguments.");
+                return;
+            }
+
+            var name = args[0];
+            var levelname = args[1];
+            var message = args[2]; // yes this doesn't support spaces idgaf.
+            if (!Enum.TryParse<LogLevel>(levelname, out var result))
+            {
+                shell.WriteLine("Failed to parse 2nd argument. Must be one of the values of the LogLevel enum.");
+                return;
+            }
+            var level = result;
+
+            Logger.LogS(level, name, message);
+        }
+    }
+}

Robust.Client/Console/Commands/PhysicsOverlayCommands.cs

@@ -1,7 +1,6 @@
 using Robust.Client.Debugging;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
 
 namespace Robust.Client.Console.Commands
 {
@@ -9,13 +8,12 @@ namespace Robust.Client.Console.Commands
     {
         public string Command => "physics";
         public string Description => $"Shows a debug physics overlay. The arg supplied specifies the overlay.";
-        public string Help => $"{Command} <aabbs / com / contactnormals / contactpoints / joints / shapeinfo / shapes>";
-
+        public string Help => $"{Command} <aabbs / contactnormals / contactpoints / joints / shapeinfo / shapes>";
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 1)
             {
-                shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific", ("properAmount", 1), ("currentAmount", args.Length)));
+                shell.WriteLine($"Invalid number of args supplied");
                 return;
             }
 
@@ -45,27 +43,11 @@ namespace Robust.Client.Console.Commands
                     system.Flags ^= PhysicsDebugFlags.Shapes;
                     break;
                 default:
-                    shell.WriteError(Loc.GetString("cmd-physics-overlay", ("overlay", args[0])));
+                    shell.WriteLine($"{args[0]} is not a recognised overlay");
                     return;
             }
 
             return;
         }
-
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
-        {
-            if (args.Length != 1) return CompletionResult.Empty;
-
-            return CompletionResult.FromOptions(new[]
-            {
-                "aabbs",
-                "com",
-                "contactnormals",
-                "contactpoints",
-                "joints",
-                "shapeinfo",
-                "shapes",
-            });
-        }
     }
 }

Robust.Client/Console/Commands/SendGarbageCommand.cs

@@ -15,7 +15,7 @@ namespace Robust.Client.Console.Commands
             // MsgStringTableEntries is registered as NetMessageAccept.Client so the server will immediately deny it.
             // And kick us.
             var net = IoCManager.Resolve<IClientNetManager>();
-            var msg = new MsgStringTableEntries();
+            var msg = net.CreateNetMessage<MsgStringTableEntries>();
             msg.Entries = new MsgStringTableEntries.Entry[0];
             net.ClientSendMessage(msg);
         }

Robust.Client/Console/IClientConsoleHost.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using Robust.Shared.Console;
 using Robust.Shared.Utility;
 
@@ -18,7 +15,5 @@ namespace Robust.Client.Console
         event EventHandler<AddFormattedMessageArgs> AddFormatted;
 
         void AddFormattedLine(FormattedMessage message);
-
-        Task<CompletionResult> GetCompletions(List<string> args, CancellationToken cancel);
     }
 }

Robust.Client/Console/ScriptClient.ScriptConsoleServer.cs

@@ -35,7 +35,7 @@ namespace Robust.Client.Console
 
                 RunButton.Disabled = true;
 
-                var msg = new MsgScriptEval();
+                var msg = _client._netManager.CreateNetMessage<MsgScriptEval>();
                 msg.ScriptSession = _session;
                 msg.Code = _lastEnteredText = InputBar.Text;
 
@@ -48,7 +48,7 @@ namespace Robust.Client.Console
 
             protected override void Complete()
             {
-                var msg = new MsgScriptCompletion();
+                var msg = _client._netManager.CreateNetMessage<MsgScriptCompletion>();
                 msg.ScriptSession = _session;
                 msg.Code = InputBar.Text;
                 msg.Cursor = InputBar.CursorPosition;

Robust.Client/Console/ScriptClient.cs

@@ -65,7 +65,7 @@ namespace Robust.Client.Console
                 throw new InvalidOperationException("We do not have scripting permission.");
             }
 
-            var msg = new MsgScriptStart();
+            var msg = _netManager.CreateNetMessage<MsgScriptStart>();
             msg.ScriptSession = _nextSessionId++;
             _netManager.ClientSendMessage(msg);
         }
@@ -74,7 +74,7 @@ namespace Robust.Client.Console
         {
             _activeConsoles.Remove(session);
 
-            var msg = new MsgScriptStop();
+            var msg = _netManager.CreateNetMessage<MsgScriptStop>();
             msg.ScriptSession = session;
             _netManager.ClientSendMessage(msg);
         }

Robust.Client/Debugging/DebugDrawing.cs

@@ -6,21 +6,17 @@ using Robust.Shared.Maths;
 
 namespace Robust.Client.Debugging
 {
-    /// <summary>
-    /// A collection of visual debug overlays for the client game.
-    /// </summary>
-    public sealed class DebugDrawingSystem : EntitySystem
+    /// <inheritdoc />
+    public sealed class DebugDrawing : IDebugDrawing
     {
         [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Dependency] private readonly IEntityLookup _lookup = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly EntityLookupSystem _lookup = default!;
 
         private bool _debugPositions;
 
-        /// <summary>
-        /// Toggles the visual overlay of the local origin for each entity on screen.
-        /// </summary>
+        /// <inheritdoc />
         public bool DebugPositions
         {
             get => _debugPositions;
@@ -46,13 +42,13 @@ namespace Robust.Client.Debugging
 
         private sealed class EntityPositionOverlay : Overlay
         {
-            private readonly EntityLookupSystem _lookup;
+            private readonly IEntityLookup _lookup;
             private readonly IEyeManager _eyeManager;
             private readonly IEntityManager _entityManager;
 
             public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-            public EntityPositionOverlay(EntityLookupSystem lookup, IEyeManager eyeManager, IEntityManager entityManager)
+            public EntityPositionOverlay(IEntityLookup lookup, IEyeManager eyeManager, IEntityManager entityManager)
             {
                 _lookup = lookup;
                 _eyeManager = eyeManager;
@@ -65,11 +61,13 @@ namespace Robust.Client.Debugging
 
                 var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
                 var viewport = _eyeManager.GetWorldViewport();
-                var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
 
                 foreach (var entity in _lookup.GetEntitiesIntersecting(_eyeManager.CurrentMap, viewport))
                 {
-                    var (center, worldRotation) = xformQuery.GetComponent(entity).GetWorldPositionRotation();
+                    var transform = _entityManager.GetComponent<TransformComponent>(entity);
+
+                    var center = transform.WorldPosition;
+                    var worldRotation = transform.WorldRotation;
 
                     var xLine = worldRotation.RotateVec(Vector2.UnitX);
                     var yLine = worldRotation.RotateVec(Vector2.UnitY);

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -52,7 +52,6 @@ using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
@@ -89,7 +88,6 @@ namespace Robust.Client.Debugging
                             EntityManager,
                             IoCManager.Resolve<IEyeManager>(),
                             IoCManager.Resolve<IInputManager>(),
-                            IoCManager.Resolve<IMapManager>(),
                             IoCManager.Resolve<IResourceCache>(),
                             this,
                             Get<SharedPhysicsSystem>()));
@@ -153,12 +151,10 @@ namespace Robust.Client.Debugging
         /// Shows the world point for each contact in the viewport.
         /// </summary>
         ContactPoints = 1 << 0,
-
         /// <summary>
         /// Shows the world normal for each contact in the viewport.
         /// </summary>
         ContactNormals = 1 << 1,
-
         /// <summary>
         /// Shows all physics shapes in the viewport.
         /// </summary>
@@ -166,10 +162,6 @@ namespace Robust.Client.Debugging
         ShapeInfo = 1 << 3,
         Joints = 1 << 4,
         AABBs = 1 << 5,
-
-        /// <summary>
-        /// Shows Center of Mass for all bodies in the viewport.
-        /// </summary>
         COM = 1 << 6,
     }
 
@@ -178,7 +170,6 @@ namespace Robust.Client.Debugging
         private IEntityManager _entityManager = default!;
         private IEyeManager _eyeManager = default!;
         private IInputManager _inputManager = default!;
-        private IMapManager _mapManager = default!;
         private DebugPhysicsSystem _debugPhysicsSystem = default!;
         private SharedPhysicsSystem _physicsSystem = default!;
 
@@ -190,12 +181,11 @@ namespace Robust.Client.Debugging
 
         private HashSet<Joint> _drawnJoints = new();
 
-        public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IResourceCache cache, DebugPhysicsSystem system, SharedPhysicsSystem physicsSystem)
+        public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IResourceCache cache, DebugPhysicsSystem system, SharedPhysicsSystem physicsSystem)
         {
             _entityManager = entityManager;
             _eyeManager = eyeManager;
             _inputManager = inputManager;
-            _mapManager = mapManager;
             _debugPhysicsSystem = system;
             _physicsSystem = physicsSystem;
             _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
@@ -250,21 +240,26 @@ namespace Robust.Client.Debugging
 
             if ((_debugPhysicsSystem.Flags & PhysicsDebugFlags.COM) != 0)
             {
-                const float Alpha = 0.25f;
-
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
-                    var color = Color.Purple.WithAlpha(Alpha);
-                    var transform = physBody.GetTransform();
-                    worldHandle.DrawCircle(Transform.Mul(transform, physBody.LocalCenter), 0.2f, color);
-                }
+                    Color color;
+                    const float Alpha = 0.25f;
+                    float size;
+
+                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner))
+                    {
+                        color = Color.Orange.WithAlpha(Alpha);
+                        size = 1f;
+                    }
+                    else
+                    {
+                        color = Color.Purple.WithAlpha(Alpha);
+                        size = 0.2f;
+                    }
 
-                foreach (var grid in _mapManager.FindGridsIntersecting(mapId, viewBounds))
-                {
-                    var physBody = _entityManager.GetComponent<PhysicsComponent>(grid.GridEntityId);
-                    var color = Color.Orange.WithAlpha(Alpha);
                     var transform = physBody.GetTransform();
-                    worldHandle.DrawCircle(Transform.Mul(transform, physBody.LocalCenter), 1f, color);
+
+                    worldHandle.DrawCircle(Transform.Mul(transform, physBody.LocalCenter), size, color);
                 }
             }
 

Robust.Client/Debugging/IDebugDrawing.cs

@@ -0,0 +1,13 @@
+namespace Robust.Client.Debugging
+{
+    /// <summary>
+    /// A collection of visual debug overlays for the client game.
+    /// </summary>
+    public interface IDebugDrawing
+    {
+        /// <summary>
+        /// Toggles the visual overlay of the local origin for each entity on screen.
+        /// </summary>
+        bool DebugPositions { get; set; }
+    }
+}

Robust.Client/GameController/GameController.Redialler.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Threading;
-using Robust.LoaderApi;
-using Robust.Shared;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Robust.Client;
-
-internal partial class GameController
-{
-    // A little paranoia goes a long way.
-    // This is static on purpose - the whole process shouldn't redial more than once, ever.
-    private static int _hasRedialled = 0;
-
-    public void Redial(string address, string? text = null)
-    {
-        // -- ATTENTION, YE WOULD-BE TRESPASSERS! --
-        // This code is the least testable code ever (because it's in-engine code that requires the Launcher), so don't make it do too much.
-        // This checks for some obvious requirements and then forwards to RedialApi which does the actual work.
-        // Testing of RedialApi is doable in the SS14.Launcher project, this is why it has a fake RobustToolbox build.
-        // -- THANK YE, NOW KINDLY MOVE ALONG! --
-
-        // We don't ever want to successfully redial more than once, and we want to shutdown once we've redialled.
-        // Otherwise abuse could happen.
-        DebugTools.AssertNotNull(_mainLoop);
-
-        Logger.Info($"Attempting redial of {address}: {text ?? "no reason given"}");
-
-        if (!_mainLoop!.Running)
-        {
-            throw new Exception("Attempted a redial during shutdown, this is not acceptable - redial first and if you succeed it'll shutdown anyway.");
-        }
-
-        if (_loaderArgs == null)
-        {
-            throw new Exception("Attempted a redial when the game was not run from the launcher (_loaderArgs == null)");
-        }
-
-        if (_loaderArgs!.RedialApi == null)
-        {
-            throw new Exception("Attempted a redial when redialling was not supported by the loader (Outdated launcher?)");
-        }
-
-        if (Interlocked.Increment(ref _hasRedialled) != 1)
-        {
-            // Don't let it overflow or anything
-            Interlocked.Decrement(ref _hasRedialled);
-            throw new Exception("Attempted a redial after one already succeeded or while one is in progress, this is never acceptable");
-        }
-
-        try
-        {
-            _loaderArgs!.RedialApi!.Redial(new Uri(address), text ?? "");
-        }
-        catch (Exception)
-        {
-            Interlocked.Decrement(ref _hasRedialled);
-            throw;
-        }
-
-        Shutdown("Redial");
-    }
-}
-

Robust.Client/GameController/GameController.cs

@@ -21,16 +21,14 @@ using Robust.Shared;
 using Robust.Shared.Asynchronous;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Exceptions;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
-using Robust.Shared.Profiling;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
-using Robust.Shared.Threading;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
@@ -52,6 +50,7 @@ namespace Robust.Client
         [Dependency] private readonly IClientConsoleHost _console = default!;
         [Dependency] private readonly ITimerManager _timerManager = default!;
         [Dependency] private readonly IClientEntityManager _entityManager = default!;
+        [Dependency] private readonly IEntityLookup _lookup = default!;
         [Dependency] private readonly IPlacementManager _placementManager = default!;
         [Dependency] private readonly IClientGameStateManager _gameStateManager = default!;
         [Dependency] private readonly IOverlayManagerInternal _overlayManager = default!;
@@ -68,9 +67,6 @@ namespace Robust.Client
         [Dependency] private readonly IAuthManager _authManager = default!;
         [Dependency] private readonly IMidiManager _midiManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
-        [Dependency] private readonly IParallelManagerInternal _parallelMgr = default!;
-        [Dependency] private readonly ProfManager _prof = default!;
-        [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
 
         private IWebViewManagerHook? _webViewHook;
 
@@ -96,8 +92,7 @@ namespace Robust.Client
 
             _clyde.InitializePostWindowing();
             _clydeAudio.InitializePostWindowing();
-            _clyde.SetWindowTitle(
-                Options.DefaultWindowTitle ?? _resourceManifest!.DefaultWindowTitle ?? "RobustToolbox");
+            _clyde.SetWindowTitle(Options.DefaultWindowTitle ?? _resourceManifest!.DefaultWindowTitle ?? "RobustToolbox");
 
             _taskManager.Initialize();
             _fontManager.SetFontDpi((uint)_configurationManager.GetCVar(CVars.DisplayFontDpi));
@@ -108,8 +103,7 @@ namespace Robust.Client
             // Disable load context usage on content start.
             // This prevents Content.Client being loaded twice and things like csi blowing up because of it.
             _modLoader.SetUseLoadContext(!ContentStart);
-            var disableSandbox = Environment.GetEnvironmentVariable("ROBUST_DISABLE_SANDBOX") == "1";
-            _modLoader.SetEnableSandboxing(!disableSandbox && Options.Sandboxing);
+            _modLoader.SetEnableSandboxing(Options.Sandboxing);
 
             var assemblyPrefix = Options.ContentModulePrefix ?? _resourceManifest!.AssemblyPrefix ?? "Content.";
             if (!_modLoader.TryLoadModulesFrom(Options.AssemblyDirectory, assemblyPrefix))
@@ -138,9 +132,8 @@ namespace Robust.Client
             _inputManager.Initialize();
             _console.Initialize();
             _prototypeManager.Initialize();
-            _prototypeManager.LoadDirectory(new ResourcePath("/EnginePrototypes/"));
             _prototypeManager.LoadDirectory(Options.PrototypeDirectory);
-            _prototypeManager.ResolveResults();
+            _prototypeManager.Resync();
             _entityManager.Initialize();
             _mapManager.Initialize();
             _gameStateManager.Initialize();
@@ -165,7 +158,7 @@ namespace Robust.Client
             // Setup main loop
             if (_mainLoop == null)
             {
-                _mainLoop = new GameLoop(_gameTiming, _runtimeLog, _prof)
+                _mainLoop = new GameLoop(_gameTiming)
                 {
                     SleepMode = displayMode == DisplayMode.Headless ? SleepMode.Delay : SleepMode.None
                 };
@@ -205,7 +198,7 @@ namespace Robust.Client
 
             _clyde.Ready();
 
-            if (_resourceManifest!.AutoConnect &&
+            if (!Options.DisableCommandLineConnect &&
                 (_commandLineArgs?.Connect == true || _commandLineArgs?.Launcher == true)
                 && LaunchState.ConnectEndpoint != null)
             {
@@ -221,7 +214,7 @@ namespace Robust.Client
         {
             // Parses /manifest.yml for game-specific settings that cannot be exclusively set up by content code.
             if (!_resourceCache.TryContentFileRead("/manifest.yml", out var stream))
-                return new ResourceManifestData(Array.Empty<string>(), null, null, null, null, true);
+                return new ResourceManifestData(Array.Empty<string>(), null, null, null, null);
 
             var yamlStream = new YamlStream();
             using (stream)
@@ -231,7 +224,7 @@ namespace Robust.Client
             }
 
             if (yamlStream.Documents.Count == 0)
-                return new ResourceManifestData(Array.Empty<string>(), null, null, null, null, true);
+                return new ResourceManifestData(Array.Empty<string>(), null, null, null, null);
 
             if (yamlStream.Documents.Count != 1 || yamlStream.Documents[0].RootNode is not YamlMappingNode mapping)
             {
@@ -266,11 +259,7 @@ namespace Robust.Client
             if (mapping.TryGetNode("splashLogo", out var splashNode))
                 splashLogo = splashNode.AsString();
 
-            bool autoConnect = true;
-            if (mapping.TryGetNode("autoConnect", out var autoConnectNode))
-                autoConnect = autoConnectNode.AsBool();
-
-            return new ResourceManifestData(modules, assemblyPrefix, defaultWindowTitle, windowIconSet, splashLogo, autoConnect);
+            return new ResourceManifestData(modules, assemblyPrefix, defaultWindowTitle, windowIconSet, splashLogo);
         }
 
         internal bool StartupSystemSplash(GameControllerOptions options, Func<ILogHandler>? logHandlerFactory)
@@ -338,12 +327,6 @@ namespace Robust.Client
 
             ProfileOptSetup.Setup(_configurationManager);
 
-            _parallelMgr.Initialize();
-            _prof.Initialize();
-#if !FULL_RELEASE
-            _configurationManager.OverrideDefault(CVars.ProfEnabled, true);
-#endif
-
             _resourceCache.Initialize(Options.LoadConfigAndUserData ? userDataDir : null);
 
             var mountOptions = _commandLineArgs != null
@@ -464,127 +447,52 @@ namespace Robust.Client
 
         private void Input(FrameEventArgs frameEventArgs)
         {
-            using (_prof.Group("Input Events"))
-            {
-                _clyde.ProcessInput(frameEventArgs);
-            }
-
-            using (_prof.Group("Network"))
-            {
-                _networkManager.ProcessPackets();
-            }
-
-            using (_prof.Group("Async"))
-            {
-                _taskManager.ProcessPendingTasks(); // tasks like connect
-            }
+            _clyde.ProcessInput(frameEventArgs);
+            _networkManager.ProcessPackets();
+            _taskManager.ProcessPendingTasks(); // tasks like connect
         }
 
         private void Tick(FrameEventArgs frameEventArgs)
         {
-            using (_prof.Group("Content pre engine"))
-            {
-                _modLoader.BroadcastUpdate(ModUpdateLevel.PreEngine, frameEventArgs);
-            }
-
-            using (_prof.Group("Console"))
-            {
-                _console.CommandBufferExecute();
-            }
-
-            using (_prof.Group("Timers"))
-            {
-                _timerManager.UpdateTimers(frameEventArgs);
-            }
-
-            using (_prof.Group("Async"))
-            {
-                _taskManager.ProcessPendingTasks();
-            }
+            _modLoader.BroadcastUpdate(ModUpdateLevel.PreEngine, frameEventArgs);
+            _timerManager.UpdateTimers(frameEventArgs);
+            _taskManager.ProcessPendingTasks();
 
             // GameStateManager is in full control of the simulation update in multiplayer.
             if (_client.RunLevel == ClientRunLevel.InGame || _client.RunLevel == ClientRunLevel.Connected)
             {
-                using (_prof.Group("Game state"))
-                {
-                    _gameStateManager.ApplyGameState();
-                }
+                _gameStateManager.ApplyGameState();
             }
 
             // In singleplayer, however, we're in full control instead.
             else if (_client.RunLevel == ClientRunLevel.SinglePlayerGame)
             {
-                using (_prof.Group("Entity"))
-                {
-                    // The last real tick is the current tick! This way we won't be in "prediction" mode.
-                    _gameTiming.LastRealTick = _gameTiming.CurTick;
-                    _entityManager.TickUpdate(frameEventArgs.DeltaSeconds, noPredictions: false);
-                }
+                // The last real tick is the current tick! This way we won't be in "prediction" mode.
+                _gameTiming.LastRealTick = _gameTiming.CurTick;
+                _entityManager.TickUpdate(frameEventArgs.DeltaSeconds, noPredictions: false);
+                _lookup.Update();
             }
 
-            using (_prof.Group("Content post engine"))
-            {
-                _modLoader.BroadcastUpdate(ModUpdateLevel.PostEngine, frameEventArgs);
-            }
+            _modLoader.BroadcastUpdate(ModUpdateLevel.PostEngine, frameEventArgs);
         }
 
         private void Update(FrameEventArgs frameEventArgs)
         {
-            if (_webViewHook != null)
-            {
-                using (_prof.Group("WebView"))
-                {
-                    _webViewHook?.Update();
-                }
-            }
-
-            using (_prof.Group("ClydeAudio"))
-            {
-                _clydeAudio.FrameProcess(frameEventArgs);
-            }
-
-            using (_prof.Group("Clyde"))
-            {
-                _clyde.FrameProcess(frameEventArgs);
-            }
-
-            using (_prof.Group("Content Pre Engine"))
-            {
-                _modLoader.BroadcastUpdate(ModUpdateLevel.FramePreEngine, frameEventArgs);
-            }
-
-            using (_prof.Group("State"))
-            {
-                _stateManager.FrameUpdate(frameEventArgs);
-            }
+            _webViewHook?.Update();
+            _clydeAudio.FrameProcess(frameEventArgs);
+            _clyde.FrameProcess(frameEventArgs);
+            _modLoader.BroadcastUpdate(ModUpdateLevel.FramePreEngine, frameEventArgs);
+            _stateManager.FrameUpdate(frameEventArgs);
 
             if (_client.RunLevel >= ClientRunLevel.Connected)
             {
-                using (_prof.Group("Placement"))
-                {
-                    _placementManager.FrameUpdate(frameEventArgs);
-                }
-
-                using (_prof.Group("Entity"))
-                {
-                    _entityManager.FrameUpdate(frameEventArgs.DeltaSeconds);
-                }
+                _placementManager.FrameUpdate(frameEventArgs);
+                _entityManager.FrameUpdate(frameEventArgs.DeltaSeconds);
             }
 
-            using (_prof.Group("Overlay"))
-            {
-                _overlayManager.FrameUpdate(frameEventArgs);
-            }
-
-            using (_prof.Group("UI"))
-            {
-                _userInterfaceManager.FrameUpdate(frameEventArgs);
-            }
-
-            using (_prof.Group("Content Post Engine"))
-            {
-                _modLoader.BroadcastUpdate(ModUpdateLevel.FramePostEngine, frameEventArgs);
-            }
+            _overlayManager.FrameUpdate(frameEventArgs);
+            _userInterfaceManager.FrameUpdate(frameEventArgs);
+            _modLoader.BroadcastUpdate(ModUpdateLevel.FramePostEngine, frameEventArgs);
         }
 
         internal static void SetupLogging(ILogManager logManager, Func<ILogHandler> logHandlerFactory)
@@ -602,7 +510,7 @@ namespace Robust.Client
             logManager.GetSawmill("discord").Level = LogLevel.Warning;
             logManager.GetSawmill("net.predict").Level = LogLevel.Info;
             logManager.GetSawmill("szr").Level = LogLevel.Info;
-            logManager.GetSawmill("loc").Level = LogLevel.Warning;
+            logManager.GetSawmill("loc").Level = LogLevel.Error;
 
 #if DEBUG_ONLY_FCE_INFO
 #if DEBUG_ONLY_FCE_LOG
@@ -667,6 +575,7 @@ namespace Robust.Client
 
             _networkManager.Shutdown("Client shutting down");
             _midiManager.Shutdown();
+            IoCManager.Resolve<IEntityLookup>().Shutdown();
             _entityManager.Shutdown();
             _clyde.Shutdown();
             _clydeAudio.Shutdown();
@@ -677,8 +586,7 @@ namespace Robust.Client
             string? AssemblyPrefix,
             string? DefaultWindowTitle,
             string? WindowIconSet,
-            string? SplashLogo,
-            bool AutoConnect
+            string? SplashLogo
         );
     }
 }

Robust.Client/GameControllerOptions.cs

@@ -82,5 +82,10 @@ namespace Robust.Client
         ///     Whether to load config and user data.
         /// </summary>
         public bool LoadConfigAndUserData { get; init; } = true;
+
+        /// <summary>
+        ///     Whether to disable command line args server auto-connecting.
+        /// </summary>
+        public bool DisableCommandLineConnect { get; init; } = false;
     }
 }

Robust.Client/GameObjects/ClientComponentFactory.cs

@@ -1,3 +1,4 @@
+using Robust.Shared.Console;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -7,8 +8,8 @@ namespace Robust.Client.GameObjects
 {
     internal sealed class ClientComponentFactory : ComponentFactory
     {
-        public ClientComponentFactory(IDynamicTypeFactoryInternal typeFactory, IReflectionManager reflectionManager)
-            : base(typeFactory, reflectionManager)
+        public ClientComponentFactory(IDynamicTypeFactoryInternal typeFactory, IReflectionManager reflectionManager, IConsoleHost conHost)
+            : base(typeFactory, reflectionManager, conHost)
         {
             // Required for the engine to work
             RegisterIgnore("KeyBindingInput");

Robust.Client/GameObjects/ClientEntityManager.cs

@@ -27,6 +27,7 @@ namespace Robust.Client.GameObjects
         public override void Initialize()
         {
             SetupNetworking();
+            ReceivedComponentMessage += (_, compMsg) => DispatchComponentMessage(compMsg);
             ReceivedSystemMessage += (_, systemMsg) => EventBus.RaiseEvent(EventSource.Network, systemMsg);
 
             base.Initialize();
@@ -37,9 +38,9 @@ namespace Robust.Client.GameObjects
             return base.CreateEntity(prototypeName, uid);
         }
 
-        void IClientEntityManagerInternal.InitializeEntity(EntityUid entity, MetaDataComponent? meta)
+        void IClientEntityManagerInternal.InitializeEntity(EntityUid entity)
         {
-            base.InitializeEntity(entity, meta);
+            base.InitializeEntity(entity);
         }
 
         void IClientEntityManagerInternal.StartEntity(EntityUid entity)
@@ -51,6 +52,9 @@ namespace Robust.Client.GameObjects
 
         public override IEntityNetworkManager EntityNetManager => this;
 
+        /// <inheritdoc />
+        public event EventHandler<NetworkComponentMessage>? ReceivedComponentMessage;
+
         /// <inheritdoc />
         public event EventHandler<object>? ReceivedSystemMessage;
 
@@ -86,7 +90,7 @@ namespace Robust.Client.GameObjects
 
         public void SendSystemNetworkMessage(EntityEventArgs message, uint sequence)
         {
-            var msg = new MsgEntity();
+            var msg = _networkManager.CreateNetMessage<MsgEntity>();
             msg.Type = EntityMessageType.SystemMessage;
             msg.SystemMessage = message;
             msg.SourceTick = _gameTiming.CurTick;
@@ -101,6 +105,26 @@ namespace Robust.Client.GameObjects
             throw new NotSupportedException();
         }
 
+        /// <inheritdoc />
+        [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
+        public void SendComponentNetworkMessage(INetChannel? channel, EntityUid entity, IComponent component, ComponentMessage message)
+        {
+            var componentType = component.GetType();
+            var netId = ComponentFactory.GetRegistration(componentType).NetID;
+
+            if (!netId.HasValue)
+                throw new ArgumentException($"Component {componentType} does not have a NetID.", nameof(component));
+
+            var msg = _networkManager.CreateNetMessage<MsgEntity>();
+            msg.Type = EntityMessageType.ComponentMessage;
+            msg.EntityUid = entity;
+            msg.NetId = netId.Value;
+            msg.ComponentMessage = message;
+            msg.SourceTick = _gameTiming.CurTick;
+
+            _networkManager.ClientSendMessage(msg);
+        }
+
         private void HandleEntityNetworkMessage(MsgEntity message)
         {
             if (message.SourceTick <= _gameStateManager.CurServerTick)
@@ -119,6 +143,10 @@ namespace Robust.Client.GameObjects
         {
             switch (message.Type)
             {
+                case EntityMessageType.ComponentMessage:
+                    ReceivedComponentMessage?.Invoke(this, new NetworkComponentMessage(message));
+                    return;
+
                 case EntityMessageType.SystemMessage:
                     var msg = message.SystemMessage;
                     var sessionType = typeof(EntitySessionMessage<>).MakeGenericType(msg.GetType());

Robust.Client/GameObjects/Components/Icon/IconComponent.cs

@@ -1,4 +1,3 @@
-using System;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.Utility;
@@ -33,13 +32,11 @@ namespace Robust.Client.GameObjects
         public const string LogCategory = "go.comp.icon";
         const string SerializationCache = "icon";
 
-        [Obsolete("Use SpriteSystem instead.")]
         private static IRsiStateLike TextureForConfig(IconComponent compData, IResourceCache resourceCache)
         {
             return compData.Icon?.Default ?? resourceCache.GetFallback<TextureResource>().Texture;
         }
 
-        [Obsolete("Use SpriteSystem instead.")]
         public static IRsiStateLike? GetPrototypeIcon(EntityPrototype prototype, IResourceCache resourceCache)
         {
             if (!prototype.Components.TryGetValue("Icon", out var compData))
@@ -47,7 +44,7 @@ namespace Robust.Client.GameObjects
                 return null;
             }
 
-            return TextureForConfig((IconComponent)compData.Component, resourceCache);
+            return TextureForConfig((IconComponent)compData, resourceCache);
         }
     }
 }

Robust.Client/GameObjects/Components/Light/ClientOccluderComponent.cs

@@ -8,7 +8,7 @@ using Robust.Shared.ViewVariables;
 namespace Robust.Client.GameObjects
 {
     [ComponentReference(typeof(OccluderComponent))]
-    public sealed class ClientOccluderComponent : OccluderComponent
+    internal sealed class ClientOccluderComponent : OccluderComponent
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
@@ -71,29 +71,13 @@ namespace Robust.Client.GameObjects
         {
             Occluding = OccluderDir.None;
 
-            if (Deleted)
-                return;
-
-            // Content may want to override the default behavior for occlusion.
-            var xform = _entityManager.GetComponent<TransformComponent>(Owner);
-            var ev = new OccluderDirectionsEvent
+            if (Deleted || !_entityManager.GetComponent<TransformComponent>(Owner).Anchored)
             {
-                Component = xform,
-            };
-
-            _entityManager.EventBus.RaiseLocalEvent(Owner, ref ev);
-
-            if (ev.Handled)
-            {
-                Occluding = ev.Directions;
                 return;
             }
 
-            if (!xform.Anchored)
-                return;
-
-            var grid = _mapManager.GetGrid(xform.GridID);
-            var position = xform.Coordinates;
+            var grid = _mapManager.GetGrid(_entityManager.GetComponent<TransformComponent>(Owner).GridID);
+            var position = _entityManager.GetComponent<TransformComponent>(Owner).Coordinates;
             void CheckDir(Direction dir, OccluderDir oclDir)
             {
                 foreach (var neighbor in grid.GetInDir(position, dir))
@@ -106,7 +90,7 @@ namespace Robust.Client.GameObjects
                 }
             }
 
-            var angle = xform.LocalRotation;
+            var angle = _entityManager.GetComponent<TransformComponent>(Owner).LocalRotation;
             var dirRolling = angle.GetCardinalDir();
             // dirRolling starts at effective south
 
@@ -121,28 +105,15 @@ namespace Robust.Client.GameObjects
 
             CheckDir(dirRolling, OccluderDir.East);
         }
-    }
 
-    [Flags]
-    public enum OccluderDir : byte
-    {
-        None = 0,
-        North = 1,
-        East = 1 << 1,
-        South = 1 << 2,
-        West = 1 << 3,
-    }
-
-    /// <summary>
-    /// Raised by occluders when trying to get occlusion directions.
-    /// </summary>
-    [ByRefEvent]
-    public struct OccluderDirectionsEvent
-    {
-        public bool Handled = false;
-        public OccluderDir Directions = OccluderDir.None;
-        public TransformComponent Component = default!;
-
-        public OccluderDirectionsEvent() {}
+        [Flags]
+        internal enum OccluderDir : byte
+        {
+            None = 0,
+            North = 1,
+            East = 1 << 1,
+            South = 1 << 2,
+            West = 1 << 3,
+        }
     }
 }

Robust.Client/GameObjects/Components/Light/PointLightComponent.cs

@@ -11,7 +11,7 @@ namespace Robust.Client.GameObjects
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedPointLightComponent))]
-    public sealed class PointLightComponent : SharedPointLightComponent
+    public sealed class PointLightComponent : SharedPointLightComponent, ISerializationHooks
     {
         [Dependency] private readonly IEntityManager _entityManager = default!;
 

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

@@ -25,8 +25,6 @@ namespace Robust.Client.GameObjects
         [Animatable]
         Vector2 Scale { get; set; }
 
-        Box2 Bounds { get; }
-
         /// <summary>
         ///     A rotation applied to all layers.
         /// </summary>
@@ -121,8 +119,7 @@ namespace Robust.Client.GameObjects
         ///     This is useful to allow layer map configs to be defined in prototypes,
         ///     while still allowing code to create configs if they're absent.
         /// </remarks>
-        /// <returns>Index of the new layer.</returns>
-        int LayerMapReserveBlank(object key);
+        void LayerMapReserveBlank(object key);
 
         /// <summary>
         ///     Adds a layer without texture (thus falling back to the error texture).
@@ -148,8 +145,8 @@ namespace Robust.Client.GameObjects
         void RemoveLayer(int layer);
         void RemoveLayer(object layerKey);
 
-        void LayerSetShader(int layer, ShaderInstance shader, string? prototype = null);
-        void LayerSetShader(object layerKey, ShaderInstance shader, string? prototype = null);
+        void LayerSetShader(int layer, ShaderInstance shader);
+        void LayerSetShader(object layerKey, ShaderInstance shader);
         void LayerSetShader(int layer, string shaderName);
         void LayerSetShader(object layerKey, string shaderName);
 
@@ -220,8 +217,8 @@ namespace Robust.Client.GameObjects
         int GetLayerDirectionCount(ISpriteLayer layer);
 
         /// <summary>
-        ///     Calculate the rotated sprite bounding box in world-space coordinates.
+        ///     Calculate sprite bounding box in world-space coordinates.
         /// </summary>
-        Box2Rotated CalculateRotatedBoundingBox(Vector2 worldPosition, Angle worldRotation, IEye? eye = null);
+        Box2 CalculateBoundingBox(Vector2 worldPos);
     }
 }

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

@@ -25,6 +25,8 @@ namespace Robust.Client.GameObjects
 
         RSI.State.Direction EffectiveDirection(Angle worldRotation);
 
+        Vector2 LocalToLayer(Vector2 localPos);
+
         /// <summary>
         ///     Layer size in pixels.
         ///     Don't account layer scale or sprite world transform.

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

@@ -82,18 +82,12 @@ namespace Robust.Client.GameObjects
             {
                 var localAABB = _entityManager.GetComponent<TransformComponent>(comp.Owner).InvWorldMatrix.TransformBox(viewport);
 
-                foreach (var (sprite, xform) in comp.SpriteTree.QueryAabb(localAABB))
+                foreach (var sprite in comp.SpriteTree.QueryAabb(localAABB))
                 {
-                    var (worldPos, worldRot) = xform.GetWorldPositionRotation();
-                    var bounds = sprite.CalculateRotatedBoundingBox(worldPos, worldRot);
-
-                    // Get scaled down bounds used to indicate the "south" of a sprite.
-                    var localBound = bounds.Box;
-                    var smallLocal = localBound.Scale(0.2f).Translated(-new Vector2(0f, localBound.Extents.Y));
-                    var southIndicator = new Box2Rotated(smallLocal, bounds.Rotation, bounds.Origin);
-
+                    var worldPos = _entityManager.GetComponent<TransformComponent>(sprite.Owner).WorldPosition;
+                    var bounds = sprite.CalculateBoundingBox(worldPos);
                     handle.DrawRect(bounds, Color.Red.WithAlpha(0.2f));
-                    handle.DrawRect(southIndicator, Color.Blue.WithAlpha(0.5f));
+                    handle.DrawRect(bounds.Scale(0.2f).Translated(-new Vector2(0f, bounds.Extents.Y)), Color.Blue.WithAlpha(0.5f));
                 }
             }
         }

Robust.Client/GameObjects/Components/RenderingTreeComponent.cs

@@ -6,7 +6,7 @@ namespace Robust.Client.GameObjects
     [RegisterComponent]
     public sealed class RenderingTreeComponent : Component
     {
-        internal DynamicTree<ComponentTreeEntry<SpriteComponent>> SpriteTree { get; set; } = default!;
-        internal DynamicTree<ComponentTreeEntry<PointLightComponent>> LightTree { get; set; } = default!;
+        internal DynamicTree<SpriteComponent> SpriteTree { get; set; } = default!;
+        internal DynamicTree<PointLightComponent> LightTree { get; set; } = default!;
     }
 }

Robust.Client/GameObjects/Components/UserInterface/ClientUserInterfaceComponent.cs

@@ -75,10 +75,6 @@ namespace Robust.Client.GameObjects
                 (BoundUserInterface) _dynamicTypeFactory.CreateInstance(type, new[] {this, wrapped.UiKey});
             boundInterface.Open();
             _openInterfaces[wrapped.UiKey] = boundInterface;
-
-            var playerSession = _playerManager.LocalPlayer?.Session;
-            if(playerSession != null)
-                _entityManager.EventBus.RaiseLocalEvent(Owner, new BoundUIOpenedEvent(wrapped.UiKey, Owner, playerSession));
         }
 
         internal void Close(object uiKey, bool remoteCall)

Robust.Client/GameObjects/EntitySystems/AppearanceSystem.cs

@@ -1,14 +1,12 @@
-using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
-using Robust.Shared;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 
 namespace Robust.Client.GameObjects
 {
     [UsedImplicitly]
-    public sealed class AppearanceSystem : SharedAppearanceSystem
+    internal sealed class AppearanceSystem : SharedAppearanceSystem
     {
         private readonly Queue<ClientAppearanceComponent> _queuedUpdates = new();
 
@@ -52,33 +50,10 @@ namespace Robust.Client.GameObjects
 
             if (!stateDiff) return;
 
-            component.AppearanceData = CloneAppearanceData(actualState.Data);
+            component.AppearanceData = actualState.Data;
             MarkDirty(component);
         }
 
-        /// <summary>
-        ///     Take in an appearance data dictionary and attempt to clone it.
-        /// </summary>
-        /// <remarks>
-        ///     As some appearance data values are not simple value-type objects, this is not just a shallow clone.
-        /// </remarks>
-        private Dictionary<object, object> CloneAppearanceData(Dictionary<object, object> data)
-        {
-            Dictionary<object, object> newDict = new(data.Count);
-
-            foreach (var (key, value) in data)
-            {
-                if (value.GetType().IsValueType)
-                    newDict[key] = value;
-                else if (value is ICloneable cloneable)
-                    newDict[key] = cloneable.Clone();
-                else
-                    throw new NotSupportedException("Invalid object in appearance data dictionary. Appearance data must be cloneable");
-            }
-
-            return newDict;
-        }
-
         public override void MarkDirty(AppearanceComponent component)
         {
             if (component.AppearanceDirty)
@@ -95,21 +70,17 @@ namespace Robust.Client.GameObjects
 
         public override void FrameUpdate(float frameTime)
         {
-            var spriteQuery = GetEntityQuery<SpriteComponent>();
             while (_queuedUpdates.TryDequeue(out var appearance))
             {
                 if (appearance.Deleted)
                     continue;
 
-                // Sprite comp is allowed to be null, so that things like spriteless point-lights can use this system
-                spriteQuery.TryGetComponent(appearance.Owner, out var sprite);
-
-                OnChangeData(appearance.Owner, sprite, appearance);
+                OnChangeData(appearance.Owner, appearance);
                 UnmarkDirty(appearance);
             }
         }
 
-        public void OnChangeData(EntityUid uid, SpriteComponent? sprite, ClientAppearanceComponent? appearanceComponent = null)
+        public void OnChangeData(EntityUid uid, ClientAppearanceComponent? appearanceComponent = null)
         {
             if (!Resolve(uid, ref appearanceComponent, false)) return;
 
@@ -117,7 +88,6 @@ namespace Robust.Client.GameObjects
             {
                 Component = appearanceComponent,
                 AppearanceData = appearanceComponent.AppearanceData,
-                Sprite = sprite,
             };
 
             // Give it AppearanceData so we can still keep the friend attribute on the component.
@@ -137,8 +107,7 @@ namespace Robust.Client.GameObjects
     [ByRefEvent]
     public struct AppearanceChangeEvent
     {
-        public AppearanceComponent Component;
-        public IReadOnlyDictionary<object, object> AppearanceData;
-        public SpriteComponent? Sprite;
+        public AppearanceComponent Component = default!;
+        public IReadOnlyDictionary<object, object> AppearanceData = default!;
     }
 }

Robust.Client/GameObjects/EntitySystems/AudioSystem.cs

@@ -144,94 +144,75 @@ namespace Robust.Client.GameObjects
                         {
                             stream.Source.SetVolume(-10000000);
                         }
-                        else if (stream.Attenuation == Attenuation.NoAttenuation)
+                        else
                         {
-                            //TODO: OpenAL supports positional audio together with no attenuation, we should do too.
-                            if (!stream.Source.SetPosition(ourPos))
+                            var sourceRelative = ourPos - pos.Position;
+                            var occlusion = 0f;
+                            if (sourceRelative.Length > 0)
+                            {
+                                occlusion = _broadPhaseSystem.IntersectRayPenetration(
+                                    pos.MapId,
+                                    new CollisionRay(
+                                        pos.Position,
+                                        sourceRelative.Normalized,
+                                        OcclusionCollisionMask),
+                                    sourceRelative.Length,
+                                    stream.TrackingEntity);
+                            }
+
+                            var distance = MathF.Max(stream.ReferenceDistance, MathF.Min(sourceRelative.Length, stream.MaxDistance));
+                            float gain;
+
+                            // Technically these are formulas for gain not decibels but EHHHHHHHH.
+                            switch (stream.Attenuation)
+                            {
+                                case Attenuation.Default:
+                                    gain = 1f;
+                                    break;
+                                // You thought I'd implement clamping per source? Hell no that's just for the overall OpenAL setting
+                                // I didn't even wanna implement this much for linear but figured it'd be cleaner.
+                                case Attenuation.InverseDistanceClamped:
+                                case Attenuation.InverseDistance:
+                                    gain = stream.ReferenceDistance /
+                                           (stream.ReferenceDistance + stream.RolloffFactor * (distance - stream.ReferenceDistance));
+
+                                    break;
+                                case Attenuation.LinearDistanceClamped:
+                                case Attenuation.LinearDistance:
+                                    gain = 1f - stream.RolloffFactor * (distance - stream.ReferenceDistance) /
+                                        (stream.MaxDistance - stream.ReferenceDistance);
+
+                                    break;
+                                case Attenuation.ExponentDistanceClamped:
+                                case Attenuation.ExponentDistance:
+                                    gain = MathF.Pow((distance / stream.ReferenceDistance),
+                                        (-stream.RolloffFactor));
+                                    break;
+                                default:
+                                    throw new ArgumentOutOfRangeException($"No implemented attenuation for {stream.Attenuation.ToString()}");
+                            }
+
+                            var volume = MathF.Pow(10, stream.Volume / 10);
+                            var actualGain = MathF.Max(0f, volume * gain);
+
+                            stream.Source.SetVolumeDirect(actualGain);
+                            stream.Source.SetOcclusion(occlusion);
+                        }
+
+                        SetAudioPos(stream, stream.Attenuation != Attenuation.NoAttenuation ? pos.Position : ourPos);
+
+                        void SetAudioPos(PlayingStream stream, Vector2 pos)
+                        {
+                            if (!stream.Source.SetPosition(pos))
                             {
                                 Logger.Warning("Interrupting positional audio, can't set position.");
                                 stream.Source.StopPlaying();
                             }
                         }
-                        else
+
+                        if (stream.TrackingEntity != default)
                         {
-                            var sourceRelative = ourPos - pos.Position;
-                            // OpenAL uses MaxDistance to limit how much attenuation can *reduce* the gain,
-                            // and doesn't do any culling. We however cull based on MaxDistance, because
-                            // this is what all current code that uses MaxDistance expects and because
-                            // we don't need the OpenAL behaviour.
-                            if (sourceRelative.Length > stream.MaxDistance)
-                            {
-                                stream.Source.SetVolume(-10000000);
-                            }
-                            else
-                            {
-                                var occlusion = 0f;
-                                if (sourceRelative.Length > 0)
-                                {
-                                    occlusion = _broadPhaseSystem.IntersectRayPenetration(
-                                        pos.MapId,
-                                        new CollisionRay(
-                                            pos.Position,
-                                            sourceRelative.Normalized,
-                                            OcclusionCollisionMask),
-                                        sourceRelative.Length,
-                                        stream.TrackingEntity);
-                                }
-
-                                // OpenAL also limits the distance to <= AL_MAX_DISTANCE, but since we cull
-                                // sources that are further away than stream.MaxDistance, we don't do that.
-                                var distance = MathF.Max(stream.ReferenceDistance, sourceRelative.Length);
-                                float gain;
-
-                                // Technically these are formulas for gain not decibels but EHHHHHHHH.
-                                switch (stream.Attenuation)
-                                {
-                                    case Attenuation.Default:
-                                        gain = 1f;
-                                        break;
-                                    // You thought I'd implement clamping per source? Hell no that's just for the overall OpenAL setting
-                                    // I didn't even wanna implement this much for linear but figured it'd be cleaner.
-                                    case Attenuation.InverseDistanceClamped:
-                                    case Attenuation.InverseDistance:
-                                        gain = stream.ReferenceDistance /
-                                               (stream.ReferenceDistance + stream.RolloffFactor *
-                                                   (distance - stream.ReferenceDistance));
-
-                                        break;
-                                    case Attenuation.LinearDistanceClamped:
-                                    case Attenuation.LinearDistance:
-                                        gain = 1f - stream.RolloffFactor * (distance - stream.ReferenceDistance) /
-                                            (stream.MaxDistance - stream.ReferenceDistance);
-
-                                        break;
-                                    case Attenuation.ExponentDistanceClamped:
-                                    case Attenuation.ExponentDistance:
-                                        gain = MathF.Pow((distance / stream.ReferenceDistance),
-                                            (-stream.RolloffFactor));
-                                        break;
-                                    default:
-                                        throw new ArgumentOutOfRangeException(
-                                            $"No implemented attenuation for {stream.Attenuation.ToString()}");
-                                }
-
-                                var volume = MathF.Pow(10, stream.Volume / 10);
-                                var actualGain = MathF.Max(0f, volume * gain);
-
-                                stream.Source.SetVolumeDirect(actualGain);
-                                stream.Source.SetOcclusion(occlusion);
-
-                                if (!stream.Source.SetPosition(pos.Position))
-                                {
-                                    Logger.Warning("Interrupting positional audio, can't set position.");
-                                    stream.Source.StopPlaying();
-                                }
-
-                                if (stream.TrackingEntity != default)
-                                {
-                                    stream.Source.SetVelocity(stream.TrackingEntity.GlobalLinearVelocity());
-                                }
-                            }
+                            stream.Source.SetVelocity(stream.TrackingEntity.GlobalLinearVelocity());
                         }
                     }
                 }
@@ -285,7 +266,6 @@ namespace Robust.Client.GameObjects
 
             source.SetGlobal();
             source.StartPlaying();
-            // These defaults differ from AudioParams.Default
             var playing = new PlayingStream
             {
                 Source = source,

Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs

@@ -1,10 +1,12 @@
 using System.Collections.Generic;
+using System.Linq;
 using JetBrains.Annotations;
 using Robust.Client.Physics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Utility;
 
 namespace Robust.Client.GameObjects
 {
@@ -31,10 +33,9 @@ namespace Robust.Client.GameObjects
             UpdatesAfter.Add(typeof(TransformSystem));
             UpdatesAfter.Add(typeof(PhysicsSystem));
 
-            SubscribeLocalEvent<OccluderDirtyEvent>(OnOccluderDirty);
+            SubscribeLocalEvent<OccluderDirtyEvent>(HandleDirtyEvent);
 
-            SubscribeLocalEvent<ClientOccluderComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-            SubscribeLocalEvent<ClientOccluderComponent, ReAnchorEvent>(OnReAnchor);
+            SubscribeLocalEvent<ClientOccluderComponent, AnchorStateChangedEvent>(HandleAnchorChanged);
         }
 
         public override void FrameUpdate(float frameTime)
@@ -61,58 +62,51 @@ namespace Robust.Client.GameObjects
             }
         }
 
-        private static void OnAnchorChanged(EntityUid uid, ClientOccluderComponent component, ref AnchorStateChangedEvent args)
+        private static void HandleAnchorChanged(EntityUid uid, ClientOccluderComponent component, ref AnchorStateChangedEvent args)
         {
             component.AnchorStateChanged();
         }
 
-        private void OnReAnchor(EntityUid uid, ClientOccluderComponent component, ref ReAnchorEvent args)
-        {
-            component.AnchorStateChanged();
-        }
-
-        private void OnOccluderDirty(OccluderDirtyEvent ev)
+        private void HandleDirtyEvent(OccluderDirtyEvent ev)
         {
             var sender = ev.Sender;
-            IMapGrid? grid;
-            var occluderQuery = GetEntityQuery<ClientOccluderComponent>();
-
             if (EntityManager.EntityExists(sender) &&
-                occluderQuery.HasComponent(sender))
+                EntityManager.TryGetComponent(sender, out ClientOccluderComponent? iconSmooth)
+                && iconSmooth.Initialized)
             {
                 var xform = EntityManager.GetComponent<TransformComponent>(sender);
-                if (!_mapManager.TryGetGrid(xform.GridID, out grid))
+                if (!_mapManager.TryGetGrid(xform.GridID, out var grid1))
                     return;
 
                 var coords = xform.Coordinates;
-                var localGrid = grid.TileIndicesFor(coords);
 
                 _dirtyEntities.Enqueue(sender);
-                AddValidEntities(grid.GetAnchoredEntitiesEnumerator(localGrid + new Vector2i(0, 1)), occluderQuery);
-                AddValidEntities(grid.GetAnchoredEntitiesEnumerator(localGrid + new Vector2i(0, -1)), occluderQuery);
-                AddValidEntities(grid.GetAnchoredEntitiesEnumerator(localGrid + new Vector2i(1, 0)), occluderQuery);
-                AddValidEntities(grid.GetAnchoredEntitiesEnumerator(localGrid + new Vector2i(-1, 0)), occluderQuery);
+                AddValidEntities(grid1.GetInDir(coords, Direction.North));
+                AddValidEntities(grid1.GetInDir(coords, Direction.South));
+                AddValidEntities(grid1.GetInDir(coords, Direction.East));
+                AddValidEntities(grid1.GetInDir(coords, Direction.West));
             }
 
             // Entity is no longer valid, update around the last position it was at.
-            else if (ev.LastPosition.HasValue && _mapManager.TryGetGrid(ev.LastPosition.Value.grid, out grid))
+            else if (ev.LastPosition.HasValue && _mapManager.TryGetGrid(ev.LastPosition.Value.grid, out var grid))
             {
                 var pos = ev.LastPosition.Value.pos;
 
-                AddValidEntities(grid.GetAnchoredEntitiesEnumerator(pos + new Vector2i(0, 1)), occluderQuery);
-                AddValidEntities(grid.GetAnchoredEntitiesEnumerator(pos + new Vector2i(0, -1)), occluderQuery);
-                AddValidEntities(grid.GetAnchoredEntitiesEnumerator(pos + new Vector2i(1, 0)), occluderQuery);
-                AddValidEntities(grid.GetAnchoredEntitiesEnumerator(pos + new Vector2i(-1, 0)), occluderQuery);
+                AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(1, 0)));
+                AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(-1, 0)));
+                AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(0, 1)));
+                AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(0, -1)));
             }
         }
 
-        private void AddValidEntities(AnchoredEntitiesEnumerator enumerator, EntityQuery<ClientOccluderComponent> occluderQuery)
+        private void AddValidEntities(IEnumerable<EntityUid> candidates)
         {
-            while (enumerator.MoveNext(out var entity))
+            foreach (var entity in candidates)
             {
-                if (!occluderQuery.HasComponent(entity.Value)) continue;
-
-                _dirtyEntities.Enqueue(entity.Value);
+                if (EntityManager.HasComponent<ClientOccluderComponent>(entity))
+                {
+                    _dirtyEntities.Enqueue(entity);
+                }
             }
         }
     }

Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Robust.Shared.Collections;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
@@ -26,12 +25,18 @@ namespace Robust.Client.GameObjects
         {
             base.Initialize();
 
+            SubscribeLocalEvent<UpdateContainerOcclusionMessage>(UpdateContainerOcclusion);
             SubscribeLocalEvent<EntityInitializedMessage>(HandleEntityInitialized);
             SubscribeLocalEvent<ContainerManagerComponent, ComponentHandleState>(HandleComponentState);
 
             UpdatesBefore.Add(typeof(SpriteSystem));
         }
 
+        private void UpdateContainerOcclusion(UpdateContainerOcclusionMessage ev)
+        {
+            _updateQueue.Add(ev.Entity);
+        }
+
         private void HandleEntityInitialized(EntityInitializedMessage ev)
         {
             if (!ExpectedEntities.TryGetValue(ev.Entity, out var container))
@@ -51,26 +56,24 @@ namespace Robust.Client.GameObjects
                 return;
 
             // Delete now-gone containers.
-            var toDelete = new ValueList<string>();
+            List<string>? toDelete = null;
             foreach (var (id, container) in component.Containers)
             {
-                // TODO: This is usually O(n^2) to the amount of containers.
-                foreach (var stateContainer in cast.ContainerSet)
+                if (!cast.ContainerSet.Any(data => data.Id == id))
                 {
-                    if (stateContainer.Id == id)
-                        goto skip;
+                    container.EmptyContainer(true, entMan: EntityManager);
+                    container.Shutdown();
+                    toDelete ??= new List<string>();
+                    toDelete.Add(id);
                 }
-
-                container.EmptyContainer(true, entMan: EntityManager);
-                container.Shutdown();
-                toDelete.Add(id);
-
-                skip: ;
             }
 
-            foreach (var dead in toDelete)
+            if (toDelete != null)
             {
-                component.Containers.Remove(dead);
+                foreach (var dead in toDelete)
+                {
+                    component.Containers.Remove(dead);
+                }
             }
 
             // Add new containers and update existing contents.
@@ -88,33 +91,37 @@ namespace Robust.Client.GameObjects
                 container.OccludesLight = occludesLight;
 
                 // Remove gone entities.
-                var toRemove = new ValueList<EntityUid>();
+                List<EntityUid>? toRemove = null;
                 foreach (var entity in container.ContainedEntities)
                 {
                     if (!entityUids.Contains(entity))
                     {
+                        toRemove ??= new List<EntityUid>();
                         toRemove.Add(entity);
                     }
                 }
 
-                foreach (var goner in toRemove)
+                if (toRemove != null)
                 {
-                    container.Remove(goner);
+                    foreach (var goner in toRemove)
+                        container.Remove(goner);
                 }
 
                 // Remove entities that were expected, but have been removed from the container.
-                var removedExpected = new ValueList<EntityUid>();
+                List<EntityUid>? removedExpected = null;
                 foreach (var entityUid in container.ExpectedEntities)
                 {
                     if (!entityUids.Contains(entityUid))
                     {
+                        removedExpected ??= new List<EntityUid>();
                         removedExpected.Add(entityUid);
                     }
                 }
 
-                foreach (var entityUid in removedExpected)
+                if (removedExpected != null)
                 {
-                    RemoveExpectedEntity(entityUid);
+                    foreach (var entityUid in removedExpected)
+                        RemoveExpectedEntity(entityUid);
                 }
 
                 // Add new entities.
@@ -145,14 +152,9 @@ namespace Robust.Client.GameObjects
             }
         }
 
-        protected override void OnParentChanged(ref EntParentChangedMessage message)
+        protected override void HandleParentChanged(ref EntParentChangedMessage message)
         {
-            base.OnParentChanged(ref message);
-
-            var xform = Transform(message.Entity);
-
-            if (xform.MapID != MapId.Nullspace)
-                _updateQueue.Add(message.Entity);
+            base.HandleParentChanged(ref message);
 
             // If an entity warped in from null-space (i.e., re-entered PVS) and got attached to a container, do the same checks as for newly initialized entities.
             if (message.OldParent != null && message.OldParent.Value.IsValid())
@@ -161,12 +163,12 @@ namespace Robust.Client.GameObjects
             if (!ExpectedEntities.TryGetValue(message.Entity, out var container))
                 return;
 
-            if (xform.ParentUid != container.Owner)
+            if (Transform(message.Entity).ParentUid != container.Owner)
             {
                 // This container is expecting an entity... but it got parented to some other entity???
                 // Ah well, the sever should send a new container state that updates expected entities so just ignore it for now.
                 return;
-            }
+            }    
 
             RemoveExpectedEntity(message.Entity);
 
@@ -208,101 +210,68 @@ namespace Robust.Client.GameObjects
         public override void FrameUpdate(float frameTime)
         {
             base.FrameUpdate(frameTime);
-            var pointQuery = EntityManager.GetEntityQuery<PointLightComponent>();
-            var spriteQuery = EntityManager.GetEntityQuery<SpriteComponent>();
-            var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
 
             foreach (var toUpdate in _updateQueue)
             {
-                if (Deleted(toUpdate))
+                if (EntityManager.Deleted(toUpdate))
+                {
                     continue;
+                }
 
-                UpdateEntityRecursively(toUpdate, xformQuery, pointQuery, spriteQuery);
+                UpdateEntityRecursively(toUpdate);
             }
 
             _updateQueue.Clear();
         }
 
-        private void UpdateEntityRecursively(
-            EntityUid entity,
-            EntityQuery<TransformComponent> xformQuery,
-            EntityQuery<PointLightComponent> pointQuery,
-            EntityQuery<SpriteComponent> spriteQuery)
+        private void UpdateEntityRecursively(EntityUid entity)
         {
-            // Recursively go up parents and containers to see whether both sprites and lights need to be occluded
-            // Could maybe optimise this more by checking nearest parent that has sprite / light and whether it's container
-            // occluded but this probably isn't a big perf issue.
-            var xform = xformQuery.GetComponent(entity);
-            var parent = xform.ParentUid;
-            var child = entity;
-            var spriteOccluded = false;
-            var lightOccluded = false;
+            // TODO: Since we are recursing down,
+            // we could cache ShowContents data here to speed it up for children.
+            // Am lazy though.
+            UpdateEntity(entity);
 
-            while (parent.IsValid() && (!spriteOccluded || !lightOccluded))
+            foreach (var child in EntityManager.GetComponent<TransformComponent>(entity).Children)
             {
-                var parentXform = xformQuery.GetComponent(parent);
-                if (TryComp<ContainerManagerComponent>(parent, out var manager) && manager.TryGetContainer(child, out var container))
-                {
-                    spriteOccluded = spriteOccluded || !container.ShowContents;
-                    lightOccluded = lightOccluded || container.OccludesLight;
-                }
-
-                child = parent;
-                parent = parentXform.ParentUid;
+                UpdateEntityRecursively(child.Owner);
             }
-
-            // Alright so
-            // This is the CBT bit.
-            // The issue is we need to go through the children and re-check whether they are or are not contained.
-            // if they are contained then the occlusion values may need updating for all those children
-            UpdateEntity(entity, xform, xformQuery, pointQuery, spriteQuery, spriteOccluded, lightOccluded);
         }
 
-        private void UpdateEntity(
-            EntityUid entity,
-            TransformComponent xform,
-            EntityQuery<TransformComponent> xformQuery,
-            EntityQuery<PointLightComponent> pointQuery,
-            EntityQuery<SpriteComponent> spriteQuery,
-            bool spriteOccluded,
-            bool lightOccluded)
+        private void UpdateEntity(EntityUid entity)
         {
-            if (spriteQuery.TryGetComponent(entity, out var sprite))
+            if (EntityManager.TryGetComponent(entity, out SpriteComponent? sprite))
             {
-                sprite.ContainerOccluded = spriteOccluded;
-            }
+                sprite.ContainerOccluded = false;
 
-            if (pointQuery.TryGetComponent(entity, out var light))
-            {
-                light.ContainerOccluded = lightOccluded;
-            }
-
-            var childEnumerator = xform.ChildEnumerator;
-
-            // Try to avoid TryComp if we already know stuff is occluded.
-            if ((!spriteOccluded || !lightOccluded) && TryComp<ContainerManagerComponent>(entity, out var manager))
-            {
-                while (childEnumerator.MoveNext(out var child))
+                // We have to recursively scan for containers upwards in case of nested containers.
+                var tempParent = entity;
+                while (tempParent.TryGetContainer(out var container))
                 {
-                    // Thank god it's by value and not by ref.
-                    var childSpriteOccluded = spriteOccluded;
-                    var childLightOccluded = lightOccluded;
-
-                    // We already know either sprite or light is not occluding so need to check container.
-                    if (manager.TryGetContainer(child.Value, out var container))
+                    if (!container.ShowContents)
                     {
-                        childSpriteOccluded = childSpriteOccluded || !container.ShowContents;
-                        childLightOccluded = childLightOccluded || container.OccludesLight;
+                        sprite.ContainerOccluded = true;
+                        break;
                     }
 
-                    UpdateEntity(child.Value, xformQuery.GetComponent(child.Value), xformQuery, pointQuery, spriteQuery, childSpriteOccluded, childLightOccluded);
+                    tempParent = container.Owner;
                 }
             }
-            else
+
+            if (EntityManager.TryGetComponent(entity, out PointLightComponent? light))
             {
-                while (childEnumerator.MoveNext(out var child))
+                light.ContainerOccluded = false;
+
+                // We have to recursively scan for containers upwards in case of nested containers.
+                var tempParent = entity;
+                while (tempParent.TryGetContainer(out var container))
                 {
-                    UpdateEntity(child.Value, xformQuery.GetComponent(child.Value), xformQuery, pointQuery, spriteQuery, spriteOccluded, lightOccluded);
+                    if (container.OccludesLight)
+                    {
+                        light.ContainerOccluded = true;
+                        break;
+                    }
+
+                    tempParent = container.Owner;
                 }
             }
         }

Robust.Client/GameObjects/EntitySystems/DebugEntityLookupSystem.cs

@@ -1,105 +0,0 @@
-using System.Collections.Generic;
-using Robust.Client.Graphics;
-using Robust.Shared.Console;
-using Robust.Shared.Containers;
-using Robust.Shared.Enums;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Utility;
-using Color = Robust.Shared.Maths.Color;
-
-namespace Robust.Client.GameObjects;
-
-public sealed class DebugEntityLookupCommand : IConsoleCommand
-{
-    public string Command => "togglelookup";
-    public string Description => "Shows / hides entitylookup bounds via an overlay";
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        EntitySystem.Get<DebugEntityLookupSystem>().Enabled ^= true;
-    }
-}
-
-public sealed class DebugEntityLookupSystem : EntitySystem
-{
-    public bool Enabled
-    {
-        get => _enabled;
-        set
-        {
-            if (_enabled == value) return;
-
-            _enabled = value;
-
-            if (_enabled)
-            {
-                IoCManager.Resolve<IOverlayManager>().AddOverlay(
-                    new EntityLookupOverlay(
-                        EntityManager,
-                        Get<EntityLookupSystem>()));
-            }
-            else
-            {
-                IoCManager.Resolve<IOverlayManager>().RemoveOverlay<EntityLookupOverlay>();
-            }
-        }
-    }
-
-    private bool _enabled;
-}
-
-public sealed class EntityLookupOverlay : Overlay
-{
-    private IEntityManager _entityManager = default!;
-    private EntityLookupSystem _lookup = default!;
-
-    public override OverlaySpace Space => OverlaySpace.WorldSpace;
-
-    public EntityLookupOverlay(IEntityManager entManager, EntityLookupSystem lookup)
-    {
-        _entityManager = entManager;
-        _lookup = lookup;
-    }
-
-    protected internal override void Draw(in OverlayDrawArgs args)
-    {
-        var worldHandle = args.WorldHandle;
-        var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
-
-        foreach (var lookup in _lookup.FindLookupsIntersecting(args.MapId, args.WorldBounds))
-        {
-            var lookupXform = xformQuery.GetComponent(lookup.Owner);
-
-            var (_, rotation, matrix, invMatrix) = lookupXform.GetWorldPositionRotationMatrixWithInv();
-
-            worldHandle.SetTransform(matrix);
-
-
-            var lookupAABB = invMatrix.TransformBox(args.WorldBounds);
-            var ents = new List<EntityUid>();
-
-            // Gonna allocate a lot but debug overlay sooo
-            lookup.Tree._b2Tree.FastQuery(ref lookupAABB, (ref EntityUid data) =>
-            {
-                ents.Add(data);
-            });
-
-            foreach (var ent in ents)
-            {
-                if (_entityManager.Deleted(ent)) continue;
-                var xform = xformQuery.GetComponent(ent);
-
-                //DebugTools.Assert(!ent.IsInContainer(_entityManager));
-                var (entPos, entRot) = xform.GetWorldPositionRotation();
-
-                var lookupPos = invMatrix.Transform(entPos);
-                var lookupRot = entRot - rotation;
-
-                var aabb = _lookup.GetAABB(ent, lookupPos, lookupRot, xform, xformQuery);
-
-                worldHandle.DrawRect(aabb, Color.Blue.WithAlpha(0.2f));
-            }
-        }
-    }
-}

Robust.Client/GameObjects/EntitySystems/DebugLightTreeSystem.cs

@@ -25,7 +25,7 @@ namespace Robust.Client.GameObjects
                 if (_enabled)
                 {
                     _lightOverlay = new DebugLightOverlay(
-                        EntitySystem.Get<EntityLookupSystem>(),
+                        IoCManager.Resolve<IEntityLookup>(),
                         IoCManager.Resolve<IEyeManager>(),
                         IoCManager.Resolve<IMapManager>(),
                         Get<RenderingTreeSystem>());
@@ -44,7 +44,7 @@ namespace Robust.Client.GameObjects
 
         private sealed class DebugLightOverlay : Overlay
         {
-            private EntityLookupSystem _lookup;
+            private IEntityLookup _lookup;
             private IEyeManager _eyeManager;
             private IMapManager _mapManager;
 
@@ -52,7 +52,7 @@ namespace Robust.Client.GameObjects
 
             public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-            public DebugLightOverlay(EntityLookupSystem lookup, IEyeManager eyeManager, IMapManager mapManager, RenderingTreeSystem tree)
+            public DebugLightOverlay(IEntityLookup lookup, IEyeManager eyeManager, IMapManager mapManager, RenderingTreeSystem tree)
             {
                 _lookup = lookup;
                 _eyeManager = eyeManager;
@@ -70,9 +70,9 @@ namespace Robust.Client.GameObjects
 
                 foreach (var tree in _tree.GetRenderTrees(map, viewport))
                 {
-                    foreach (var (light, xform) in tree.LightTree)
+                    foreach (var light in tree.LightTree)
                     {
-                        var aabb = _lookup.GetWorldAABB(light.Owner, xform);
+                        var aabb = _lookup.GetWorldAabbFromEntity(light.Owner);
                         if (!aabb.Intersects(worldBounds)) continue;
 
                         args.WorldHandle.DrawRect(aabb, Color.Green.WithAlpha(0.1f));

Robust.Client/GameObjects/EntitySystems/EffectSystem.cs

@@ -323,7 +323,7 @@ namespace Robust.Client.GameObjects
         {
             private readonly IPlayerManager _playerManager;
 
-            public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
+            public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
             private readonly ShaderInstance _unshadedShader;
             private readonly EffectSystem _owner;
@@ -342,6 +342,7 @@ namespace Robust.Client.GameObjects
                 var map = _owner.eyeManager.CurrentMap;
 
                 var worldHandle = args.WorldHandle;
+                ShaderInstance? currentShader = null;
 
                 if (_playerManager.LocalPlayer?.ControlledEntity is not {} playerEnt)
                     return;
@@ -361,8 +362,13 @@ namespace Robust.Client.GameObjects
                         continue;
                     }
 
-                    if (!effect.Shaded)
-                        worldHandle.UseShader(_unshadedShader);
+                    var newShader = effect.Shaded ? null : _unshadedShader;
+
+                    if (newShader != currentShader)
+                    {
+                        worldHandle.UseShader(newShader);
+                        currentShader = newShader;
+                    }
 
                     // TODO: Should be doing matrix transformations
                     var effectSprite = effect.EffectSprite;
@@ -371,9 +377,6 @@ namespace Robust.Client.GameObjects
                         (attachedXform?.Coordinates ?? effect.Coordinates)
                         .Offset(effect.AttachedOffset);
 
-                    // If we've never seen the entity before then can't resolve coordinates.
-                    if (!coordinates.IsValid(_entityManager)) continue;
-
                     // ???
                     var rotation = attachedXform?.WorldRotation ?? _entityManager.GetComponent<TransformComponent>(coordinates.EntityId).WorldRotation;
 
@@ -383,9 +386,6 @@ namespace Robust.Client.GameObjects
                     var rotatedBox = new Box2Rotated(effectArea, effect.Rotation + rotation, effectOrigin);
 
                     worldHandle.DrawTextureRect(effectSprite, rotatedBox, ToColor(effect.Color));
-
-                    if (!effect.Shaded)
-                        worldHandle.UseShader(null);
                 }
             }
         }

Robust.Client/GameObjects/EntitySystems/GridChunkBoundsDebugSystem.cs

@@ -76,7 +76,7 @@ namespace Robust.Client.GameObjects
                 worldHandle.SetTransform(worldMatrix);
                 var transform = new Transform(Vector2.Zero, Angle.Zero);
 
-                var chunkEnumerator = gridInternal.GetMapChunks(viewport);
+                gridInternal.GetMapChunks(viewport, out var chunkEnumerator);
 
                 while (chunkEnumerator.MoveNext(out var chunk))
                 {

Robust.Client/GameObjects/EntitySystems/GridFixtureSystem.cs

@@ -0,0 +1,9 @@
+using Robust.Shared.GameObjects;
+
+namespace Robust.Client.GameObjects
+{
+    internal sealed class GridFixtureSystem : SharedGridFixtureSystem
+    {
+
+    }
+}

Robust.Client/GameObjects/EntitySystems/GridRenderingSystem.cs

@@ -1,19 +0,0 @@
-using Robust.Client.Graphics;
-using Robust.Shared.GameObjects;
-
-namespace Robust.Client.GameObjects;
-
-internal class GridRenderingSystem : EntitySystem
-{
-    private readonly IClydeInternal _clyde;
-
-    public GridRenderingSystem(IClydeInternal clyde)
-    {
-        _clyde = clyde;
-    }
-
-    public override void Initialize()
-    {
-        _clyde.RegisterGridEcsEvents();
-    }
-}

Robust.Client/GameObjects/EntitySystems/InputSystem.cs

@@ -4,15 +4,11 @@ using Robust.Client.Input;
 using Robust.Client.Player;
 using Robust.Shared;
 using Robust.Shared.Configuration;
-using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Players;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Robust.Client.GameObjects
@@ -25,8 +21,6 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IInputManager _inputManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientGameStateManager _stateManager = default!;
-        [Dependency] private readonly IConsoleHost _conHost = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
 
         private readonly IPlayerCommandStates _cmdStates = new PlayerCommandStates();
 
@@ -114,43 +108,6 @@ namespace Robust.Client.GameObjects
         public override void Initialize()
         {
             SubscribeLocalEvent<PlayerAttachSysMessage>(OnAttachedEntityChanged);
-
-            _conHost.RegisterCommand("incmd",
-                "Inserts an input command into the simulation",
-                "incmd <KeyFunction> <d|u KeyState> <wxPos> <wyPos>",
-                GenerateInputCommand);
-        }
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-
-            _conHost.UnregisterCommand("incmd");
-        }
-
-        private void GenerateInputCommand(IConsoleShell shell, string argstr, string[] args)
-        {
-            var localPlayer = _playerManager.LocalPlayer;
-            if(localPlayer is null)
-                return;
-
-            var pent = localPlayer.ControlledEntity;
-            if(pent is null)
-                return;
-
-            BoundKeyFunction keyFunction = new BoundKeyFunction(args[0]);
-            BoundKeyState state = args[1] == "u" ? BoundKeyState.Up: BoundKeyState.Down;
-
-            var pxform = Transform(pent.Value);
-            var wPos = pxform.WorldPosition + new Vector2(float.Parse(args[2]), float.Parse(args[3]));
-            var coords = EntityCoordinates.FromMap(EntityManager, pent.Value, new MapCoordinates(wPos, pxform.MapID));
-
-            var funcId = _inputManager.NetworkBindMap.KeyFunctionID(keyFunction);
-
-            var message = new FullInputCmdMessage(_timing.CurTick, _timing.TickFraction, funcId, state,
-                coords, new ScreenCoordinates(0, 0, default), EntityUid.Invalid);
-
-            HandleInputCommand(localPlayer.Session, keyFunction, message);
         }
 
         private void OnAttachedEntityChanged(PlayerAttachSysMessage message)

Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Client.Physics;
@@ -19,8 +18,6 @@ namespace Robust.Client.GameObjects
     [UsedImplicitly]
     public sealed class RenderingTreeSystem : EntitySystem
     {
-        [Dependency] private readonly TransformSystem _xformSystem = default!;
-
         internal const string LoggerSawmill = "rendertree";
 
         // Nullspace is not indexed. Keep that in mind.
@@ -73,17 +70,18 @@ namespace Robust.Client.GameObjects
             UpdatesAfter.Add(typeof(TransformSystem));
             UpdatesAfter.Add(typeof(PhysicsSystem));
 
-            SubscribeLocalEvent<MapChangedEvent>(MapManagerOnMapCreated);
-
-            SubscribeLocalEvent<GridInitializeEvent>(MapManagerOnGridCreated);
+            _mapManager.MapCreated += MapManagerOnMapCreated;
+            _mapManager.OnGridCreated += MapManagerOnGridCreated;
 
             // Due to how recursion works, this must be done.
             SubscribeLocalEvent<MoveEvent>(AnythingMoved);
 
+            SubscribeLocalEvent<SpriteComponent, EntMapIdChangedMessage>(SpriteMapChanged);
             SubscribeLocalEvent<SpriteComponent, EntParentChangedMessage>(SpriteParentChanged);
             SubscribeLocalEvent<SpriteComponent, ComponentRemove>(RemoveSprite);
             SubscribeLocalEvent<SpriteComponent, SpriteUpdateEvent>(HandleSpriteUpdate);
 
+            SubscribeLocalEvent<PointLightComponent, EntMapIdChangedMessage>(LightMapChanged);
             SubscribeLocalEvent<PointLightComponent, EntParentChangedMessage>(LightParentChanged);
             SubscribeLocalEvent<PointLightComponent, PointLightRadiusChangedEvent>(PointLightRadiusChanged);
             SubscribeLocalEvent<PointLightComponent, PointLightUpdateEvent>(HandleLightUpdate);
@@ -97,8 +95,8 @@ namespace Robust.Client.GameObjects
 
         private void OnTreeInit(EntityUid uid, RenderingTreeComponent component, ComponentInit args)
         {
-            component.LightTree = new(LightAabbFunc);
-            component.SpriteTree = new(SpriteAabbFunc);
+            component.LightTree = new DynamicTree<PointLightComponent>(LightAabbFunc);
+            component.SpriteTree = new DynamicTree<SpriteComponent>(SpriteAabbFunc);
         }
 
         private void HandleLightUpdate(EntityUid uid, PointLightComponent component, PointLightUpdateEvent args)
@@ -115,18 +113,12 @@ namespace Robust.Client.GameObjects
 
         private void AnythingMoved(ref MoveEvent args)
         {
-            var pointQuery = EntityManager.GetEntityQuery<PointLightComponent>();
-            var spriteQuery = EntityManager.GetEntityQuery<SpriteComponent>();
-            var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
+            var xforms = EntityManager.GetEntityQuery<TransformComponent>();
 
-            AnythingMovedSubHandler(args.Sender, xformQuery, pointQuery, spriteQuery);
+            AnythingMovedSubHandler(args.Sender, xforms);
         }
 
-        private void AnythingMovedSubHandler(
-            EntityUid uid,
-            EntityQuery<TransformComponent> xformQuery,
-            EntityQuery<PointLightComponent> pointQuery,
-            EntityQuery<SpriteComponent> spriteQuery)
+        private void AnythingMovedSubHandler(EntityUid uid, EntityQuery<TransformComponent> xforms)
         {
             // To avoid doing redundant updates (and we don't need to update a grid's children ever)
             if (!_checkedChildren.Add(uid) || EntityManager.HasComponent<RenderingTreeComponent>(uid)) return;
@@ -135,19 +127,17 @@ namespace Robust.Client.GameObjects
             // WHATEVER YOU DO, DON'T REPLACE THIS WITH SPAMMING EVENTS UNLESS YOU HAVE A GUARANTEE IT WON'T LAG THE GC.
             // (Struct-based events ok though)
             // Ironically this was lagging the GC lolz
-            if (spriteQuery.TryGetComponent(uid, out var sprite))
+            if (EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
                 QueueSpriteUpdate(sprite);
 
-            if (pointQuery.TryGetComponent(uid, out var light))
+            if (EntityManager.TryGetComponent(uid, out PointLightComponent? light))
                 QueueLightUpdate(light);
 
-            if (!xformQuery.TryGetComponent(uid, out var xform)) return;
+            if (!xforms.TryGetComponent(uid, out var xform)) return;
 
-            var childEnumerator = xform.ChildEnumerator;
-
-            while (childEnumerator.MoveNext(out var child))
+            foreach (var child in xform.ChildEntities)
             {
-                AnythingMovedSubHandler(child.Value, xformQuery, pointQuery, spriteQuery);
+                AnythingMovedSubHandler(child, xforms);
             }
         }
 
@@ -157,6 +147,10 @@ namespace Robust.Client.GameObjects
         // Otherwise these will still have their past MapId and that's all we need..
 
         #region SpriteHandlers
+        private void SpriteMapChanged(EntityUid uid, SpriteComponent component, EntMapIdChangedMessage args)
+        {
+            QueueSpriteUpdate(component);
+        }
 
         private void SpriteParentChanged(EntityUid uid, SpriteComponent component, ref EntParentChangedMessage args)
         {
@@ -172,7 +166,7 @@ namespace Robust.Client.GameObjects
         {
             if (component.RenderTree == null) return;
 
-            component.RenderTree.SpriteTree.Remove(new() { Component = component });
+            component.RenderTree.SpriteTree.Remove(component);
             component.RenderTree = null;
         }
 
@@ -186,6 +180,10 @@ namespace Robust.Client.GameObjects
         #endregion
 
         #region LightHandlers
+        private void LightMapChanged(EntityUid uid, PointLightComponent component, EntMapIdChangedMessage args)
+        {
+            QueueLightUpdate(component);
+        }
 
         private void LightParentChanged(EntityUid uid, PointLightComponent component, ref EntParentChangedMessage args)
         {
@@ -201,7 +199,7 @@ namespace Robust.Client.GameObjects
         {
             if (component.RenderTree == null) return;
 
-            component.RenderTree.LightTree.Remove(new() { Component = component });
+            component.RenderTree.LightTree.Remove(component);
             component.RenderTree = null;
         }
 
@@ -214,25 +212,32 @@ namespace Robust.Client.GameObjects
         }
         #endregion
 
+        public override void Shutdown()
+        {
+            base.Shutdown();
+            _mapManager.MapCreated -= MapManagerOnMapCreated;
+            _mapManager.OnGridCreated -= MapManagerOnGridCreated;
+        }
+
         private void OnTreeRemove(EntityUid uid, RenderingTreeComponent component, ComponentRemove args)
         {
             foreach (var sprite in component.SpriteTree)
             {
-                sprite.Component.RenderTree = null;
+                sprite.RenderTree = null;
             }
 
             foreach (var light in component.LightTree)
             {
-                light.Component.RenderTree = null;
+                light.RenderTree = null;
             }
 
             component.SpriteTree.Clear();
             component.LightTree.Clear();
         }
 
-        private void MapManagerOnMapCreated(MapChangedEvent e)
+        private void MapManagerOnMapCreated(object? sender, MapEventArgs e)
         {
-            if (e.Destroyed || e.Map == MapId.Nullspace)
+            if (e.Map == MapId.Nullspace)
             {
                 return;
             }
@@ -240,16 +245,17 @@ namespace Robust.Client.GameObjects
             EntityManager.EnsureComponent<RenderingTreeComponent>(_mapManager.GetMapEntityId(e.Map));
         }
 
-        private void MapManagerOnGridCreated(GridInitializeEvent ev)
+        private void MapManagerOnGridCreated(MapId mapId, GridId gridId)
         {
-            EntityManager.EnsureComponent<RenderingTreeComponent>(_mapManager.GetGrid(ev.GridId).GridEntityId);
+            EntityManager.EnsureComponent<RenderingTreeComponent>(_mapManager.GetGrid(gridId).GridEntityId);
         }
 
-        private RenderingTreeComponent? GetRenderTree(EntityUid entity, TransformComponent xform, EntityQuery<TransformComponent> xforms)
+        private RenderingTreeComponent? GetRenderTree(EntityUid entity, EntityQuery<TransformComponent> xforms)
         {
             var lookups = EntityManager.GetEntityQuery<RenderingTreeComponent>();
 
             if (!EntityManager.EntityExists(entity) ||
+                !xforms.TryGetComponent(entity, out var xform) ||
                 xform.MapID == MapId.Nullspace ||
                 lookups.HasComponent(entity)) return null;
 
@@ -284,11 +290,11 @@ namespace Robust.Client.GameObjects
                     continue;
                 }
 
-                var xform = xforms.GetComponent(sprite.Owner);
                 var oldMapTree = sprite.RenderTree;
-                var newMapTree = GetRenderTree(sprite.Owner, xform, xforms);
+                var newMapTree = GetRenderTree(sprite.Owner, xforms);
                 // TODO: Temp PVS guard
-                var (worldPos, worldRot) = _xformSystem.GetWorldPositionRotation(xform, xforms);
+                var xform = xforms.GetComponent(sprite.Owner);
+                var (worldPos, worldRot) = xform.GetWorldPositionRotation();
 
                 if (float.IsNaN(worldPos.X) || float.IsNaN(worldPos.Y))
                 {
@@ -296,17 +302,17 @@ namespace Robust.Client.GameObjects
                     continue;
                 }
 
-                var aabb = SpriteAabbFunc(sprite, xform, worldPos, worldRot, xforms);
+                var aabb = SpriteAabbFunc(sprite, worldPos, worldRot, xforms);
 
                 // If we're on a new map then clear the old one.
                 if (oldMapTree != newMapTree)
                 {
                     ClearSprite(sprite);
-                    newMapTree?.SpriteTree.Add((sprite,xform) , aabb);
+                    newMapTree?.SpriteTree.Add(sprite, aabb);
                 }
                 else
                 {
-                    newMapTree?.SpriteTree.Update((sprite, xform), aabb);
+                    newMapTree?.SpriteTree.Update(sprite, aabb);
                 }
 
                 sprite.RenderTree = newMapTree;
@@ -322,11 +328,10 @@ namespace Robust.Client.GameObjects
                     continue;
                 }
 
-                var xform = xforms.GetComponent(light.Owner);
                 var oldMapTree = light.RenderTree;
-                var newMapTree = GetRenderTree(light.Owner, xform, xforms);
+                var newMapTree = GetRenderTree(light.Owner, xforms);
                 // TODO: Temp PVS guard
-                var worldPos = _xformSystem.GetWorldPosition(xform, xforms);
+                var worldPos = xforms.GetComponent(light.Owner).WorldPosition;
 
                 if (float.IsNaN(worldPos.X) || float.IsNaN(worldPos.Y))
                 {
@@ -340,17 +345,18 @@ namespace Robust.Client.GameObjects
                 {
                     Logger.WarningS(LoggerSawmill, $"Light radius for {light.Owner} set above max radius of {MaxLightRadius}. This may lead to pop-in.");
                 }
-                var aabb = LightAabbFunc(light, xform, worldPos, xforms);
+
+                var aabb = LightAabbFunc(light, worldPos, xforms);
 
                 // If we're on a new map then clear the old one.
                 if (oldMapTree != newMapTree)
                 {
                     ClearLight(light);
-                    newMapTree?.LightTree.Add((light, xform), aabb);
+                    newMapTree?.LightTree.Add(light, aabb);
                 }
                 else
                 {
-                    newMapTree?.LightTree.Update((light, xform), aabb);
+                    newMapTree?.LightTree.Update(light, aabb);
                 }
 
                 light.RenderTree = newMapTree;
@@ -360,38 +366,42 @@ namespace Robust.Client.GameObjects
             _lightQueue.Clear();
         }
 
-        private Box2 SpriteAabbFunc(in ComponentTreeEntry<SpriteComponent> entry)
+        private Box2 SpriteAabbFunc(in SpriteComponent value)
         {
             var xforms = EntityManager.GetEntityQuery<TransformComponent>();
 
-            var (worldPos, worldRot) = _xformSystem.GetWorldPositionRotation(entry.Transform, xforms);
+            var xform = xforms.GetComponent(value.Owner);
+            var (worldPos, worldRot) = xform.GetWorldPositionRotation();
+            var bounds = new Box2Rotated(value.CalculateBoundingBox(worldPos), worldRot, worldPos);
+            var tree = GetRenderTree(value.Owner, xforms);
 
-            return SpriteAabbFunc(entry.Component, entry.Transform, worldPos, worldRot, xforms);
+            return tree == null ? bounds.CalcBoundingBox() : xforms.GetComponent(tree.Owner).InvWorldMatrix.TransformBox(bounds);
         }
 
-        private Box2 LightAabbFunc(in ComponentTreeEntry<PointLightComponent> entry)
+        private Box2 LightAabbFunc(in PointLightComponent value)
         {
             var xforms = EntityManager.GetEntityQuery<TransformComponent>();
-            var worldPos = _xformSystem.GetWorldPosition(entry.Transform, xforms);
-            var tree = GetRenderTree(entry.Uid, entry.Transform, xforms);
-            var boxSize = entry.Component.Radius * 2;
 
-            var localPos = tree == null ? worldPos : _xformSystem.GetInvWorldMatrix(tree.Owner, xforms).Transform(worldPos);
+            var worldPos = xforms.GetComponent(value.Owner).WorldPosition;
+            var tree = GetRenderTree(value.Owner, xforms);
+            var boxSize = value.Radius * 2;
+
+            var localPos = tree == null ? worldPos : xforms.GetComponent(tree.Owner).InvWorldMatrix.Transform(worldPos);
             return Box2.CenteredAround(localPos, (boxSize, boxSize));
         }
 
-        private Box2 SpriteAabbFunc(SpriteComponent value, TransformComponent xform, Vector2 worldPos, Angle worldRot, EntityQuery<TransformComponent> xforms)
+        private Box2 SpriteAabbFunc(SpriteComponent value, Vector2 worldPos, Angle worldRot, EntityQuery<TransformComponent> xforms)
         {
-            var bounds = value.CalculateRotatedBoundingBox(worldPos, worldRot);
-            var tree = GetRenderTree(value.Owner, xform, xforms);
+            var bounds = new Box2Rotated(value.CalculateBoundingBox(worldPos), worldRot, worldPos);
+            var tree = GetRenderTree(value.Owner, xforms);
 
-            return tree == null ? bounds.CalcBoundingBox() : _xformSystem.GetInvWorldMatrix(tree.Owner, xforms).TransformBox(bounds);
+            return tree == null ? bounds.CalcBoundingBox() : xforms.GetComponent(tree.Owner).InvWorldMatrix.TransformBox(bounds);
         }
 
-        private Box2 LightAabbFunc(PointLightComponent value, TransformComponent xform, Vector2 worldPos, EntityQuery<TransformComponent> xforms)
+        private Box2 LightAabbFunc(PointLightComponent value, Vector2 worldPos, EntityQuery<TransformComponent> xforms)
         {
             // Lights are circles so don't need entity's rotation
-            var tree = GetRenderTree(value.Owner, xform, xforms);
+            var tree = GetRenderTree(value.Owner, xforms);
             var boxSize = value.Radius * 2;
 
             var localPos = tree == null ? worldPos : xforms.GetComponent(tree.Owner).InvWorldMatrix.Transform(worldPos);

Robust.Client/GameObjects/EntitySystems/ScaleVisualsSystem.cs

@@ -1,24 +0,0 @@
-using Robust.Shared.GameObjects;
-using Robust.Shared.Maths;
-
-namespace Robust.Client.GameObjects;
-
-public sealed class ScaleVisualsSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<AppearanceChangeEvent>(OnChangeData);
-    }
-
-    private void OnChangeData(ref AppearanceChangeEvent ev)
-    {
-        if (!ev.AppearanceData.TryGetValue(ScaleVisuals.Scale, out var scale) ||
-            ev.Sprite == null) return;
-
-        var vecScale = (Vector2)scale;
-
-        // Set it directly because prediction may call this multiple times.
-        ev.Sprite.Scale = vecScale;
-    }
-}

Robust.Client/GameObjects/EntitySystems/SpriteSystem.Specifier.cs

@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using JetBrains.Annotations;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Client.Utility;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Robust.Client.GameObjects;
-
-public sealed partial class SpriteSystem
-{
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
-
-    private readonly Dictionary<string, IRsiStateLike> _cachedPrototypeIcons = new();
-
-    public Texture Frame0(SpriteSpecifier specifier)
-    {
-        return RsiStateLike(specifier).Default;
-    }
-
-    public IRsiStateLike RsiStateLike(SpriteSpecifier specifier)
-    {
-        switch (specifier)
-        {
-            case SpriteSpecifier.Texture tex:
-                return tex.GetTexture(_resourceCache);
-
-            case SpriteSpecifier.Rsi rsi:
-                return GetState(rsi);
-
-            case SpriteSpecifier.EntityPrototype prototypeIcon:
-                return GetPrototypeIcon(prototypeIcon.EntityPrototypeId);
-
-            default:
-                throw new NotSupportedException();
-        }
-    }
-
-    /// <summary>
-    ///     Returns an icon for a given <see cref="EntityPrototype"/> ID, or a fallback in case of an error.
-    ///     This method caches the result based on the prototype identifier.
-    /// </summary>
-    public IRsiStateLike GetPrototypeIcon(string prototype)
-    {
-        // Check if this prototype has been cached before, and if so return the result.
-        if (_cachedPrototypeIcons.TryGetValue(prototype, out var cachedResult))
-            return cachedResult;
-
-        if (!_proto.TryIndex<EntityPrototype>(prototype, out var entityPrototype))
-        {
-            // The specified prototype doesn't exist, return the fallback "error" sprite.
-            Logger.Error("Failed to load PrototypeIcon {0}", prototype);
-            return GetFallbackState();
-        }
-
-        // Generate the icon and cache it in case it's ever needed again.
-        var result = GetPrototypeIcon(entityPrototype);
-        _cachedPrototypeIcons[prototype] = result;
-
-        return result;
-    }
-
-    /// <summary>
-    ///     Returns an icon for a given <see cref="EntityPrototype"/> ID, or a fallback in case of an error.
-    ///     This method does NOT cache the result.
-    /// </summary>
-    public IRsiStateLike GetPrototypeIcon(EntityPrototype prototype)
-    {
-        // IconComponent takes precedence. If it has a valid icon, return that. Otherwise, continue as normal.
-        if (prototype.Components.TryGetValue("Icon", out var compData)
-            && compData.Component is IconComponent {Icon: {} icon})
-        {
-            return icon.Default;
-        }
-
-        // If the prototype doesn't have a SpriteComponent, then there's nothing we can do but return the fallback.
-        if (!prototype.Components.ContainsKey("Sprite"))
-        {
-            return GetFallbackState();
-        }
-
-        // Finally, we use spawn a dummy entity to get its icon.
-        var dummy = Spawn(prototype.ID, MapCoordinates.Nullspace);
-        var spriteComponent = EnsureComp<SpriteComponent>(dummy);
-        var result = spriteComponent.Icon ?? GetFallbackState();
-        Del(dummy);
-
-        return result;
-    }
-
-    [Pure]
-    public RSI.State GetFallbackState()
-    {
-        return _resourceCache.GetFallback<RSIResource>().RSI["error"];
-    }
-
-    [Pure]
-    public RSI.State GetState(SpriteSpecifier.Rsi rsiSpecifier)
-    {
-        if (_resourceCache.TryGetResource<RSIResource>(
-                SharedSpriteComponent.TextureRoot / rsiSpecifier.RsiPath,
-                out var theRsi) &&
-            theRsi.RSI.TryGetState(rsiSpecifier.RsiState, out var state))
-        {
-            return state;
-        }
-
-        Logger.Error("Failed to load RSI {0}", rsiSpecifier.RsiPath);
-        return GetFallbackState();
-    }
-
-    private void OnPrototypesReloaded(PrototypesReloadedEventArgs protoReloaded)
-    {
-        // Check if any EntityPrototype has been changed.
-        if (!protoReloaded.ByType.TryGetValue(typeof(EntityPrototype), out var changedSet))
-            return;
-
-        // Remove all changed prototypes from the cache, if they're there.
-        foreach (var (prototype, _) in changedSet.Modified)
-        {
-            // Let's be lazy and not regenerate them until something needs them again.
-            _cachedPrototypeIcons.Remove(prototype);
-        }
-    }
-}

Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs

@@ -1,10 +1,9 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Physics;
 
 namespace Robust.Client.GameObjects
 {
@@ -12,7 +11,7 @@ namespace Robust.Client.GameObjects
     /// Updates the layer animation for every visible sprite.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class SpriteSystem : EntitySystem
+    public sealed class SpriteSystem : EntitySystem
     {
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly RenderingTreeSystem _treeSystem = default!;
@@ -24,16 +23,9 @@ namespace Robust.Client.GameObjects
         {
             base.Initialize();
 
-            _proto.PrototypesReloaded += OnPrototypesReloaded;
             SubscribeLocalEvent<SpriteUpdateInertEvent>(QueueUpdateInert);
         }
 
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            _proto.PrototypesReloaded -= OnPrototypesReloaded;
-        }
-
         private void QueueUpdateInert(SpriteUpdateInertEvent ev)
         {
             _inertUpdateQueue.Enqueue(ev.Sprite);
@@ -67,15 +59,15 @@ namespace Robust.Client.GameObjects
             {
                 var bounds = xforms.GetComponent(comp.Owner).InvWorldMatrix.TransformBox(pvsBounds);
 
-                comp.SpriteTree.QueryAabb(ref frameTime, (ref float state, in ComponentTreeEntry<SpriteComponent> value) =>
+                comp.SpriteTree.QueryAabb(ref frameTime, (ref float state, in SpriteComponent value) =>
                 {
-                    if (value.Component.IsInert)
+                    if (value.IsInert)
                     {
                         return true;
                     }
 
-                    if (!_manualUpdate.Contains(value.Component))
-                        value.Component.FrameUpdate(state);
+                    if (!_manualUpdate.Contains(value))
+                        value.FrameUpdate(state);
                     return true;
                 }, bounds, true);
             }

Robust.Client/GameObjects/EntitySystems/TransformSystem.cs

@@ -52,8 +52,7 @@ namespace Robust.Client.GameObjects
 
                 // Only lerp if parent didn't change.
                 // E.g. entering lockers would do it.
-                if (transform.LerpParent == transform.ParentUid &&
-                    transform.ParentUid.IsValid())
+                if (transform.LerpParent == transform.ParentUid)
                 {
                     if (transform.LerpDestination != null)
                     {
@@ -72,7 +71,7 @@ namespace Robust.Client.GameObjects
                     {
                         var lerpDest = transform.LerpAngle.Value;
                         var lerpSource = transform.LerpSourceAngle;
-                        if (Math.Abs(Angle.ShortestDistance(lerpDest, lerpSource)) < MaxInterpolationAngle)
+                        if (lerpDest.Theta - lerpSource.Theta < MaxInterpolationAngle)
                         {
                             transform.LocalRotation = Angle.Lerp(lerpSource, lerpDest, step);
                             // Setting LocalRotation clears LerpAngle so fix that.

Robust.Client/GameObjects/IClientEntityManagerInternal.cs

@@ -8,7 +8,7 @@ namespace Robust.Client.GameObjects
 
         EntityUid CreateEntity(string? prototypeName, EntityUid uid = default);
 
-        void InitializeEntity(EntityUid entity, MetaDataComponent? meta = null);
+        void InitializeEntity(EntityUid entity);
 
         void StartEntity(EntityUid entity);
     }

Robust.Client/GameStates/ClientDirtySystem.cs

@@ -1,82 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Microsoft.Extensions.ObjectPool;
-using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
-using Robust.Shared.IoC;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Robust.Client.GameStates;
-
-/// <summary>
-/// Tracks dirty entities on the client for the purposes of gamestatemanager.
-/// </summary>
-internal sealed class ClientDirtySystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-
-    private readonly Dictionary<GameTick, HashSet<EntityUid>> _dirtyEntities = new();
-
-    private ObjectPool<HashSet<EntityUid>> _dirtyPool =
-        new DefaultObjectPool<HashSet<EntityUid>>(new DefaultPooledObjectPolicy<HashSet<EntityUid>>(), 64);
-
-    // Keep it out of the pool because it's probably going to be a lot bigger.
-    private HashSet<EntityUid> _dirty = new(256);
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        EntityManager.EntityDirtied += OnEntityDirty;
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        EntityManager.EntityDirtied -= OnEntityDirty;
-        _dirtyEntities.Clear();
-    }
-
-    internal void Reset()
-    {
-        foreach (var (_, sets) in _dirtyEntities)
-        {
-            sets.Clear();
-            _dirtyPool.Return(sets);
-        }
-
-        _dirtyEntities.Clear();
-    }
-
-    public IEnumerable<EntityUid> GetDirtyEntities(GameTick currentTick)
-    {
-        _dirty.Clear();
-
-        // This is just to avoid collection being modified during iteration unfortunately.
-        foreach (var (tick, dirty) in _dirtyEntities)
-        {
-            if (tick < currentTick) continue;
-            foreach (var ent in dirty)
-            {
-                _dirty.Add(ent);
-            }
-        }
-
-        return _dirty;
-    }
-
-    private void OnEntityDirty(EntityUid e)
-    {
-        if (e.IsClientSide()) return;
-
-        var tick = _timing.CurTick;
-        if (!_dirtyEntities.TryGetValue(tick, out var ents))
-        {
-            ents = _dirtyPool.Get();
-            _dirtyEntities[tick] = ents;
-        }
-
-        ents.Add(e);
-    }
-}

Robust.Client/GameStates/ClientGameStateManager.cs

@@ -21,7 +21,6 @@ using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
 using Robust.Shared.Players;
-using Robust.Shared.Profiling;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -46,6 +45,7 @@ namespace Robust.Client.GameStates
 
         [Dependency] private readonly IComponentFactory _compFactory = default!;
         [Dependency] private readonly IClientEntityManagerInternal _entities = default!;
+        [Dependency] private readonly IEntityLookup _lookup = default!;
         [Dependency] private readonly IPlayerManager _players = default!;
         [Dependency] private readonly IClientNetManager _network = default!;
         [Dependency] private readonly IBaseClient _client = default!;
@@ -53,9 +53,8 @@ namespace Robust.Client.GameStates
         [Dependency] private readonly IClientGameTiming _timing = default!;
         [Dependency] private readonly INetConfigurationManager _config = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
-        [Dependency] private readonly ClientEntityManager _entityManager = default!;
+        [Dependency] private readonly IClientEntityManager _entityManager = default!;
         [Dependency] private readonly IInputManager _inputManager = default!;
-        [Dependency] private readonly ProfManager _prof = default!;
 #if EXCEPTION_TOLERANCE
         [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
 #endif
@@ -226,28 +225,18 @@ namespace Robust.Client.GameStates
                     ResetPredictedEntities(_timing.CurTick);
                 }
 
-                using (_prof.Group("FullRep"))
+                if (!curState.Extrapolated)
                 {
-                    if (!curState.Extrapolated)
-                    {
-                        _processor.UpdateFullRep(curState);
-                    }
+                    _processor.UpdateFullRep(curState);
                 }
 
                 // Store last tick we got from the GameStateProcessor.
                 _lastProcessedTick = _timing.CurTick;
 
                 // apply current state
-                List<EntityUid> createdEntities;
-                using (_prof.Group("ApplyGameState"))
-                {
-                    createdEntities = ApplyGameState(curState, nextState);
-                }
+                var createdEntities = ApplyGameState(curState, nextState);
 
-                using (_prof.Group("MergeImplicitData"))
-                {
-                    MergeImplicitData(createdEntities);
-                }
+                MergeImplicitData(createdEntities);
 
                 if (_lastProcessedSeq < curState.LastProcessedInput)
                 {
@@ -282,7 +271,6 @@ namespace Robust.Client.GameStates
 
             if (IsPredictionEnabled)
             {
-                using var _p = _prof.Group("Prediction");
                 using var _ = _timing.StartPastPredictionArea();
 
                 if (_pendingInputs.Count > 0)
@@ -303,8 +291,6 @@ namespace Robust.Client.GameStates
 
                 for (var t = _lastProcessedTick.Value + 1; t <= targetTick; t++)
                 {
-                    var groupStart = _prof.WriteGroupStart();
-
                     var tick = new GameTick(t);
                     _timing.CurTick = tick;
 
@@ -336,43 +322,37 @@ namespace Robust.Client.GameStates
 
                     if (t != targetTick)
                     {
-                        using (_prof.Group("Systems"))
-                        {
-                            // Don't run EntitySystemManager.TickUpdate if this is the target tick,
-                            // because the rest of the main loop will call into it with the target tick later,
-                            // and it won't be a past prediction.
-                            _entitySystemManager.TickUpdate((float) _timing.TickPeriod.TotalSeconds, noPredictions: false);
-                        }
-
-                        using (_prof.Group("Event queue"))
-                        {
-                            ((IBroadcastEventBusInternal) _entities.EventBus).ProcessEventQueue();
-                        }
+                        // Don't run EntitySystemManager.TickUpdate if this is the target tick,
+                        // because the rest of the main loop will call into it with the target tick later,
+                        // and it won't be a past prediction.
+                        _entitySystemManager.TickUpdate((float) _timing.TickPeriod.TotalSeconds, noPredictions: false);
+                        ((IBroadcastEventBusInternal) _entities.EventBus).ProcessEventQueue();
                     }
-
-                    _prof.WriteGroupEnd(groupStart, "Prediction tick", ProfData.Int64(t));
                 }
             }
 
-            using (_prof.Group("Tick"))
-            {
-                _entities.TickUpdate((float) _timing.TickPeriod.TotalSeconds, noPredictions: !IsPredictionEnabled);
-            }
+            _entities.TickUpdate((float) _timing.TickPeriod.TotalSeconds, noPredictions: !IsPredictionEnabled);
+
+            _lookup.Update();
         }
 
         private void ResetPredictedEntities(GameTick curTick)
         {
-            using var _ = _prof.Group("ResetPredictedEntities");
-
-            var countReset = 0;
-            var system = _entitySystemManager.GetEntitySystem<ClientDirtySystem>();
-            var query = _entityManager.GetEntityQuery<MetaDataComponent>();
-
-            foreach (var entity in system.GetDirtyEntities(curTick))
+            foreach (var meta in _entityManager.EntityQuery<MetaDataComponent>(true))
             {
+                var entity = meta.Owner;
+
+                // TODO: 99% there's an off-by-one here.
+                if (entity.IsClientSide() || meta.EntityLastModifiedTick < curTick)
+                {
+                    continue;
+                }
+
                 // Check log level first to avoid the string alloc.
                 if (_sawmill.Level <= LogLevel.Debug)
+                {
                     _sawmill.Debug($"Entity {entity} was made dirty.");
+                }
 
                 if (!_processor.TryGetLastServerStates(entity, out var last))
                 {
@@ -380,8 +360,6 @@ namespace Robust.Client.GameStates
                     continue;
                 }
 
-                countReset += 1;
-
                 // TODO: handle component deletions/creations.
                 foreach (var (netId, comp) in _entityManager.GetNetComponents(entity))
                 {
@@ -392,21 +370,13 @@ namespace Robust.Client.GameStates
                         continue;
                     }
 
-                    if (_sawmill.Level <= LogLevel.Debug)
-                        _sawmill.Debug($"  And also its component {comp.GetType()}");
-
+                    _sawmill.Debug($"  And also its component {comp.GetType()}");
                     // TODO: Handle interpolation.
                     var handleState = new ComponentHandleState(compState, null);
                     _entities.EventBus.RaiseComponentEvent(comp, ref handleState);
                     comp.HandleComponentState(compState, null);
-                    comp.LastModifiedTick = curTick;
                 }
-                query.GetComponent(entity).EntityLastModifiedTick = curTick;
             }
-
-            system.Reset();
-
-            _prof.WriteValue("Reset count", ProfData.Int32(countReset));
         }
 
         private void MergeImplicitData(List<EntityUid> createdEntities)
@@ -442,47 +412,28 @@ namespace Robust.Client.GameStates
 
         private void AckGameState(GameTick sequence)
         {
-            var msg = new MsgStateAck();
+            var msg = _network.CreateNetMessage<MsgStateAck>();
             msg.Sequence = sequence;
             _network.ClientSendMessage(msg);
         }
 
         private List<EntityUid> ApplyGameState(GameState curState, GameState? nextState)
         {
-            using (_prof.Group("Config"))
-            {
-                _config.TickProcessMessages();
-            }
-
-            using (_prof.Group("Map Pre"))
-            {
-                _mapManager.ApplyGameStatePre(curState.MapData, curState.EntityStates.Span);
-            }
-
-            List<EntityUid> createdEntities;
-            using (_prof.Group("Entity"))
-            {
-                createdEntities = ApplyEntityStates(curState.EntityStates.Span, curState.EntityDeletions.Span,
-                    nextState != null ? nextState.EntityStates.Span : default);
-            }
-
-            using (_prof.Group("Player"))
-            {
-                _players.ApplyPlayerStates(curState.PlayerStates.Value ?? Array.Empty<PlayerState>());
-            }
-
-            using (_prof.Group("Callback"))
-            {
-                GameStateApplied?.Invoke(new GameStateAppliedArgs(curState));
-            }
+            _config.TickProcessMessages();
+            _mapManager.ApplyGameStatePre(curState.MapData, curState.EntityStates.Span);
+            var createdEntities = ApplyEntityStates(curState.EntityStates.Span, curState.EntityDeletions.Span,
+                nextState != null ? nextState.EntityStates.Span : default);
+            _players.ApplyPlayerStates(curState.PlayerStates.Value ?? Array.Empty<PlayerState>());
+            _mapManager.ApplyGameStatePost(curState.MapData);
 
+            GameStateApplied?.Invoke(new GameStateAppliedArgs(curState));
             return createdEntities;
         }
 
         private List<EntityUid> ApplyEntityStates(ReadOnlySpan<EntityState> curEntStates, ReadOnlySpan<EntityUid> deletions,
             ReadOnlySpan<EntityState> nextEntStates)
         {
-            var toApply = new Dictionary<EntityUid, (EntityState?, EntityState?)>(curEntStates.Length);
+            var toApply = new Dictionary<EntityUid, (EntityState?, EntityState?)>();
             var toInitialize = new List<EntityUid>();
             var created = new List<EntityUid>();
 
@@ -590,9 +541,6 @@ namespace Robust.Client.GameStates
             }
 #endif
 
-            _prof.WriteValue("Created", ProfData.Int32(created.Count));
-            _prof.WriteValue("Applied", ProfData.Int32(toApply.Count));
-
             return created;
         }
 
@@ -604,8 +552,6 @@ namespace Robust.Client.GameStates
 
             if (curState != null)
             {
-                compStateWork.EnsureCapacity(curState.ComponentChanges.Span.Length);
-
                 foreach (var compChange in curState.ComponentChanges.Span)
                 {
                     if (compChange.Deleted)
@@ -638,8 +584,6 @@ namespace Robust.Client.GameStates
 
             if (nextState != null)
             {
-                compStateWork.EnsureCapacity(compStateWork.Count + nextState.ComponentChanges.Span.Length);
-
                 foreach (var compState in nextState.ComponentChanges.Span)
                 {
                     if (compStateWork.TryGetValue(compState.NetID, out var state))

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

@@ -15,7 +15,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Audio;
 using Robust.Shared.Log;
 using Vector2 = Robust.Shared.Maths.Vector2;
-using Robust.Shared.Utility;
 
 namespace Robust.Client.Graphics.Audio
 {
@@ -194,10 +193,8 @@ namespace Robust.Client.Graphics.Audio
                 {
                     _didPositionWarning = true;
                     Logger.WarningS("clyde.oal",
-                        "Attempting to set position on audio source with multiple audio channels! Stream: '{0}'.  Make sure the audio is MONO, not stereo.",
+                        "Attempting to set position on audio source with multiple audio channels! Stream: '{0}'",
                         _sourceStream.Name);
-                    // warning isn't enough, people just ignore it :(
-                    DebugTools.Assert(false, $"Attempting to set position on audio source with multiple audio channels! Stream: '{_sourceStream.Name}'. Make sure the audio is MONO, not stereo.");
                 }
 #endif
 

Robust.Client/Graphics/ClientEye/EyeManager.cs

@@ -2,7 +2,6 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
@@ -133,12 +132,6 @@ namespace Robust.Client.Graphics
 
         public ScreenCoordinates MapToScreen(MapCoordinates point)
         {
-            if (CurrentEye.Position.MapId != point.MapId)
-            {
-                Logger.Error($"Attempted to convert map coordinates ({point}) to screen coordinates with an eye on another map ({CurrentEye.Position.MapId})");
-                return new(default, WindowId.Invalid);
-            }
-
             return new(WorldToScreen(point.Position), MainViewport.Window?.Id ?? default);
         }