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.IntegrationTests/ContentIntegrationTest.cs

@@ -6,13 +6,12 @@ using Content.Server;
 using Content.Server.Interfaces.GameTicking;
 using Content.Shared;
 using NUnit.Framework;
-using Robust.Server.Interfaces.Maps;
-using Robust.Server.Interfaces.Timing;
+using Robust.Server.Maps;
+using Robust.Server.Timing;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Network;
 using Robust.UnitTesting;
 
 namespace Content.IntegrationTests

Content.IntegrationTests/DummyGameTicker.cs

@@ -5,8 +5,8 @@ using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Roles;
 using Content.Shared.Preferences;
 using Content.Server.Mobs;
-using Robust.Server.Interfaces.Player;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Server.Player;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 

Content.IntegrationTests/Tests/AI/AiControllerTest.cs

@@ -6,12 +6,10 @@ using Content.Shared.Utility;
 using NUnit.Framework;
 using Robust.Server.AI;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Reflection;
 
 namespace Content.IntegrationTests.Tests.AI
 {

Content.IntegrationTests/Tests/AI/SpriteTest.cs

@@ -1,11 +1,10 @@
 #nullable enable
 using System.Threading.Tasks;
 using NUnit.Framework;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.GameObjects;
+using Robust.Client.ResourceManagement;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests.AI

Content.IntegrationTests/Tests/Atmos/AtmosHelpersTest.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Content.Server.Atmos;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 

Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Atmos;
 using NUnit.Framework;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.IntegrationTests.Tests.Atmos
 {

Content.IntegrationTests/Tests/Body/LegTest.cs

@@ -5,8 +5,7 @@ using Content.Shared.GameObjects.Components.Body.Part;
 using Content.Shared.GameObjects.Components.Rotation;
 using NUnit.Framework;
 using Robust.Server.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/Body/LungTest.cs

@@ -9,9 +9,8 @@ using Content.Server.GameObjects.Components.Metabolism;
 using Content.Shared.Atmos;
 using Content.Shared.GameObjects.Components.Body;
 using NUnit.Framework;
-using Robust.Server.Interfaces.Maps;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Server.Maps;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs

@@ -6,8 +6,7 @@ using Content.Shared.GameObjects.Components.Body;
 using Content.Shared.GameObjects.Components.Body.Mechanism;
 using Content.Shared.GameObjects.Components.Body.Part;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/Buckle/BuckleTest.cs

@@ -10,8 +10,7 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
 using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
 using Content.Shared.Utility;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs

@@ -4,8 +4,7 @@ using Content.Shared.Damage;
 using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs.State;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs

@@ -5,8 +5,8 @@ using Content.Server.GameTicking;
 using Content.Server.Interfaces.GameTicking;
 using Content.Shared;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.Configuration;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Timing;
 
 namespace Content.IntegrationTests.Tests.Commands

Content.IntegrationTests/Tests/ContainerOcclusionTest.cs

@@ -3,10 +3,8 @@ using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.Items.Storage;
 using NUnit.Framework;
 using Robust.Client.GameObjects;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.IntegrationTests/Tests/Damageable/DamageableTest.cs

@@ -3,8 +3,7 @@ using System.Threading.Tasks;
 using Content.Shared.Damage;
 using Content.Shared.GameObjects.Components.Damage;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.IntegrationTests.Tests.Damageable

Content.IntegrationTests/Tests/DeleteInventoryTest.cs

@@ -2,8 +2,7 @@
 using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Clothing;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;

Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs

@@ -3,8 +3,7 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
 using Content.Shared.GameObjects.Components.Damage;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;

Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs

@@ -3,8 +3,7 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
 using Content.Shared.GameObjects.Components.Damage;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;

Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs

@@ -5,8 +5,7 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors;
 using Content.Shared.Damage;
 using Content.Shared.GameObjects.Components.Damage;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;

Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs

@@ -7,8 +7,7 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
 using Content.Shared.GameObjects.Components.Damage;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;

Content.IntegrationTests/Tests/Destructible/TestThresholdListenerComponent.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Destructible;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.IntegrationTests.Tests.Destructible
 {

Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs

@@ -5,8 +5,7 @@ using Content.Server.GameObjects.Components;
 using Content.Server.GameObjects.Components.Disposal;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs

@@ -3,12 +3,10 @@ using System.Threading.Tasks;
 using Content.Server.GameObjects.Components;
 using Content.Server.GameObjects.EntitySystems.DoAfter;
 using NUnit.Framework;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Timing;
 
 namespace Content.IntegrationTests.Tests.DoAfter
 {

Content.IntegrationTests/Tests/Doors/AirlockTest.cs

@@ -1,9 +1,7 @@
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.Doors;
 using NUnit.Framework;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using static Content.Server.GameObjects.Components.Doors.ServerDoorComponent;

Content.IntegrationTests/Tests/DummyIconTest.cs

@@ -1,10 +1,9 @@
-#nullable enable
+#nullable enable
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.ResourceManagement;
-using Robust.Shared.GameObjects;
+using Robust.Client.ResourceManagement;
 using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests

Content.IntegrationTests/Tests/EntityTest.cs

@@ -4,10 +4,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using Content.Shared.Utility;
 using NUnit.Framework;
-using Robust.Server.Interfaces.Timing;
+using Robust.Server.Timing;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;

Content.IntegrationTests/Tests/Fluids/PuddleTest.cs

@@ -4,12 +4,10 @@ using Content.Server.GameObjects.Components.Fluids;
 using Content.Shared.Chemistry;
 using Content.Shared.Utility;
 using NUnit.Framework;
-using Robust.Server.Interfaces.Timing;
-using Robust.Shared.GameObjects.Components.Timers;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Server.Timing;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Timing;
 
 namespace Content.IntegrationTests.Tests.Fluids
 {

Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs

@@ -7,8 +7,7 @@ using Content.Server.Interfaces.GameObjects.Components.Items;
 using Content.Shared.GameObjects.Components.Body;
 using NUnit.Framework;
 using Robust.Server.Console;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Client.GameObjects.Components.Mobs;
@@ -10,13 +10,12 @@ using Content.Shared.Actions;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.Utility;
 using NUnit.Framework;
-using Robust.Client.Interfaces.UserInterface;
-using Robust.Client.Player;
+using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.Map;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using IPlayerManager = Robust.Server.Player.IPlayerManager;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
 {
@@ -65,7 +64,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await server.WaitIdleAsync();
             await client.WaitIdleAsync();
 
-            var serverPlayerManager = server.ResolveDependency<Robust.Server.Interfaces.Player.IPlayerManager>();
+            var serverPlayerManager = server.ResolveDependency<IPlayerManager>();
             var innateActions = new List<ActionType>();
 
             await server.WaitAssertion(() =>
@@ -91,7 +90,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await server.WaitRunTicks(5);
             await client.WaitRunTicks(5);
 
-            var clientPlayerMgr = client.ResolveDependency<IPlayerManager>();
+            var clientPlayerMgr = client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
             var clientUIMgr = client.ResolveDependency<IUserInterfaceManager>();
             var expectedOrder = new List<ActionType>();
 
@@ -226,7 +225,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await server.WaitIdleAsync();
             await client.WaitIdleAsync();
 
-            var serverPlayerManager = server.ResolveDependency<Robust.Server.Interfaces.Player.IPlayerManager>();
+            var serverPlayerManager = server.ResolveDependency<IPlayerManager>();
             var serverEntManager = server.ResolveDependency<IEntityManager>();
             var serverGameTiming = server.ResolveDependency<IGameTiming>();
 
@@ -273,7 +272,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await client.WaitRunTicks(5);
 
             // check that client has the actions, and toggle the light on via the action slot it was auto-assigned to
-            var clientPlayerMgr = client.ResolveDependency<IPlayerManager>();
+            var clientPlayerMgr = client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
             var clientUIMgr = client.ResolveDependency<IUserInterfaceManager>();
             EntityUid clientFlashlight = default;
             await client.WaitAssertion(() =>

Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.UserInterface;
@@ -6,8 +6,8 @@ using Content.Client.UserInterface.Controls;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Shared.Alert;
 using NUnit.Framework;
-using Robust.Client.Interfaces.UserInterface;
-using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using IPlayerManager = Robust.Server.Player.IPlayerManager;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
 {
@@ -24,7 +24,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await server.WaitIdleAsync();
             await client.WaitIdleAsync();
 
-            var serverPlayerManager = server.ResolveDependency<Robust.Server.Interfaces.Player.IPlayerManager>();
+            var serverPlayerManager = server.ResolveDependency<IPlayerManager>();
 
             await server.WaitAssertion(() =>
             {
@@ -42,7 +42,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await server.WaitRunTicks(5);
             await client.WaitRunTicks(5);
 
-            var clientPlayerMgr = client.ResolveDependency<IPlayerManager>();
+            var clientPlayerMgr = client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
             var clientUIMgr = client.ResolveDependency<IUserInterfaceManager>();
             await client.WaitAssertion(() =>
             {

Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs

@@ -4,9 +4,7 @@ using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.Physics;
 using NUnit.Framework;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs

@@ -4,7 +4,7 @@ using Content.Server.GameTicking;
 using Content.Server.GameTicking.GameRules;
 using Content.Server.Interfaces.GameTicking;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.Timing;
 
 namespace Content.IntegrationTests.Tests.GameRules
 {

Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs

@@ -7,8 +7,6 @@ using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Utility;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Map;
 
 namespace Content.IntegrationTests.Tests.Gravity

Content.IntegrationTests/Tests/GravityGridTest.cs

@@ -4,8 +4,7 @@ using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Shared.GameObjects.Components.Gravity;
 using Content.Shared.Utility;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/GridTileLookupTest.cs

@@ -2,9 +2,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using Robust.Server.GameObjects.EntitySystems.TileLookup;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 

Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs

@@ -1,8 +1,7 @@
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.GUI;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;

Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs

@@ -1,12 +1,10 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Client.Utility;
 using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Utility;
 using NUnit.Framework;
-using Robust.Server.GameObjects.Components.Container;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.Map;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.IntegrationTests.Tests.Interaction

Content.IntegrationTests/Tests/InventoryHelpersTest.cs

@@ -4,8 +4,7 @@ using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.Utility;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;

Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Client;
 using Content.Client.Interfaces;
 using Content.Client.State;
@@ -9,9 +9,9 @@ using Content.Server.Preferences;
 using Content.Shared;
 using Content.Shared.Preferences;
 using NUnit.Framework;
-using Robust.Client.Interfaces.State;
-using Robust.Shared.Interfaces.Configuration;
-using Robust.Shared.Interfaces.Network;
+using Robust.Client.State;
+using Robust.Shared.Configuration;
+using Robust.Shared.Network;
 
 namespace Content.IntegrationTests.Tests.Lobby
 {

Content.IntegrationTests/Tests/MindEntityDeletionTest.cs

@@ -4,10 +4,9 @@ using Content.Server.Mobs;
 using Content.Server.Players;
 using Content.Shared.Utility;
 using NUnit.Framework;
-using Robust.Server.Interfaces.GameObjects;
-using Robust.Server.Interfaces.Player;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/Networking/ConnectTest.cs

@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Enums;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Network;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Network;
 
 namespace Content.IntegrationTests.Tests.Networking
 {

Content.IntegrationTests/Tests/Networking/ReconnectTest.cs

@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Robust.Client.Console;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
+using Robust.Shared.Network;
 
 namespace Content.IntegrationTests.Tests.Networking
 {

Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs

@@ -5,18 +5,14 @@ using System.Threading.Tasks;
 using Content.Shared.GameObjects;
 using NUnit.Framework;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameStates;
-using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Reflection;
 using Robust.Shared.Timing;
 using System;
+using Robust.Client.GameStates;
+using Robust.Server.Player;
 using Robust.Shared.Serialization;
 
 namespace Content.IntegrationTests.Tests.Networking

Content.IntegrationTests/Tests/Pathfinding/PathfindingChunkTest.cs

@@ -2,8 +2,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding;
 using NUnit.Framework;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.Resources;
+using Robust.Shared.ContentPack;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.IntegrationTests/Tests/PowerTest.cs

@@ -5,8 +5,7 @@ using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using Content.Shared.Utility;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.IntegrationTests/Tests/Pulling/PullTest.cs

@@ -3,9 +3,7 @@ using Content.Server.GameObjects.Components.Pulling;
 using Content.Shared.GameObjects.Components.Pulling;
 using Content.Shared.Physics.Pull;
 using NUnit.Framework;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.IntegrationTests.Tests.Pulling

Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs

@@ -3,8 +3,7 @@ using Content.Server.GameTicking;
 using Content.Server.Interfaces.GameTicking;
 using Content.Shared.GameTicking;
 using NUnit.Framework;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Reflection;
 

Content.IntegrationTests/Tests/SaveLoadMapTest.cs

@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
-using Robust.Server.Interfaces.Maps;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Resources;
+using Robust.Server.Maps;
+using Robust.Shared.ContentPack;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.IntegrationTests/Tests/SaveLoadSaveTest.cs

@@ -2,10 +2,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using Robust.Server.Interfaces.Maps;
-using Robust.Server.Interfaces.Timing;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Resources;
+using Robust.Server.Maps;
+using Robust.Server.Timing;
+using Robust.Shared.ContentPack;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
 

Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs

@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
 using Content.Server.GameObjects.EntitySystems.StationEvents;
 using NUnit.Framework;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Timing;
 
 namespace Content.IntegrationTests.Tests.StationEvents
 {

Content.IntegrationTests/Tests/Tag/TagTest.cs

@@ -4,8 +4,7 @@ using System.Threading.Tasks;
 using Content.Shared.GameObjects.Components.Tag;
 using Content.Shared.Prototypes.Tag;
 using NUnit.Framework;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 

Content.IntegrationTests/Tests/VendingMachineTest.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using Content.Shared.VendingMachines;
 using NUnit.Framework;
-using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
@@ -38,4 +37,4 @@ namespace Content.IntegrationTests.Tests
             await server.WaitIdleAsync();
         }
     }
-}
+}