Version: 136.0.2

(cherry picked from commit 24d5c26fa6)
(cherry picked from commit b89d13d39ffa53b9ca687946c6b56e86449d50bd)

.github/CODEOWNERS

@@ -1,12 +1,18 @@
 # Last match in file takes precedence.
 
 # Ping for all PRs
-* @PJB3005 @DrSmugleaf
+* @Acruid @PJB3005 @ZoldorfTheWizard
 
-# 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
 
-# Physics
-**/Robust.Shared/Physics/** @metalgearsloth
+# Be they Fluent translations or Freemarker templates, I know them both!
+*.ftl @RemieRichards

.github/workflows/build-docfx.yml

@@ -7,12 +7,12 @@ jobs:
   docfx:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3.6.0
+    - uses: actions/checkout@v2
       with:
         submodules: true
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 7.0.x
 

.github/workflows/build-test.yml

@@ -15,12 +15,12 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3.6.0
+    - uses: actions/checkout@v2
       with:
         submodules: true
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 7.0.x
     - name: Install dependencies

.github/workflows/codeql-analysis.yml

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

.github/workflows/publish-client.yml

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

.github/workflows/test-content.yml

@@ -13,13 +13,13 @@ jobs:
 
     steps:
     - name: Check out content
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v2
       with:
         repository: space-wizards/space-station-14
         submodules: recursive
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 7.0.x
     - name: Disable submodule autoupdate

MSBuild/Robust.DefineConstants.targets

@@ -23,7 +23,7 @@
   <PropertyGroup Condition="'$(FullRelease)' != 'True'">
     <DefineConstants>$(DefineConstants);DEVELOPMENT</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'Tools'">
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DefineConstants>$(DefineConstants);EXCEPTION_TOLERANCE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(EnableClientScripting)' == 'True'">

MSBuild/Robust.Engine.Version.props

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

MSBuild/Robust.Properties.targets

@@ -25,7 +25,4 @@
 
   <!-- analyzer -->
   <Import Project="Robust.Analyzers.targets" Condition="'$(SkipRobustAnalyzer)' != 'true'" />
-
-  <!-- serialization generator -->
-  <Import Project="Robust.Serialization.Generator.targets" />
 </Project>

MSBuild/Robust.Serialization.Generator.targets

@@ -1,5 +0,0 @@
-<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>

Resources/EnginePrototypes/Debug/rotation.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: debugRotation
   abstract: true
-  categories: [ debug ]
+  suffix: DEBUG
   components:
   - type: Sprite
     netsync: false

Resources/EnginePrototypes/UserInterface/uiThemes.yml

@@ -1,6 +1,6 @@
 - type: uiTheme
   id: Default
-  path: /Textures/Interface/Default/
+  path: /Textures/Interface/Default
   colors:
     # Root
     rootBackground: "#000000"

Resources/EnginePrototypes/entityCategory.yml

@@ -1,17 +0,0 @@
-# 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

@@ -558,6 +558,3 @@ cmd-vfs_ls-help = Usage: vfs_list <path>
 
 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/discordRPC.ftl

@@ -1,5 +1,4 @@
 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}
+discord-rpc-players = Players: {$players}/{$maxplayers}

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

@@ -1,8 +0,0 @@
-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,15 +18,6 @@ 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

Resources/Locale/en-US/replays.ftl

@@ -22,7 +22,7 @@ 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-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.
@@ -33,7 +33,7 @@ cmd-replay-error-run-level = You cannot load a replay while connected to a serve
 # 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-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.
@@ -48,7 +48,7 @@ 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.
+cmd-replay-recording-stats-result = Duration: {$time} min, Ticks: {$ticks}, Size: {$size} mb, rate: {$rate} mb/min.
 
 
 # Time Control UI
@@ -56,4 +56,4 @@ 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}
+replay-time-box-tick-label = Tick: {$current} / {$total}

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

@@ -1,423 +0,0 @@
-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/view-variables.ftl

@@ -1,6 +1,5 @@
 ## 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
@@ -9,4 +8,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]

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -23,6 +23,16 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
         "Make sure that methods subscribing to a ref event have the ref keyword for the event argument."
     );
 
+    private static readonly DiagnosticDescriptor ByValueEventSubscribedByRefRule = new(
+        Diagnostics.IdValueEventRaisedByRef,
+        "Value event subscribed to by-ref",
+        "Tried to subscribe to a value event '{0}' by-ref.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure that methods subscribing to value events do not have the ref keyword for the event argument."
+    );
+
     private static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
         Diagnostics.IdByRefEventRaisedByValue,
         "By-ref event raised by value",
@@ -45,6 +55,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
 
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
         ByRefEventSubscribedByValueRule,
+        ByValueEventSubscribedByRefRule,
         ByRefEventRaisedByValueRule,
         ByValueEventRaisedByRefRule
     );
@@ -53,9 +64,71 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     {
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
         context.EnableConcurrentExecution();
+        context.RegisterOperationAction(CheckEventSubscription, OperationKind.Invocation);
         context.RegisterOperationAction(CheckEventRaise, OperationKind.Invocation);
     }
 
+    private void CheckEventSubscription(OperationAnalysisContext context)
+    {
+        if (context.Operation is not IInvocationOperation operation)
+            return;
+
+        var subscribeMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("SubscribeLocalEvent"))
+            .Cast<IMethodSymbol>();
+
+        if (subscribeMethods == null)
+            return;
+
+        if (!subscribeMethods.Any(m => m.Equals(operation.TargetMethod.OriginalDefinition, Default)))
+            return;
+
+        var typeArguments = operation.TargetMethod.TypeArguments;
+        if (typeArguments.Length < 1 || typeArguments.Length > 2)
+            return;
+
+        if (operation.Arguments.First().Value is not IDelegateCreationOperation delegateCreation)
+            return;
+
+        if (delegateCreation.Target is not IMethodReferenceOperation methodReference)
+            return;
+
+        var eventParameter = methodReference.Method.Parameters.LastOrDefault();
+        if (eventParameter == null)
+            return;
+
+        ITypeSymbol eventArgument;
+        switch (typeArguments.Length)
+        {
+            case 1:
+                eventArgument = typeArguments[0];
+                break;
+            case 2:
+                eventArgument = typeArguments[1];
+                break;
+            default:
+                return;
+        }
+
+        var byRefAttribute = context.Compilation.GetTypeByMetadataName(ByRefAttribute);
+        if (byRefAttribute == null)
+            return;
+
+        var isByRefEventType = eventArgument
+            .GetAttributes()
+            .Any(attribute => attribute.AttributeClass?.Equals(byRefAttribute, Default) ?? false);
+        var parameterIsRef = eventParameter.RefKind == RefKind.Ref;
+
+        if (isByRefEventType != parameterIsRef)
+        {
+            var descriptor = isByRefEventType ? ByRefEventSubscribedByValueRule : ByValueEventSubscribedByRefRule;
+            var diagnostic = Diagnostic.Create(descriptor, operation.Syntax.GetLocation(), eventArgument);
+            context.ReportDiagnostic(diagnostic);
+        }
+    }
+
     private void CheckEventRaise(OperationAnalysisContext context)
     {
         if (context.Operation is not IInvocationOperation operation)

Robust.Analyzers/DataDefinitionAnalyzer.cs

@@ -1,293 +0,0 @@
-#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

@@ -1,168 +0,0 @@
-#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

@@ -18,12 +18,9 @@ public static class Diagnostics
     public const string IdInvalidNotNullableFlagType = "RA0011";
     public const string IdNotNullableFlagValueType = "RA0012";
     public const string IdByRefEventSubscribedByValue = "RA0013";
+    public const string IdValueEventSubscribedByRef = "RA0014";
     public const string IdByRefEventRaisedByValue = "RA0015";
     public const string IdValueEventRaisedByRef = "RA0016";
-    public const string IdDataDefinitionPartial = "RA0017";
-    public const string IdNestedDataDefinitionPartial = "RA0018";
-    public const string IdDataFieldWritable = "RA0019";
-    public const string IdDataFieldPropertyWritable = "RA0020";
 
     public static SuppressionDescriptor MeansImplicitAssignment =>
         new SuppressionDescriptor("RADC1000", "CS0649", "Marked as implicitly assigned.");

Robust.Benchmarks/EntityManager/AddRemoveComponentBenchmark.cs

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

Robust.Benchmarks/EntityManager/ComponentIteratorBenchmark.cs

@@ -1,75 +0,0 @@
-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/GetComponentBenchmark.cs

@@ -1,3 +1,4 @@
+using System;
 using BenchmarkDotNet.Attributes;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
@@ -8,7 +9,7 @@ using Robust.UnitTesting.Server;
 namespace Robust.Benchmarks.EntityManager;
 
 [Virtual]
-public partial class GetComponentBenchmark
+public class GetComponentBenchmark
 {
     private ISimulation _simulation = default!;
     private IEntityManager _entityManager = default!;
@@ -54,7 +55,7 @@ public partial class GetComponentBenchmark
     }
 
     [ComponentProtoName("A")]
-    public sealed partial class A : Component
+    public sealed class A : Component
     {
     }
 }

Robust.Benchmarks/EntityManager/SpawnDeleteEntityBenchmark.cs

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

Robust.Benchmarks/Serialization/Definitions/DataDefinitionWithString.cs

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

Robust.Benchmarks/Serialization/Definitions/SealedDataDefinitionWithString.cs

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

Robust.Benchmarks/Serialization/Definitions/SeedDataDefinition.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -11,7 +10,8 @@ namespace Robust.Benchmarks.Serialization.Definitions
     ///     Arbitrarily large data definition for benchmarks.
     ///     Taken from content.
     /// </summary>
-    public sealed partial class SeedDataDefinition : Component
+    [Prototype("seed")]
+    public sealed class SeedDataDefinition : IPrototype
     {
         public const string Prototype = @"
 - type: seed
@@ -106,7 +106,7 @@ namespace Robust.Benchmarks.Serialization.Definitions
     }
 
     [DataDefinition]
-    public partial struct SeedChemQuantity
+    public struct SeedChemQuantity
     {
         [DataField("Min")]
         public int Min;

Robust.Benchmarks/Transform/RecursiveMoveBenchmark.cs

@@ -1,171 +0,0 @@
-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.Client/Audio/AudioStream.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Client.Graphics;
 
 namespace Robust.Client.Audio;
@@ -8,17 +8,13 @@ public sealed class AudioStream
     public TimeSpan Length { get; }
     internal ClydeHandle? ClydeHandle { get; }
     public string? Name { get; }
-    public string? Title { get; }
-    public string? Artist { get; }
     public int ChannelCount { get; }
 
-    internal AudioStream(ClydeHandle handle, TimeSpan length, int channelCount, string? name = null, string? title = null, string? artist = null)
+    internal AudioStream(ClydeHandle handle, TimeSpan length, int channelCount, string? name = null)
     {
         ClydeHandle = handle;
         Length = length;
         ChannelCount = channelCount;
         Name = name;
-        Title = title;
-        Artist = artist;
     }
 }

Robust.Client/Audio/Midi/IMidiRenderer.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using Robust.Client.Graphics;
 using Robust.Shared.Audio.Midi;
 using Robust.Shared.GameObjects;
@@ -17,6 +15,7 @@ public enum MidiRendererStatus : byte
 
 public interface IMidiRenderer : IDisposable
 {
+
     /// <summary>
     ///     The buffered audio source of this renderer.
     /// </summary>
@@ -35,7 +34,6 @@ public interface IMidiRenderer : IDisposable
     /// <summary>
     ///     This increases all note on velocities to 127.
     /// </summary>
-    [Obsolete($"Use {nameof(VelocityOverride)} instead, you can set it to 127 to achieve the same effect.")]
     bool VolumeBoost { get; set; }
 
     /// <summary>
@@ -96,27 +94,6 @@ public interface IMidiRenderer : IDisposable
     /// </summary>
     double SequencerTimeScale { get; }
 
-    /// <summary>
-    ///     Whether this renderer will subscribe to another and copy its events.
-    ///     See <see cref="FilteredChannels"/> to filter specific channels.
-    /// </summary>
-    IMidiRenderer? Master { get; set; }
-
-    // NOTE: Why is the properties below BitArray, you ask?
-    // Well see, MIDI 2.0 supports up to 256(!) channels as opposed to MIDI 1.0's meekly 16 channels...
-    // I'd like us to support MIDI 2.0 one day so I'm just future-proofing here. Also BitArray is cool!
-
-    /// <summary>
-    ///     Allows you to filter out note events from certain channels.
-    ///     Only NoteOn will be filtered.
-    /// </summary>
-    BitArray FilteredChannels { get; }
-
-    /// <summary>
-    ///     Allows you to override all NoteOn velocities. Set to null to disable.
-    /// </summary>
-    byte? VelocityOverride { get; set; }
-
     /// <summary>
     ///     Start listening for midi input.
     /// </summary>
@@ -143,11 +120,6 @@ public interface IMidiRenderer : IDisposable
     /// </summary>
     void StopAllNotes();
 
-    /// <summary>
-    ///     Reset renderer back to a clean state.
-    /// </summary>
-    void SystemReset();
-
     /// <summary>
     /// Clears all scheduled events.
     /// </summary>
@@ -184,7 +156,7 @@ public interface IMidiRenderer : IDisposable
     ///     This is only used if <see cref="Mono"/> is set to True
     ///     and <see cref="TrackingEntity"/> is null.
     /// </summary>
-    MapCoordinates? TrackingCoordinates { get; set; }
+    EntityCoordinates? TrackingCoordinates { get; set; }
 
     MidiRendererState RendererState { get; }
 
@@ -192,8 +164,7 @@ public interface IMidiRenderer : IDisposable
     ///     Send a midi event for the renderer to play.
     /// </summary>
     /// <param name="midiEvent">The midi event to be played</param>
-    /// <param name="raiseEvent">Whether to raise an event for this event.</param>
-    void SendMidiEvent(RobustMidiEvent midiEvent, bool raiseEvent = true);
+    void SendMidiEvent(RobustMidiEvent midiEvent);
 
     /// <summary>
     ///     Schedule a MIDI event to be played at a later time.
@@ -206,7 +177,7 @@ public interface IMidiRenderer : IDisposable
     /// <summary>
     ///     Apply a certain state to the renderer.
     /// </summary>
-    void ApplyState(MidiRendererState state, bool filterChannels = false);
+    void ApplyState(MidiRendererState state);
 
     /// <summary>
     ///     Actually disposes of this renderer. Do NOT use outside the MIDI thread.

Robust.Client/Audio/Midi/MidiManager.cs

@@ -3,27 +3,20 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using System.Threading.Tasks;
 using NFluidsynth;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared;
 using Robust.Shared.Asynchronous;
-using Robust.Shared.Audio.Midi;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Exceptions;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Threading;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
@@ -33,13 +26,6 @@ internal sealed partial class MidiManager : IMidiManager
 {
     public const string SoundfontEnvironmentVariable = "ROBUST_SOUNDFONT_OVERRIDE";
 
-    private int _minRendererParallel;
-    private float _occlusionUpdateDelay;
-    private float _positionUpdateDelay;
-
-    [ViewVariables] private TimeSpan _nextOcclusionUpdate = TimeSpan.Zero;
-    [ViewVariables] private TimeSpan _nextPositionUpdate = TimeSpan.Zero;
-
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly IResourceCacheInternal _resourceManager = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
@@ -47,9 +33,6 @@ internal sealed partial class MidiManager : IMidiManager
     [Dependency] private readonly IClydeAudio _clydeAudio = default!;
     [Dependency] private readonly ITaskManager _taskManager = default!;
     [Dependency] private readonly ILogManager _logger = default!;
-    [Dependency] private readonly IParallelManager _parallel = default!;
-    [Dependency] private readonly IRuntimeLog _runtime = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
 
     private SharedPhysicsSystem _broadPhaseSystem = default!;
 
@@ -76,10 +59,11 @@ internal sealed partial class MidiManager : IMidiManager
         }
     }
 
-    [ViewVariables] private readonly List<IMidiRenderer> _renderers = new();
+    [ViewVariables]
+    private readonly List<IMidiRenderer> _renderers = new();
 
     private bool _alive = true;
-    [ViewVariables] private Settings? _settings;
+    private Settings? _settings;
     private Thread? _midiThread;
     private ISawmill _midiSawmill = default!;
     private float _volume = 0f;
@@ -131,7 +115,7 @@ internal sealed partial class MidiManager : IMidiManager
     private bool _failedInitialize;
 
     private NFluidsynth.Logger.LoggerDelegate _loggerDelegate = default!;
-    private ISawmill _fluidsynthSawmill = default!;
+    private ISawmill _sawmill = default!;
     private float _maxCastLength;
 
     [ViewVariables(VVAccess.ReadWrite)]
@@ -146,28 +130,20 @@ internal sealed partial class MidiManager : IMidiManager
     {
         if (FluidsynthInitialized || _failedInitialize) return;
 
+        _volume = _cfgMan.GetCVar(CVars.MidiVolume);
         _cfgMan.OnValueChanged(CVars.MidiVolume, value =>
         {
             _volume = value;
             _volumeDirty = true;
         }, true);
 
-        _cfgMan.OnValueChanged(CVars.MidiMinRendererParallel,
-            value => _minRendererParallel = value, true);
-
-        _cfgMan.OnValueChanged(CVars.MidiOcclusionUpdateDelay,
-            value => _occlusionUpdateDelay = value, true);
-
-        _cfgMan.OnValueChanged(CVars.MidiPositionUpdateDelay,
-            value => _positionUpdateDelay = value, true);
-
         _midiSawmill = _logger.GetSawmill("midi");
 #if DEBUG
         _midiSawmill.Level = LogLevel.Debug;
 #else
         _midiSawmill.Level = LogLevel.Error;
 #endif
-        _fluidsynthSawmill = _logger.GetSawmill("midi.fluidsynth");
+        _sawmill = _logger.GetSawmill("midi.fluidsynth");
         _loggerDelegate = LoggerDelegate;
 
         if (!_resourceManager.UserData.Exists(CustomSoundfontDirectory))
@@ -191,6 +167,8 @@ internal sealed partial class MidiManager : IMidiManager
             _settings["synth.lock-memory"].IntValue = 0;
             _settings["synth.threadsafe-api"].IntValue = 1;
             _settings["synth.gain"].DoubleValue = 1.0d;
+            _settings["synth.polyphony"].IntValue = 1024;
+            _settings["synth.cpu-cores"].IntValue = 2;
             _settings["synth.midi-channels"].IntValue = 16;
             _settings["synth.overflow.age"].DoubleValue = 3000;
             _settings["audio.driver"].StringValue = "file";
@@ -198,11 +176,8 @@ internal sealed partial class MidiManager : IMidiManager
             _settings["audio.period-size"].IntValue = 4096;
             _settings["midi.autoconnect"].IntValue = 1;
             _settings["player.reset-synth"].IntValue = 0;
-            _settings["synth.midi-channels"].IntValue = Math.Clamp(RobustMidiEvent.MaxChannels, 16, 256);
             _settings["synth.midi-bank-select"].StringValue = "gm";
             //_settings["synth.verbose"].IntValue = 1; // Useful for debugging.
-
-            _parallel.AddAndInvokeParallelCountChanged(UpdateParallelCount);
         }
         catch (Exception e)
         {
@@ -220,18 +195,6 @@ internal sealed partial class MidiManager : IMidiManager
         FluidsynthInitialized = true;
     }
 
-    private void UpdateParallelCount()
-    {
-        if (_settings == null)
-            return;
-
-        _settings["synth.polyphony"].IntValue = Math.Clamp(1024 + (int)(Math.Log2(_parallel.ParallelProcessCount) * 2048), 1, 65535);
-        _settings["synth.cpu-cores"].IntValue = Math.Clamp(_parallel.ParallelProcessCount, 1, 256);
-
-        _midiSawmill.Debug($"Synth Cores: {_settings["synth.cpu-cores"].IntValue}");
-        _midiSawmill.Debug($"Synth Polyphony: {_settings["synth.polyphony"].IntValue}");
-    }
-
     private void OnRaycastLengthChanged(float value)
     {
         _maxCastLength = value;
@@ -248,7 +211,7 @@ internal sealed partial class MidiManager : IMidiManager
             NFluidsynth.Logger.LogLevel.Debug => LogLevel.Debug,
             _ => LogLevel.Debug
         };
-        _fluidsynthSawmill.Log(rLevel, message);
+        _sawmill.Log(rLevel, message);
     }
 
     public IMidiRenderer? GetNewRenderer(bool mono = true)
@@ -275,7 +238,7 @@ internal sealed partial class MidiManager : IMidiManager
 
             var renderer = new MidiRenderer(_settings!, soundfontLoader, mono, this, _clydeAudio, _taskManager, _midiSawmill);
 
-            _midiSawmill.Debug($"Loading fallback soundfont {FallbackSoundfont}");
+            _midiSawmill.Debug($"Loading soundfont {FallbackSoundfont}");
             // Since the last loaded soundfont takes priority, we load the fallback soundfont before the soundfont.
             renderer.LoadSoundfont(FallbackSoundfont);
 
@@ -289,8 +252,8 @@ internal sealed partial class MidiManager : IMidiManager
 
                     try
                     {
-                        _midiSawmill.Debug($"Loading OS soundfont {filepath}");
                         renderer.LoadSoundfont(filepath);
+                        _midiSawmill.Debug($"Loaded Linux soundfont {filepath}");
                     }
                     catch (Exception)
                     {
@@ -304,7 +267,7 @@ internal sealed partial class MidiManager : IMidiManager
             {
                 if (File.Exists(OsxSoundfont) && SoundFont.IsSoundFont(OsxSoundfont))
                 {
-                    _midiSawmill.Debug($"Loading OS soundfont {OsxSoundfont}");
+                    _midiSawmill.Debug($"Loading soundfont {OsxSoundfont}");
                     renderer.LoadSoundfont(OsxSoundfont);
                 }
             }
@@ -312,7 +275,7 @@ internal sealed partial class MidiManager : IMidiManager
             {
                 if (File.Exists(WindowsSoundfont) && SoundFont.IsSoundFont(WindowsSoundfont))
                 {
-                    _midiSawmill.Debug($"Loading OS soundfont {WindowsSoundfont}");
+                    _midiSawmill.Debug($"Loading soundfont {WindowsSoundfont}");
                     renderer.LoadSoundfont(WindowsSoundfont);
                 }
             }
@@ -323,31 +286,27 @@ internal sealed partial class MidiManager : IMidiManager
             {
                 if (File.Exists(soundfontOverride) && SoundFont.IsSoundFont(soundfontOverride))
                 {
-                    _midiSawmill.Debug($"Loading environment variable soundfont {soundfontOverride}");
+                    _midiSawmill.Debug($"Loading soundfont {soundfontOverride} from environment variable.");
                     renderer.LoadSoundfont(soundfontOverride);
                 }
             }
 
             // Load content-specific custom soundfonts, which should override the system/fallback soundfont.
-            _midiSawmill.Debug($"Loading soundfonts from content directory {ContentCustomSoundfontDirectory}");
+            _midiSawmill.Debug($"Loading soundfonts from {ContentCustomSoundfontDirectory}");
             foreach (var file in _resourceManager.ContentFindFiles(ContentCustomSoundfontDirectory))
             {
                 if (file.Extension != "sf2" && file.Extension != "dls" && file.Extension != "sf3") continue;
-                _midiSawmill.Debug($"Loading content soundfont {file}");
+                _midiSawmill.Debug($"Loading soundfont {file}");
                 renderer.LoadSoundfont(file.ToString());
             }
 
-            var userDataPath = _resourceManager.UserData.RootDir == null
-                ? CustomSoundfontDirectory
-                : new ResPath(_resourceManager.UserData.RootDir) / CustomSoundfontDirectory.ToRelativePath();
-
             // Load every soundfont from the user data directory last, since those may override any other soundfont.
-            _midiSawmill.Debug($"Loading soundfonts from user data directory {userDataPath}");
-            var enumerator = _resourceManager.UserData.Find($"{CustomSoundfontDirectory.ToRelativePath()}*").Item1;
+            _midiSawmill.Debug($"Loading soundfonts from {{USERDATA}} {CustomSoundfontDirectory}");
+            var enumerator = _resourceManager.UserData.Find($"{CustomSoundfontDirectory.ToRelativePath()}/*").Item1;
             foreach (var file in enumerator)
             {
                 if (file.Extension != "sf2" && file.Extension != "dls" && file.Extension != "sf3") continue;
-                _midiSawmill.Debug($"Loading user soundfont {file}");
+                _midiSawmill.Debug($"Loading soundfont {{USERDATA}} {file}");
                 renderer.LoadSoundfont(file.ToString());
             }
 
@@ -377,108 +336,72 @@ internal sealed partial class MidiManager : IMidiManager
 
         lock (_renderers)
         {
-            if (_renderers.Count == 0)
-                return;
-
-            var transQuery = _entityManager.GetEntityQuery<TransformComponent>();
-            var physicsQuery = _entityManager.GetEntityQuery<PhysicsComponent>();
-            var opts = new ParallelOptions { MaxDegreeOfParallelism = _parallel.ParallelProcessCount };
-
-            if (_renderers.Count > _minRendererParallel)
+            foreach (var renderer in _renderers)
             {
-                Parallel.ForEach(_renderers, opts, renderer => UpdateRenderer(renderer, transQuery, physicsQuery));
-            }
-            else
-            {
-                foreach (var renderer in _renderers)
+                if (renderer.Disposed)
+                    continue;
+
+                if(_volumeDirty)
+                    renderer.Source.SetVolume(Volume);
+
+                if (!renderer.Mono)
                 {
-                    UpdateRenderer(renderer, transQuery, physicsQuery);
+                    renderer.Source.SetGlobal();
+                    continue;
+                }
+
+                MapCoordinates? mapPos = null;
+                var trackingEntity = renderer.TrackingEntity != null && !_entityManager.Deleted(renderer.TrackingEntity);
+                if (trackingEntity)
+                {
+                    renderer.TrackingCoordinates = _entityManager.GetComponent<TransformComponent>(renderer.TrackingEntity!.Value).Coordinates;
+                }
+
+                if (renderer.TrackingCoordinates != null)
+                {
+                    mapPos = renderer.TrackingCoordinates.Value.ToMap(_entityManager);
+                }
+
+                if (mapPos != null && mapPos.Value.MapId == _eyeManager.CurrentMap)
+                {
+                    var pos = mapPos.Value;
+
+                    var sourceRelative = pos.Position - _eyeManager.CurrentEye.Position.Position;
+                    var occlusion = 0f;
+                    if (sourceRelative.Length() > 0)
+                    {
+                        occlusion = _broadPhaseSystem.IntersectRayPenetration(
+                            pos.MapId,
+                            new CollisionRay(
+                                _eyeManager.CurrentEye.Position.Position,
+                                sourceRelative.Normalized(),
+                                OcclusionCollisionMask),
+                            MathF.Min(sourceRelative.Length(), _maxCastLength),
+                            renderer.TrackingEntity);
+                    }
+
+                    renderer.Source.SetOcclusion(occlusion);
+
+                    if (!renderer.Source.SetPosition(pos.Position))
+                    {
+                        return;
+                    }
+
+                    if (trackingEntity)
+                    {
+                        var vel = _broadPhaseSystem.GetMapLinearVelocity(renderer.TrackingEntity!.Value);
+                        renderer.Source.SetVelocity(vel);
+                    }
+                }
+                else
+                {
+                    renderer.Source.SetOcclusion(float.MaxValue);
                 }
             }
-
         }
 
-        if (_nextOcclusionUpdate < _timing.RealTime)
-            _nextOcclusionUpdate = _timing.RealTime.Add(TimeSpan.FromSeconds(_occlusionUpdateDelay));
-
-        if (_nextPositionUpdate < _timing.RealTime)
-            _nextPositionUpdate = _timing.RealTime.Add(TimeSpan.FromSeconds(_positionUpdateDelay));
-
         _volumeDirty = false;
     }
-    private void UpdateRenderer(IMidiRenderer renderer, EntityQuery<TransformComponent> transQuery,
-        EntityQuery<PhysicsComponent> physicsQuery)
-    {
-        try
-        {
-            if (renderer.Disposed)
-                return;
-
-            if (_volumeDirty)
-                renderer.Source.SetVolume(Volume);
-
-            if (!renderer.Mono)
-            {
-                renderer.Source.SetGlobal();
-                return;
-            }
-
-            if (_nextPositionUpdate < _timing.RealTime)
-            {
-                if (renderer.TrackingEntity is {} trackedEntity && !_entityManager.Deleted(trackedEntity))
-                {
-                    renderer.TrackingCoordinates = transQuery.GetComponent(renderer.TrackingEntity!.Value).MapPosition;
-                }
-                else if (renderer.TrackingCoordinates == null)
-                {
-                    return;
-                }
-
-                if (!renderer.Source.SetPosition(renderer.TrackingCoordinates.Value.Position))
-                {
-                    return;
-                }
-
-                var vel = _broadPhaseSystem.GetMapLinearVelocity(renderer.TrackingEntity!.Value,
-                    xformQuery: transQuery, physicsQuery: physicsQuery);
-                renderer.Source.SetVelocity(vel);
-            }
-
-            if (renderer.TrackingCoordinates != null && renderer.TrackingCoordinates.Value.MapId == _eyeManager.CurrentMap)
-            {
-                if (_nextOcclusionUpdate >= _timing.RealTime)
-                    return;
-
-                var pos = renderer.TrackingCoordinates.Value;
-
-                var sourceRelative = pos.Position - _eyeManager.CurrentEye.Position.Position;
-                var occlusion = 0f;
-                if (sourceRelative.Length() > 0)
-                {
-                    occlusion = _broadPhaseSystem.IntersectRayPenetration(
-                        pos.MapId,
-                        new CollisionRay(
-                            _eyeManager.CurrentEye.Position.Position,
-                            sourceRelative.Normalized(),
-                            OcclusionCollisionMask),
-                        MathF.Min(sourceRelative.Length(), _maxCastLength),
-                        renderer.TrackingEntity);
-                }
-
-                renderer.Source.SetOcclusion(occlusion);
-            }
-            else
-            {
-                renderer.Source.SetOcclusion(float.MaxValue);
-            }
-
-        }
-        catch (Exception ex)
-        {
-            _runtime.LogException(ex, _midiSawmill.Name);
-        }
-
-    }
 
     /// <summary>
     ///     Main method for the thread rendering the midi audio.
@@ -493,12 +416,7 @@ internal sealed partial class MidiManager : IMidiManager
                 {
                     var renderer = _renderers[i];
                     if (!renderer.Disposed)
-                    {
-                        if (renderer.Master is { Disposed: true })
-                            renderer.Master = null;
-
                         renderer.Render();
-                    }
                     else
                     {
                         renderer.InternalDispose();

Robust.Client/Audio/Midi/MidiRenderer.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using JetBrains.Annotations;
 using NFluidsynth;
 using Robust.Client.Graphics;
 using Robust.Shared.Asynchronous;
@@ -11,6 +9,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
+using Logger = Robust.Shared.Log.Logger;
 
 namespace Robust.Client.Audio.Midi;
 
@@ -22,13 +21,14 @@ internal sealed class MidiRenderer : IMidiRenderer
     // TODO: Make this a replicated CVar in MidiManager
     private const int MidiSizeLimit = 2000000;
     private const double BytesToMegabytes = 0.000001d;
-    private const int ChannelCount = RobustMidiEvent.MaxChannels;
+    private const int ChannelCount = 16;
 
     private readonly ISawmill _midiSawmill;
 
     private readonly Settings _settings;
 
-    [ViewVariables(VVAccess.ReadWrite)] private bool _debugEvents = false;
+    [ViewVariables(VVAccess.ReadWrite)]
+    private bool _debugEvents = false;
 
     // Kept around to avoid the loader callbacks getting GC'd
     // ReSharper disable once NotAccessedField.Local
@@ -48,9 +48,8 @@ internal sealed class MidiRenderer : IMidiRenderer
     private readonly SequencerClientId _robustRegister;
     private readonly SequencerClientId _debugRegister;
 
-    [ViewVariables] private MidiRendererState _rendererState = new();
-
-    private IMidiRenderer? _master;
+    [ViewVariables]
+    private MidiRendererState _rendererState = new();
     public MidiRendererState RendererState => _rendererState;
     public IClydeBufferedAudioSource Source { get; set; }
     IClydeBufferedAudioSource IMidiRenderer.Source => Source;
@@ -71,8 +70,8 @@ internal sealed class MidiRenderer : IMidiRenderer
             {
                 for (byte i = 0; i < ChannelCount; i++)
                 {
-                    // Don't change percussion channel instrument.
-                    if (i == RobustMidiEvent.PercussionChannel)
+                    // Channel 9 is the percussion channel. Let's not change its instrument...
+                    if (i == 9)
                         continue;
 
                     SendMidiEvent(RobustMidiEvent.ProgramChange(i, value, SequencerTick));
@@ -97,14 +96,11 @@ internal sealed class MidiRenderer : IMidiRenderer
             {
                 for (byte i = 0; i < ChannelCount; i++)
                 {
-                    // Don't change percussion channel bank.
-                    if (i == RobustMidiEvent.PercussionChannel)
+                    // Channel 9 is the percussion channel. Let's not change its bank...
+                    if (i == 9)
                         continue;
 
                     SendMidiEvent(RobustMidiEvent.BankSelect(i, value, SequencerTick));
-
-                    // Re-select program.
-                    SendMidiEvent(RobustMidiEvent.ProgramChange(i, _midiProgram, SequencerTick));
                 }
             }
 
@@ -132,11 +128,7 @@ internal sealed class MidiRenderer : IMidiRenderer
     }
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public bool DisablePercussionChannel
-    {
-        get => FilteredChannels[RobustMidiEvent.PercussionChannel];
-        set => FilteredChannels[RobustMidiEvent.PercussionChannel] = value;
-    }
+    public bool DisablePercussionChannel { get; set; } = true;
 
     [ViewVariables(VVAccess.ReadWrite)]
     public bool DisableProgramChangeEvent { get; set; } = true;
@@ -189,62 +181,13 @@ internal sealed class MidiRenderer : IMidiRenderer
     }
 
     [ViewVariables(VVAccess.ReadWrite)]
-    [Obsolete($"Use {nameof(VelocityOverride)} instead, you can set it to 127 to achieve the same effect.")]
-    public bool VolumeBoost
-    {
-        get => VelocityOverride == 127;
-        set => VelocityOverride = value ? 127 : null;
-    }
+    public bool VolumeBoost { get; set; }
 
     [ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? TrackingEntity { get; set; } = null;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public MapCoordinates? TrackingCoordinates { get; set; } = null;
-
-    [ViewVariables]
-    public BitArray FilteredChannels { get; } = new(RobustMidiEvent.MaxChannels);
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    public byte? VelocityOverride { get; set; } = null;
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    public IMidiRenderer? Master
-    {
-        get => _master;
-        set
-        {
-            if (value == _master)
-                return;
-
-            if (_master is { Disposed: false })
-            {
-                try
-                {
-                    _master.OnMidiEvent -= SendMidiEvent;
-                }
-                catch
-                {
-                    // ignored
-                }
-            }
-
-            _master = value;
-
-            if (_master == null)
-                return;
-
-            _master.OnMidiEvent += SendMidiEvent;
-            ApplyState(_master.RendererState, true);
-            MidiBank = _midiBank;
-        }
-    }
-
-    [ViewVariables, UsedImplicitly]
-    private double CpuLoad => !_synth.Disposed ? _synth.CpuLoad : 0;
-
-    public event Action<RobustMidiEvent>? OnMidiEvent;
-    public event Action? OnMidiPlayerFinished;
+    public EntityCoordinates? TrackingCoordinates { get; set; } = null;
 
     internal MidiRenderer(Settings settings, SoundFontLoader soundFontLoader, bool mono,
         IMidiManager midiManager, IClydeAudio clydeAudio, ITaskManager taskManager, ISawmill midiSawmill)
@@ -411,11 +354,6 @@ internal sealed class MidiRenderer : IMidiRenderer
         }
     }
 
-    public void SystemReset()
-    {
-        SendMidiEvent(RobustMidiEvent.SystemReset(SequencerTick));
-    }
-
     public void ClearAllEvents()
     {
         _sequencer.RemoveEvents(SequencerClientId.Wildcard, SequencerClientId.Wildcard, -1);
@@ -430,6 +368,9 @@ internal sealed class MidiRenderer : IMidiRenderer
         }
     }
 
+    public event Action<RobustMidiEvent>? OnMidiEvent;
+    public event Action? OnMidiPlayerFinished;
+
     void IMidiRenderer.Render()
     {
         Render();
@@ -491,7 +432,7 @@ internal sealed class MidiRenderer : IMidiRenderer
         if (!Source.IsPlaying) Source.StartPlaying();
     }
 
-    public void ApplyState(MidiRendererState state, bool filterChannels = false)
+    public void ApplyState(MidiRendererState state)
     {
         lock (_playerStateLock)
         {
@@ -499,9 +440,6 @@ internal sealed class MidiRenderer : IMidiRenderer
 
             for (var channel = 0; channel < ChannelCount; channel++)
             {
-                if (filterChannels && !FilteredChannels[channel])
-                    continue;
-
                 _synth.AllNotesOff(channel);
 
                 _synth.PitchBend(channel, state.PitchBend.AsSpan[channel]);
@@ -524,8 +462,7 @@ internal sealed class MidiRenderer : IMidiRenderer
                     }
                 }
 
-                var program = DisableProgramChangeEvent ? MidiProgram : state.Program.AsSpan[channel];
-                _synth.ProgramChange(channel, program);
+                _synth.ProgramChange(channel, state.Program.AsSpan[channel]);
 
                 for (var key = 0; key < state.NoteVelocities.AsSpan[channel].AsSpan.Length; key++)
                 {
@@ -550,12 +487,7 @@ internal sealed class MidiRenderer : IMidiRenderer
         }
     }
 
-    private void SendMidiEvent(RobustMidiEvent midiEvent)
-    {
-        SendMidiEvent(midiEvent, true);
-    }
-
-    public void SendMidiEvent(RobustMidiEvent midiEvent, bool raiseEvent)
+    public void SendMidiEvent(RobustMidiEvent midiEvent)
     {
         if (Disposed)
             return;
@@ -573,10 +505,11 @@ internal sealed class MidiRenderer : IMidiRenderer
                         break;
 
                     case RobustMidiCommand.NoteOn:
-                        if (FilteredChannels[midiEvent.Channel])
-                            break;
+                        // Channel 9 is the percussion channel. We only block NoteOn events to it.
+                        if (DisablePercussionChannel && midiEvent.Channel == 9)
+                            return;
 
-                        var velocity = VelocityOverride ?? midiEvent.Velocity;
+                        var velocity = (byte)(VolumeBoost ? 127 : midiEvent.Velocity);
 
                         _rendererState.NoteVelocities.AsSpan[midiEvent.Channel].AsSpan[midiEvent.Key] = velocity;
                         _synth.NoteOn(midiEvent.Channel, midiEvent.Key, velocity);
@@ -590,7 +523,7 @@ internal sealed class MidiRenderer : IMidiRenderer
                     case RobustMidiCommand.ControlChange:
                         // CC0 is bank selection
                         if (midiEvent.Control == 0x0 && DisableProgramChangeEvent)
-                            break;
+                            return;
 
                         _rendererState.Controllers.AsSpan[midiEvent.Channel].AsSpan[midiEvent.Control] = midiEvent.Value;
                         if(midiEvent.Control != 0x0)
@@ -601,7 +534,7 @@ internal sealed class MidiRenderer : IMidiRenderer
 
                     case RobustMidiCommand.ProgramChange:
                         if (DisableProgramChangeEvent)
-                            break;
+                            return;
 
                         _rendererState.Program.AsSpan[midiEvent.Channel] = midiEvent.Program;
                         _synth.ProgramChange(midiEvent.Channel, midiEvent.Program);
@@ -628,14 +561,14 @@ internal sealed class MidiRenderer : IMidiRenderer
                         switch (midiEvent.Control)
                         {
                             case 0x0 when midiEvent.Status == 0xFF:
-                                _rendererState = new MidiRendererState();
+                                _rendererState = new ();
                                 _synth.SystemReset();
 
                                 // Reset the instrument to the one we were using.
                                 if (DisableProgramChangeEvent)
                                 {
-                                    MidiBank = _midiBank;
                                     MidiProgram = _midiProgram;
+                                    MidiBank = _midiBank;
                                 }
 
                                 break;
@@ -664,10 +597,7 @@ internal sealed class MidiRenderer : IMidiRenderer
             //_midiSawmill.Error("Exception while sending midi event of type {0}: {1}", midiEvent.Type, e, midiEvent);
         }
 
-        if (raiseEvent)
-        {
-            _taskManager.RunOnMainThread(() => OnMidiEvent?.Invoke(midiEvent));
-        }
+        _taskManager.RunOnMainThread(() => OnMidiEvent?.Invoke(midiEvent));
     }
 
     public void ScheduleMidiEvent(RobustMidiEvent midiEvent, uint time, bool absolute = false)
@@ -703,9 +633,6 @@ internal sealed class MidiRenderer : IMidiRenderer
     /// <inheritdoc />
     void IMidiRenderer.InternalDispose()
     {
-        OnMidiEvent = null;
-        OnMidiPlayerFinished = null;
-
         Source?.Dispose();
         _driver?.Dispose();
 

Robust.Client/Audio/Midi/MidiRendererState.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
 using Robust.Shared.Utility;
-using Robust.Shared.ViewVariables;
 
 namespace Robust.Client.Audio.Midi;
 
@@ -13,7 +12,7 @@ public struct MidiRendererState
     internal FixedArray16<byte> ChannelPressure;
     internal FixedArray16<ushort> PitchBend;
 
-    [ViewVariables] internal Span<byte> AsSpan => MemoryMarshal.CreateSpan(ref NoteVelocities._00._00, 4160);
+    internal Span<byte> AsSpan => MemoryMarshal.CreateSpan(ref NoteVelocities._00._00, 4160);
 
     static unsafe MidiRendererState()
     {

Robust.Client/BaseClient.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Linq;
 using System.Net;
 using Robust.Client.Configuration;
+using Robust.Client.Debugging;
 using Robust.Client.GameObjects;
 using Robust.Client.GameStates;
 using Robust.Client.Player;
@@ -8,12 +10,13 @@ using Robust.Client.Utility;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -62,12 +65,12 @@ namespace Robust.Client
 
             _configManager.OnValueChanged(CVars.NetTickrate, TickRateChanged, invokeImmediately: true);
 
-            _playMan.Initialize(0);
+            _playMan.Initialize();
             _playMan.PlayerListUpdated += OnPlayerListUpdated;
             Reset();
         }
 
-        private void OnPlayerListUpdated()
+        private void OnPlayerListUpdated(object? sender, EventArgs e)
         {
             var serverPlayers = _playMan.PlayerCount;
             if (_net.ServerChannel != null && GameInfo != null && _net.IsConnected)
@@ -127,10 +130,9 @@ namespace Robust.Client
         {
             DebugTools.Assert(RunLevel < ClientRunLevel.Connecting);
             DebugTools.Assert(!_net.IsConnected);
-            var name = PlayerNameOverride ?? _configManager.GetCVar(CVars.PlayerName);
-            _playMan.SetupSinglePlayer(name);
+            _playMan.Startup();
+            _playMan.LocalPlayer!.Name = PlayerNameOverride ?? _configManager.GetCVar(CVars.PlayerName);
             OnRunLevelChanged(ClientRunLevel.SinglePlayerGame);
-            _playMan.JoinGame(_playMan.LocalSession!);
             GameStartedSetup();
         }
 
@@ -171,14 +173,22 @@ namespace Robust.Client
                 info.ServerName = serverName;
             }
 
-            var channel = _net.ServerChannel!;
+            var maxPlayers = _configManager.GetCVar<int>("game.maxplayers");
+            info.ServerMaxPlayers = maxPlayers;
+
+            var userName = _net.ServerChannel!.UserName;
+            var userId = _net.ServerChannel.UserId;
 
             // start up player management
-            _playMan.SetupMultiplayer(channel);
-            _playMan.PlayerStatusChanged += OnStatusChanged;
+            _playMan.Startup();
+
+            _playMan.LocalPlayer!.UserId = userId;
+            _playMan.LocalPlayer.Name = userName;
+
+            _playMan.LocalPlayer.StatusChanged += OnLocalStatusChanged;
 
             var serverPlayers = _playMan.PlayerCount;
-            _discord.Update(info.ServerName, channel.UserName, info.ServerMaxPlayers.ToString(), serverPlayers.ToString());
+            _discord.Update(info.ServerName, userName, info.ServerMaxPlayers.ToString(), serverPlayers.ToString());
 
         }
 
@@ -211,8 +221,6 @@ namespace Robust.Client
 
         private void Reset()
         {
-            _configManager.ReceivedInitialNwVars -= OnReceivedClientData;
-            _playMan.PlayerStatusChanged -= OnStatusChanged;
             _configManager.ClearReceivedInitialNwVars();
             OnRunLevelChanged(ClientRunLevel.Initialize);
         }
@@ -255,17 +263,19 @@ namespace Robust.Client
             Reset();
         }
 
-        private void OnStatusChanged(object? sender, SessionStatusEventArgs e)
+        private void OnLocalStatusChanged(object? obj, StatusEventArgs eventArgs)
         {
-            if (e.Session != _playMan.LocalSession)
-                return;
-
             // player finished fully connecting to the server.
             // OldStatus is used here because it can go from connecting-> connected or connecting-> ingame
-            if (e.OldStatus == SessionStatus.Connecting)
-                OnPlayerJoinedServer(e.Session);
-            else if (e.NewStatus == SessionStatus.InGame)
-                OnPlayerJoinedGame(e.Session);
+            if (eventArgs.OldStatus == SessionStatus.Connecting)
+            {
+                OnPlayerJoinedServer(_playMan.LocalPlayer!.Session);
+            }
+
+            if (eventArgs.NewStatus == SessionStatus.InGame)
+            {
+                OnPlayerJoinedGame(_playMan.LocalPlayer!.Session);
+            }
         }
 
         private void OnRunLevelChanged(ClientRunLevel newRunLevel)

Robust.Client/ClientIoC.cs

@@ -37,7 +37,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Physics;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
 using Robust.Shared.Replays;
@@ -68,7 +68,6 @@ namespace Robust.Client
             deps.Register<IComponentFactory, ComponentFactory>();
             deps.Register<ITileDefinitionManager, ClydeTileDefinitionManager>();
             deps.Register<IClydeTileDefinitionManager, ClydeTileDefinitionManager>();
-            deps.Register<ClydeTileDefinitionManager, ClydeTileDefinitionManager>();
             deps.Register<GameController, GameController>();
             deps.Register<IGameController, GameController>();
             deps.Register<IGameControllerInternal, GameController>();
@@ -85,7 +84,6 @@ namespace Robust.Client
             deps.Register<IReplayLoadManager, ReplayLoadManager>();
             deps.Register<IReplayPlaybackManager, ReplayPlaybackManager>();
             deps.Register<IReplayRecordingManager, ReplayRecordingManager>();
-            deps.Register<IReplayRecordingManagerInternal, ReplayRecordingManager>();
             deps.Register<IClientGameStateManager, ClientGameStateManager>();
             deps.Register<IBaseClient, BaseClient>();
             deps.Register<IPlayerManager, PlayerManager>();

Robust.Client/ComponentTrees/LightTreeComponent.cs

@@ -2,13 +2,11 @@ using Robust.Client.GameObjects;
 using Robust.Shared.ComponentTrees;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics;
-using Robust.Shared.ViewVariables;
 
 namespace Robust.Client.ComponentTrees;
 
 [RegisterComponent]
-public sealed partial class LightTreeComponent: Component, IComponentTreeComponent<PointLightComponent>
+public sealed class LightTreeComponent: Component, IComponentTreeComponent<PointLightComponent>
 {
-    [ViewVariables]
     public DynamicTree<ComponentTreeEntry<PointLightComponent>> Tree { get; set; } = default!;
 }

Robust.Client/ComponentTrees/SpriteTreeComponent.cs

@@ -6,7 +6,7 @@ using Robust.Shared.Physics;
 namespace Robust.Client.ComponentTrees;
 
 [RegisterComponent]
-public sealed partial class SpriteTreeComponent: Component, IComponentTreeComponent<SpriteComponent>
+public sealed class SpriteTreeComponent: Component, IComponentTreeComponent<SpriteComponent>
 {
     public DynamicTree<ComponentTreeEntry<SpriteComponent>> Tree { get; set; } = default!;
 }

Robust.Client/Console/ClientConsoleHost.Completions.cs

@@ -14,7 +14,7 @@ internal sealed partial class ClientConsoleHost
     private int _completionSeq;
 
 
-    public async Task<CompletionResult> GetCompletions(List<string> args, string argStr, CancellationToken cancel)
+    public async Task<CompletionResult> GetCompletions(List<string> args, CancellationToken cancel)
     {
         // Last element is the command currently being typed. May be empty.
 
@@ -24,10 +24,10 @@ internal sealed partial class ClientConsoleHost
         if (delay > 0)
             await Task.Delay((int)(delay * 1000), cancel);
 
-        return await CalcCompletions(args, argStr, cancel);
+        return await CalcCompletions(args, cancel);
     }
 
-    private Task<CompletionResult> CalcCompletions(List<string> args, string argStr, CancellationToken cancel)
+    private Task<CompletionResult> CalcCompletions(List<string> args, CancellationToken cancel)
     {
         if (args.Count == 1)
         {
@@ -44,10 +44,10 @@ internal sealed partial class ClientConsoleHost
         if (!AvailableCommands.TryGetValue(args[0], out var cmd))
             return Task.FromResult(CompletionResult.Empty);
 
-        return cmd.GetCompletionAsync(LocalShell, args.ToArray()[1..], argStr, cancel).AsTask();
+        return cmd.GetCompletionAsync(LocalShell, args.ToArray()[1..], cancel).AsTask();
     }
 
-    private Task<CompletionResult> DoServerCompletions(List<string> args, string argStr, CancellationToken cancel)
+    private Task<CompletionResult> DoServerCompletions(List<string> args, CancellationToken cancel)
     {
         var tcs = new TaskCompletionSource<CompletionResult>();
         var cts = CancellationTokenSource.CreateLinkedTokenSource(cancel);
@@ -62,7 +62,6 @@ internal sealed partial class ClientConsoleHost
         var msg = new MsgConCompletion
         {
             Args = args.ToArray(),
-            ArgString = argStr,
             Seq = seq
         };
 

Robust.Client/Console/ClientConsoleHost.cs

@@ -10,10 +10,9 @@ using Robust.Shared.Console;
 using Robust.Shared.Enums;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
-using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Reflection;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
@@ -22,13 +21,13 @@ namespace Robust.Client.Console
 {
     public sealed class AddStringArgs : EventArgs
     {
-        public FormattedMessage Text { get; }
+        public string Text { get; }
 
         public bool Local { get; }
 
         public bool Error { get; }
 
-        public AddStringArgs(FormattedMessage text, bool local, bool error)
+        public AddStringArgs(string text, bool local, bool error)
         {
             Text = text;
             Local = local;
@@ -133,17 +132,10 @@ namespace Robust.Client.Console
             AddFormatted?.Invoke(this, new AddFormattedMessageArgs(message));
         }
 
-        public override void WriteLine(ICommonSession? session, FormattedMessage msg)
-        {
-            AddFormattedLine(msg);
-        }
-
         /// <inheritdoc />
         public override void WriteError(ICommonSession? session, string text)
         {
-            var msg = new FormattedMessage();
-            msg.AddText(text);
-            OutputText(msg, true, true);
+            OutputText(text, true, true);
         }
 
         public bool IsCmdServer(IConsoleCommand cmd)
@@ -159,13 +151,8 @@ namespace Robust.Client.Console
             if (string.IsNullOrWhiteSpace(command))
                 return;
 
-            WriteLine(null, "");
-            var msg = new FormattedMessage();
-            msg.PushColor(Color.Gold);
-            msg.AddText("> " + command);
-            msg.Pop();
             // echo the command locally
-            OutputText(msg, true, false);
+            WriteLine(null, "> " + command);
 
             //Commands are processed locally and then sent to the server to be processed there again.
             var args = new List<string>();
@@ -218,9 +205,7 @@ namespace Robust.Client.Console
         /// <inheritdoc />
         public override void WriteLine(ICommonSession? session, string text)
         {
-            var msg = new FormattedMessage();
-            msg.AddText(text);
-            OutputText(msg, true, false);
+            OutputText(text, true, false);
         }
 
         /// <inheritdoc />
@@ -229,12 +214,12 @@ namespace Robust.Client.Console
             // We don't have anything to dispose.
         }
 
-        private void OutputText(FormattedMessage text, bool local, bool error)
+        private void OutputText(string text, bool local, bool error)
         {
             AddString?.Invoke(this, new AddStringArgs(text, local, error));
 
             var level = error ? LogLevel.Warning : LogLevel.Info;
-            _conLogger.Log(level, text.ToString());
+            _conLogger.Log(level, text);
         }
 
         private void OnNetworkConnected(object? sender, NetChannelArgs netChannelArgs)
@@ -244,7 +229,7 @@ namespace Robust.Client.Console
 
         private void HandleConCmdAck(MsgConCmdAck msg)
         {
-            OutputText(msg.Text, false, msg.Error);
+            OutputText("< " + msg.Text, false, msg.Error);
         }
 
         private void HandleConCmdReg(MsgConCmdReg msg)
@@ -318,14 +303,13 @@ namespace Robust.Client.Console
             public async ValueTask<CompletionResult> GetCompletionAsync(
                 IConsoleShell shell,
                 string[] args,
-                string argStr,
                 CancellationToken cancel)
             {
                 var host = (ClientConsoleHost)shell.ConsoleHost;
                 var argsList = args.ToList();
                 argsList.Insert(0, Command);
 
-                return await host.DoServerCompletions(argsList, argStr, cancel);
+                return await host.DoServerCompletions(argsList, cancel);
             }
         }
 
@@ -343,11 +327,10 @@ namespace Robust.Client.Console
             public override async ValueTask<CompletionResult> GetCompletionAsync(
                 IConsoleShell shell,
                 string[] args,
-                string argStr,
                 CancellationToken cancel)
             {
                 var host = (ClientConsoleHost)shell.ConsoleHost;
-                return await host.DoServerCompletions(args.ToList(), argStr[">".Length..], cancel);
+                return await host.DoServerCompletions(args.ToList(), cancel);
             }
         }
     }

Robust.Client/Console/Commands/AddCompCommand.cs

@@ -22,11 +22,13 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            var netEntity = NetEntity.Parse(args[0]);
-            var entity = _entityManager.GetEntity(netEntity);
+            var entity = EntityUid.Parse(args[0]);
             var componentName = args[1];
 
-            var component = _componentFactory.GetComponent(componentName);
+            var component = (Component) _componentFactory.GetComponent(componentName);
+
+            component.Owner = entity;
+
             _entityManager.AddComponent(entity, component);
         }
     }
@@ -47,8 +49,7 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            var netEntity = NetEntity.Parse(args[0]);
-            var entityUid = _entityManager.GetEntity(netEntity);
+            var entityUid = EntityUid.Parse(args[0]);
             var componentName = args[1];
 
             var registration = _componentFactory.GetRegistration(componentName);

Robust.Client/Console/Commands/Debug.cs

@@ -78,7 +78,14 @@ namespace Robust.Client.Console.Commands
                     message.Append($"net ID: {registration.NetID}");
                 }
 
+                message.Append($", References:");
+
                 shell.WriteLine(message.ToString());
+
+                foreach (var type in registration.References)
+                {
+                    shell.WriteLine($"  {type}");
+                }
             }
             catch (UnknownComponentException)
             {
@@ -289,7 +296,6 @@ namespace Robust.Client.Console.Commands
 
     internal sealed class SnapGridGetCell : LocalizedCommands
     {
-        [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IMapManager _map = default!;
 
         public override string Command => "sggcell";
@@ -304,7 +310,7 @@ namespace Robust.Client.Console.Commands
 
             string indices = args[1];
 
-            if (!NetEntity.TryParse(args[0], out var gridNet))
+            if (!EntityUid.TryParse(args[0], out var gridUid))
             {
                 shell.WriteError($"{args[0]} is not a valid entity UID.");
                 return;
@@ -316,7 +322,7 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            if (_map.TryGetGrid(_entManager.GetEntity(gridNet), out var grid))
+            if (_map.TryGetGrid(gridUid, out var grid))
             {
                 foreach (var entity in grid.GetAnchoredEntities(new Vector2i(
                              int.Parse(indices.Split(',')[0], CultureInfo.InvariantCulture),
@@ -424,7 +430,6 @@ namespace Robust.Client.Console.Commands
 
     internal sealed class GridTileCount : LocalizedCommands
     {
-        [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IMapManager _map = default!;
 
         public override string Command => "gridtc";
@@ -437,8 +442,7 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            if (!NetEntity.TryParse(args[0], out var gridUidNet) ||
-                !_entManager.TryGetEntity(gridUidNet, out var gridUid))
+            if (!EntityUid.TryParse(args[0], out var gridUid))
             {
                 shell.WriteLine($"{args[0]} is not a valid entity UID.");
                 return;
@@ -617,7 +621,6 @@ namespace Robust.Client.Console.Commands
 
     internal sealed class ChunkInfoCommand : LocalizedCommands
     {
-        [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IMapManager _map = default!;
         [Dependency] private readonly IEyeManager _eye = default!;
         [Dependency] private readonly IInputManager _input = default!;
@@ -626,19 +629,18 @@ namespace Robust.Client.Console.Commands
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var mousePos = _eye.PixelToMap(_input.MouseScreenPosition);
+            var mousePos = _eye.ScreenToMap(_input.MouseScreenPosition);
 
-            if (!_map.TryFindGridAt(mousePos, out var gridUid, out var grid))
+            if (!_map.TryFindGridAt(mousePos, out _, out var grid))
             {
                 shell.WriteLine("No grid under your mouse cursor.");
                 return;
             }
 
-            var mapSystem = _entManager.System<SharedMapSystem>();
-            var chunkIndex = mapSystem.LocalToChunkIndices(gridUid, grid, grid.MapToGrid(mousePos));
-            var chunk = mapSystem.GetOrAddChunk(gridUid, grid, chunkIndex);
+            var chunkIndex = grid.LocalToChunkIndices(grid.MapToGrid(mousePos));
+            var chunk = grid.GetOrAddChunk(chunkIndex);
 
-            shell.WriteLine($"worldBounds: {mapSystem.CalcWorldAABB(gridUid, grid, chunk)} localBounds: {chunk.CachedBounds}");
+            shell.WriteLine($"worldBounds: {grid.CalcWorldAABB(chunk)} localBounds: {chunk.CachedBounds}");
         }
     }
 

Robust.Client/Console/IClientConsoleHost.cs

@@ -19,6 +19,6 @@ namespace Robust.Client.Console
 
         void AddFormattedLine(FormattedMessage message);
 
-        Task<CompletionResult> GetCompletions(List<string> args, string argStr, CancellationToken cancel);
+        Task<CompletionResult> GetCompletions(List<string> args, CancellationToken cancel);
     }
 }

Robust.Client/Debugging/DebugAnchoringSystem.cs

@@ -1,7 +1,6 @@
 #if DEBUG
 using System.Numerics;
 using System.Text;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
@@ -9,6 +8,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 
 namespace Robust.Client.Debugging
@@ -19,7 +19,6 @@ namespace Robust.Client.Debugging
         [Dependency] private readonly IInputManager _inputManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterface = default!;
-        [Dependency] private readonly MapSystem _mapSystem = default!;
 
         private Label? _label;
 
@@ -62,7 +61,7 @@ namespace Robust.Client.Debugging
             }
 
             var mouseSpot = _inputManager.MouseScreenPosition;
-            var spot = _eyeManager.PixelToMap(mouseSpot);
+            var spot = _eyeManager.ScreenToMap(mouseSpot);
 
             if (!_mapManager.TryFindGridAt(spot, out var gridUid, out var grid))
             {
@@ -71,7 +70,7 @@ namespace Robust.Client.Debugging
                 return;
             }
 
-            var tile = _mapSystem.GetTileRef(gridUid, grid, spot);
+            var tile = grid.GetTileRef(spot);
             _label.Position = mouseSpot.Position + new Vector2(32, 0);
 
             if (_hovered?.GridId == gridUid && _hovered?.Tile == tile) return;
@@ -80,7 +79,7 @@ namespace Robust.Client.Debugging
 
             var text = new StringBuilder();
 
-            foreach (var ent in _mapSystem.GetAnchoredEntities(gridUid, grid, spot))
+            foreach (var ent in grid.GetAnchoredEntities(spot))
             {
                 if (EntityManager.TryGetComponent<MetaDataComponent>(ent, out var meta))
                 {

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -46,6 +46,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -206,7 +207,6 @@ namespace Robust.Client.Debugging
         private readonly Font _font;
 
         private HashSet<Joint> _drawnJoints = new();
-        private List<Entity<MapGridComponent>> _grids = new();
 
         public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem)
         {
@@ -218,7 +218,7 @@ namespace Robust.Client.Debugging
             _debugPhysicsSystem = system;
             _lookup = lookup;
             _physicsSystem = physicsSystem;
-            _font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
+            _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
         }
 
         private void DrawWorld(DrawingHandleWorld worldHandle, OverlayDrawArgs args)
@@ -231,33 +231,32 @@ namespace Robust.Client.Debugging
             {
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
-                    if (_entityManager.HasComponent<MapGridComponent>(physBody)) continue;
+                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner)) continue;
 
-                    var xform = _physicsSystem.GetPhysicsTransform(physBody);
-                    var comp = physBody.Comp;
+                    var xform = _physicsSystem.GetPhysicsTransform(physBody.Owner);
 
                     const float AlphaModifier = 0.2f;
 
-                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody).Fixtures.Values)
+                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody.Owner).Fixtures.Values)
                     {
                         // Invalid shape - Box2D doesn't check for IsSensor but we will for sanity.
-                        if (comp.BodyType == BodyType.Dynamic && fixture.Density == 0f && fixture.Hard)
+                        if (physBody.BodyType == BodyType.Dynamic && fixture.Density == 0f && fixture.Hard)
                         {
                             DrawShape(worldHandle, fixture, xform, Color.Red.WithAlpha(AlphaModifier));
                         }
-                        else if (!comp.CanCollide)
+                        else if (!physBody.CanCollide)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.5f, 0.5f, 0.3f).WithAlpha(AlphaModifier));
                         }
-                        else if (comp.BodyType == BodyType.Static)
+                        else if (physBody.BodyType == BodyType.Static)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.5f, 0.9f, 0.5f).WithAlpha(AlphaModifier));
                         }
-                        else if ((comp.BodyType & (BodyType.Kinematic | BodyType.KinematicController)) != 0x0)
+                        else if ((physBody.BodyType & (BodyType.Kinematic | BodyType.KinematicController)) != 0x0)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.5f, 0.5f, 0.9f).WithAlpha(AlphaModifier));
                         }
-                        else if (!comp.Awake)
+                        else if (!physBody.Awake)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.6f, 0.6f, 0.6f).WithAlpha(AlphaModifier));
                         }
@@ -276,18 +275,15 @@ namespace Robust.Client.Debugging
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
                     var color = Color.Purple.WithAlpha(Alpha);
-                    var transform = _physicsSystem.GetPhysicsTransform(physBody);
-                    worldHandle.DrawCircle(Transform.Mul(transform, physBody.Comp.LocalCenter), 0.2f, color);
+                    var transform = _physicsSystem.GetPhysicsTransform(physBody.Owner);
+                    worldHandle.DrawCircle(Transform.Mul(transform, physBody.LocalCenter), 0.2f, color);
                 }
 
-                _grids.Clear();
-                _mapManager.FindGridsIntersecting(mapId, viewBounds, ref _grids);
-
-                foreach (var grid in _grids)
+                foreach (var grid in _mapManager.FindGridsIntersecting(mapId, viewBounds))
                 {
-                    var physBody = _entityManager.GetComponent<PhysicsComponent>(grid);
+                    var physBody = _entityManager.GetComponent<PhysicsComponent>(grid.Owner);
                     var color = Color.Orange.WithAlpha(Alpha);
-                    var transform = _physicsSystem.GetPhysicsTransform(grid);
+                    var transform = _physicsSystem.GetPhysicsTransform(grid.Owner);
                     worldHandle.DrawCircle(Transform.Mul(transform, physBody.LocalCenter), 1f, color);
                 }
             }
@@ -296,14 +292,14 @@ namespace Robust.Client.Debugging
             {
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
-                    if (_entityManager.HasComponent<MapGridComponent>(physBody)) continue;
+                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner)) continue;
 
-                    var xform = _physicsSystem.GetPhysicsTransform(physBody);
+                    var xform = _physicsSystem.GetPhysicsTransform(physBody.Owner);
 
                     const float AlphaModifier = 0.2f;
                     Box2? aabb = null;
 
-                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody).Fixtures.Values)
+                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody.Owner).Fixtures.Values)
                     {
                         for (var i = 0; i < fixture.Shape.ChildCount; i++)
                         {
@@ -322,11 +318,10 @@ namespace Robust.Client.Debugging
             {
                 _drawnJoints.Clear();
 
-                var query = _entityManager.AllEntityQueryEnumerator<JointComponent>();
-                while (query.MoveNext(out var uid, out var jointComponent))
+                foreach (var jointComponent in _entityManager.EntityQuery<JointComponent>(true))
                 {
                     if (jointComponent.JointCount == 0 ||
-                        !_entityManager.TryGetComponent(uid, out TransformComponent? xf1) ||
+                        !_entityManager.TryGetComponent(jointComponent.Owner, out TransformComponent? xf1) ||
                         !viewAABB.Contains(xf1.WorldPosition)) continue;
 
                     foreach (var (_, joint) in jointComponent.Joints)
@@ -366,9 +361,6 @@ namespace Robust.Client.Debugging
 
                 _debugPhysicsSystem.PointCount = 0;
             }
-
-            worldHandle.UseShader(null);
-            worldHandle.SetTransform(Matrix3.Identity);
         }
 
         private void DrawScreen(DrawingHandleScreen screenHandle, OverlayDrawArgs args)
@@ -378,31 +370,28 @@ namespace Robust.Client.Debugging
 
             if ((_debugPhysicsSystem.Flags & PhysicsDebugFlags.ShapeInfo) != 0x0)
             {
-                var hoverBodies = new List<Entity<PhysicsComponent>>();
-                var bounds = Box2.UnitCentered.Translated(_eyeManager.PixelToMap(mousePos.Position).Position);
+                var hoverBodies = new List<PhysicsComponent>();
+                var bounds = Box2.UnitCentered.Translated(_eyeManager.ScreenToMap(mousePos.Position).Position);
 
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, bounds))
                 {
-                    var uid = physBody.Owner;
-                    if (_entityManager.HasComponent<MapGridComponent>(uid)) continue;
-                    hoverBodies.Add((uid, physBody));
+                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner)) continue;
+                    hoverBodies.Add(physBody);
                 }
 
                 var lineHeight = _font.GetLineHeight(1f);
                 var drawPos = mousePos.Position + new Vector2(20, 0) + new Vector2(0, -(hoverBodies.Count * 4 * lineHeight / 2f));
                 int row = 0;
 
-                foreach (var bodyEnt in hoverBodies)
+                foreach (var body in hoverBodies)
                 {
-                    if (bodyEnt != hoverBodies[0])
+                    if (body != hoverBodies[0])
                     {
                         screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), "------");
                         row++;
                     }
 
-                    var body = bodyEnt.Comp;
-
-                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {bodyEnt.Owner}");
+                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {body.Owner}");
                     row++;
                     screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Layer: {Convert.ToString(body.CollisionLayer, 2)}");
                     row++;
@@ -415,7 +404,7 @@ namespace Robust.Client.Debugging
 
             if ((_debugPhysicsSystem.Flags & PhysicsDebugFlags.Distance) != 0x0)
             {
-                var mapPos = _eyeManager.PixelToMap(mousePos);
+                var mapPos = _eyeManager.ScreenToMap(mousePos);
 
                 if (mapPos.MapId != args.MapId)
                     return;
@@ -441,9 +430,6 @@ namespace Robust.Client.Debugging
                     }
                 }
             }
-
-            screenHandle.UseShader(null);
-            screenHandle.SetTransform(Matrix3.Identity);
         }
 
         protected internal override void Draw(in OverlayDrawArgs args)
@@ -465,26 +451,11 @@ namespace Robust.Client.Debugging
         {
             switch (fixture.Shape)
             {
-                case ChainShape cShape:
-                {
-                    var count = cShape.Count;
-                    var vertices = cShape.Vertices;
-
-                    var v1 = Transform.Mul(xform, vertices[0]);
-                    for (var i = 1; i < count; ++i)
-                    {
-                        var v2 = Transform.Mul(xform, vertices[i]);
-                        worldHandle.DrawLine(v1, v2, color);
-                        v1 = v2;
-                    }
-                }
-                    break;
                 case PhysShapeCircle circle:
                     var center = Transform.Mul(xform, circle.Position);
                     worldHandle.DrawCircle(center, circle.Radius, color);
                     break;
                 case EdgeShape edge:
-                {
                     var v1 = Transform.Mul(xform, edge.Vertex1);
                     var v2 = Transform.Mul(xform, edge.Vertex2);
                     worldHandle.DrawLine(v1, v2, color);
@@ -494,7 +465,6 @@ namespace Robust.Client.Debugging
                         worldHandle.DrawCircle(v1, 0.1f, color);
                         worldHandle.DrawCircle(v2, 0.1f, color);
                     }
-                }
 
                     break;
                 case PolygonShape poly:

Robust.Client/GameController/GameController.RobustModules.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Reflection;
 using System.Runtime.Loader;
 using Robust.Client.WebViewHook;
-using Robust.Shared.ContentPack;
 using Robust.Shared.Log;
 using Robust.Shared.Utility;
 

Robust.Client/GameController/GameController.cs

@@ -33,7 +33,6 @@ using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Profiling;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Reflection;
 using Robust.Shared.Replays;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
@@ -85,8 +84,7 @@ namespace Robust.Client
         [Dependency] private readonly NetworkResourceManager _netResMan = default!;
         [Dependency] private readonly IReplayLoadManager _replayLoader = default!;
         [Dependency] private readonly IReplayPlaybackManager _replayPlayback = default!;
-        [Dependency] private readonly IReplayRecordingManagerInternal _replayRecording = default!;
-        [Dependency] private readonly IReflectionManager _reflectionManager = default!;
+        [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
 
         private IWebViewManagerHook? _webViewHook;
 
@@ -164,9 +162,9 @@ namespace Robust.Client
             // before prototype load.
             ProgramShared.FinishCheckBadFileExtensions(checkBadExtensions);
 
-            _reflectionManager.Initialize();
             _prototypeManager.Initialize();
             _prototypeManager.LoadDefaultPrototypes();
+            _prototypeManager.ResolveResults();
             _userInterfaceManager.Initialize();
             _eyeManager.Initialize();
             _entityManager.Initialize();
@@ -202,12 +200,7 @@ namespace Robust.Client
             // Setup main loop
             if (_mainLoop == null)
             {
-                _mainLoop = new GameLoop(
-                    _gameTiming,
-                    _runtimeLog,
-                    _prof,
-                    _logManager.GetSawmill("eng"),
-                    GameLoopOptions.FromCVars(_configurationManager))
+                _mainLoop = new GameLoop(_gameTiming, _runtimeLog, _prof, _logManager.GetSawmill("eng"))
                 {
                     SleepMode = displayMode == DisplayMode.Headless ? SleepMode.Delay : SleepMode.None
                 };
@@ -287,6 +280,78 @@ namespace Robust.Client
             return true;
         }
 
+        private ResourceManifestData LoadResourceManifest()
+        {
+            // Parses /manifest.yml for game-specific settings that cannot be exclusively set up by content code.
+            if (!_resourceCache.TryContentFileRead("/manifest.yml", out var stream))
+                return ResourceManifestData.Default;
+
+            var yamlStream = new YamlStream();
+            using (stream)
+            {
+                using var streamReader = new StreamReader(stream, EncodingHelpers.UTF8);
+                yamlStream.Load(streamReader);
+            }
+
+            if (yamlStream.Documents.Count == 0)
+                return ResourceManifestData.Default;
+
+            if (yamlStream.Documents.Count != 1 || yamlStream.Documents[0].RootNode is not YamlMappingNode mapping)
+            {
+                throw new InvalidOperationException(
+                    "Expected a single YAML document with root mapping for /manifest.yml");
+            }
+
+            var modules = ReadStringArray(mapping, "modules") ?? Array.Empty<string>();
+
+            string? assemblyPrefix = null;
+            if (mapping.TryGetNode("assemblyPrefix", out var prefixNode))
+                assemblyPrefix = prefixNode.AsString();
+
+            string? defaultWindowTitle = null;
+            if (mapping.TryGetNode("defaultWindowTitle", out var winTitleNode))
+                defaultWindowTitle = winTitleNode.AsString();
+
+            string? windowIconSet = null;
+            if (mapping.TryGetNode("windowIconSet", out var iconSetNode))
+                windowIconSet = iconSetNode.AsString();
+
+            string? splashLogo = null;
+            if (mapping.TryGetNode("splashLogo", out var splashNode))
+                splashLogo = splashNode.AsString();
+
+            bool autoConnect = true;
+            if (mapping.TryGetNode("autoConnect", out var autoConnectNode))
+                autoConnect = autoConnectNode.AsBool();
+
+            var clientAssemblies = ReadStringArray(mapping, "clientAssemblies");
+
+            return new ResourceManifestData(
+                modules,
+                assemblyPrefix,
+                defaultWindowTitle,
+                windowIconSet,
+                splashLogo,
+                autoConnect,
+                clientAssemblies
+            );
+
+            static string[]? ReadStringArray(YamlMappingNode mapping, string key)
+            {
+                if (!mapping.TryGetNode(key, out var node))
+                    return null;
+
+                var sequence = (YamlSequenceNode)node;
+                var array = new string[sequence.Children.Count];
+                for (var i = 0; i < array.Length; i++)
+                {
+                    array[i] = sequence[i].AsString();
+                }
+
+                return array;
+            }
+        }
+
         internal bool StartupSystemSplash(
             GameControllerOptions options,
             Func<ILogHandler>? logHandlerFactory,
@@ -385,7 +450,7 @@ namespace Robust.Client
                 _modLoader.VerifierExtraLoadHandler = VerifierExtraLoadHandler;
             }
 
-            _resourceManifest = ResourceManifestData.LoadResourceManifest(_resourceCache);
+            _resourceManifest = LoadResourceManifest();
 
             {
                 // Handle GameControllerOptions implicit CVar overrides.
@@ -495,11 +560,6 @@ namespace Robust.Client
             {
                 _taskManager.ProcessPendingTasks(); // tasks like connect
             }
-
-            using (_prof.Group("Content post engine"))
-            {
-                _modLoader.BroadcastUpdate(ModUpdateLevel.InputPostEngine, frameEventArgs);
-            }
         }
 
         private void Tick(FrameEventArgs frameEventArgs)
@@ -632,6 +692,7 @@ namespace Robust.Client
             logManager.GetSawmill("ogl.debug.other").Level = LogLevel.Warning;
             logManager.GetSawmill("gdparse").Level = LogLevel.Error;
             logManager.GetSawmill("discord").Level = LogLevel.Warning;
+            logManager.GetSawmill("net.predict").Level = LogLevel.Info;
             logManager.GetSawmill("szr").Level = LogLevel.Info;
             logManager.GetSawmill("loc").Level = LogLevel.Warning;
 
@@ -695,8 +756,6 @@ namespace Robust.Client
 
         internal void CleanupGameThread()
         {
-            _replayRecording.Shutdown();
-
             _modLoader.Shutdown();
 
             // CEF specifically makes a massive silent stink of it if we don't shut it down from the correct thread.
@@ -713,6 +772,20 @@ namespace Robust.Client
             _clydeAudio.Shutdown();
         }
 
+        private sealed record ResourceManifestData(
+            string[] Modules,
+            string? AssemblyPrefix,
+            string? DefaultWindowTitle,
+            string? WindowIconSet,
+            string? SplashLogo,
+            bool AutoConnect,
+            string[]? ClientAssemblies
+        )
+        {
+            public static readonly ResourceManifestData Default =
+                new ResourceManifestData(Array.Empty<string>(), null, null, null, null, true, null);
+        }
+
         public event Action<FrameEventArgs>? TickUpdateOverride;
     }
 }

Robust.Client/GameObjects/ClientEntityManager.Network.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Utility;
-
-namespace Robust.Client.GameObjects;
-
-public sealed partial class ClientEntityManager
-{
-    protected override NetEntity GenerateNetEntity() => new(NextNetworkId++ | NetEntity.ClientEntity);
-
-    /// <summary>
-    /// If the client fails to resolve a NetEntity then during component state handling or the likes we
-    /// flag that comp state as requiring re-running if that NetEntity comes in.
-    /// </summary>
-    /// <returns></returns>
-    internal readonly Dictionary<NetEntity, List<(Type type, EntityUid Owner)>> PendingNetEntityStates = new();
-
-    public override bool IsClientSide(EntityUid uid, MetaDataComponent? metadata = null)
-    {
-        // Can't log false because some content code relies on invalid UIDs.
-        if (!MetaQuery.Resolve(uid, ref metadata, false))
-            return false;
-
-        return metadata.NetEntity.IsClientSide();
-    }
-
-    public override EntityUid EnsureEntity<T>(NetEntity nEntity, EntityUid callerEntity)
-    {
-        if (!nEntity.Valid)
-        {
-            return EntityUid.Invalid;
-        }
-
-        if (NetEntityLookup.TryGetValue(nEntity, out var entity))
-        {
-            return entity.Item1;
-        }
-
-        // Flag the callerEntity to have their state potentially re-run later.
-        var pending = PendingNetEntityStates.GetOrNew(nEntity);
-        pending.Add((typeof(T), callerEntity));
-
-        return entity.Item1;
-    }
-
-    public override EntityCoordinates EnsureCoordinates<T>(NetCoordinates netCoordinates, EntityUid callerEntity)
-    {
-        var entity = EnsureEntity<T>(netCoordinates.NetEntity, callerEntity);
-        return new EntityCoordinates(entity, netCoordinates.Position);
-    }
-}

Robust.Client/GameObjects/ClientEntityManager.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Prometheus;
 using Robust.Client.GameStates;
 using Robust.Client.Player;
 using Robust.Client.Timing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
 using Robust.Shared.Replays;
@@ -16,7 +18,7 @@ namespace Robust.Client.GameObjects
     /// <summary>
     /// Manager for entities -- controls things like template loading and instantiation
     /// </summary>
-    public sealed partial class ClientEntityManager : EntityManager, IClientEntityManagerInternal
+    public sealed class ClientEntityManager : EntityManager, IClientEntityManagerInternal
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientNetManager _networkManager = default!;
@@ -25,6 +27,8 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IBaseClient _client = default!;
         [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
 
+        protected override int NextEntityUid { get; set; } = EntityUid.ClientUid + 1;
+
         public override void Initialize()
         {
             SetupNetworking();
@@ -35,16 +39,13 @@ namespace Robust.Client.GameObjects
 
         public override void FlushEntities()
         {
-            // Server doesn't network deletions on client shutdown so we need to
-            // manually clear these out or risk stale data getting used.
-            PendingNetEntityStates.Clear();
             using var _ = _gameTiming.StartStateApplicationArea();
             base.FlushEntities();
         }
 
-        EntityUid IClientEntityManagerInternal.CreateEntity(string? prototypeName, out MetaDataComponent metadata)
+        EntityUid IClientEntityManagerInternal.CreateEntity(string? prototypeName, EntityUid uid)
         {
-            return base.CreateEntity(prototypeName, out metadata);
+            return base.CreateEntity(prototypeName, uid);
         }
 
         void IClientEntityManagerInternal.InitializeEntity(EntityUid entity, MetaDataComponent? meta)
@@ -65,12 +66,9 @@ namespace Robust.Client.GameObjects
                 base.DirtyEntity(uid, meta);
         }
 
-        public override void QueueDeleteEntity(EntityUid? uid)
+        public override void QueueDeleteEntity(EntityUid uid)
         {
-            if (uid == null)
-                return;
-
-            if (IsClientSide(uid.Value))
+            if (uid.IsClientSide())
             {
                 base.QueueDeleteEntity(uid);
                 return;
@@ -81,29 +79,23 @@ namespace Robust.Client.GameObjects
 
             // Client-side entity deletion is not supported and will cause errors.
             if (_client.RunLevel == ClientRunLevel.Connected || _client.RunLevel == ClientRunLevel.InGame)
-                LogManager.RootSawmill.Error($"Predicting the queued deletion of a networked entity: {ToPrettyString(uid.Value)}. Trace: {Environment.StackTrace}");
+                LogManager.RootSawmill.Error($"Predicting the queued deletion of a networked entity: {ToPrettyString(uid)}. Trace: {Environment.StackTrace}");
         }
 
         /// <inheritdoc />
-        public override void Dirty(EntityUid uid, IComponent component, MetaDataComponent? meta = null)
-        {
-            Dirty(new Entity<IComponent>(uid, component), meta);
-        }
-
-        /// <inheritdoc />
-        public override void Dirty<T>(Entity<T> ent, MetaDataComponent? meta = null)
+        public override void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null)
         {
             //  Client only dirties during prediction
             if (_gameTiming.InPrediction)
-                base.Dirty(ent, meta);
+                base.Dirty(uid, component, meta);
         }
 
-        public override EntityStringRepresentation ToPrettyString(EntityUid uid, MetaDataComponent? metaDataComponent = null)
+        public override EntityStringRepresentation ToPrettyString(EntityUid uid)
         {
             if (_playerManager.LocalPlayer?.ControlledEntity == uid)
                 return base.ToPrettyString(uid) with { Session = _playerManager.LocalPlayer.Session };
-
-            return base.ToPrettyString(uid);
+            else
+                return base.ToPrettyString(uid);
         }
 
         public override void RaisePredictiveEvent<T>(T msg)
@@ -170,7 +162,7 @@ namespace Robust.Client.GameObjects
         }
 
         /// <inheritdoc />
-        public void SendSystemNetworkMessage(EntityEventArgs message, INetChannel? channel)
+        public void SendSystemNetworkMessage(EntityEventArgs message, INetChannel channel)
         {
             throw new NotSupportedException();
         }

Robust.Client/GameObjects/Components/Animations/AnimationPlayerComponent.cs

@@ -1,6 +1,8 @@
+using System;
 using System.Collections.Generic;
 using Robust.Client.Animations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using static Robust.Client.Animations.AnimationPlaybackShared;
 
 namespace Robust.Client.GameObjects
@@ -9,7 +11,7 @@ namespace Robust.Client.GameObjects
     ///     Plays back <see cref="Animation"/>s on entities.
     /// </summary>
     [RegisterComponent]
-    public sealed partial class AnimationPlayerComponent : Component
+    public sealed class AnimationPlayerComponent : Component
     {
         // TODO: Give this component a friend someday. Way too much content shit to change atm ._.
 
@@ -19,5 +21,42 @@ namespace Robust.Client.GameObjects
             = new();
 
         internal bool HasPlayingAnimation = false;
+
+        /// <summary>
+        ///     Start playing an animation.
+        /// </summary>
+        /// <param name="animation">The animation to play.</param>
+        /// <param name="key">
+        ///     The key for this animation play. This key can be used to stop playback short later.
+        /// </param>
+        [Obsolete("Use AnimationPlayerSystem.Play() instead")]
+        public void Play(Animation animation, string key)
+        {
+            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AnimationPlayerSystem>().AddComponent(this);
+            var playback = new AnimationPlayback(animation);
+
+            PlayingAnimations.Add(key, playback);
+        }
+
+        [Obsolete("Use AnimationPlayerSystem.HasRunningAnimation() instead")]
+        public bool HasRunningAnimation(string key)
+        {
+            return PlayingAnimations.ContainsKey(key);
+        }
+
+        [Obsolete("Use AnimationPlayerSystem.Stop() instead")]
+        public void Stop(string key)
+        {
+            PlayingAnimations.Remove(key);
+        }
+
+        [Obsolete("Temporary method until the event is replaced with eventbus")]
+        internal void AnimationComplete(string key)
+        {
+            AnimationCompleted?.Invoke(key);
+        }
+
+        [Obsolete("Use AnimationCompletedEvent instead")]
+        public event Action<string>? AnimationCompleted;
     }
 }

Robust.Client/GameObjects/Components/Appearance/GenericVisualizerComponent.cs

@@ -11,7 +11,7 @@ namespace Robust.Client.GameObjects;
 /// </summary>
 [RegisterComponent]
 [Access(typeof(GenericVisualizerSystem))]
-public sealed partial class GenericVisualizerComponent : Component
+public sealed class GenericVisualizerComponent : Component
 {
     /// <summary>
     ///     This is a nested dictionary that maps appearance data keys -> sprite layer keys -> appearance data values -> layer data.

Robust.Client/GameObjects/Components/Eye/EyeComponent.cs

@@ -0,0 +1,187 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Robust.Client.GameObjects
+{
+    [RegisterComponent, ComponentReference(typeof(SharedEyeComponent))]
+    public sealed class EyeComponent : SharedEyeComponent
+    {
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+
+        [ViewVariables]
+        private Eye? _eye = default!;
+
+        // Horrible hack to get around ordering issues.
+        private bool _setCurrentOnInitialize;
+        [DataField("drawFov")]
+        private bool _setDrawFovOnInitialize = true;
+        [DataField("zoom")]
+        private Vector2 _setZoomOnInitialize = Vector2.One;
+
+        /// <summary>
+        ///     If not null, this entity is used to update the eye's position instead of just using the component's owner.
+        /// </summary>
+        /// <remarks>
+        ///     This is useful for things like vehicles that effectively need to hijack the eye. This allows them to do
+        ///     that without messing with the main viewport's eye. This is important as there are some overlays that are
+        ///     only be drawn if that viewport's eye belongs to the currently controlled entity.
+        /// </remarks>
+        [ViewVariables]
+        public EntityUid? Target;
+
+        public IEye? Eye => _eye;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool Current
+        {
+            get => _eyeManager.CurrentEye == _eye;
+            set
+            {
+                if (_eye == null)
+                {
+                    _setCurrentOnInitialize = value;
+                    return;
+                }
+
+                if (_eyeManager.CurrentEye == _eye == value)
+                    return;
+
+                if (value)
+                {
+                    _eyeManager.CurrentEye = _eye;
+                }
+                else
+                {
+                    _eyeManager.ClearCurrentEye();
+                }
+            }
+        }
+
+        public override Vector2 Zoom
+        {
+            get => _eye?.Zoom ?? _setZoomOnInitialize;
+            set
+            {
+                if (_eye == null)
+                {
+                    _setZoomOnInitialize = value;
+                }
+                else
+                {
+                    _eye.Zoom = value;
+                }
+            }
+        }
+
+        public override Angle Rotation
+        {
+            get => _eye?.Rotation ?? Angle.Zero;
+            set
+            {
+                if (_eye != null)
+                    _eye.Rotation = value;
+            }
+        }
+
+        public override Vector2 Offset
+        {
+            get => _eye?.Offset ?? default;
+            set
+            {
+                if (_eye != null)
+                    _eye.Offset = value;
+            }
+        }
+
+        public override bool DrawFov
+        {
+            get => _eye?.DrawFov ?? _setDrawFovOnInitialize;
+            set
+            {
+                if (_eye == null)
+                {
+                    _setDrawFovOnInitialize = value;
+                }
+                else
+                {
+                    _eye.DrawFov = value;
+                }
+            }
+        }
+
+        [ViewVariables]
+        public MapCoordinates? Position => _eye?.Position;
+
+        /// <inheritdoc />
+        protected override void Initialize()
+        {
+            base.Initialize();
+
+            _eye = new Eye
+            {
+                Position = _entityManager.GetComponent<TransformComponent>(Owner).MapPosition,
+                Zoom = _setZoomOnInitialize,
+                DrawFov = _setDrawFovOnInitialize
+            };
+
+            if ((_eyeManager.CurrentEye == _eye) != _setCurrentOnInitialize)
+            {
+                if (_setCurrentOnInitialize)
+                {
+                    _eyeManager.ClearCurrentEye();
+                }
+                else
+                {
+                    _eyeManager.CurrentEye = _eye;
+                }
+            }
+        }
+
+        public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
+        {
+            base.HandleComponentState(curState, nextState);
+
+            if (curState is not EyeComponentState state)
+            {
+                return;
+            }
+
+            DrawFov = state.DrawFov;
+            // TODO: Should be a way for content to override lerping and lerp the zoom
+            Zoom = state.Zoom;
+            Offset = state.Offset;
+            VisibilityMask = state.VisibilityMask;
+        }
+
+        protected override void OnRemove()
+        {
+            base.OnRemove();
+
+            Current = false;
+        }
+
+        /// <summary>
+        /// Updates the Eye of this entity with the transform position. This has to be called every frame to
+        /// keep the view following the entity.
+        /// </summary>
+        public void UpdateEyePosition()
+        {
+            if (_eye == null) return;
+
+            if (!_entityManager.TryGetComponent(Target, out TransformComponent? xform))
+            {
+                xform = _entityManager.GetComponent<TransformComponent>(Owner);
+                Target = null;
+            }
+
+            _eye.Position = xform.MapPosition;
+        }
+    }
+}

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

@@ -16,8 +16,8 @@ namespace Robust.Client.GameObjects;
 /// updated.
 /// </remarks>
 [RegisterComponent]
-public sealed partial class IconComponent : Component
+public sealed class IconComponent : Component
 {
     [IncludeDataField]
-    public SpriteSpecifier.Rsi Icon = default!;
+    public readonly SpriteSpecifier.Rsi Icon = default!;
 }

Robust.Client/GameObjects/Components/Input/InputComponent.cs

@@ -9,7 +9,7 @@ namespace Robust.Client.GameObjects
     ///     Defines data fields used in the <see cref="InputSystem"/>.
     /// </summary>
     [RegisterComponent]
-    public sealed partial class InputComponent : Component
+    public sealed class InputComponent : Component
     {
         /// <summary>
         ///     The context that will be made active for a client that attaches to this entity.

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

@@ -0,0 +1,85 @@
+using Robust.Client.Graphics;
+using Robust.Shared.Animations;
+using Robust.Shared.ComponentTrees;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Maths;
+using Robust.Shared.Physics;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Robust.Client.GameObjects
+{
+    [RegisterComponent]
+    [ComponentReference(typeof(SharedPointLightComponent))]
+    public sealed class PointLightComponent : SharedPointLightComponent, IComponentTreeEntry<PointLightComponent>
+    {
+        public EntityUid? TreeUid { get; set; }
+
+        public DynamicTree<ComponentTreeEntry<PointLightComponent>>? Tree { get; set; }
+
+        public bool AddToTree => Enabled && !ContainerOccluded;
+        public bool TreeUpdateQueued { get; set; }
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [Animatable]
+        public override Color Color
+        {
+            get => _color;
+            set => base.Color = value;
+        }
+
+        [Access(typeof(PointLightSystem))]
+        public bool ContainerOccluded;
+
+        /// <summary>
+        ///     Determines if the light mask should automatically rotate with the entity. (like a flashlight)
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool MaskAutoRotate
+        {
+            get => _maskAutoRotate;
+            set => _maskAutoRotate = value;
+        }
+
+        /// <summary>
+        ///     Local rotation of the light mask around the center origin
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        [Animatable]
+        public Angle Rotation
+        {
+            get => _rotation;
+            set => _rotation = value;
+        }
+
+        /// <summary>
+        /// The resource path to the mask texture the light will use.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public string? MaskPath
+        {
+            get => _maskPath;
+            set
+            {
+                if (_maskPath?.Equals(value) != false) return;
+                _maskPath = value;
+                EntitySystem.Get<PointLightSystem>().UpdateMask(this);
+            }
+        }
+
+        /// <summary>
+        ///     Set a mask texture that will be applied to the light while rendering.
+        ///     The mask's red channel will be linearly multiplied.p
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public Texture? Mask { get; set; }
+
+        [DataField("autoRot")]
+        private bool _maskAutoRotate;
+        private Angle _rotation;
+
+        [DataField("mask")]
+        internal string? _maskPath;
+    }
+}

Robust.Client/GameObjects/Components/PointLightComponent.cs

@@ -1,38 +0,0 @@
-using Robust.Client.Graphics;
-using Robust.Shared.ComponentTrees;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Physics;
-using Robust.Shared.ViewVariables;
-
-namespace Robust.Client.GameObjects;
-
-[RegisterComponent]
-public sealed partial class PointLightComponent : SharedPointLightComponent, IComponentTreeEntry<PointLightComponent>
-{
-    #region Component Tree
-
-    /// <inheritdoc />
-    [ViewVariables]
-    public EntityUid? TreeUid { get; set; }
-
-    /// <inheritdoc />
-    [ViewVariables]
-    public DynamicTree<ComponentTreeEntry<PointLightComponent>>? Tree { get; set; }
-
-    /// <inheritdoc />
-    [ViewVariables]
-    public bool AddToTree => Enabled && !ContainerOccluded;
-
-    /// <inheritdoc />
-    [ViewVariables]
-    public bool TreeUpdateQueued { get; set; }
-
-    #endregion
-
-    /// <summary>
-    ///     Set a mask texture that will be applied to the light while rendering.
-    ///     The mask's red channel will be linearly multiplied.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    internal Texture? Mask;
-}

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

@@ -4,7 +4,7 @@ using Robust.Shared.Maths;
 
 namespace Robust.Client.GameObjects
 {
-    public partial interface IRenderableComponent : IComponent
+    public interface IRenderableComponent : IComponent
     {
         int DrawDepth { get; set; }
         float Bottom { get; }

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

@@ -1,7 +1,5 @@
 using System.Numerics;
 using Robust.Client.Graphics;
-using Robust.Shared.Graphics;
-using Robust.Shared.Graphics.RSI;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.GameObjects
@@ -26,7 +24,7 @@ namespace Robust.Client.GameObjects
         int AnimationFrame { get; }
         bool AutoAnimated { get; set; }
 
-        RsiDirection EffectiveDirection(Angle worldRotation);
+        RSI.State.Direction EffectiveDirection(Angle worldRotation);
 
         /// <summary>
         ///     Layer size in pixels.

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

@@ -12,8 +12,6 @@ using Robust.Shared;
 using Robust.Shared.Animations;
 using Robust.Shared.ComponentTrees;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Graphics;
-using Robust.Shared.Graphics.RSI;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
@@ -28,13 +26,13 @@ using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using static Robust.Client.ComponentTrees.SpriteTreeSystem;
 using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth;
+using RSIDirection = Robust.Client.Graphics.RSI.State.Direction;
 using static Robust.Shared.Serialization.TypeSerializers.Implementations.SpriteSpecifierSerializer;
-using Direction = Robust.Shared.Maths.Direction;
 
 namespace Robust.Client.GameObjects
 {
     [RegisterComponent]
-    public sealed partial class SpriteComponent : Component, IComponentDebug, ISerializationHooks, IComponentTreeEntry<SpriteComponent>, IAnimationProperties
+    public sealed class SpriteComponent : Component, IComponentDebug, ISerializationHooks, IComponentTreeEntry<SpriteComponent>, IAnimationProperties
     {
         [Dependency] private readonly IResourceCache resourceCache = default!;
         [Dependency] private readonly IPrototypeManager prototypes = default!;
@@ -169,9 +167,40 @@ namespace Robust.Client.GameObjects
 
         public bool TreeUpdateQueued { get; set; }
 
+        [DataField("layerDatums")]
+        private List<PrototypeLayerData> LayerDatums
+        {
+            get
+            {
+                var layerDatums = new List<PrototypeLayerData>();
+                foreach (var layer in Layers)
+                {
+                    layerDatums.Add(layer.ToPrototypeData());
+                }
+
+                return layerDatums;
+            }
+            set
+            {
+                if (value == null) return;
+
+                Layers.Clear();
+                foreach (var layerDatum in value)
+                {
+                    AddLayer(layerDatum);
+                }
+
+                _layerMapShared = true;
+
+                QueueUpdateRenderTree();
+                QueueUpdateIsInert();
+            }
+        }
+
         private RSI? _baseRsi;
 
         [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("rsi", priority: 2)]
         public RSI? BaseRSI
         {
             get => _baseRsi;
@@ -328,16 +357,7 @@ namespace Robust.Client.GameObjects
             if (layerDatums.Count != 0)
             {
                 LayerMap.Clear();
-                Layers.Clear();
-                foreach (var datum in layerDatums)
-                {
-                    AddLayer(datum);
-                }
-
-                _layerMapShared = true;
-
-                QueueUpdateRenderTree();
-                QueueUpdateIsInert();
+                LayerDatums = layerDatums;
             }
 
             UpdateLocalMatrix();
@@ -1349,11 +1369,11 @@ namespace Robust.Client.GameObjects
                 state = GetFallbackState(resourceCache);
             }
 
-            return state.RsiDirections switch
+            return state.Directions switch
             {
-                RsiDirectionType.Dir1 => 1,
-                RsiDirectionType.Dir4 => 4,
-                RsiDirectionType.Dir8 => 8,
+                RSI.State.DirectionType.Dir1 => 1,
+                RSI.State.DirectionType.Dir4 => 4,
+                RSI.State.DirectionType.Dir8 => 8,
                 _ => throw new ArgumentOutOfRangeException()
             };
         }
@@ -1391,7 +1411,7 @@ namespace Robust.Client.GameObjects
             builder.AppendFormat(
                 "vis/depth/scl/rot/ofs/col/norot/override/dir: {0}/{1}/{2}/{3}/{4}/{5}/{6}/{8}/{7}\n",
                 Visible, DrawDepth, Scale, Rotation, Offset,
-                Color, NoRotation, entities.GetComponent<TransformComponent>(Owner).WorldRotation.ToRsiDirection(RsiDirectionType.Dir8),
+                Color, NoRotation, entities.GetComponent<TransformComponent>(Owner).WorldRotation.ToRsiDirection(RSI.State.DirectionType.Dir8),
                 DirectionOverride
             );
 
@@ -1691,7 +1711,7 @@ namespace Robust.Client.GameObjects
 
             int ISpriteLayer.AnimationFrame => AnimationFrame;
 
-            public RsiDirection EffectiveDirection(Angle worldRotation)
+            public RSIDirection EffectiveDirection(Angle worldRotation)
             {
                 if (State == default)
                 {
@@ -1712,23 +1732,23 @@ namespace Robust.Client.GameObjects
                 return default;
             }
 
-            public RsiDirection EffectiveDirection(RSI.State state, Angle worldRotation,
+            public RSIDirection EffectiveDirection(RSI.State state, Angle worldRotation,
                 Direction? overrideDirection)
             {
-                if (state.RsiDirections == RsiDirectionType.Dir1)
+                if (state.Directions == RSI.State.DirectionType.Dir1)
                 {
-                    return RsiDirection.South;
+                    return RSIDirection.South;
                 }
                 else
                 {
-                    RsiDirection dir;
+                    RSIDirection dir;
                     if (overrideDirection != null)
                     {
-                        dir = overrideDirection.Value.Convert(state.RsiDirections);
+                        dir = overrideDirection.Value.Convert(state.Directions);
                     }
                     else
                     {
-                        dir = worldRotation.ToRsiDirection(state.RsiDirections);
+                        dir = worldRotation.ToRsiDirection(state.Directions);
                     }
 
                     return dir.OffsetRsiDir(DirOffset);
@@ -1884,20 +1904,20 @@ namespace Robust.Client.GameObjects
                 else if (_parent.SnapCardinals && (!_parent.GranularLayersRendering || RenderingStrategy == LayerRenderingStrategy.UseSpriteStrategy)
                          || _parent.GranularLayersRendering && RenderingStrategy == LayerRenderingStrategy.SnapToCardinals)
                 {
-                    DebugTools.Assert(_actualState == null || _actualState.RsiDirections == RsiDirectionType.Dir1);
+                    DebugTools.Assert(_actualState == null || _actualState.Directions == RSI.State.DirectionType.Dir1);
                     size = new Vector2(longestSide, longestSide);
                 }
                 else
                 {
                     // Build the bounding box based on how many directions the sprite has
-                    size = (_actualState?.RsiDirections) switch
+                    size = (_actualState?.Directions) switch
                     {
                         // If we have four cardinal directions, take the longest side of our texture and square it, then turn that into our bounding box.
                         // This accounts for all possible rotations.
-                        RsiDirectionType.Dir4 => new Vector2(longestSide, longestSide),
+                        RSI.State.DirectionType.Dir4 => new Vector2(longestSide, longestSide),
 
                         // If we have eight directions, find the maximum length of the texture (accounting for rotation), then square it to make
-                        RsiDirectionType.Dir8 => new Vector2(longestRotatedSide, longestRotatedSide),
+                        RSI.State.DirectionType.Dir8 => new Vector2(longestRotatedSide, longestRotatedSide),
 
                         // If we have only one direction or an invalid RSI state, create a simple bounding box with the size of the texture.
                         _ => textureSize
@@ -1931,9 +1951,9 @@ namespace Robust.Client.GameObjects
             ///     Given the apparent rotation of an entity on screen (world + eye rotation), get layer's matrix for drawing &
             ///     relevant RSI direction.
             /// </summary>
-            public void GetLayerDrawMatrix(RsiDirection dir, out Matrix3 layerDrawMatrix)
+            public void GetLayerDrawMatrix(RSIDirection dir, out Matrix3 layerDrawMatrix)
             {
-                if (_parent.NoRotation || dir == RsiDirection.South)
+                if (_parent.NoRotation || dir == RSIDirection.South)
                     layerDrawMatrix = LocalMatrix;
                 else
                 {
@@ -1958,11 +1978,11 @@ namespace Robust.Client.GameObjects
             ///     Converts an angle (between 0 and 2pi) to an RSI direction. This will slightly bias the angle to avoid flickering for
             ///     4-directional sprites.
             /// </summary>
-            public static RsiDirection GetDirection(RsiDirectionType dirType, Angle angle)
+            public static RSIDirection GetDirection(RSI.State.DirectionType dirType, Angle angle)
             {
-                if (dirType == RsiDirectionType.Dir1)
-                    return RsiDirection.South;
-                else if (dirType == RsiDirectionType.Dir8)
+                if (dirType == RSI.State.DirectionType.Dir1)
+                    return RSIDirection.South;
+                else if (dirType == RSI.State.DirectionType.Dir8)
                     return angle.GetDir().Convert(dirType);
 
                 // For 4-directional sprites, as entities are often moving & facing diagonally, we will slightly bias the
@@ -1975,10 +1995,10 @@ namespace Robust.Client.GameObjects
 
                 return ((int)Math.Round(modTheta / MathHelper.PiOver2) % 4) switch
                 {
-                    0 => RsiDirection.South,
-                    1 => RsiDirection.East,
-                    2 => RsiDirection.North,
-                    _ => RsiDirection.West,
+                    0 => RSIDirection.South,
+                    1 => RSIDirection.East,
+                    2 => RSIDirection.North,
+                    _ => RSIDirection.West,
                 };
             }
 
@@ -1990,7 +2010,7 @@ namespace Robust.Client.GameObjects
                 if (!Visible || Blank)
                     return;
 
-                var dir = _actualState == null ? RsiDirection.South : GetDirection(_actualState.RsiDirections, angle);
+                var dir = _actualState == null ? RSIDirection.South : GetDirection(_actualState.Directions, angle);
 
                 // Set the drawing transform for this layer
                 GetLayerDrawMatrix(dir, out var layerMatrix);
@@ -2000,7 +2020,7 @@ namespace Robust.Client.GameObjects
                 // The direction used to draw the sprite can differ from the one that the angle would naively suggest,
                 // due to direction overrides or offsets.
                 if (overrideDirection != null && _actualState != null)
-                    dir = overrideDirection.Value.Convert(_actualState.RsiDirections);
+                    dir = overrideDirection.Value.Convert(_actualState.Directions);
                 dir = dir.OffsetRsiDir(DirOffset);
 
                 // Get the correct directional texture from the state, and draw it!
@@ -2023,7 +2043,7 @@ namespace Robust.Client.GameObjects
                     drawingHandle.UseShader(null);
             }
 
-            private Texture GetRenderTexture(RSI.State? state, RsiDirection dir)
+            private Texture GetRenderTexture(RSI.State? state, RSIDirection dir)
             {
                 if (state == null)
                     return Texture ?? _parent.resourceCache.GetFallback<TextureResource>().Texture;

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

@@ -1,17 +1,28 @@
 using System;
+using System.Collections.Generic;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Player;
+using Robust.Shared.ViewVariables;
 
-namespace Robust.Shared.GameObjects
+namespace Robust.Client.GameObjects
 {
+    [RegisterComponent, ComponentReference(typeof(SharedUserInterfaceComponent))]
+    public sealed class ClientUserInterfaceComponent : SharedUserInterfaceComponent
+    {
+        [ViewVariables]
+        internal readonly Dictionary<Enum, PrototypeData> _interfaces = new();
+
+        [ViewVariables]
+        public readonly Dictionary<Enum, BoundUserInterface> OpenInterfaces = new();
+    }
+
     /// <summary>
     ///     An abstract class to override to implement bound user interfaces.
     /// </summary>
     public abstract class BoundUserInterface : IDisposable
     {
         [Dependency] protected readonly IEntityManager EntMan = default!;
-        [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
-        protected readonly SharedUserInterfaceSystem UiSystem;
+        protected readonly UserInterfaceSystem UiSystem = default!;
 
         public readonly Enum UiKey;
         public EntityUid Owner { get; }
@@ -24,7 +35,7 @@ namespace Robust.Shared.GameObjects
         protected BoundUserInterface(EntityUid owner, Enum uiKey)
         {
             IoCManager.InjectDependencies(this);
-            UiSystem = EntMan.System<SharedUserInterfaceSystem>();
+            UiSystem = EntMan.System<UserInterfaceSystem>();
 
             Owner = owner;
             UiKey = uiKey;
@@ -57,7 +68,7 @@ namespace Robust.Shared.GameObjects
         /// </summary>
         public void Close()
         {
-            UiSystem.TryCloseUi(_playerManager.LocalSession, Owner, UiKey);
+            UiSystem.TryCloseUi(Owner, UiKey);
         }
 
         /// <summary>
@@ -68,11 +79,6 @@ namespace Robust.Shared.GameObjects
             UiSystem.SendUiMessage(this, message);
         }
 
-        public void SendPredictedMessage(BoundUserInterfaceMessage message)
-        {
-            UiSystem.SendPredictedUiMessage(this, message);
-        }
-
         internal void InternalReceiveMessage(BoundUserInterfaceMessage message)
         {
             switch (message)

Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs

@@ -1,19 +1,23 @@
-using System;
 using System.Collections.Generic;
 using Robust.Client.Animations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Utility;
+using TerraFX.Interop.Windows;
 
 namespace Robust.Client.GameObjects
 {
-    public sealed class AnimationPlayerSystem : EntitySystem
+    public sealed class AnimationPlayerSystem : EntitySystem, IPostInjectInit
     {
-        private readonly List<Entity<AnimationPlayerComponent>> _activeAnimations = new();
+        private readonly List<AnimationPlayerComponent> _activeAnimations = new();
 
         private EntityQuery<MetaDataComponent> _metaQuery;
 
         [Dependency] private readonly IComponentFactory _compFact = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
+        private ISawmill _sawmill = default!;
 
         public override void Initialize()
         {
@@ -35,22 +39,22 @@ namespace Robust.Client.GameObjects
                     continue;
                 }
 
-                if (!Update(uid, anim.Comp, frameTime))
+                if (!Update(uid, anim, frameTime))
                 {
                     continue;
                 }
 
                 _activeAnimations.RemoveSwap(i);
                 i--;
-                anim.Comp.HasPlayingAnimation = false;
+                anim.HasPlayingAnimation = false;
             }
         }
 
-        internal void AddComponent(Entity<AnimationPlayerComponent> ent)
+        internal void AddComponent(AnimationPlayerComponent component)
         {
-            if (ent.Comp.HasPlayingAnimation) return;
-            _activeAnimations.Add(ent);
-            ent.Comp.HasPlayingAnimation = true;
+            if (component.HasPlayingAnimation) return;
+            _activeAnimations.Add(component);
+            component.HasPlayingAnimation = true;
         }
 
         private bool Update(EntityUid uid, AnimationPlayerComponent component, float frameTime)
@@ -75,6 +79,7 @@ namespace Robust.Client.GameObjects
             {
                 component.PlayingAnimations.Remove(key);
                 EntityManager.EventBus.RaiseLocalEvent(uid, new AnimationCompletedEvent {Uid = uid, Key = key}, true);
+                component.AnimationComplete(key);
             }
 
             return false;
@@ -85,29 +90,22 @@ namespace Robust.Client.GameObjects
         /// </summary>
         public void Play(EntityUid uid, Animation animation, string key)
         {
-            var component = EnsureComp<AnimationPlayerComponent>(uid);
-            Play(new Entity<AnimationPlayerComponent>(uid, component), animation, key);
+            var component = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
+            Play(component, animation, key);
         }
 
-        [Obsolete("Use Play(EntityUid<AnimationPlayerComponent> ent, Animation animation, string key) instead")]
         public void Play(EntityUid uid, AnimationPlayerComponent? component, Animation animation, string key)
         {
             component ??= EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
-            Play(new Entity<AnimationPlayerComponent>(uid, component), animation, key);
+            Play(component, animation, key);
         }
 
         /// <summary>
         ///     Start playing an animation.
         /// </summary>
-        [Obsolete("Use Play(EntityUid<AnimationPlayerComponent> ent, Animation animation, string key) instead")]
         public void Play(AnimationPlayerComponent component, Animation animation, string key)
         {
-            Play(new Entity<AnimationPlayerComponent>(component.Owner, component), animation, key);
-        }
-
-        public void Play(Entity<AnimationPlayerComponent> ent, Animation animation, string key)
-        {
-            AddComponent(ent);
+            AddComponent(component);
             var playback = new AnimationPlaybackShared.AnimationPlayback(animation);
 
 #if DEBUG
@@ -119,18 +117,18 @@ namespace Robust.Client.GameObjects
 
                 if (compTrack.ComponentType == null)
                 {
-                    Log.Error("Attempted to play a component animation without any component specified.");
+                    _sawmill.Error($"Attempted to play a component animation without any component specified.");
                     return;
                 }
 
-                if (!EntityManager.TryGetComponent(ent, compTrack.ComponentType, out var animatedComp))
+                if (!EntityManager.TryGetComponent(component.Owner, compTrack.ComponentType, out var animatedComp))
                 {
-                    Log.Error(
-                        $"Attempted to play a component animation, but the entity {ToPrettyString(ent)} does not have the component to be animated: {compTrack.ComponentType}.");
+                    _sawmill.Error(
+                        $"Attempted to play a component animation, but the entity {ToPrettyString(component.Owner)} does not have the component to be animated: {compTrack.ComponentType}.");
                     return;
                 }
 
-                if (IsClientSide(ent) || !animatedComp.NetSyncEnabled)
+                if (component.Owner.IsClientSide() || !animatedComp.NetSyncEnabled)
                     continue;
 
                 var reg = _compFact.GetRegistration(animatedComp);
@@ -138,18 +136,12 @@ namespace Robust.Client.GameObjects
                 // In principle there is nothing wrong with this, as long as the property of the component being
                 // animated is not part of the networked state and setting it does not dirty the component. Hence only a
                 // warning in debug mode.
-                if (reg.NetID != null && compTrack.Property != null)
-                {
-                    if (animatedComp.GetType().GetProperty(compTrack.Property) is { } property &&
-                        property.HasCustomAttribute<AutoNetworkedFieldAttribute>())
-                    {
-                        Log.Warning($"Playing a component animation on a networked component {reg.Name} belonging to {ToPrettyString(ent)}");
-                    }
-                }
+                if (reg.NetID != null)
+                    _sawmill.Warning($"Playing a component animation on a networked component {reg.Name} belonging to {ToPrettyString(component.Owner)}");
             }
 #endif
 
-            ent.Comp.PlayingAnimations.Add(key, playback);
+            component.PlayingAnimations.Add(key, playback);
         }
 
         public bool HasRunningAnimation(EntityUid uid, string key)
@@ -178,19 +170,20 @@ namespace Robust.Client.GameObjects
 
         public void Stop(EntityUid uid, string key)
         {
-            if (!TryComp<AnimationPlayerComponent>(uid, out var player))
-                return;
-
+            if (!TryComp<AnimationPlayerComponent>(uid, out var player)) return;
             player.PlayingAnimations.Remove(key);
         }
 
         public void Stop(EntityUid uid, AnimationPlayerComponent? component, string key)
         {
-            if (!Resolve(uid, ref component, false))
-                return;
-
+            if (!Resolve(uid, ref component, false)) return;
             component.PlayingAnimations.Remove(key);
         }
+
+        void IPostInjectInit.PostInject()
+        {
+            _sawmill = _logManager.GetSawmill("anim");
+        }
     }
 
     public sealed class AnimationCompletedEvent : EntityEventArgs

Robust.Client/GameObjects/EntitySystems/AudioSystem.cs

@@ -17,6 +17,7 @@ using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Random;
 using Robust.Shared.Replays;
 using Robust.Shared.Threading;
@@ -80,13 +81,9 @@ public sealed class AudioSystem : SharedAudioSystem
     #region Event Handlers
     private void PlayAudioEntityHandler(PlayAudioEntityMessage ev)
     {
-        var uid = GetEntity(ev.NetEntity);
-        var coords = GetCoordinates(ev.Coordinates);
-        var fallback = GetCoordinates(ev.FallbackCoordinates);
-
-        var stream = EntityManager.EntityExists(uid)
-            ? (PlayingStream?) Play(ev.FileName, uid, fallback, ev.AudioParams, false)
-            : (PlayingStream?) Play(ev.FileName, coords, fallback, ev.AudioParams, false);
+        var stream = EntityManager.EntityExists(ev.EntityUid)
+            ? (PlayingStream?) Play(ev.FileName, ev.EntityUid, ev.FallbackCoordinates, ev.AudioParams, false)
+            : (PlayingStream?) Play(ev.FileName, ev.Coordinates, ev.FallbackCoordinates, ev.AudioParams, false);
 
         if (stream != null)
             stream.NetIdentifier = ev.Identifier;
@@ -101,10 +98,7 @@ public sealed class AudioSystem : SharedAudioSystem
 
     private void PlayAudioPositionalHandler(PlayAudioPositionalMessage ev)
     {
-        var coords = GetCoordinates(ev.Coordinates);
-        var fallback = GetCoordinates(ev.FallbackCoordinates);
-
-        var stream = (PlayingStream?) Play(ev.FileName, coords, fallback, ev.AudioParams, false);
+        var stream = (PlayingStream?) Play(ev.FileName, ev.Coordinates, ev.FallbackCoordinates, ev.AudioParams, false);
         if (stream != null)
             stream.NetIdentifier = ev.Identifier;
     }
@@ -320,9 +314,9 @@ public sealed class AudioSystem : SharedAudioSystem
         return source != null;
     }
 
-    private PlayingStream CreateAndStartPlayingStream(IClydeAudioSource source, AudioParams? audioParams, AudioStream stream)
+    private PlayingStream CreateAndStartPlayingStream(IClydeAudioSource source, AudioParams? audioParams)
     {
-        ApplyAudioParams(audioParams, source, stream);
+        ApplyAudioParams(audioParams, source);
         source.StartPlaying();
         var playing = new PlayingStream
         {
@@ -371,7 +365,7 @@ public sealed class AudioSystem : SharedAudioSystem
 
         source.SetGlobal();
 
-        return CreateAndStartPlayingStream(source, audioParams, stream);
+        return CreateAndStartPlayingStream(source, audioParams);
     }
 
     /// <summary>
@@ -389,8 +383,8 @@ public sealed class AudioSystem : SharedAudioSystem
             _replayRecording.RecordReplayMessage(new PlayAudioEntityMessage
             {
                 FileName = filename,
-                NetEntity = GetNetEntity(entity),
-                FallbackCoordinates = GetNetCoordinates(fallbackCoordinates) ?? default,
+                EntityUid = entity,
+                FallbackCoordinates = fallbackCoordinates ?? default,
                 AudioParams = audioParams ?? AudioParams.Default
             });
         }
@@ -422,7 +416,7 @@ public sealed class AudioSystem : SharedAudioSystem
         if (!source.SetPosition(worldPos))
             return Play(stream, fallbackCoordinates.Value, fallbackCoordinates.Value, audioParams);
 
-        var playing = CreateAndStartPlayingStream(source, audioParams, stream);
+        var playing = CreateAndStartPlayingStream(source, audioParams);
         playing.TrackingEntity = entity;
         playing.TrackingFallbackCoordinates = fallbackCoordinates != EntityCoordinates.Invalid ? fallbackCoordinates : null;
         return playing;
@@ -443,8 +437,8 @@ public sealed class AudioSystem : SharedAudioSystem
             _replayRecording.RecordReplayMessage(new PlayAudioPositionalMessage
             {
                 FileName = filename,
-                Coordinates = GetNetCoordinates(coordinates),
-                FallbackCoordinates = GetNetCoordinates(fallbackCoordinates),
+                Coordinates = coordinates,
+                FallbackCoordinates = fallbackCoordinates,
                 AudioParams = audioParams ?? AudioParams.Default
             });
         }
@@ -475,7 +469,7 @@ public sealed class AudioSystem : SharedAudioSystem
             return null;
         }
 
-        var playing = CreateAndStartPlayingStream(source, audioParams, stream);
+        var playing = CreateAndStartPlayingStream(source, audioParams);
         playing.TrackingCoordinates = coordinates;
         playing.TrackingFallbackCoordinates = fallbackCoordinates != EntityCoordinates.Invalid ? fallbackCoordinates : null;
         return playing;
@@ -499,7 +493,7 @@ public sealed class AudioSystem : SharedAudioSystem
         return null;
     }
 
-    private void ApplyAudioParams(AudioParams? audioParams, IClydeAudioSource source, AudioStream audio)
+    private void ApplyAudioParams(AudioParams? audioParams, IClydeAudioSource source)
     {
         if (!audioParams.HasValue)
             return;
@@ -514,12 +508,8 @@ public sealed class AudioSystem : SharedAudioSystem
         source.SetRolloffFactor(audioParams.Value.RolloffFactor);
         source.SetMaxDistance(audioParams.Value.MaxDistance);
         source.SetReferenceDistance(audioParams.Value.ReferenceDistance);
+        source.SetPlaybackPosition(audioParams.Value.PlayOffsetSeconds);
         source.IsLooping = audioParams.Value.Loop;
-
-        // TODO clamp the offset inside of SetPlaybackPosition() itself.
-        var offset = audioParams.Value.PlayOffsetSeconds;
-        offset = Math.Clamp(offset, 0f, (float) audio.Length.TotalSeconds);
-        source.SetPlaybackPosition(offset);
     }
 
     public sealed class PlayingStream : IPlayingAudioStream

Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs

@@ -40,7 +40,7 @@ internal sealed class ClientOccluderSystem : OccluderSystem
             return;
 
         comp.Enabled = enabled;
-        Dirty(uid, comp);
+        Dirty(comp);
 
         var xform = Transform(uid);
         QueueTreeUpdate(uid, comp, xform);

Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs

@@ -1,4 +1,3 @@
-using System;
 using Robust.Shared.Collections;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -6,11 +5,13 @@ using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
+using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Robust.Shared.Serialization;
+using Robust.Shared.Physics.Components;
 using static Robust.Shared.Containers.ContainerManagerComponent;
 
 namespace Robust.Client.GameObjects
@@ -22,20 +23,14 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IDynamicTypeFactoryInternal _dynFactory = default!;
         [Dependency] private readonly PointLightSystem _lightSys = default!;
 
-        private EntityQuery<PointLightComponent> _pointLightQuery;
-        private EntityQuery<SpriteComponent> _spriteQuery;
-
         private readonly HashSet<EntityUid> _updateQueue = new();
 
-        public readonly Dictionary<NetEntity, BaseContainer> ExpectedEntities = new();
+        public readonly Dictionary<EntityUid, IContainer> ExpectedEntities = new();
 
         public override void Initialize()
         {
             base.Initialize();
 
-            _pointLightQuery = GetEntityQuery<PointLightComponent>();
-            _spriteQuery = GetEntityQuery<SpriteComponent>();
-
             EntityManager.EntityInitialized += HandleEntityInitialized;
             SubscribeLocalEvent<ContainerManagerComponent, ComponentHandleState>(HandleComponentState);
 
@@ -48,18 +43,20 @@ namespace Robust.Client.GameObjects
             base.Shutdown();
         }
 
-        protected override void ValidateMissingEntity(EntityUid uid, BaseContainer cont, EntityUid missing)
+        protected override void ValidateMissingEntity(EntityUid uid, IContainer cont, EntityUid missing)
         {
-            var netEntity = GetNetEntity(missing);
-            DebugTools.Assert(ExpectedEntities.TryGetValue(netEntity, out var expectedContainer) && expectedContainer == cont && cont.ExpectedEntities.Contains(netEntity));
+            DebugTools.Assert(ExpectedEntities.TryGetValue(missing, out var expectedContainer) && expectedContainer == cont && cont.ExpectedEntities.Contains(missing));
         }
 
         private void HandleEntityInitialized(EntityUid uid)
         {
-            if (!RemoveExpectedEntity(GetNetEntity(uid), out var container))
+            if (!RemoveExpectedEntity(uid, out var container))
                 return;
 
-            container.Insert(uid, EntityManager, transform: TransformQuery.GetComponent(uid), meta: MetaQuery.GetComponent(uid));
+            if (container.Deleted)
+                return;
+
+            container.Insert(uid);
         }
 
         private void HandleComponentState(EntityUid uid, ContainerManagerComponent component, ref ComponentHandleState args)
@@ -67,24 +64,23 @@ namespace Robust.Client.GameObjects
             if (args.Current is not ContainerManagerComponentState cast)
                 return;
 
-            var xform = TransformQuery.GetComponent(uid);
+            var metaQuery = GetEntityQuery<MetaDataComponent>();
+            var xformQuery = GetEntityQuery<TransformComponent>();
+            var xform = xformQuery.GetComponent(uid);
 
             // Delete now-gone containers.
             var toDelete = new ValueList<string>();
             foreach (var (id, container) in component.Containers)
             {
                 if (cast.Containers.ContainsKey(id))
-                {
-                    DebugTools.Assert(cast.Containers[id].ContainerType == container.GetType().Name);
                     continue;
-                }
 
                 foreach (var entity in container.ContainedEntities.ToArray())
                 {
                     container.Remove(entity,
                         EntityManager,
-                        TransformQuery.GetComponent(entity),
-                        MetaQuery.GetComponent(entity),
+                        xformQuery.GetComponent(entity),
+                        metaQuery.GetComponent(entity),
                         force: true,
                         reparent: false);
 
@@ -102,32 +98,26 @@ namespace Robust.Client.GameObjects
 
             // Add new containers and update existing contents.
 
-            foreach (var (id, data) in cast.Containers)
+            foreach (var (containerType, id, showEnts, occludesLight, entityUids) in cast.Containers.Values)
             {
                 if (!component.Containers.TryGetValue(id, out var container))
                 {
-                    var type = _serializer.FindSerializedType(typeof(BaseContainer), data.ContainerType);
-                    container = _dynFactory.CreateInstanceUnchecked<BaseContainer>(type!, inject:false);
-                    container.Init(id, uid, component);
+                    container = ContainerFactory(component, containerType, id);
                     component.Containers.Add(id, container);
                 }
 
-                DebugTools.Assert(container.ID == id);
-                container.ShowContents = data.ShowContents;
-                container.OccludesLight = data.OccludesLight;
+                // sync show flag
+                container.ShowContents = showEnts;
+                container.OccludesLight = occludesLight;
 
                 // Remove gone entities.
                 var toRemove = new ValueList<EntityUid>();
-
-                DebugTools.Assert(!container.Contains(EntityUid.Invalid));
-
-                var stateNetEnts = data.ContainedEntities;
-                var stateEnts = GetEntityArray(stateNetEnts); // No need to ensure entities.
-
                 foreach (var entity in container.ContainedEntities)
                 {
-                    if (!stateEnts.Contains(entity))
+                    if (!entityUids.Contains(entity))
+                    {
                         toRemove.Add(entity);
+                    }
                 }
 
                 foreach (var entity in toRemove)
@@ -135,8 +125,8 @@ namespace Robust.Client.GameObjects
                     container.Remove(
                         entity,
                         EntityManager,
-                        TransformQuery.GetComponent(entity),
-                        MetaQuery.GetComponent(entity),
+                        xformQuery.GetComponent(entity),
+                        metaQuery.GetComponent(entity),
                         force: true,
                         reparent: false);
 
@@ -144,11 +134,13 @@ namespace Robust.Client.GameObjects
                 }
 
                 // Remove entities that were expected, but have been removed from the container.
-                var removedExpected = new ValueList<NetEntity>();
-                foreach (var netEntity in container.ExpectedEntities)
+                var removedExpected = new ValueList<EntityUid>();
+                foreach (var entityUid in container.ExpectedEntities)
                 {
-                    if (!stateNetEnts.Contains(netEntity))
-                        removedExpected.Add(netEntity);
+                    if (!entityUids.Contains(entityUid))
+                    {
+                        removedExpected.Add(entityUid);
+                    }
                 }
 
                 foreach (var entityUid in removedExpected)
@@ -157,20 +149,14 @@ namespace Robust.Client.GameObjects
                 }
 
                 // Add new entities.
-                for (var i = 0; i < stateNetEnts.Length; i++)
+                foreach (var entity in entityUids)
                 {
-                    var entity = stateEnts[i];
-                    var netEnt = stateNetEnts[i];
-                    if (!entity.IsValid())
+                    if (!EntityManager.TryGetComponent(entity, out MetaDataComponent? meta))
                     {
-                        DebugTools.Assert(netEnt.IsValid());
-                        AddExpectedEntity(netEnt, container);
+                        AddExpectedEntity(entity, container);
                         continue;
                     }
 
-                    var meta = MetaData(entity);
-                    DebugTools.Assert(meta.NetEntity == netEnt);
-
                     // If an entity is currently in the shadow realm, it means we probably left PVS and are now getting
                     // back into range. We do not want to directly insert this entity, as IF the container and entity
                     // transform states did not get sent simultaneously, the entity's transform will be modified by the
@@ -180,18 +166,18 @@ namespace Robust.Client.GameObjects
                     // containers/players.
                     if ((meta.Flags & MetaDataFlags.Detached) != 0)
                     {
-                        AddExpectedEntity(netEnt, container);
+                        AddExpectedEntity(entity, container);
                         continue;
                     }
 
                     if (container.Contains(entity))
                         continue;
 
-                    RemoveExpectedEntity(netEnt, out _);
+                    RemoveExpectedEntity(entity, out _);
                     container.Insert(entity, EntityManager,
-                        TransformQuery.GetComponent(entity),
+                        xformQuery.GetComponent(entity),
                         xform,
-                        MetaQuery.GetComponent(entity),
+                        metaQuery.GetComponent(entity),
                         force: true);
 
                     DebugTools.Assert(container.Contains(entity));
@@ -212,7 +198,7 @@ namespace Robust.Client.GameObjects
             if (message.OldParent != null && message.OldParent.Value.IsValid())
                 return;
 
-            if (!RemoveExpectedEntity(GetNetEntity(message.Entity), out var container))
+            if (!RemoveExpectedEntity(message.Entity, out var container))
                 return;
 
             if (xform.ParentUid != container.Owner)
@@ -222,69 +208,84 @@ namespace Robust.Client.GameObjects
                 return;
             }
 
+            if (container.Deleted)
+                return;
+
             container.Insert(message.Entity, EntityManager);
         }
 
-        public void AddExpectedEntity(NetEntity netEntity, BaseContainer container)
+        private IContainer ContainerFactory(ContainerManagerComponent component, string containerType, string id)
         {
-#if DEBUG
-            var uid = GetEntity(netEntity);
+            var type = _serializer.FindSerializedType(typeof(IContainer), containerType);
+            if (type is null) throw new ArgumentException($"Container of type {containerType} for id {id} cannot be found.");
 
-            if (TryComp<MetaDataComponent>(uid, out var meta))
-            {
-                DebugTools.Assert((meta.Flags & ( MetaDataFlags.Detached | MetaDataFlags.InContainer) ) == MetaDataFlags.Detached,
-                    $"Adding entity {ToPrettyString(uid)} to list of expected entities for container {container.ID} in {ToPrettyString(container.Owner)}, despite it already being in a container.");
-            }
-#endif
+            var newContainer = _dynFactory.CreateInstanceUnchecked<BaseContainer>(type);
+            newContainer.ID = id;
+            newContainer.Manager = component;
+            return newContainer;
+        }
 
-            if (!ExpectedEntities.TryAdd(netEntity, container))
+        public void AddExpectedEntity(EntityUid uid, IContainer container)
+        {
+            DebugTools.Assert(!TryComp(uid, out MetaDataComponent? meta) ||
+                (meta.Flags & ( MetaDataFlags.Detached | MetaDataFlags.InContainer) ) == MetaDataFlags.Detached,
+                $"Adding entity {ToPrettyString(uid)} to list of expected entities for container {container.ID} in {ToPrettyString(container.Owner)}, despite it already being in a container.");
+
+            if (!ExpectedEntities.TryAdd(uid, container))
             {
                 // It is possible that we were expecting this entity in one container, but it has now moved to another
                 // container, and this entity's state is just being applied before the old container is getting updated.
-                var oldContainer = ExpectedEntities[netEntity];
-                ExpectedEntities[netEntity] = container;
-                DebugTools.Assert(oldContainer.ExpectedEntities.Contains(netEntity),
-                    $"Entity {netEntity} is expected, but not expected in the given container? Container: {oldContainer.ID} in {ToPrettyString(oldContainer.Owner)}");
-                oldContainer.ExpectedEntities.Remove(netEntity);
+                var oldContainer = ExpectedEntities[uid];
+                ExpectedEntities[uid] = container;
+                DebugTools.Assert(oldContainer.ExpectedEntities.Contains(uid),
+                    $"Entity {ToPrettyString(uid)} is expected, but not expected in the given container? Container: {oldContainer.ID} in {ToPrettyString(oldContainer.Owner)}");
+                oldContainer.ExpectedEntities.Remove(uid);
             }
 
-            DebugTools.Assert(!container.ExpectedEntities.Contains(netEntity),
-                $"Contained entity {netEntity} was not yet expected by the system, but was already expected by the container: {container.ID} in {ToPrettyString(container.Owner)}");
-            container.ExpectedEntities.Add(netEntity);
+            DebugTools.Assert(!container.ExpectedEntities.Contains(uid),
+                $"Contained entity {ToPrettyString(uid)} was not yet expected by the system, but was already expected by the container: {container.ID} in {ToPrettyString(container.Owner)}");
+            container.ExpectedEntities.Add(uid);
         }
 
-        public bool RemoveExpectedEntity(NetEntity netEntity, [NotNullWhen(true)] out BaseContainer? container)
+        public bool RemoveExpectedEntity(EntityUid uid, [NotNullWhen(true)] out IContainer? container)
         {
-            if (!ExpectedEntities.Remove(netEntity, out container))
+            if (!ExpectedEntities.Remove(uid, out container))
                 return false;
 
-            DebugTools.Assert(container.ExpectedEntities.Contains(netEntity),
-                $"While removing expected contained entity {ToPrettyString(netEntity)}, the entity was missing from the container expected set. Container: {container.ID} in {ToPrettyString(container.Owner)}");
-            container.ExpectedEntities.Remove(netEntity);
+            DebugTools.Assert(container.ExpectedEntities.Contains(uid),
+                $"While removing expected contained entity {ToPrettyString(uid)}, the entity was missing from the container expected set. Container: {container.ID} in {ToPrettyString(container.Owner)}");
+            container.ExpectedEntities.Remove(uid);
             return true;
         }
 
         public override void FrameUpdate(float frameTime)
         {
             base.FrameUpdate(frameTime);
+            var pointQuery = EntityManager.GetEntityQuery<PointLightComponent>();
+            var spriteQuery = EntityManager.GetEntityQuery<SpriteComponent>();
+            var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
 
             foreach (var toUpdate in _updateQueue)
             {
                 if (Deleted(toUpdate))
                     continue;
 
-                UpdateEntityRecursively(toUpdate);
+                UpdateEntityRecursively(toUpdate, xformQuery, pointQuery, spriteQuery);
             }
 
             _updateQueue.Clear();
         }
 
-        private void UpdateEntityRecursively(EntityUid entity)
+        private void UpdateEntityRecursively(
+            EntityUid entity,
+            EntityQuery<TransformComponent> xformQuery,
+            EntityQuery<PointLightComponent> pointQuery,
+            EntityQuery<SpriteComponent> spriteQuery)
         {
             // Recursively go up parents and containers to see whether both sprites and lights need to be occluded
             // Could maybe optimise this more by checking nearest parent that has sprite / light and whether it's container
             // occluded but this probably isn't a big perf issue.
-            var xform = TransformQuery.GetComponent(entity);
+            var xform = xformQuery.GetComponent(entity);
             var parent = xform.ParentUid;
             var child = entity;
             var spriteOccluded = false;
@@ -292,7 +293,7 @@ namespace Robust.Client.GameObjects
 
             while (parent.IsValid() && (!spriteOccluded || !lightOccluded))
             {
-                var parentXform = TransformQuery.GetComponent(parent);
+                var parentXform = xformQuery.GetComponent(parent);
                 if (TryComp<ContainerManagerComponent>(parent, out var manager) && manager.TryGetContainer(child, out var container))
                 {
                     spriteOccluded = spriteOccluded || !container.ShowContents;
@@ -307,21 +308,24 @@ namespace Robust.Client.GameObjects
             // This is the CBT bit.
             // The issue is we need to go through the children and re-check whether they are or are not contained.
             // if they are contained then the occlusion values may need updating for all those children
-            UpdateEntity(entity, xform, spriteOccluded, lightOccluded);
+            UpdateEntity(entity, xform, xformQuery, pointQuery, spriteQuery, spriteOccluded, lightOccluded);
         }
 
         private void UpdateEntity(
             EntityUid entity,
             TransformComponent xform,
+            EntityQuery<TransformComponent> xformQuery,
+            EntityQuery<PointLightComponent> pointQuery,
+            EntityQuery<SpriteComponent> spriteQuery,
             bool spriteOccluded,
             bool lightOccluded)
         {
-            if (_spriteQuery.TryGetComponent(entity, out var sprite))
+            if (spriteQuery.TryGetComponent(entity, out var sprite))
             {
                 sprite.ContainerOccluded = spriteOccluded;
             }
 
-            if (_pointLightQuery.TryGetComponent(entity, out var light))
+            if (pointQuery.TryGetComponent(entity, out var light))
                 _lightSys.SetContainerOccluded(entity, lightOccluded, light);
 
             var childEnumerator = xform.ChildEnumerator;
@@ -342,14 +346,14 @@ namespace Robust.Client.GameObjects
                         childLightOccluded = childLightOccluded || container.OccludesLight;
                     }
 
-                    UpdateEntity(child.Value, TransformQuery.GetComponent(child.Value), childSpriteOccluded, childLightOccluded);
+                    UpdateEntity(child.Value, xformQuery.GetComponent(child.Value), xformQuery, pointQuery, spriteQuery, childSpriteOccluded, childLightOccluded);
                 }
             }
             else
             {
                 while (childEnumerator.MoveNext(out var child))
                 {
-                    UpdateEntity(child.Value, TransformQuery.GetComponent(child.Value), spriteOccluded, lightOccluded);
+                    UpdateEntity(child.Value, xformQuery.GetComponent(child.Value), xformQuery, pointQuery, spriteQuery, spriteOccluded, lightOccluded);
                 }
             }
         }

Robust.Client/GameObjects/EntitySystems/DebugEntityLookupSystem.cs

@@ -38,8 +38,7 @@ public sealed class DebugEntityLookupSystem : EntitySystem
                 IoCManager.Resolve<IOverlayManager>().AddOverlay(
                     new EntityLookupOverlay(
                         EntityManager,
-                        EntityManager.System<EntityLookupSystem>(),
-                        EntityManager.System<SharedTransformSystem>()));
+                        Get<EntityLookupSystem>()));
             }
             else
             {
@@ -53,35 +52,31 @@ public sealed class DebugEntityLookupSystem : EntitySystem
 
 public sealed class EntityLookupOverlay : Overlay
 {
-    private readonly IEntityManager _entityManager;
-    private readonly EntityLookupSystem _lookup;
-    private readonly SharedTransformSystem _transform;
-
-    private EntityQuery<TransformComponent> _xformQuery;
+    private IEntityManager _entityManager = default!;
+    private EntityLookupSystem _lookup = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-    public EntityLookupOverlay(IEntityManager entManager, EntityLookupSystem lookup, SharedTransformSystem transform)
+    public EntityLookupOverlay(IEntityManager entManager, EntityLookupSystem lookup)
     {
         _entityManager = entManager;
         _lookup = lookup;
-        _xformQuery = entManager.GetEntityQuery<TransformComponent>();
-        _transform = transform;
     }
 
     protected internal override void Draw(in OverlayDrawArgs args)
     {
         var worldHandle = args.WorldHandle;
-        var worldBounds = args.WorldBounds;
+        var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
 
-        // TODO: Static version
-        _lookup.FindLookupsIntersecting(args.MapId, worldBounds, (uid, lookup) =>
+        foreach (var lookup in _lookup.FindLookupsIntersecting(args.MapId, args.WorldBounds))
         {
-            var (_, rotation, matrix, invMatrix) = _transform.GetWorldPositionRotationMatrixWithInv(uid);
+            var lookupXform = xformQuery.GetComponent(lookup.Owner);
+
+            var (_, rotation, matrix, invMatrix) = lookupXform.GetWorldPositionRotationMatrixWithInv();
 
             worldHandle.SetTransform(matrix);
 
-            var lookupAABB = invMatrix.TransformBox(worldBounds);
+            var lookupAABB = invMatrix.TransformBox(args.WorldBounds);
             var ents = new List<EntityUid>();
 
             lookup.DynamicTree.QueryAabb(ref ents, static (ref List<EntityUid> state, in FixtureProxy value) =>
@@ -110,22 +105,20 @@ public sealed class EntityLookupOverlay : Overlay
 
             foreach (var ent in ents)
             {
-                if (_entityManager.Deleted(ent))
-                    continue;
-
-                var xform = _xformQuery.GetComponent(ent);
+                if (_entityManager.Deleted(ent)) continue;
+                var xform = xformQuery.GetComponent(ent);
 
                 //DebugTools.Assert(!ent.IsInContainer(_entityManager));
-                var (entPos, entRot) = _transform.GetWorldPositionRotation(ent);
+                var (entPos, entRot) = xform.GetWorldPositionRotation();
 
                 var lookupPos = invMatrix.Transform(entPos);
                 var lookupRot = entRot - rotation;
 
-                var aabb = _lookup.GetAABB(ent, lookupPos, lookupRot, xform, _xformQuery);
+                var aabb = _lookup.GetAABB(ent, lookupPos, lookupRot, xform, xformQuery);
 
                 worldHandle.DrawRect(aabb, Color.Blue.WithAlpha(0.2f));
             }
-        });
+        }
 
         worldHandle.SetTransform(Matrix3.Identity);
     }

Robust.Client/GameObjects/EntitySystems/EyeSystem.cs

@@ -1,86 +0,0 @@
-using Robust.Client.Graphics;
-using Robust.Client.Physics;
-using Robust.Client.Player;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Graphics;
-using Robust.Shared.IoC;
-using Robust.Shared.Player;
-
-namespace Robust.Client.GameObjects;
-
-public sealed class EyeSystem : SharedEyeSystem
-{
-    [Dependency] private readonly IEyeManager _eyeManager = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<EyeComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<EyeComponent, LocalPlayerDetachedEvent>(OnEyeDetached);
-        SubscribeLocalEvent<EyeComponent, LocalPlayerAttachedEvent>(OnEyeAttached);
-        SubscribeLocalEvent<EyeComponent, AfterAutoHandleStateEvent>(OnEyeAutoState);
-
-        // Make sure this runs *after* entities have been moved by interpolation and movement.
-        UpdatesAfter.Add(typeof(TransformSystem));
-        UpdatesAfter.Add(typeof(PhysicsSystem));
-    }
-
-    private void OnEyeAutoState(EntityUid uid, EyeComponent component, ref AfterAutoHandleStateEvent args)
-    {
-        UpdateEye(component);
-    }
-
-    private void OnEyeAttached(EntityUid uid, EyeComponent component, LocalPlayerAttachedEvent args)
-    {
-        // TODO: This probably shouldn't be nullable bruv.
-        if (component._eye != null)
-        {
-            _eyeManager.CurrentEye = component._eye;
-        }
-
-        var ev = new EyeAttachedEvent(uid, component);
-        RaiseLocalEvent(uid, ref ev, true);
-    }
-
-    private void OnEyeDetached(EntityUid uid, EyeComponent component, LocalPlayerDetachedEvent args)
-    {
-        _eyeManager.ClearCurrentEye();
-    }
-
-    private void OnInit(EntityUid uid, EyeComponent component, ComponentInit args)
-    {
-        component._eye = new Eye
-        {
-            Position = Transform(uid).MapPosition,
-            Zoom = component.Zoom,
-            DrawFov = component.DrawFov,
-            Rotation = component.Rotation,
-        };
-    }
-
-    /// <inheritdoc />
-    public override void FrameUpdate(float frameTime)
-    {
-        var query = AllEntityQuery<EyeComponent>();
-
-        while (query.MoveNext(out var uid, out var eyeComponent))
-        {
-            if (eyeComponent._eye == null)
-                continue;
-
-            if (!TryComp<TransformComponent>(eyeComponent.Target, out var xform))
-            {
-                xform = Transform(uid);
-                eyeComponent.Target = null;
-            }
-
-            eyeComponent._eye.Position = xform.MapPosition;
-        }
-    }
-}
-
-/// <summary>
-/// Raised on an entity when it is attached to one with an <see cref="EyeComponent"/>
-/// </summary>
-[ByRefEvent]
-public readonly record struct EyeAttachedEvent(EntityUid Entity, EyeComponent Component);

Robust.Client/GameObjects/EntitySystems/EyeUpdateSystem.cs

@@ -0,0 +1,43 @@
+using System;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Client.Physics;
+using Robust.Client.Player;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Timing;
+
+#nullable enable
+
+namespace Robust.Client.GameObjects
+{
+    /// <summary>
+    /// Updates the position of every Eye every frame, so that the camera follows the player around.
+    /// </summary>
+    [UsedImplicitly]
+    public sealed class EyeUpdateSystem : EntitySystem
+    {
+        /// <inheritdoc />
+        public override void Initialize()
+        {
+            base.Initialize();
+            // Make sure this runs *after* entities have been moved by interpolation and movement.
+            UpdatesAfter.Add(typeof(TransformSystem));
+            UpdatesAfter.Add(typeof(PhysicsSystem));
+        }
+
+        /// <inheritdoc />
+        public override void FrameUpdate(float frameTime)
+        {
+            foreach (var eyeComponent in EntityManager.EntityQuery<EyeComponent>(true))
+            {
+                eyeComponent.UpdateEyePosition();
+            }
+        }
+    }
+}

Robust.Client/GameObjects/EntitySystems/GridChunkBoundsDebugSystem.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
@@ -59,8 +58,6 @@ namespace Robust.Client.GameObjects
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-        private List<Entity<MapGridComponent>> _grids = new();
-
         public GridChunkBoundsOverlay(IEntityManager entManager, IEyeManager eyeManager, IMapManager mapManager)
         {
             _entityManager = entManager;
@@ -74,19 +71,17 @@ namespace Robust.Client.GameObjects
             var viewport = args.WorldBounds;
             var worldHandle = args.WorldHandle;
 
-            _grids.Clear();
-            _mapManager.FindGridsIntersecting(currentMap, viewport, ref _grids);
-            foreach (var grid in _grids)
+            foreach (var grid in _mapManager.FindGridsIntersecting(currentMap, viewport))
             {
-                var worldMatrix = _entityManager.GetComponent<TransformComponent>(grid).WorldMatrix;
+                var worldMatrix = _entityManager.GetComponent<TransformComponent>(grid.Owner).WorldMatrix;
                 worldHandle.SetTransform(worldMatrix);
                 var transform = new Transform(Vector2.Zero, Angle.Zero);
 
-                var chunkEnumerator = grid.Comp.GetMapChunks(viewport);
+                var chunkEnumerator = grid.GetMapChunks(viewport);
 
                 while (chunkEnumerator.MoveNext(out var chunk))
                 {
-                    foreach (var fixture in chunk.Fixtures.Values)
+                    foreach (var fixture in chunk.Fixtures)
                     {
                         var poly = (PolygonShape) fixture.Shape;
 

Robust.Client/GameObjects/EntitySystems/GridRenderingSystem.cs

@@ -16,9 +16,4 @@ internal sealed class GridRenderingSystem : EntitySystem
     {
         _clyde.RegisterGridEcsEvents();
     }
-
-    public override void Shutdown()
-    {
-        _clyde.ShutdownGridEcsEvents();
-    }
 }

Robust.Client/GameObjects/EntitySystems/InputSystem.cs

@@ -3,13 +3,16 @@ using System.Numerics;
 using Robust.Client.GameStates;
 using Robust.Client.Input;
 using Robust.Client.Player;
+using Robust.Shared;
+using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Player;
+using Robust.Shared.Maths;
+using Robust.Shared.Players;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -49,7 +52,7 @@ namespace Robust.Client.GameObjects
         /// <param name="message">Arguments for this event.</param>
         /// <param name="replay">if true, current cmd state will not be checked or updated - use this for "replaying" an
         /// old input that was saved or buffered until further processing could be done</param>
-        public bool HandleInputCommand(ICommonSession? session, BoundKeyFunction function, IFullInputCmdMessage message, bool replay = false)
+        public bool HandleInputCommand(ICommonSession? session, BoundKeyFunction function, FullInputCmdMessage message, bool replay = false)
         {
             #if DEBUG
 
@@ -75,27 +78,14 @@ namespace Robust.Client.GameObjects
                     continue;
 
                 // local handlers can block sending over the network.
-                if (handler.HandleCmdMessage(EntityManager, session, message))
+                if (handler.HandleCmdMessage(session, message))
                 {
                     return true;
                 }
             }
 
             // send it off to the server
-            var clientMsg = (ClientFullInputCmdMessage)message;
-            var fullMsg = new FullInputCmdMessage(
-                clientMsg.Tick,
-                clientMsg.SubTick,
-                (int)clientMsg.InputSequence,
-                clientMsg.InputFunctionId,
-                clientMsg.State,
-                GetNetCoordinates(clientMsg.Coordinates),
-                clientMsg.ScreenCoordinates)
-            {
-                Uid = GetNetEntity(clientMsg.Uid)
-            };
-
-            DispatchInputCommand(clientMsg, fullMsg);
+            DispatchInputCommand(message);
             return false;
         }
 
@@ -103,7 +93,7 @@ namespace Robust.Client.GameObjects
         /// Handle a predicted input command.
         /// </summary>
         /// <param name="inputCmd">Input command to handle as predicted.</param>
-        public void PredictInputCommand(IFullInputCmdMessage inputCmd)
+        public void PredictInputCommand(FullInputCmdMessage inputCmd)
         {
             DebugTools.AssertNotNull(_playerManager.LocalPlayer);
 
@@ -113,22 +103,21 @@ namespace Robust.Client.GameObjects
             var session = _playerManager.LocalPlayer!.Session;
             foreach (var handler in BindRegistry.GetHandlers(keyFunc))
             {
-                if (handler.HandleCmdMessage(EntityManager, session, inputCmd))
-                    break;
+                if (handler.HandleCmdMessage(session, inputCmd)) break;
             }
             Predicted = false;
 
         }
 
-        private void DispatchInputCommand(ClientFullInputCmdMessage clientMsg, FullInputCmdMessage message)
+        private void DispatchInputCommand(FullInputCmdMessage message)
         {
-            _stateManager.InputCommandDispatched(clientMsg, message);
+            _stateManager.InputCommandDispatched(message);
             EntityManager.EntityNetManager?.SendSystemNetworkMessage(message, message.InputSequence);
         }
 
         public override void Initialize()
         {
-            SubscribeLocalEvent<LocalPlayerAttachedEvent>(OnAttachedEntityChanged);
+            SubscribeLocalEvent<PlayerAttachSysMessage>(OnAttachedEntityChanged);
 
             _conHost.RegisterCommand("incmd",
                 "Inserts an input command into the simulation",
@@ -163,16 +152,16 @@ namespace Robust.Client.GameObjects
             var funcId = _inputManager.NetworkBindMap.KeyFunctionID(keyFunction);
 
             var message = new FullInputCmdMessage(_timing.CurTick, _timing.TickFraction, funcId, state,
-                GetNetCoordinates(coords), new ScreenCoordinates(0, 0, default), NetEntity.Invalid);
+                coords, new ScreenCoordinates(0, 0, default), EntityUid.Invalid);
 
             HandleInputCommand(localPlayer.Session, keyFunction, message);
         }
 
-        private void OnAttachedEntityChanged(LocalPlayerAttachedEvent message)
+        private void OnAttachedEntityChanged(PlayerAttachSysMessage message)
         {
-            if (message.Entity != default) // attach
+            if (message.AttachedEntity != default) // attach
             {
-                SetEntityContextActive(_inputManager, message.Entity);
+                SetEntityContextActive(_inputManager, message.AttachedEntity);
             }
             else // detach
             {
@@ -217,11 +206,49 @@ namespace Robust.Client.GameObjects
             SetEntityContextActive(_inputManager, controlled);
         }
 
-        protected override void PostInject()
+        void IPostInjectInit.PostInject()
         {
-            base.PostInject();
-
             _sawmillInputContext = _logManager.GetSawmill("input.context");
         }
     }
+
+    /// <summary>
+    ///     Entity system message that is raised when the player changes attached entities.
+    /// </summary>
+    public sealed class PlayerAttachSysMessage : EntityEventArgs
+    {
+        /// <summary>
+        ///     New entity the player is attached to.
+        /// </summary>
+        public EntityUid AttachedEntity { get; }
+
+        /// <summary>
+        ///     Creates a new instance of <see cref="PlayerAttachSysMessage"/>.
+        /// </summary>
+        /// <param name="attachedEntity">New entity the player is attached to.</param>
+        public PlayerAttachSysMessage(EntityUid attachedEntity)
+        {
+            AttachedEntity = attachedEntity;
+        }
+    }
+
+    public sealed class PlayerAttachedEvent : EntityEventArgs
+    {
+        public PlayerAttachedEvent(EntityUid entity)
+        {
+            Entity = entity;
+        }
+
+        public EntityUid Entity { get; }
+    }
+
+    public sealed class PlayerDetachedEvent : EntityEventArgs
+    {
+        public PlayerDetachedEvent(EntityUid entity)
+        {
+            Entity = entity;
+        }
+
+        public EntityUid Entity { get; }
+    }
 }

Robust.Client/GameObjects/EntitySystems/PointLightSystem.cs

@@ -1,8 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
 using Robust.Client.ComponentTrees;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
@@ -17,108 +15,59 @@ namespace Robust.Client.GameObjects
         {
             base.Initialize();
             SubscribeLocalEvent<PointLightComponent, ComponentInit>(HandleInit);
-            SubscribeLocalEvent<PointLightComponent, ComponentHandleState>(OnLightHandleState);
-        }
-
-        private void OnLightHandleState(EntityUid uid, PointLightComponent component, ref ComponentHandleState args)
-        {
-            if (args.Current is not PointLightComponentState state)
-                return;
-
-            component.Enabled = state.Enabled;
-            component.Offset = state.Offset;
-            component.Softness = state.Softness;
-            component.CastShadows = state.CastShadows;
-            component.Energy = state.Energy;
-            component.Radius = state.Radius;
-            component.Color = state.Color;
-
-            _lightTree.QueueTreeUpdate(uid, component);
-        }
-
-        public override SharedPointLightComponent EnsureLight(EntityUid uid)
-        {
-            return EnsureComp<PointLightComponent>(uid);
-        }
-
-        public override bool ResolveLight(EntityUid uid, [NotNullWhen(true)] ref SharedPointLightComponent? component)
-        {
-            if (component is not null)
-                return true;
-
-            TryComp<PointLightComponent>(uid, out var comp);
-            component = comp;
-            return component != null;
-        }
-
-        public override bool TryGetLight(EntityUid uid, [NotNullWhen(true)] out SharedPointLightComponent? component)
-        {
-            if (TryComp<PointLightComponent>(uid, out var comp))
-            {
-                component = comp;
-                return true;
-            }
-
-            component = null;
-            return false;
-        }
-
-        public override bool RemoveLightDeferred(EntityUid uid)
-        {
-            return RemCompDeferred<PointLightComponent>(uid);
         }
 
         private void HandleInit(EntityUid uid, PointLightComponent component, ComponentInit args)
         {
-            SetMask(component.MaskPath, component);
+            UpdateMask(component);
         }
 
-        public void SetMask(string? maskPath, PointLightComponent component)
+        internal void UpdateMask(PointLightComponent component)
         {
-            if (maskPath is not null)
-                component.Mask = _resourceCache.GetResource<TextureResource>(maskPath);
+            if (component._maskPath is not null)
+                component.Mask = _resourceCache.GetResource<TextureResource>(component._maskPath);
             else
                 component.Mask = null;
         }
 
         #region Setters
-
-        public void SetContainerOccluded(EntityUid uid, bool occluded, SharedPointLightComponent? comp = null)
+        public void SetContainerOccluded(EntityUid uid, bool occluded, PointLightComponent? comp = null)
         {
-            if (!ResolveLight(uid, ref comp) || occluded == comp.ContainerOccluded || comp is not PointLightComponent clientComp)
+            if (!Resolve(uid, ref comp) || occluded == comp.ContainerOccluded)
                 return;
 
             comp.ContainerOccluded = occluded;
-            Dirty(uid, comp);
+            Dirty(comp);
 
             if (comp.Enabled)
-                _lightTree.QueueTreeUpdate(uid, clientComp);
+                _lightTree.QueueTreeUpdate(uid, comp);
         }
 
         public override void SetEnabled(EntityUid uid, bool enabled, SharedPointLightComponent? comp = null)
         {
-            if (!ResolveLight(uid, ref comp) || enabled == comp.Enabled || comp is not PointLightComponent clientComp)
+            if (!Resolve(uid, ref comp) || enabled == comp.Enabled)
                 return;
 
-            comp.Enabled = enabled;
+            comp._enabled = enabled;
             RaiseLocalEvent(uid, new PointLightToggleEvent(comp.Enabled));
-            Dirty(uid, comp);
+            Dirty(comp);
 
-            if (!comp.ContainerOccluded)
-                _lightTree.QueueTreeUpdate(uid, clientComp);
+            var cast = (PointLightComponent)comp;
+            if (!cast.ContainerOccluded)
+                _lightTree.QueueTreeUpdate(uid, cast);
         }
 
         public override void SetRadius(EntityUid uid, float radius, SharedPointLightComponent? comp = null)
         {
-            if (!ResolveLight(uid, ref comp) || MathHelper.CloseToPercent(radius, comp.Radius) ||
-                comp is not PointLightComponent clientComp)
+            if (!Resolve(uid, ref comp) || MathHelper.CloseToPercent(radius, comp.Radius))
                 return;
 
-            comp.Radius = radius;
-            Dirty(uid, comp);
+            comp._radius = radius;
+            Dirty(comp);
 
-            if (clientComp.TreeUid != null)
-                _lightTree.QueueTreeUpdate(uid, clientComp);
+            var cast = (PointLightComponent)comp;
+            if (cast.TreeUid != null)
+                _lightTree.QueueTreeUpdate(uid, cast);
         }
         #endregion
     }

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

@@ -4,7 +4,6 @@ using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.Utility;
-using Robust.Shared.Graphics;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;

Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs

@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
 using JetBrains.Annotations;
 using Robust.Client.ComponentTrees;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
-using Robust.Client.Utility;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Graphics.RSI;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
@@ -18,7 +15,6 @@ using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 using static Robust.Client.GameObjects.SpriteComponent;
 
 namespace Robust.Client.GameObjects
@@ -187,48 +183,6 @@ namespace Robust.Client.GameObjects
         {
             _queuedFrameUpdate.Add(uid);
         }
-
-        /// <summary>
-        /// Gets the specified frame for this sprite at the specified time.
-        /// </summary>
-        public Texture GetFrame(SpriteSpecifier spriteSpec, TimeSpan curTime)
-        {
-            Texture? sprite = null;
-
-            switch (spriteSpec)
-            {
-                case SpriteSpecifier.Rsi rsi:
-                    var rsiActual = _resourceCache.GetResource<RSIResource>(rsi.RsiPath).RSI;
-                    rsiActual.TryGetState(rsi.RsiState, out var state);
-                    var frames = state!.GetFrames(RsiDirection.South);
-                    var delays = state.GetDelays();
-                    var totalDelay = delays.Sum();
-                    var time = curTime.TotalSeconds % totalDelay;
-                    var delaySum = 0f;
-
-                    for (var i = 0; i < delays.Length; i++)
-                    {
-                        var delay = delays[i];
-                        delaySum += delay;
-
-                        if (time > delaySum)
-                            continue;
-
-                        sprite = frames[i];
-                        break;
-                    }
-
-                    sprite ??= Frame0(spriteSpec);
-                    break;
-                case SpriteSpecifier.Texture texture:
-                    sprite = texture.GetTexture(_resourceCache);
-                    break;
-                default:
-                    throw new NotImplementedException();
-            }
-
-            return sprite;
-        }
     }
 
     /// <summary>

Robust.Client/GameObjects/EntitySystems/TransformSystem.Component.cs

@@ -1,41 +1,44 @@
 using System.Numerics;
-using Robust.Client.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.GameObjects;
 
 public sealed partial class TransformSystem
 {
-    public override void SetLocalPosition(EntityUid uid, Vector2 value, TransformComponent? xform = null)
+    public override void SetLocalPosition(TransformComponent xform, Vector2 value)
     {
-        if (!XformQuery.Resolve(uid, ref xform))
-            return;
-
+        xform.PrevPosition = xform._localPosition;
         xform.NextPosition = value;
-        ActivateLerp(uid, xform);
-        base.SetLocalPosition(uid, value, xform);
+        xform.LerpParent = xform.ParentUid;
+        base.SetLocalPosition(xform, value);
+        ActivateLerp(xform);
     }
 
-    public override void SetLocalRotation(EntityUid uid, Angle value, TransformComponent? xform = null)
+    public override void SetLocalPositionNoLerp(TransformComponent xform, Vector2 value)
     {
-        if (!XformQuery.Resolve(uid, ref xform))
-            return;
-
-        xform.NextRotation = value;
-        ActivateLerp(uid, xform);
-        base.SetLocalRotation(uid, value, xform);
+        xform.NextPosition = null;
+        xform.LerpParent = EntityUid.Invalid;
+        base.SetLocalPositionNoLerp(xform, value);
     }
 
-    public override void SetLocalPositionRotation(EntityUid uid, Vector2 pos, Angle rot, TransformComponent? xform = null)
+    public override void SetLocalRotation(TransformComponent xform, Angle angle)
     {
-        if (!XformQuery.Resolve(uid, ref xform))
-            return;
+        xform.PrevRotation = xform._localRotation;
+        xform.NextRotation = angle;
+        xform.LerpParent = xform.ParentUid;
+        base.SetLocalRotation(xform, angle);
+        ActivateLerp(xform);
+    }
 
+    public override void SetLocalPositionRotation(TransformComponent xform, Vector2 pos, Angle rot)
+    {
+        xform.PrevPosition = xform._localPosition;
         xform.NextPosition = pos;
+        xform.PrevRotation = xform._localRotation;
         xform.NextRotation = rot;
-        ActivateLerp(uid, xform);
-        base.SetLocalPositionRotation(uid, pos, rot, xform);
+        xform.LerpParent = xform.ParentUid;
+        base.SetLocalPositionRotation(xform, pos, rot);
+        ActivateLerp(xform);
     }
 }

Robust.Client/GameObjects/EntitySystems/TransformSystem.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Numerics;
 using JetBrains.Annotations;
@@ -24,15 +25,20 @@ namespace Robust.Client.GameObjects
         private const float MinInterpolationDistance = 0.001f;
         private const float MinInterpolationDistanceSquared = MinInterpolationDistance * MinInterpolationDistance;
 
+        private const double MinInterpolationAngle = Math.PI / 720;
+
+        // 45 degrees.
+        private const double MaxInterpolationAngle = Math.PI / 4;
+
         [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         // Only keep track of transforms actively lerping.
         // Much faster than iterating 3000+ transforms every frame.
-        [ViewVariables] private readonly List<Entity<TransformComponent>> _lerpingTransforms = new();
+        [ViewVariables] private readonly List<TransformComponent> _lerpingTransforms = new();
 
         public void Reset()
         {
-            foreach (var (_, xform) in _lerpingTransforms)
+            foreach (var xform in _lerpingTransforms)
             {
                 xform.ActivelyLerping = false;
                 xform.NextPosition = null;
@@ -42,78 +48,21 @@ namespace Robust.Client.GameObjects
             _lerpingTransforms.Clear();
         }
 
-        public override void ActivateLerp(EntityUid uid, TransformComponent xform)
+        public override void ActivateLerp(TransformComponent xform)
         {
-            // This lerping logic is pretty convoluted and generally assumes that the client does not mispredict.
-            // A more foolproof solution would be to just cache the coordinates at which any given entity was most
-            // recently rendered and using that as the lerp origin. However that'd require enumerating over all entities
-            // every tick which is pretty icky.
-
-            // The general considerations are:
-            // - If the client receives a server state for an entity moving from a->b and predicts nothing else, then it
-            //   should show the entity lerping.
-            // - If the client predicts an entity will move while already lerping due to a state-application, it should
-            //   clear the state's lerp, under the assumption that the client predicted the state and already rendered
-            //   the entity in the state's final position.
-            // - If the client predicts that an entity moves, then we only lerp if this is the first time that the tick
-            //   was predicted. I.e., we assume the entity was already rendered in the final position that was
-            //   previously predicted.
-            // - If the client predicts that an entity should lerp twice in the same tick, then we need to combine them.
-            //   I.e. moving from a->b then b->c, the client should lerp from a->c.
-
-            // If the client predicts an entity moves while already lerping, it should clear the
-            // predict a->b, lerp a->b
-            // predicted a->b, then predict b->c. Lerp b->c
-            // predicted a->b, then predict b->c. Lerp b->c
-            // predicted a->b, predicted b->c, then predict c->d. Lerp c->d
-            // server state a->b, then predicted b->c, lerp b->c
-            // server state a->b, then predicted b->c, then predict d, lerp b->c
-
-            if (_gameTiming.ApplyingState)
-            {
-                if (xform.ActivelyLerping)
-                {
-                    // This should not happen, but can happen if some bad component state application code modifies an entity's coordinates.
-                    Log.Error($"Entity {(ToPrettyString(uid))} tried to lerp twice while applying component states.");
-                    return;
-                }
-
-                _lerpingTransforms.Add((uid, xform));
-                xform.ActivelyLerping = true;
-                xform.PredictedLerp = false;
-                xform.LerpParent = xform.ParentUid;
-                xform.PrevRotation = xform._localRotation;
-                xform.PrevPosition = xform._localPosition;
-                xform.LastLerp = _gameTiming.CurTick;
+            if (xform.ActivelyLerping)
                 return;
-            }
 
-            xform.LastLerp = _gameTiming.CurTick;
-            if (!_gameTiming.IsFirstTimePredicted)
-            {
-                xform.ActivelyLerping = false;
-                return;
-            }
+            xform.ActivelyLerping = true;
+            _lerpingTransforms.Add(xform);
+        }
 
-            if (!xform.ActivelyLerping)
-            {
-                _lerpingTransforms.Add((uid, xform));
-                xform.ActivelyLerping = true;
-                xform.PredictedLerp = true;
-                xform.PrevRotation = xform._localRotation;
-                xform.PrevPosition = xform._localPosition;
-                xform.LerpParent = xform.ParentUid;
-                return;
-            }
-
-            if (!xform.PredictedLerp || xform.LerpParent != xform.ParentUid)
-            {
-                // Existing lerp was not due to prediction, but due to state application. That lerp should already
-                // have been rendered, so we will start a new lerp from the current position.
-                xform.PrevRotation = xform._localRotation;
-                xform.PrevPosition = xform._localPosition;
-                xform.LerpParent = xform.ParentUid;
-            }
+        public override void DeactivateLerp(TransformComponent component)
+        {
+            // this should cause the lerp to do nothing
+            component.NextPosition = null;
+            component.NextRotation = null;
+            component.LerpParent = EntityUid.Invalid;
         }
 
         public override void FrameUpdate(float frameTime)
@@ -124,13 +73,12 @@ namespace Robust.Client.GameObjects
 
             for (var i = 0; i < _lerpingTransforms.Count; i++)
             {
-                var (uid, transform) = _lerpingTransforms[i];
+                var transform = _lerpingTransforms[i];
                 var found = false;
 
                 // Only lerp if parent didn't change.
                 // E.g. entering lockers would do it.
-                if (transform.ActivelyLerping
-                    && transform.LerpParent == transform.ParentUid
+                if (transform.LerpParent == transform.ParentUid
                     && transform.ParentUid.IsValid()
                     && !transform.Deleted)
                 {
@@ -142,7 +90,8 @@ namespace Robust.Client.GameObjects
 
                         if (distance is > MinInterpolationDistanceSquared and < MaxInterpolationDistanceSquared)
                         {
-                            SetLocalPositionNoLerp(uid, Vector2.Lerp(lerpSource, lerpDest, step), transform);
+                            transform.LocalPosition = Vector2.Lerp(lerpSource, lerpDest, step);
+                            // Setting LocalPosition clears LerpPosition so fix that.
                             transform.NextPosition = lerpDest;
                             found = true;
                         }
@@ -152,9 +101,15 @@ namespace Robust.Client.GameObjects
                     {
                         var lerpDest = transform.NextRotation.Value;
                         var lerpSource = transform.PrevRotation;
-                        SetLocalRotationNoLerp(uid, Angle.Lerp(lerpSource, lerpDest, step), transform);
-                        transform.NextRotation = lerpDest;
-                        found = true;
+                        var distance = Math.Abs(Angle.ShortestDistance(lerpDest, lerpSource));
+
+                        if (distance is > MinInterpolationAngle and < MaxInterpolationAngle)
+                        {
+                            transform.LocalRotation = Angle.Lerp(lerpSource, lerpDest, step);
+                            // Setting LocalRotation clears LerpAngle so fix that.
+                            transform.NextRotation = lerpDest;
+                            found = true;
+                        }
                     }
                 }
 

Robust.Client/GameObjects/EntitySystems/UserInterfaceSystem.cs

@@ -1,12 +1,13 @@
+using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Reflection;
 using System;
-using UserInterfaceComponent = Robust.Shared.GameObjects.UserInterfaceComponent;
 
 namespace Robust.Client.GameObjects
 {
+    [UsedImplicitly]
     public sealed class UserInterfaceSystem : SharedUserInterfaceSystem
     {
         [Dependency] private readonly IDynamicTypeFactory _dynamicTypeFactory = default!;
@@ -18,22 +19,41 @@ namespace Robust.Client.GameObjects
             base.Initialize();
 
             SubscribeNetworkEvent<BoundUIWrapMessage>(MessageReceived);
+            SubscribeLocalEvent<ClientUserInterfaceComponent, ComponentInit>(OnUserInterfaceInit);
+            SubscribeLocalEvent<ClientUserInterfaceComponent, ComponentShutdown>(OnUserInterfaceShutdown);
+        }
+
+        private void OnUserInterfaceInit(EntityUid uid, ClientUserInterfaceComponent component, ComponentInit args)
+        {
+            component._interfaces.Clear();
+
+            foreach (var data in component._interfaceData)
+            {
+                component._interfaces[data.UiKey] = data;
+            }
+        }
+
+        private void OnUserInterfaceShutdown(EntityUid uid, ClientUserInterfaceComponent component, ComponentShutdown args)
+        {
+            foreach (var bui in component.OpenInterfaces.Values)
+            {
+                bui.Dispose();
+            }
         }
 
         private void MessageReceived(BoundUIWrapMessage ev)
         {
-            var uid = GetEntity(ev.Entity);
-
-            if (!TryComp<UserInterfaceComponent>(uid, out var cmp))
+            var uid = ev.Entity;
+            if (!TryComp<ClientUserInterfaceComponent>(uid, out var cmp))
                 return;
 
             var uiKey = ev.UiKey;
             var message = ev.Message;
             // This should probably not happen at this point, but better make extra sure!
-            if (_playerManager.LocalPlayer != null)
+            if(_playerManager.LocalPlayer != null)
                 message.Session = _playerManager.LocalPlayer.Session;
 
-            message.Entity = GetNetEntity(uid);
+            message.Entity = uid;
             message.UiKey = uiKey;
 
             // Raise as object so the correct type is used.
@@ -46,7 +66,7 @@ namespace Robust.Client.GameObjects
                     break;
 
                 case CloseBoundInterfaceMessage _:
-                    TryCloseUi(message.Session, uid, uiKey, remoteCall: true, uiComp: cmp);
+                    TryCloseUi(uid, uiKey, remoteCall: true, uiComp: cmp);
                     break;
 
                 default:
@@ -57,7 +77,7 @@ namespace Robust.Client.GameObjects
             }
         }
 
-        private bool TryOpenUi(EntityUid uid, Enum uiKey, UserInterfaceComponent? uiComp = null)
+        private bool TryOpenUi(EntityUid uid, Enum uiKey, ClientUserInterfaceComponent? uiComp = null)
         {
             if (!Resolve(uid, ref uiComp))
                 return false;
@@ -65,7 +85,7 @@ namespace Robust.Client.GameObjects
             if (uiComp.OpenInterfaces.ContainsKey(uiKey))
                 return false;
 
-            var data = uiComp.MappedInterfaceData[uiKey];
+            var data = uiComp._interfaces[uiKey];
 
             // TODO: This type should be cached, but I'm too lazy.
             var type = _reflectionManager.LooseGetType(data.ClientType);
@@ -76,13 +96,36 @@ namespace Robust.Client.GameObjects
             uiComp.OpenInterfaces[uiKey] = boundInterface;
 
             var playerSession = _playerManager.LocalPlayer?.Session;
-            if (playerSession != null)
-            {
-                uiComp.Interfaces[uiKey]._subscribedSessions.Add(playerSession);
+            if(playerSession != null)
                 RaiseLocalEvent(uid, new BoundUIOpenedEvent(uiKey, uid, playerSession), true);
-            }
 
             return true;
         }
+
+        internal bool TryCloseUi(EntityUid uid, Enum uiKey, bool remoteCall = false, ClientUserInterfaceComponent? uiComp = null)
+        {
+            if (!Resolve(uid, ref uiComp))
+                return false;
+
+            if (!uiComp.OpenInterfaces.TryGetValue(uiKey, out var boundUserInterface))
+                return false;
+
+            if (!remoteCall)
+                SendUiMessage(boundUserInterface, new CloseBoundInterfaceMessage());
+
+            uiComp.OpenInterfaces.Remove(uiKey);
+            boundUserInterface.Dispose();
+
+            var playerSession = _playerManager.LocalPlayer?.Session;
+            if(playerSession != null)
+                RaiseLocalEvent(uid, new BoundUIClosedEvent(uiKey, uid, playerSession), true);
+
+            return true;
+        }
+
+        internal void SendUiMessage(BoundUserInterface bui, BoundUserInterfaceMessage msg)
+        {
+            RaiseNetworkEvent(new BoundUIWrapMessage(bui.Owner, msg, bui.UiKey));
+        }
     }
 }

Robust.Client/GameObjects/IClientEntityManagerInternal.cs

@@ -6,7 +6,7 @@ namespace Robust.Client.GameObjects
     {
         // These methods are used by the Game State Manager.
 
-        EntityUid CreateEntity(string? prototypeName, out MetaDataComponent metadata);
+        EntityUid CreateEntity(string? prototypeName, EntityUid uid = default);
 
         void InitializeEntity(EntityUid entity, MetaDataComponent? meta = null);
 

Robust.Client/GameStates/ClientDirtySystem.cs

@@ -1,6 +1,7 @@
 using Robust.Client.Timing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Utility;
 using System;
 using System.Collections.Generic;
@@ -14,7 +15,7 @@ public sealed class ClientDirtySystem : EntitySystem
 {
     [Dependency] private readonly IClientGameTiming _timing = default!;
     [Dependency] private readonly IComponentFactory _compFact = default!;
-
+    
     // Entities that have removed networked components
     // could pool the ushort sets, but predicted component changes are rare... soo...
     internal readonly Dictionary<EntityUid, HashSet<ushort>> RemovedComponents = new();
@@ -39,11 +40,11 @@ public sealed class ClientDirtySystem : EntitySystem
 
     private void OnTerminate(ref EntityTerminatingEvent ev)
     {
-        if (!_timing.InPrediction || IsClientSide(ev.Entity))
+        if (!_timing.InPrediction || ev.Entity.IsClientSide())
             return;
 
         // Client-side entity deletion is not supported and will cause errors.
-        Log.Error($"Predicting the deletion of a networked entity: {ToPrettyString(ev.Entity)}. Trace: {Environment.StackTrace}");
+        Logger.Error($"Predicting the deletion of a networked entity: {ToPrettyString(ev.Entity)}. Trace: {Environment.StackTrace}");
     }
 
     private void OnCompRemoved(RemovedComponentEventArgs args)
@@ -51,9 +52,8 @@ public sealed class ClientDirtySystem : EntitySystem
         if (args.Terminating)
             return;
 
-        var uid = args.BaseArgs.Owner;
         var comp = args.BaseArgs.Component;
-        if (!_timing.InPrediction || !comp.NetSyncEnabled || IsClientSide(uid, args.Meta))
+        if (!_timing.InPrediction || comp.Owner.IsClientSide() || !comp.NetSyncEnabled)
             return;
 
         // Was this component added during prediction? If yes, then there is no need to re-add it when resetting.
@@ -62,7 +62,7 @@ public sealed class ClientDirtySystem : EntitySystem
 
         var netId = _compFact.GetRegistration(comp).NetID;
         if (netId != null)
-            RemovedComponents.GetOrNew(uid).Add(netId.Value);
+            RemovedComponents.GetOrNew(comp.Owner).Add(netId.Value);
     }
 
     public void Reset()
@@ -73,7 +73,7 @@ public sealed class ClientDirtySystem : EntitySystem
 
     private void OnEntityDirty(EntityUid e)
     {
-        if (_timing.InPrediction && !IsClientSide(e))
+        if (_timing.InPrediction && !e.IsClientSide())
             DirtyEntities.Add(e);
     }
 }

Robust.Client/GameStates/GameStateProcessor.cs

@@ -1,38 +1,50 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
 using Robust.Client.Timing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
+using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Network.Messages;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Robust.Client.GameStates
 {
     /// <inheritdoc />
-    internal sealed class GameStateProcessor : IGameStateProcessor
+    internal sealed class GameStateProcessor : IGameStateProcessor, IPostInjectInit
     {
+        [Dependency] private ILogManager _logMan = default!;
+
         private readonly IClientGameTiming _timing;
-        private readonly IClientGameStateManager _state;
-        private readonly ISawmill _logger;
 
         private readonly List<GameState> _stateBuffer = new();
 
-        private readonly Dictionary<GameTick, List<NetEntity>> _pvsDetachMessages = new();
+        private readonly Dictionary<GameTick, List<EntityUid>> _pvsDetachMessages = new();
+
+        private ISawmill _logger = default!;
+        private ISawmill _stateLogger = default!;
+
         public GameState? LastFullState { get; private set; }
         public bool WaitingForFull => LastFullStateRequested.HasValue;
-        public (GameTick Tick, DateTime Time)? LastFullStateRequested { get; private set; } = (GameTick.Zero, DateTime.MaxValue);
+        public GameTick? LastFullStateRequested
+        {
+            get => _lastFullStateRequested;
+            set
+            {
+                _lastFullStateRequested = value;
+                LastFullState = null;
+            }
+        }
+
+        public GameTick? _lastFullStateRequested = GameTick.Zero;
 
         private int _bufferSize;
-        private int _maxBufferSize = 512;
-        public const int MinimumMaxBufferSize = 256;
 
         /// <summary>
         /// This dictionary stores the full most recently received server state of any entity. This is used whenever predicted entities get reset.
         /// </summary>
-        internal readonly Dictionary<NetEntity, Dictionary<ushort, ComponentState>> _lastStateFullRep
+        internal readonly Dictionary<EntityUid, Dictionary<ushort, ComponentState>> _lastStateFullRep
             = new();
 
         /// <inheritdoc />
@@ -48,14 +60,7 @@ namespace Robust.Client.GameStates
         public int BufferSize
         {
             get => _bufferSize;
-            set => _bufferSize = Math.Max(value, 0);
-        }
-
-        public int MaxBufferSize
-        {
-            get => _maxBufferSize;
-            // We place a lower bound on the maximum size to avoid spamming servers with full game state requests.
-            set => _maxBufferSize = Math.Max(value, MinimumMaxBufferSize);
+            set => _bufferSize = value < 0 ? 0 : value;
         }
 
         /// <inheritdoc />
@@ -65,12 +70,9 @@ namespace Robust.Client.GameStates
         ///     Constructs a new instance of <see cref="GameStateProcessor"/>.
         /// </summary>
         /// <param name="timing">Timing information of the current state.</param>
-        /// <param name="clientGameStateManager"></param>
-        public GameStateProcessor(IClientGameStateManager state, IClientGameTiming timing, ISawmill logger)
+        public GameStateProcessor(IClientGameTiming timing)
         {
             _timing = timing;
-            _state = state;
-            _logger = logger;
         }
 
         /// <inheritdoc />
@@ -80,7 +82,7 @@ namespace Robust.Client.GameStates
             if (state.ToSequence <= _timing.LastRealTick)
             {
                 if (Logging)
-                    _logger.Debug($"Received Old GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
+                    _stateLogger.Debug($"Received Old GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
 
                 return false;
             }
@@ -92,7 +94,7 @@ namespace Robust.Client.GameStates
                     continue;
 
                 if (Logging)
-                    _logger.Debug($"Received Dupe GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
+                    _stateLogger.Debug($"Received Dupe GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
 
                 return false;
             }
@@ -101,68 +103,34 @@ namespace Robust.Client.GameStates
             if (!WaitingForFull)
             {
                 // This is a good state that we will be using.
-                TryAdd(state);
+                _stateBuffer.Add(state);
                 if (Logging)
-                    _logger.Debug($"Received New GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
+                    _stateLogger.Debug($"Received New GameState: lastRealTick={_timing.LastRealTick}, fSeq={state.FromSequence}, tSeq={state.ToSequence}, sz={state.PayloadSize}, buf={_stateBuffer.Count}");
                 return true;
             }
 
-            if (LastFullState == null && state.FromSequence == GameTick.Zero)
+            if (LastFullState == null && state.FromSequence == GameTick.Zero && state.ToSequence >= LastFullStateRequested!.Value)
             {
-                if (state.ToSequence >= LastFullStateRequested!.Value.Tick)
-                {
-                    LastFullState = state;
-                    _logger.Info($"Received Full GameState: to={state.ToSequence}, sz={state.PayloadSize}");
-                    return true;
-                }
+                LastFullState = state;
 
-                _logger.Info($"Received a late full game state. Received: {state.ToSequence}. Requested: {LastFullStateRequested.Value.Tick}");
+                if (Logging)
+                    _logger.Info($"Received Full GameState: to={state.ToSequence}, sz={state.PayloadSize}");
+
+                return true;
             }
 
             if (LastFullState != null && state.ToSequence <= LastFullState.ToSequence)
             {
-                _logger.Info($"While waiting for full, received late GameState with lower to={state.ToSequence} than the last full state={LastFullState.ToSequence}");
+                if (Logging)
+                    _logger.Info($"While waiting for full, received late GameState with lower to={state.ToSequence} than the last full state={LastFullState.ToSequence}");
+
                 return false;
             }
 
-            TryAdd(state);
+            _stateBuffer.Add(state);
             return true;
         }
 
-        public void TryAdd(GameState state)
-        {
-            if (_stateBuffer.Count <= MaxBufferSize)
-            {
-                _stateBuffer.Add(state);
-                return;
-            }
-
-            // This can happen if a required state gets dropped somehow and the client keeps receiving future
-            // game states that they can't apply. I.e., GetApplicableStateCount() is zero, even though there are many
-            // states in the list.
-            //
-            // This can seemingly happen when the server sends ""reliable"" game states while the client is paused?
-            // For example, when debugging the client, while the server is running:
-            // - The client stops sending acks for states that the server sends out.
-            // - Thus the client will exceed the net.force_ack_threshold cvar
-            // - The server starts sending some packets ""reliably"" and just force updates the clients last ack.
-            //
-            // What should happen is that when the client resumes, it receives the reliably sent states and can just
-            // resume. However, even though the packets are sent ""reliably"", they just seem to get dropped.
-            // I don't quite understand how/why yet, but this ensures the client doesn't get stuck.
-#if FULL_RELEASE
-            _logger.Warning(@$"Exceeded maximum state buffer size!
-Tick: {_timing.CurTick}/{_timing.LastProcessedTick}/{_timing.LastRealTick}
-Size: {_stateBuffer.Count}
-Applicable states: {GetApplicableStateCount()}
-Was waiting for full: {WaitingForFull} {LastFullStateRequested}
-Had full state: {LastFullState != null}"
-            );
-#endif
-
-            _state.RequestFullState();
-        }
-
         /// <summary>
         ///     Attempts to get the current and next states to apply.
         /// </summary>
@@ -183,7 +151,7 @@ Had full state: {LastFullState != null}"
                     "Tried to apply a non-extrapolated state that has too high of a FromSequence!");
 
                 if (Logging)
-                    _logger.Debug($"Applying State:  cTick={_timing.LastProcessedTick}, fSeq={curState.FromSequence}, tSeq={curState.ToSequence}, buf={_stateBuffer.Count}");
+                    _stateLogger.Debug($"Applying State:  cTick={_timing.LastProcessedTick}, fSeq={curState.FromSequence}, tSeq={curState.ToSequence}, buf={_stateBuffer.Count}");
             }
 
             return applyNextState;
@@ -210,10 +178,10 @@ Had full state: {LastFullState != null}"
 
             foreach (var entityState in state.EntityStates.Span)
             {
-                if (!_lastStateFullRep.TryGetValue(entityState.NetEntity, out var compData))
+                if (!_lastStateFullRep.TryGetValue(entityState.Uid, out var compData))
                 {
                     compData = new Dictionary<ushort, ComponentState>();
-                    _lastStateFullRep.Add(entityState.NetEntity, compData);
+                    _lastStateFullRep.Add(entityState.Uid, compData);
                 }
 
                 foreach (var change in entityState.ComponentChanges.Span)
@@ -295,7 +263,7 @@ Had full state: {LastFullState != null}"
             return false;
         }
 
-        internal void AddLeavePvsMessage(List<NetEntity> entities, GameTick tick)
+        internal void AddLeavePvsMessage(List<EntityUid> entities, GameTick tick)
         {
             // Late message may still need to be processed,
             DebugTools.Assert(entities.Count > 0);
@@ -304,9 +272,9 @@ Had full state: {LastFullState != null}"
 
         public void ClearDetachQueue() => _pvsDetachMessages.Clear();
 
-        public List<(GameTick Tick, List<NetEntity> Entities)> GetEntitiesToDetach(GameTick toTick, int budget)
+        public List<(GameTick Tick, List<EntityUid> Entities)> GetEntitiesToDetach(GameTick toTick, int budget)
         {
-            var result = new List<(GameTick Tick, List<NetEntity> Entities)>();
+            var result = new List<(GameTick Tick, List<EntityUid> Entities)>();
             foreach (var (tick, entities) in _pvsDetachMessages)
             {
                 if (tick > toTick)
@@ -375,35 +343,27 @@ Had full state: {LastFullState != null}"
         {
             _stateBuffer.Clear();
             LastFullState = null;
-            LastFullStateRequested = (GameTick.Zero, DateTime.MaxValue);
+            LastFullStateRequested = GameTick.Zero;
         }
 
-        public void OnFullStateRequested(GameTick tick)
+        public void RequestFullState()
         {
             _stateBuffer.Clear();
             LastFullState = null;
-            LastFullStateRequested = (tick, DateTime.UtcNow);
+            LastFullStateRequested = _timing.LastRealTick;
         }
 
-        public void OnFullStateReceived()
+        public void MergeImplicitData(Dictionary<EntityUid, Dictionary<ushort, ComponentState>> implicitData)
         {
-            LastFullState = null;
-            LastFullStateRequested = null;
-        }
-
-        public void MergeImplicitData(Dictionary<NetEntity, Dictionary<ushort, ComponentState>> implicitData)
-        {
-            foreach (var (netEntity, implicitEntState) in implicitData)
+            foreach (var (uid, implicitEntState) in implicitData)
             {
-                var fullRep = _lastStateFullRep[netEntity];
+                var fullRep = _lastStateFullRep[uid];
 
                 foreach (var (netId, implicitCompState) in implicitEntState)
                 {
-                    ref var serverState = ref CollectionsMarshal.GetValueRefOrAddDefault(fullRep, netId, out var exists);
-
-                    if (!exists)
+                    if (!fullRep.TryGetValue(netId, out var serverState))
                     {
-                        serverState = implicitCompState;
+                        fullRep.Add(netId, implicitCompState);
                         continue;
                     }
 
@@ -414,50 +374,37 @@ Had full state: {LastFullState != null}"
                     // state from the entity prototype.
                     if (implicitCompState is not IComponentDeltaState implicitDelta || !implicitDelta.FullState)
                     {
-                        _logger.Error($"Server sent delta state and client failed to construct an implicit full state for entity {netEntity}");
+                        _logger.Error($"Server sent delta state and client failed to construct an implicit full state for entity {uid}");
                         continue;
                     }
 
                     serverDelta.ApplyToFullState(implicitCompState);
-                    serverState = implicitCompState;
+                    fullRep[netId] = implicitCompState;
                     DebugTools.Assert(implicitCompState is IComponentDeltaState d && d.FullState);
                 }
             }
         }
 
-        public Dictionary<ushort, ComponentState> GetLastServerStates(NetEntity netEntity)
+        public Dictionary<ushort, ComponentState> GetLastServerStates(EntityUid entity)
         {
-            return _lastStateFullRep[netEntity];
+            return _lastStateFullRep[entity];
         }
 
-        public Dictionary<NetEntity, Dictionary<ushort, ComponentState>> GetFullRep()
+        public Dictionary<EntityUid, Dictionary<ushort, ComponentState>> GetFullRep()
         {
             return _lastStateFullRep;
         }
 
-        public bool TryGetLastServerStates(NetEntity entity,
+        public bool TryGetLastServerStates(EntityUid entity,
             [NotNullWhen(true)] out Dictionary<ushort, ComponentState>? dictionary)
         {
             return _lastStateFullRep.TryGetValue(entity, out dictionary);
         }
 
-        public bool IsQueuedForDetach(NetEntity entity)
+        public int CalculateBufferSize(GameTick fromTick)
         {
-            // This isn't fast, but its just meant for use in tests & debug asserts.
-            foreach (var msg in _pvsDetachMessages.Values)
-            {
-                if (msg.Contains(entity))
-                    return true;
-            }
-
-            return false;
-        }
-
-        public int GetApplicableStateCount(GameTick? fromTick = null)
-        {
-            fromTick ??= _timing.LastRealTick;
             bool foundState;
-            var nextTick = fromTick.Value;
+            var nextTick = fromTick;
 
             do
             {
@@ -475,9 +422,13 @@ Had full state: {LastFullState != null}"
             }
             while (foundState);
 
-            return (int) (nextTick.Value - fromTick.Value.Value);
+            return (int) (nextTick.Value - fromTick.Value);
         }
 
-        public int StateCount => _stateBuffer.Count;
+        void IPostInjectInit.PostInject()
+        {
+            _logger = _logMan.GetSawmill("net");
+            _stateLogger = _logMan.GetSawmill("net.state");
+        }
     }
 }

Robust.Client/GameStates/IClientGameStateManager.cs

@@ -32,15 +32,7 @@ namespace Robust.Client.GameStates
         /// <summary>
         ///     Number of applicable game states currently in the state buffer.
         /// </summary>
-        int GetApplicableStateCount();
-
-        [Obsolete("use GetApplicableStateCount()")]
-        int CurrentBufferSize => GetApplicableStateCount();
-
-        /// <summary>
-        ///     Total number of game states currently in the state buffer.
-        /// </summary>
-        int StateCount { get; }
+        int CurrentBufferSize { get; }
 
         /// <summary>
         ///     If the buffer size is this many states larger than the target buffer size,
@@ -83,7 +75,7 @@ namespace Robust.Client.GameStates
         /// <summary>
         ///     Applies a given set of game states.
         /// </summary>
-        IEnumerable<NetEntity> ApplyGameState(GameState curState, GameState? nextState);
+        IEnumerable<EntityUid> ApplyGameState(GameState curState, GameState? nextState);
 
         /// <summary>
         ///     Resets any entities that have changed while predicting future ticks.
@@ -94,12 +86,12 @@ namespace Robust.Client.GameStates
         ///     An input command has been dispatched.
         /// </summary>
         /// <param name="message">Message being dispatched.</param>
-        void InputCommandDispatched(ClientFullInputCmdMessage clientMsg, FullInputCmdMessage message);
+        void InputCommandDispatched(FullInputCmdMessage message);
 
         /// <summary>
         ///     Requests a full state from the server. This should override even implicit entity data.
         /// </summary>
-        void RequestFullState(NetEntity? missingEntity = null, GameTick? tick = null);
+        void RequestFullState(EntityUid? missingEntity = null);
 
         uint SystemMessageDispatched<T>(T message) where T : EntityEventArgs;
 
@@ -113,7 +105,7 @@ namespace Robust.Client.GameStates
         /// <summary>
         /// Returns the full collection of cached game states that are used to reset predicted entities.
         /// </summary>
-        Dictionary<NetEntity, Dictionary<ushort, ComponentState>> GetFullRep();
+        Dictionary<EntityUid, Dictionary<ushort, ComponentState>> GetFullRep();
 
         /// <summary>
         /// This will perform some setup in order to reset the game to an earlier state. To fully reset the state
@@ -152,12 +144,12 @@ namespace Robust.Client.GameStates
         /// Queue a collection of entities that are to be detached to null-space & marked as PVS-detached.
         /// This store and modify the list given to it.
         /// </summary>
-        void QueuePvsDetach(List<NetEntity> entities, GameTick tick);
+        void QueuePvsDetach(List<EntityUid> entities, GameTick tick);
 
         /// <summary>
         /// Immediately detach several entities.
         /// </summary>
-        void DetachImmediate(List<NetEntity> entities);
+        void DetachImmediate(List<EntityUid> entities);
 
         /// <summary>
         /// Clears the PVS detach queue.

Robust.Client/GameStates/IGameStateProcessor.cs

@@ -83,22 +83,22 @@ namespace Robust.Client.GameStates
         ///     The data to merge.
         ///     It's a dictionary of entity ID -> (component net ID -> ComponentState)
         /// </param>
-        void MergeImplicitData(Dictionary<NetEntity, Dictionary<ushort, ComponentState>> data);
+        void MergeImplicitData(Dictionary<EntityUid, Dictionary<ushort, ComponentState>> data);
 
         /// <summary>
         ///     Get the last state data from the server for an entity.
         /// </summary>
         /// <returns>Dictionary (net ID -> ComponentState)</returns>
-        Dictionary<ushort, ComponentState> GetLastServerStates(NetEntity entity);
+        Dictionary<ushort, ComponentState> GetLastServerStates(EntityUid entity);
 
         /// <summary>
         ///     Calculate the number of applicable states in the game state buffer from a given tick.
         ///     This includes only applicable states. If there is a gap, future buffers are not included.
         /// </summary>
         /// <param name="fromTick">The tick to calculate from.</param>
-        int GetApplicableStateCount(GameTick? fromTick);
+        int CalculateBufferSize(GameTick fromTick);
 
-        bool TryGetLastServerStates(NetEntity entity,
+        bool TryGetLastServerStates(EntityUid entity,
             [NotNullWhen(true)] out Dictionary<ushort, ComponentState>? dictionary);
     }
 }

Robust.Client/GameStates/NetEntityOverlay.cs

@@ -35,13 +35,13 @@ namespace Robust.Client.GameStates
 
         private readonly Font _font;
         private readonly int _lineHeight;
-        private readonly Dictionary<NetEntity, NetEntData> _netEnts = new();
+        private readonly Dictionary<EntityUid, NetEntData> _netEnts = new();
 
         public NetEntityOverlay()
         {
             IoCManager.InjectDependencies(this);
             var cache = IoCManager.Resolve<IResourceCache>();
-            _font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
+            _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
             _lineHeight = _font.GetLineHeight(1);
 
             _gameStateManager.GameStateApplied += HandleGameStateApplied;
@@ -77,12 +77,12 @@ namespace Robust.Client.GameStates
 
             foreach (var entityState in gameState.EntityStates.Span)
             {
-                if (!_netEnts.TryGetValue(entityState.NetEntity, out var netEnt))
+                if (!_netEnts.TryGetValue(entityState.Uid, out var netEnt))
                 {
                     if (_netEnts.Count >= _maxEnts)
                         continue;
 
-                    _netEnts[entityState.NetEntity] = netEnt = new();
+                    _netEnts[entityState.Uid] = netEnt = new();
                 }
 
                 if (!netEnt.InPVS && netEnt.LastUpdate < gameState.ToSequence)
@@ -119,13 +119,11 @@ namespace Robust.Client.GameStates
             var screenHandle = args.ScreenHandle;
 
             int i = 0;
-            foreach (var (nent, netEnt) in _netEnts)
+            foreach (var (uid, netEnt) in _netEnts)
             {
-                var uid = _entityManager.GetEntity(nent);
-
                 if (!_entityManager.EntityExists(uid))
                 {
-                    _netEnts.Remove(nent);
+                    _netEnts.Remove(uid);
                     continue;
                 }
 

Robust.Client/GameStates/NetGraphOverlay.cs

@@ -26,7 +26,6 @@ namespace Robust.Client.GameStates
         [Dependency] private readonly IClientNetManager _netManager = default!;
         [Dependency] private readonly IClientGameStateManager _gameStateManager = default!;
         [Dependency] private readonly IComponentFactory _componentFactory = default!;
-        [Dependency] private readonly IEntityManager _entManager = default!;
 
         private const int HistorySize = 60 * 5; // number of ticks to keep in history.
         private const int TargetPayloadBps = 56000 / 8; // Target Payload size in Bytes per second. A mind-numbing fifty-six thousand bits per second, who would ever need more?
@@ -54,7 +53,7 @@ namespace Robust.Client.GameStates
         {
             IoCManager.InjectDependencies(this);
             var cache = IoCManager.Resolve<IResourceCache>();
-            _font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
+            _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
 
             _gameStateManager.GameStateApplied += HandleGameStateApplied;
         }
@@ -68,13 +67,13 @@ namespace Robust.Client.GameStates
             var lag = _netManager.ServerChannel!.Ping;
 
             // calc interp info
-            var buffer = _gameStateManager.GetApplicableStateCount();
+            var buffer = _gameStateManager.CurrentBufferSize;
 
             _totalHistoryPayload += sz;
             _history.Add((toSeq, sz, lag, buffer));
 
             // not watching an ent
-            if(!WatchEntId.IsValid() || _entManager.IsClientSide(WatchEntId))
+            if(!WatchEntId.IsValid() || WatchEntId.IsClientSide())
                 return;
 
             string? entStateString = null;
@@ -87,9 +86,7 @@ namespace Robust.Client.GameStates
                 var sb = new StringBuilder();
                 foreach (var entState in entStates.Span)
                 {
-                    var uid = _entManager.GetEntity(entState.NetEntity);
-
-                    if (uid != WatchEntId)
+                    if (entState.Uid != WatchEntId)
                         continue;
 
                     if (!entState.ComponentChanges.HasContents)
@@ -118,9 +115,7 @@ namespace Robust.Client.GameStates
 
             foreach (var ent in args.Detached)
             {
-                var uid = _entManager.GetEntity(ent);
-
-                if (uid != WatchEntId)
+                if (ent != WatchEntId)
                     continue;
 
                 conShell.WriteLine($"watchEnt: Left PVS at tick {args.AppliedState.ToSequence}, eid={WatchEntId}" + "\n");
@@ -131,9 +126,7 @@ namespace Robust.Client.GameStates
             {
                 foreach (var entDelete in entDeletes.Span)
                 {
-                    var uid = _entManager.GetEntity(entDelete);
-
-                    if (uid == WatchEntId)
+                    if (entDelete == WatchEntId)
                         entDelString = "\n  Deleted";
                 }
             }
@@ -268,7 +261,7 @@ namespace Robust.Client.GameStates
                 handle.DrawString(_font, new Vector2(LeftMargin + width, lastLagY), $"{lastLagMs.ToString()}ms");
 
             // buffer text
-            handle.DrawString(_font, new Vector2(LeftMargin, height + LowerGraphOffset), $"{_gameStateManager.GetApplicableStateCount().ToString()} states");
+            handle.DrawString(_font, new Vector2(LeftMargin, height + LowerGraphOffset), $"{_gameStateManager.CurrentBufferSize.ToString()} states");
         }
 
         protected override void DisposeBehavior()
@@ -301,33 +294,30 @@ namespace Robust.Client.GameStates
 
         private sealed class NetWatchEntCommand : LocalizedCommands
         {
-            [Dependency] private readonly IEntityManager _entManager = default!;
-            [Dependency] private readonly IOverlayManager _overlayManager = default!;
-            [Dependency] private readonly IPlayerManager _playerManager = default!;
-
             public override string Command => "net_watchent";
 
             public override void Execute(IConsoleShell shell, string argStr, string[] args)
             {
-                EntityUid? entity;
-
+                EntityUid eValue;
                 if (args.Length == 0)
                 {
-                    entity = _playerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
+                    eValue = IoCManager.Resolve<IPlayerManager>().LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
                 }
-                else if (!NetEntity.TryParse(args[0], out var netEntity) || !_entManager.TryGetEntity(netEntity, out entity))
+                else if (!EntityUid.TryParse(args[0], out eValue))
                 {
                     shell.WriteError("Invalid argument: Needs to be 0 or an entityId.");
                     return;
                 }
 
-                if (!_overlayManager.TryGetOverlay(out NetGraphOverlay? overlay))
+                var overlayMan = IoCManager.Resolve<IOverlayManager>();
+
+                if (!overlayMan.TryGetOverlay(out NetGraphOverlay? overlay))
                 {
-                    overlay = new NetGraphOverlay();
-                    _overlayManager.AddOverlay(overlay);
+                    overlay = new();
+                    overlayMan.AddOverlay(overlay);
                 }
 
-                overlay.WatchEntId = entity.Value;
+                overlay.WatchEntId = eValue;
             }
         }
     }

Robust.Client/GameStates/NetInterpOverlay.cs

@@ -1,19 +1,19 @@
-using System;
 using Robust.Shared.Enums;
 using Robust.Client.Graphics;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Containers;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 
 namespace Robust.Client.GameStates
 {
     internal sealed class NetInterpOverlay : Overlay
     {
-        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -24,11 +24,6 @@ namespace Robust.Client.GameStates
         private readonly SharedContainerSystem _container;
         private readonly SharedTransformSystem _xform;
 
-        /// <summary>
-        /// When an entity stops lerping the overlay will continue to draw a box around the entity for this amount of time.
-        /// </summary>
-        public static readonly TimeSpan Delay = TimeSpan.FromSeconds(2f);
-
         public NetInterpOverlay(EntityLookupSystem lookup)
         {
             IoCManager.InjectDependencies(this);
@@ -45,8 +40,8 @@ namespace Robust.Client.GameStates
             var worldHandle = (DrawingHandleWorld) handle;
             var viewport = args.WorldAABB;
 
-            var query = _entityManager.AllEntityQueryEnumerator<TransformComponent>();
-            while (query.MoveNext(out var uid, out var transform))
+            var query = _entityManager.AllEntityQueryEnumerator<PhysicsComponent, TransformComponent>();
+            while (query.MoveNext(out var uid, out var physics, out var transform))
             {
                 // if not on the same map, continue
                 if (transform.MapID != _eyeManager.CurrentMap || _container.IsEntityInContainer(uid))
@@ -55,8 +50,8 @@ namespace Robust.Client.GameStates
                 if (transform.GridUid == uid)
                     continue;
 
-                var delta = (_timing.CurTick.Value - transform.LastLerp.Value) * _timing.TickPeriod;
-                if(!transform.ActivelyLerping && delta > Delay)
+                // This entity isn't lerping, no need to draw debug info for it
+                if(transform.NextPosition == null)
                     continue;
 
                 var aabb = _lookup.GetWorldAABB(uid);
@@ -66,9 +61,7 @@ namespace Robust.Client.GameStates
                     continue;
 
                 var (pos, rot) = _xform.GetWorldPositionRotation(transform, _entityManager.GetEntityQuery<TransformComponent>());
-                var boxOffset = transform.NextPosition != null
-                    ? transform.NextPosition.Value - transform.LocalPosition
-                    : default;
+                var boxOffset = transform.NextPosition.Value - transform.LocalPosition;
                 var worldOffset = (rot - transform.LocalRotation).RotateVec(boxOffset);
 
                 var nextPos = pos + worldOffset;

Robust.Client/Graphics/AtlasTexture.cs

@@ -1,5 +1,4 @@
 using JetBrains.Annotations;
-using Robust.Shared.Graphics;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 

Robust.Client/Graphics/Audio/ClydeAudio.Formats.OggVorbis.cs

@@ -27,7 +27,7 @@ namespace Robust.Client.Graphics.Audio
                     readSamples += read;
                 }
 
-                return new OggVorbisData(totalSamples, sampleRate, channels, buffer, vorbis.Tags.Title, vorbis.Tags.Artist);
+                return new OggVorbisData(totalSamples, sampleRate, channels, buffer);
             }
         }
 
@@ -37,17 +37,13 @@ namespace Robust.Client.Graphics.Audio
             public readonly long SampleRate;
             public readonly long Channels;
             public readonly ReadOnlyMemory<float> Data;
-            public readonly string Title;
-            public readonly string Artist;
 
-            public OggVorbisData(long totalSamples, long sampleRate, long channels, ReadOnlyMemory<float> data, string title, string artist)
+            public OggVorbisData(long totalSamples, long sampleRate, long channels, ReadOnlyMemory<float> data)
             {
                 TotalSamples = totalSamples;
                 SampleRate = sampleRate;
                 Channels = channels;
                 Data = data;
-                Title = title;
-                Artist = artist;
             }
         }
     }

Robust.Client/Graphics/Audio/ClydeAudio.cs

@@ -261,9 +261,6 @@ namespace Robust.Client.Graphics.Audio
         {
             var source = AL.GenSource();
 
-            if (!AL.IsSource(source))
-                throw new Exception("Failed to generate source. Too many simultaneous audio streams?");
-
             // ReSharper disable once PossibleInvalidOperationException
 
             var audioSource = new BufferedAudioSource(this, source, AL.GenBuffers(buffers), floatAudio);
@@ -329,7 +326,7 @@ namespace Robust.Client.Graphics.Audio
             var handle = new ClydeHandle(_audioSampleBuffers.Count);
             _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
             var length = TimeSpan.FromSeconds(vorbis.TotalSamples / (double) vorbis.SampleRate);
-            return new AudioStream(handle, length, (int) vorbis.Channels, name, vorbis.Title, vorbis.Artist);
+            return new AudioStream(handle, length, (int) vorbis.Channels, name);
         }
 
         public AudioStream LoadAudioWav(Stream stream, string? name = null)

Robust.Client/Graphics/ClientEye/Eye.cs

@@ -1,17 +1,17 @@
-#nullable enable
-
 using System.Numerics;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
 
-namespace Robust.Shared.Graphics
+#nullable enable
+
+namespace Robust.Client.Graphics
 {
     /// <inheritdoc />
     [Virtual]
     public class Eye : IEye
     {
-        private Vector2 _scale = Vector2.One / 2f;
+        private Vector2 _scale = Vector2.One/2f;
         private Angle _rotation = Angle.Zero;
         private MapCoordinates _coords;
 

Robust.Client/Graphics/ClientEye/EyeManager.cs

@@ -2,7 +2,6 @@ using System.Numerics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
@@ -25,7 +24,6 @@ namespace Robust.Client.Graphics
         [Dependency] private readonly IClyde _displayManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
-        private ISawmill _logMill = default!;
 
         // We default to this when we get set to a null eye.
         private readonly FixedEye _defaultEye = new();
@@ -55,7 +53,6 @@ namespace Robust.Client.Graphics
         void IEyeManager.Initialize()
         {
             MainViewport = _uiManager.MainViewport;
-            _logMill = IoCManager.Resolve<ILogManager>().RootSawmill;
         }
 
         /// <inheritdoc />
@@ -132,14 +129,14 @@ namespace Robust.Client.Graphics
         /// <inheritdoc />
         public ScreenCoordinates CoordinatesToScreen(EntityCoordinates point)
         {
-            return MapToScreen(point.ToMap(_entityManager, _entityManager.System<SharedTransformSystem>()));
+            return MapToScreen(point.ToMap(_entityManager));
         }
 
         public ScreenCoordinates MapToScreen(MapCoordinates point)
         {
             if (CurrentEye.Position.MapId != point.MapId)
             {
-                _logMill.Error($"Attempted to convert map coordinates ({point}) to screen coordinates with an eye on another map ({CurrentEye.Position.MapId})");
+                Logger.Error($"Attempted to convert map coordinates ({point}) to screen coordinates with an eye on another map ({CurrentEye.Position.MapId})");
                 return new(default, WindowId.Invalid);
             }
 
@@ -149,10 +146,12 @@ namespace Robust.Client.Graphics
         /// <inheritdoc />
         public MapCoordinates ScreenToMap(ScreenCoordinates point)
         {
+            var (pos, window) = point;
+
             if (_uiManager.MouseGetControl(point) is not IViewportControl viewport)
                 return default;
 
-            return viewport.ScreenToMap(point.Position);
+            return viewport.ScreenToMap(pos);
         }
 
         /// <inheritdoc />
@@ -160,21 +159,6 @@ namespace Robust.Client.Graphics
         {
             return MainViewport.ScreenToMap(point);
         }
-
-        /// <inheritdoc />
-        public MapCoordinates PixelToMap(ScreenCoordinates point)
-        {
-            if (_uiManager.MouseGetControl(point) is not IViewportControl viewport)
-                return default;
-
-            return viewport.PixelToMap(point.Position);
-        }
-
-        /// <inheritdoc />
-        public MapCoordinates PixelToMap(Vector2 point)
-        {
-            return MainViewport.PixelToMap(point);
-        }
     }
 
     public sealed class CurrentEyeChangedEvent : EntityEventArgs

Robust.Client/Graphics/ClientEye/FixedEye.cs

@@ -1,6 +1,4 @@
-using Robust.Shared.Graphics;
-
-namespace Robust.Client.Graphics
+namespace Robust.Client.Graphics
 {
     /// <summary>
     ///     A fixed eye is an eye which is fixed to one point, its position.

Robust.Client/Graphics/ClientEye/IEye.cs

@@ -1,9 +1,9 @@
-using System.Numerics;
+using System.Numerics;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Robust.Shared.Graphics
+namespace Robust.Client.Graphics
 {
     /// <summary>
     /// An Eye is a point through which the player can view the world.

Robust.Client/Graphics/ClientEye/IEyeManager.cs

@@ -1,6 +1,5 @@
 using System.Numerics;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Graphics;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
@@ -80,16 +79,6 @@ namespace Robust.Client.Graphics
         /// <returns>Corresponding point in the world.</returns>
         MapCoordinates ScreenToMap(Vector2 point);
 
-        /// <summary>
-        /// Similar to <see cref="ScreenToMap(ScreenCoordinates)"/>, except it should compensate for the effects of shaders on viewports.
-        /// </summary>
-        MapCoordinates PixelToMap(ScreenCoordinates point);
-
-        /// <summary>
-        /// Similar to <see cref="ScreenToMap(Vector2)"/>, except it should compensate for the effects of shaders on viewports.
-        /// </summary>
-        MapCoordinates PixelToMap(Vector2 point);
-
         void ClearCurrentEye();
         void Initialize();
     }

Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs

@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;
 using OpenToolkit.Graphics.OpenGL4;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
@@ -40,28 +40,22 @@ namespace Robust.Client.Graphics.Clyde
             gridProgram.SetUniformTextureMaybe(UniILightTexture, TextureUnit.Texture1);
             gridProgram.SetUniform(UniIModUV, new Vector4(0, 0, 1, 1));
 
-            var grids = new List<Entity<MapGridComponent>>();
-            _mapManager.FindGridsIntersecting(mapId, worldBounds, ref grids);
-            foreach (var mapGrid in grids)
+            foreach (var mapGrid in _mapManager.FindGridsIntersecting(mapId, worldBounds))
             {
-                if (!_mapChunkData.ContainsKey(mapGrid))
+                if (!_mapChunkData.ContainsKey(mapGrid.Owner))
                     continue;
 
-                var transform = _entityManager.GetComponent<TransformComponent>(mapGrid);
+                var transform = _entityManager.GetComponent<TransformComponent>(mapGrid.Owner);
                 gridProgram.SetUniform(UniIModelMatrix, transform.WorldMatrix);
-                var enumerator = mapGrid.Comp.GetMapChunks(worldBounds);
-                var data = _mapChunkData[mapGrid];
+                var enumerator = mapGrid.GetMapChunks(worldBounds);
 
                 while (enumerator.MoveNext(out var chunk))
                 {
-                    DebugTools.Assert(chunk.FilledTiles > 0);
-                    if (!data.TryGetValue(chunk.Indices, out MapChunkData? datum))
-                        data[chunk.Indices] = datum = _initChunkBuffers(mapGrid, chunk);
+                    if (_isChunkDirty(mapGrid, chunk))
+                        _updateChunkMesh(mapGrid, chunk);
 
-                    if (datum.Dirty)
-                        _updateChunkMesh(mapGrid, chunk, datum);
+                    var datum = _mapChunkData[mapGrid.Owner][chunk.Indices];
 
-                    DebugTools.Assert(datum.TileCount > 0);
                     if (datum.TileCount == 0)
                         continue;
 
@@ -73,36 +67,22 @@ namespace Robust.Client.Graphics.Clyde
                     CheckGlError();
                 }
             }
-
-            CullEmptyChunks();
         }
 
-        private void CullEmptyChunks()
+        private void _updateChunkMesh(MapGridComponent grid, MapChunk chunk)
         {
-            foreach (var (grid, chunks) in _mapChunkData)
+            var data = _mapChunkData[grid.Owner];
+
+            if (!data.TryGetValue(chunk.Indices, out var datum))
             {
-                var gridComp = _mapManager.GetGridComp(grid);
-                foreach (var (index, chunk) in chunks)
-                {
-                    if (!chunk.Dirty || gridComp.Chunks.ContainsKey(index))
-                    {
-                        DebugTools.Assert(gridComp.Chunks[index].FilledTiles > 0);
-                        continue;
-                    }
-
-                    DeleteChunk(chunk);
-                    chunks.Remove(index);
-                }
+                datum = _initChunkBuffers(grid, chunk);
             }
-        }
 
-        private void _updateChunkMesh(Entity<MapGridComponent> grid, MapChunk chunk, MapChunkData datum)
-        {
             Span<ushort> indexBuffer = stackalloc ushort[_indicesPerChunk(chunk)];
             Span<Vertex2D> vertexBuffer = stackalloc Vertex2D[_verticesPerChunk(chunk)];
 
             var i = 0;
-            var cSz = grid.Comp.ChunkSize;
+            var cSz = grid.ChunkSize;
             var cScaled = chunk.Indices * cSz;
             for (ushort x = 0; x < cSz; x++)
             {
@@ -149,7 +129,7 @@ namespace Robust.Client.Graphics.Clyde
             datum.TileCount = i;
         }
 
-        private unsafe MapChunkData _initChunkBuffers(Entity<MapGridComponent> grid, MapChunk chunk)
+        private unsafe MapChunkData _initChunkBuffers(MapGridComponent grid, MapChunk chunk)
         {
             var vao = GenVertexArray();
             BindVertexArray(vao);
@@ -177,22 +157,41 @@ namespace Robust.Client.Graphics.Clyde
                 Dirty = true
             };
 
+            _mapChunkData[grid.Owner].Add(chunk.Indices, datum);
             return datum;
         }
 
-        private void DeleteChunk(MapChunkData data)
+        private bool _isChunkDirty(MapGridComponent grid, MapChunk chunk)
         {
-            DeleteVertexArray(data.VAO);
-            CheckGlError();
-            data.VBO.Delete();
-            data.EBO.Delete();
+            var data = _mapChunkData[grid.Owner];
+            return !data.TryGetValue(chunk.Indices, out var datum) || datum.Dirty;
+        }
+
+        public void _setChunkDirty(MapGridComponent grid, Vector2i chunk)
+        {
+            var data = _mapChunkData.GetOrNew(grid.Owner);
+            if (data.TryGetValue(chunk, out var datum))
+            {
+                datum.Dirty = true;
+            }
+            // Don't need to set it if we don't have an entry since lack of an entry is treated as dirty.
+        }
+
+        private void _updateOnGridModified(GridModifiedEvent args)
+        {
+            foreach (var (pos, _) in args.Modified)
+            {
+                var grid = args.Grid;
+                var chunk = grid.GridTileToChunkIndices(pos);
+                _setChunkDirty(grid, chunk);
+            }
         }
 
         private void _updateTileMapOnUpdate(ref TileChangedEvent args)
         {
-            var gridData = _mapChunkData.GetOrNew(args.Entity);
-            if (gridData.TryGetValue(args.ChunkIndex, out var data))
-                data.Dirty = true;
+            var grid = _mapManager.GetGrid(args.NewTile.GridUid);
+            var chunk = grid.GridTileToChunkIndices(new Vector2i(args.NewTile.X, args.NewTile.Y));
+            _setChunkDirty(grid, chunk);
         }
 
         private void _updateOnGridCreated(GridStartupEvent ev)
@@ -208,7 +207,10 @@ namespace Robust.Client.Graphics.Clyde
             var data = _mapChunkData[gridId];
             foreach (var chunkDatum in data.Values)
             {
-                DeleteChunk(chunkDatum);
+                DeleteVertexArray(chunkDatum.VAO);
+                CheckGlError();
+                chunkDatum.VBO.Delete();
+                chunkDatum.EBO.Delete();
             }
 
             _mapChunkData.Remove(gridId);