diff --git a/Dalamud.Test/Dalamud.Test.csproj b/Dalamud.Test/Dalamud.Test.csproj index 96ae59c05..bcbccb45a 100644 --- a/Dalamud.Test/Dalamud.Test.csproj +++ b/Dalamud.Test/Dalamud.Test.csproj @@ -1,96 +1,96 @@  - - - - + + + + + + Debug + AnyCPU + {C8004563-1806-4329-844F-0EF6274291FC} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + Dalamud.Test + Dalamud.Test + v4.7.2 + 512 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll + True + + + ..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll + True + + + ..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll + True + + + ..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll + True + + + + + + + + + + + + + {b92dab43-2279-4a2c-96e3-d9d5910edbea} + Dalamud + + + + + + + + - Debug - AnyCPU - {C8004563-1806-4329-844F-0EF6274291FC} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - Dalamud.Test - Dalamud.Test - v4.7.2 - 512 + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - True - - - ..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - True - - - ..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - True - - - ..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - True - - - - - - - - - - - - - {b92dab43-2279-4a2c-96e3-d9d5910edbea} - Dalamud - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - - - - - - - - - + \ No newline at end of file diff --git a/Dalamud.Test/Plugin/Sanitizer/SanitizerTests.cs b/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs similarity index 81% rename from Dalamud.Test/Plugin/Sanitizer/SanitizerTests.cs rename to Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs index 25aefd183..f2ce7a9c9 100644 --- a/Dalamud.Test/Plugin/Sanitizer/SanitizerTests.cs +++ b/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs @@ -1,13 +1,13 @@ -// ReSharper disable StringLiteralTypo +// ReSharper disable StringLiteralTypo using System.Collections.Generic; using System.Linq; using Xunit; -namespace Dalamud.Test.Plugin.Sanitizer { +namespace Dalamud.Test.Game.Text.Sanitizer { public class SanitizerTests { - private global::Dalamud.Plugin.Sanitizer.Sanitizer sanitizer; + private global::Dalamud.Game.Text.Sanitizer.Sanitizer sanitizer; [Theory] [InlineData( ClientLanguage.English, "Pixie Cotton Hood of Healing", "Pixie Cotton Hood of Healing" )] @@ -20,11 +20,11 @@ namespace Dalamud.Test.Plugin.Sanitizer { ClientLanguage clientLanguage, string unsanitizedString, string sanitizedString) { var sanitizedStrings = new List {unsanitizedString}; - sanitizer = new global::Dalamud.Plugin.Sanitizer.Sanitizer(clientLanguage); + sanitizer = new global::Dalamud.Game.Text.Sanitizer.Sanitizer(clientLanguage); Assert.Equal(sanitizedString, sanitizer.Sanitize(unsanitizedString)); Assert.Equal(sanitizedString, sanitizer.Sanitize(sanitizedStrings).First()); - sanitizer = new global::Dalamud.Plugin.Sanitizer.Sanitizer(ClientLanguage.English); + sanitizer = new global::Dalamud.Game.Text.Sanitizer.Sanitizer(ClientLanguage.English); Assert.Equal(sanitizedString, sanitizer.Sanitize(unsanitizedString, clientLanguage)); Assert.Equal(sanitizedString, sanitizer.Sanitize(sanitizedStrings, clientLanguage).First()); } diff --git a/Dalamud/Configuration/DalamudConfiguration.cs b/Dalamud/Configuration/DalamudConfiguration.cs index 342fd1908..407ac56f5 100644 --- a/Dalamud/Configuration/DalamudConfiguration.cs +++ b/Dalamud/Configuration/DalamudConfiguration.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.IO; -using Dalamud.Game.Chat; +using Dalamud.Game.Text; using Newtonsoft.Json; using Serilog; diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs index 78a3404a6..7c13ae542 100644 --- a/Dalamud/Dalamud.cs +++ b/Dalamud/Dalamud.cs @@ -6,7 +6,7 @@ using System.Threading; using Dalamud.Configuration; using Dalamud.Data; using Dalamud.Game; -using Dalamud.Game.Chat.SeStringHandling; +using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.ClientState; using Dalamud.Game.Command; using Dalamud.Game.Internal; diff --git a/Dalamud/Game/ChatHandlers.cs b/Dalamud/Game/ChatHandlers.cs index 8e7a8e534..129e027af 100644 --- a/Dalamud/Game/ChatHandlers.cs +++ b/Dalamud/Game/ChatHandlers.cs @@ -7,9 +7,9 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CheapLoc; -using Dalamud.Game.Chat; -using Dalamud.Game.Chat.SeStringHandling; -using Dalamud.Game.Chat.SeStringHandling.Payloads; +using Dalamud.Game.Text; +using Dalamud.Game.Text.SeStringHandling; +using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Internal.Libc; using Dalamud.Interface; using Dalamud.Plugin; diff --git a/Dalamud/Game/Command/CommandManager.cs b/Dalamud/Game/Command/CommandManager.cs index b9d723351..2cfc9daf2 100644 --- a/Dalamud/Game/Command/CommandManager.cs +++ b/Dalamud/Game/Command/CommandManager.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Text.RegularExpressions; -using Dalamud.Game.Chat; -using Dalamud.Game.Chat.SeStringHandling; +using Dalamud.Game.Text; +using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Internal.Libc; using Serilog; diff --git a/Dalamud/Game/Internal/Gui/ChatGui.cs b/Dalamud/Game/Internal/Gui/ChatGui.cs index 87e11d8e5..6a67162b1 100644 --- a/Dalamud/Game/Internal/Gui/ChatGui.cs +++ b/Dalamud/Game/Internal/Gui/ChatGui.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using Dalamud.Game.Chat; -using Dalamud.Game.Chat.SeStringHandling; -using Dalamud.Game.Chat.SeStringHandling.Payloads; +using Dalamud.Game.Text; +using Dalamud.Game.Text.SeStringHandling; +using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Internal.Libc; using Dalamud.Hooking; using Serilog; diff --git a/Dalamud/Game/Internal/Gui/GameGui.cs b/Dalamud/Game/Internal/Gui/GameGui.cs index bdd34bc99..570e4b954 100644 --- a/Dalamud/Game/Internal/Gui/GameGui.cs +++ b/Dalamud/Game/Internal/Gui/GameGui.cs @@ -1,6 +1,6 @@ using System; using System.Runtime.InteropServices; -using Dalamud.Game.Chat.SeStringHandling.Payloads; +using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Hooking; using ImGuiNET; using Serilog; diff --git a/Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs b/Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs index 91de07913..42c68259c 100755 --- a/Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs +++ b/Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using Dalamud.Data; -using Dalamud.Game.Chat.SeStringHandling; +using Dalamud.Game.Text.SeStringHandling; using Lumina.Excel.GeneratedSheets; namespace Dalamud.Game.Internal.Gui.Structs { diff --git a/Dalamud/Plugin/Sanitizer/ISanitizer.cs b/Dalamud/Game/Text/Sanitizer/ISanitizer.cs similarity index 97% rename from Dalamud/Plugin/Sanitizer/ISanitizer.cs rename to Dalamud/Game/Text/Sanitizer/ISanitizer.cs index 21fe8ab77..ffaa9cc0a 100644 --- a/Dalamud/Plugin/Sanitizer/ISanitizer.cs +++ b/Dalamud/Game/Text/Sanitizer/ISanitizer.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Dalamud.Plugin.Sanitizer +namespace Dalamud.Game.Text.Sanitizer { /// /// Sanitize strings to remove soft hyphens and other special characters. diff --git a/Dalamud/Plugin/Sanitizer/Sanitizer.cs b/Dalamud/Game/Text/Sanitizer/Sanitizer.cs similarity index 99% rename from Dalamud/Plugin/Sanitizer/Sanitizer.cs rename to Dalamud/Game/Text/Sanitizer/Sanitizer.cs index 58f6fde47..c1f91f99c 100644 --- a/Dalamud/Plugin/Sanitizer/Sanitizer.cs +++ b/Dalamud/Game/Text/Sanitizer/Sanitizer.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Dalamud.Plugin.Sanitizer +namespace Dalamud.Game.Text.Sanitizer { /// /// Sanitize strings to remove soft hyphens and other special characters. diff --git a/Dalamud/Game/Chat/SeIconChar.cs b/Dalamud/Game/Text/SeIconChar.cs similarity index 99% rename from Dalamud/Game/Chat/SeIconChar.cs rename to Dalamud/Game/Text/SeIconChar.cs index 077dd7674..8fa0cfd20 100644 --- a/Dalamud/Game/Chat/SeIconChar.cs +++ b/Dalamud/Game/Text/SeIconChar.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; #pragma warning disable 1591 -namespace Dalamud.Game.Chat +namespace Dalamud.Game.Text { /// /// Special unicode characters with game-related symbols that work both in-game and in any dalamud window. diff --git a/Dalamud/Game/Chat/SeStringHandling/BitmapFontIcon.cs b/Dalamud/Game/Text/SeStringHandling/BitmapFontIcon.cs similarity index 97% rename from Dalamud/Game/Chat/SeStringHandling/BitmapFontIcon.cs rename to Dalamud/Game/Text/SeStringHandling/BitmapFontIcon.cs index 3dbf19571..ae709b89d 100644 --- a/Dalamud/Game/Chat/SeStringHandling/BitmapFontIcon.cs +++ b/Dalamud/Game/Text/SeStringHandling/BitmapFontIcon.cs @@ -1,6 +1,6 @@ #pragma warning disable 1591 -namespace Dalamud.Game.Chat.SeStringHandling { +namespace Dalamud.Game.Text.SeStringHandling { public enum BitmapFontIcon : uint { None, ControllerDPadUp, diff --git a/Dalamud/Game/Chat/SeStringHandling/ITextProvider.cs b/Dalamud/Game/Text/SeStringHandling/ITextProvider.cs similarity index 67% rename from Dalamud/Game/Chat/SeStringHandling/ITextProvider.cs rename to Dalamud/Game/Text/SeStringHandling/ITextProvider.cs index 911471e03..d78543698 100644 --- a/Dalamud/Game/Chat/SeStringHandling/ITextProvider.cs +++ b/Dalamud/Game/Text/SeStringHandling/ITextProvider.cs @@ -1,6 +1,6 @@ using System; -namespace Dalamud.Game.Chat.SeStringHandling +namespace Dalamud.Game.Text.SeStringHandling { public interface ITextProvider { diff --git a/Dalamud/Game/Chat/SeStringHandling/Payload.cs b/Dalamud/Game/Text/SeStringHandling/Payload.cs similarity index 99% rename from Dalamud/Game/Chat/SeStringHandling/Payload.cs rename to Dalamud/Game/Text/SeStringHandling/Payload.cs index 9d35f4c8c..726db44fa 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payload.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Dalamud.Data; -using Dalamud.Game.Chat.SeStringHandling.Payloads; +using Dalamud.Game.Text.SeStringHandling.Payloads; using Serilog; // TODOs: @@ -14,7 +14,7 @@ using Serilog; // - [SeString] some way to add surrounding formatting information as flags/data to text (or other?) payloads? // eg, if a text payload is surrounded by italics payloads, strip them out and mark the text payload as italicized -namespace Dalamud.Game.Chat.SeStringHandling +namespace Dalamud.Game.Text.SeStringHandling { /// /// This class represents a parsed SeString payload. diff --git a/Dalamud/Game/Chat/SeStringHandling/PayloadType.cs b/Dalamud/Game/Text/SeStringHandling/PayloadType.cs similarity index 97% rename from Dalamud/Game/Chat/SeStringHandling/PayloadType.cs rename to Dalamud/Game/Text/SeStringHandling/PayloadType.cs index b18bd870a..5ca36d138 100644 --- a/Dalamud/Game/Chat/SeStringHandling/PayloadType.cs +++ b/Dalamud/Game/Text/SeStringHandling/PayloadType.cs @@ -1,5 +1,5 @@ -namespace Dalamud.Game.Chat.SeStringHandling +namespace Dalamud.Game.Text.SeStringHandling { /// /// All parsed types of SeString payloads. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/AutoTranslatePayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs similarity index 99% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/AutoTranslatePayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs index afe00c70e..2e3a81443 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/AutoTranslatePayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs @@ -8,7 +8,7 @@ using Dalamud.Data; using Dalamud.Data.TransientSheet; using Newtonsoft.Json; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload containing an auto-translation/completion chat message. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/DalamudLinkPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs similarity index 96% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/DalamudLinkPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs index 88bd15695..032915a58 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/DalamudLinkPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using JetBrains.Annotations; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads { +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/EmphasisItalicPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/EmphasisItalicPayload.cs similarity index 97% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/EmphasisItalicPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/EmphasisItalicPayload.cs index 341439edb..4b08e5ed8 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/EmphasisItalicPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/EmphasisItalicPayload.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload containing information about enabling or disabling italics formatting on following text. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/IconPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs similarity index 97% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/IconPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs index b7fffde8b..69b3dc97e 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/IconPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads { +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// SeString payload representing a bitmap icon from fontIcon diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/ItemPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs similarity index 99% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/ItemPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs index 6815e6d0d..f32aaf01f 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/ItemPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs @@ -7,7 +7,7 @@ using Dalamud.Data; using Lumina.Excel.GeneratedSheets; using Newtonsoft.Json; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload representing an interactable item link. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/MapLinkPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs similarity index 99% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/MapLinkPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs index ce547691d..3fc15f2d7 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/MapLinkPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs @@ -5,7 +5,7 @@ using System.IO; using Dalamud.Data; using Newtonsoft.Json; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload representing an interactable map position link. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/PlayerPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs similarity index 98% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/PlayerPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs index 1cfe9bfa8..261a74f75 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/PlayerPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs @@ -6,7 +6,7 @@ using System.Text; using Dalamud.Data; using Newtonsoft.Json; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload representing a player link. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/QuestPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/QuestPayload.cs similarity index 97% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/QuestPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/QuestPayload.cs index ac802755e..6b2030047 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/QuestPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/QuestPayload.cs @@ -5,7 +5,7 @@ using Dalamud.Data; using Lumina.Excel.GeneratedSheets; using Newtonsoft.Json; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads { +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload representing an interactable quest link. /// diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/RawPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs similarity index 98% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/RawPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs index 8184dd477..d672d32c3 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/RawPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload representing unhandled raw payload data. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/SeHyphenPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/SeHyphenPayload.cs similarity index 91% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/SeHyphenPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/SeHyphenPayload.cs index 7b2fcbf26..8ac8a9770 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/SeHyphenPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/SeHyphenPayload.cs @@ -1,6 +1,6 @@ -using System.IO; +using System.IO; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads { +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// A wrapped '–' /// diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/StatusPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/StatusPayload.cs similarity index 97% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/StatusPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/StatusPayload.cs index 11e90c3e3..da7dd30cf 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/StatusPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/StatusPayload.cs @@ -5,7 +5,7 @@ using System.IO; using Dalamud.Data; using Newtonsoft.Json; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload representing an interactable status link. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/TextPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs similarity index 97% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/TextPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs index 6c5ec22cc..15525018a 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/TextPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload representing a plain text string. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/UIForegroundPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs similarity index 98% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/UIForegroundPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs index d25c0e033..d287a8964 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/UIForegroundPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs @@ -5,7 +5,7 @@ using System.IO; using Dalamud.Data; using Newtonsoft.Json; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload representing a UI foreground color applied to following text payloads. diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/UIGlowPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs similarity index 98% rename from Dalamud/Game/Chat/SeStringHandling/Payloads/UIGlowPayload.cs rename to Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs index 655e3c01e..249cda947 100644 --- a/Dalamud/Game/Chat/SeStringHandling/Payloads/UIGlowPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs @@ -5,7 +5,7 @@ using System.IO; using Dalamud.Data; using Newtonsoft.Json; -namespace Dalamud.Game.Chat.SeStringHandling.Payloads +namespace Dalamud.Game.Text.SeStringHandling.Payloads { /// /// An SeString Payload representing a UI glow color applied to following text payloads. diff --git a/Dalamud/Game/Chat/SeStringHandling/SeString.cs b/Dalamud/Game/Text/SeStringHandling/SeString.cs similarity index 98% rename from Dalamud/Game/Chat/SeStringHandling/SeString.cs rename to Dalamud/Game/Text/SeStringHandling/SeString.cs index d5d96cc46..b67dd3b1a 100644 --- a/Dalamud/Game/Chat/SeStringHandling/SeString.cs +++ b/Dalamud/Game/Text/SeStringHandling/SeString.cs @@ -4,10 +4,10 @@ using System.IO; using System.Linq; using System.Text; using Dalamud.Data; -using Dalamud.Game.Chat.SeStringHandling.Payloads; +using Dalamud.Game.Text.SeStringHandling.Payloads; using Newtonsoft.Json; -namespace Dalamud.Game.Chat.SeStringHandling +namespace Dalamud.Game.Text.SeStringHandling { /// /// This class represents a parsed SeString. diff --git a/Dalamud/Game/Chat/SeStringHandling/SeStringManager.cs b/Dalamud/Game/Text/SeStringHandling/SeStringManager.cs similarity index 98% rename from Dalamud/Game/Chat/SeStringHandling/SeStringManager.cs rename to Dalamud/Game/Text/SeStringHandling/SeStringManager.cs index a67a0764d..6815ad040 100644 --- a/Dalamud/Game/Chat/SeStringHandling/SeStringManager.cs +++ b/Dalamud/Game/Text/SeStringHandling/SeStringManager.cs @@ -6,10 +6,10 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; using Dalamud.Data; -using Dalamud.Game.Chat.SeStringHandling.Payloads; +using Dalamud.Game.Text.SeStringHandling.Payloads; using Lumina.Excel.GeneratedSheets; -namespace Dalamud.Game.Chat.SeStringHandling +namespace Dalamud.Game.Text.SeStringHandling { public class SeStringManager { diff --git a/Dalamud/Game/Chat/XivChatEntry.cs b/Dalamud/Game/Text/XivChatEntry.cs similarity index 91% rename from Dalamud/Game/Chat/XivChatEntry.cs rename to Dalamud/Game/Text/XivChatEntry.cs index 3f4075535..4a4cc28af 100644 --- a/Dalamud/Game/Chat/XivChatEntry.cs +++ b/Dalamud/Game/Text/XivChatEntry.cs @@ -1,6 +1,7 @@ using System; -namespace Dalamud.Game.Chat { +namespace Dalamud.Game.Text +{ public sealed class XivChatEntry { public XivChatType Type { get; set; } = XivChatType.Debug; diff --git a/Dalamud/Game/Chat/XivChatType.cs b/Dalamud/Game/Text/XivChatType.cs similarity index 99% rename from Dalamud/Game/Chat/XivChatType.cs rename to Dalamud/Game/Text/XivChatType.cs index ab3469420..54d609d6b 100644 --- a/Dalamud/Game/Chat/XivChatType.cs +++ b/Dalamud/Game/Text/XivChatType.cs @@ -2,7 +2,7 @@ using System; using System.Linq; #pragma warning disable 1591 -namespace Dalamud.Game.Chat +namespace Dalamud.Game.Text { /// /// The FFXIV chat types as seen in the LogKind ex table. diff --git a/Dalamud/Interface/DalamudDataWindow.cs b/Dalamud/Interface/DalamudDataWindow.cs index dd7a6340d..6fab7e594 100644 --- a/Dalamud/Interface/DalamudDataWindow.cs +++ b/Dalamud/Interface/DalamudDataWindow.cs @@ -4,7 +4,7 @@ using System.Dynamic; using System.Linq; using System.Numerics; -using Dalamud.Game.Chat; +using Dalamud.Game.Text; using Dalamud.Game.ClientState; using Dalamud.Game.ClientState.Actors.Types; using Dalamud.Game.ClientState.Actors.Types.NonPlayer; diff --git a/Dalamud/Interface/DalamudSettingsWindow.cs b/Dalamud/Interface/DalamudSettingsWindow.cs index 0e16a0129..353256507 100644 --- a/Dalamud/Interface/DalamudSettingsWindow.cs +++ b/Dalamud/Interface/DalamudSettingsWindow.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Windows.Forms.VisualStyles; using CheapLoc; using Dalamud.Configuration; -using Dalamud.Game.Chat; +using Dalamud.Game.Text; using ImGuiNET; namespace Dalamud.Interface diff --git a/Dalamud/Plugin/DalamudPluginInterface.cs b/Dalamud/Plugin/DalamudPluginInterface.cs index dab5995e7..5a2ff0421 100644 --- a/Dalamud/Plugin/DalamudPluginInterface.cs +++ b/Dalamud/Plugin/DalamudPluginInterface.cs @@ -7,13 +7,13 @@ using System.Reflection; using Dalamud.Configuration; using Dalamud.Data; using Dalamud.Game; -using Dalamud.Game.Chat.SeStringHandling; -using Dalamud.Game.Chat.SeStringHandling.Payloads; using Dalamud.Game.ClientState; using Dalamud.Game.Command; using Dalamud.Game.Internal; +using Dalamud.Game.Text.Sanitizer; +using Dalamud.Game.Text.SeStringHandling; +using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Interface; -using Dalamud.Plugin.Sanitizer; namespace Dalamud.Plugin { @@ -49,7 +49,7 @@ namespace Dalamud.Plugin this.pluginName = pluginName; this.configs = configs; - this.Sanitizer = new Sanitizer.Sanitizer(this.Data.Language); + this.Sanitizer = new Sanitizer(this.Data.Language); this.UiLanguage = this.dalamud.Configuration.LanguageOverride; dalamud.LocalizationManager.OnLocalizationChanged += this.OnLocalizationChanged; } diff --git a/Dalamud/Plugin/PluginRepository.cs b/Dalamud/Plugin/PluginRepository.cs index 4e72db768..6e19ed8de 100644 --- a/Dalamud/Plugin/PluginRepository.cs +++ b/Dalamud/Plugin/PluginRepository.cs @@ -10,7 +10,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; using CheapLoc; -using Dalamud.Game.Chat; +using Dalamud.Game.Text; using Newtonsoft.Json; using Serilog;