diff --git a/Robust.Client/Profiling/ProfViewManager.cs b/Robust.Client/Profiling/ProfViewManager.cs index 5fd3197e5..81c01732a 100644 --- a/Robust.Client/Profiling/ProfViewManager.cs +++ b/Robust.Client/Profiling/ProfViewManager.cs @@ -1,9 +1,9 @@ using System; +using Robust.Shared.Collections; using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Profiling; using Robust.Shared.Timing; -using Robust.Shared.Utility.Collections; namespace Robust.Client.Profiling; diff --git a/Robust.Client/UserInterface/CustomControls/DebugConsole.xaml.Completions.cs b/Robust.Client/UserInterface/CustomControls/DebugConsole.xaml.Completions.cs index 42eeee92b..f2e955ffc 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugConsole.xaml.Completions.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugConsole.xaml.Completions.cs @@ -4,11 +4,11 @@ using System.Linq; using System.Threading; using Robust.Client.UserInterface.Controls; using Robust.Shared; +using Robust.Shared.Collections; using Robust.Shared.Console; using Robust.Shared.Input; using Robust.Shared.Maths; using Robust.Shared.Utility; -using Robust.Shared.Utility.Collections; namespace Robust.Client.UserInterface.CustomControls; diff --git a/Robust.Client/UserInterface/DevWindow/ProfTree.xaml.cs b/Robust.Client/UserInterface/DevWindow/ProfTree.xaml.cs index ff631b852..d35de5f23 100644 --- a/Robust.Client/UserInterface/DevWindow/ProfTree.xaml.cs +++ b/Robust.Client/UserInterface/DevWindow/ProfTree.xaml.cs @@ -3,11 +3,11 @@ using System.Runtime.InteropServices; using Robust.Client.AutoGenerated; using Robust.Client.Profiling; using Robust.Client.UserInterface.XAML; +using Robust.Shared.Collections; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Profiling; -using Robust.Shared.Utility.Collections; namespace Robust.Client.UserInterface; diff --git a/Robust.Server/ServerStatus/StatusHost.Acz.Sources.cs b/Robust.Server/ServerStatus/StatusHost.Acz.Sources.cs index f47f59958..39d07cb7c 100644 --- a/Robust.Server/ServerStatus/StatusHost.Acz.Sources.cs +++ b/Robust.Server/ServerStatus/StatusHost.Acz.Sources.cs @@ -15,7 +15,6 @@ using System.Security.Cryptography; using Robust.Shared; using Robust.Shared.ContentPack; using Robust.Shared.Utility; -using Robust.Shared.Utility.Collections; using SharpZstd.Interop; using SpaceWizards.Sodium; diff --git a/Robust.Server/ServerStatus/StatusHost.Acz.cs b/Robust.Server/ServerStatus/StatusHost.Acz.cs index 11e5cdf61..68c216b6b 100644 --- a/Robust.Server/ServerStatus/StatusHost.Acz.cs +++ b/Robust.Server/ServerStatus/StatusHost.Acz.cs @@ -13,9 +13,9 @@ using System.Net; using System.Net.Http; using System.Security.Cryptography; using Robust.Shared; +using Robust.Shared.Collections; using Robust.Shared.ContentPack; using Robust.Shared.Utility; -using Robust.Shared.Utility.Collections; using SharpZstd.Interop; using SpaceWizards.Sodium; diff --git a/Robust.Shared/Utility/Collections/ValueList.cs b/Robust.Shared/Collections/ValueList.cs similarity index 99% rename from Robust.Shared/Utility/Collections/ValueList.cs rename to Robust.Shared/Collections/ValueList.cs index b5807a212..a3f5f9ddc 100644 --- a/Robust.Shared/Utility/Collections/ValueList.cs +++ b/Robust.Shared/Collections/ValueList.cs @@ -8,7 +8,7 @@ using System.Diagnostics; using System.Linq; using System.Runtime.CompilerServices; -namespace Robust.Shared.Utility.Collections; +namespace Robust.Shared.Collections; /// /// Implementation of that is stored in a struct instead. diff --git a/Robust.Shared/Configuration/ConfigurationManager.cs b/Robust.Shared/Configuration/ConfigurationManager.cs index dd16716c2..6b3123fc3 100644 --- a/Robust.Shared/Configuration/ConfigurationManager.cs +++ b/Robust.Shared/Configuration/ConfigurationManager.cs @@ -11,7 +11,6 @@ using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Timing; using Robust.Shared.Utility; -using Robust.Shared.Utility.Collections; namespace Robust.Shared.Configuration { diff --git a/Robust.Shared/Configuration/NetConfigurationManager.cs b/Robust.Shared/Configuration/NetConfigurationManager.cs index 5f3d1724b..9a4a4fa78 100644 --- a/Robust.Shared/Configuration/NetConfigurationManager.cs +++ b/Robust.Shared/Configuration/NetConfigurationManager.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; +using Robust.Shared.Collections; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Network; using Robust.Shared.Network.Messages; using Robust.Shared.Timing; using Robust.Shared.Utility; -using Robust.Shared.Utility.Collections; namespace Robust.Shared.Configuration { diff --git a/Robust.Shared/GameObjects/ComponentRegistration.cs b/Robust.Shared/GameObjects/ComponentRegistration.cs index 53f9cd2f0..35347b8fe 100644 --- a/Robust.Shared/GameObjects/ComponentRegistration.cs +++ b/Robust.Shared/GameObjects/ComponentRegistration.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; +using Robust.Shared.Collections; using Robust.Shared.GameStates; -using Robust.Shared.Utility.Collections; namespace Robust.Shared.GameObjects; diff --git a/Robust.Shared/GameObjects/EntityEventBus.Directed.cs b/Robust.Shared/GameObjects/EntityEventBus.Directed.cs index b8011cde1..4b1852f69 100644 --- a/Robust.Shared/GameObjects/EntityEventBus.Directed.cs +++ b/Robust.Shared/GameObjects/EntityEventBus.Directed.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; +using Robust.Shared.Collections; using Robust.Shared.Utility; -using Robust.Shared.Utility.Collections; namespace Robust.Shared.GameObjects { diff --git a/Robust.Shared/Profiling/ProfManager.cs b/Robust.Shared/Profiling/ProfManager.cs index d65ab9f91..a70792c84 100644 --- a/Robust.Shared/Profiling/ProfManager.cs +++ b/Robust.Shared/Profiling/ProfManager.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Robust.Shared.Collections; using Robust.Shared.Configuration; using Robust.Shared.Log; using Robust.Shared.Utility; -using Robust.Shared.Utility.Collections; namespace Robust.Shared.Profiling; diff --git a/Robust.Shared/Utility/CommandParsing.cs b/Robust.Shared/Utility/CommandParsing.cs index f47ec2d1d..a6e5e16a9 100644 --- a/Robust.Shared/Utility/CommandParsing.cs +++ b/Robust.Shared/Utility/CommandParsing.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using Robust.Shared.Utility.Collections; +using Robust.Shared.Collections; namespace Robust.Shared.Utility {