From 2e731b1eab2d57ff1c2f515ee900868b11f60d4d Mon Sep 17 00:00:00 2001 From: goat Date: Sat, 29 Jun 2024 00:27:04 +0200 Subject: [PATCH] api10 todo: only use ClientLanguage from Dalamud.Common, move ToLumina() extension into Dalamud.Util --- .../Game/Text/Sanitizer/SanitizerTests.cs | 3 ++ Dalamud/ClientLanguage.cs | 30 ------------------- Dalamud/Data/DataManager.cs | 1 + Dalamud/Game/ChatHandlers.cs | 2 ++ Dalamud/Game/ClientState/ClientState.cs | 1 + .../ClientState/Resolvers/ExcelResolver{T}.cs | 1 + Dalamud/Game/Command/CommandManager.cs | 1 + .../Structures/InfoProxy/CharacterData.cs | 1 + Dalamud/Game/Text/Sanitizer/ISanitizer.cs | 2 ++ Dalamud/Game/Text/Sanitizer/Sanitizer.cs | 2 ++ .../Payloads/MapLinkPayload.cs | 2 ++ .../Game/Text/SeStringHandling/SeString.cs | 1 + Dalamud/Interface/Textures/GameIconLookup.cs | 2 ++ .../Internal/TextureManager.GamePath.cs | 1 + Dalamud/Plugin/Services/IClientState.cs | 1 + Dalamud/Plugin/Services/IDataManager.cs | 2 ++ .../{ => Utility}/ClientLanguageExtensions.cs | 5 ++-- Dalamud/Utility/Util.cs | 2 ++ 18 files changed, 27 insertions(+), 33 deletions(-) delete mode 100644 Dalamud/ClientLanguage.cs rename Dalamud/{ => Utility}/ClientLanguageExtensions.cs (86%) diff --git a/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs b/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs index 2d2a34df5..fdab49a62 100644 --- 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.Common; + using Xunit; // ReSharper disable StringLiteralTypo diff --git a/Dalamud/ClientLanguage.cs b/Dalamud/ClientLanguage.cs deleted file mode 100644 index 1bf1c884a..000000000 --- a/Dalamud/ClientLanguage.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Dalamud.Utility; - -namespace Dalamud; - -/// -/// Enum describing the language the game loads in. -/// -[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")] -public enum ClientLanguage -{ - /// - /// Indicating a Japanese game client. - /// - Japanese, - - /// - /// Indicating an English game client. - /// - English, - - /// - /// Indicating a German game client. - /// - German, - - /// - /// Indicating a French game client. - /// - French, -} diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs index 0a344945e..d4c3c2098 100644 --- a/Dalamud/Data/DataManager.cs +++ b/Dalamud/Data/DataManager.cs @@ -1,6 +1,7 @@ using System.IO; using System.Threading; +using Dalamud.Common; using Dalamud.IoC; using Dalamud.IoC.Internal; using Dalamud.Plugin.Services; diff --git a/Dalamud/Game/ChatHandlers.cs b/Dalamud/Game/ChatHandlers.cs index 73e924f2d..81d31874b 100644 --- a/Dalamud/Game/ChatHandlers.cs +++ b/Dalamud/Game/ChatHandlers.cs @@ -6,6 +6,8 @@ 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; diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs index d6fd8f37b..4d7290c68 100644 --- a/Dalamud/Game/ClientState/ClientState.cs +++ b/Dalamud/Game/ClientState/ClientState.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Runtime.InteropServices; +using Dalamud.Common; using Dalamud.Data; using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Objects; diff --git a/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs b/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs index 04003d9aa..ebf0ccbfb 100644 --- a/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs +++ b/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs @@ -1,3 +1,4 @@ +using Dalamud.Common; using Dalamud.Data; using Lumina.Excel; diff --git a/Dalamud/Game/Command/CommandManager.cs b/Dalamud/Game/Command/CommandManager.cs index dd0a8346d..665f4e441 100644 --- a/Dalamud/Game/Command/CommandManager.cs +++ b/Dalamud/Game/Command/CommandManager.cs @@ -4,6 +4,7 @@ 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; diff --git a/Dalamud/Game/Network/Structures/InfoProxy/CharacterData.cs b/Dalamud/Game/Network/Structures/InfoProxy/CharacterData.cs index 96de1c3b2..f22e5abb7 100644 --- a/Dalamud/Game/Network/Structures/InfoProxy/CharacterData.cs +++ b/Dalamud/Game/Network/Structures/InfoProxy/CharacterData.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; +using Dalamud.Common; using Dalamud.Game.ClientState.Resolvers; using Dalamud.Memory; diff --git a/Dalamud/Game/Text/Sanitizer/ISanitizer.cs b/Dalamud/Game/Text/Sanitizer/ISanitizer.cs index 65603951a..506e7c2df 100644 --- a/Dalamud/Game/Text/Sanitizer/ISanitizer.cs +++ b/Dalamud/Game/Text/Sanitizer/ISanitizer.cs @@ -1,5 +1,7 @@ using System.Collections.Generic; +using Dalamud.Common; + namespace Dalamud.Game.Text.Sanitizer; /// diff --git a/Dalamud/Game/Text/Sanitizer/Sanitizer.cs b/Dalamud/Game/Text/Sanitizer/Sanitizer.cs index 3966d3b89..e45daa942 100644 --- a/Dalamud/Game/Text/Sanitizer/Sanitizer.cs +++ b/Dalamud/Game/Text/Sanitizer/Sanitizer.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; using System.Linq; +using Dalamud.Common; + namespace Dalamud.Game.Text.Sanitizer; /// diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs index 7d975b347..1ee57eca1 100644 --- a/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; using System.IO; +using Dalamud.Common; + using Lumina.Excel.GeneratedSheets; using Newtonsoft.Json; diff --git a/Dalamud/Game/Text/SeStringHandling/SeString.cs b/Dalamud/Game/Text/SeStringHandling/SeString.cs index 4a04f0326..38738e26f 100644 --- a/Dalamud/Game/Text/SeStringHandling/SeString.cs +++ b/Dalamud/Game/Text/SeStringHandling/SeString.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Text; +using Dalamud.Common; using Dalamud.Data; using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Utility; diff --git a/Dalamud/Interface/Textures/GameIconLookup.cs b/Dalamud/Interface/Textures/GameIconLookup.cs index db26b3142..b1a2fbfc8 100644 --- a/Dalamud/Interface/Textures/GameIconLookup.cs +++ b/Dalamud/Interface/Textures/GameIconLookup.cs @@ -1,5 +1,7 @@ using System.Text; +using Dalamud.Common; + namespace Dalamud.Interface.Textures; /// Represents a lookup for a game icon. diff --git a/Dalamud/Interface/Textures/Internal/TextureManager.GamePath.cs b/Dalamud/Interface/Textures/Internal/TextureManager.GamePath.cs index 455b6f504..ae25480e7 100644 --- 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.Common; using Dalamud.Plugin.Services; namespace Dalamud.Interface.Textures.Internal; diff --git a/Dalamud/Plugin/Services/IClientState.cs b/Dalamud/Plugin/Services/IClientState.cs index 9f256b3eb..54c952317 100644 --- a/Dalamud/Plugin/Services/IClientState.cs +++ b/Dalamud/Plugin/Services/IClientState.cs @@ -1,3 +1,4 @@ +using Dalamud.Common; 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 index e4b249319..1f1e6bc55 100644 --- a/Dalamud/Plugin/Services/IDataManager.cs +++ b/Dalamud/Plugin/Services/IDataManager.cs @@ -1,3 +1,5 @@ +using Dalamud.Common; + using Lumina; using Lumina.Data; using Lumina.Excel; diff --git a/Dalamud/ClientLanguageExtensions.cs b/Dalamud/Utility/ClientLanguageExtensions.cs similarity index 86% rename from Dalamud/ClientLanguageExtensions.cs rename to Dalamud/Utility/ClientLanguageExtensions.cs index 40ff65867..275db74dc 100644 --- a/Dalamud/ClientLanguageExtensions.cs +++ b/Dalamud/Utility/ClientLanguageExtensions.cs @@ -1,11 +1,10 @@ -using Dalamud.Utility; +using Dalamud.Common; -namespace Dalamud; +namespace Dalamud.Utility; /// /// Extension methods for the class. /// -[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")] public static class ClientLanguageExtensions { /// diff --git a/Dalamud/Utility/Util.cs b/Dalamud/Utility/Util.cs index a9be33244..79674e2f1 100644 --- a/Dalamud/Utility/Util.cs +++ b/Dalamud/Utility/Util.cs @@ -28,6 +28,8 @@ 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;