Version: 0.8.48

.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,33 +0,0 @@
-name: Benchmarks
-#on:
-#  push
-  #schedule:
-  #  - cron: '0 5 * * *'
-  #push:
-  #  tags:
-  #    - 'v*'
-
-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:
-      - 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: Run benchmark
-        run: cd Robust.Benchmarks && sudo dotnet run --filter '*' --configuration Release

.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 -v n
- 
-

.gitignore

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

MSBuild/Robust.Engine.Version.props

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

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/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,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using BenchmarkDotNet.Exporters;
-using BenchmarkDotNet.Loggers;
-using BenchmarkDotNet.Mathematics;
-using BenchmarkDotNet.Reports;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-using Npgsql;
-
-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.Migrate();
-            ctx.BenchmarkRuns.Add(BenchmarkRun.FromSummary(summary, gitHash));
-            ctx.SaveChanges();
-        }
-        finally
-        {
-            ctx.Dispose();
-        }
-    }
-
-    public string Name => "sql";
-}
-
-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
-{
-    [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-    public ulong 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/BenchmarkContextModelSnapshot.cs

@@ -1,53 +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<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/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

@@ -10,15 +10,9 @@
     <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.0-rc.2" />
     </ItemGroup>
     <Import Project="..\MSBuild\Robust.Engine.targets" />
 </Project>

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.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/Audio/Midi/MidiRenderer.cs

@@ -619,7 +619,6 @@ namespace Robust.Client.Audio.Midi
             var seqEv = (SequencerEvent) midiEvent;
             seqEv.Dest = _debugEvents ? _debugRegister : _synthRegister;
             _sequencer.SendAt(seqEv, time, absolute);
-            seqEv.Dispose();
         }
 
         public void Dispose()

Robust.Client/BaseClient.cs

@@ -26,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!;
@@ -212,6 +213,7 @@ namespace Robust.Client
         {
             _entityManager.Startup();
             _mapManager.Startup();
+            _entityLookup.Startup();
 
             _timing.ResetSimTime();
             _timing.Paused = false;
@@ -222,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

@@ -47,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>();
@@ -71,6 +72,7 @@ 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>();

Robust.Client/Console/ClientConsoleHost.cs

@@ -109,13 +109,13 @@ namespace Robust.Client.Console
             if (AvailableCommands.ContainsKey(commandName))
             {
                 var playerManager = IoCManager.Resolve<IPlayerManager>();
-#if !DEBUG
+
                 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);

Robust.Client/Console/Commands/Debug.cs

@@ -168,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;
         }
     }
@@ -861,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/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/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.cs

@@ -50,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!;
@@ -454,7 +455,6 @@ namespace Robust.Client
         private void Tick(FrameEventArgs frameEventArgs)
         {
             _modLoader.BroadcastUpdate(ModUpdateLevel.PreEngine, frameEventArgs);
-            _console.CommandBufferExecute();
             _timerManager.UpdateTimers(frameEventArgs);
             _taskManager.ProcessPendingTasks();
 
@@ -470,6 +470,7 @@ namespace Robust.Client
                 // 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();
             }
 
             _modLoader.BroadcastUpdate(ModUpdateLevel.PostEngine, frameEventArgs);
@@ -509,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
@@ -574,6 +575,7 @@ namespace Robust.Client
 
             _networkManager.Shutdown("Client shutting down");
             _midiManager.Shutdown();
+            IoCManager.Resolve<IEntityLookup>().Shutdown();
             _entityManager.Shutdown();
             _clyde.Shutdown();
             _clydeAudio.Shutdown();

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();
@@ -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;
 
@@ -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/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!;
@@ -40,14 +40,13 @@ namespace Robust.Client.GameObjects
 
         public void AnchorStateChanged()
         {
-            var xform = _entityManager.GetComponent<TransformComponent>(Owner);
-            SendDirty(xform);
+            SendDirty();
 
-            if(!xform.Anchored)
+            if(!_entityManager.GetComponent<TransformComponent>(Owner).Anchored)
                 return;
 
-            var grid = _mapManager.GetGrid(xform.GridID);
-            _lastPosition = (xform.GridID, grid.TileIndicesFor(xform.Coordinates));
+            var grid = _mapManager.GetGrid(_entityManager.GetComponent<TransformComponent>(Owner).GridID);
+            _lastPosition = (_entityManager.GetComponent<TransformComponent>(Owner).GridID, grid.TileIndicesFor(_entityManager.GetComponent<TransformComponent>(Owner).Coordinates));
         }
 
         protected override void Shutdown()
@@ -57,10 +56,9 @@ namespace Robust.Client.GameObjects
             SendDirty();
         }
 
-        private void SendDirty(TransformComponent? xform = null)
+        private void SendDirty()
         {
-            xform ??= _entityManager.GetComponent<TransformComponent>(Owner);
-            if (xform.Anchored)
+            if (_entityManager.GetComponent<TransformComponent>(Owner).Anchored)
             {
                 _entityManager.EventBus.RaiseEvent(EventSource.Local,
                     new OccluderDirtyEvent(Owner, _lastPosition));
@@ -71,29 +69,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 +88,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 +103,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/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

@@ -84,16 +84,10 @@ namespace Robust.Client.GameObjects
 
                 foreach (var sprite in comp.SpriteTree.QueryAabb(localAABB))
                 {
-                    var (worldPos, worldRot) = _entityManager.GetComponent<TransformComponent>(sprite.Owner).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/EntitySystems/AppearanceSystem.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -7,7 +6,7 @@ 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();
 
@@ -51,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)
@@ -108,14 +84,12 @@ namespace Robust.Client.GameObjects
         {
             if (!Resolve(uid, ref appearanceComponent, false)) return;
 
-            var ev = new AppearanceChangeEvent
+            // Give it AppearanceData so we can still keep the friend attribute on the component.
+            EntityManager.EventBus.RaiseLocalEvent(uid, new AppearanceChangeEvent
             {
                 Component = appearanceComponent,
                 AppearanceData = appearanceComponent.AppearanceData,
-            };
-
-            // Give it AppearanceData so we can still keep the friend attribute on the component.
-            EntityManager.EventBus.RaiseLocalEvent(uid, ref ev);
+            });
 
             // Eventually visualizers would be nuked and we'd just make them components instead.
             foreach (var visualizer in appearanceComponent.Visualizers)
@@ -126,12 +100,11 @@ namespace Robust.Client.GameObjects
     }
 
     /// <summary>
-    ///     Raised whenever the appearance data for an entity changes.
+    /// Raised whenever the appearance data for an entity changes.
     /// </summary>
-    [ByRefEvent]
-    public struct AppearanceChangeEvent
+    public sealed class AppearanceChangeEvent : EntityEventArgs
     {
-        public AppearanceComponent Component;
-        public IReadOnlyDictionary<object, object> AppearanceData;
+        public AppearanceComponent Component = default!;
+        public IReadOnlyDictionary<object, object> AppearanceData = default!;
     }
 }

Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs

@@ -74,11 +74,8 @@ namespace Robust.Client.GameObjects
                 EntityManager.TryGetComponent(sender, out ClientOccluderComponent? iconSmooth)
                 && iconSmooth.Initialized)
             {
-                var xform = EntityManager.GetComponent<TransformComponent>(sender);
-                if (!_mapManager.TryGetGrid(xform.GridID, out var grid1))
-                    return;
-
-                var coords = xform.Coordinates;
+                var grid1 = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(sender).GridID);
+                var coords = EntityManager.GetComponent<TransformComponent>(sender).Coordinates;
 
                 _dirtyEntities.Enqueue(sender);
                 AddValidEntities(grid1.GetInDir(coords, Direction.North));

Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs

@@ -5,8 +5,6 @@ using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 using static Robust.Shared.Containers.ContainerManagerComponent;
 
@@ -133,51 +131,12 @@ namespace Robust.Client.GameObjects
                         continue;
                     }
 
-                    // If an entity is currently in the shadow realm, it means we probably left PVS and are now getting
-                    // back into range. We do not want to directly insert this entity, as IF the container and entity
-                    // transform states did not get sent simultaneously, the entity's transform will be modified by the
-                    // insert operation. This means it will then be reset to the shadow realm, causing it to be ejected
-                    // from the container. It would then subsequently be parented to the container without ever being
-                    // re-inserted, leading to the client seeing what should be hidden entities attached to
-                    // containers/players.
-                    if (Transform(entity).MapID == MapId.Nullspace)
-                    {
-                        AddExpectedEntity(entity, container);
-                        continue;
-                    }
-
                     if (!container.ContainedEntities.Contains(entity))
                         container.Insert(entity);
                 }
             }
         }
 
-        protected override void HandleParentChanged(ref EntParentChangedMessage message)
-        {
-            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())
-                return;
-
-            if (!ExpectedEntities.TryGetValue(message.Entity, out var container))
-                return;
-
-            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);
-
-            if (container.Deleted)
-                return;
-
-            container.Insert(message.Entity);
-        }
-
         private IContainer ContainerFactory(ContainerManagerComponent component, string containerType, string id)
         {
             var type = _serializer.FindSerializedType(typeof(IContainer), containerType);
@@ -210,101 +169,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/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;
@@ -72,7 +72,7 @@ namespace Robust.Client.GameObjects
                 {
                     foreach (var light in tree.LightTree)
                     {
-                        var aabb = _lookup.GetWorldAABB(light.Owner);
+                        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/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

@@ -70,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);
@@ -112,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;
@@ -132,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);
             }
         }
 
@@ -154,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)
         {
@@ -183,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)
         {
@@ -211,6 +212,13 @@ 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)
@@ -227,9 +235,9 @@ namespace Robust.Client.GameObjects
             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;
             }
@@ -237,9 +245,9 @@ 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, EntityQuery<TransformComponent> xforms)
@@ -361,10 +369,13 @@ namespace Robust.Client.GameObjects
         private Box2 SpriteAabbFunc(in SpriteComponent value)
         {
             var xforms = EntityManager.GetEntityQuery<TransformComponent>();
+
             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(value, worldPos, worldRot, xforms);
+            return tree == null ? bounds.CalcBoundingBox() : xforms.GetComponent(tree.Owner).InvWorldMatrix.TransformBox(bounds);
         }
 
         private Box2 LightAabbFunc(in PointLightComponent value)
@@ -381,7 +392,7 @@ namespace Robust.Client.GameObjects
 
         private Box2 SpriteAabbFunc(SpriteComponent value, Vector2 worldPos, Angle worldRot, EntityQuery<TransformComponent> xforms)
         {
-            var bounds = value.CalculateRotatedBoundingBox(worldPos, worldRot);
+            var bounds = new Box2Rotated(value.CalculateBoundingBox(worldPos), worldRot, worldPos);
             var tree = GetRenderTree(value.Owner, xforms);
 
             return tree == null ? bounds.CalcBoundingBox() : xforms.GetComponent(tree.Owner).InvWorldMatrix.TransformBox(bounds);

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

@@ -1,84 +0,0 @@
-using System;
-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!;
-
-    [Pure]
-    public Texture Frame0(SpriteSpecifier specifier)
-    {
-        return RsiStateLike(specifier).Default;
-    }
-
-    [Pure]
-    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:
-                if (!_proto.TryIndex<EntityPrototype>(prototypeIcon.EntityPrototypeId, out var prototype))
-                {
-                    Logger.Error("Failed to load PrototypeIcon {0}", prototypeIcon.EntityPrototypeId);
-                    return SpriteComponent.GetFallbackState(_resourceCache);
-                }
-
-                return SpriteComponent.GetPrototypeIcon(prototype, _resourceCache);
-
-            default:
-                throw new NotSupportedException();
-        }
-    }
-
-    [Pure]
-    public IRsiStateLike GetPrototypeIcon(EntityPrototype prototype, IResourceCache resourceCache)
-    {
-        var icon = IconComponent.GetPrototypeIcon(prototype, _resourceCache);
-        if (icon != null) return icon;
-
-        if (!prototype.Components.ContainsKey("Sprite"))
-        {
-            return SpriteComponent.GetFallbackState(resourceCache);
-        }
-
-        var dummy = Spawn(prototype.ID, MapCoordinates.Nullspace);
-        var spriteComponent = EnsureComp<SpriteComponent>(dummy);
-        var result = spriteComponent.Icon ?? SpriteComponent.GetFallbackState(resourceCache);
-        Del(dummy);
-
-        return result;
-    }
-
-    [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 SpriteComponent.GetFallbackState(_resourceCache);
-    }
-}

Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs

@@ -11,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!;

Robust.Client/GameObjects/EntitySystems/VisualizerSystem.cs

@@ -1,20 +0,0 @@
-using Robust.Shared.GameObjects;
-
-namespace Robust.Client.GameObjects;
-
-/// <summary>
-///     An abstract entity system inheritor for systems that deal with
-///     appearance data, replacing <see cref="AppearanceVisualizer"/>.
-/// </summary>
-public abstract class VisualizerSystem<T> : EntitySystem
-    where T: Component
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<T, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
-    protected virtual void OnAppearanceChange(EntityUid uid, T component, ref AppearanceChangeEvent args) {}
-}

Robust.Client/GameStates/ClientGameStateManager.cs

@@ -45,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!;
@@ -331,6 +332,8 @@ namespace Robust.Client.GameStates
             }
 
             _entities.TickUpdate((float) _timing.TickPeriod.TotalSeconds, noPredictions: !IsPredictionEnabled);
+
+            _lookup.Update();
         }
 
         private void ResetPredictedEntities(GameTick curTick)
@@ -347,7 +350,9 @@ namespace Robust.Client.GameStates
 
                 // 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))
                 {
@@ -365,9 +370,7 @@ 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);
@@ -421,6 +424,7 @@ namespace Robust.Client.GameStates
             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;

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/Clyde/Clyde.GridRendering.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Buffers;
 using System.Collections.Generic;
+using System.Diagnostics;
 using OpenToolkit.Graphics.OpenGL4;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -16,8 +18,8 @@ namespace Robust.Client.Graphics.Clyde
         private readonly Dictionary<GridId, Dictionary<Vector2i, MapChunkData>> _mapChunkData =
             new();
 
-        private int _verticesPerChunk(MapChunk chunk) => chunk.ChunkSize * chunk.ChunkSize * 4;
-        private int _indicesPerChunk(MapChunk chunk) => chunk.ChunkSize * chunk.ChunkSize * GetQuadBatchIndexCount();
+        private int _verticesPerChunk(IMapChunk chunk) => chunk.ChunkSize * chunk.ChunkSize * 4;
+        private int _indicesPerChunk(IMapChunk chunk) => chunk.ChunkSize * chunk.ChunkSize * GetQuadBatchIndexCount();
 
         private void _drawGrids(Viewport viewport, Box2Rotated worldBounds, IEye eye)
         {
@@ -76,7 +78,7 @@ namespace Robust.Client.Graphics.Clyde
             }
         }
 
-        private void _updateChunkMesh(IMapGrid grid, MapChunk chunk)
+        private void _updateChunkMesh(IMapGrid grid, IMapChunk chunk)
         {
             var data = _mapChunkData[grid.Index];
 
@@ -89,41 +91,25 @@ namespace Robust.Client.Graphics.Clyde
             Span<Vertex2D> vertexBuffer = stackalloc Vertex2D[_verticesPerChunk(chunk)];
 
             var i = 0;
-            var cSz = grid.ChunkSize;
-            var cScaled = chunk.Indices * cSz;
-            for (ushort x = 0; x < cSz; x++)
+            foreach (var tile in chunk)
             {
-                for (ushort y = 0; y < cSz; y++)
+                var regionMaybe = _tileDefinitionManager.TileAtlasRegion(tile.Tile);
+                if (regionMaybe == null)
                 {
-                    var tile = chunk.GetTile(x, y);
-                    if (tile.IsEmpty)
-                        continue;
-
-                    var regionMaybe = _tileDefinitionManager.TileAtlasRegion(tile);
-
-                    Box2 region;
-                    if (regionMaybe == null || regionMaybe.Length <= tile.Variant)
-                    {
-                        region = _tileDefinitionManager.ErrorTileRegion;
-                    }
-                    else
-                    {
-                        region = regionMaybe[tile.Variant];
-                    }
-
-                    var gx = x + cScaled.X;
-                    var gy = y + cScaled.Y;
-
-                    var vIdx = i * 4;
-                    vertexBuffer[vIdx + 0] = new Vertex2D(gx, gy, region.Left, region.Bottom);
-                    vertexBuffer[vIdx + 1] = new Vertex2D(gx + 1, gy, region.Right, region.Bottom);
-                    vertexBuffer[vIdx + 2] = new Vertex2D(gx + 1, gy + 1, region.Right, region.Top);
-                    vertexBuffer[vIdx + 3] = new Vertex2D(gx, gy + 1, region.Left, region.Top);
-                    var nIdx = i * GetQuadBatchIndexCount();
-                    var tIdx = (ushort)(i * 4);
-                    QuadBatchIndexWrite(indexBuffer, ref nIdx, tIdx);
-                    i += 1;
+                    continue;
                 }
+
+                var region = regionMaybe.Value;
+
+                var vIdx = i * 4;
+                vertexBuffer[vIdx + 0] = new Vertex2D(tile.X, tile.Y, region.Left, region.Bottom);
+                vertexBuffer[vIdx + 1] = new Vertex2D(tile.X + 1, tile.Y, region.Right, region.Bottom);
+                vertexBuffer[vIdx + 2] = new Vertex2D(tile.X + 1, tile.Y + 1, region.Right, region.Top);
+                vertexBuffer[vIdx + 3] = new Vertex2D(tile.X, tile.Y + 1, region.Left, region.Top);
+                var nIdx = i * GetQuadBatchIndexCount();
+                var tIdx = (ushort) (i * 4);
+                QuadBatchIndexWrite(indexBuffer, ref nIdx, tIdx);
+                i += 1;
             }
 
             GL.BindVertexArray(datum.VAO);
@@ -136,7 +122,7 @@ namespace Robust.Client.Graphics.Clyde
             datum.TileCount = i;
         }
 
-        private MapChunkData _initChunkBuffers(IMapGrid grid, MapChunk chunk)
+        private MapChunkData _initChunkBuffers(IMapGrid grid, IMapChunk chunk)
         {
             var vao = GenVertexArray();
             BindVertexArray(vao);
@@ -173,7 +159,7 @@ namespace Robust.Client.Graphics.Clyde
             return datum;
         }
 
-        private bool _isChunkDirty(IMapGrid grid, MapChunk chunk)
+        private bool _isChunkDirty(IMapGrid grid, IMapChunk chunk)
         {
             var data = _mapChunkData[grid.Index];
             return !data.TryGetValue(chunk.Indices, out var datum) || datum.Dirty;
@@ -189,7 +175,7 @@ namespace Robust.Client.Graphics.Clyde
             // Don't need to set it if we don't have an entry since lack of an entry is treated as dirty.
         }
 
-        private void _updateOnGridModified(GridModifiedEvent args)
+        private void _updateOnGridModified(object? sender, GridChangedEventArgs args)
         {
             foreach (var (pos, _) in args.Modified)
             {
@@ -199,23 +185,21 @@ namespace Robust.Client.Graphics.Clyde
             }
         }
 
-        private void _updateTileMapOnUpdate(TileChangedEvent args)
+        private void _updateTileMapOnUpdate(object? sender, TileChangedEventArgs args)
         {
             var grid = _mapManager.GetGrid(args.NewTile.GridIndex);
             var chunk = grid.GridTileToChunkIndices(new Vector2i(args.NewTile.X, args.NewTile.Y));
             _setChunkDirty(grid, chunk);
         }
 
-        private void _updateOnGridCreated(GridStartupEvent ev)
+        private void _updateOnGridCreated(MapId mapId, GridId gridId)
         {
-            var gridId = ev.GridId;
             Logger.DebugS("grid", $"Adding {gridId} to grid renderer");
             _mapChunkData.Add(gridId, new Dictionary<Vector2i, MapChunkData>());
         }
 
-        private void _updateOnGridRemoved(GridRemovalEvent ev)
+        private void _updateOnGridRemoved(MapId mapId, GridId gridId)
         {
-            var gridId = ev.GridId;
             Logger.DebugS("grid", $"Removing {gridId} from grid renderer");
 
             var data = _mapChunkData[gridId];

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

@@ -24,19 +24,11 @@ namespace Robust.Client.Graphics.Clyde
     {
         public ClydeDebugLayers DebugLayers { get; set; }
 
-        private readonly RefList<(SpriteComponent sprite, Vector2 worldPos, Angle worldRotation, Box2 spriteScreenBB)>
+        private readonly RefList<(SpriteComponent sprite, Matrix3 worldMatrix, Angle worldRotation, float yWorldPos)>
             _drawingSpriteList
                 =
                 new();
 
-        // TODO allow this scale to be passed with PostShader as variable
-        /// <summary>
-        ///     Some shaders that enlarge the final sprite, like emission or highlight effects, need to use a slightly larger render target.
-        /// </summary>
-        public static float PostShadeScale = 1.25f;
-
-        private List<Overlay> _overlays = new();
-
         public void Render()
         {
             CheckTransferringScreenshots();
@@ -154,19 +146,19 @@ namespace Robust.Client.Graphics.Clyde
 
         private List<Overlay> GetOverlaysForSpace(OverlaySpace space)
         {
-            _overlays.Clear();
+            var list = new List<Overlay>();
 
             foreach (var overlay in _overlayManager.AllOverlays)
             {
                 if ((overlay.Space & space) != 0)
                 {
-                    _overlays.Add(overlay);
+                    list.Add(overlay);
                 }
             }
 
-            _overlays.Sort(OverlayComparer.Instance);
+            list.Sort(OverlayComparer.Instance);
 
-            return _overlays;
+            return list;
         }
 
         private ClydeTexture? ScreenBufferTexture;
@@ -225,8 +217,9 @@ namespace Robust.Client.Graphics.Clyde
             RenderOverlays(viewport, OverlaySpace.WorldSpaceBelowEntities, worldAABB, worldBounds);
 
             var screenSize = viewport.Size;
+            eye.GetViewMatrix(out var eyeMatrix, eye.Scale);
 
-            ProcessSpriteEntities(mapId, viewport, eye, worldBounds, _drawingSpriteList);
+            ProcessSpriteEntities(mapId, eyeMatrix, worldBounds, _drawingSpriteList);
 
             var worldOverlays = new List<Overlay>();
 
@@ -283,12 +276,30 @@ namespace Robust.Client.Graphics.Clyde
                     break;
                 }
 
+                var matrix = entry.worldMatrix;
+                var worldPosition = new Vector2(matrix.R0C2, matrix.R1C2);
+
                 RenderTexture? entityPostRenderTarget = null;
                 Vector2i roundedPos = default;
                 if (entry.sprite.PostShader != null)
                 {
-                    // get the size of the sprite on screen, scaled slightly to allow for shaders that increase the final sprite size.
-                    var screenSpriteSize = (Vector2i) (entry.spriteScreenBB.Size * PostShadeScale).Rounded();
+                    // calculate world bounding box
+                    var spriteBB = entry.sprite.CalculateBoundingBox(worldPosition);
+                    var spriteLB = spriteBB.BottomLeft;
+                    var spriteRT = spriteBB.TopRight;
+
+                    // finally we can calculate screen bounding in pixels
+                    var screenLB = viewport.WorldToLocal(spriteLB);
+                    var screenRT = viewport.WorldToLocal(spriteRT);
+
+                    // we need to scale RT a for effects like emission or highlight
+                    // scale can be passed with PostShader as variable in future
+                    var postShadeScale = 1.25f;
+                    var screenSpriteSize = (Vector2i) ((screenRT - screenLB) * postShadeScale).Rounded();
+
+                    // Rotate the vector by the eye angle, otherwise the bounding box will be incorrect
+                    screenSpriteSize = (Vector2i) eye.Rotation.RotateVec(screenSpriteSize).Rounded();
+                    screenSpriteSize.Y = -screenSpriteSize.Y;
 
                     // I'm not 100% sure why it works, but without it post-shader
                     // can be lower or upper by 1px than original sprite depending on sprite rotation or scale
@@ -311,14 +322,16 @@ namespace Robust.Client.Graphics.Clyde
                         // Calculate viewport so that the entity thinks it's drawing to the same position,
                         // which is necessary for light application,
                         // but it's ACTUALLY drawing into the center of the render target.
-                        roundedPos = (Vector2i) entry.spriteScreenBB.Center;
-                        var flippedPos = new Vector2i(roundedPos.X, screenSize.Y - roundedPos.Y);
+                        var spritePos = spriteBB.Center;
+                        var screenPos = viewport.WorldToLocal(spritePos);
+                        var (roundedX, roundedY) = roundedPos = (Vector2i) screenPos;
+                        var flippedPos = new Vector2i(roundedX, screenSize.Y - roundedY);
                         flippedPos -= entityPostRenderTarget.Size / 2;
                         _renderHandle.Viewport(Box2i.FromDimensions(-flippedPos, screenSize));
                     }
                 }
 
-                entry.sprite.Render(_renderHandle.DrawingHandleWorld, eye.Rotation, in entry.worldRotation, in entry.worldPos);
+                entry.sprite.Render(_renderHandle.DrawingHandleWorld, eye.Rotation, in entry.worldRotation, in worldPosition);
 
                 if (entry.sprite.PostShader != null && entityPostRenderTarget != null)
                 {
@@ -356,26 +369,17 @@ namespace Robust.Client.Graphics.Clyde
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
-        private void ProcessSpriteEntities(MapId map, Viewport view, IEye eye, Box2Rotated worldBounds,
-            RefList<(SpriteComponent sprite, Vector2 worldPos, Angle worldRot, Box2 spriteScreenBB)> list)
+        private void ProcessSpriteEntities(MapId map, Matrix3 eyeMatrix, Box2Rotated worldBounds,
+            RefList<(SpriteComponent sprite, Matrix3 matrix, Angle worldRot, float yWorldPos)> list)
         {
             var xforms = _entityManager.GetEntityQuery<TransformComponent>();
 
-            // Construct a matrix equivalent for Viewport.WorldToLocal()
-            eye.GetViewMatrix(out var viewMatrix, view.RenderScale);
-            var uiProjmatrix = Matrix3.Identity;
-            uiProjmatrix.R0C0 = EyeManager.PixelsPerMeter;
-            uiProjmatrix.R1C1 = -EyeManager.PixelsPerMeter;
-            uiProjmatrix.R0C2 = view.Size.X / 2f;
-            uiProjmatrix.R1C2 = view.Size.Y / 2f;
-            var worldToLocal = viewMatrix * uiProjmatrix;
-
             foreach (var comp in _entitySystemManager.GetEntitySystem<RenderingTreeSystem>().GetRenderTrees(map, worldBounds))
             {
                 var bounds = xforms.GetComponent(comp.Owner).InvWorldMatrix.TransformBox(worldBounds);
 
                 comp.SpriteTree.QueryAabb(ref list, (
-                    ref RefList<(SpriteComponent sprite, Vector2 worldPos, Angle worldRot, Box2 spriteScreenBB)> state,
+                    ref RefList<(SpriteComponent sprite, Matrix3 matrix, Angle worldRot, float yWorldPos)> state,
                     in SpriteComponent value) =>
                 {
                     var entity = value.Owner;
@@ -383,10 +387,12 @@ namespace Robust.Client.Graphics.Clyde
 
                     ref var entry = ref state.AllocAdd();
                     entry.sprite = value;
-                    (entry.worldPos, entry.worldRot) = transform.GetWorldPositionRotation();
-
-                    var spriteWorldBB = value.CalculateRotatedBoundingBox(entry.worldPos, entry.worldRot, eye);
-                    entry.spriteScreenBB = worldToLocal.TransformBox(spriteWorldBB);
+                    Vector2 worldPos;
+                    (worldPos, entry.worldRot, entry.matrix) = transform.GetWorldPositionRotationMatrix();
+                    var eyePos = eyeMatrix.Transform(worldPos);
+                    // Didn't use the bounds from the query as that has to be re-calculated (and is probably more expensive than this).
+                    var bounds = value.CalculateBoundingBox(eyePos);
+                    entry.yWorldPos = eyePos.Y - bounds.Extents.Y;
                     return true;
 
                 }, bounds, true);

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

@@ -514,14 +514,14 @@ namespace Robust.Client.Graphics.Clyde
             var enlargedBounds = worldAABB.Enlarged(renderingTreeSystem.MaxLightRadius);
 
             // Use worldbounds for this one as we only care if the light intersects our actual bounds
-            var state = (this, worldAABB, count: 0, shadowCastingCount: 0);
+            var state = (this, worldAABB, count: 0);
             var xforms = _entityManager.GetEntityQuery<TransformComponent>();
 
             foreach (var comp in renderingTreeSystem.GetRenderTrees(map, enlargedBounds))
             {
                 var bounds = xforms.GetComponent(comp.Owner).InvWorldMatrix.TransformBox(worldBounds);
 
-                comp.LightTree.QueryAabb(ref state, (ref (Clyde clyde, Box2 worldAABB, int count, int shadowCastingCount) state, in PointLightComponent light) =>
+                comp.LightTree.QueryAabb(ref state, (ref (Clyde clyde, Box2 worldAABB, int count) state, in PointLightComponent light) =>
                 {
                     if (state.count >= LightsToRenderListSize)
                     {
@@ -543,9 +543,6 @@ namespace Robust.Client.Graphics.Clyde
                         return true;
                     }
 
-                    // If the light is a shadow casting light, keep a separate track of that
-                    if (light.CastShadows) state.shadowCastingCount++;
-
                     float distanceSquared = (state.worldAABB.Center - lightPos).LengthSquared;
                     state.clyde._lightsToRenderList[state.count++] = (light, lightPos, distanceSquared);
 
@@ -553,29 +550,17 @@ namespace Robust.Client.Graphics.Clyde
                 }, bounds);
             }
 
-            if (state.shadowCastingCount > _maxLightsPerScene)
+            if (state.count > _maxLightsPerScene)
             {
-                // There are too many lights casting shadows to fit in the scene.
+                // There are too many lights to fit in the scene.
                 // This check must occur before occluder expansion, or else bad things happen.
-
-                // First, partition the array based on whether the lights are shadow casting or not
-                // (non shadow casting lights should be the first partition, shadow casting lights the second)
+                // Sort lights by distance.
                 Array.Sort(_lightsToRenderList, 0, state.count, Comparer<(PointLightComponent light, Vector2 pos, float distanceSquared)>.Create((x, y) =>
-                {
-                    if (x.light.CastShadows && !y.light.CastShadows) return 1;
-                    else if (!x.light.CastShadows && y.light.CastShadows) return -1;
-                    else return 0;
-                }));
-
-                // Next, sort just the shadow casting lights by distance.
-                Array.Sort(_lightsToRenderList, state.count - state.shadowCastingCount, state.shadowCastingCount, Comparer<(PointLightComponent light, Vector2 pos, float distanceSquared)>.Create((x, y) =>
                 {
                     return x.distanceSquared.CompareTo(y.distanceSquared);
                 }));
-
-                // Then effectively delete the furthest lights, by setting the end of the array to exclude N
-                // number of shadow casting lights (where N is the number above the max number per scene.)
-                state.count -= state.shadowCastingCount - _maxLightsPerScene;
+                // Then effectively delete the furthest lights.
+                state.count = _maxLightsPerScene;
             }
 
             // When culling occluders later, we can't just remove any occluders outside the worldBounds.
@@ -861,6 +846,7 @@ namespace Robust.Client.Graphics.Clyde
             // 3D geometry used during depth projection.
             // 2D mask geometry used to apply wall bleed.
 
+            // TODO: This code probably does not work correctly with rotated camera.
             // TODO: Yes this function throws and index exception if you reach maxOccluders.
 
             const int maxOccluders = 2048;

Robust.Client/Graphics/Clyde/Clyde.Rendering.cs

@@ -994,9 +994,9 @@ namespace Robust.Client.Graphics.Clyde
 
         private sealed class SpriteDrawingOrderComparer : IComparer<int>
         {
-            private readonly RefList<(SpriteComponent, Vector2, Angle, Box2)> _drawList;
+            private readonly RefList<(SpriteComponent, Matrix3, Angle, float)> _drawList;
 
-            public SpriteDrawingOrderComparer(RefList<(SpriteComponent, Vector2, Angle, Box2)> drawList)
+            public SpriteDrawingOrderComparer(RefList<(SpriteComponent, Matrix3, Angle, float)> drawList)
             {
                 _drawList = drawList;
             }
@@ -1019,8 +1019,7 @@ namespace Robust.Client.Graphics.Clyde
                     return cmp;
                 }
 
-                // compare the top of the sprite's BB for y-sorting. Because screen coordinates are flipped, the "top" of the BB is actually the "bottom".
-                cmp = _drawList[x].Item4.Top.CompareTo(_drawList[y].Item4.Top);
+                cmp = _drawList[y].Item4.CompareTo(_drawList[x].Item4);
 
                 if (cmp != 0)
                 {

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

@@ -437,13 +437,6 @@ namespace Robust.Client.Graphics.Clyde
             _windowing!.WindowSetVisible(reg, visible);
         }
 
-        public void RunOnWindowThread(Action a)
-        {
-            DebugTools.AssertNotNull(_windowing);
-
-            _windowing!.RunOnWindowThread(a);
-        }
-
         private abstract class WindowReg
         {
             public bool IsDisposed;

Robust.Client/Graphics/Clyde/Clyde.cs

@@ -22,7 +22,7 @@ namespace Robust.Client.Graphics.Clyde
     /// <summary>
     ///     Responsible for most things rendering on OpenGL mode.
     /// </summary>
-    internal sealed partial class Clyde : IClydeInternal, IPostInjectInit, IEntityEventSubscriber
+    internal sealed partial class Clyde : IClydeInternal, IPostInjectInit
     {
         [Dependency] private readonly IClydeTileDefinitionManager _tileDefinitionManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
@@ -134,19 +134,16 @@ namespace Robust.Client.Graphics.Clyde
 
         public void PostInject()
         {
+            _mapManager.TileChanged += _updateTileMapOnUpdate;
+            _mapManager.OnGridCreated += _updateOnGridCreated;
+            _mapManager.OnGridRemoved += _updateOnGridRemoved;
+            _mapManager.GridChanged += _updateOnGridModified;
+
             // This cvar does not modify the actual GL version requested or anything,
             // it overrides the version we detect to detect GL features.
             RegisterBlockCVars();
         }
 
-        public void RegisterGridEcsEvents()
-        {
-            _entityManager.EventBus.SubscribeEvent<TileChangedEvent>(EventSource.Local, this, _updateTileMapOnUpdate);
-            _entityManager.EventBus.SubscribeEvent<GridStartupEvent>(EventSource.Local, this, _updateOnGridCreated);
-            _entityManager.EventBus.SubscribeEvent<GridRemovalEvent>(EventSource.Local, this, _updateOnGridRemoved);
-            _entityManager.EventBus.SubscribeEvent<GridModifiedEvent>(EventSource.Local, this, _updateOnGridModified);
-        }
-
         private void GLInitBindings(bool gles)
         {
             _glBindingsContext = _glContext!.BindingsContext;

Robust.Client/Graphics/Clyde/ClydeHeadless.cs

@@ -76,11 +76,6 @@ namespace Robust.Client.Graphics.Clyde
             return null;
         }
 
-        public void RegisterGridEcsEvents()
-        {
-            // Nada.
-        }
-
         public void SetWindowTitle(string title)
         {
             // Nada.
@@ -251,11 +246,6 @@ namespace Robust.Client.Graphics.Clyde
             // Nada.
         }
 
-        public void RunOnWindowThread(Action action)
-        {
-            action();
-        }
-
         private sealed class DummyCursor : ICursor
         {
             public void Dispose()

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

@@ -118,10 +118,6 @@ namespace Robust.Client.Graphics.Clyde
                     case CmdWinCursorSet cmd:
                         WinThreadWinCursorSet(cmd);
                         break;
-
-                    case CmdRunAction cmd:
-                        cmd.Action();
-                        break;
                 }
             }
 
@@ -173,11 +169,6 @@ namespace Robust.Client.Graphics.Clyde
                 }
             }
 
-            public void RunOnWindowThread(Action action)
-            {
-                SendCmd(new CmdRunAction(action));
-            }
-
             private abstract record CmdBase;
 
             private sealed record CmdTerminate : CmdBase;
@@ -254,10 +245,6 @@ namespace Robust.Client.Graphics.Clyde
             private sealed record CmdCursorDestroy(
                 ClydeHandle Cursor
             ) : CmdBase;
-
-            private sealed record CmdRunAction(
-                Action Action
-            ) : CmdBase;
         }
     }
 }

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

@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Robust.Client.Input;
 using Robust.Shared.Maths;
 using SixLabors.ImageSharp;
@@ -59,9 +58,6 @@ namespace Robust.Client.Graphics.Clyde
             void GLMakeContextCurrent(WindowReg? reg);
             void GLSwapInterval(int interval);
             unsafe void* GLGetProcAddress(string procName);
-
-            // Misc
-            void RunOnWindowThread(Action a);
         }
     }
 }

Robust.Client/Graphics/FontManager.cs

@@ -9,7 +9,6 @@ using Robust.Shared.Utility;
 using SharpFont;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
-using TerraFX.Interop.Windows;
 
 namespace Robust.Client.Graphics
 {
@@ -59,14 +58,6 @@ namespace Robust.Client.Graphics
             return instance;
         }
 
-        public void ClearFontCache()
-        {
-            foreach (var fontInstance in _loadedInstances)
-            {
-                fontInstance.Value.ClearSizeData();
-            }
-        }
-
         private ScaledFontData _generateScaledDatum(FontInstanceHandle instance, float scale)
         {
             var ftFace = instance.FaceHandle.Face;
@@ -255,18 +246,6 @@ namespace Robust.Client.Graphics
                 FaceHandle = faceHandle;
             }
 
-            public void ClearSizeData()
-            {
-                foreach (var scaleData in _scaledData)
-                {
-                    foreach (var ownedTexture in scaleData.Value.AtlasTextures)
-                    {
-                        ownedTexture.Dispose();
-                    }
-                }
-                _scaledData.Clear();
-            }
-
             public Texture? GetCharTexture(Rune codePoint, float scale)
             {
                 var glyph = GetGlyph(codePoint);

Robust.Client/Graphics/IClydeInternal.cs

@@ -61,9 +61,5 @@ namespace Robust.Client.Graphics
 
         /// <returns>Null if not running on X11.</returns>
         uint? GetX11WindowId();
-
-        void RegisterGridEcsEvents();
-
-        void RunOnWindowThread(Action action);
     }
 }

Robust.Client/Graphics/IFontManager.cs

@@ -5,8 +5,9 @@ namespace Robust.Client.Graphics
 {
     public interface IFontManager
     {
-        public void ClearFontCache();
+
     }
+
     internal interface IFontManagerInternal : IFontManager
     {
         IFontFaceHandle Load(Stream stream);

Robust.Client/Graphics/RSI/RSI.State.cs

@@ -152,12 +152,9 @@ namespace Robust.Client.Graphics
             /// <summary>
             ///     Specifies a direction in an RSI state.
             /// </summary>
-            /// <remarks>
-            ///     Value of the enum here matches the index used to store it in the icons array. If this ever changes, then
-            ///     <see cref="GameObjects.SpriteComponent.Layer._rsiDirectionMatrices"/> also needs to be updated.
-            /// </remarks>
             public enum Direction : byte
             {
+                // Value of the enum here matches the index used to store it in the icons array.
                 South = 0,
                 North = 1,
                 East = 2,

Robust.Client/Map/ClydeTileDefinitionManager.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.Utility;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
@@ -22,20 +22,11 @@ namespace Robust.Client.Map
 
         public Texture TileTextureAtlas => _tileTextureAtlas ?? Texture.Transparent;
 
-        private readonly Dictionary<ushort, Box2[]> _tileRegions = new();
+        private readonly Dictionary<ushort, Box2> _tileRegions = new();
 
-        public Box2 ErrorTileRegion { get; private set; }
-
-        /// <inheritdoc />
-        public Box2[]? TileAtlasRegion(Tile tile)
+        public Box2? TileAtlasRegion(Tile tile)
         {
-            return TileAtlasRegion(tile.TypeId);
-        }
-
-        /// <inheritdoc />
-        public Box2[]? TileAtlasRegion(ushort tileType)
-        {
-            if (_tileRegions.TryGetValue(tileType, out var region))
+            if (_tileRegions.TryGetValue(tile.TypeId, out var region))
             {
                 return region;
             }
@@ -60,79 +51,39 @@ namespace Robust.Client.Map
 
             const int tileSize = EyeManager.PixelsPerMeter;
 
-            var tileCount = defList.Select(x => (int)x.Variants).Sum() + 1;
+            var dimensionX = (int) Math.Ceiling(Math.Sqrt(defList.Count));
+            var dimensionY = (int) Math.Ceiling((float) defList.Count / dimensionX);
 
-            var dimensionX = (int) Math.Ceiling(Math.Sqrt(tileCount));
-            var dimensionY = (int) Math.Ceiling((float) tileCount / dimensionX);
+            var sheet = new Image<Rgba32>(dimensionX * tileSize, dimensionY * tileSize);
 
-            var imgWidth = dimensionX * tileSize;
-            var imgHeight = dimensionY * tileSize;
-            var sheet = new Image<Rgba32>(imgWidth, imgHeight);
-
-            // Add in the missing tile texture sprite as tile texture 0.
+            for (var i = 0; i < defList.Count; i++)
             {
-                var w = (float) sheet.Width;
-                var h = (float) sheet.Height;
-                ErrorTileRegion = Box2.FromDimensions(
-                    0, (h - EyeManager.PixelsPerMeter) / h,
-                    tileSize / w, tileSize / h);
-                Image<Rgba32> image;
-                using (var stream = _resourceCache.ContentFileRead("/Textures/noTile.png"))
-                {
-                    image = Image.Load<Rgba32>(stream);
-                }
+                var def = defList[i];
+                var column = i % dimensionX;
+                var row = i / dimensionX;
 
-                image.Blit(new UIBox2i(0, 0, tileSize, tileSize), sheet, Vector2i.Zero);
-            }
-
-            if (imgWidth >= 2048 || imgHeight >= 2048)
-            {
-                // Sanity warning, some machines don't have textures larger than this and need multiple atlases.
-                Logger.WarningS("clyde",
-                    $"Tile texture atlas is ({imgWidth} x {imgHeight}), larger than 2048 x 2048. If you really need {tileCount} tiles, file an issue on RobustToolbox.");
-            }
-
-            var column = 1;
-            var row = 0;
-            foreach (var def in defList)
-            {
                 Image<Rgba32> image;
                 using (var stream = _resourceCache.ContentFileRead(new ResourcePath(def.Path) / $"{def.SpriteName}.png"))
                 {
                     image = Image.Load<Rgba32>(stream);
                 }
 
-                if (image.Width != (tileSize * def.Variants) || image.Height != tileSize)
+                if (image.Width != tileSize || image.Height != tileSize)
                 {
-                    throw new NotSupportedException(
-                        $"Unable to load {new ResourcePath(def.Path) / $"{def.SpriteName}.png"}, due to being unable to use tile texture with a dimension other than {tileSize}x({tileSize} * Variants).");
+                    throw new NotSupportedException("Unable to use tiles with a dimension other than 32x32.");
                 }
 
-                var regionList = new Box2[def.Variants];
+                var point = new Vector2i(column * tileSize, row * tileSize);
 
-                for (var j = 0; j < def.Variants; j++)
-                {
-                    var point = new Vector2i(column * tileSize, row * tileSize);
+                image.Blit(new UIBox2i(0, 0, image.Width, image.Height), sheet, point);
 
-                    var box = new UIBox2i(0, 0, tileSize, tileSize).Translated(new Vector2i(j * tileSize, 0));
-                    image.Blit(box, sheet, point);
+                var w = (float) sheet.Width;
+                var h = (float) sheet.Height;
 
-                    var w = (float) sheet.Width;
-                    var h = (float) sheet.Height;
-
-                    regionList[j] = Box2.FromDimensions(
+                _tileRegions.Add(def.TileId,
+                    Box2.FromDimensions(
                         point.X / w, (h - point.Y - EyeManager.PixelsPerMeter) / h,
-                        tileSize / w, tileSize / h);
-                    column++;
-
-                    if (column >= dimensionX)
-                    {
-                        column = 0;
-                        row++;
-                    }
-                }
-
-                _tileRegions.Add(def.TileId, regionList);
+                        tileSize / w, tileSize / h));
             }
 
             _tileTextureAtlas = Texture.LoadFromImage(sheet, "Tile Atlas");

Robust.Client/Map/IClydeTileDefinitionManager.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Robust.Client.Graphics;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
@@ -10,8 +9,6 @@ namespace Robust.Client.Map
     /// </summary>
     internal interface IClydeTileDefinitionManager : ITileDefinitionManager
     {
-        Box2 ErrorTileRegion { get; }
-
         /// <summary>
         ///     The texture atlas containing all the tiles.
         /// </summary>
@@ -21,12 +18,6 @@ namespace Robust.Client.Map
         ///     Gets the region inside the texture atlas to use to draw a tile.
         /// </summary>
         /// <returns>If null, do not draw the tile at all.</returns>
-        Box2[]? TileAtlasRegion(Tile tile);
-
-        /// <summary>
-        ///     Gets the region inside the texture atlas to use to draw a tile type.
-        /// </summary>
-        /// <returns>If null, do not draw the tile at all.</returns>
-        Box2[]? TileAtlasRegion(ushort tileType);
+        Box2? TileAtlasRegion(Tile tile);
     }
 }

Robust.Client/Physics/PhysicsSystem.cs

@@ -37,7 +37,7 @@ namespace Robust.Client.Physics
             SimulateWorld((float) diff.TotalSeconds, true);
         }
 
-        protected override void HandleMapCreated(MapChangedEvent eventArgs)
+        protected override void HandleMapCreated(object? sender, MapEventArgs eventArgs)
         {
             if (eventArgs.Map == MapId.Nullspace) return;
             var mapUid = MapManager.GetMapEntityId(eventArgs.Map);

Robust.Client/Placement/Modes/AlignSimilar.cs

@@ -31,7 +31,7 @@ namespace Robust.Client.Placement.Modes
 
             var mapId = MouseCoords.GetMapId(pManager.EntityManager);
 
-            var snapToEntities = EntitySystem.Get<EntityLookupSystem>().GetEntitiesInRange(MouseCoords, SnapToRange)
+            var snapToEntities = IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(MouseCoords, SnapToRange)
                 .Where(entity => pManager.EntityManager.GetComponent<MetaDataComponent>(entity).EntityPrototype == pManager.CurrentPrototype && pManager.EntityManager.GetComponent<TransformComponent>(entity).MapID == mapId)
                 .OrderBy(entity => (pManager.EntityManager.GetComponent<TransformComponent>(entity).WorldPosition - MouseCoords.ToMapPos(pManager.EntityManager)).LengthSquared)
                 .ToList();

Robust.Client/Placement/Modes/AlignTileEmpty.cs

@@ -53,7 +53,7 @@ namespace Robust.Client.Placement.Modes
             var topRight = new Vector2(CurrentTile.X + 0.99f, CurrentTile.Y + 0.99f);
             var box = new Box2(bottomLeft, topRight);
 
-            return !EntitySystem.Get<EntityLookupSystem>().AnyEntitiesIntersecting(map, box);
+            return !IoCManager.Resolve<IEntityLookup>().AnyEntitiesIntersecting(map, box);
         }
     }
 }

Robust.Client/Placement/PlacementManager.cs

@@ -22,7 +22,7 @@ using Robust.Shared.Utility;
 
 namespace Robust.Client.Placement
 {
-    public sealed partial class PlacementManager : IPlacementManager, IDisposable, IEntityEventSubscriber
+    public sealed partial class PlacementManager : IPlacementManager, IDisposable
     {
         [Dependency] private readonly IClientNetManager NetworkManager = default!;
         [Dependency] public readonly IPlayerManager PlayerManager = default!;
@@ -185,7 +185,7 @@ namespace Robust.Client.Placement
                 _modeDictionary.Add(type.Name, type);
             }
 
-            EntityManager.EventBus.SubscribeEvent<TileChangedEvent>(EventSource.Local, this, HandleTileChanged);
+            MapManager.TileChanged += HandleTileChanged;
 
             _drawOverlay = new PlacementOverlay(this);
             _overlayManager.AddOverlay(_drawOverlay);
@@ -328,7 +328,7 @@ namespace Robust.Client.Placement
             }
         }
 
-        private void HandleTileChanged(TileChangedEvent args)
+        private void HandleTileChanged(object? sender, TileChangedEventArgs args)
         {
             var coords = MapManager.GetGrid(args.NewTile.GridIndex).GridTileToLocal(args.NewTile.GridIndices);
             _pendingTileChanges.RemoveAll(c => c.Item1 == coords);

Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs

@@ -230,7 +230,7 @@ namespace Robust.Client.ResourceManagement
 
             using (var manifestFile = cache.ContentFileRead(manifestPath))
             {
-                if (manifestFile.CanSeek && manifestFile.Length <= 4096)
+                if (manifestFile.Length <= 4096)
                 {
                     // Most RSIs are actually tiny so if that's the case just load them into a stackalloc buffer.
                     // Avoids a ton of allocations with stream reader etc

Robust.Client/Robust.Client.csproj

@@ -13,8 +13,8 @@
   <Import Project="..\MSBuild\Robust.DefineConstants.targets" />
   <ItemGroup>
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
-    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.2" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.3" />
     <PackageReference Include="nfluidsynth" Version="0.3.1" />
     <PackageReference Include="NVorbis" Version="0.10.1" />
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
@@ -25,9 +25,9 @@
     <PackageReference Include="TerraFX.Interop.Windows" Version="10.0.20348-rc2" />
   </ItemGroup>
   <ItemGroup Condition="'$(EnableClientScripting)' == 'True'">
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.0.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="3.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
 
     <ProjectReference Include="..\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj" />
   </ItemGroup>
@@ -53,7 +53,6 @@
     <Compile Update="UserInterface\CustomControls\DefaultWindow.xaml.cs">
       <DependentUpon>DefaultWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Remove="Debugging\IDebugDrawing.cs" />
   </ItemGroup>
   <Import Project="..\MSBuild\Robust.Engine.targets" />
   <PropertyGroup>

Robust.Client/UserInterface/Controls/WindowRoot.cs

@@ -1,6 +1,4 @@
 using Robust.Client.Graphics;
-using Robust.Shared.Maths;
-using Robust.Shared.ViewVariables;
 
 namespace Robust.Client.UserInterface.Controls
 {
@@ -11,30 +9,6 @@ namespace Robust.Client.UserInterface.Controls
             Window = window;
         }
 
-        /// <summary>
-        ///     Enable the UI autoscale system, this will scale down the UI for lower resolutions
-        /// </summary>
-        [ViewVariables]
-        public bool AutoScale { get; set; } = false;
-
-        /// <summary>
-        ///     Minimum resolution to start clamping autoscale to 1
-        /// </summary>
-        [ViewVariables]
-        public Vector2i AutoScaleUpperCutoff { get; set; } = new Vector2i(1080, 720);
-
-        /// <summary>
-        ///     Maximum resolution to start clamping autos scale to autoscale minimum
-        /// </summary>
-        [ViewVariables]
-        public Vector2i AutoScaleLowerCutoff { get; set; } = new Vector2i(520, 520);
-
-        /// <summary>
-        ///     The minimum ui scale value that autoscale will scale to
-        /// </summary>
-        [ViewVariables]
-        public float AutoScaleMinimum { get; set; } = 0.5f;
-
         public override float UIScale => UIScaleSet;
         internal float UIScaleSet { get; set; }
         public override IClydeWindow Window { get; }

Robust.Client/UserInterface/CustomControls/DebugCoordsPanel.cs

@@ -102,18 +102,13 @@ Mouse Pos:
                 var playerScreen = _eyeManager.WorldToScreen(playerWorldOffset.Position);
 
                 var playerCoordinates = entityTransform.Coordinates;
-                var playerRotation = entityTransform.WorldRotation;
-
-                Angle gridRotation = _mapManager.TryGetGrid(entityTransform.GridID, out var grid) ? grid.WorldRotation : Angle.Zero;
 
                 stringBuilder.AppendFormat(@"    Screen: {0}
     {1}
     {2}
-    Rotation: {3:F2}°
-    EntId: {4}
-    GridID: {5}
-    Grid Rotation: {6:F2}°", playerScreen, playerWorldOffset, playerCoordinates, playerRotation.Degrees, entityTransform.Owner,
-                    entityTransform.GridID, gridRotation.Degrees);
+    EntId: {3}
+    GridID: {4}", playerScreen, playerWorldOffset, playerCoordinates, entityTransform.Owner,
+                    entityTransform.GridID);
             }
 
             if (controlHovered != null)

Robust.Client/UserInterface/FileDialogManager.cs

@@ -8,7 +8,6 @@ using System.Text;
 using System.Threading.Tasks;
 using Robust.Client.Graphics;
 using Robust.Shared;
-using Robust.Shared.Console;
 using Robust.Shared.Asynchronous;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -165,11 +164,12 @@ namespace Robust.Client.UserInterface
         {
             if (OperatingSystem.IsMacOS())
             {
-                // macOS seems pretty annoying about having the file dialog opened from the main windowing thread.
-                // So we are forced to execute this synchronously on the main windowing thread.
-                // nativefiledialog doesn't provide any form of async API, so this WILL lock up half the client.
+                // macOS seems pretty annoying about having the file dialog opened from the main thread.
+                // So we are forced to execute this synchronously on the main thread.
+                // Also I'm calling RunOnMainThread here to provide safety in case this is ran from a different thread.
+                // nativefiledialog doesn't provide any form of async API, so this WILL lock up the client.
                 var tcs = new TaskCompletionSource<string?>();
-                _clyde.RunOnWindowThread(() => tcs.SetResult(action()));
+                _taskManager.RunOnMainThread(() => tcs.SetResult(action()));
 
                 return tcs.Task;
             }
@@ -388,17 +388,4 @@ namespace Robust.Client.UserInterface
             SW_NFD_CANCEL,
         }
     }
-
-    public sealed class OpenFileCommand : IConsoleCommand
-    {
-        public string Command => "testopenfile";
-        public string Description => "";
-        public string Help => "";
-
-        public async void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            var stream = await IoCManager.Resolve<IFileDialogManager>().OpenFile();
-            stream?.Dispose();
-        }
-    }
 }

Robust.Client/UserInterface/UserInterfaceManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Robust.Client.Graphics;
@@ -23,7 +23,6 @@ namespace Robust.Client.UserInterface
     internal sealed class UserInterfaceManager : IUserInterfaceManagerInternal
     {
         [Dependency] private readonly IInputManager _inputManager = default!;
-        [Dependency] private readonly IFontManager _fontManager = default!;
         [Dependency] private readonly IClydeInternal _clyde = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -372,21 +371,16 @@ namespace Robust.Client.UserInterface
                 }
             }
 
+            ReleaseKeyboardFocus();
 
             if (hit == null)
             {
-                ReleaseKeyboardFocus();
                 hitData = null;
                 return false;
             }
 
             var (control, rel) = hit.Value;
 
-            if (control != KeyboardFocused)
-            {
-                ReleaseKeyboardFocus();
-            }
-
             ControlFocused = control;
 
             if (ControlFocused.CanKeyboardFocus && ControlFocused.KeyboardFocusOnClick)
@@ -957,37 +951,14 @@ namespace Robust.Client.UserInterface
         private void WindowContentScaleChanged(WindowContentScaleEventArgs args)
         {
             if (_windowsToRoot.TryGetValue(args.Window.Id, out var root))
-            {
                 UpdateUIScale(root);
-                _fontManager.ClearFontCache();
-            }
-
-        }
-
-        private float CalculateAutoScale(WindowRoot root)
-        {
-            //Grab the OS UIScale or the value set through CVAR debug
-            var osScale = _configurationManager.GetCVar(CVars.DisplayUIScale);
-            osScale = osScale == 0f ? root.Window.ContentScale.X : osScale;
-            var windowSize = root.Window.RenderTarget.Size;
-            //Only run autoscale if it is enabled, otherwise default to just use OS UIScale
-            if (!root.AutoScale && (windowSize.X <= 0 || windowSize.Y <= 0)) return osScale;
-            var maxScaleRes = root.AutoScaleUpperCutoff;
-            var minScaleRes = root.AutoScaleLowerCutoff;
-            var autoScaleMin = root.AutoScaleMinimum;
-            float scaleRatioX;
-            float scaleRatioY;
-
-            //Calculate the scale ratios and clamp it between the maximums and minimums
-            scaleRatioX = Math.Clamp(((float) windowSize.X - minScaleRes.X) / (maxScaleRes.X - minScaleRes.X) * osScale, autoScaleMin, osScale);
-            scaleRatioY = Math.Clamp(((float) windowSize.Y - minScaleRes.Y) / (maxScaleRes.Y - minScaleRes.Y) * osScale, autoScaleMin, osScale);
-            //Take the smallest UIScale value and use it for UI scaling
-            return Math.Min(scaleRatioX, scaleRatioY);
         }
 
         private void UpdateUIScale(WindowRoot root)
         {
-            root.UIScaleSet = CalculateAutoScale(root);
+            var newVal = _configurationManager.GetCVar(CVars.DisplayUIScale);
+            root.UIScaleSet = newVal == 0f ? root.Window.ContentScale.X : newVal;
+
             _propagateUIScaleChanged(root);
             root.InvalidateMeasure();
         }
@@ -1006,7 +977,7 @@ namespace Robust.Client.UserInterface
         {
             if (!_windowsToRoot.TryGetValue(windowResizedEventArgs.Window.Id, out var root))
                 return;
-            UpdateUIScale(root);
+
             root.InvalidateMeasure();
         }
 

Robust.Client/Utility/SpriteSpecifierExt.cs

@@ -22,7 +22,6 @@ namespace Robust.Client.Utility
                 .Texture;
         }
 
-        [Obsolete("Use SpriteSystem")]
         public static RSI.State GetState(this SpriteSpecifier.Rsi rsiSpecifier, IResourceCache cache)
         {
             if (cache.TryGetResource<RSIResource>(
@@ -37,7 +36,6 @@ namespace Robust.Client.Utility
             return SpriteComponent.GetFallbackState(cache);
         }
 
-        [Obsolete("Use SpriteSystem")]
         public static Texture Frame0(this SpriteSpecifier specifier)
         {
             return specifier.RsiStateLike().Default;
@@ -82,7 +80,6 @@ namespace Robust.Client.Utility
             return specifier.RsiStateLike();
         }
 
-        [Obsolete("Use SpriteSystem")]
         public static IRsiStateLike RsiStateLike(this SpriteSpecifier specifier)
         {
             var resC = IoCManager.Resolve<IResourceCache>();

Robust.Docfx/articles/example-article.md

@@ -1 +0,0 @@
-# Add your introductions here!

Robust.Docfx/articles/toc.yml

@@ -1,2 +0,0 @@
-- name: Example-article
-  href: example-article.md

Robust.Docfx/docfx.json

@@ -1,214 +0,0 @@
-{
-  "metadata": [
-    {
-      "src":
-      [
-        {
-          "files": [
-            "**.csproj"
-          ],
-          "exclude": [
-            "**/bin/**",
-            "**/obj/**",
-            "_site/**",
-            "**.xaml"
-          ],
-          "src": "../Robust.UnitTesting"
-        }
-      ],
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "dest": "api/Robust.UnitTesting"
-    },
-    {
-      "src":
-      [
-        {
-          "files": [
-            "**.csproj"
-          ],
-          "exclude": [
-            "**/bin/**",
-            "**/obj/**",
-            "_site/**",
-            "**.xaml"
-          ],
-          "src": "../Robust.Shared"
-        }
-      ],
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "dest": "api/Robust.Shared"
-    },
-    {
-      "src":
-      [
-        {
-          "files": [
-            "**.csproj"
-          ],
-          "exclude": [
-            "**/bin/**",
-            "**/obj/**",
-            "_site/**",
-            "**.xaml"
-          ],
-          "src": "../Robust.Shared.Maths"
-        }
-      ],
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "dest": "api/Robust.Shared.Maths"
-    },
-    {
-      "src":
-      [
-        {
-          "files": [
-            "**.csproj"
-          ],
-          "exclude": [
-            "**/bin/**",
-            "**/obj/**",
-            "_site/**",
-            "**.xaml"
-          ],
-          "src": "../Robust.Shared.Scripting"
-        }
-      ],
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "dest": "api/Robust.Shared.Scripting"
-    },
-    {
-      "src":
-      [
-        {
-          "files": [
-            "**.csproj"
-          ],
-          "exclude": [
-            "**/bin/**",
-            "**/obj/**",
-            "_site/**",
-            "**.xaml"
-          ],
-          "src": "../Robust.Client"
-        }
-      ],
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "dest": "api/Robust.Client"
-    },
-    {
-      "src":
-      [
-        {
-          "files": [
-            "**.csproj"
-          ],
-          "exclude": [
-            "**/bin/**",
-            "**/obj/**",
-            "_site/**",
-            "**.xaml"
-          ],
-          "src": "../Robust.Client.WebView"
-        }
-      ],
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "dest": "api/Robust.Client.WebView"
-    },
-    {
-      "src":
-      [
-        {
-          "files": [
-            "**.csproj"
-          ],
-          "exclude": [
-            "**/bin/**",
-            "**/obj/**",
-            "_site/**",
-            "**.xaml"
-          ],
-          "src": "../Robust.Server"
-        }
-      ],
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "dest": "api/Robust.Server"
-    },
-    {
-      "src":
-      [
-        {
-          "files": [
-            "**.csproj"
-          ],
-          "exclude": [
-            "**/bin/**",
-            "**/obj/**",
-            "_site/**",
-            "**.xaml"
-          ],
-          "src": "../Robust.LoaderApi"
-        }
-      ],
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "dest": "api/Robust.LoaderApi/Robust.LoaderApi"
-    }
-  ],
-  "build": {
-    "content": [
-      {
-        "files": [
-          "api/**/**.yml"
-        ]
-      },
-      {
-        "files": [
-          "articles/**.md",
-          "articles/**/toc.yml",
-          "toc.yml",
-          "*.md"
-        ]
-      }
-    ],
-    "resource": [
-      {
-        "files": [
-          "images/**",
-          "favicon.ico",
-          "icon.svg"          
-        ]
-      }
-    ],
-    "overwrite": [
-      {
-        "files": [
-          "apidoc/**.md"
-        ],
-        "exclude": [
-          "obj/**",
-          "_site/**"
-        ]
-      }
-    ],
-    "dest": "_robust-site",
-    "globalMetadataFiles": [],
-    "fileMetadataFiles": [],
-    "template": [
-      "default",
-      "templates/darkfx"
-    ],
-    "postProcessors": [],
-    "markdownEngineName": "markdig",
-    "noLangKeyword": false,
-    "keepFileLink": false,
-    "cleanupCacheHistory": false,
-    "disableGitFeatures": false
-  }
-}

Robust.Docfx/index.md

@@ -1,6 +0,0 @@
-# RobustToolbox DocFX
-![](https://i.imgur.com/Sv3Swxg.png)
-
-## Welcome to the RobustToolbox DocFX instance.
-### Click one of the tabs above to see documentation for that particular project/namespace
-

Robust.Docfx/templates/darkfx/LICENSE.txt

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Steffen Wilke
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

Robust.Docfx/templates/darkfx/partials/affix.tmpl.partial

@@ -1,40 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-<div class="hidden-sm col-md-2" role="complementary">
-  <div class="sideaffix">
-    {{^_disableContribution}}
-    <div class="contribution">
-      <ul class="nav">
-        {{#docurl}}
-        <li>
-          <a href="{{docurl}}" class="contribution-link">{{__global.improveThisDoc}}</a>
-        </li>
-        {{/docurl}}
-        {{#sourceurl}}
-        <li>
-          <a href="{{sourceurl}}" class="contribution-link">{{__global.viewSource}}</a>
-        </li>
-        {{/sourceurl}}
-      </ul>
-    </div>
-    {{/_disableContribution}}
-    <div class="toggle-mode">
-      <div class="icon">
-        <i aria-hidden="true">☀</i>
-      </div>
-      <label class="switch">
-        <input type="checkbox" id="switch-style">
-        <span class="slider round"></span>
-      </label>
-      <div class="icon">
-        <i aria-hidden="true">☾</i>
-      </div>
-    </div>
-
-    <nav class="bs-docs-sidebar hidden-print hidden-xs hidden-sm affix" id="affix">
-    <h5>{{__global.inThisArticle}}</h5>
-    <div></div>
-    <!-- <p><a class="back-to-top" href="#top">Back to top</a><p> -->
-    </nav>
-  </div>
-</div>

Robust.Docfx/templates/darkfx/partials/class.header.tmpl.partial

@@ -1,108 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-<h1 id="{{id}}" data-uid="{{uid}}" class="text-break">{{>partials/title}}</h1>
-<div class="markdown level0 summary">{{{summary}}}</div>
-<div class="markdown level0 conceptual">{{{conceptual}}}</div>
-{{#inClass}}
-<div class="inheritance">
-  <h5>{{__global.inheritance}}</h5>
-  {{#inheritance}}
-  <div class="level{{index}}">{{{specName.0.value}}}</div>
-  {{/inheritance}}
-  <div class="level{{level}}"><span class="xref">{{name.0.value}}</span></div>
-  {{#derivedClasses}}
-    <div class="level{{index}}">{{{specName.0.value}}}</div>
-  {{/derivedClasses}}
-</div>
-{{/inClass}}
-{{#implements.0}}
-<div classs="implements">
-  <h5>{{__global.implements}}</h5>
-{{/implements.0}}
-{{#implements}}
-  <div>{{{specName.0.value}}}</div>
-{{/implements}}
-{{#implements.0}}
-</div>
-{{/implements.0}}
-{{#inheritedMembers.0}}
-<div class="inheritedMembers">
-</div>
-{{/inheritedMembers.0}}
-<h6><strong>{{__global.namespace}}</strong>: {{{namespace.specName.0.value}}}</h6>
-<h6><strong>{{__global.assembly}}</strong>: {{assemblies.0}}.dll</h6>
-<h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
-<div class="codewrapper">
-  <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
-</div>
-{{#syntax.parameters.0}}
-<h5 class="parameters">{{__global.parameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.name}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-{{/syntax.parameters.0}}
-{{#syntax.parameters}}
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td><span class="parametername">{{{id}}}</span></td>
-      <td>{{{description}}}</td>
-    </tr>
-{{/syntax.parameters}}
-{{#syntax.parameters.0}}
-  </tbody>
-</table>
-{{/syntax.parameters.0}}
-{{#syntax.return}}
-<h5 class="returns">{{__global.returns}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td>{{{description}}}</td>
-    </tr>
-  </tbody>
-</table>
-{{/syntax.return}}
-{{#syntax.typeParameters.0}}
-<h5 class="typeParameters">{{__global.typeParameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.name}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-{{/syntax.typeParameters.0}}
-{{#syntax.typeParameters}}
-    <tr>
-      <td><span class="parametername">{{{id}}}</span></td>
-      <td>{{{description}}}</td>
-    </tr>
-{{/syntax.typeParameters}}
-{{#syntax.typeParameters.0}}
-  </tbody>
-</table>
-{{/syntax.typeParameters.0}}
-{{#remarks}}
-<h5 id="{{id}}_remarks"><strong>{{__global.remarks}}</strong></h5>
-<div class="markdown level0 remarks">{{{remarks}}}</div>
-{{/remarks}}
-{{#example.0}}
-<h5 id="{{id}}_examples"><strong>{{__global.examples}}</strong></h5>
-{{/example.0}}
-{{#example}}
-{{{.}}}
-{{/example}}

Robust.Docfx/templates/darkfx/partials/footer.tmpl.partial

@@ -1,29 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-<footer>
-  <div class="grad-bottom"></div>
-  <div class="footer">
-    <div class="container">
-      <span class="pull-right">
-        <a href="#top">Back to top</a>
-      </span>
-      <div class="pull-left">
-        {{{_appFooter}}}
-        {{^_appFooter}}<span>Generated by <strong>DocFX</strong></span>{{/_appFooter}}
-      </div>
-      <div class="toggle-mode pull-right visible-sm visible-xs">
-        <div class="icon">
-          <i aria-hidden="true">☀</i>
-        </div>
-        <label class="switch">
-          <input type="checkbox" id="switch-style-m">
-          <span class="slider round"></span>
-        </label>
-        <div class="icon">
-          <i aria-hidden="true">☾</i>
-        </div>
-      </div>
-    </div>
-  </div>
-  <script type="text/javascript" src="{{_rel}}styles/toggle-theme.js"></script>
-</footer>

Robust.Docfx/templates/darkfx/partials/head.tmpl.partial

@@ -1,20 +0,0 @@
-{{!Copyright (c) Oscar Vasquez. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <title>{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}</title>
-  <meta name="viewport" content="width=device-width">
-  <meta name="title" content="{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}">
-  <meta name="generator" content="docfx {{_docfxVersion}}">
-  {{#_description}}<meta name="description" content="{{_description}}">{{/_description}}
-  <link rel="shortcut icon" href="{{_rel}}{{{_appFaviconPath}}}{{^_appFaviconPath}}favicon.ico{{/_appFaviconPath}}">
-  <link rel="stylesheet" href="{{_rel}}styles/docfx.vendor.css">
-  <link rel="stylesheet" href="{{_rel}}styles/docfx.css">
-  <link rel="stylesheet" href="{{_rel}}styles/main.css">
-  <meta property="docfx:navrel" content="{{_navRel}}">
-  <meta property="docfx:tocrel" content="{{_tocRel}}">
-  {{#_noindex}}<meta name="searchOption" content="noindex">{{/_noindex}}
-  {{#_enableSearch}}<meta property="docfx:rel" content="{{_rel}}">{{/_enableSearch}}
-  {{#_enableNewTab}}<meta property="docfx:newtab" content="true">{{/_enableNewTab}}
-</head>

Robust.Docfx/templates/darkfx/styles/main.css

@@ -1,470 +0,0 @@
-:root, body.dark-theme {
-  --color-foreground: #ccd5dc;
-  --color-navbar: #66666d;
-  --color-breadcrumb: #999;
-  --color-underline: #ddd;
-  --color-toc-hover: #fff;
-  --color-background: #2d2d30;
-  --color-background-subnav: #333337;
-  --color-background-dark: #1e1e1e;
-  --color-background-table-alt: #212123;
-  --color-background-quote: #69696e;
-}
-
-body.light-theme {
-  --color-foreground: #171717;
-  --color-breadcrumb: #4a4a4a;
-  --color-toc-hover: #4c4c4c;
-  --color-background: #ffffff;
-  --color-background-subnav: #f5f5f5;
-  --color-background-dark: #ddd;
-  --color-background-table-alt: #f9f9f9;
-}
-
-body {
-  color: var(--color-foreground);
-  line-height: 1.5;
-  font-size: 14px;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  word-wrap: break-word;
-  background-color: var(--color-background);
-}
-
-.btn.focus, .btn:focus, .btn:hover {
-  color: var(--color-foreground);
-}
-
-h1 {
-  font-weight: 600;
-  font-size: 32px;
-}
-
-h2 {
-  font-weight: 600;
-  font-size: 24px;
-  line-height: 1.8;
-}
-
-h3 {
-  font-weight: 600;
-  font-size: 20px;
-  line-height: 1.8;
-}
-
-h5 {
-  font-size: 14px;
-  padding: 10px 0px;
-}
-
-article h1, article h2, article h3, article h4 {
-  margin-top: 35px;
-  margin-bottom: 15px;
-}
-
-article h4 {
-  padding-bottom: 8px;
-  border-bottom: 2px solid var(--color-underline);
-}
-
-.navbar-brand>img {
-  color: var(--color-background);
-}
-
-.navbar {
-  border: none;
-}
-
-.subnav {
-  border-top: 1px solid var(--color-underline);
-  background-color: var(--color-background-subnav);
-}
-
-.sidenav, .fixed_header, .toc {
-  background-color: var(--color-background);
-}
-
-.navbar-inverse {
-  background-color: var(--color-background-dark);
-  z-index: 100;
-}
-
-.navbar-inverse .navbar-nav>li>a, .navbar-inverse .navbar-text {
-  color: var(--color-navbar);
-  background-color: var(--color-background-dark);
-  border-bottom: 3px solid transparent;
-  padding-bottom: 12px;
-}
-
-.navbar-inverse .navbar-nav>li>a:focus, .navbar-inverse .navbar-nav>li>a:hover {
-  color: var(--color-foreground);
-  background-color: var(--color-background-dark);
-  border-bottom: 3px solid var(--color-background-subnav);
-  transition: all ease 0.25s;
-}
-
-.navbar-inverse .navbar-nav>.active>a, .navbar-inverse .navbar-nav>.active>a:focus, .navbar-inverse .navbar-nav>.active>a:hover {
-  color: var(--color-foreground);
-  background-color: var(--color-background-dark);
-  border-bottom: 3px solid var(--color-foreground);
-  transition: all ease 0.25s;
-}
-
-.navbar-form .form-control {
-  border: none;
-  border-radius: 0;
-}
-
-.light-theme .navbar-brand svg {
-  filter: brightness(20%);
-}
-
-.toc .level1>li {
-  font-weight: 400;
-}
-
-.toc .nav>li>a {
-  color: var(--color-foreground);
-}
-
-.sidefilter {
-  background-color: var(--color-background);
-  border-left: none;
-  border-right: none;
-}
-
-.sidefilter {
-  background-color: var(--color-background);
-  border-left: none;
-  border-right: none;
-}
-
-.toc-filter {
-  padding: 10px;
-  margin: 0;
-  background-color: var(--color-background);
-}
-
-.toc-filter>input {
-  border: none;
-  border-radius: unset;
-  background-color: var(--color-background-subnav);
-  padding: 5px 0 5px 20px;
-  font-size: 90%
-}
-
-.toc-filter>.clear-icon {
-  position: absolute;
-  top: 17px;
-  right: 15px;
-}
-
-.toc-filter>input:focus {
-  color: var(--color-foreground);
-  transition: all ease 0.25s;
-}
-
-.toc-filter>.filter-icon {
-  display: none;
-}
-
-.sidetoc>.toc {
-  background-color: var(--color-background);
-  overflow-x: hidden;
-}
-
-.sidetoc {
-  background-color: var(--color-background);
-  border: none;
-}
-
-.alert {
-  background-color: inherit;
-  border: none;
-  padding: 10px 0;
-  border-radius: 0;
-}
-
-.alert>p {
-  margin-bottom: 0;
-  padding: 5px 10px;
-  border-bottom: 1px solid;
-  background-color: var(--color-background-dark);
-}
-
-.alert>h5 {
-  padding: 10px 15px;
-  margin-top: 0;
-  margin-bottom: 0;
-  text-transform: uppercase;
-  font-weight: bold;
-  border-top: 2px solid;
-  background-color: var(--color-background-dark);
-  border-radius: none;
-}
-
-.alert>ul {
-  margin-bottom: 0;
-  padding: 5px 40px;
-}
-
-.alert-info {
-  color: #1976d2;
-}
-
-.alert-warning {
-  color: #f57f17;
-}
-
-.alert-danger {
-  color: #d32f2f;
-}
-
-pre {
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  word-break: break-all;
-  word-wrap: break-word;
-  background-color: var(--color-background-dark);
-  border-radius: 0;
-  border: none;
-}
-
-code {
-  background: var(--color-background-dark) !important;
-  border-radius: 2px;
-}
-
-.hljs {
-  color: var(--color-foreground);
-}
-
-.toc .nav>li.active>.expand-stub::before, .toc .nav>li.in>.expand-stub::before, .toc .nav>li.in.active>.expand-stub::before, .toc .nav>li.filtered>.expand-stub::before {
-  content: "▾";
-}
-
-.toc .nav>li>.expand-stub::before, .toc .nav>li.active>.expand-stub::before {
-  content: "▸";
-}
-
-.affix ul ul>li>a:before {
-  content: "|";
-}
-
-.breadcrumb {
-  background-color: var(--color-background-subnav);
-}
-
-.breadcrumb .label.label-primary {
-  background: #444;
-  border-radius: 0;
-  font-weight: normal;
-  font-size: 100%;
-}
-
-#breadcrumb .breadcrumb>li a {
-  border-radius: 0;
-  font-weight: normal;
-  font-size: 85%;
-  display: inline;
-  padding: 0 .6em 0;
-  line-height: 1;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  color: var(--color-breadcrumb);
-}
-
-#breadcrumb .breadcrumb>li a:hover {
-  color: var(--color-foreground);
-  transition: all ease 0.25s;
-}
-
-.breadcrumb>li+li:before {
-  content: "⯈";
-  font-size: 75%;
-  color: var(--color-background-dark);
-  padding: 0;
-}
-
-.light-theme .breadcrumb>li+li:before {
-  color: var(--color-foreground)
- }
-
-.toc .level1>li {
-  font-weight: 600;
-  font-size: 130%;
-  padding-left: 5px;
-}
-
-.footer {
-  border-top: none;
-  background-color: var(--color-background-dark);
-  padding: 15px 0;
-  font-size: 90%;
-}
-
-.toc .nav>li>a:hover, .toc .nav>li>a:focus {
-  color: var(--color-toc-hover);
-  transition: all ease 0.1s;
-}
-
-.form-control {
-  background-color: var(--color-background-subnav);
-  border: none;
-  border-radius: 0;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-
-.form-control:focus {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-
-input#search-query:focus {
-  color: var(--color-foreground);
-}
-
-.table-bordered, .table-bordered>tbody>tr>td, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>td, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>thead>tr>th {
-  border: 1px solid var(--color-background-dark);
-}
-
-.table-striped>tbody>tr:nth-of-type(odd) {
-  background-color: var(--color-background-table-alt);
-}
-
-blockquote {
-  padding: 10px 20px;
-  margin: 0 0 10px;
-  font-size: 110%;
-  border-left: 5px solid var(--color-background-quote);
-  color: var(--color-background-quote);
-}
-
-.pagination>.disabled>a, .pagination>.disabled>a:focus, .pagination>.disabled>a:hover, .pagination>.disabled>span, .pagination>.disabled>span:focus, .pagination>.disabled>span:hover {
-  background-color: var(--color-background-subnav);
-  border-color: var(--color-background-subnav);
-}
-
-.breadcrumb>li, .pagination {
-  display: inline;
-}
-
-.tabGroup a[role="tab"] {
-  border-bottom: 2px solid var(--color-background-dark);
-}
-
-.tabGroup a[role="tab"][aria-selected="true"] {
-  color: var(--color-foreground);
-}
-
-.tabGroup section[role="tabpanel"] {
-  border: 1px solid var(--color-background-dark);
-}
-
-.sideaffix > div.contribution > ul > li > a.contribution-link:hover {
-  background-color: var(--color-background);
-}
-
-.switch {
-  position: relative;
-  display: inline-block;
-  width: 40px;
-  height: 20px;
-}
-
-.switch input { 
-  opacity: 0;
-  width: 0;
-  height: 0;
-}
-
-.slider {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: #ccc;
-  -webkit-transition: .4s;
-  transition: .4s;
-}
-
-.slider:before {
-  position: absolute;
-  content: "";
-  height: 14px;
-  width: 14px;
-  left: 4px;
-  bottom: 3px;
-  background-color: white;
-  -webkit-transition: .4s;
-  transition: .4s;
-}
-
-input:checked + .slider {
-  background-color: #337ab7;
-}
-
-input:focus + .slider {
-  box-shadow: 0 0 1px #337ab7;
-}
-
-input:checked + .slider:before {
-  -webkit-transform: translateX(19px);
-  -ms-transform: translateX(19px);
-  transform: translateX(19px);
-}
-
-/* Rounded sliders */
-.slider.round {
-  border-radius: 20px;
-}
-
-.slider.round:before {
-  border-radius: 50%;
-}
-.toggle-mode .icon {
-  display: inline-block;
-}
-
-.toggle-mode .icon i {
-  font-style: normal;
-  font-size: 17px;
-  display: inline-block;
-  padding-right: 7px;
-  padding-left: 7px;
-  vertical-align: middle;
-}
-
-@media (min-width: 1600px) {
-  .container {
-    width: 100%;
-  }
-  .sidefilter {
-    width: 18%;
-  }
-  .sidetoc {
-    width: 18%;
-  }
-  .article.grid-right {
-    margin-left: 19%;
-  }
-  .sideaffix {
-    width: 11.5%;
-  }
-  .affix ul>li.active>a {
-    white-space: initial;
-  }
-  .affix ul>li>a {
-    width: 99%;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-}

Robust.Docfx/templates/darkfx/styles/toggle-theme.js

@@ -1,35 +0,0 @@
-const sw = document.getElementById("switch-style"), sw_mobile = document.getElementById("switch-style-m"), b = document.body;
-if (b) {
-  function toggleTheme(target, dark) {
-    target.classList.toggle("dark-theme", dark)
-    target.classList.toggle("light-theme", !dark)
-  }
-
-  function switchEventListener() {
-    toggleTheme(b, this.checked);
-    if (window.localStorage) {
-      this.checked ? localStorage.setItem("theme", "dark-theme") : localStorage.setItem("theme", "light-theme")
-    }
-  }
-
-  var isDarkTheme = !window.localStorage || !window.localStorage.getItem("theme") || window.localStorage && localStorage.getItem("theme") === "dark-theme";
-
-  if(sw && sw_mobile){
-    sw.checked = isDarkTheme;
-    sw_mobile.checked = isDarkTheme;
-
-    sw.addEventListener("change", switchEventListener);
-    sw_mobile.addEventListener("change", switchEventListener);
-    
-    // sync state between switches
-    sw.addEventListener("change", function() {
-      sw_mobile.checked = this.checked;
-    });
-
-    sw_mobile.addEventListener("change", function() {
-      sw.checked = this.checked;
-    });
-  }
-
-  toggleTheme(b, isDarkTheme);
-}

Robust.Docfx/toc.yml

@@ -1,29 +0,0 @@
-- name: Articles
-  href: articles/
-  
-# Client 
-- name: Robust.Client 
-  href: api/Robust.Client/
-  homepage: api/Robust.Client/Robust.Client.html
-- name: Robust.Client.WebView
-  href: api/Robust.Client.WebView/
-
-#Loader Api
-- name: Robust.LoaderApi
-  href: api/Robust.LoaderApi/Robust.LoaderApi/
-  
-# Server
-- name: Robust.Server
-  href: api/Robust.Server/
-
-# Shared 
-- name: Robust.Shared
-  href: api/Robust.Shared/
-- name: Robust.Shared.Maths
-  href: api/Robust.Shared.Maths/
-- name: Robust.Shared.Scripting
-  href: api/Robust.Shared.Scripting/
-
-# Unit testing
-- name: Robust.UnitTesting
-  href: api/Robust.UnitTesting/

Robust.Server/BaseServer.cs

@@ -66,17 +66,18 @@ namespace Robust.Server
 
         [Dependency] private readonly IConfigurationManagerInternal _config = default!;
         [Dependency] private readonly IServerEntityManager _entityManager = default!;
+        [Dependency] private readonly IEntityLookup _lookup = default!;
         [Dependency] private readonly ILogManager _log = default!;
         [Dependency] private readonly IRobustSerializer _serializer = default!;
         [Dependency] private readonly IGameTiming _time = default!;
         [Dependency] private readonly IResourceManagerInternal _resources = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly ITimerManager _timerManager = default!;
+        [Dependency] private readonly ITimerManager timerManager = default!;
         [Dependency] private readonly IServerGameStateManager _stateManager = default!;
         [Dependency] private readonly IServerNetManager _network = default!;
         [Dependency] private readonly ISystemConsoleManager _systemConsole = default!;
         [Dependency] private readonly ITaskManager _taskManager = default!;
-        [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
+        [Dependency] private readonly IRuntimeLog runtimeLog = default!;
         [Dependency] private readonly IModLoaderInternal _modLoader = default!;
         [Dependency] private readonly IWatchdogApi _watchdogApi = default!;
         [Dependency] private readonly HubManager _hubManager = default!;
@@ -126,7 +127,7 @@ namespace Robust.Server
             else
                 Logger.InfoS("srv", $"{reason}, shutting down...");
 
-            _shutdownReason = reason ?? "Shutting down";
+            _shutdownReason = reason;
 
             if (_mainLoop != null) _mainLoop.Running = false;
             if (_logHandler != null)
@@ -343,6 +344,7 @@ namespace Robust.Server
             _consoleHost.Initialize();
             _entityManager.Startup();
             _mapManager.Startup();
+            IoCManager.Resolve<IEntityLookup>().Startup();
             _stateManager.Initialize();
 
             var reg = _entityManager.ComponentFactory.GetRegistration<TransformComponent>();
@@ -601,6 +603,7 @@ namespace Robust.Server
             _network.Shutdown($"Server shutting down: {_shutdownReason}");
 
             // shutdown entities
+            IoCManager.Resolve<IEntityLookup>().Shutdown();
             _entityManager.Cleanup();
 
             if (_config.GetCVar(CVars.LogRuntimeLog))
@@ -611,7 +614,7 @@ namespace Robust.Server
                 Directory.CreateDirectory(relPath);
                 var pathToWrite = Path.Combine(relPath,
                     "Runtime-" + DateTime.Now.ToString("yyyy-MM-dd-THH-mm-ss") + ".txt");
-                File.WriteAllText(pathToWrite, _runtimeLog.Display(), EncodingHelpers.UTF8);
+                File.WriteAllText(pathToWrite, runtimeLog.Display(), EncodingHelpers.UTF8);
             }
 
             AppDomain.CurrentDomain.ProcessExit -= ProcessExiting;
@@ -656,8 +659,7 @@ namespace Robust.Server
 
             using (TickUsage.WithLabels("Timers").NewTimer())
             {
-                _consoleHost.CommandBufferExecute();
-                _timerManager.UpdateTimers(frameEventArgs);
+                timerManager.UpdateTimers(frameEventArgs);
             }
 
             using (TickUsage.WithLabels("AsyncTasks").NewTimer())
@@ -668,6 +670,8 @@ namespace Robust.Server
             // Pass Histogram into the IEntityManager.Update so it can do more granular measuring.
             _entityManager.TickUpdate(frameEventArgs.DeltaSeconds, noPredictions: false, TickUsage);
 
+            _lookup.Update();
+
             using (TickUsage.WithLabels("PostEngine").NewTimer())
             {
                 _modLoader.BroadcastUpdate(ModUpdateLevel.PostEngine, frameEventArgs);

Robust.Server/Bql/BqlQuerySelector.Builtin.cs

@@ -311,7 +311,7 @@ namespace Robust.Server.Bql
         public override IEnumerable<EntityUid> DoSelection(IEnumerable<EntityUid> input, IReadOnlyList<object> arguments, bool isInverted, IEntityManager entityManager)
         {
             var radius = (float)(double)arguments[0];
-            var entityLookup = EntitySystem.Get<EntityLookupSystem>();
+            var entityLookup = IoCManager.Resolve<IEntityLookup>();
 
             // TODO: Make this a foreach and reduce LINQ chain because it'll allocate a LOT
             //BUG: GetEntitiesInRange effectively uses manhattan distance. This is not intended, near is supposed to be circular.

Robust.Server/Console/Commands/MapCommands.cs

@@ -29,13 +29,14 @@ namespace Robust.Server.Console.Commands
             var mapId = new MapId(int.Parse(args[0]));
 
             var mapMgr = IoCManager.Resolve<IMapManager>();
+            var pauseMgr = IoCManager.Resolve<IPauseManager>();
 
             if (!mapMgr.MapExists(mapId))
             {
                 mapMgr.CreateMap(mapId);
                 if (args.Length >= 2 && args[1] == "false")
                 {
-                    mapMgr.AddUninitializedMap(mapId);
+                    pauseMgr.AddUninitializedMap(mapId);
                 }
 
                 shell.WriteLine($"Map with ID {mapId} created.");
@@ -218,11 +219,7 @@ namespace Robust.Server.Console.Commands
             }
 
             IoCManager.Resolve<IMapLoader>().LoadMap(mapId, args[1]);
-
-            if (mapManager.MapExists(mapId))
-                shell.WriteLine($"Map {mapId} has been loaded from {args[1]}.");
-            else
-                shell.WriteError($"Error while loading map from {args[1]}.");
+            shell.WriteLine($"Map {mapId} has been loaded from {args[1]}.");
         }
     }
 
@@ -321,6 +318,7 @@ namespace Robust.Server.Console.Commands
             }
 
             var mapManager = IoCManager.Resolve<IMapManager>();
+            var pauseManager = IoCManager.Resolve<IPauseManager>();
 
             var arg = args[0];
             var mapId = new MapId(int.Parse(arg, CultureInfo.InvariantCulture));
@@ -331,13 +329,13 @@ namespace Robust.Server.Console.Commands
                 return;
             }
 
-            if (mapManager.IsMapInitialized(mapId))
+            if (pauseManager.IsMapInitialized(mapId))
             {
                 shell.WriteError("Map is already initialized!");
                 return;
             }
 
-            mapManager.DoMapInitialize(mapId);
+            pauseManager.DoMapInitialize(mapId);
         }
     }
 
@@ -350,16 +348,17 @@ namespace Robust.Server.Console.Commands
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var mapManager = IoCManager.Resolve<IMapManager>();
+            var pauseManager = IoCManager.Resolve<IPauseManager>();
 
             var msg = new StringBuilder();
 
             foreach (var mapId in mapManager.GetAllMapIds().OrderBy(id => id.Value))
             {
                 msg.AppendFormat("{0}: init: {1}, paused: {2}, ent: {3}, grids: {4}\n",
-                    mapId, mapManager.IsMapInitialized(mapId),
-                    mapManager.IsMapPaused(mapId),
-                    mapManager.GetMapEntityId(mapId),
-                    string.Join(",", mapManager.GetAllMapGrids(mapId).Select(grid => grid.Index)));
+                    mapId, pauseManager.IsMapInitialized(mapId),
+                    pauseManager.IsMapPaused(mapId),
+                    string.Join(",", mapManager.GetAllMapGrids(mapId).Select(grid => grid.Index)),
+                    mapManager.GetMapEntityId(mapId));
             }
 
             shell.WriteLine(msg.ToString());
@@ -381,7 +380,7 @@ namespace Robust.Server.Console.Commands
             foreach (var grid in mapManager.GetAllGrids().OrderBy(grid => grid.Index.Value))
             {
                 msg.AppendFormat("{0}: map: {1}, ent: {2}, pos: {3} \n",
-                    grid.Index, grid.ParentMapId, grid.GridEntityId, grid.WorldPosition);
+                    grid.Index, grid.ParentMapId, grid.WorldPosition, grid.GridEntityId);
             }
 
             shell.WriteLine(msg.ToString());

Robust.Server/Console/Commands/TestbedCommand.cs

@@ -109,8 +109,9 @@ namespace Robust.Server.Console.Commands
         private void SetupPlayer(MapId mapId, IConsoleShell shell, IPlayerSession? player, IMapManager mapManager)
         {
             if (mapId == MapId.Nullspace) return;
-            mapManager.SetMapPaused(mapId, false);
-            var mapUid = mapManager.GetMapEntityIdOrThrow(mapId);
+            var pauseManager = IoCManager.Resolve<IPauseManager>();
+            pauseManager.SetMapPaused(mapId, false);
+            var mapUid = IoCManager.Resolve<IMapManager>().GetMapEntityIdOrThrow(mapId);
             IoCManager.Resolve<IEntityManager>().GetComponent<SharedPhysicsMapComponent>(mapUid).Gravity = new Vector2(0, -9.8f);
 
             return;

Robust.Server/GameObjects/EntitySystems/AppearanceSystem.cs

@@ -3,7 +3,7 @@ using Robust.Shared.GameStates;
 
 namespace Robust.Server.GameObjects;
 
-public sealed class AppearanceSystem : SharedAppearanceSystem
+internal sealed class AppearanceSystem : SharedAppearanceSystem
 {
     public override void Initialize()
     {

Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs

@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Server.Physics;
 using Robust.Shared;
 using Robust.Shared.Configuration;
@@ -37,7 +37,7 @@ namespace Robust.Server.GameObjects
             collideComp.BodyType = BodyType.Static;
         }
 
-        protected override void HandleMapCreated(MapChangedEvent eventArgs)
+        protected override void HandleMapCreated(object? sender, MapEventArgs eventArgs)
         {
             if (eventArgs.Map == MapId.Nullspace) return;
             var mapUid = MapManager.GetMapEntityIdOrThrow(eventArgs.Map);

Robust.Server/GameObjects/EntitySystems/UserInterfaceSystem.cs

@@ -176,7 +176,7 @@ namespace Robust.Server.GameObjects
 
         public BoundUserInterface? GetUiOrNull(EntityUid uid, object uiKey, ServerUserInterfaceComponent? ui = null)
         {
-            return TryGetUi(uid, uiKey, out var bui, ui)
+            return TryGetUi(uid, uiKey, out var bui)
                 ? bui
                 : null;
         }
@@ -185,12 +185,12 @@ namespace Robust.Server.GameObjects
         {
             bui = null;
 
-            return Resolve(uid, ref ui, false) && ui.TryGetBoundUserInterface(uiKey, out bui);
+            return Resolve(uid, ref ui) && ui.TryGetBoundUserInterface(uiKey, out bui);
         }
 
         public bool IsUiOpen(EntityUid uid, object uiKey, ServerUserInterfaceComponent? ui = null)
         {
-            if (!Resolve(uid, ref ui, false))
+            if (!Resolve(uid, ref ui))
                 return false;
 
             if (!TryGetUi(uid, uiKey, out var bui, ui))
@@ -201,7 +201,7 @@ namespace Robust.Server.GameObjects
 
         public bool TrySetUiState(EntityUid uid, object uiKey, BoundUserInterfaceState state, IPlayerSession? session = null, ServerUserInterfaceComponent? ui = null)
         {
-            if (!Resolve(uid, ref ui, false))
+            if (!Resolve(uid, ref ui))
                 return false;
 
             if (!TryGetUi(uid, uiKey, out var bui, ui))

Robust.Server/GameObjects/ServerEntityManager.cs

@@ -37,6 +37,7 @@ namespace Robust.Server.GameObjects
         public override void Initialize()
         {
             SetupNetworking();
+            ReceivedComponentMessage += (_, compMsg) => DispatchComponentMessage(compMsg);
             ReceivedSystemMessage += (_, systemMsg) => EventBus.RaiseEvent(EventSource.Network, systemMsg);
 
             base.Initialize();
@@ -97,6 +98,9 @@ namespace Robust.Server.GameObjects
 
         public override IEntityNetworkManager EntityNetManager => this;
 
+        /// <inheritdoc />
+        public event EventHandler<NetworkComponentMessage>? ReceivedComponentMessage;
+
         /// <inheritdoc />
         public event EventHandler<object>? ReceivedSystemMessage;
 
@@ -203,6 +207,35 @@ namespace Robust.Server.GameObjects
             }
         }
 
+        /// <inheritdoc />
+        [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
+        public void SendComponentNetworkMessage(INetChannel? channel, EntityUid entity, IComponent component,
+            ComponentMessage message)
+        {
+            if (_networkManager.IsClient)
+                return;
+
+            var netId = ComponentFactory.GetRegistration(component.GetType()).NetID;
+
+            if (!netId.HasValue)
+                throw new ArgumentException($"Component {component.GetType()} 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;
+
+            // Logger.DebugS("net.ent", "Sending: {0}", msg);
+
+            //Send the message
+            if (channel == null)
+                _networkManager.ServerSendToAll(msg);
+            else
+                _networkManager.ServerSendMessage(msg, channel);
+        }
+
         /// <inheritdoc />
         public void SendSystemNetworkMessage(EntityEventArgs message)
         {
@@ -269,6 +302,10 @@ namespace Robust.Server.GameObjects
             {
                 switch (message.Type)
                 {
+                    case EntityMessageType.ComponentMessage:
+                        ReceivedComponentMessage?.Invoke(this, new NetworkComponentMessage(message, player));
+                        return;
+
                     case EntityMessageType.SystemMessage:
                         var msg = message.SystemMessage;
                         var sessionType = typeof(EntitySessionMessage<>).MakeGenericType(msg.GetType());

Robust.Server/GameStates/ChunkIndicesEnumerator.cs

@@ -5,31 +5,30 @@ namespace Robust.Server.GameStates;
 
 public struct ChunkIndicesEnumerator
 {
-    private Vector2i _bottomLeft;
-    private Vector2i _topRight;
+    private Vector2i _topLeft;
+    private Vector2i _bottomRight;
 
     private int _x;
     private int _y;
 
-    public ChunkIndicesEnumerator(Vector2 viewPos, float range, float chunkSize)
+    public ChunkIndicesEnumerator(Box2 viewBox, float chunkSize)
     {
-        _bottomLeft = ((viewPos - range) / chunkSize).Floored();
-        // Also floor this as we get the whole chunk anyway.
-        _topRight = ((viewPos + range) / chunkSize).Floored();
+        _topLeft = (viewBox.TopLeft / chunkSize).Floored();
+        _bottomRight = (viewBox.BottomRight / chunkSize).Floored();
 
-        _x = _bottomLeft.X;
-        _y = _bottomLeft.Y;
+        _x = _topLeft.X;
+        _y = _bottomRight.Y;
     }
 
     public bool MoveNext([NotNullWhen(true)] out Vector2i? chunkIndices)
     {
-        if (_y > _topRight.Y)
+        if (_y > _topLeft.Y)
         {
             _x++;
-            _y = _bottomLeft.Y;
+            _y = _bottomRight.Y;
         }
 
-        if (_x > _topRight.X)
+        if (_x > _bottomRight.X)
         {
             chunkIndices = null;
             return false;

Robust.Server/GameStates/PVSCollection.cs

@@ -8,7 +8,6 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 
 namespace Robust.Server.GameStates;
 
@@ -33,18 +32,12 @@ public interface IPVSCollection
     /// </summary>
     /// <param name="tick">The <see cref="GameTick"/> before which all deletions should be removed.</param>
     public void CullDeletionHistoryUntil(GameTick tick);
-
-    public bool IsDirty(IChunkIndexLocation location);
-
-    public bool MarkDirty(IChunkIndexLocation location);
-
-    public void ClearDirty();
-
 }
 
 public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : IComparable<TIndex>, IEquatable<TIndex>
 {
     [Shared.IoC.Dependency] private readonly IEntityManager _entityManager = default!;
+    [Shared.IoC.Dependency] private readonly IMapManager _mapManager = default!;
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static Vector2i GetChunkIndices(Vector2 coordinates)
@@ -88,29 +81,19 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
     private readonly List<(GameTick tick, TIndex index)> _deletionHistory = new();
 
     /// <summary>
-    /// An index containing the <see cref="IIndexLocation"/>s of all <see cref="TIndex"/>.
+    /// An index containing the <see cref="IndexLocation"/>s of all <see cref="TIndex"/>.
     /// </summary>
-    private readonly Dictionary<TIndex, IIndexLocation> _indexLocations = new();
+    private readonly Dictionary<TIndex, IndexLocation> _indexLocations = new();
 
     /// <summary>
     /// Buffer of all locationchanges since the last process call
     /// </summary>
-    private readonly Dictionary<TIndex, IIndexLocation> _locationChangeBuffer = new();
+    private readonly Dictionary<TIndex, IndexLocation> _locationChangeBuffer = new();
     /// <summary>
     /// Buffer of all indexremovals since the last process call
     /// </summary>
     private readonly Dictionary<TIndex, GameTick> _removalBuffer = new();
 
-    /// <summary>
-    /// To avoid re-allocating the hashset every tick we'll just store it.
-    /// </summary>
-    private HashSet<TIndex> _changedIndices = new();
-
-    /// <summary>
-    /// A set of all chunks changed last tick
-    /// </summary>
-    private HashSet<IChunkIndexLocation> _dirtyChunks = new();
-
     public PVSCollection()
     {
         IoCManager.InjectDependencies(this);
@@ -118,17 +101,13 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
 
     public void Process()
     {
-        _changedIndices.EnsureCapacity(_locationChangeBuffer.Count);
-
-        foreach (var (key, loc) in _locationChangeBuffer)
-        {
-            _changedIndices.Add(key);
-        }
+        var changedIndices = new HashSet<TIndex>(_locationChangeBuffer.Keys);
 
+        var changedChunkLocations = new HashSet<IndexLocation>();
         foreach (var (index, tick) in _removalBuffer)
         {
             //changes dont need to be computed if we are removing the index anyways
-            if (_changedIndices.Remove(index) && !_indexLocations.ContainsKey(index))
+            if (changedIndices.Remove(index) && !_indexLocations.ContainsKey(index))
             {
                 //this index wasnt added yet, so we can safely just skip the deletion
                 continue;
@@ -136,50 +115,37 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
 
             var location = RemoveIndexInternal(index);
             if(location is GridChunkLocation or MapChunkLocation)
-                _dirtyChunks.Add((IChunkIndexLocation) location);
+                changedChunkLocations.Add(location);
             _deletionHistory.Add((tick, index));
         }
 
         // remove empty chunk-subsets
-        foreach (var chunkLocation in _dirtyChunks)
+        foreach (var chunkLocation in changedChunkLocations)
         {
             switch (chunkLocation)
             {
                 case GridChunkLocation gridChunkLocation:
-                    if(!_gridChunkContents.TryGetValue(gridChunkLocation.GridId, out var gridChunks)) continue;
-                    if(!gridChunks.TryGetValue(gridChunkLocation.ChunkIndices, out var chunk)) continue;
-                    if(chunk.Count == 0)
-                        gridChunks.Remove(gridChunkLocation.ChunkIndices);
+                    if (_gridChunkContents[gridChunkLocation.GridId][gridChunkLocation.ChunkIndices].Count == 0)
+                        _gridChunkContents[gridChunkLocation.GridId].Remove(gridChunkLocation.ChunkIndices);
                     break;
                 case MapChunkLocation mapChunkLocation:
-                    if(!_mapChunkContents.TryGetValue(mapChunkLocation.MapId, out var mapChunks)) continue;
-                    if(!mapChunks.TryGetValue(mapChunkLocation.ChunkIndices, out chunk)) continue;
-                    if(chunk.Count == 0)
-                        mapChunks.Remove(mapChunkLocation.ChunkIndices);
+                    if (_mapChunkContents[mapChunkLocation.MapId][mapChunkLocation.ChunkIndices].Count == 0)
+                        _mapChunkContents[mapChunkLocation.MapId].Remove(mapChunkLocation.ChunkIndices);
                     break;
             }
         }
 
-        foreach (var index in _changedIndices)
+        foreach (var index in changedIndices)
         {
-            var oldLoc = RemoveIndexInternal(index);
-            if(oldLoc is GridChunkLocation or MapChunkLocation)
-                _dirtyChunks.Add((IChunkIndexLocation) oldLoc);
+            RemoveIndexInternal(index);
 
-            AddIndexInternal(index, _locationChangeBuffer[index], _dirtyChunks);
+            AddIndexInternal(index, _locationChangeBuffer[index]);
         }
 
-        _changedIndices.Clear();
         _locationChangeBuffer.Clear();
         _removalBuffer.Clear();
     }
 
-    public bool IsDirty(IChunkIndexLocation location) => _dirtyChunks.Contains(location);
-
-    public bool MarkDirty(IChunkIndexLocation location) => _dirtyChunks.Add(location);
-
-    public void ClearDirty() => _dirtyChunks.Clear();
-
     public bool TryGetChunk(MapId mapId, Vector2i chunkIndices, [NotNullWhen(true)] out HashSet<TIndex>? indices) =>
         _mapChunkContents[mapId].TryGetValue(chunkIndices, out indices);
 
@@ -188,7 +154,7 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
 
     public HashSet<TIndex>.Enumerator GetElementsForSession(ICommonSession session) => _localOverrides[session].GetEnumerator();
 
-    private void AddIndexInternal(TIndex index, IIndexLocation location, HashSet<IChunkIndexLocation> dirtyChunks)
+    private void AddIndexInternal(TIndex index, IndexLocation location)
     {
         switch (location)
         {
@@ -197,10 +163,10 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
                 break;
             case GridChunkLocation gridChunkLocation:
                 // might be gone due to grid-deletions
-                if(!_gridChunkContents.TryGetValue(gridChunkLocation.GridId, out var gridChunk)) return;
-                var gridLoc = gridChunk.GetOrNew(gridChunkLocation.ChunkIndices);
-                gridLoc.Add(index);
-                dirtyChunks.Add(gridChunkLocation);
+                if(!_gridChunkContents.ContainsKey(gridChunkLocation.GridId)) return;
+                if(!_gridChunkContents[gridChunkLocation.GridId].ContainsKey(gridChunkLocation.ChunkIndices))
+                    _gridChunkContents[gridChunkLocation.GridId][gridChunkLocation.ChunkIndices] = new();
+                _gridChunkContents[gridChunkLocation.GridId][gridChunkLocation.ChunkIndices].Add(index);
                 break;
             case LocalOverride localOverride:
                 // might be gone due to disconnects
@@ -209,10 +175,10 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
                 break;
             case MapChunkLocation mapChunkLocation:
                 // might be gone due to map-deletions
-                if(!_mapChunkContents.TryGetValue(mapChunkLocation.MapId, out var mapChunk)) return;
-                var mapLoc = mapChunk.GetOrNew(mapChunkLocation.ChunkIndices);
-                mapLoc.Add(index);
-                dirtyChunks.Add(mapChunkLocation);
+                if(!_mapChunkContents.ContainsKey(mapChunkLocation.MapId)) return;
+                if(!_mapChunkContents[mapChunkLocation.MapId].ContainsKey(mapChunkLocation.ChunkIndices))
+                    _mapChunkContents[mapChunkLocation.MapId][mapChunkLocation.ChunkIndices] = new();
+                _mapChunkContents[mapChunkLocation.MapId][mapChunkLocation.ChunkIndices].Add(index);
                 break;
         }
 
@@ -220,7 +186,7 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
         _indexLocations.Add(index, location);
     }
 
-    private IIndexLocation? RemoveIndexInternal(TIndex index)
+    private IndexLocation? RemoveIndexInternal(TIndex index)
     {
         // the index might be gone due to disconnects/grid-/map-deletions
         if (!_indexLocations.TryGetValue(index, out var location))
@@ -355,9 +321,6 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
         if(!removeFromOverride && IsOverride(index))
             return;
 
-        if (_indexLocations.TryGetValue(index, out var oldLocation) &&
-            oldLocation is GlobalOverride) return;
-
         RegisterUpdate(index, new GlobalOverride());
     }
 
@@ -372,10 +335,6 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
         if(!removeFromOverride && IsOverride(index))
             return;
 
-        if (_indexLocations.TryGetValue(index, out var oldLocation) &&
-            oldLocation is LocalOverride local &&
-            local.Session == session) return;
-
         RegisterUpdate(index, new LocalOverride(session));
     }
 
@@ -393,28 +352,14 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
         var gridId = coordinates.GetGridId(_entityManager);
         if (gridId != GridId.Invalid)
         {
-            var gridIndices = GetChunkIndices(coordinates.Position);
+            var gridIndices = GetChunkIndices(_mapManager.GetGrid(gridId).LocalToGrid(coordinates));
             UpdateIndex(index, gridId, gridIndices, true); //skip overridecheck bc we already did it (saves some dict lookups)
             return;
         }
 
-        var mapCoordinates = coordinates.ToMap(_entityManager);
-        var mapIndices = GetChunkIndices(coordinates.Position);
-        UpdateIndex(index, mapCoordinates.MapId, mapIndices, true); //skip overridecheck bc we already did it (saves some dict lookups)
-    }
-
-    public IChunkIndexLocation GetChunkIndex(EntityCoordinates coordinates)
-    {
-        var gridId = coordinates.GetGridId(_entityManager);
-        if (gridId != GridId.Invalid)
-        {
-            var gridIndices = GetChunkIndices(coordinates.Position);
-            return new GridChunkLocation(gridId, gridIndices);
-        }
-
-        var mapCoordinates = coordinates.ToMap(_entityManager);
-        var mapIndices = GetChunkIndices(coordinates.Position);
-        return new MapChunkLocation(mapCoordinates.MapId, mapIndices);
+        var mapId = coordinates.GetMapId(_entityManager);
+        var mapIndices = GetChunkIndices(coordinates.ToMapPos(_entityManager));
+        UpdateIndex(index, mapId, mapIndices, true); //skip overridecheck bc we already did it (saves some dict lookups)
     }
 
     /// <summary>
@@ -429,11 +374,6 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
         if(!removeFromOverride && IsOverride(index))
             return;
 
-        if (_indexLocations.TryGetValue(index, out var oldLocation) &&
-            oldLocation is GridChunkLocation oldGrid &&
-            oldGrid.ChunkIndices == chunkIndices &&
-            oldGrid.GridId == gridId) return;
-
         RegisterUpdate(index, new GridChunkLocation(gridId, chunkIndices));
     }
 
@@ -449,92 +389,25 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
         if(!removeFromOverride && IsOverride(index))
             return;
 
-        if (_indexLocations.TryGetValue(index, out var oldLocation) &&
-            oldLocation is MapChunkLocation oldMap &&
-            oldMap.ChunkIndices == chunkIndices &&
-            oldMap.MapId == mapId) return;
-
         RegisterUpdate(index, new MapChunkLocation(mapId, chunkIndices));
     }
 
-    private void RegisterUpdate(TIndex index, IIndexLocation location)
+    private void RegisterUpdate(TIndex index, IndexLocation location)
     {
+        if(_indexLocations.TryGetValue(index, out var oldLocation) && oldLocation == location) return;
+
         _locationChangeBuffer[index] = location;
     }
 
     #endregion
+
+    #region IndexLocations
+
+    private abstract record IndexLocation;
+    private record MapChunkLocation(MapId MapId, Vector2i ChunkIndices) : IndexLocation;
+    private record GridChunkLocation(GridId GridId, Vector2i ChunkIndices) : IndexLocation;
+    private record GlobalOverride : IndexLocation;
+    private record LocalOverride(ICommonSession Session) : IndexLocation;
+
+    #endregion
 }
-
-#region IndexLocations
-
-public interface IIndexLocation {};
-
-public interface IChunkIndexLocation{ };
-
-public struct MapChunkLocation : IIndexLocation, IChunkIndexLocation, IEquatable<MapChunkLocation>
-{
-    public MapChunkLocation(MapId mapId, Vector2i chunkIndices)
-    {
-        MapId = mapId;
-        ChunkIndices = chunkIndices;
-    }
-
-    public MapId MapId { get; init; }
-    public Vector2i ChunkIndices { get; init; }
-
-    public bool Equals(MapChunkLocation other)
-    {
-        return MapId.Equals(other.MapId) && ChunkIndices.Equals(other.ChunkIndices);
-    }
-
-    public override bool Equals(object? obj)
-    {
-        return obj is MapChunkLocation other && Equals(other);
-    }
-
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(MapId, ChunkIndices);
-    }
-}
-
-public struct GridChunkLocation : IIndexLocation, IChunkIndexLocation, IEquatable<GridChunkLocation>
-{
-    public GridChunkLocation(GridId gridId, Vector2i chunkIndices)
-    {
-        GridId = gridId;
-        ChunkIndices = chunkIndices;
-    }
-
-    public GridId GridId { get; init; }
-    public Vector2i ChunkIndices { get; init; }
-
-    public bool Equals(GridChunkLocation other)
-    {
-        return GridId.Equals(other.GridId) && ChunkIndices.Equals(other.ChunkIndices);
-    }
-
-    public override bool Equals(object? obj)
-    {
-        return obj is GridChunkLocation other && Equals(other);
-    }
-
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(GridId, ChunkIndices);
-    }
-}
-
-public struct GlobalOverride : IIndexLocation { }
-
-public struct LocalOverride : IIndexLocation
-{
-    public LocalOverride(ICommonSession session)
-    {
-        Session = session;
-    }
-
-    public ICommonSession Session { get; init; }
-}
-
-#endregion