Update arch (#4605)

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>

.github/CODEOWNERS

@@ -1,20 +1,12 @@
 # Last match in file takes precedence.
 
 # Ping for all PRs
-* @Acruid @PJB3005 @Silvertorch5
+* @PJB3005 @DrSmugleaf
 
-/Robust.*/Audio/Midi/ @Zumorica
+# commands commands commands commands
+**/Toolshed/** @moonheart08
+*Command.cs @moonheart08
+*Commands.cs @moonheart08
 
-/Robust.Client.NameGenerator @PaulRitter
-/Robust.Client.Injectors @PaulRitter
-/Robust.Generators @PaulRitter
-/Robust.Analyzers @PaulRitter
-/Robust.*/GameStates @PaulRitter
-/Robust.Shared/Analyzers @PaulRitter
-/Robust.*/Serialization @PaulRitter @DrSmugleaf
-/Robust.*/Prototypes @PaulRitter
-/Robust.Shared/GameObjects/ComponentDependencies @PaulRitter
-/Robust.*/Containers @PaulRitter
-
-# Be they Fluent translations or Freemarker templates, I know them both!
-*.ftl @RemieRichards
+# Physics
+**/Robust.Shared/Physics/** @metalgearsloth

.github/workflows/build-docfx.yml

@@ -6,29 +6,29 @@ on:
 jobs:
   docfx:
    runs-on: ubuntu-latest
-   steps: 
-    - uses: actions/checkout@v2
+   steps:
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: true
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.x
-        
+        dotnet-version: 7.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      
+      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 }} 
+        BUILD_DIR: Robust.Docfx/_robust-site
+        GH_PAT: ${{ secrets.GH_PAT }}

.github/workflows/build-test.yml

@@ -15,19 +15,19 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: true
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore /p:WarningsAsErrors=nullable
     - name: Test Engine
       run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
- 
+
 

.github/workflows/codeql-analysis.yml

@@ -35,14 +35,14 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.6.0
       with:
         submodules: true
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
 
     - name: Build
       run: dotnet build

.github/workflows/publish-client.yml

@@ -16,14 +16,14 @@ jobs:
         $ver = [regex]::Match($env:GITHUB_REF, "refs/tags/v?(.+)").Groups[1].Value
         echo ("::set-output name=version::{0}" -f $ver)
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: true
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
 
     - name: Package client
       run: Tools/package_client_build.py -p windows mac linux

.github/workflows/test-content.yml

@@ -13,15 +13,15 @@ jobs:
 
     steps:
     - name: Check out content
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.6.0
       with:
         repository: space-wizards/space-station-14
         submodules: recursive
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
     - name: Disable submodule autoupdate
       run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
 
@@ -34,7 +34,7 @@ jobs:
     - name: Install dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --configuration Release --no-restore
+      run: dotnet build --configuration Tools --no-restore
     - name: Content.Tests
       run: dotnet test --no-build Content.Tests/Content.Tests.csproj -v n
     - name: Content.IntegrationTests

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "cefglue"]
 	path = cefglue
 	url = https://github.com/space-wizards/cefglue.git
+[submodule "Arch/Arch"]
+	path = Arch/Arch
+	url = https://github.com/space-wizards/Arch.git

Arch/Arch.csproj

@@ -0,0 +1,94 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <LangVersion>latest</LangVersion>
+    <TargetFramework>net7.0</TargetFramework>
+
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <Nullable>enable</Nullable>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+
+    <PackageId>Arch</PackageId>
+    <Title>Arch</Title>
+    <Version>1.2.7.1-alpha</Version>
+    <Authors>genaray</Authors>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <Description>A high performance c# net.6 and net.7 archetype based ECS ( Entity component system ).</Description>
+    <PackageReleaseNotes>Updated LowLevel which fixes bugs. </PackageReleaseNotes>
+    <PackageTags>c#;.net;.net6;.net7;ecs;game;entity;gamedev; game-development; game-engine; entity-component-system;stride;unity;godot;</PackageTags>
+
+    <PackageProjectUrl>https://github.com/genaray/Arch</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/genaray/Arch.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <IsPackable>true</IsPackable>
+
+    <LangVersion>11</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Copyright>Apache2.0</Copyright>
+
+    <NoWarn>1701;1702;1591</NoWarn>
+
+    <Configurations>Debug;Debug-PureECS;Debug-Events;Release;Release-PureECS;Release-Events;</Configurations>
+
+    <AssemblyName>Arch</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <DefaultItemExcludes>src/Arch/**/*</DefaultItemExcludes>
+    <DefineConstants>$(DefineConstants);PURE_ECS;CONTRACTS_FULL</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>$(DefineConstants);PURE_ECS;CONTRACTS_FULL;TRACE;</DefineConstants>
+    <Optimize>false</Optimize>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Arch.Benchmarks" />
+    <InternalsVisibleTo Include="Arch.Tests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="System" />
+    <Using Include="System.Collections" />
+    <Using Include="System.Collections.Generic" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Diagnostics.CodeAnalysis" />
+    <Using Include="System.IO" />
+    <Using Include="System.Linq" />
+    <Using Include="System.Runtime.CompilerServices" />
+    <Using Include="System.Runtime.InteropServices" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include=".\Arch\src\Arch.SourceGen\Arch.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Arch.LowLevel" Version="1.1.0" />
+    <PackageReference Include="Collections.Pooled" Version="2.0.0-preview.27" />
+    <PackageReference Include="CommunityToolkit.HighPerformance" Version="7.1.2" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+    <PackageReference Include="ZeroAllocJobScheduler" Version="1.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="Arch\src\Arch\**\*.cs">
+      <Link>Arch\%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+    <Compile Remove="Arch\src\Arch\obj\**\*.cs" />
+    <InternalsVisibleTo Include="Arch.Benchmarks" />
+    <InternalsVisibleTo Include="Arch.Tests" />
+  </ItemGroup>
+
+  <Import Project="../MSBuild/Robust.Properties.targets" />
+
+</Project>

Avalonia.Base/Avalonia.Base.csproj

@@ -1,7 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
-    </PropertyGroup>
-
+  <Import Project="..\MSBuild\Robust.Engine.props" />
 </Project>

Lidgren.Network/Lidgren.Network.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>SpaceWizards.Lidgren.Network</AssemblyName>
 
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -9,6 +8,8 @@
     <DefaultItemExcludes>Lidgren.Network/**/*</DefaultItemExcludes>
     <DefineConstants>$(DefineConstants);USE_RELEASE_STATISTICS</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+    <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,4 +19,5 @@
     <Compile Remove="Lidgren.Network\Lidgren.Network\obj\**\*.cs" />
   </ItemGroup>
 
+  <Import Project="../MSBuild/Robust.Properties.targets" />
 </Project>

MSBuild/Robust.CompNetworkGenerator.targets

@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+  </ItemGroup>
+</Project>

MSBuild/Robust.Configurations.props

@@ -0,0 +1,37 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Build configurations -->
+  <PropertyGroup>
+    <!-- Avoid SDK defining DEBUG/RELEASE/DEBUGOPT/TOOLS itself. -->
+    <DisableImplicitConfigurationDefines>true</DisableImplicitConfigurationDefines>
+
+    <!-- Project configurations -->
+    <Configurations>Debug;Release;Tools;DebugOpt</Configurations>
+    <Platforms>AnyCPU</Platforms>
+  </PropertyGroup>
+  <!-- Debug configuration: asserts, tools, no optimizations -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
+    <Optimize Condition="'$(Optimize)' == ''">false</Optimize>
+    <RobustToolsBuild Condition="'$(RobustToolsBuild)' == ''">true</RobustToolsBuild>
+    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <!-- DebugOpt configuration: asserts, tools, optimizations -->
+  <PropertyGroup Condition="'$(Configuration)' == 'DebugOpt'">
+    <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
+    <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
+    <RobustToolsBuild Condition="'$(RobustToolsBuild)' == ''">true</RobustToolsBuild>
+    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <!-- Tools configuration: no asserts, tools, optimizations -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Tools'">
+    <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
+    <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
+    <RobustToolsBuild Condition="'$(RobustToolsBuild)' == ''">true</RobustToolsBuild>
+  </PropertyGroup>
+  <!-- Release configuration: no asserts, no tools, optimizations -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
+    <RobustToolsBuild Condition="'$(RobustToolsBuild)' == ''">false</RobustToolsBuild>
+    <DefineConstants>RELEASE;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+</Project>

MSBuild/Robust.DefineConstants.targets

@@ -20,7 +20,10 @@
   <PropertyGroup Condition="'$(FullRelease)' == 'True'">
     <DefineConstants>$(DefineConstants);FULL_RELEASE</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+  <PropertyGroup Condition="'$(FullRelease)' != 'True'">
+    <DefineConstants>$(DefineConstants);DEVELOPMENT</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'Tools'">
     <DefineConstants>$(DefineConstants);EXCEPTION_TOLERANCE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(EnableClientScripting)' == 'True'">
@@ -29,4 +32,7 @@
   <PropertyGroup Condition="'$(UseSystemSqlite)' == 'True'">
     <DefineConstants>$(DefineConstants);USE_SYSTEM_SQLITE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(RobustToolsBuild)' == 'true'">
+    <DefineConstants>$(DefineConstants);TOOLS</DefineConstants>
+  </PropertyGroup>
 </Project>

MSBuild/Robust.Engine.Version.props

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

MSBuild/Robust.Engine.props

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

MSBuild/Robust.Platform.props

@@ -0,0 +1,35 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- MSBuild hurts and I can't find a foolproof way to detect platform. -->
+  <PropertyGroup>
+    <OS Condition="'$(OS)' == ''">Windows_NT</OS>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(OS)' != 'Unix'">
+      <PropertyGroup>
+        <ActualOS>Windows</ActualOS>
+      </PropertyGroup>
+    </When>
+    <!-- Folders that *probably* only exist on MacOS and not Linux. -->
+    <When Condition="Exists('/Volumes') And Exists('/System') And Exists('/Library')" >
+      <PropertyGroup>
+        <ActualOS>MacOS</ActualOS>
+      </PropertyGroup>
+    </When>
+    <When Condition="$([MSBuild]::IsOSPlatform('FreeBSD'))">
+      <PropertyGroup>
+        <ActualOS>FreeBSD</ActualOS>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <ActualOS>Linux</ActualOS>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <PropertyGroup>
+    <TargetOS Condition="'$(TargetOS)' == ''">$(ActualOS)</TargetOS>
+    <Python>python3</Python>
+    <Python Condition="'$(ActualOS)' == 'Windows'">py -3</Python>
+    <UseSystemSqlite Condition="'$(TargetOS)' == 'FreeBSD'">True</UseSystemSqlite>
+  </PropertyGroup>
+</Project>

MSBuild/Robust.Properties.targets

@@ -1,40 +1,31 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Properties for both engine and content. -->
+  <!-- Import this at the end of any project files in Robust and Content. -->
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+  </PropertyGroup>
+
   <Import Project="Robust.Custom.targets" Condition="Exists('Robust.Custom.targets')"/>
-  <!-- MSBuild hurts and I can't find a foolproof way to detect platform. -->
+
+  <!-- Configuration logic -->
+  <Import Project="Robust.Configurations.props" />
+
+  <!-- Some platform management logic -->
+  <Import Project="Robust.Platform.props" />
+
   <PropertyGroup>
-    <OS Condition="'$(OS)' == ''">Windows_NT</OS>
-  </PropertyGroup>
-  <Choose>
-    <When Condition="'$(OS)' != 'Unix'">
-      <PropertyGroup>
-        <ActualOS>Windows</ActualOS>
-      </PropertyGroup>
-    </When>
-    <!-- Folders that *probably* only exist on MacOS and not Linux. -->
-    <When Condition="Exists('/Volumes') And Exists('/System') And Exists('/Library')" >
-      <PropertyGroup>
-        <ActualOS>MacOS</ActualOS>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::IsOSPlatform('FreeBSD'))">
-      <PropertyGroup>
-        <ActualOS>FreeBSD</ActualOS>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <ActualOS>Linux</ActualOS>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <PropertyGroup>
-    <TargetOS Condition="'$(TargetOS)' == ''">$(ActualOS)</TargetOS>
-    <Python>python3</Python>
-    <Python Condition="'$(ActualOS)' == 'Windows'">py -3</Python>
-    <TargetFramework>net6.0</TargetFramework>
-    <EnableClientScripting>True</EnableClientScripting>
-    <!-- Client scripting is disabled on full release builds for security and size reasons. -->
-    <EnableClientScripting Condition="'$(FullRelease)' == 'True'">False</EnableClientScripting>
-    <UseSystemSqlite Condition="'$(TargetOS)' == 'FreeBSD'">True</UseSystemSqlite>
+    <EnableClientScripting>False</EnableClientScripting>
+    <!-- Client scripting is only enabled on tools builds for security and size reasons. -->
+    <EnableClientScripting Condition="'$(RobustToolsBuild)' == 'true'">True</EnableClientScripting>
   </PropertyGroup>
+
+  <!-- built-in define constants -->
+  <Import Project="Robust.DefineConstants.targets" />
+
+  <!-- analyzer -->
+  <Import Project="Robust.Analyzers.targets" Condition="'$(SkipRobustAnalyzer)' != 'true'" />
+
+  <!-- serialization generator -->
+  <Import Project="Robust.Serialization.Generator.targets" />
 </Project>

MSBuild/Robust.Serialization.Generator.targets

@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+  </ItemGroup>
+</Project>

MSBuild/XamlIL.targets

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Avoid MSBuild adding a None entry for XAML files because they'd show up TWICE in the project view. -->
     <DefaultItemExcludes>**/*.xaml</DefaultItemExcludes>
-    <RobustUseExternalMSBuild>false</RobustUseExternalMSBuild>
+    <RobustUseExternalMSBuild>true</RobustUseExternalMSBuild>
     <_RobustUseExternalMSBuild>$(RobustUseExternalMSBuild)</_RobustUseExternalMSBuild>
     <_RobustUseExternalMSBuild Condition="'$(_RobustForceInternalMSBuild)' == 'true'">false</_RobustUseExternalMSBuild>
   </PropertyGroup>
@@ -19,10 +19,17 @@
     <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\Robust.Client.Injectors.csproj" ReferenceOutputAssembly="false"/>
   </ItemGroup>
 
+  <!-- XamlIL does not make use of special Robust configurations like DebugOpt. Convert these down. -->
+  <PropertyGroup>
+    <RobustInjectorsConfiguration>$(Configuration)</RobustInjectorsConfiguration>
+    <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'DebugOpt'">Debug</RobustInjectorsConfiguration>
+    <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'Tools'">Release</RobustInjectorsConfiguration>
+  </PropertyGroup>
+
   <UsingTask
     Condition="'$(_RobustUseExternalMSBuild)' != 'true' And $(DesignTimeBuild) != true"
     TaskName="CompileRobustXamlTask"
-    AssemblyFile="$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(Configuration)\netstandard2.0\Robust.Client.Injectors.dll"/>
+    AssemblyFile="$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(RobustInjectorsConfiguration)\netstandard2.0\Robust.Client.Injectors.dll"/>
   <Target
     Name="CompileRobustXaml"
     Condition="Exists('@(IntermediateAssembly)')"

OpenToolkit.GraphicsLibraryFramework/GLFWNative.cs

@@ -25,7 +25,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
                 }
 
                 string rName = null;
-                if (OperatingSystem.IsLinux()) rName = "libglfw.so.3";
+                if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD()) rName = "libglfw.so.3";
                 else if (OperatingSystem.IsMacOS()) rName = "libglfw.3.dylib";
 
                 if ((rName != null) && NativeLibrary.TryLoad(rName, assembly, path, out var handle))

OpenToolkit.GraphicsLibraryFramework/OpenToolkit.GraphicsLibraryFramework.csproj

@@ -1,17 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\MSBuild\Robust.Properties.targets" />
-
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>9.0</LangVersion>
+    <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
   </PropertyGroup>
 
-  <Import Project="..\MSBuild\Robust.DefineConstants.targets" />
-
-  <ItemGroup>
-    <PackageReference Condition="'$(TargetFramework)' == 'net472'" Include="System.Memory" Version="4.5.3" />
-  </ItemGroup>
-
+  <Import Project="..\MSBuild\Robust.Properties.targets" />
 </Project>

README.md

@@ -18,7 +18,7 @@ We are happy to accept contributions from anybody. Get in Discord or IRC if you
 
 ## Building
 
-This repository is the **engine** part of SS14. It's the base engine all SS14 servers will be built on. As such, it does not start on its own: it needs the [content repo](https://github.com/space-wizards/space-station-14). Think of Robust Toolbox as BYOND in the context of Spacestation 13.
+This repository is the **engine** part of SS14. It's the base engine all SS14 servers will be built on. As such, it does not start on its own: it needs the [content repo](https://github.com/space-wizards/space-station-14). Think of Robust Toolbox as BYOND in the context of Space Station 13.
 
 ## Legal Info
 

Resources/EngineCredits/Libraries.yml

@@ -1546,6 +1546,31 @@
        misrepresented as being the original software.
     3. This notice may not be removed or altered from any source distribution.
 
+- name: FastNoise
+  license: |
+    MIT License
+
+    Copyright(c) 2020 Jordan Peck (jordan.me2@gmail.com)
+    Copyright(c) 2020 Contributors
+
+    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.
+
 - name: OpenAL soft
   license: |
     GNU LIBRARY GENERAL PUBLIC LICENSE
@@ -2178,3 +2203,207 @@
     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.
+
+- name: Arch
+  license: |
+    Apache License
+                            Version 2.0, January 2004
+                         http://www.apache.org/licenses/
+    
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+    
+    1. Definitions.
+    
+    "License" shall mean the terms and conditions for use, reproduction,
+    and distribution as defined by Sections 1 through 9 of this document.
+    
+    "Licensor" shall mean the copyright owner or entity authorized by
+    the copyright owner that is granting the License.
+    
+    "Legal Entity" shall mean the union of the acting entity and all
+    other entities that control, are controlled by, or are under common
+    control with that entity. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.
+    
+    "You" (or "Your") shall mean an individual or Legal Entity
+    exercising permissions granted by this License.
+    
+    "Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation
+    source, and configuration files.
+    
+    "Object" form shall mean any form resulting from mechanical
+    transformation or translation of a Source form, including but
+    not limited to compiled object code, generated documentation,
+    and conversions to other media types.
+    
+    "Work" shall mean the work of authorship, whether in Source or
+    Object form, made available under the License, as indicated by a
+    copyright notice that is included in or attached to the work
+    (an example is provided in the Appendix below).
+    
+    "Derivative Works" shall mean any work, whether in Source or Object
+    form, that is based on (or derived from) the Work and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship. For the purposes
+    of this License, Derivative Works shall not include works that remain
+    separable from, or merely link (or bind by name) to the interfaces of,
+    the Work and Derivative Works thereof.
+    
+    "Contribution" shall mean any work of authorship, including
+    the original version of the Work and any modifications or additions
+    to that Work or Derivative Works thereof, that is intentionally
+    submitted to Licensor for inclusion in the Work by the copyright owner
+    or by an individual or Legal Entity authorized to submit on behalf of
+    the copyright owner. For the purposes of this definition, "submitted"
+    means any form of electronic, verbal, or written communication sent
+    to the Licensor or its representatives, including but not limited to
+    communication on electronic mailing lists, source code control systems,
+    and issue tracking systems that are managed by, or on behalf of, the
+    Licensor for the purpose of discussing and improving the Work, but
+    excluding communication that is conspicuously marked or otherwise
+    designated in writing by the copyright owner as "Not a Contribution."
+    
+    "Contributor" shall mean Licensor and any individual or Legal Entity
+    on behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.
+    
+    2. Grant of Copyright License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of,
+    publicly display, publicly perform, sublicense, and distribute the
+    Work and such Derivative Works in Source or Object form.
+    
+    3. Grant of Patent License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made,
+    use, offer to sell, sell, import, and otherwise transfer the Work,
+    where such license applies only to those patent claims licensable
+    by such Contributor that are necessarily infringed by their
+    Contribution(s) alone or by combination of their Contribution(s)
+    with the Work to which such Contribution(s) was submitted. If You
+    institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work
+    or a Contribution incorporated within the Work constitutes direct
+    or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate
+    as of the date such litigation is filed.
+    
+    4. Redistribution. You may reproduce and distribute copies of the
+    Work or Derivative Works thereof in any medium, with or without
+    modifications, and in Source or Object form, provided that You
+    meet the following conditions:
+    
+    (a) You must give any other recipients of the Work or
+    Derivative Works a copy of this License; and
+    
+    (b) You must cause any modified files to carry prominent notices
+    stating that You changed the files; and
+    
+    (c) You must retain, in the Source form of any Derivative Works
+    that You distribute, all copyright, patent, trademark, and
+    attribution notices from the Source form of the Work,
+    excluding those notices that do not pertain to any part of
+    the Derivative Works; and
+    
+    (d) If the Work includes a "NOTICE" text file as part of its
+    distribution, then any Derivative Works that You distribute must
+    include a readable copy of the attribution notices contained
+    within such NOTICE file, excluding those notices that do not
+    pertain to any part of the Derivative Works, in at least one
+    of the following places: within a NOTICE text file distributed
+    as part of the Derivative Works; within the Source form or
+    documentation, if provided along with the Derivative Works; or,
+    within a display generated by the Derivative Works, if and
+    wherever such third-party notices normally appear. The contents
+    of the NOTICE file are for informational purposes only and
+    do not modify the License. You may add Your own attribution
+    notices within Derivative Works that You distribute, alongside
+    or as an addendum to the NOTICE text from the Work, provided
+    that such additional attribution notices cannot be construed
+    as modifying the License.
+    
+    You may add Your own copyright statement to Your modifications and
+    may provide additional or different license terms and conditions
+    for use, reproduction, or distribution of Your modifications, or
+    for any such Derivative Works as a whole, provided Your use,
+    reproduction, and distribution of the Work otherwise complies with
+    the conditions stated in this License.
+    
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+    any Contribution intentionally submitted for inclusion in the Work
+    by You to the Licensor shall be under the terms and conditions of
+    this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify
+    the terms of any separate license agreement you may have executed
+    with Licensor regarding such Contributions.
+    
+    6. Trademarks. This License does not grant permission to use the trade
+    names, trademarks, service marks, or product names of the Licensor,
+    except as required for reasonable and customary use in describing the
+    origin of the Work and reproducing the content of the NOTICE file.
+    
+    7. Disclaimer of Warranty. Unless required by applicable law or
+    agreed to in writing, Licensor provides the Work (and each
+    Contributor provides its Contributions) on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied, including, without limitation, any warranties or conditions
+    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+    PARTICULAR PURPOSE. You are solely responsible for determining the
+    appropriateness of using or redistributing the Work and assume any
+    risks associated with Your exercise of permissions under this License.
+    
+    8. Limitation of Liability. In no event and under no legal theory,
+    whether in tort (including negligence), contract, or otherwise,
+    unless required by applicable law (such as deliberate and grossly
+    negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a
+    result of this License or out of the use or inability to use the
+    Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all
+    other commercial damages or losses), even if such Contributor
+    has been advised of the possibility of such damages.
+    
+    9. Accepting Warranty or Additional Liability. While redistributing
+    the Work or Derivative Works thereof, You may choose to offer,
+    and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this
+    License. However, in accepting such obligations, You may act only
+    on Your own behalf and on Your sole responsibility, not on behalf
+    of any other Contributor, and only if You agree to indemnify,
+    defend, and hold each Contributor harmless for any liability
+    incurred by, or claims asserted against, such Contributor by reason
+    of your accepting any such warranty or additional liability.
+    
+    END OF TERMS AND CONDITIONS
+    
+    APPENDIX: How to apply the Apache License to your work.
+    
+    To apply the Apache License to your work, attach the following
+    boilerplate notice, with the fields enclosed by brackets "[]"
+    replaced with your own identifying information. (Don't include
+    the brackets!)  The text should be enclosed in the appropriate
+    comment syntax for the file format. We also recommend that a
+    file or class name and description of purpose be included on the
+    same "printed page" as the copyright notice for easier
+    identification within third-party archives.
+    
+    Copyright 2022 Lars Matthäus/genaray
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.

Resources/EngineFonts/NotoSans/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Resources/EnginePrototypes/Debug/rotation.yml

@@ -0,0 +1,34 @@
+- type: entity
+  id: debugRotation
+  abstract: true
+  categories: [ debug ]
+  components:
+  - type: Sprite
+    netsync: false
+    visible: true
+    sprite: debugRotation.rsi
+    state: direction1
+
+- type: entity
+  id: debugRotation1
+  parent: debugRotation
+  name: dbg_rotation1
+  components:
+  - type: Sprite
+    state: direction1
+
+- type: entity
+  id: debugRotation4
+  parent: debugRotation
+  name: dbg_rotation4
+  components:
+  - type: Sprite
+    state: direction4
+
+- type: entity
+  id: debugRotationTex
+  parent: debugRotation
+  name: dbg_rotationTex
+  components:
+  - type: Sprite
+    state: direction1

Resources/EnginePrototypes/UserInterface/uiThemes.yml

@@ -1,3 +1,44 @@
 - type: uiTheme
   id: Default
-  path: /textures/interface/Default
+  path: /Textures/Interface/Default/
+  colors:
+    # Root
+    rootBackground: "#000000"
+
+    # Windows
+    windowBackground: "#111111"
+    windowBorder: "#444444"
+    windowHeader: "#001e3d"
+
+    windowCloseButton: "#FFFFFF"
+    windowCloseButtonHover: "#FF7F7F"
+    windowCloseButtonPressed: "#FF0000"
+
+    # Scrollbars
+    scrollBarDefault: "#80808059"
+    scrollBarHovered: "#8C8C8C59"
+    scrollBarGrabbed: "#8C8C8C59"
+
+    # Buttons
+    buttonBackground: "#171717"
+    buttonBackgroundHovered: "#272727"
+    buttonBackgroundPressed: "#173717"
+    buttonBorder: "#444444"
+    buttonBorderHovered: "#444444"
+    buttonBorderPressed: "#447044"
+    buttonBackgroundDisabled: "#333333"
+    buttonBorderDisabled: "#222222"
+
+    # LineEdit
+    lineEditUneditableText: "#444444"
+    lineEditPlaceholderText: "#7d7d7d"
+    lineEditBackground: "#000000"
+    lineEditBorder: "#444444"
+
+    # TabContainer
+    tabContainerBackground: "#000000"
+    tabContainerBorder: "#444444"
+    tabContainerActiveTabBackground: "#173717"
+    tabContainerActiveTabBorder: "#447044"
+    tabContainerInactiveTabBackground: "#171717"
+    tabContainerInactiveTabBorder: "#444444"

Resources/EnginePrototypes/entityCategory.yml

@@ -0,0 +1,17 @@
+# debug related entities
+- type: entityCategory
+  id: debug
+  name: entity-category-name-debug
+  description: entity-category-desc-debug
+
+# entities that spawn other entities
+- type: entityCategory
+  id: spawner
+  name: entity-category-name-spawner
+  description: entity-category-desc-spawner
+
+# entities that should be hidden from the spawn menu
+- type: entityCategory
+  id: hideSpawnMenu
+  name: entity-category-name-hide
+  description: entity-category-desc-hide

Resources/Locale/en-US/commands.ftl

@@ -11,6 +11,10 @@ cmd-parse-failure-uid = {$arg} is not a valid entity UID.
 cmd-parse-failure-mapid = {$arg} is not a valid MapId.
 cmd-parse-failure-entity-exist = UID {$arg} does not correspond to an existing entity.
 
+cmd-error-file-not-found = Could not find file: {$file}.
+cmd-error-dir-not-found = Could not find directory: {$dir}.
+
+cmd-failure-no-attached-entity = There is no entity attached to this shell.
 
 ## 'help' command
 cmd-help-desc = Display general help or help text for a specific command
@@ -183,6 +187,15 @@ cmd-guidump-help = Usage: guidump
 cmd-uitest-desc = Open a dummy UI testing window
 cmd-uitest-help = Usage: uitest
 
+## 'uitest2' command
+cmd-uitest2-desc = Opens a UI control testing OS window
+cmd-uitest2-help = Usage: uitest2 <tab>
+cmd-uitest2-arg-tab = <tab>
+cmd-uitest2-error-args = Expected at most one argument
+cmd-uitest2-error-tab = Invalid tab: '{$value}'
+cmd-uitest2-title = UITest2
+
+
 cmd-setclipboard-desc = Sets the system clipboard
 cmd-setclipboard-help = Usage: setclipboard <text>
 
@@ -217,8 +230,15 @@ cmd-cldbglyr-help= Usage: cldbglyr <layer>: Toggle <layer>
 cmd-key-info-desc = Keys key info for a key.
 cmd-key-info-help = Usage: keyinfo <Key>
 
-cmd-bind-desc = Binds an input key to an input command.
-cmd-bind-help = bind <KeyName> <BindMode> <InputCommand>
+## 'bind' command
+cmd-bind-desc = Binds an input key combination to an input command.
+cmd-bind-help = Usage: bind { cmd-bind-arg-key } { cmd-bind-arg-mode } { cmd-bind-arg-command }
+    Note that this DOES NOT automatically save bindings.
+    Use the 'svbind' command to save binding configuration.
+
+cmd-bind-arg-key = <KeyName>
+cmd-bind-arg-mode = <BindMode>
+cmd-bind-arg-command = <InputCommand>
 
 cmd-net-draw-interp-desc = Toggles the debug drawing of the network interpolation.
 cmd-net-draw-interp-help = Usage: net_draw_interp
@@ -361,8 +381,11 @@ cmd-netaudit-help = netaudit
 cmd-tp-desc = Teleports a player to any location in the round.
 cmd-tp-help = tp <x> <y> [<mapID>]
 
-cmd-tpto-desc = Teleports the current player or the specified players/entities to the location of last player/entity specified.d.
+cmd-tpto-desc = Teleports the current player or the specified players/entities to the location of the first player/entity.
 cmd-tpto-help = tpto <username|uid> [username|uid]...
+cmd-tpto-destination-hint = destination (uid or username)
+cmd-tpto-victim-hint = entity to teleport (uid or username)
+cmd-tpto-parse-error = Cant resolve entity or player: {$str}
 
 cmd-listplayers-desc = Lists all players currently connected.
 cmd-listplayers-help = listplayers
@@ -506,10 +529,35 @@ cmd-vvread-desc = Retrieve a path's value using VV (View Variables).
 cmd-vvread-desc = Usage: vvread <path>
 
 cmd-vvwrite-desc = Modify a path's value using VV (View Variables).
-cmd-vvwrite-desc = Usage: vvwrite <path>
+cmd-vvwrite-help = Usage: vvwrite <path>
 
 cmd-vv-desc = Opens View Variables (VV).
-cmd-vv-desc = Usage: vv <path|entity ID|guihover>
+cmd-vv-help = Usage: vv <path|entity ID|guihover>
 
 cmd-vvinvoke-desc = Invoke/Call a path with arguments using VV.
-cmd-vvinvoke-desc = Usage: vvinvoke <path> [arguments...]
+cmd-vvinvoke-help = Usage: vvinvoke <path> [arguments...]
+
+cmd-dump_dependency_injectors-desc = Dump IoCManager's dependency injector cache.
+cmd-dump_dependency_injectors-help = Usage: dump_dependency_injectors
+cmd-dump_dependency_injectors-total-count = Total count: { $total }
+
+cmd-dump_netserializer_type_map-desc = Dump NetSerializer's type map and serializer hash.
+cmd-dump_netserializer_type_map-help = Usage: dump_netserializer_type_map
+
+cmd-hub_advertise_now-desc = Immediately advertise to the master hub server
+cmd-hub_advertise_now-help = Usage: hub_advertise_now
+
+cmd-echo-desc = Echo arguments back to the console
+cmd-echo-help = Usage: echo "<message>"
+
+## 'vfs_ls' command
+cmd-vfs_ls-desc = List directory contents in the VFS.
+cmd-vfs_ls-help = Usage: vfs_list <path>
+    Example:
+    vfs_list /Assemblies
+
+cmd-vfs_ls-err-args = Need exactly 1 argument.
+cmd-vfs_ls-hint-path = <path>
+
+cmd-reloadtiletextures-desc = Reloads the tile texture atlas to allow hot reloading tile sprites
+cmd-reloadtiletextures-help = Usage: reloadtiletextures

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

@@ -3,6 +3,7 @@
 entity-spawn-window-title = Entity Spawn Panel
 entity-spawn-window-search-bar-placeholder = search
 entity-spawn-window-clear-button = Clear
+entity-spawn-window-replace-button-text = Replace
 entity-spawn-window-erase-button-text = Erase Mode
 entity-spawn-window-override-menu-tooltip = Override placement
 

Resources/Locale/en-US/debug-builtin-connection-screen.ftl

@@ -0,0 +1,3 @@
+debug-builtin-connection-screen-invalid-username-with-reason = The given username is invalid: {$invalidreason}
+debug-builtin-connection-screen-invalid-username = Invalid Username.
+debug-builtin-connection-screen-failed-to-connect = Failed to connect: {$reason}

Resources/Locale/en-US/discordRPC.ftl

@@ -0,0 +1,5 @@
+discord-rpc-in-main-menu = In Main Menu
+discord-rpc-in-main-menu-logo-text = I think coolsville SUCKS
+discord-rpc-character = Username: {$username}
+discord-rpc-on-server = On Server: {$servername}
+discord-rpc-players = Players: {$players}/{$maxplayers}

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

@@ -0,0 +1,8 @@
+entity-category-name-debug = Debug
+entity-category-desc-debug = Entity prototypes intended for debugging & testing.
+
+entity-category-name-spawner = Spawner
+entity-category-desc-spawner = Entity prototypes that spawn other entities.
+
+entity-category-name-hide = Hidden
+entity-category-desc-hide = Entity prototypes that should be hidden from the spawn menu

Resources/Locale/en-US/input.ftl

@@ -18,6 +18,15 @@ input-key-F12 = F12
 input-key-F13 = F13
 input-key-F14 = F14
 input-key-F15 = F15
+input-key-F16 = F16
+input-key-F17 = F17
+input-key-F18 = F18
+input-key-F19 = F19
+input-key-F20 = F20
+input-key-F21 = F21
+input-key-F22 = F22
+input-key-F23 = F23
+input-key-F24 = F24
 input-key-Pause = Pause
 input-key-Left = Left
 input-key-Up = Up
@@ -25,7 +34,22 @@ input-key-Down = Down
 input-key-Right = Right
 input-key-Space = Space
 input-key-Return = Return
-input-key-NumpadEnter = Num Enter
+input-key-NumpadEnter = Numpad Enter
+input-key-NumpadNum0 = Numpad 0
+input-key-NumpadNum1 = Numpad 1
+input-key-NumpadNum2 = Numpad 2
+input-key-NumpadNum3 = Numpad 3
+input-key-NumpadNum4 = Numpad 4
+input-key-NumpadNum5 = Numpad 5
+input-key-NumpadNum6 = Numpad 6
+input-key-NumpadNum7 = Numpad 7
+input-key-NumpadNum8 = Numpad 8
+input-key-NumpadNum9 = Numpad 9
+input-key-NumpadAdd = Numpad Add
+input-key-NumpadSubtract = Numpad Subtract
+input-key-NumpadDivide = Numpad Divide
+input-key-NumpadMultiply = Numpad Multiply
+input-key-NumpadDecimal = Numpad Decimal
 input-key-BackSpace = Backspace
 input-key-Tab = Tab
 input-key-PageUp = Page Up

Resources/Locale/en-US/replays.ftl

@@ -0,0 +1,59 @@
+# Playback Commands
+
+cmd-replay-play-desc = Resume replay playback.
+cmd-replay-play-help = replay_play
+
+cmd-replay-pause-desc = Pause replay playback
+cmd-replay-pause-help = replay_pause
+
+cmd-replay-toggle-desc = Resume or pause replay playback.
+cmd-replay-toggle-help = replay_toggle
+
+cmd-replay-stop-desc = Stop and unload a replay.
+cmd-replay-stop-help = replay_stop
+
+cmd-replay-load-desc = Load and start a replay.
+cmd-replay-load-help = replay_load <replay folder>
+cmd-replay-load-hint = Replay folder
+
+cmd-replay-skip-desc = Skip forwards or backwards in time.
+cmd-replay-skip-help = replay_skip <tick or timespan>
+cmd-replay-skip-hint = Ticks or timespan (HH:MM:SS).
+
+cmd-replay-set-time-desc = Jump forwards or backwards to some specific time.
+cmd-replay-set-time-help = replay_set <tick or time>
+cmd-replay-set-time-hint = Tick or timespan (HH:MM:SS), starting from
+
+cmd-replay-error-time = "{$time}" is not an integer or timespan.
+cmd-replay-error-args = Wrong number of arguments.
+cmd-replay-error-no-replay = Not currently playing a replay.
+cmd-replay-error-already-loaded = A replay is already loaded.
+cmd-replay-error-run-level = You cannot load a replay while connected to a server.
+
+# Recording commands
+
+cmd-replay-recording-start-desc = Starts a replay recording, optionally with some time limit.
+cmd-replay-recording-start-help = Usage: replay_recording_start [name] [overwrite] [time limit]
+cmd-replay-recording-start-success = Started recording a replay.
+cmd-replay-recording-start-already-recording = Already recording a replay.
+cmd-replay-recording-start-error = An error occurred while trying to start the recording.
+cmd-replay-recording-start-hint-time = [time limit (minutes)]
+cmd-replay-recording-start-hint-name = [name]
+cmd-replay-recording-start-hint-overwrite = [overwrite (bool)]
+
+cmd-replay-recording-stop-desc = Stops a replay recording.
+cmd-replay-recording-stop-help = Usage: replay_recording_stop
+cmd-replay-recording-stop-success = Stopped recording a replay.
+cmd-replay-recording-stop-not-recording = Not currently recording a replay.
+
+cmd-replay-recording-stats-desc = Displays information about the current replay recording.
+cmd-replay-recording-stats-help = Usage: replay_recording_stats
+cmd-replay-recording-stats-result = Duration: {$time} min, Ticks: {$ticks}, Size: {$size} MB, rate: {$rate} MB/min.
+
+
+# Time Control UI
+replay-time-box-scrubbing-label = Dynamic Scrubbing
+replay-time-box-replay-time-label = Recording Time: {$current} / {$end}  ({$percentage}%)
+replay-time-box-server-time-label = Server Time: {$current} / {$end}
+replay-time-box-index-label = Index: {$current} / {$total}
+replay-time-box-tick-label = Tick: {$current} / {$total}

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

@@ -0,0 +1,423 @@
+command-description-tpto =
+    Teleport the given entities to some target entity.
+command-description-player-list =
+    Returns a list of all player sessions.
+command-description-player-self =
+    Returns the current player session.
+command-description-player-imm =
+    Returns the session associated with the player given as argument.
+command-description-player-entity =
+    Returns the entities of the input sessions.
+command-description-self =
+    Returns the current attached entity.
+command-description-physics-velocity =
+    Returns the velocity of the input entities.
+command-description-physics-angular-velocity =
+    Returns the angular velocity of the input entities.
+command-description-buildinfo =
+    Provides information about the build of the game.
+command-description-cmd-list =
+    Returns a list of all commands, for this side.
+command-description-explain =
+    Explains the given expression, providing command descriptions and signatures.
+command-description-search =
+    Searches through the input for the provided value.
+command-description-stopwatch =
+    Measures the execution time of the given expression.
+command-description-types-consumers =
+    Provides all commands that can consume the given type.
+command-description-types-tree =
+    Debug tool to return all types the command interpreter can downcast the input to.
+command-description-types-gettype =
+    Returns the type of the input.
+command-description-types-fullname =
+    Returns the full name of the input type according to CoreCLR.
+command-description-as =
+    Casts the input to the given type.
+    Effectively a type hint if you know the type but the interpreter does not.
+command-description-count =
+    Counts the amount of entries in it's input, returning an integer.
+command-description-map =
+    Maps the input over the given block, with the provided expected return type.
+    This command may be modified to not need an explicit return type in the future.
+command-description-select =
+    Selects N objects or N% of objects from the input.
+    One can additionally invert this command with not to make it select everything except N objects instead.
+command-description-comp =
+    Returns the given component from the input entities, discarding entities without that component.
+command-description-delete =
+    Deletes the input entities.
+command-description-ent =
+    Returns the provided entity ID.
+command-description-entities =
+    Returns all entities on the server.
+command-description-paused =
+    Filters the input entities by whether or not they are paused.
+    This command can be inverted with not.
+command-description-with =
+    Filters the input entities by whether or not they have the given component.
+    This command can be inverted with not.
+command-description-fuck =
+    Throws an exception.
+command-description-ecscomp-listty =
+    Lists every type of component registered.
+command-description-cd =
+    Changes the session's current directory to the given relative or absolute path.
+command-description-ls-here =
+    Lists the contents of the current directory.
+command-description-ls-in =
+    Lists the contents of the given relative or absolute path.
+command-description-methods-get =
+    Returns all methods associated with the input type.
+command-description-methods-overrides =
+    Returns all methods overriden on the input type.
+command-description-methods-overridesfrom =
+    Returns all methods overriden from the given type on the input type.
+command-description-cmd-moo =
+    Asks the important questions.
+command-description-cmd-descloc =
+    Returns the localization string for a command's description.
+command-description-cmd-getshim =
+    Returns a command's execution shim.
+command-description-help =
+    Provides a quick rundown of how to use toolshed.
+command-description-ioc-registered =
+    Returns all the types registered with IoCManager on the current thread (usually the game thread)
+command-description-ioc-get =
+    Gets an instance of an IoC registration.
+command-description-loc-tryloc =
+    Tries to get a localization string, returning null if unable.
+command-description-loc-loc =
+    Gets a localization string, returning the unlocalized string if unable.
+command-description-physics-angular_velocity =
+    Returns the angular velocity of the given entities.
+command-description-vars =
+    Provides a list of all variables set in this session.
+command-description-any =
+    Returns true if there's any values in the input, otherwise false.
+command-description-ArrowCommand =
+    Assigns the input to a variable.
+command-description-isempty =
+    Returns true if the input is empty, otherwise false.
+command-description-isnull =
+    Returns true if the input is null, otherwise false.
+command-description-unique =
+    Filters the input sequence for uniqueness, removing duplicate values.
+command-description-where =
+    Given some input sequence IEnumerable<T>, takes a block of signature T -> bool that decides if each input value should be included in the output sequence.
+command-description-do =
+    Backwards compatibility with BQL, applies the given old commands over the input sequence.
+command-description-named =
+    Filters the input entities by their name, with the regex ^selector$.
+command-description-prototyped =
+    Filters the input entities by their prototype.
+command-description-nearby =
+    Creates a new list of all entities nearby the inputs within the given range.
+command-description-first =
+    Returns the first entry of the given enumerable.
+command-description-splat =
+    "Splats" a block, value, or variable, creating N copies of it in a list.
+command-description-val =
+    Casts the given value, block, or variable to the given type. This is mostly a workaround for current limitations of variables.
+command-description-actor-controlled =
+    Filters entities by whether or not they're actively controlled.
+command-description-actor-session =
+    Returns the sessions associated with the input entities.
+command-description-physics-parent =
+    Returns the parent(s) of the input entities.
+command-description-emplace =
+    Runs the given block over it's inputs, with the input value placed into the variable $value within the block.
+    Additionally breaks out $wx, $wy, $proto, $desc, $name, and $paused for entities.
+    Can also have breakout values for other types, consult the documentation for that type for further info.
+command-description-AddCommand =
+    Performs numeric addition.
+command-description-SubtractCommand =
+    Performs numeric subtraction.
+command-description-MultiplyCommand =
+    Performs numeric multiplication.
+command-description-DivideCommand =
+    Performs numeric division.
+command-description-min =
+    Returns the minimum of two values.
+command-description-max =
+    Returns the maximum of two values.
+command-description-BitAndCommand =
+    Performs bitwise AND.
+command-description-BitOrCommand =
+    Performs bitwise OR.
+command-description-BitXorCommand =
+    Performs bitwise XOR.
+command-description-neg =
+    Negates the input.
+command-description-GreaterThanCommand =
+    Performs a greater-than comparison, x > y.
+command-description-LessThanCommand =
+    Performs a less-than comparison, x < y.
+command-description-GreaterThanOrEqualCommand =
+    Performs a greater-than-or-equal comparison, x >= y.
+command-description-LessThanOrEqualCommand =
+    Performs a less-than-or-equal comparison, x <= y.
+command-description-EqualCommand =
+    Performs an equality comparison, returning true if the inputs are equal.
+command-description-NotEqualCommand =
+    Performs an equality comparison, returning true if the inputs are not equal.
+command-description-append =
+    Appends a value to the input enumerable.
+command-description-DefaultIfNullCommand =
+    Replaces the input with the type's default value if it is null, albeit only for value types (not objects).
+command-description-OrValueCommand =
+    If the input is null, uses the provided alternate value.
+command-description-DebugPrintCommand =
+    Prints the given value transparently, for debug prints in a command run.
+command-description-i =
+    Integer constant.
+command-description-f =
+    Float constant.
+command-description-s =
+    String constant.
+command-description-b =
+    Bool constant.
+command-description-join =
+    Joins two sequences together into one sequence.
+command-description-reduce =
+    Given a block to use as a reducer, turns a sequence into a single value.
+    The left hand side of the block is implied, and the right hand is stored in $value.
+command-description-rep =
+    Repeats the input value N times to form a sequence.
+command-description-take =
+    Takes N values from the input sequence
+command-description-spawn-at =
+    Spawns an entity at the given coordinates.
+command-description-spawn-on =
+    Spawns an entity on the given entity, at it's coordinates.
+command-description-spawn-attached =
+    Spawns an entity attached to the given entity, at (0 0) relative to it.
+command-description-mappos =
+    Returns an entity's coordinates relative to it's current map.
+command-description-pos =
+    Returns an entity's coordinates.
+command-description-tp-coords =
+    Teleports the target to the given coordinates.
+command-description-tp-to =
+    Teleports the target to the given other entity.
+command-description-tp-into =
+    Teleports the target "into" the given other entity, attaching it at (0 0) relative to it.
+command-description-comp-get =
+    Gets the given component from the given entity.
+command-description-comp-add =
+    Adds the given component to the given entity.
+command-description-comp-ensure =
+    Ensures the given entity has the given component.
+command-description-comp-has =
+    Check if the given entity has the given component.
+command-description-AddVecCommand =
+    Adds a scalar (single value) to every element in the input.
+command-description-SubVecCommand =
+    Subtracts a scalar (single value) from every element in the input.
+command-description-MulVecCommand =
+    Multiplies a scalar (single value) by every element in the input.
+command-description-DivVecCommand =
+    Divides every element in the input by a scalar (single value).
+command-description-rng-to =
+    Returns a number from its input to its argument (i.e. n..m inclusive)
+command-description-rng-from =
+    Returns a number to its input from its argument (i.e. m..n inclusive)
+command-description-rng-prob =
+    Returns a boolean based on the input probability/chance (from 0 to 1)
+command-description-sum =
+    Computes the sum of the input.
+command-description-bin =
+    "Bins" the input, counting up how many times each unique element occurs.
+command-description-extremes =
+    Returns the two extreme ends of a list, interwoven.
+command-description-sortby =
+    Sorts the input least to greatest by the computed key.
+command-description-sortmapby =
+    Sorts the input least to greatest by the computed key, replacing the value with it's computed key afterward.
+command-description-sort =
+    Sorts the input least to greatest.
+command-description-sortdownby =
+    Sorts the input greatest to least by the computed key.
+command-description-sortmapdownby =
+    Sorts the input greatest to least by the computed key, replacing the value with it's computed key afterward.
+command-description-sortdown =
+    Sorts the input greatest to least.
+command-description-iota =
+    Returns a list of numbers 1 to N.
+command-description-to =
+    Returns a list of numbers N to M.
+command-description-curtick =
+    The current game tick.
+command-description-curtime =
+    The current game time (a TimeSpan)
+command-description-realtime =
+    The current realtime since startup (a TimeSpan)
+command-description-servertime =
+    The current server game time, or zero if we are the server (a TimeSpan)
+command-description-replace =
+    Replaces the input entities with the given prototype, preserving position and rotation (but nothing else)
+command-description-allcomps =
+    Returns all components on the given entity.
+command-description-entitysystemupdateorder-tick =
+    Lists the tick update order of entity systems.
+command-description-entitysystemupdateorder-frame =
+    Lists the frame update order of entity systems.
+command-description-more =
+    Prints the contents of $more, i.e. any extras that Toolshed didn't print from the last command.
+command-description-ModulusCommand =
+    Computes the modulus of two values.
+    This is usually remainder, check C#'s documentation for the type.
+command-description-ModVecCommand =
+    Performs the modulus operation over the input with the given constant right-hand value.
+command-description-BitAndNotCommand =
+    Performs bitwise AND-NOT over the input.
+command-description-BitOrNotCommand =
+    Performs bitwise OR-NOT over the input.
+command-description-BitXnorCommand =
+    Performs bitwise XNOR over the input.
+command-description-BitNotCommand =
+    Performs bitwise NOT on the input.
+command-description-abs =
+    Computes the absolute value of the input (removing the sign)
+command-description-average =
+    Computes the average (arithmetic mean) of the input.
+command-description-bibytecount =
+    Returns the size of the input in bytes, given that the input implements IBinaryInteger.
+    This is NOT sizeof.
+command-description-shortestbitlength =
+    Returns the minimum number of bits needed to represent the input value.
+command-description-countleadzeros =
+    Counts the number of leading binary zeros in the input value.
+command-description-counttrailingzeros =
+    Counts the number of trailing binary zeros in the input value.
+command-description-fpi =
+    pi (3.14159...) as a float.
+command-description-fe =
+    e (2.71828...) as a float.
+command-description-ftau =
+    tau (6.28318...) as a float.
+command-description-fepsilon =
+    The epsilon value for a float, exactly 1.4e-45.
+command-description-dpi =
+    pi (3.14159...) as a double.
+command-description-de =
+    e (2.71828...) as a double.
+command-description-dtau =
+    tau (6.28318...) as a double.
+command-description-depsilon =
+    The epsilon value for a double, exactly 4.9406564584124654E-324.
+command-description-hpi =
+    pi (3.14...) as a half.
+command-description-he =
+    e (2.71...) as a half.
+command-description-htau =
+    tau (6.28...) as a half.
+command-description-hepsilon =
+    The epsilon value for a half, exactly 5.9604645E-08.
+command-description-floor =
+    Returns the floor of the input value (rounding toward zero).
+command-description-ceil =
+    Returns the ceil of the input value (rounding away from zero).
+command-description-round =
+    Rounds the input value.
+command-description-trunc =
+    Truncates the input value.
+command-description-round2frac =
+    Rounds the input value to the specified number of fractional digits.
+command-description-exponentbytecount =
+    Returns the number of bytes required to store the exponent.
+command-description-significandbytecount =
+    Returns the number of bytes required to store the significand.
+command-description-significandbitcount =
+    Returns the exact bit length of the significand.
+command-description-exponentshortestbitcount =
+    Returns the minimum number of bits to store the exponent.
+command-description-stepnext =
+    Steps to the next float value, adding one to the significand with carry.
+command-description-stepprev =
+    Steps to the previous float value, subtracting one from the significand with carry.
+command-description-checkedto =
+    Converts from the input numeric type to the target, erroring if not possible.
+command-description-saturateto =
+    Converts from the input numeric type to the target, saturating if the value is out of range.
+    For example, converting 382 to a byte would saturate to 255 (the maximum value of a byte).
+command-description-truncto =
+    Converts from the input numeric type to the target, with truncation.
+    In the case of integers, this is a bit cast with sign extension.
+command-description-iscanonical =
+    Returns whether the input is in canonical form.
+command-description-iscomplex =
+    Returns whether the input is a complex number (by value, not by type)
+command-description-iseven =
+    Returns whether the input is even.
+    Not a javascript package.
+command-description-isodd =
+    Returns whether the input is odd.
+command-description-isfinite =
+    Returns whether the input is finite.
+command-description-isimaginary =
+    Returns whether the input is purely imaginary (no real part).
+command-description-isinfinite =
+    Returns whether the input is infinite.
+command-description-isinteger =
+    Returns whether the input is an integer (by value, not by type)
+command-description-isnan =
+    Returns whether the input is Not a Number (NaN).
+    This is a special floating point value, so this is by value, not by type.
+command-description-isnegative =
+    Returns whether the input is negative.
+command-description-ispositive =
+    Returns whether the input is positive.
+command-description-isreal =
+    Returns whether the input is purely real (no imaginary part).
+command-description-issubnormal =
+    Returns whether the input is in sub-normal form.
+command-description-iszero =
+    Returns whether the input is zero.
+command-description-pow =
+    Computes the power of its lefthand to its righthand. x^y.
+command-description-sqrt =
+    Computes the square root of its input.
+command-description-cbrt =
+    Computes the cube root of its input.
+command-description-root =
+    Computes the Nth root of its input.
+command-description-hypot =
+    Computes the hypotenuse of a triangle with the given sides A and B.
+command-description-sin =
+    Computes the sine of the input.
+command-description-sinpi =
+    Computes the sine of the input multiplied by pi.
+command-description-asin =
+    Computes the arcsine of the input.
+command-description-asinpi =
+    Computes the arcsine of the input multiplied by pi.
+command-description-cos =
+    Computes the cosine of the input.
+command-description-cospi =
+    Computes the cosine of the input multiplied by pi.
+command-description-acos =
+    Computes the arcosine of the input.
+command-description-acospi =
+    Computes the arcosine of the input multiplied by pi.
+command-description-tan =
+    Computes the tangent of the input.
+command-description-tanpi =
+    Computes the tangent of the input multiplied by pi.
+command-description-atan =
+    Computes the arctangent of the input.
+command-description-atanpi =
+    Computes the arctangent of the input multiplied by pi.
+command-description-iterate =
+    Iterates the given function over the input N times, returning a list of results.
+    Think of this like successively applying the function to a value, tracking all the intermediate values.
+command-description-pick =
+    Picks a random value from the input.
+command-description-tee =
+    Tees the input into the given block, ignoring the block's result.
+    This essentially lets you have a branch in your code to do multiple operations on one value.
+command-description-cmd-info =
+    Returns a CommandSpec for the given command.
+    On it's own, this means it'll print the comamnd's help message.
+command-description-comp-rm =
+    Removes the given component from the entity.

Resources/Locale/en-US/uploadfolder.ftl

@@ -0,0 +1,7 @@
+uploadfolder-command-description = Uploads a folder from your UserData folder recursively to the server contentDB.
+uploadfolder-command-help = uploadfolder [folder you want to upload in userdata/UploadFolder]
+uploadfolder-command-wrong-args = Wrong number of arguments!
+uploadfolder-command-folder-not-found = Folder {$folder} not found!
+uploadfolder-command-resource-upload-disabled = Network Resource Uploading is currently disabled. check Server CVars.
+uploadfolder-command-file-too-big = File {$filename} above the current size limit! It must be smaller than {$sizeLimit} MB. skipping.
+uploadfolder-command-success = Uploaded {$fileCount} files

Resources/Locale/en-US/view-variables.ftl

@@ -1,5 +1,6 @@
 ## ViewVariablesInstanceEntity
 
+view-variables = View Variables
 view-variable-instance-entity-server-components-add-component-button-placeholder = Add Component
 view-variable-instance-entity-client-variables-tab-title = Client Variables
 view-variable-instance-entity-client-components-tab-title = Client Components
@@ -8,4 +9,4 @@ view-variable-instance-entity-server-components-tab-title = Server Components
 view-variable-instance-entity-client-components-search-bar-placeholder = Search
 view-variable-instance-entity-server-components-search-bar-placeholder = Search
 view-variable-instance-entity-add-window-server-components = Add Component [S]
-view-variable-instance-entity-add-window-client-components = Add Component [C]
+view-variable-instance-entity-add-window-client-components = Add Component [C]

Resources/Shaders/Internal/fov-lighting.swsl

@@ -5,6 +5,7 @@ preset raw;
 #include "/Shaders/Internal/fov_shared.swsl"
 
 const highp float g_MinVariance = 0.0;
+uniform highp vec4 occludeColor;
 
 void fragment()
 {
@@ -19,5 +20,5 @@ void fragment()
         discard;
     }
 
-    COLOR = vec4(0.0, 0.0, 0.0, 1.0 - occlusion);
+    COLOR = vec4(occludeColor.rgb, 1.0 - occlusion);
 }

Resources/Shaders/Internal/fov.swsl

@@ -5,6 +5,7 @@ preset raw;
 #include "/Shaders/Internal/fov_shared.swsl"
 
 const highp float g_MinVariance = 0.0;
+uniform highp vec4 occludeColor;
 
 void fragment()
 {
@@ -18,5 +19,5 @@ void fragment()
         discard;
     }
 
-    COLOR = vec4(0.0, 0.0, 0.0, 1.0);
+    COLOR = vec4(occludeColor.rgb, 1.0);
 }

Robust.Analyzers/AccessAnalyzer.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
@@ -12,6 +13,7 @@ namespace Robust.Analyzers
     public class AccessAnalyzer : DiagnosticAnalyzer
     {
         private const string AccessAttributeType = "Robust.Shared.Analyzers.AccessAttribute";
+        private const string RobustAutoGeneratedAttributeType = "Robust.Shared.Analyzers.RobustAutoGeneratedAttribute";
         private const string PureAttributeType = "System.Diagnostics.Contracts.PureAttribute";
 
         [SuppressMessage("ReSharper", "RS2008")]
@@ -73,11 +75,20 @@ namespace Robust.Analyzers
 
             // Get the attributes
             var friendAttribute = context.Compilation.GetTypeByMetadataName(AccessAttributeType);
+            var autoGenAttribute = context.Compilation.GetTypeByMetadataName(RobustAutoGeneratedAttributeType);
 
             // Get the type that is containing this expression, or, the type where this is happening.
             if (context.ContainingSymbol?.ContainingType is not {} accessingType)
                 return;
 
+            // Should we ignore the access attempt due to the accessing type being auto-generated?
+            if (accessingType.GetAttributes().FirstOrDefault(a =>
+                a.AttributeClass != null &&
+                a.AttributeClass.Equals(autoGenAttribute, SymbolEqualityComparer.Default)) is { } attr)
+            {
+                return;
+            }
+
             // Determine which type of access is happening here... Read, write or execute?
             var accessAttempt = DetermineAccess(context, targetAccess, operation);
 

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -0,0 +1,133 @@
+#nullable enable
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Operations;
+using static Microsoft.CodeAnalysis.SymbolEqualityComparer;
+
+namespace Robust.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
+{
+    private const string ByRefAttribute = "Robust.Shared.GameObjects.ByRefEventAttribute";
+
+    private static readonly DiagnosticDescriptor ByRefEventSubscribedByValueRule = new(
+        Diagnostics.IdByRefEventSubscribedByValue,
+        "By-ref event subscribed to by value",
+        "Tried to subscribe to a by-ref event '{0}' by value.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure that methods subscribing to a ref event have the ref keyword for the event argument."
+    );
+
+    private static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
+        Diagnostics.IdByRefEventRaisedByValue,
+        "By-ref event raised by value",
+        "Tried to raise a by-ref event '{0}' by value.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure to use the ref keyword when raising ref events."
+    );
+
+    private static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
+        Diagnostics.IdValueEventRaisedByRef,
+        "Value event raised by-ref",
+        "Tried to raise a value event '{0}' by-ref.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure to not use the ref keyword when raising value events."
+    );
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
+        ByRefEventSubscribedByValueRule,
+        ByRefEventRaisedByValueRule,
+        ByValueEventRaisedByRefRule
+    );
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
+        context.EnableConcurrentExecution();
+        context.RegisterOperationAction(CheckEventRaise, OperationKind.Invocation);
+    }
+
+    private void CheckEventRaise(OperationAnalysisContext context)
+    {
+        if (context.Operation is not IInvocationOperation operation)
+            return;
+
+        var raiseMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
+            .Cast<IMethodSymbol>();
+
+        var busRaiseMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntityEventBus")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
+            .Cast<IMethodSymbol>();
+
+        if (raiseMethods == null)
+            return;
+
+        if (busRaiseMethods != null)
+            raiseMethods = raiseMethods.Concat(busRaiseMethods);
+
+        if (!raiseMethods.Any(m => m.Equals(operation.TargetMethod.OriginalDefinition, Default)))
+        {
+            // If you try to do this normally by concatenating like busRaiseMethods above
+            // the analyzer does not run without any errors
+            // I don't know man
+            const string directedBusMethod = "Robust.Shared.GameObjects.IDirectedEventBus.RaiseLocalEvent";
+            if (!operation.TargetMethod.ToString().StartsWith(directedBusMethod))
+                return;
+        }
+
+        var arguments = operation.Arguments;
+        IArgumentOperation eventArgument;
+        switch (arguments.Length)
+        {
+            case 1:
+                eventArgument = arguments[0];
+                break;
+            case 2:
+            case 3:
+                eventArgument = arguments[1];
+                break;
+            default:
+                return;
+        }
+
+        var eventParameter = eventArgument.Parameter;
+        // TODO have a way to check generic type parameters
+        if (eventParameter == null ||
+            eventParameter.Type.SpecialType == SpecialType.System_Object ||
+            eventParameter.Type.TypeKind == TypeKind.TypeParameter)
+        {
+            return;
+        }
+
+        var byRefAttribute = context.Compilation.GetTypeByMetadataName(ByRefAttribute);
+        if (byRefAttribute == null)
+            return;
+
+        var isByRefEventType = eventParameter.Type
+            .GetAttributes()
+            .Any(attribute => attribute.AttributeClass?.Equals(byRefAttribute, Default) ?? false);
+
+        var parameterIsRef = eventParameter.RefKind == RefKind.Ref;
+
+        if (isByRefEventType != parameterIsRef)
+        {
+            var descriptor = isByRefEventType ? ByRefEventRaisedByValueRule : ByValueEventRaisedByRefRule;
+            var diagnostic = Diagnostic.Create(descriptor, eventArgument.Syntax.GetLocation(), eventParameter.Type);
+            context.ReportDiagnostic(diagnostic);
+        }
+    }
+}

Robust.Analyzers/DataDefinitionAnalyzer.cs

@@ -0,0 +1,293 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Robust.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
+{
+    private const string DataDefinitionNamespace = "Robust.Shared.Serialization.Manager.Attributes.DataDefinitionAttribute";
+    private const string ImplicitDataDefinitionNamespace = "Robust.Shared.Serialization.Manager.Attributes.ImplicitDataDefinitionForInheritorsAttribute";
+    private const string DataFieldBaseNamespace = "Robust.Shared.Serialization.Manager.Attributes.DataFieldBaseAttribute";
+
+    private static readonly DiagnosticDescriptor DataDefinitionPartialRule = new(
+        Diagnostics.IdDataDefinitionPartial,
+        "Type must be partial",
+        "Type {0} is a DataDefinition but is not partial.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure to mark any type that is a data definition as partial."
+    );
+
+    private static readonly DiagnosticDescriptor NestedDataDefinitionPartialRule = new(
+        Diagnostics.IdNestedDataDefinitionPartial,
+        "Type must be partial",
+        "Type {0} contains nested data definition {1} but is not partial.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure to mark any type containing a nested data definition as partial."
+    );
+
+    private static readonly DiagnosticDescriptor DataFieldWritableRule = new(
+        Diagnostics.IdDataFieldWritable,
+        "Data field must not be readonly",
+        "Data field {0} in data definition {1} is readonly.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure to remove the readonly modifier."
+    );
+
+    private static readonly DiagnosticDescriptor DataFieldPropertyWritableRule = new(
+        Diagnostics.IdDataFieldPropertyWritable,
+        "Data field property must have a setter",
+        "Data field property {0} in data definition {1} does not have a setter.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure to add a setter."
+    );
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
+        DataDefinitionPartialRule, NestedDataDefinitionPartialRule, DataFieldWritableRule, DataFieldPropertyWritableRule
+    );
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.None);
+        context.EnableConcurrentExecution();
+
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.ClassDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.StructDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.RecordDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.RecordStructDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.InterfaceDeclaration);
+
+        context.RegisterSyntaxNodeAction(AnalyzeDataField, SyntaxKind.FieldDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataFieldProperty, SyntaxKind.PropertyDeclaration);
+    }
+
+    private void AnalyzeDataDefinition(SyntaxNodeAnalysisContext context)
+    {
+        if (context.Node is not TypeDeclarationSyntax declaration)
+            return;
+
+        var type = context.SemanticModel.GetDeclaredSymbol(declaration)!;
+        if (!IsDataDefinition(type))
+            return;
+
+        if (!IsPartial(declaration))
+        {
+            context.ReportDiagnostic(Diagnostic.Create(DataDefinitionPartialRule, declaration.Keyword.GetLocation(), type.Name));
+        }
+
+        var containingType = type.ContainingType;
+        while (containingType != null)
+        {
+            var containingTypeDeclaration = (TypeDeclarationSyntax) containingType.DeclaringSyntaxReferences[0].GetSyntax();
+            if (!IsPartial(containingTypeDeclaration))
+            {
+                context.ReportDiagnostic(Diagnostic.Create(NestedDataDefinitionPartialRule, containingTypeDeclaration.Keyword.GetLocation(), containingType.Name, type.Name));
+            }
+
+            containingType = containingType.ContainingType;
+        }
+    }
+
+    private void AnalyzeDataField(SyntaxNodeAnalysisContext context)
+    {
+        if (context.Node is not FieldDeclarationSyntax field)
+            return;
+
+        var typeDeclaration = field.FirstAncestorOrSelf<TypeDeclarationSyntax>();
+        if (typeDeclaration == null)
+            return;
+
+        var type = context.SemanticModel.GetDeclaredSymbol(typeDeclaration)!;
+        if (!IsDataDefinition(type))
+            return;
+
+        foreach (var variable in field.Declaration.Variables)
+        {
+            var fieldSymbol = context.SemanticModel.GetDeclaredSymbol(variable);
+            if (fieldSymbol == null)
+                continue;
+
+            if (IsReadOnlyDataField(type, fieldSymbol))
+            {
+                context.ReportDiagnostic(Diagnostic.Create(DataFieldWritableRule, context.Node.GetLocation(), fieldSymbol.Name, type.Name));
+            }
+        }
+    }
+
+    private void AnalyzeDataFieldProperty(SyntaxNodeAnalysisContext context)
+    {
+        if (context.Node is not PropertyDeclarationSyntax property)
+            return;
+
+        var typeDeclaration = property.FirstAncestorOrSelf<TypeDeclarationSyntax>();
+        if (typeDeclaration == null)
+            return;
+
+        var type = context.SemanticModel.GetDeclaredSymbol(typeDeclaration)!;
+        if (!IsDataDefinition(type) || type.IsRecord || type.IsValueType)
+            return;
+
+        var propertySymbol = context.SemanticModel.GetDeclaredSymbol(property);
+        if (propertySymbol == null)
+            return;
+
+        if (IsReadOnlyDataField(type, propertySymbol))
+        {
+            context.ReportDiagnostic(Diagnostic.Create(DataFieldPropertyWritableRule, context.Node.GetLocation(), propertySymbol.Name, type.Name));
+        }
+    }
+
+    private static bool IsReadOnlyDataField(ITypeSymbol type, ISymbol field)
+    {
+        if (!IsDataField(field, out _, out _))
+            return false;
+
+        return IsReadOnlyMember(type, field);
+    }
+
+    private static bool IsPartial(TypeDeclarationSyntax type)
+    {
+        return type.Modifiers.IndexOf(SyntaxKind.PartialKeyword) != -1;
+    }
+
+    private static bool IsDataDefinition(ITypeSymbol? type)
+    {
+        if (type == null)
+            return false;
+
+        return HasAttribute(type, DataDefinitionNamespace) ||
+               IsImplicitDataDefinition(type);
+    }
+
+    private static bool IsDataField(ISymbol member, out ITypeSymbol type, out AttributeData attribute)
+    {
+        // TODO data records and other attributes
+        if (member is IFieldSymbol field)
+        {
+            foreach (var attr in field.GetAttributes())
+            {
+                if (attr.AttributeClass != null && Inherits(attr.AttributeClass, DataFieldBaseNamespace))
+                {
+                    type = field.Type;
+                    attribute = attr;
+                    return true;
+                }
+            }
+        }
+        else if (member is IPropertySymbol property)
+        {
+            foreach (var attr in property.GetAttributes())
+            {
+                if (attr.AttributeClass != null && Inherits(attr.AttributeClass, DataFieldBaseNamespace))
+                {
+                    type = property.Type;
+                    attribute = attr;
+                    return true;
+                }
+            }
+        }
+
+        type = null!;
+        attribute = null!;
+        return false;
+    }
+
+    private static bool Inherits(ITypeSymbol type, string parent)
+    {
+        foreach (var baseType in GetBaseTypes(type))
+        {
+            if (baseType.ToDisplayString() == parent)
+                return true;
+        }
+
+        return false;
+    }
+
+    private static bool IsReadOnlyMember(ITypeSymbol type, ISymbol member)
+    {
+        if (member is IFieldSymbol field)
+        {
+            return field.IsReadOnly;
+        }
+        else if (member is IPropertySymbol property)
+        {
+            if (property.SetMethod == null)
+                return true;
+
+            if (property.SetMethod.IsInitOnly)
+                return type.IsReferenceType;
+
+            return false;
+        }
+
+        return false;
+    }
+
+    private static bool HasAttribute(ITypeSymbol type, string attributeName)
+    {
+        foreach (var attribute in type.GetAttributes())
+        {
+            if (attribute.AttributeClass?.ToDisplayString() == attributeName)
+                return true;
+        }
+
+        return false;
+    }
+
+    private static bool IsImplicitDataDefinition(ITypeSymbol type)
+    {
+        if (HasAttribute(type, ImplicitDataDefinitionNamespace))
+            return true;
+
+        foreach (var baseType in GetBaseTypes(type))
+        {
+            if (HasAttribute(baseType, ImplicitDataDefinitionNamespace))
+                return true;
+        }
+
+        foreach (var @interface in type.AllInterfaces)
+        {
+            if (IsImplicitDataDefinitionInterface(@interface))
+                return true;
+        }
+
+        return false;
+    }
+
+    private static bool IsImplicitDataDefinitionInterface(ITypeSymbol @interface)
+    {
+        if (HasAttribute(@interface, ImplicitDataDefinitionNamespace))
+            return true;
+
+        foreach (var subInterface in @interface.AllInterfaces)
+        {
+            if (HasAttribute(subInterface, ImplicitDataDefinitionNamespace))
+                return true;
+        }
+
+        return false;
+    }
+
+    private static IEnumerable<ITypeSymbol> GetBaseTypes(ITypeSymbol type)
+    {
+        var baseType = type.BaseType;
+        while (baseType != null)
+        {
+            yield return baseType;
+            baseType = baseType.BaseType;
+        }
+    }
+}

Robust.Analyzers/DataDefinitionFixer.cs

@@ -0,0 +1,168 @@
+#nullable enable
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxKind;
+using static Robust.Analyzers.Diagnostics;
+
+namespace Robust.Analyzers;
+
+[ExportCodeFixProvider(LanguageNames.CSharp)]
+public sealed class DefinitionFixer : CodeFixProvider
+{
+    public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(
+        IdDataDefinitionPartial, IdNestedDataDefinitionPartial, IdDataFieldWritable, IdDataFieldPropertyWritable
+    );
+
+    public override Task RegisterCodeFixesAsync(CodeFixContext context)
+    {
+        foreach (var diagnostic in context.Diagnostics)
+        {
+            switch (diagnostic.Id)
+            {
+                case IdDataDefinitionPartial:
+                    return RegisterPartialTypeFix(context, diagnostic);
+                case IdNestedDataDefinitionPartial:
+                    return RegisterPartialTypeFix(context, diagnostic);
+                case IdDataFieldWritable:
+                    return RegisterDataFieldFix(context, diagnostic);
+                case IdDataFieldPropertyWritable:
+                    return RegisterDataFieldPropertyFix(context, diagnostic);
+            }
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public override FixAllProvider GetFixAllProvider()
+    {
+        return WellKnownFixAllProviders.BatchFixer;
+    }
+
+    private static async Task RegisterPartialTypeFix(CodeFixContext context, Diagnostic diagnostic)
+    {
+        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
+        var span = diagnostic.Location.SourceSpan;
+        var token = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<TypeDeclarationSyntax>().First();
+
+        if (token == null)
+            return;
+
+        context.RegisterCodeFix(CodeAction.Create(
+            "Make type partial",
+            c => MakeDataDefinitionPartial(context.Document, token, c),
+            "Make type partial"
+        ), diagnostic);
+    }
+
+    private static async Task<Document> MakeDataDefinitionPartial(Document document, TypeDeclarationSyntax declaration, CancellationToken cancellation)
+    {
+        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
+        var token = SyntaxFactory.Token(PartialKeyword);
+        var newDeclaration = declaration.AddModifiers(token);
+
+        root = root!.ReplaceNode(declaration, newDeclaration);
+
+        return document.WithSyntaxRoot(root);
+    }
+
+    private static async Task RegisterDataFieldFix(CodeFixContext context, Diagnostic diagnostic)
+    {
+        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
+        var span = diagnostic.Location.SourceSpan;
+        var field = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<FieldDeclarationSyntax>().FirstOrDefault();
+
+        if (field == null)
+            return;
+
+        context.RegisterCodeFix(CodeAction.Create(
+            "Make data field writable",
+            c => MakeFieldWritable(context.Document, field, c),
+            "Make data field writable"
+        ), diagnostic);
+    }
+
+    private static async Task RegisterDataFieldPropertyFix(CodeFixContext context, Diagnostic diagnostic)
+    {
+        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
+        var span = diagnostic.Location.SourceSpan;
+        var property = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<PropertyDeclarationSyntax>().FirstOrDefault();
+
+        if (property == null)
+            return;
+
+        context.RegisterCodeFix(CodeAction.Create(
+            "Make data field writable",
+            c => MakePropertyWritable(context.Document, property, c),
+            "Make data field writable"
+        ), diagnostic);
+    }
+
+    private static async Task<Document> MakeFieldWritable(Document document, FieldDeclarationSyntax declaration, CancellationToken cancellation)
+    {
+        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
+        var token = declaration.Modifiers.First(t => t.IsKind(ReadOnlyKeyword));
+        var newDeclaration = declaration.WithModifiers(declaration.Modifiers.Remove(token));
+
+        root = root!.ReplaceNode(declaration, newDeclaration);
+
+        return document.WithSyntaxRoot(root);
+    }
+
+    private static async Task<Document> MakePropertyWritable(Document document, PropertyDeclarationSyntax declaration, CancellationToken cancellation)
+    {
+        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
+        var newDeclaration = declaration;
+        var privateSet = newDeclaration
+            .AccessorList?
+            .Accessors
+            .FirstOrDefault(s => s.IsKind(SetAccessorDeclaration) || s.IsKind(InitAccessorDeclaration));
+
+        if (newDeclaration.AccessorList != null && privateSet != null)
+        {
+            newDeclaration = newDeclaration.WithAccessorList(
+                newDeclaration.AccessorList.WithAccessors(
+                    newDeclaration.AccessorList.Accessors.Remove(privateSet)
+                )
+            );
+        }
+
+        AccessorDeclarationSyntax setter;
+        if (declaration.Modifiers.Any(m => m.IsKind(PrivateKeyword)))
+        {
+            setter = SyntaxFactory.AccessorDeclaration(
+                SetAccessorDeclaration,
+                default,
+                default,
+                SyntaxFactory.Token(SetKeyword),
+                default,
+                default,
+                SyntaxFactory.Token(SemicolonToken)
+            );
+        }
+        else
+        {
+            setter = SyntaxFactory.AccessorDeclaration(
+                SetAccessorDeclaration,
+                default,
+                SyntaxFactory.TokenList(SyntaxFactory.Token(PrivateKeyword)),
+                SyntaxFactory.Token(SetKeyword),
+                default,
+                default,
+                SyntaxFactory.Token(SemicolonToken)
+            );
+        }
+
+        newDeclaration = newDeclaration.AddAccessorListAccessors(setter);
+
+        root = root!.ReplaceNode(declaration, newDeclaration);
+
+        return document.WithSyntaxRoot(root);
+    }
+}

Robust.Analyzers/Diagnostics.cs

@@ -9,6 +9,21 @@ public static class Diagnostics
     public const string IdAccess = "RA0002";
     public const string IdExplicitVirtual = "RA0003";
     public const string IdTaskResult = "RA0004";
+    public const string IdUseGenericVariant = "RA0005";
+    public const string IdUseGenericVariantInvalidUsage = "RA0006";
+    public const string IdUseGenericVariantAttributeValueError = "RA0007";
+    public const string IdNotNullableFlagNotSet = "RA0008";
+    public const string IdInvalidNotNullableFlagValue = "RA0009";
+    public const string IdInvalidNotNullableFlagImplementation = "RA0010";
+    public const string IdInvalidNotNullableFlagType = "RA0011";
+    public const string IdNotNullableFlagValueType = "RA0012";
+    public const string IdByRefEventSubscribedByValue = "RA0013";
+    public const string IdByRefEventRaisedByValue = "RA0015";
+    public const string IdValueEventRaisedByRef = "RA0016";
+    public const string IdDataDefinitionPartial = "RA0017";
+    public const string IdNestedDataDefinitionPartial = "RA0018";
+    public const string IdDataFieldWritable = "RA0019";
+    public const string IdDataFieldPropertyWritable = "RA0020";
 
     public static SuppressionDescriptor MeansImplicitAssignment =>
         new SuppressionDescriptor("RADC1000", "CS0649", "Marked as implicitly assigned.");

Robust.Analyzers/NotNullableFlagAnalyzer.cs

@@ -0,0 +1,171 @@
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Operations;
+
+namespace Robust.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
+{
+    private const string Attribute = "Robust.Shared.Analyzers.NotNullableFlagAttribute";
+
+    private static readonly DiagnosticDescriptor NotNullableNotSetRule = new (
+        Diagnostics.IdNotNullableFlagNotSet,
+        "Not Nullable Flag not set",
+        "Class type parameter {0} is not annotated as nullable and notNullableOverride is not set to true",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Assign true to notNullableOverride or specify the type parameter as nullable.");
+
+    private static readonly DiagnosticDescriptor InvalidNotNullableValueRule = new (
+        Diagnostics.IdInvalidNotNullableFlagValue,
+        "Not Nullable Flag wrongfully set",
+        "Class type parameter {0} is annotated as nullable but notNullableOverride is set to true",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Remove the true assignment to notNullableOverride or remove the nullable specifier of the type parameter.");
+
+    private static readonly DiagnosticDescriptor InvalidNotNullableImplementationRule = new (
+        Diagnostics.IdInvalidNotNullableFlagImplementation,
+        "Invalid NotNullable flag implementation.",
+        "NotNullable flag is either not typed as bool, or does not have a default value equaling false",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Ensure that the notNullable flag is typed bool and has false set as a default value.");
+
+    private static readonly DiagnosticDescriptor InvalidNotNullableTypeRule = new (
+        Diagnostics.IdInvalidNotNullableFlagType,
+        "Failed to resolve type parameter",
+        "Failed to resolve type parameter \"{0}\".",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Use nameof to avoid typos.");
+
+    private static readonly DiagnosticDescriptor NotNullableFlagValueTypeRule = new (
+        Diagnostics.IdNotNullableFlagValueType,
+        "NotNullable flag not supported for value types.",
+        "Value types as generic arguments are not supported for NotNullable flags",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Nullable value types are distinct at runtime when inspected with reflection. Therefore they are not supported for NotNullable flags.");
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics =>
+        ImmutableArray.Create(
+            NotNullableNotSetRule,
+            InvalidNotNullableValueRule,
+            InvalidNotNullableImplementationRule,
+            InvalidNotNullableTypeRule,
+            NotNullableFlagValueTypeRule);
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
+        context.EnableConcurrentExecution();
+        context.RegisterOperationAction(CheckNotNullableFlag, OperationKind.Invocation);
+    }
+
+    private bool TryGetTypeArgument(IMethodSymbol methodSymbol, string typeParamName, out ITypeSymbol typeArgument)
+    {
+        for (var index = 0; index < methodSymbol.TypeParameters.Length; index++)
+        {
+            if (methodSymbol.TypeParameters[index].Name != typeParamName)
+                continue;
+
+            typeArgument = methodSymbol.TypeArguments[index];
+            return true;
+        }
+
+        typeArgument = null;
+        return false;
+    }
+
+    private void CheckNotNullableFlag(OperationAnalysisContext context)
+    {
+        if (context.Operation is not IInvocationOperation invocationOperation || !invocationOperation.TargetMethod.IsGenericMethod)
+            return;
+
+        var attribute = context.Compilation.GetTypeByMetadataName(Attribute);
+        var @bool = context.Compilation.GetSpecialType(SpecialType.System_Boolean);
+
+        foreach (var argument in invocationOperation.Arguments)
+        {
+            if(argument.Parameter == null) continue;
+
+            foreach (var attributeData in argument.Parameter.GetAttributes())
+            {
+                if (!SymbolEqualityComparer.Default.Equals(attributeData.AttributeClass, attribute))
+                    continue;
+
+                if (!SymbolEqualityComparer.Default.Equals(argument.Parameter.Type, @bool) ||
+                    !argument.Parameter.HasExplicitDefaultValue ||
+                    argument.Parameter.ExplicitDefaultValue as bool? != false)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(
+                        InvalidNotNullableImplementationRule,
+                        argument.Parameter.Locations[0]));
+                    break;
+                }
+
+                if (!TryGetTypeArgument(invocationOperation.TargetMethod,
+                        attributeData.ConstructorArguments[0].Value as string, out var typeArgument))
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(
+                        InvalidNotNullableTypeRule,
+                        argument.Parameter.Locations[0],
+                        attributeData.ConstructorArguments[0].Value as string));
+                    break;
+                }
+
+                //until i find a way to implement it sanely, generic calls are exempt from this attribute
+                if(typeArgument is ITypeParameterSymbol) break;
+
+                //dont ask me why, argument.ConstantValue just straight up doesnt work.
+                //i still kept it in here as a fallback, incase it ever starts working again lol -<paul
+                var constantValue = (argument.Value as ILiteralOperation)?.ConstantValue ?? argument.ConstantValue;
+
+                if (typeArgument.IsValueType)
+                {
+                    if (argument.ArgumentKind != ArgumentKind.DefaultValue)
+                    {
+                        //todo diagnostic only use for struct types
+                        context.ReportDiagnostic(Diagnostic.Create(
+                            NotNullableFlagValueTypeRule,
+                            argument.Syntax.GetLocation()));
+                    }
+                    break;
+                }
+
+                if (typeArgument.NullableAnnotation == NullableAnnotation.None ||
+                    (argument.ArgumentKind != ArgumentKind.DefaultValue && !constantValue.HasValue))
+                    break;
+
+                var flagValue = argument.ArgumentKind != ArgumentKind.DefaultValue ||
+                                constantValue.Value as bool? == true;
+
+                var nullable = typeArgument.NullableAnnotation == NullableAnnotation.Annotated;
+
+                if (nullable && flagValue)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(InvalidNotNullableValueRule,
+                        argument.Syntax.GetLocation(),
+                        typeArgument));
+                }
+                else if (!nullable && !flagValue)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(NotNullableNotSetRule,
+                        argument.Syntax.GetLocation(),
+                        typeArgument));
+                }
+
+                break;
+            }
+        }
+    }
+}

Robust.Analyzers/PreferGenericVariantAnalyzer.cs

@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Operations;
+
+namespace Robust.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class PreferGenericVariantAnalyzer : DiagnosticAnalyzer
+{
+    private const string AttributeType = "Robust.Shared.Analyzers.PreferGenericVariantAttribute";
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
+        UseGenericVariantDescriptor, UseGenericVariantInvalidUsageDescriptor,
+        UseGenericVariantAttributeValueErrorDescriptor);
+
+    private static readonly DiagnosticDescriptor UseGenericVariantDescriptor = new(
+        Diagnostics.IdUseGenericVariant,
+        "Consider using the generic variant of this method",
+        "Consider using the generic variant of this method to avoid potential allocations",
+        "Usage",
+        DiagnosticSeverity.Warning,
+        true,
+        "Consider using the generic variant of this method to avoid potential allocations.");
+
+    private static readonly DiagnosticDescriptor UseGenericVariantInvalidUsageDescriptor = new(
+        Diagnostics.IdUseGenericVariantInvalidUsage,
+        "Invalid generic variant provided",
+        "Generic variant provided mismatches the amount of type parameters of non-generic variant",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "The non-generic variant should have at least as many type parameter at the beginning of the method as there are generic type parameters on the generic variant.");
+
+    private static readonly DiagnosticDescriptor UseGenericVariantAttributeValueErrorDescriptor = new(
+        Diagnostics.IdUseGenericVariantAttributeValueError,
+        "Failed resolving generic variant value",
+        "Failed resolving generic variant value: {0}",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Consider using nameof to avoid any typos.");
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.ReportDiagnostics | GeneratedCodeAnalysisFlags.Analyze);
+        context.EnableConcurrentExecution();
+        context.RegisterOperationAction(CheckForGenericVariant, OperationKind.Invocation);
+    }
+
+    private void CheckForGenericVariant(OperationAnalysisContext obj)
+    {
+        if(obj.Operation is not IInvocationOperation invocationOperation) return;
+
+        var preferGenericAttribute = obj.Compilation.GetTypeByMetadataName(AttributeType);
+
+        string genericVariant = null;
+        AttributeData foundAttribute = null;
+        foreach (var attribute in invocationOperation.TargetMethod.GetAttributes())
+        {
+            if (!SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, preferGenericAttribute))
+                continue;
+
+            genericVariant = attribute.ConstructorArguments[0].Value as string ?? invocationOperation.TargetMethod.Name;
+            foundAttribute = attribute;
+            break;
+        }
+
+        if(genericVariant == null) return;
+
+        var maxTypeParams = 0;
+        var typeTypeSymbol = obj.Compilation.GetTypeByMetadataName("System.Type");
+        foreach (var parameter in invocationOperation.TargetMethod.Parameters)
+        {
+            if(!SymbolEqualityComparer.Default.Equals(parameter.Type, typeTypeSymbol)) break;
+
+            maxTypeParams++;
+        }
+
+        if (maxTypeParams == 0)
+        {
+            obj.ReportDiagnostic(
+                Diagnostic.Create(UseGenericVariantInvalidUsageDescriptor,
+                    foundAttribute.ApplicationSyntaxReference?.GetSyntax().GetLocation()));
+            return;
+        }
+
+        IMethodSymbol genericVariantMethod = null;
+        foreach (var member in invocationOperation.TargetMethod.ContainingType.GetMembers())
+        {
+            if (member is not IMethodSymbol methodSymbol
+                || methodSymbol.Name != genericVariant
+                || !methodSymbol.IsGenericMethod
+                || methodSymbol.TypeParameters.Length > maxTypeParams
+                || methodSymbol.Parameters.Length > invocationOperation.TargetMethod.Parameters.Length - methodSymbol.TypeParameters.Length
+                ) continue;
+
+            var typeParamCount = methodSymbol.TypeParameters.Length;
+            var failedParamComparison = false;
+            var objType = obj.Compilation.GetSpecialType(SpecialType.System_Object);
+            for (int i = 0; i < methodSymbol.Parameters.Length; i++)
+            {
+                if (methodSymbol.Parameters[i].Type is ITypeParameterSymbol && SymbolEqualityComparer.Default.Equals(invocationOperation.TargetMethod.Parameters[i + typeParamCount].Type, objType))
+                    continue;
+
+                if (!SymbolEqualityComparer.Default.Equals(methodSymbol.Parameters[i].Type,
+                        invocationOperation.TargetMethod.Parameters[i + typeParamCount].Type))
+                {
+                    failedParamComparison = true;
+                    break;
+                }
+            }
+
+            if(failedParamComparison) continue;
+
+            genericVariantMethod = methodSymbol;
+        }
+
+        if (genericVariantMethod == null)
+        {
+            obj.ReportDiagnostic(Diagnostic.Create(
+                UseGenericVariantAttributeValueErrorDescriptor,
+                foundAttribute.ApplicationSyntaxReference?.GetSyntax().GetLocation(),
+                genericVariant));
+            return;
+        }
+
+        var typeOperands = new string[genericVariantMethod.TypeParameters.Length];
+        for (var i = 0; i < genericVariantMethod.TypeParameters.Length; i++)
+        {
+            switch (invocationOperation.Arguments[i].Value)
+            {
+                //todo figure out if ILocalReferenceOperation, IPropertyReferenceOperation or IFieldReferenceOperation is referencing static typeof assignments
+                case ITypeOfOperation typeOfOperation:
+                    typeOperands[i] = typeOfOperation.TypeOperand.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+                    continue;
+                default:
+                    return;
+            }
+        }
+
+        obj.ReportDiagnostic(Diagnostic.Create(
+            UseGenericVariantDescriptor,
+            invocationOperation.Syntax.GetLocation(),
+            ImmutableDictionary.CreateRange(new Dictionary<string, string>()
+            {
+                {"typeOperands", string.Join(",", typeOperands)}
+            })));
+    }
+}
+
+[ExportCodeFixProvider(LanguageNames.CSharp)]
+public class PreferGenericVariantCodeFixProvider : CodeFixProvider
+{
+    private static string Title(string method, string[] types) => $"Use {method}<{string.Join(",", types)}>.";
+
+    public override FixAllProvider GetFixAllProvider()
+    {
+        return WellKnownFixAllProviders.BatchFixer;
+    }
+
+    public override async Task RegisterCodeFixesAsync(CodeFixContext context)
+    {
+        var root = await context.Document.GetSyntaxRootAsync();
+        if(root == null) return;
+
+        foreach (var diagnostic in context.Diagnostics)
+        {
+            if (!diagnostic.Properties.TryGetValue("typeOperands", out var typeOperandsRaw)
+                || typeOperandsRaw == null) continue;
+
+            var node = root.FindNode(diagnostic.Location.SourceSpan);
+            if (node is ArgumentSyntax argumentSyntax)
+                node = argumentSyntax.Expression;
+
+            if(node is not InvocationExpressionSyntax invocationExpression)
+                continue;
+
+            var typeOperands = typeOperandsRaw.Split(',');
+
+            context.RegisterCodeFix(
+                CodeAction.Create(
+                    Title(invocationExpression.Expression.ToString(), typeOperands),
+                    c => FixAsync(context.Document, invocationExpression, typeOperands, c),
+                    Title(invocationExpression.Expression.ToString(), typeOperands)),
+                diagnostic);
+        }
+    }
+
+    private async Task<Document> FixAsync(
+        Document contextDocument,
+        InvocationExpressionSyntax invocationExpression,
+        string[] typeOperands,
+        CancellationToken cancellationToken)
+    {
+        var memberAccess = (MemberAccessExpressionSyntax)invocationExpression.Expression;
+
+        var root = (CompilationUnitSyntax) await contextDocument.GetSyntaxRootAsync(cancellationToken);
+
+        var arguments = new ArgumentSyntax[invocationExpression.ArgumentList.Arguments.Count - typeOperands.Length];
+        var types = new TypeSyntax[typeOperands.Length];
+
+        for (int i = 0; i < typeOperands.Length; i++)
+        {
+            types[i] = ((TypeOfExpressionSyntax)invocationExpression.ArgumentList.Arguments[i].Expression).Type;
+        }
+
+
+
+        Array.Copy(
+            invocationExpression.ArgumentList.Arguments.ToArray(),
+            typeOperands.Length,
+            arguments,
+            0,
+            arguments.Length);
+
+        memberAccess = memberAccess.WithName(SyntaxFactory.GenericName(memberAccess.Name.Identifier,
+            SyntaxFactory.TypeArgumentList(SyntaxFactory.SeparatedList(types))));
+
+        root = root!.ReplaceNode(invocationExpression,
+            invocationExpression.WithArgumentList(invocationExpression.ArgumentList.WithArguments(SyntaxFactory.SeparatedList(arguments)))
+                .WithExpression(memberAccess));
+
+        return contextDocument.WithSyntaxRoot(root);
+    }
+
+    public override ImmutableArray<string> FixableDiagnosticIds =>
+        ImmutableArray.Create(Diagnostics.IdUseGenericVariant);
+}

Robust.Analyzers/Robust.Analyzers.csproj

@@ -11,10 +11,20 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Needed for NotNullableFlagAnalyzer. -->
+    <Compile Include="..\Robust.Shared\Analyzers\NotNullableFlagAttribute.cs" />
+  </ItemGroup>
+  
   <ItemGroup>
     <!-- Needed for FriendAnalyzer. -->
     <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" />
     <Compile Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Needed for PreferGenericVariantAnalyzer. -->
+    <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" />
+  </ItemGroup>
+
 </Project>

Robust.Benchmarks/Arch/ArchComponentAccessBenchmark.cs

@@ -0,0 +1,177 @@
+using System;
+using System.Runtime.CompilerServices;
+using Arch.Core;
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Engines;
+using Robust.Shared.Analyzers;
+using static Robust.Benchmarks.EntityManager.ArchetypeComponentAccessBenchmark;
+
+namespace Robust.Benchmarks.Arch;
+
+[MemoryDiagnoser]
+[Virtual]
+public class ArchComponentAccessBenchmark
+{
+    private const int N = 10000;
+
+    private static readonly Consumer Consumer = new();
+    private Entity _entity;
+    private World _world = default!;
+    private QueryDescription _singleQuery;
+    private QueryDescription _tenQuery;
+
+    [GlobalSetup]
+    public void GlobalSetup()
+    {
+        var _ = new JobScheduler.JobScheduler("ArchBenchmark");
+
+        _world = World.Create();
+
+        for (var i = 0; i < N; i++)
+        {
+            var entity = _world.Create();
+
+            // Randomly chosen id
+            if (entity.Id == 1584)
+                _entity = entity;
+
+            _world.Add(
+                entity,
+                new Struct1(),
+                new Struct2(),
+                new Struct3(),
+                new Struct4(),
+                new Struct5(),
+                new Struct6(),
+                new Struct7(),
+                new Struct8(),
+                new Struct9(),
+                new Struct10()
+            );
+        }
+
+        _singleQuery = new QueryDescription().WithAll<Struct1>();
+        _tenQuery = new QueryDescription().WithAll<Struct1, Struct2, Struct3, Struct4, Struct5, Struct6, Struct7, Struct8, Struct9, Struct10>();
+    }
+
+    [GlobalCleanup]
+    public void GlobalCleanup()
+    {
+        JobScheduler.JobScheduler.Instance.Dispose();
+        Environment.Exit(0);
+    }
+
+    [Benchmark]
+    public Struct1 GetSingle()
+    {
+        return _world.Get<Struct1>(_entity);
+    }
+
+    [Benchmark]
+    public (Struct1, Struct2, Struct3, Struct4, Struct5, Struct6, Struct7, Struct8, Struct9, Struct10)
+        GetTen()
+    {
+        return (
+                _world.Get<Struct1>(_entity),
+                _world.Get<Struct2>(_entity),
+                _world.Get<Struct3>(_entity),
+                _world.Get<Struct4>(_entity),
+                _world.Get<Struct5>(_entity),
+                _world.Get<Struct6>(_entity),
+                _world.Get<Struct7>(_entity),
+                _world.Get<Struct8>(_entity),
+                _world.Get<Struct9>(_entity),
+                _world.Get<Struct10>(_entity)
+        );
+    }
+
+    [Benchmark]
+    public bool HasSingle()
+    {
+        return _world.Has<Struct1>(_entity);
+    }
+
+    [Benchmark]
+    public bool HasTen()
+    {
+        return _world.Has<Struct1>(_entity) &&
+               _world.Has<Struct2>(_entity) &&
+               _world.Has<Struct3>(_entity) &&
+               _world.Has<Struct4>(_entity) &&
+               _world.Has<Struct5>(_entity) &&
+               _world.Has<Struct6>(_entity) &&
+               _world.Has<Struct7>(_entity) &&
+               _world.Has<Struct8>(_entity) &&
+               _world.Has<Struct9>(_entity) &&
+               _world.Has<Struct10>(_entity);
+    }
+
+    [Benchmark]
+    public void IterateSingle()
+    {
+        _world.Query(_singleQuery, static (ref Struct1 s) => Consumer.Consume(s));
+    }
+
+    [Benchmark]
+    public void IterateSingleInline()
+    {
+        _world.InlineQuery<QueryConsumer>(_singleQuery);
+    }
+
+    [Benchmark]
+    public void IterateSingleParallel()
+    {
+        _world.ParallelQuery(_singleQuery, static (ref Struct1 s) => Consumer.Consume(s));
+    }
+
+    [Benchmark]
+    public void IterateSingleInlineParallel()
+    {
+        _world.InlineParallelQuery<QueryConsumer>(_singleQuery);
+    }
+
+    [Benchmark]
+    public void IterateTen()
+    {
+        _world.Query(_tenQuery,
+            static (
+                    ref Struct1 s1, ref Struct2 s2, ref Struct3 s3, ref Struct4 s4,
+                    ref Struct5 s5, ref Struct6 s6, ref Struct7 s7, ref Struct8 s8,
+                    ref Struct9 s9, ref Struct10 s10) =>
+                Consumer.Consume((s1, s2, s3, s4, s5, s6, s7, s8, s9, s10)));
+    }
+
+    [Benchmark]
+    public void IterateTenInline()
+    {
+        _world.InlineQuery<QueryConsumer>(_tenQuery);
+    }
+
+    [Benchmark]
+    public void IterateTenParallel()
+    {
+        _world.ParallelQuery(_tenQuery,
+            static (
+                    ref Struct1 s1, ref Struct2 s2, ref Struct3 s3, ref Struct4 s4,
+                    ref Struct5 s5, ref Struct6 s6, ref Struct7 s7, ref Struct8 s8,
+                    ref Struct9 s9, ref Struct10 s10) =>
+                Consumer.Consume((s1, s2, s3, s4, s5, s6, s7, s8, s9, s10)));
+    }
+
+    [Benchmark]
+    public void IterateTenInlineParallel()
+    {
+        _world.InlineParallelQuery<QueryConsumer>(_tenQuery);
+    }
+
+    private struct QueryConsumer : IForEach
+    {
+        private static readonly Consumer Consumer = new();
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Update(Entity entity)
+        {
+            Consumer.Consume(entity);
+        }
+    }
+}

Robust.Benchmarks/EntityManager/AddRemoveComponentBenchmark.cs

@@ -8,7 +8,7 @@ using Robust.UnitTesting.Server;
 namespace Robust.Benchmarks.EntityManager;
 
 [Virtual]
-public class AddRemoveComponentBenchmark
+public partial class AddRemoveComponentBenchmark
 {
     private ISimulation _simulation = default!;
     private IEntityManager _entityManager = default!;
@@ -41,14 +41,14 @@ public class AddRemoveComponentBenchmark
     {
         for (var i = 2; i <= N+1; i++)
         {
-            var uid = new EntityUid(i);
+            var uid = new EntityUid(i, -1);
             _entityManager.AddComponent<A>(uid);
             _entityManager.RemoveComponent<A>(uid);
         }
     }
 
     [ComponentProtoName("A")]
-    public sealed class A : Component
+    public sealed partial class A : Component
     {
     }
 }

Robust.Benchmarks/EntityManager/ComponentIndexBenchmark.cs

@@ -57,7 +57,7 @@ public class ComponentIndexBenchmark
     private static class CompArrayIndex<T>
     {
         // ReSharper disable once StaticMemberInGenericType
-        public static readonly CompIdx Idx = new(Interlocked.Increment(ref _compIndexMaster));
+        public static readonly CompIdx Idx = new(Interlocked.Increment(ref _compIndexMaster), typeof(T));
     }
 
     private static CompIdx GetCompIdIndex(Type type)

Robust.Benchmarks/EntityManager/ComponentIteratorBenchmark.cs

@@ -0,0 +1,75 @@
+using BenchmarkDotNet.Attributes;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.UnitTesting.Server;
+
+namespace Robust.Benchmarks.EntityManager;
+
+public partial class ComponentIteratorBenchmark
+{
+    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[] ComponentStructEnumerator()
+    {
+        var query = _entityManager.EntityQueryEnumerator<A>();
+        var i = 0;
+
+        while (query.MoveNext(out var comp))
+        {
+            Comps[i] = comp;
+            i++;
+        }
+
+        return Comps;
+    }
+
+    [Benchmark]
+    public A[] ComponentIEnumerable()
+    {
+        var i = 0;
+
+        foreach (var comp in _entityManager.EntityQuery<A>())
+        {
+            Comps[i] = comp;
+            i++;
+        }
+
+        return Comps;
+    }
+
+    [ComponentProtoName("A")]
+    public sealed partial class A : Component
+    {
+    }
+}

Robust.Benchmarks/EntityManager/ComponentPassingBenchmark.cs

@@ -0,0 +1,53 @@
+using BenchmarkDotNet.Attributes;
+using Robust.Shared.Analyzers;
+using static Robust.Benchmarks.EntityManager.ArchetypeComponentAccessBenchmark;
+
+namespace Robust.Benchmarks.EntityManager;
+
+[MemoryDiagnoser]
+[Virtual]
+public class ArrayAccessBenchmark
+{
+    [Params(new[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9})]
+    public int[] Array = default!;
+
+    [Params(5)]
+    public int Element;
+
+    [Params(500)]
+    public int Handle;
+
+    public Archetype<int, int, int, int, int, int, int, int, int, int> Archetype = default!;
+
+    [GlobalSetup]
+    public void GlobalSetup()
+    {
+        Archetype = new Archetype<int, int, int, int, int, int, int, int, int, int>(1000);
+    }
+
+    [Benchmark]
+    public int? GetArrayElement()
+    {
+        return Consume();
+    }
+
+    [Benchmark]
+    public int? GetExisting()
+    {
+        return Consume(Element);
+    }
+
+    [Benchmark]
+    public int? GetArchetype()
+    {
+        return Consume(Archetype.GetComponentUnsafeHandle<int>(Handle));
+    }
+
+    private int? Consume(int? value = null)
+    {
+        if (value == null)
+            value = Array[5];
+
+        return value;
+    }
+}

Robust.Benchmarks/EntityManager/GetComponentBenchmark.cs

@@ -1,4 +1,3 @@
-using System;
 using BenchmarkDotNet.Attributes;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
@@ -9,7 +8,7 @@ using Robust.UnitTesting.Server;
 namespace Robust.Benchmarks.EntityManager;
 
 [Virtual]
-public class GetComponentBenchmark
+public partial class GetComponentBenchmark
 {
     private ISimulation _simulation = default!;
     private IEntityManager _entityManager = default!;
@@ -47,7 +46,7 @@ public class GetComponentBenchmark
     {
         for (var i = 2; i <= N+1; i++)
         {
-            Comps[i] = _entityManager.GetComponent<A>(new EntityUid(i));
+            Comps[i] = _entityManager.GetComponent<A>(new EntityUid(i, -1));
         }
 
         // Return something so the JIT doesn't optimize out all the GetComponent calls.
@@ -55,7 +54,7 @@ public class GetComponentBenchmark
     }
 
     [ComponentProtoName("A")]
-    public sealed class A : Component
+    public sealed partial class A : Component
     {
     }
 }

Robust.Benchmarks/EntityManager/SpawnDeleteEntityBenchmark.cs

@@ -8,7 +8,7 @@ using Robust.UnitTesting.Server;
 namespace Robust.Benchmarks.EntityManager;
 
 [Virtual]
-public class SpawnDeleteEntityBenchmark
+public partial class SpawnDeleteEntityBenchmark
 {
     private ISimulation _simulation = default!;
     private IEntityManager _entityManager = default!;
@@ -56,7 +56,7 @@ public class SpawnDeleteEntityBenchmark
     }
 
     [ComponentProtoName("A")]
-    public sealed class A : Component
+    public sealed partial class A : Component
     {
     }
 }

Robust.Benchmarks/Exporters/SQLExporter.cs

@@ -22,6 +22,11 @@ namespace Robust.Benchmarks.Exporters;
 
 public sealed class SQLExporter : IExporter
 {
+    private static readonly JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions
+    {
+        NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
+    };
+
     public static readonly IExporter Default = new SQLExporter();
 
     private SQLExporter(){}
@@ -76,10 +81,7 @@ public sealed class SQLExporter : IExporter
         {
             ctx.Database.OpenConnection();
             var con = (NpgsqlConnection) ctx.Database.GetDbConnection();
-            con.TypeMapper.AddTypeResolverFactory(new JsonOverrideTypeHandlerResolverFactory(new JsonSerializerOptions
-            {
-                NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
-            }));
+            con.TypeMapper.AddTypeResolverFactory(new JsonOverrideTypeHandlerResolverFactory(JsonSerializerOptions));
 
             ctx.Database.Migrate();
             foreach (var run in BenchmarkRun.FromSummary(summary, gitHash))

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

@@ -13,7 +13,7 @@ namespace Robust.Benchmarks.Migrations
 {
     [DbContext(typeof(BenchmarkContext))]
     [Migration("20220510131430_fix-pk")]
-    partial class fixpk
+    partial class FixPK
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {

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

@@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace Robust.Benchmarks.Migrations
 {
-    public partial class fixpk : Migration
+    public partial class FixPK : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

Robust.Benchmarks/Migrations/20221009235705_db.Designer.cs

@@ -14,7 +14,7 @@ namespace Robust.Benchmarks.Migrations
 {
     [DbContext(typeof(BenchmarkContext))]
     [Migration("20221009235705_db")]
-    partial class db
+    partial class DB
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {

Robust.Benchmarks/Migrations/20221009235705_db.cs

@@ -4,7 +4,7 @@
 
 namespace Robust.Benchmarks.Migrations
 {
-    public partial class db : Migration
+    public partial class DB : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

Robust.Benchmarks/Migrations/20221010144620_param_work.Designer.cs

@@ -14,7 +14,7 @@ namespace Robust.Benchmarks.Migrations
 {
     [DbContext(typeof(BenchmarkContext))]
     [Migration("20221010144620_param_work")]
-    partial class param_work
+    partial class ParamWork
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {

Robust.Benchmarks/Migrations/20221010144620_param_work.cs

@@ -5,7 +5,7 @@ using Robust.Benchmarks.Exporters;
 
 namespace Robust.Benchmarks.Migrations
 {
-    public partial class param_work : Migration
+    public partial class ParamWork : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

Robust.Benchmarks/NumericsHelpers/AddBenchmark.cs

@@ -1,33 +1,32 @@
 using BenchmarkDotNet.Attributes;
 using Robust.Shared.Analyzers;
 
-namespace Robust.Benchmarks.NumericsHelpers
+namespace Robust.Benchmarks.NumericsHelpers;
+
+[Virtual]
+public class AddBenchmark
 {
-    [Virtual]
-    public class AddBenchmark
+    [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!;
+
+    [GlobalSetup]
+    public void Setup()
     {
-        [Params(32, 128)]
-        public int N { get; set; }
+        _inputA = new float[N];
+        _inputB = new float[N];
+        _output = new float[N];
+    }
 
-        [Params(1,2)]
-        public int T { get; set; }
-
-        private float[] _inputA = default!;
-        private float[] _inputB = default!;
-        private float[] _output = default!;
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            _inputA = new float[N];
-            _inputB = new float[N];
-            _output = new float[N];
-        }
-
-        [Benchmark]
-        public void Bench()
-        {
-            Shared.Maths.NumericsHelpers.Add(_inputA, _inputB, _output);
-        }
+    [Benchmark]
+    public void Bench()
+    {
+        Shared.Maths.NumericsHelpers.Add(_inputA, _inputB, _output);
     }
 }

Robust.Benchmarks/NumericsHelpers/HorizontalAddBenchmark.cs

@@ -0,0 +1,26 @@
+using BenchmarkDotNet.Attributes;
+using Robust.Shared.Analyzers;
+
+namespace Robust.Benchmarks.NumericsHelpers;
+
+[Virtual]
+[DisassemblyDiagnoser()]
+public class HorizontalAddBenchmark
+{
+    [Params(8, 32, 128)]
+    public int N { get; set; }
+
+    private float[] _inputA = default!;
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        _inputA = new float[N];
+    }
+
+    [Benchmark]
+    public float Bench()
+    {
+        return Shared.Maths.NumericsHelpers.HorizontalAdd(_inputA);
+    }
+}

Robust.Benchmarks/Program.cs

@@ -1,8 +1,9 @@
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Running;
+#if DEBUG
+using BenchmarkDotNet.Configs;
+#endif
 using System;
+using BenchmarkDotNet.Running;
 using Robust.Benchmarks.Configs;
-using Robust.Benchmarks.Exporters;
 
 namespace Robust.Benchmarks
 {

Robust.Benchmarks/Robust.Benchmarks.csproj

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

Robust.Benchmarks/Serialization/BenchmarkIntSerializer.cs

@@ -1,5 +1,6 @@
 using System.Globalization;
 using Robust.Shared.IoC;
+using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Validation;
@@ -8,7 +9,7 @@ using Robust.Shared.Serialization.TypeSerializers.Interfaces;
 
 namespace Robust.Benchmarks.Serialization
 {
-    public sealed class BenchmarkIntSerializer : ITypeSerializer<int, ValueDataNode>
+    public sealed class BenchmarkIntSerializer : ITypeSerializer<int, ValueDataNode>, ITypeCopyCreator<int>
     {
         public ValidationNode Validate(ISerializationManager serializationManager, ValueDataNode node,
             IDependencyCollection dependencies, ISerializationContext? context = null)
@@ -19,7 +20,8 @@ namespace Robust.Benchmarks.Serialization
         }
 
         public int Read(ISerializationManager serializationManager, ValueDataNode node,
-            IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null, int _ = default)
+            IDependencyCollection dependencies, SerializationHookContext hookCtx, ISerializationContext? context = null,
+            ISerializationManager.InstantiationDelegate<int>? instanceProvider = null)
         {
             return int.Parse(node.Value, CultureInfo.InvariantCulture);
         }
@@ -31,8 +33,8 @@ namespace Robust.Benchmarks.Serialization
             return new ValueDataNode(value.ToString(CultureInfo.InvariantCulture));
         }
 
-        public int Copy(ISerializationManager serializationManager, int source, int target, bool skipHook,
-            ISerializationContext? context = null)
+        public int CreateCopy(ISerializationManager serializationManager, int source,
+            IDependencyCollection dependencies, SerializationHookContext hookCtx, ISerializationContext? context = null)
         {
             return source;
         }

Robust.Benchmarks/Serialization/Copy/SerializationCopyBenchmark.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using BenchmarkDotNet.Attributes;
 using Robust.Benchmarks.Serialization.Definitions;
 using Robust.Shared.Analyzers;
-using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Sequence;
@@ -28,7 +27,7 @@ namespace Robust.Benchmarks.Serialization.Copy
 
             var seedMapping = yamlStream.Documents[0].RootNode.ToDataNodeCast<SequenceDataNode>().Cast<MappingDataNode>(0);
 
-            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping);
+            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping, notNullableOverride: true);
         }
 
         private const string String = "ABC";
@@ -46,25 +45,25 @@ namespace Robust.Benchmarks.Serialization.Copy
         [Benchmark]
         public string? CreateCopyString()
         {
-            return SerializationManager.Copy(String);
+            return SerializationManager.CreateCopy(String, notNullableOverride: true);
         }
 
         [Benchmark]
         public int? CreateCopyInteger()
         {
-            return SerializationManager.Copy(Integer);
+            return SerializationManager.CreateCopy(Integer);
         }
 
         [Benchmark]
         public DataDefinitionWithString? CreateCopyDataDefinitionWithString()
         {
-            return SerializationManager.Copy(DataDefinitionWithString);
+            return SerializationManager.CreateCopy(DataDefinitionWithString, notNullableOverride: true);
         }
 
         [Benchmark]
         public SeedDataDefinition? CreateCopySeedDataDefinition()
         {
-            return SerializationManager.Copy(Seed);
+            return SerializationManager.CreateCopy(Seed, notNullableOverride: true);
         }
 
         [Benchmark]
@@ -109,9 +108,7 @@ namespace Robust.Benchmarks.Serialization.Copy
             copy.Potency = Seed.Potency;
             copy.Ligneous = Seed.Ligneous;
 
-            copy.PlantRsi = Seed.PlantRsi == null
-                ? null!
-                : new ResourcePath(Seed.PlantRsi.ToString(), Seed.PlantRsi.Separator);
+            copy.PlantRsi = new ResPath(Seed.PlantRsi.ToString());
             copy.PlantIconState = Seed.PlantIconState;
             copy.Bioluminescent = Seed.Bioluminescent;
             copy.BioluminescentColor = Seed.BioluminescentColor;
@@ -124,30 +121,21 @@ namespace Robust.Benchmarks.Serialization.Copy
         [BenchmarkCategory("flag")]
         public object? CopyFlagZero()
         {
-            return SerializationManager.CopyWithTypeSerializer(
-                typeof(FlagSerializer<BenchmarkFlags>),
-                (int) FlagZero,
-                (int) FlagZero);
+            return SerializationManager.CreateCopy<int, FlagSerializer<BenchmarkFlags>>((int) FlagZero);
         }
 
         [Benchmark]
         [BenchmarkCategory("flag")]
         public object? CopyFlagThirtyOne()
         {
-            return SerializationManager.CopyWithTypeSerializer(
-                typeof(FlagSerializer<BenchmarkFlags>),
-                (int) FlagThirtyOne,
-                (int) FlagThirtyOne);
+            return SerializationManager.CreateCopy<int, FlagSerializer<BenchmarkFlags>>((int) FlagThirtyOne);
         }
 
         [Benchmark]
         [BenchmarkCategory("customTypeSerializer")]
         public object? CopyIntegerCustomSerializer()
         {
-            return SerializationManager.CopyWithTypeSerializer(
-                typeof(BenchmarkIntSerializer),
-                Integer,
-                Integer);
+            return SerializationManager.CreateCopy<int, BenchmarkIntSerializer>(Integer);
         }
     }
 }

Robust.Benchmarks/Serialization/Definitions/DataDefinitionWithString.cs

@@ -5,9 +5,9 @@ namespace Robust.Benchmarks.Serialization.Definitions
 {
     [DataDefinition]
     [Virtual]
-    public class DataDefinitionWithString
+    public partial class DataDefinitionWithString
     {
         [DataField("string")]
-        public string StringField { get; init; } = default!;
+        public string StringField { get; set; } = default!;
     }
 }

Robust.Benchmarks/Serialization/Definitions/SealedDataDefinitionWithString.cs

@@ -3,9 +3,9 @@
 namespace Robust.Benchmarks.Serialization.Definitions
 {
     [DataDefinition]
-    public sealed class SealedDataDefinitionWithString
+    public sealed partial class SealedDataDefinitionWithString
     {
         [DataField("string")]
-        public string StringField { get; init; } = default!;
+        public string StringField { get; private set; } = default!;
     }
 }

Robust.Benchmarks/Serialization/Definitions/SeedDataDefinition.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -10,8 +11,7 @@ namespace Robust.Benchmarks.Serialization.Definitions
     ///     Arbitrarily large data definition for benchmarks.
     ///     Taken from content.
     /// </summary>
-    [Prototype("seed")]
-    public sealed class SeedDataDefinition : IPrototype
+    public sealed partial class SeedDataDefinition : Component
     {
         public const string Prototype = @"
 - type: seed
@@ -87,7 +87,7 @@ namespace Robust.Benchmarks.Serialization.Definitions
         #endregion
 
         #region Cosmetics
-        [DataField("plantRsi", required: true)] public ResourcePath PlantRsi { get; set; } = default!;
+        [DataField("plantRsi", required: true)] public ResPath PlantRsi { get; set; } = default!;
         [DataField("plantIconState")] public string PlantIconState { get; set; } = "produce";
         [DataField("bioluminescent")] public bool Bioluminescent { get; set; }
         [DataField("bioluminescentColor")] public Color BioluminescentColor { get; set; } = Color.White;
@@ -106,7 +106,7 @@ namespace Robust.Benchmarks.Serialization.Definitions
     }
 
     [DataDefinition]
-    public struct SeedChemQuantity
+    public partial struct SeedChemQuantity
     {
         [DataField("Min")]
         public int Min;

Robust.Benchmarks/Serialization/Read/SerializationReadBenchmark.cs

@@ -43,7 +43,7 @@ namespace Robust.Benchmarks.Serialization.Read
         [Benchmark]
         public string ReadString()
         {
-            return SerializationManager.Read<string>(StringNode);
+            return SerializationManager.Read<string>(StringNode, notNullableOverride: true);
         }
 
         [Benchmark]
@@ -55,43 +55,34 @@ namespace Robust.Benchmarks.Serialization.Read
         [Benchmark]
         public DataDefinitionWithString ReadDataDefinitionWithString()
         {
-            return SerializationManager.Read<DataDefinitionWithString>(StringDataDefNode);
+            return SerializationManager.Read<DataDefinitionWithString>(StringDataDefNode, notNullableOverride: true);
         }
 
         [Benchmark]
         public SeedDataDefinition ReadSeedDataDefinition()
         {
-            return SerializationManager.Read<SeedDataDefinition>(SeedNode);
+            return SerializationManager.Read<SeedDataDefinition>(SeedNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("flag")]
         public object? ReadFlagZero()
         {
-            return SerializationManager.ReadWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagZero);
+            return SerializationManager.Read<int, ValueDataNode, FlagSerializer<BenchmarkFlags>>(FlagZero);
         }
 
         [Benchmark]
         [BenchmarkCategory("flag")]
         public object? ReadThirtyOne()
         {
-            return SerializationManager.ReadWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagThirtyOne);
+            return SerializationManager.Read<int, ValueDataNode, FlagSerializer<BenchmarkFlags>>(FlagThirtyOne);
         }
 
         [Benchmark]
         [BenchmarkCategory("customTypeSerializer")]
         public object? ReadIntegerCustomSerializer()
         {
-            return SerializationManager.ReadWithTypeSerializer(
-                typeof(int),
-                typeof(BenchmarkIntSerializer),
-                IntNode);
+            return SerializationManager.Read<int, ValueDataNode, BenchmarkIntSerializer>(IntNode);
         }
     }
 }

Robust.Benchmarks/Serialization/SerializationArrayBenchmark.cs

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

Robust.Benchmarks/Serialization/SerializationBenchmark.cs

@@ -12,9 +12,9 @@ namespace Robust.Benchmarks.Serialization
     {
         public SerializationBenchmark()
         {
-            IoCManager.InitThread();
-            ServerIoC.RegisterIoC();
-            IoCManager.BuildGraph();
+            var deps = IoCManager.InitThread();
+            ServerIoC.RegisterIoC(deps);
+            deps.BuildGraph();
 
             var assemblies = new[]
             {
@@ -25,12 +25,12 @@ namespace Robust.Benchmarks.Serialization
 
             foreach (var assembly in assemblies)
             {
-                IoCManager.Resolve<IConfigurationManagerInternal>().LoadCVarsFromAssembly(assembly);
+                deps.Resolve<IConfigurationManagerInternal>().LoadCVarsFromAssembly(assembly);
             }
 
-            IoCManager.Resolve<IReflectionManager>().LoadAssemblies(assemblies);
+            deps.Resolve<IReflectionManager>().LoadAssemblies(assemblies);
 
-            SerializationManager = IoCManager.Resolve<ISerializationManager>();
+            SerializationManager = deps.Resolve<ISerializationManager>();
         }
 
         protected ISerializationManager SerializationManager { get; }

Robust.Benchmarks/Serialization/Write/SerializationWriteBenchmark.cs

@@ -3,7 +3,6 @@ using System.IO;
 using BenchmarkDotNet.Attributes;
 using Robust.Benchmarks.Serialization.Definitions;
 using Robust.Shared.Analyzers;
-using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Sequence;
@@ -28,7 +27,7 @@ namespace Robust.Benchmarks.Serialization.Write
 
             var seedMapping = yamlStream.Documents[0].RootNode.ToDataNodeCast<SequenceDataNode>().Cast<MappingDataNode>(0);
 
-            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping);
+            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping, notNullableOverride: true);
         }
 
         private const string String = "ABC";
@@ -46,7 +45,7 @@ namespace Robust.Benchmarks.Serialization.Write
         [Benchmark]
         public DataNode WriteString()
         {
-            return SerializationManager.WriteValue(String);
+            return SerializationManager.WriteValue(String, notNullableOverride: true);
         }
 
         [Benchmark]
@@ -58,13 +57,13 @@ namespace Robust.Benchmarks.Serialization.Write
         [Benchmark]
         public DataNode WriteDataDefinitionWithString()
         {
-            return SerializationManager.WriteValue(DataDefinitionWithString);
+            return SerializationManager.WriteValue(DataDefinitionWithString, notNullableOverride: true);
         }
 
         [Benchmark]
         public DataNode WriteSeedDataDefinition()
         {
-            return SerializationManager.WriteValue(Seed);
+            return SerializationManager.WriteValue(Seed, notNullableOverride: true);
         }
 
         [Benchmark]
@@ -107,30 +106,21 @@ namespace Robust.Benchmarks.Serialization.Write
         [BenchmarkCategory("flag")]
         public DataNode WriteFlagZero()
         {
-            return SerializationManager.WriteWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagZero);
+            return SerializationManager.WriteValue<int, FlagSerializer<BenchmarkFlags>>((int)FlagZero);
         }
 
         [Benchmark]
         [BenchmarkCategory("flag")]
         public DataNode WriteThirtyOne()
         {
-            return SerializationManager.WriteWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagThirtyOne);
+            return SerializationManager.WriteValue<int, FlagSerializer<BenchmarkFlags>>((int)FlagThirtyOne);
         }
 
         [Benchmark]
         [BenchmarkCategory("customTypeSerializer")]
         public DataNode WriteIntegerCustomSerializer()
         {
-            return SerializationManager.WriteWithTypeSerializer(
-                typeof(int),
-                typeof(BenchmarkIntSerializer),
-                Integer);
+            return SerializationManager.WriteValue<int, BenchmarkIntSerializer>(Integer);
         }
     }
 }

Robust.Benchmarks/Transform/RecursiveMoveBenchmark.cs

@@ -0,0 +1,171 @@
+using System;
+using System.Linq;
+using System.Numerics;
+using BenchmarkDotNet.Attributes;
+using Robust.Server.Containers;
+using Robust.Server.GameStates;
+using Robust.Shared;
+using Robust.Shared.Analyzers;
+using Robust.Shared.Configuration;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.UnitTesting.Server;
+
+namespace Robust.Benchmarks.Transform;
+
+/// <summary>
+/// This benchmark tests various transform/move related functions with an entity that has many children.
+/// </summary>
+[Virtual, MemoryDiagnoser]
+public class RecursiveMoveBenchmark
+{
+    private ISimulation _simulation = default!;
+    private IEntityManager _entMan = default!;
+    private SharedTransformSystem _transform = default!;
+    private ContainerSystem _container = default!;
+    private PvsSystem _pvs = default!;
+    private EntityCoordinates _mapCoords;
+    private EntityCoordinates _gridCoords;
+    private EntityUid _ent;
+    private EntityUid _child;
+    private TransformComponent _childXform = default!;
+    private EntityQuery<TransformComponent> _query;
+
+    [GlobalSetup]
+    public void GlobalSetup()
+    {
+        _simulation = RobustServerSimulation
+            .NewSimulation()
+            .InitializeInstance();
+
+        if (!_simulation.Resolve<IConfigurationManager>().GetCVar(CVars.NetPVS))
+            throw new InvalidOperationException("PVS must be enabled");
+
+        _entMan = _simulation.Resolve<IEntityManager>();
+        _transform = _entMan.System<SharedTransformSystem>();
+        _container = _entMan.System<ContainerSystem>();
+        _pvs = _entMan.System<PvsSystem>();
+        _query = _entMan.GetEntityQuery<TransformComponent>();
+
+        // Create map & grid
+        var mapMan = _simulation.Resolve<IMapManager>();
+        var mapSys = _entMan.System<SharedMapSystem>();
+        var mapId = mapMan.CreateMap();
+        var map = mapMan.GetMapEntityId(mapId);
+        var gridComp = mapMan.CreateGridEntity(mapId);
+        var grid = gridComp.Owner;
+        _gridCoords = new EntityCoordinates(grid, .5f, .5f);
+        _mapCoords = new EntityCoordinates(map, 100, 100);
+        mapSys.SetTile(grid, gridComp, Vector2i.Zero, new Tile(1));
+
+        // Next, we will spawn our test entity. This entity will have a  complex transform/container hierarchy.
+        // This is intended to be representative of a typical SS14 player entity, with organs. clothing, and a full backpack.
+        _ent = _entMan.Spawn();
+
+        // Quick check that SetCoordinates actually changes the parent as expected
+        // I.e., ensure that grid-traversal code doesn't just dump the entity on the map.
+        _transform.SetCoordinates(_ent, _gridCoords);
+        if (_query.GetComponent(_ent).ParentUid != _gridCoords.EntityId)
+            throw new Exception("Grid traversal error.");
+
+        _transform.SetCoordinates(_ent, _mapCoords);
+        if (_query.GetComponent(_ent).ParentUid != _mapCoords.EntityId)
+            throw new Exception("Grid traversal error.");
+
+        // Add 5 direct children in slots to represent clothing.
+        for (var i = 0; i < 5; i++)
+        {
+            var id = $"inventory{i}";
+            _container.EnsureContainer<ContainerSlot>(_ent, id);
+            if (!_entMan.TrySpawnInContainer(null, _ent, id, out _))
+                throw new Exception($"Failed to setup entity");
+        }
+
+        // body parts
+        _container.EnsureContainer<Container>(_ent, "body");
+        for (var i = 0; i < 5; i++)
+        {
+            // Simple organ
+            if (!_entMan.TrySpawnInContainer(null, _ent, "body", out _))
+                throw new Exception($"Failed to setup entity");
+
+            // body part that has another body part / limb
+            if (!_entMan.TrySpawnInContainer(null, _ent, "body", out var limb))
+                throw new Exception($"Failed to setup entity");
+
+            _container.EnsureContainer<ContainerSlot>(limb.Value, "limb");
+            if (!_entMan.TrySpawnInContainer(null, limb.Value, "limb", out _))
+                throw new Exception($"Failed to setup entity");
+        }
+
+        // Backpack
+        _container.EnsureContainer<ContainerSlot>(_ent, "inventory-backpack");
+        if (!_entMan.TrySpawnInContainer(null, _ent, "inventory-backpack", out var backpack))
+            throw new Exception($"Failed to setup entity");
+
+        // Misc backpack contents.
+        var backpackStorage = _container.EnsureContainer<Container>(backpack.Value, "storage");
+        for (var i = 0; i < 10; i++)
+        {
+            if (!_entMan.TrySpawnInContainer(null, backpack.Value, "storage", out _))
+                throw new Exception($"Failed to setup entity");
+        }
+
+        // Emergency box inside of the backpack
+        var box = backpackStorage.ContainedEntities.First();
+        var boxContainer = _container.EnsureContainer<Container>(box, "storage");
+        for (var i = 0; i < 10; i++)
+        {
+            if (!_entMan.TrySpawnInContainer(null, box, "storage", out _))
+                throw new Exception($"Failed to setup entity");
+        }
+
+        // Deepest child.
+        _child = boxContainer.ContainedEntities.First();
+        _childXform = _query.GetComponent(_child);
+
+        _pvs.ProcessCollections();
+    }
+
+    /// <summary>
+    /// This implicitly measures move events, including PVS and entity lookups. Though given that most of the entities
+    /// are in containers, this will bias the entity lookup aspect.
+    /// </summary>
+    [Benchmark]
+    public void MoveEntity()
+    {
+        _transform.SetCoordinates(_ent, _gridCoords);
+        _transform.SetCoordinates(_ent, _mapCoords);
+    }
+
+    /// <summary>
+    /// Like <see cref="MoveEntity"/>, but also processes queued PVS chunk updates.
+    /// </summary>
+    [Benchmark]
+    public void MoveAndUpdateChunks()
+    {
+        _transform.SetCoordinates(_ent, _gridCoords);
+        _pvs.ProcessCollections();
+        _transform.SetCoordinates(_ent, _mapCoords);
+        _pvs.ProcessCollections();
+    }
+
+    [Benchmark]
+    public Vector2 GetWorldPos()
+    {
+        return _transform.GetWorldPosition(_childXform);
+    }
+
+    [Benchmark]
+    public EntityUid GetRootUid()
+    {
+        var xform = _childXform;
+        while (xform.ParentUid.IsValid())
+        {
+            xform = _query.GetComponent(xform.ParentUid);
+        }
+        return xform.ParentUid;
+    }
+}

Robust.Benchmarks/TypeMatching/TypeSwitchBenchmark.cs

@@ -0,0 +1,71 @@
+using BenchmarkDotNet.Attributes;
+using Robust.Shared.Analyzers;
+
+namespace Robust.Benchmarks.TypeMatching;
+
+[MemoryDiagnoser]
+[Virtual]
+public class TypeSwitchBenchmark
+{
+    private readonly Matcher<Struct> _matcher = new();
+
+    [Benchmark]
+    public int BenchmarkInt()
+    {
+        return _matcher.TypeToInt<int>();
+    }
+
+    [Benchmark]
+    public int BenchmarkString()
+    {
+        return _matcher.TypeToInt<string>();
+    }
+
+    [Benchmark]
+    public int BenchmarkStruct()
+    {
+        return _matcher.TypeToInt<Struct>();
+    }
+
+    [Benchmark]
+    public int BenchmarkDouble()
+    {
+        return _matcher.TypeToInt<double>();
+    }
+
+    [Benchmark]
+    public int BenchmarkFloat()
+    {
+        return _matcher.TypeToInt<float>();
+    }
+
+    [Benchmark]
+    public int BenchmarkClass()
+    {
+        return _matcher.TypeToInt<Class>();
+    }
+
+    private class Matcher<T1>
+    {
+        public int TypeToInt<T>(T val = default!)
+        {
+            return val switch
+            {
+                int => 1,
+                string => 2,
+                double => 3,
+                T1 => 4,
+                Class => 5,
+                _ => 6
+            };
+        }
+    }
+
+    private struct Struct
+    {
+    }
+
+    private class Class
+    {
+    }
+}

Robust.Benchmarks/Utility/ResourcePathBench.cs

@@ -0,0 +1,36 @@
+using BenchmarkDotNet.Attributes;
+using JetBrains.Annotations;
+using Robust.Shared.Analyzers;
+using Robust.Shared.Utility;
+
+#pragma warning disable CS0612
+namespace Robust.Benchmarks.Utility;
+
+[Virtual]
+public class ResourcePathBench
+{
+    private string _path = default!;
+
+    [UsedImplicitly]
+    [Params(10, 100, 1000)]
+    public int N;
+
+    [GlobalSetup]
+    public void GlobalSetup()
+    {
+        _path = "/a/b/c/../test";
+    }
+
+    [Benchmark]
+    public ResPath CreateWithSeparatorResPath()
+    {
+        ResPath res = default;
+        for (var i = 0; i < N; i++)
+        {
+            res = new ResPath(_path);
+        }
+        return res;
+    }
+
+}
+#pragma warning restore CS0612

Robust.Client.Injectors/RXamlWellKnownTypes.cs

@@ -25,7 +25,7 @@ namespace Robust.Build.Tasks
             Single = ts.GetType("System.Single");
             Int32 = ts.GetType("System.Int32");
 
-            (Vector2, Vector2ConstructorFull) = GetNumericTypeInfo("Robust.Shared.Maths.Vector2", Single, 2);
+            (Vector2, Vector2ConstructorFull) = GetNumericTypeInfo("System.Numerics.Vector2", Single, 2);
             (Vector2i, Vector2iConstructorFull) = GetNumericTypeInfo("Robust.Shared.Maths.Vector2i", Int32, 2);
             (Thickness, ThicknessConstructorFull) = GetNumericTypeInfo("Robust.Shared.Maths.Thickness", Single, 4);
 

Robust.Client.Injectors/XamlCompiler.cs

@@ -110,25 +110,6 @@ namespace Robust.Build.Tasks
             var compiler =
                 new RobustXamlILCompiler(transformerconfig, emitConfig, true);
 
-            var loaderDispatcherDef = new TypeDefinition("CompiledRobustXaml", "!XamlLoader",
-                TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
-
-            var loaderDispatcherMethod = new MethodDefinition("TryLoad",
-                MethodAttributes.Static | MethodAttributes.Public,
-                asm.MainModule.TypeSystem.Object)
-            {
-                Parameters = {new ParameterDefinition(asm.MainModule.TypeSystem.String)}
-            };
-            loaderDispatcherDef.Methods.Add(loaderDispatcherMethod);
-            asm.MainModule.Types.Add(loaderDispatcherDef);
-
-            var stringEquals = asm.MainModule.ImportReference(asm.MainModule.TypeSystem.String.Resolve().Methods.First(
-                m =>
-                    m.IsStatic && m.Name == "Equals" && m.Parameters.Count == 2 &&
-                    m.ReturnType.FullName == "System.Boolean"
-                    && m.Parameters[0].ParameterType.FullName == "System.String"
-                    && m.Parameters[1].ParameterType.FullName == "System.String"));
-
             bool CompileGroup(IResourceGroup group)
             {
                 var typeDef = new TypeDefinition("CompiledRobustXaml", "!" + group.Name, TypeAttributes.Class,
@@ -252,31 +233,6 @@ namespace Robust.Build.Tasks
                                     $"No call to RobustXamlLoader.Load(this) call found anywhere in the type {classType.FullName} and type seems to have custom constructors.");
                             }
                         }
-
-                        //add compiled build method
-                        var compiledBuildMethod = typeSystem.GetTypeReference(builder).Resolve().Methods
-                            .First(m => m.Name == buildName);
-                        var parameterlessCtor = classTypeDefinition.GetConstructors()
-                            .FirstOrDefault(c => c.IsPublic && !c.IsStatic && !c.HasParameters);
-
-                        if (compiledBuildMethod != null && parameterlessCtor != null)
-                        {
-                            var i = loaderDispatcherMethod.Body.Instructions;
-                            var nop = Instruction.Create(OpCodes.Nop);
-                            i.Add(Instruction.Create(OpCodes.Ldarg_0));
-                            i.Add(Instruction.Create(OpCodes.Ldstr, res.Uri));
-                            i.Add(Instruction.Create(OpCodes.Call, stringEquals));
-                            i.Add(Instruction.Create(OpCodes.Brfalse, nop));
-                            if (parameterlessCtor != null)
-                                i.Add(Instruction.Create(OpCodes.Newobj, parameterlessCtor));
-                            else
-                            {
-                                i.Add(Instruction.Create(OpCodes.Call, compiledBuildMethod));
-                            }
-
-                            i.Add(Instruction.Create(OpCodes.Ret));
-                            i.Add(nop);
-                        }
                     }
                     catch (Exception e)
                     {
@@ -293,8 +249,6 @@ namespace Robust.Build.Tasks
                     return false;
             }
 
-            loaderDispatcherMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ldnull));
-            loaderDispatcherMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
             return true;
         }
 

Robust.Client.NameGenerator/XamlUiPartialClassGenerator.cs

@@ -332,7 +332,7 @@ namespace {nameSpace}
                                 "Usage",
                                 DiagnosticSeverity.Error,
                                 true),
-                            Location.None));
+                            candidateClass.GetLocation()));
                 }
             }
 

Robust.Client.WebView/Cef/Program.cs

@@ -20,7 +20,7 @@ namespace Robust.Client.WebView.Cef
             var mainArgs = new CefMainArgs(argv);
 
             // This will block executing until the subprocess is shut down.
-            var code = CefRuntime.ExecuteProcess(mainArgs, new RobustCefApp(), IntPtr.Zero);
+            var code = CefRuntime.ExecuteProcess(mainArgs, new RobustCefApp(null), IntPtr.Zero);
 
             if (code != 0)
             {

Robust.Client.WebView/Cef/RobustCefApp.cs

@@ -7,9 +7,15 @@ namespace Robust.Client.WebView.Cef
 {
     internal sealed class RobustCefApp : CefApp
     {
+        private readonly ISawmill? _sawmill;
         private readonly BrowserProcessHandler _browserProcessHandler = new();
         private readonly RenderProcessHandler _renderProcessHandler = new();
 
+        public RobustCefApp(ISawmill? sawmill)
+        {
+            _sawmill = sawmill;
+        }
+
         protected override CefBrowserProcessHandler GetBrowserProcessHandler()
         {
             return _browserProcessHandler;
@@ -39,8 +45,7 @@ namespace Robust.Client.WebView.Cef
             commandLine.AppendSwitch("disable-threaded-scrolling", "1");
             commandLine.AppendSwitch("disable-features", "TouchpadAndWheelScrollLatching,AsyncWheelEvents");
 
-            if(IoCManager.Instance != null)
-                Logger.Debug($"{commandLine}");
+            _sawmill?.Debug($"CEF command line: {commandLine}");
         }
 
         protected override void OnRegisterCustomSchemes(CefSchemeRegistrar registrar)

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

@@ -27,7 +27,7 @@ namespace Robust.Client.WebView.Cef
             var impl = new WebViewWindowImpl(this);
 
             var lifeSpanHandler = new WindowLifeSpanHandler(impl);
-            var reqHandler = new RobustRequestHandler(Logger.GetSawmill("root"));
+            var reqHandler = new RobustRequestHandler(_sawmill);
             var client = new WindowCefClient(lifeSpanHandler, reqHandler);
             var settings = new CefBrowserSettings();
 

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
@@ -143,6 +144,8 @@ namespace Robust.Client.WebView.Cef
 
             private const int ScrollSpeed = 50;
 
+            private bool _textInputActive;
+
             private readonly RobustRequestHandler _requestHandler = new(Logger.GetSawmill("root"));
             private LiveData? _data;
             private string _startUrl = "about:blank";
@@ -360,24 +363,21 @@ namespace Robust.Client.WebView.Cef
                 return modifiers;
             }
 
-            public void TextEntered(GUITextEventArgs args)
+            public void TextEntered(GUITextEnteredEventArgs args)
             {
                 if (_data == null)
                     return;
 
                 var host = _data.Browser.GetHost();
 
-                Span<char> buf = stackalloc char[2];
-                var written = args.AsRune.EncodeToUtf16(buf);
-
-                for (var i = 0; i < written; i++)
+                foreach (var chr in args.Text)
                 {
                     host.SendKeyEvent(new CefKeyEvent
                     {
                         EventType = CefKeyEventType.Char,
-                        WindowsKeyCode = buf[i],
-                        Character = buf[i],
-                        UnmodifiedCharacter = buf[i]
+                        WindowsKeyCode = chr,
+                        Character = chr,
+                        UnmodifiedCharacter = chr
                     });
                 }
             }
@@ -481,6 +481,32 @@ namespace Robust.Client.WebView.Cef
                 _requestHandler.RemoveBeforeBrowseHandler(handler);
             }
 
+            public void FocusEntered()
+            {
+                if (_textInputActive)
+                    _clyde.TextInputStart();
+            }
+
+            public void FocusExited()
+            {
+                if (_textInputActive)
+                    _clyde.TextInputStop();
+            }
+
+            public void TextInputStart()
+            {
+                _textInputActive = true;
+                if (Owner.HasKeyboardFocus())
+                    _clyde.TextInputStart();
+            }
+
+            public void TextInputStop()
+            {
+                _textInputActive = false;
+                if (Owner.HasKeyboardFocus())
+                    _clyde.TextInputStop();
+            }
+
             private sealed class LiveData
             {
                 public OwnedTexture Texture;
@@ -579,6 +605,22 @@ namespace Robust.Client.WebView.Cef
                 if (_control.Owner.Disposed)
                     return;
             }
+
+            protected override void OnVirtualKeyboardRequested(CefBrowser browser, CefTextInputMode inputMode)
+            {
+                base.OnVirtualKeyboardRequested(browser, inputMode);
+
+                // Treat virtual keyboard requests as a guide for whether we should accept text input.
+
+                if (inputMode == CefTextInputMode.None)
+                {
+                    _control.TextInputStop();
+                }
+                else
+                {
+                    _control.TextInputStart();
+                }
+            }
         }
     }
 }

Robust.Client.WebView/Cef/WebViewManagerCef.cs

@@ -26,15 +26,20 @@ namespace Robust.Client.WebView.Cef
         [Dependency] private readonly IResourceManagerInternal _resourceManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+        [Dependency] private readonly ILocalizationManager _localization = default!;
+
+        private ISawmill _sawmill = default!;
 
         public void Initialize()
         {
-            IoCManager.Instance!.InjectDependencies(this, oneOff: true);
+            _sawmill = _logManager.GetSawmill("web.cef");
 
-            _consoleHost.RegisterCommand("flushcookies", Loc.GetString("cmd-flushcookies-desc"), Loc.GetString("cmd-flushcookies-help"), (_, _, _) =>
-            {
-                CefCookieManager.GetGlobal(null).FlushStore(null);
-            });
+            _consoleHost.RegisterCommand(
+                "flushcookies",
+                _localization.GetString("cmd-flushcookies-desc"),
+                _localization.GetString("cmd-flushcookies-help"),
+                (_, _, _) => CefCookieManager.GetGlobal(null).FlushStore(null));
 
             string subProcessName;
             if (OperatingSystem.IsWindows())
@@ -46,6 +51,7 @@ namespace Robust.Client.WebView.Cef
 
             var subProcessPath = Path.Combine(BasePath, subProcessName);
             var cefResourcesPath = LocateCefResources();
+            _sawmill.Debug($"Subprocess path: {subProcessPath}, resources: {cefResourcesPath}");
 
             // System.Console.WriteLine(AppContext.GetData("NATIVE_DLL_SEARCH_DIRECTORIES"));
 
@@ -54,7 +60,7 @@ namespace Robust.Client.WebView.Cef
 
             var cachePath = "";
             if (_resourceManager.UserData is WritableDirProvider userData)
-                cachePath = userData.GetFullPath(new ResourcePath("/cef_cache"));
+                cachePath = userData.GetFullPath(new ResPath("/cef_cache"));
 
             var settings = new CefSettings()
             {
@@ -69,20 +75,28 @@ namespace Robust.Client.WebView.Cef
                 CachePath = cachePath,
             };
 
-            Logger.Info($"CEF Version: {CefRuntime.ChromeVersion}");
+            var userAgentOverride = _cfg.GetCVar(WCVars.WebUserAgentOverride);
+            if (!string.IsNullOrEmpty(userAgentOverride))
+            {
+                settings.UserAgent = userAgentOverride;
+            }
 
-            _app = new RobustCefApp();
+            _sawmill.Info($"CEF Version: {CefRuntime.ChromeVersion}");
 
-            // We pass no main arguments...
-            CefRuntime.Initialize(new CefMainArgs(null), settings, _app, IntPtr.Zero);
+            _app = new RobustCefApp(_sawmill);
 
-            // TODO CEF: After this point, debugging breaks. No, literally. My client crashes but ONLY with the debugger.
-            // I have tried using the DEBUG and RELEASE versions of libcef.so, stripped or non-stripped...
-            // And nothing seemed to work. Odd.
+            // So these arguments look like nonsense, but it turns out CEF is just *like that*.
+            // The first argument is literally nonsense, but it needs to be there as otherwise the second argument doesn't apply
+            // The second argument turns off CEF's bullshit error handling, which breaks dotnet's error handling.
+            CefRuntime.Initialize(new CefMainArgs(new string[]{"binary","--disable-in-process-stack-traces"}), settings, _app, IntPtr.Zero);
 
             if (_cfg.GetCVar(WCVars.WebResProtocol))
             {
-                var handler = new ResourceSchemeFactoryHandler(this, _resourceManager, Logger.GetSawmill("web.res"));
+                var handler = new ResourceSchemeFactoryHandler(
+                    this,
+                    _resourceManager,
+                    _logManager.GetSawmill("web.res"));
+
                 CefRuntime.RegisterSchemeHandlerFactory("res", "", handler);
             }
         }
@@ -155,10 +169,10 @@ namespace Robust.Client.WebView.Cef
 
                 _sawmill.Debug($"HANDLING: {request.Url}");
 
-                var resourcePath = new ResourcePath(uri.AbsolutePath);
-                if (_resourceManager.TryContentFileRead(resourcePath, out var stream))
+                var resPath = new ResPath(uri.AbsolutePath);
+                if (_resourceManager.TryContentFileRead(resPath, out var stream))
                 {
-                    if (!_parent.TryGetResourceMimeType(resourcePath.Extension, out var mime))
+                    if (!_parent.TryGetResourceMimeType(resPath.Extension, out var mime))
                         mime = "application/octet-stream";
 
                     return new RequestResultStream(stream, mime, HttpStatusCode.OK).MakeHandler();

Robust.Client.WebView/Headless/WebViewManagerHeadless.cs

@@ -106,7 +106,7 @@ namespace Robust.Client.WebView.Headless
                 return false;
             }
 
-            public void TextEntered(GUITextEventArgs args)
+            public void TextEntered(GUITextEnteredEventArgs args)
             {
             }
 
@@ -125,6 +125,14 @@ namespace Robust.Client.WebView.Headless
             public void RemoveBeforeBrowseHandler(Action<IBeforeBrowseContext> handler)
             {
             }
+
+            public void FocusEntered()
+            {
+            }
+
+            public void FocusExited()
+            {
+            }
         }
 
         private sealed class WebViewWindowDummy : DummyBase, IWebViewWindow

Robust.Client.WebView/IWebViewControlImpl.cs

@@ -15,10 +15,12 @@ namespace Robust.Client.WebView
         void MouseExited();
         void MouseWheel(GUIMouseWheelEventArgs args);
         bool RawKeyEvent(in GuiRawKeyEvent guiRawEvent);
-        void TextEntered(GUITextEventArgs args);
+        void TextEntered(GUITextEnteredEventArgs args);
         void Resized();
         void Draw(DrawingHandleScreen handle);
         void AddBeforeBrowseHandler(Action<IBeforeBrowseContext> handler);
         void RemoveBeforeBrowseHandler(Action<IBeforeBrowseContext> handler);
+        void FocusEntered();
+        void FocusExited();
     }
 }

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

@@ -1,17 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\MSBuild\Robust.Properties.targets" />
   <Import Project="..\MSBuild\Robust.Engine.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>WinExe</OutputType>
+    <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
   </PropertyGroup>
 
-  <Import Project="..\MSBuild\Robust.DefineConstants.targets" />
-  <Target Name="RobustAfterBuild" AfterTargets="Build" />
-  <Import Project="..\MSBuild\Robust.Engine.targets" />
-
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
     <PackageReference Include="Robust.Natives.Cef" Version="102.0.9" />
@@ -21,4 +16,6 @@
     <ProjectReference Include="..\cefglue\CefGlue\CefGlue.csproj" />
     <ProjectReference Include="..\Robust.Client\Robust.Client.csproj" />
   </ItemGroup>
+
+  <Import Project="..\MSBuild\Robust.Properties.targets" />
 </Project>

Robust.Client.WebView/WCVars.cs

@@ -14,4 +14,16 @@ public static class WCVars
     /// </summary>
     public static readonly CVarDef<bool> WebResProtocol =
         CVarDef.Create("web.res_protocol", true, CVar.CLIENTONLY);
+
+    /// <summary>
+    /// Overrides the default CEF user-agent when set to a non-empty string.
+    /// </summary>
+    public static readonly CVarDef<string> WebUserAgentOverride =
+        CVarDef.Create("web.user_agent", "", CVar.CLIENTONLY);
+
+    /// <summary>
+    /// If true, use headless WebView implementation even with graphical client (turn off CEF).
+    /// </summary>
+    public static readonly CVarDef<bool> WebHeadless =
+        CVarDef.Create("web.headless", false, CVar.CLIENTONLY);
 }

Robust.Client.WebView/WebViewControl.cs

@@ -1,7 +1,6 @@
 using System;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
-using Robust.Client.WebView.Cef;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
@@ -76,13 +75,27 @@ namespace Robust.Client.WebView
             return _controlImpl.RawKeyEvent(guiRawEvent);
         }
 
-        protected internal override void TextEntered(GUITextEventArgs args)
+        protected internal override void TextEntered(GUITextEnteredEventArgs args)
         {
             base.TextEntered(args);
 
             _controlImpl.TextEntered(args);
         }
 
+        protected internal override void KeyboardFocusEntered()
+        {
+            base.KeyboardFocusEntered();
+
+            _controlImpl.FocusEntered();
+        }
+
+        protected internal override void KeyboardFocusExited()
+        {
+            base.KeyboardFocusExited();
+
+            _controlImpl.FocusExited();
+        }
+
         protected override void Resized()
         {
             base.Resized();

Robust.Client.WebView/WebViewManager.cs

@@ -15,22 +15,29 @@ namespace Robust.Client.WebView
     {
         private IWebViewManagerImpl? _impl;
 
-        public void Initialize(GameController.DisplayMode mode)
+        public void PreInitialize(IDependencyCollection dependencies, GameController.DisplayMode mode)
         {
             DebugTools.Assert(_impl == null, "WebViewManager has already been initialized!");
 
-            var cfg = IoCManager.Resolve<IConfigurationManagerInternal>();
+            var cfg = dependencies.Resolve<IConfigurationManagerInternal>();
             cfg.LoadCVarsFromAssembly(typeof(WebViewManager).Assembly);
 
-            IoCManager.RegisterInstance<IWebViewManager>(this);
-            IoCManager.RegisterInstance<IWebViewManagerInternal>(this);
+            dependencies.RegisterInstance<IWebViewManager>(this);
+            dependencies.RegisterInstance<IWebViewManagerInternal>(this);
 
-            if (mode == GameController.DisplayMode.Headless)
+            if (mode == GameController.DisplayMode.Headless || cfg.GetCVar(WCVars.WebHeadless))
                 _impl = new WebViewManagerHeadless();
             else
                 _impl = new WebViewManagerCef();
 
-            _impl.Initialize();
+            dependencies.InjectDependencies(_impl, oneOff: true);
+        }
+
+        public void Initialize()
+        {
+            DebugTools.Assert(_impl != null, "WebViewManager has not yet been initialized!");
+
+            _impl!.Initialize();
         }
 
         public void Update()