actually just move the language types, don't use the one from the com…

…mon assembly
goatcorp · Jun 28, 2024 · 7e397be · 7e397be
1 parent b212b4e
commit 7e397be
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs b/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs
@@ -1,5 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+
+using Dalamud.Game;
+
 using Xunit;
 
 // ReSharper disable StringLiteralTypo

diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Threading;
 
+using Dalamud.Game;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;

diff --git a/Dalamud/ClientLanguage.cs → Dalamud/Game/ClientLanguage.cs b/Dalamud/ClientLanguage.cs → Dalamud/Game/ClientLanguage.cs
@@ -1,11 +1,8 @@
-using Dalamud.Utility;
-
-namespace Dalamud;
+namespace Dalamud.Game;
 
 /// <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>

diff --git a/Dalamud/Interface/Textures/GameIconLookup.cs b/Dalamud/Interface/Textures/GameIconLookup.cs
@@ -1,5 +1,7 @@
 using System.Text;
 
+using Dalamud.Game;
+
 namespace Dalamud.Interface.Textures;
 
 /// <summary>Represents a lookup for a game icon.</summary>

diff --git a/Dalamud/Interface/Textures/Internal/TextureManager.GamePath.cs b/Dalamud/Interface/Textures/Internal/TextureManager.GamePath.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 
+using Dalamud.Game;
 using Dalamud.Plugin.Services;
 
 namespace Dalamud.Interface.Textures.Internal;

diff --git a/Dalamud/Plugin/Services/IClientState.cs b/Dalamud/Plugin/Services/IClientState.cs
@@ -1,3 +1,4 @@
+using Dalamud.Game;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 

diff --git a/Dalamud/Plugin/Services/IDataManager.cs b/Dalamud/Plugin/Services/IDataManager.cs
@@ -1,3 +1,5 @@
+using Dalamud.Game;
+
 using Lumina;
 using Lumina.Data;
 using Lumina.Excel;

diff --git a/Dalamud/ClientLanguageExtensions.cs → Dalamud/Utility/ClientLanguageExtensions.cs b/Dalamud/ClientLanguageExtensions.cs → Dalamud/Utility/ClientLanguageExtensions.cs
@@ -1,11 +1,10 @@
-using Dalamud.Utility;
+using Dalamud.Game;
 
-namespace Dalamud;
+namespace Dalamud.Utility;
 
 /// <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>