Revert "api10 todo: only use ClientLanguage from Dalamud.Common, move ToLumina() extension into Dalamud.Util"

This reverts commit 2e731b1eab.

Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs

@@ -1,8 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-
-using Dalamud.Common;
-
 using Xunit;
 
 // ReSharper disable StringLiteralTypo

Dalamud/ClientLanguage.cs

@@ -0,0 +1,30 @@
+using Dalamud.Utility;
+
+namespace Dalamud;
+
+/// <summary>
+/// Enum describing the language the game loads in.
+/// </summary>
+[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")]
+public enum ClientLanguage
+{
+    /// <summary>
+    /// Indicating a Japanese game client.
+    /// </summary>
+    Japanese,
+
+    /// <summary>
+    /// Indicating an English game client.
+    /// </summary>
+    English,
+
+    /// <summary>
+    /// Indicating a German game client.
+    /// </summary>
+    German,
+
+    /// <summary>
+    /// Indicating a French game client.
+    /// </summary>
+    French,
+}

Dalamud/ClientLanguageExtensions.cs

@@ -1,10 +1,11 @@
-using Dalamud.Common;
+using Dalamud.Utility;
 
-namespace Dalamud.Utility;
+namespace Dalamud;
 
 /// <summary>
 /// Extension methods for the <see cref="ClientLanguage"/> class.
 /// </summary>
+[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")]
 public static class ClientLanguageExtensions
 {
     /// <summary>

Dalamud/Data/DataManager.cs

@@ -1,7 +1,6 @@
 using System.IO;
 using System.Threading;
 
-using Dalamud.Common;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;

Dalamud/Game/ChatHandlers.cs

@@ -6,8 +6,6 @@ using System.Threading;
 using System.Threading.Tasks;
 
 using CheapLoc;
-
-using Dalamud.Common;
 using Dalamud.Configuration.Internal;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.Gui;

Dalamud/Game/ClientState/ClientState.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 
-using Dalamud.Common;
 using Dalamud.Data;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects;

Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs

@@ -1,4 +1,3 @@
-using Dalamud.Common;
 using Dalamud.Data;
 
 using Lumina.Excel;

Dalamud/Game/Command/CommandManager.cs

@@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-using Dalamud.Common;
 using Dalamud.Console;
 using Dalamud.Game.Gui;
 using Dalamud.Game.Text;

Dalamud/Game/Network/Structures/InfoProxy/CharacterData.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 
-using Dalamud.Common;
 using Dalamud.Game.ClientState.Resolvers;
 using Dalamud.Memory;
 

Dalamud/Game/Text/Sanitizer/ISanitizer.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 
-using Dalamud.Common;
-
 namespace Dalamud.Game.Text.Sanitizer;
 
 /// <summary>

Dalamud/Game/Text/Sanitizer/Sanitizer.cs

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Dalamud.Common;
-
 namespace Dalamud.Game.Text.Sanitizer;
 
 /// <summary>

Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 
-using Dalamud.Common;
-
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 

Dalamud/Game/Text/SeStringHandling/SeString.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Linq;
 using System.Text;
 
-using Dalamud.Common;
 using Dalamud.Data;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Utility;

Dalamud/Interface/Textures/GameIconLookup.cs

@@ -1,7 +1,5 @@
 using System.Text;
 
-using Dalamud.Common;
-
 namespace Dalamud.Interface.Textures;
 
 /// <summary>Represents a lookup for a game icon.</summary>

Dalamud/Interface/Textures/Internal/TextureManager.GamePath.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 
-using Dalamud.Common;
 using Dalamud.Plugin.Services;
 
 namespace Dalamud.Interface.Textures.Internal;

Dalamud/Plugin/Services/IClientState.cs

@@ -1,4 +1,3 @@
-using Dalamud.Common;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 

Dalamud/Plugin/Services/IDataManager.cs

@@ -1,5 +1,3 @@
-using Dalamud.Common;
-
 using Lumina;
 using Lumina.Data;
 using Lumina.Excel;

Dalamud/Utility/Util.cs

@@ -28,8 +28,6 @@ using Windows.Win32.Storage.FileSystem;
 using Windows.Win32.System.Memory;
 using Windows.Win32.System.Ole;
 
-using Dalamud.Common;
-
 using HWND = Windows.Win32.Foundation.HWND;
 using Win32_PInvoke = Windows.Win32.PInvoke;