Massive Namespace Cleanup (#3120)

* Engine namespace changes.

* Automated remove redundant using statements.

* Simplified Graphics namespace.

* Apparently the container system stores full type names in the map file.😞 This updates those names.

* API Changes to LocalizationManager.LoadCulture.

* Update submodule to v0.3.2

Content.Benchmarks/ComponentManagerGetAllComponents.cs

@@ -3,11 +3,9 @@ using BenchmarkDotNet.Attributes;
 using Moq;
 using Robust.Shared.Exceptions;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Log;
-using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Reflection;
 
 namespace Content.Benchmarks
 {

Content.Client/Administration/ClientAdminManager.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Administration;
 using Content.Shared.Network.NetMessages;
 using Robust.Client.Console;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Network;
 
 #nullable enable
 

Content.Client/Animations/ReusableAnimations.cs

@@ -1,13 +1,11 @@
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.Components.Animations;
 using Robust.Shared.Animations;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using System;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Animations
 {

Content.Client/Arcade/BlockGameMenu.cs

@@ -6,8 +6,7 @@ using Content.Client.Utility;
 using Content.Shared.Arcade;
 using Content.Shared.Input;
 using Robust.Client.Graphics;
-using Robust.Client.Graphics.Drawing;
-using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;

Content.Client/Atmos/AtmosDebugOverlay.cs

@@ -1,14 +1,10 @@
 using Content.Client.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.EntitySystems.Atmos;
 using Content.Shared.Atmos;
-using Robust.Client.Graphics.ClientEye;
-using Robust.Client.Graphics.Drawing;
-using Robust.Client.Graphics.Overlays;
-using Robust.Client.Interfaces.Graphics;
-using Robust.Client.Interfaces.Graphics.ClientEye;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Map;
+using Robust.Client.Graphics;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Atmos

Content.Client/Atmos/GasTileOverlay.cs

@@ -1,12 +1,8 @@
 using Content.Client.GameObjects.EntitySystems;
-using Robust.Client.Graphics.ClientEye;
-using Robust.Client.Graphics.Drawing;
-using Robust.Client.Graphics.Overlays;
-using Robust.Client.Interfaces.Graphics;
-using Robust.Client.Interfaces.Graphics.ClientEye;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Map;
+using Robust.Client.Graphics;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Atmos

Content.Client/Chat/ChatBox.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Chat;
-using Robust.Client.Graphics.Drawing;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;

Content.Client/Chat/ChatManager.cs

@@ -5,14 +5,11 @@ using Content.Client.Interfaces.Chat;
 using Content.Shared.Administration;
 using Content.Shared.Chat;
 using Robust.Client.Console;
-using Robust.Client.Interfaces.Graphics.ClientEye;
-using Robust.Client.Interfaces.UserInterface;
+using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;

Content.Client/Chat/SpeechBubble.cs

@@ -1,9 +1,9 @@
 using System;
 using Content.Client.Interfaces.Chat;
-using Robust.Client.Interfaces.Graphics.ClientEye;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Timers;
 using Robust.Shared.Timing;

Content.Client/ClickMapManager.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using Robust.Client.Graphics;
-using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.ResourceManagement;
 using Robust.Client.Utility;
 using Robust.Shared.IoC;

Content.Client/ClientNotifyManager.cs

@@ -4,17 +4,16 @@ using System.Collections.Generic;
 using Content.Client.Interfaces;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared;
-using Robust.Client.Interfaces.Graphics.ClientEye;
-using Robust.Client.Interfaces.Input;
-using Robust.Client.Interfaces.UserInterface;
+using Robust.Client.Graphics;
 using Robust.Client.Player;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Console;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Network;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 

Content.Client/ClientPreferencesManager.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using Content.Client.Interfaces;
 using Content.Shared.Network.NetMessages;
 using Content.Shared.Preferences;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
+using Robust.Shared.Network;
 using Robust.Shared.Utility;
 
 namespace Content.Client

Content.Client/Commands/AtmosDebugCommands.cs

@@ -1,9 +1,9 @@
 using JetBrains.Annotations;
 using Content.Client.GameObjects.EntitySystems;
-using Robust.Shared.GameObjects.Systems;
 using Content.Shared.Atmos;
 using System;
 using Robust.Shared.Console;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Commands
 {

Content.Client/Commands/DebugAiCommand.cs

@@ -1,7 +1,7 @@
 using Content.Client.GameObjects.EntitySystems.AI;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Commands
 {

Content.Client/Commands/DebugCommands.cs

@@ -4,13 +4,12 @@ using System;
 using Content.Client.GameObjects.Components;
 using Content.Client.GameObjects.EntitySystems;
 using Content.Client.Interfaces;
-using Content.Shared.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Client.GameObjects;
 using Robust.Shared.Console;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using DrawDepth = Content.Shared.GameObjects.DrawDepth;
 
 namespace Content.Client.Commands
 {

Content.Client/Commands/DebugPathfindingCommand.cs

@@ -1,7 +1,7 @@
 using Content.Client.GameObjects.EntitySystems.AI;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Commands
 {

Content.Client/Commands/HideMechanismsCommand.cs

@@ -3,7 +3,7 @@ using Robust.Client.Console;
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
 using Robust.Shared.Containers;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Client.Commands

Content.Client/Commands/ShowMechanismsCommand.cs

@@ -2,7 +2,7 @@
 using Robust.Client.Console;
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Client.Commands

Content.Client/Commands/ToggleOutlineCommand.cs

@@ -1,6 +1,6 @@
 using Content.Shared;
+using Robust.Shared.Configuration;
 using Robust.Shared.Console;
-using Robust.Shared.Interfaces.Configuration;
 using Robust.Shared.IoC;
 
 namespace Content.Client.Commands

Content.Client/Construction/ConstructionMenu.xaml.cs

@@ -9,15 +9,14 @@ using Content.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.Components.Interactable;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
-using Robust.Client.Interfaces.Placement;
-using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.Placement;
+using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
 using Robust.Shared.Enums;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Client/Construction/ConstructionPlacementHijack.cs

@@ -6,7 +6,7 @@ using Content.Shared.Construction;
 using Robust.Client.Graphics;
 using Robust.Client.Placement;
 using Robust.Client.Utility;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.Client.Construction

Content.Client/EntryPoint.cs

@@ -17,7 +17,6 @@ using Content.Client.Graphics.Overlays;
 using Content.Shared.Actions;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.Components.Cargo;
-using Content.Shared.GameObjects.Components.Chemistry;
 using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
 using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
 using Content.Shared.GameObjects.Components.Gravity;
@@ -28,15 +27,12 @@ using Content.Shared.GameObjects.Components.VendingMachines;
 using Content.Shared.Kitchen;
 using Content.Shared.Alert;
 using Robust.Client;
-using Robust.Client.Interfaces;
-using Robust.Client.Interfaces.Graphics.Overlays;
-using Robust.Client.Interfaces.Input;
-using Robust.Client.Interfaces.State;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
 using Robust.Client.Player;
+using Robust.Client.State;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Interfaces.Configuration;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;

Content.Client/EscapeMenuOwner.cs

@@ -1,12 +1,11 @@
 using Content.Client.State;
 using Content.Client.UserInterface;
 using Robust.Client.Console;
-using Robust.Client.Interfaces.Input;
-using Robust.Client.Interfaces.State;
+using Robust.Client.Input;
+using Robust.Client.State;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 
 namespace Content.Client
 {

Content.Client/Eui/BaseEui.cs

@@ -1,7 +1,7 @@
 using Content.Shared.Eui;
 using Content.Shared.Network.NetMessages;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
+using Robust.Shared.Network;
 
 #nullable enable
 

Content.Client/Eui/EuiManager.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using Content.Shared.Network.NetMessages;
-using Robust.Shared.Interfaces.Network;
-using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
+using Robust.Shared.Network;
+using Robust.Shared.Reflection;
 
 #nullable enable
 

Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using static Content.Shared.GameObjects.Components.Access.SharedIdCardConsoleComponent;
 

Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs

@@ -3,9 +3,7 @@ using Content.Shared.GameObjects.Components.ActionBlocking;
 using Content.Shared.Preferences.Appearance;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.ComponentDependencies;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 

Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs

@@ -3,16 +3,16 @@ using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.UserInterface;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.GameObjects.Components.Actor;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.GameObjects;
+using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.Utility;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
+using Robust.Shared.Network;
 using Robust.Shared.Players;
 
 namespace Content.Client.GameObjects.Components.Actor

Content.Client/GameObjects/Components/Actor/CharacterInterface.cs

@@ -4,11 +4,10 @@ using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.UserInterface;
 using Content.Shared.Input;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.Input;
+using Robust.Client.Input;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Client.GameObjects.Components.Actor

Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs

@@ -1,6 +1,6 @@
 using System;
 using Content.Client.GameObjects.EntitySystems.DoAfter;
-using Robust.Client.Graphics.Drawing;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Maths;
 

Content.Client/GameObjects/Components/AnimationsTestComponent.cs

@@ -1,10 +1,8 @@
 using System;
 using Robust.Client.Animations;
-using Robust.Client.GameObjects.Components.Animations;
-using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Maths;
 
 namespace Content.Client.GameObjects.Components

Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs

@@ -1,10 +1,8 @@
-using System;
-using Content.Client.Arcade;
+using Content.Client.Arcade;
 using Content.Shared.Arcade;
-using Content.Shared.GameObjects.Components.Arcade;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Arcade
 {

Content.Client/GameObjects/Components/Arcade/SpaceVillainArcadeBoundUserInterface.cs

@@ -1,8 +1,8 @@
 using Content.Client.Arcade;
 using Content.Shared.GameObjects.Components.Arcade;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Arcade

Content.Client/GameObjects/Components/Atmos/FireVisualizer.cs

@@ -1,9 +1,7 @@
-using System;
-using Content.Shared.GameObjects.Components.Atmos;
+using Content.Shared.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs

@@ -1,5 +1,5 @@
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using static Content.Shared.GameObjects.Components.SharedGasAnalyzerComponent;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs

@@ -1,8 +1,8 @@
 using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
 using Content.Shared.Utility;
-using Robust.Client.Graphics.Drawing;
-using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;

Content.Client/GameObjects/Components/Atmos/GasAnalyzerVisualizer.cs

@@ -1,7 +1,6 @@
 using Content.Shared.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Atmos/GasCanisterBoundUserInterface.cs

@@ -1,11 +1,8 @@
 #nullable enable
-using System;
-using System.Diagnostics;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
-using Content.Client.GameObjects.Components.Atmos;
 using Content.Shared.GameObjects.Components.Atmos;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/GasCanisterVisualizer.cs

@@ -1,10 +1,6 @@
 using Content.Shared.GameObjects.Components.Atmos;
 using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Atmos/GasCanisterWindow.cs

@@ -1,14 +1,9 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Disposal;
-using Robust.Client.Graphics.Drawing;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using Content.Client.GameObjects.Components.Atmos;
 using Content.Shared.GameObjects.Components.Atmos;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs

@@ -2,8 +2,7 @@
 using Content.Shared.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs

@@ -3,15 +3,11 @@ using Content.Shared.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.ResourceManagement;
-using Robust.Shared.GameObjects.Components.Renderable;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs

@@ -1,8 +1,7 @@
 using Content.Shared.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs

@@ -1,9 +1,8 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Content.Shared.GameObjects.Components.Atmos;
+using Robust.Shared.GameObjects;
 using YamlDotNet.RepresentationModel;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs

@@ -1,9 +1,8 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Content.Shared.GameObjects.Components.Atmos;
+using Robust.Shared.GameObjects;
 using YamlDotNet.RepresentationModel;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs

@@ -3,9 +3,6 @@ using Content.Shared.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.Components.Animations;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Animations;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;

Content.Client/GameObjects/Components/Body/Scanner/BodyScannerBoundUserInterface.cs

@@ -1,9 +1,8 @@
 using System;
 using Content.Shared.GameObjects.Components.Body.Scanner;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Body.Scanner

Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs

@@ -6,7 +6,7 @@ using Content.Shared.GameObjects.Components.Body.Part;
 using Content.Shared.GameObjects.Components.Damage;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Client/GameObjects/Components/Body/Surgery/SurgeryBoundUserInterface.cs

@@ -1,8 +1,8 @@
 #nullable enable
 using Content.Shared.GameObjects.Components.Body.Surgery;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Body.Surgery
 {

Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs

@@ -1,8 +1,7 @@
 using Content.Shared.GameObjects.Components.Botany;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
 namespace Content.Client.GameObjects.Components.Botany

Content.Client/GameObjects/Components/Buckle/BuckleComponent.cs

@@ -1,7 +1,6 @@
 using Content.Shared.GameObjects.Components.Buckle;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Buckle
 {

Content.Client/GameObjects/Components/Buckle/BuckleVisualizer.cs

@@ -4,8 +4,6 @@ using Content.Shared.GameObjects.Components.Strap;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.Components.Animations;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Animations;
 using Robust.Shared.Maths;
 

Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs

@@ -1,9 +1,9 @@
 using Content.Client.UserInterface.Cargo;
 using Content.Shared.GameObjects.Components.Cargo;
 using Content.Shared.Prototypes.Cargo;
-using Robust.Client.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Cargo

Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs

@@ -1,8 +1,8 @@
 #nullable enable
 using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent;
 

Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs

@@ -3,11 +3,11 @@ using System.Linq;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
-using Robust.Client.Graphics.Drawing;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Client/GameObjects/Components/Chemistry/FoamVisualizer.cs

@@ -4,8 +4,6 @@ using Content.Shared.GameObjects.Components.Chemistry;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.Components.Animations;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;

Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs

@@ -2,9 +2,9 @@
 using System.Linq;
 using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent;
 

Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs

@@ -2,11 +2,11 @@
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
-using Robust.Client.Graphics.Drawing;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Client/GameObjects/Components/Chemistry/SmokeVisualizer.cs

@@ -2,7 +2,6 @@
 using Content.Shared.GameObjects.Components.Chemistry;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Maths;
 
 namespace Content.Client.GameObjects.Components.Chemistry

Content.Client/GameObjects/Components/ClickableComponent.cs

@@ -1,9 +1,8 @@
 #nullable enable
 using System;
-using Robust.Client.Graphics.ClientEye;
-using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.Serialization;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;

Content.Client/GameObjects/Components/ClientEntitySpawnerComponent.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
 using System.Collections.Generic;
 

Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
 
 namespace Content.Client.GameObjects.Components.CloningPod

Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs

@@ -1,7 +1,6 @@
 using System;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
 using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent.CloningPodStatus;
 

Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs

@@ -7,7 +7,6 @@ using Content.Shared.GameObjects.Components.Items;
 using Robust.Client.Graphics;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 

Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs

@@ -1,10 +1,10 @@
 using System;
 using Content.Client.Command;
 using Content.Shared.GameObjects.Components.Command;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Command

Content.Client/GameObjects/Components/ComputerVisualizer.cs

@@ -1,8 +1,7 @@
 using Content.Shared.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Configuration/ConfigurationBoundUserInterface.cs

@@ -1,7 +1,7 @@
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using static Content.Shared.GameObjects.Components.SharedConfigurationComponent;
 
 namespace Content.Client.GameObjects.Components.Wires

Content.Client/GameObjects/Components/Construction/MachineFrameVisualizer.cs

@@ -1,7 +1,6 @@
 using Content.Shared.GameObjects.Components.Construction;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 
 namespace Content.Client.GameObjects.Components.Construction
 {

Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs

@@ -2,9 +2,7 @@
 using Content.Shared.GameObjects.Components.Conveyor;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Conveyor/TwoWayLeverVisualizer.cs

@@ -1,11 +1,7 @@
-using System;
-using Content.Shared.GameObjects.Components.Conveyor;
-using Content.Shared.GameObjects.Components.MachineLinking;
+using Content.Shared.GameObjects.Components.MachineLinking;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Crayon/CrayonBoundUserInterface.cs

@@ -1,9 +1,9 @@
 using Content.Shared.GameObjects.Components;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Crayon
 {

Content.Client/GameObjects/Components/Crayon/CrayonDecalVisualizer.cs

@@ -1,7 +1,6 @@
 using Content.Shared.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Maths;
 
 namespace Content.Client.GameObjects.Components.Crayon

Content.Client/GameObjects/Components/Crayon/CrayonWindow.cs

@@ -1,7 +1,6 @@
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.GameObjects.Components;
 using Robust.Client.Graphics;
-using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.Utility;

Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitBoundUserInterface.cs

@@ -1,8 +1,8 @@
 #nullable enable
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Shared.GameObjects;
 using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalMailingUnitComponent;
 
 namespace Content.Client.GameObjects.Components.Disposal

Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs

@@ -1,11 +1,11 @@
 using Content.Shared.GameObjects.Components.Disposal;
-using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using System.Collections.Generic;
+using Robust.Client.Graphics;
 using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalMailingUnitComponent;
 
 namespace Content.Client.GameObjects.Components.Disposal

Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalRouterComponent;
 
 namespace Content.Client.GameObjects.Components.Disposal

Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalTaggerComponent;
 
 namespace Content.Client.GameObjects.Components.Disposal

Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent;
 
 namespace Content.Client.GameObjects.Components.Disposal

Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs

@@ -2,10 +2,7 @@
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.Components.Animations;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent;

Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs

@@ -1,5 +1,5 @@
 using Content.Shared.GameObjects.Components.Disposal;
-using Robust.Client.Graphics.Drawing;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;

Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs

@@ -2,9 +2,7 @@
 using Content.Shared.GameObjects.Components.Disposal;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/DoAfterComponent.cs

@@ -4,10 +4,10 @@ using System.Collections.Generic;
 using Content.Client.GameObjects.EntitySystems.DoAfter;
 using Content.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.Network;
-using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
+using Robust.Shared.Network;
 using Robust.Shared.Players;
+using Robust.Shared.Timing;
 
 namespace Content.Client.GameObjects.Components
 {

Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs

@@ -5,9 +5,7 @@ using Content.Shared.GameObjects.Components.Doors;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.Components.Animations;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/EmergencyLightComponent.cs

@@ -1,7 +1,6 @@
 using System;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.Components.Animations;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;

Content.Client/GameObjects/Components/Explosion/ClusterFlashVisualizer.cs

@@ -1,7 +1,6 @@
 using Content.Shared.GameObjects.Components.Explosion;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/ExtinguisherCabinetVisualizer.cs

@@ -1,7 +1,6 @@
 using Content.Shared.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 
 namespace Content.Client.GameObjects.Components
 {

Content.Client/GameObjects/Components/FlashLightVisualizer.cs

@@ -3,7 +3,6 @@ using Content.Shared.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.Components.Animations;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
 

Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs

@@ -1,7 +1,6 @@
 using Content.Shared.GameObjects.Components.Fluids;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs

@@ -1,8 +1,8 @@
 using Content.Shared.GameObjects.Components.Gravity;
-using Robust.Client.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs

@@ -1,11 +1,11 @@
 #nullable enable
 using Content.Shared.GameObjects.Components.Gravity;
 using Robust.Client.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Utility;
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
 using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components.Gravity

Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs

@@ -7,9 +7,7 @@ using Content.Shared.GameObjects.Components.Inventory;
 using Content.Shared.GameObjects.Components.Movement;
 using Content.Shared.Preferences.Appearance;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;

Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs

@@ -3,11 +3,11 @@ using System.Linq;
 using Content.Client.UserInterface;
 using Content.Client.Utility;
 using JetBrains.Annotations;
-using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs

@@ -5,8 +5,8 @@ using Content.Shared.GameObjects.Components.Inventory;
 using Content.Shared.Input;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Client.GameObjects.Components.HUD.Inventory

Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs

@@ -1,11 +1,9 @@
 using System.Collections.Generic;
 using Content.Client.UserInterface;
 using Content.Shared.GameObjects.Components.GUI;
-using Content.Shared.GameObjects.Components.Inventory;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.Localization;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;

Content.Client/GameObjects/Components/HandheldLightComponent.cs

@@ -1,7 +1,5 @@
-using System;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Utility;
-using Robust.Client.Graphics.Drawing;
+using Content.Shared.GameObjects.Components;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;

Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs

@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using Content.Client.GameObjects.EntitySystems;
 using JetBrains.Annotations;
-using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.Transform;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;

Content.Client/GameObjects/Components/Instruments/InstrumentBoundUserInterface.cs

@@ -1,5 +1,5 @@
 using Content.Client.Instruments;
-using Robust.Client.GameObjects.Components.UserInterface;
+using Robust.Client.GameObjects;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Instruments

Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs

@@ -8,13 +8,11 @@ using Content.Shared.Physics;
 using Robust.Client.Audio.Midi;
 using Robust.Shared.Audio.Midi;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.Timers;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Network;
-using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
+using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Instruments

Content.Client/GameObjects/Components/InteractionOutlineComponent.cs

@@ -1,5 +1,5 @@
-using Robust.Client.Graphics.Shaders;
-using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;

Content.Client/GameObjects/Components/Items/HandsComponent.cs

@@ -1,22 +1,14 @@
 #nullable enable
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Client.Animations;
 using Content.Client.UserInterface;
 using Content.Shared.GameObjects.Components.Items;
-using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.Components.Animations;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
+using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.ViewVariables;