ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: Dalamud.Game.Chat => Dalamud.Game.Text, move Sanitizer

Browse source
This commit is contained in:
goat 2021-04-04 21:54:24 +02:00
parent 7996b64827
commit 3decb57b2c
38 changed files with 141 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

172
Dalamud.Test/Dalamud.Test.csproj
View file

@ -1,96 +1,96 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props" Condition="Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" /> <Import Project="..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props" Condition="Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" />
<Import Project="..\packages\xunit.runner.visualstudio.2.4.3\build\net452\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.3\build\net452\xunit.runner.visualstudio.props')" /> <Import Project="..\packages\xunit.runner.visualstudio.2.4.3\build\net452\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.3\build\net452\xunit.runner.visualstudio.props')" />
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" /> <Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C8004563-1806-4329-844F-0EF6274291FC}</ProjectGuid>
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Dalamud.Test</RootNamespace>
<AssemblyName>Dalamud.Test</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="LocalizationTests.cs" />
<Compile Include="Game\Text\Sanitizer\SanitizerTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Dalamud\Dalamud.csproj">
<Project>{b92dab43-2279-4a2c-96e3-d9d5910edbea}</Project>
<Name>Dalamud</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <ErrorText>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}.</ErrorText>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C8004563-1806-4329-844F-0EF6274291FC}</ProjectGuid>
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Dalamud.Test</RootNamespace>
<AssemblyName>Dalamud.Test</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
<PlatformTarget>AnyCPU</PlatformTarget> <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
<DebugSymbols>true</DebugSymbols> <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.3\build\net452\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.3\build\net452\xunit.runner.visualstudio.props'))" />
<DebugType>full</DebugType> <Error Condition="!Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props'))" />
<Optimize>false</Optimize> </Target>
<OutputPath>bin\Debug\</OutputPath> <Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
<DefineConstants>DEBUG;TRACE</DefineConstants> <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="LocalizationTests.cs" />
<Compile Include="Plugin\Sanitizer\SanitizerTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Dalamud\Dalamud.csproj">
<Project>{b92dab43-2279-4a2c-96e3-d9d5910edbea}</Project>
<Name>Dalamud</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.3\build\net452\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.3\build\net452\xunit.runner.visualstudio.props'))" />
<Error Condition="!Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props'))" />
</Target>
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
</Target> </Target>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project>
</Project>

10
Dalamud.Test/Plugin/Sanitizer/SanitizerTests.cs → Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs
View file

@ -1,13 +1,13 @@
// ReSharper disable StringLiteralTypo // ReSharper disable StringLiteralTypo
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Xunit; using Xunit;
namespace Dalamud.Test.Plugin.Sanitizer { namespace Dalamud.Test.Game.Text.Sanitizer {
public class SanitizerTests { public class SanitizerTests {
private global::Dalamud.Plugin.Sanitizer.Sanitizer sanitizer; private global::Dalamud.Game.Text.Sanitizer.Sanitizer sanitizer;
[Theory] [Theory]
[InlineData( ClientLanguage.English, "Pixie Cotton Hood of Healing", "Pixie Cotton Hood of Healing" )] [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) ClientLanguage clientLanguage, string unsanitizedString, string sanitizedString)
{ {
var sanitizedStrings = new List<string> {unsanitizedString}; var sanitizedStrings = new List<string> {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(unsanitizedString));
Assert.Equal(sanitizedString, sanitizer.Sanitize(sanitizedStrings).First()); 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(unsanitizedString, clientLanguage));
Assert.Equal(sanitizedString, sanitizer.Sanitize(sanitizedStrings, clientLanguage).First()); Assert.Equal(sanitizedString, sanitizer.Sanitize(sanitizedStrings, clientLanguage).First());
} }

2
Dalamud/Configuration/DalamudConfiguration.cs
View file

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using Dalamud.Game.Chat; using Dalamud.Game.Text;
using Newtonsoft.Json; using Newtonsoft.Json;
using Serilog; using Serilog;

2
Dalamud/Dalamud.cs
View file

@ -6,7 +6,7 @@ using System.Threading;
using Dalamud.Configuration; using Dalamud.Configuration;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Game; using Dalamud.Game;
using Dalamud.Game.Chat.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.ClientState; using Dalamud.Game.ClientState;
using Dalamud.Game.Command; using Dalamud.Game.Command;
using Dalamud.Game.Internal; using Dalamud.Game.Internal;

6
Dalamud/Game/ChatHandlers.cs
View file

@ -7,9 +7,9 @@ using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using CheapLoc; using CheapLoc;
using Dalamud.Game.Chat; using Dalamud.Game.Text;
using Dalamud.Game.Chat.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Chat.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Game.Internal.Libc; using Dalamud.Game.Internal.Libc;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Plugin; using Dalamud.Plugin;

4
Dalamud/Game/Command/CommandManager.cs
View file

@ -2,8 +2,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Dalamud.Game.Chat; using Dalamud.Game.Text;
using Dalamud.Game.Chat.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Internal.Libc; using Dalamud.Game.Internal.Libc;
using Serilog; using Serilog;

6
Dalamud/Game/Internal/Gui/ChatGui.cs
View file

@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using Dalamud.Game.Chat; using Dalamud.Game.Text;
using Dalamud.Game.Chat.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Chat.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Game.Internal.Libc; using Dalamud.Game.Internal.Libc;
using Dalamud.Hooking; using Dalamud.Hooking;
using Serilog; using Serilog;

2
Dalamud/Game/Internal/Gui/GameGui.cs
View file

@ -1,6 +1,6 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dalamud.Game.Chat.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Hooking; using Dalamud.Hooking;
using ImGuiNET; using ImGuiNET;
using Serilog; using Serilog;

4
Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs
View file

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Game.Chat.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Lumina.Excel.GeneratedSheets; using Lumina.Excel.GeneratedSheets;
namespace Dalamud.Game.Internal.Gui.Structs { namespace Dalamud.Game.Internal.Gui.Structs {

2
Dalamud/Plugin/Sanitizer/ISanitizer.cs → Dalamud/Game/Text/Sanitizer/ISanitizer.cs
View file

@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Dalamud.Plugin.Sanitizer namespace Dalamud.Game.Text.Sanitizer
{ {
/// <summary> /// <summary>
/// Sanitize strings to remove soft hyphens and other special characters. /// Sanitize strings to remove soft hyphens and other special characters.

2
Dalamud/Plugin/Sanitizer/Sanitizer.cs → Dalamud/Game/Text/Sanitizer/Sanitizer.cs
View file

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace Dalamud.Plugin.Sanitizer namespace Dalamud.Game.Text.Sanitizer
{ {
/// <summary> /// <summary>
/// Sanitize strings to remove soft hyphens and other special characters. /// Sanitize strings to remove soft hyphens and other special characters.

2
Dalamud/Game/Chat/SeIconChar.cs → Dalamud/Game/Text/SeIconChar.cs
View file

@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
#pragma warning disable 1591 #pragma warning disable 1591
namespace Dalamud.Game.Chat namespace Dalamud.Game.Text
{ {
/// <summary> /// <summary>
/// Special unicode characters with game-related symbols that work both in-game and in any dalamud window. /// Special unicode characters with game-related symbols that work both in-game and in any dalamud window.

2
Dalamud/Game/Chat/SeStringHandling/BitmapFontIcon.cs → Dalamud/Game/Text/SeStringHandling/BitmapFontIcon.cs
View file

@ -1,6 +1,6 @@
#pragma warning disable 1591 #pragma warning disable 1591
namespace Dalamud.Game.Chat.SeStringHandling { namespace Dalamud.Game.Text.SeStringHandling {
public enum BitmapFontIcon : uint { public enum BitmapFontIcon : uint {
None, None,
ControllerDPadUp, ControllerDPadUp,

2
Dalamud/Game/Chat/SeStringHandling/ITextProvider.cs → Dalamud/Game/Text/SeStringHandling/ITextProvider.cs
View file

@ -1,6 +1,6 @@
using System; using System;
namespace Dalamud.Game.Chat.SeStringHandling namespace Dalamud.Game.Text.SeStringHandling
{ {
public interface ITextProvider public interface ITextProvider
{ {

4
Dalamud/Game/Chat/SeStringHandling/Payload.cs → Dalamud/Game/Text/SeStringHandling/Payload.cs
View file

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Game.Chat.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Serilog; using Serilog;
// TODOs: // TODOs:
@ -14,7 +14,7 @@ using Serilog;
// - [SeString] some way to add surrounding formatting information as flags/data to text (or other?) payloads? // - [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 // 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
{ {
/// <summary> /// <summary>
/// This class represents a parsed SeString payload. /// This class represents a parsed SeString payload.

2
Dalamud/Game/Chat/SeStringHandling/PayloadType.cs → Dalamud/Game/Text/SeStringHandling/PayloadType.cs
View file

@ -1,5 +1,5 @@
namespace Dalamud.Game.Chat.SeStringHandling namespace Dalamud.Game.Text.SeStringHandling
{ {
/// <summary> /// <summary>
/// All parsed types of SeString payloads. /// All parsed types of SeString payloads.

2
Dalamud/Game/Chat/SeStringHandling/Payloads/AutoTranslatePayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs
View file

@ -8,7 +8,7 @@ using Dalamud.Data;
using Dalamud.Data.TransientSheet; using Dalamud.Data.TransientSheet;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload containing an auto-translation/completion chat message. /// An SeString Payload containing an auto-translation/completion chat message.

2
Dalamud/Game/Chat/SeStringHandling/Payloads/DalamudLinkPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs
View file

@ -6,7 +6,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads { namespace Dalamud.Game.Text.SeStringHandling.Payloads {
/// <summary> /// <summary>
/// ///

2
Dalamud/Game/Chat/SeStringHandling/Payloads/EmphasisItalicPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/EmphasisItalicPayload.cs
View file

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload containing information about enabling or disabling italics formatting on following text. /// An SeString Payload containing information about enabling or disabling italics formatting on following text.

2
Dalamud/Game/Chat/SeStringHandling/Payloads/IconPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs
View file

@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System; using System;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads { namespace Dalamud.Game.Text.SeStringHandling.Payloads {
/// <summary> /// <summary>
/// SeString payload representing a bitmap icon from fontIcon /// SeString payload representing a bitmap icon from fontIcon

2
Dalamud/Game/Chat/SeStringHandling/Payloads/ItemPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs
View file

@ -7,7 +7,7 @@ using Dalamud.Data;
using Lumina.Excel.GeneratedSheets; using Lumina.Excel.GeneratedSheets;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload representing an interactable item link. /// An SeString Payload representing an interactable item link.

2
Dalamud/Game/Chat/SeStringHandling/Payloads/MapLinkPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs
View file

@ -5,7 +5,7 @@ using System.IO;
using Dalamud.Data; using Dalamud.Data;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload representing an interactable map position link. /// An SeString Payload representing an interactable map position link.

2
Dalamud/Game/Chat/SeStringHandling/Payloads/PlayerPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs
View file

@ -6,7 +6,7 @@ using System.Text;
using Dalamud.Data; using Dalamud.Data;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload representing a player link. /// An SeString Payload representing a player link.

2
Dalamud/Game/Chat/SeStringHandling/Payloads/QuestPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/QuestPayload.cs
View file

@ -5,7 +5,7 @@ using Dalamud.Data;
using Lumina.Excel.GeneratedSheets; using Lumina.Excel.GeneratedSheets;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads { namespace Dalamud.Game.Text.SeStringHandling.Payloads {
/// <summary> /// <summary>
/// An SeString Payload representing an interactable quest link. /// An SeString Payload representing an interactable quest link.
/// </summary> /// </summary>

2
Dalamud/Game/Chat/SeStringHandling/Payloads/RawPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs
View file

@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload representing unhandled raw payload data. /// An SeString Payload representing unhandled raw payload data.

4
Dalamud/Game/Chat/SeStringHandling/Payloads/SeHyphenPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/SeHyphenPayload.cs
View file

@ -1,6 +1,6 @@
using System.IO; using System.IO;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads { namespace Dalamud.Game.Text.SeStringHandling.Payloads {
/// <summary> /// <summary>
/// A wrapped '–' /// A wrapped '–'
/// </summary> /// </summary>

2
Dalamud/Game/Chat/SeStringHandling/Payloads/StatusPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/StatusPayload.cs
View file

@ -5,7 +5,7 @@ using System.IO;
using Dalamud.Data; using Dalamud.Data;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload representing an interactable status link. /// An SeString Payload representing an interactable status link.

2
Dalamud/Game/Chat/SeStringHandling/Payloads/TextPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs
View file

@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload representing a plain text string. /// An SeString Payload representing a plain text string.

2
Dalamud/Game/Chat/SeStringHandling/Payloads/UIForegroundPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs
View file

@ -5,7 +5,7 @@ using System.IO;
using Dalamud.Data; using Dalamud.Data;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload representing a UI foreground color applied to following text payloads. /// An SeString Payload representing a UI foreground color applied to following text payloads.

2
Dalamud/Game/Chat/SeStringHandling/Payloads/UIGlowPayload.cs → Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs
View file

@ -5,7 +5,7 @@ using System.IO;
using Dalamud.Data; using Dalamud.Data;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Game.Chat.SeStringHandling.Payloads namespace Dalamud.Game.Text.SeStringHandling.Payloads
{ {
/// <summary> /// <summary>
/// An SeString Payload representing a UI glow color applied to following text payloads. /// An SeString Payload representing a UI glow color applied to following text payloads.

4
Dalamud/Game/Chat/SeStringHandling/SeString.cs → Dalamud/Game/Text/SeStringHandling/SeString.cs
View file

@ -4,10 +4,10 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Game.Chat.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Game.Chat.SeStringHandling namespace Dalamud.Game.Text.SeStringHandling
{ {
/// <summary> /// <summary>
/// This class represents a parsed SeString. /// This class represents a parsed SeString.

4
Dalamud/Game/Chat/SeStringHandling/SeStringManager.cs → Dalamud/Game/Text/SeStringHandling/SeStringManager.cs
View file

@ -6,10 +6,10 @@ using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Game.Chat.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Lumina.Excel.GeneratedSheets; using Lumina.Excel.GeneratedSheets;
namespace Dalamud.Game.Chat.SeStringHandling namespace Dalamud.Game.Text.SeStringHandling
{ {
public class SeStringManager public class SeStringManager
{ {

3
Dalamud/Game/Chat/XivChatEntry.cs → Dalamud/Game/Text/XivChatEntry.cs
View file

@ -1,6 +1,7 @@
using System; using System;
namespace Dalamud.Game.Chat { namespace Dalamud.Game.Text
{
public sealed class XivChatEntry { public sealed class XivChatEntry {
public XivChatType Type { get; set; } = XivChatType.Debug; public XivChatType Type { get; set; } = XivChatType.Debug;

2
Dalamud/Game/Chat/XivChatType.cs → Dalamud/Game/Text/XivChatType.cs
View file

@ -2,7 +2,7 @@ using System;
using System.Linq; using System.Linq;
#pragma warning disable 1591 #pragma warning disable 1591
namespace Dalamud.Game.Chat namespace Dalamud.Game.Text
{ {
/// <summary> /// <summary>
/// The FFXIV chat types as seen in the LogKind ex table. /// The FFXIV chat types as seen in the LogKind ex table.

2
Dalamud/Interface/DalamudDataWindow.cs
View file

@ -4,7 +4,7 @@ using System.Dynamic;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using Dalamud.Game.Chat; using Dalamud.Game.Text;
using Dalamud.Game.ClientState; using Dalamud.Game.ClientState;
using Dalamud.Game.ClientState.Actors.Types; using Dalamud.Game.ClientState.Actors.Types;
using Dalamud.Game.ClientState.Actors.Types.NonPlayer; using Dalamud.Game.ClientState.Actors.Types.NonPlayer;

2
Dalamud/Interface/DalamudSettingsWindow.cs
View file

@ -7,7 +7,7 @@ using System.Threading.Tasks;
using System.Windows.Forms.VisualStyles; using System.Windows.Forms.VisualStyles;
using CheapLoc; using CheapLoc;
using Dalamud.Configuration; using Dalamud.Configuration;
using Dalamud.Game.Chat; using Dalamud.Game.Text;
using ImGuiNET; using ImGuiNET;
namespace Dalamud.Interface namespace Dalamud.Interface

8
Dalamud/Plugin/DalamudPluginInterface.cs
View file

@ -7,13 +7,13 @@ using System.Reflection;
using Dalamud.Configuration; using Dalamud.Configuration;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Game; using Dalamud.Game;
using Dalamud.Game.Chat.SeStringHandling;
using Dalamud.Game.Chat.SeStringHandling.Payloads;
using Dalamud.Game.ClientState; using Dalamud.Game.ClientState;
using Dalamud.Game.Command; using Dalamud.Game.Command;
using Dalamud.Game.Internal; 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.Interface;
using Dalamud.Plugin.Sanitizer;
namespace Dalamud.Plugin namespace Dalamud.Plugin
{ {
@ -49,7 +49,7 @@ namespace Dalamud.Plugin
this.pluginName = pluginName; this.pluginName = pluginName;
this.configs = configs; this.configs = configs;
this.Sanitizer = new Sanitizer.Sanitizer(this.Data.Language); this.Sanitizer = new Sanitizer(this.Data.Language);
this.UiLanguage = this.dalamud.Configuration.LanguageOverride; this.UiLanguage = this.dalamud.Configuration.LanguageOverride;
dalamud.LocalizationManager.OnLocalizationChanged += this.OnLocalizationChanged; dalamud.LocalizationManager.OnLocalizationChanged += this.OnLocalizationChanged;
} }

2
Dalamud/Plugin/PluginRepository.cs
View file

@ -10,7 +10,7 @@ using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using CheapLoc; using CheapLoc;
using Dalamud.Game.Chat; using Dalamud.Game.Text;
using Newtonsoft.Json; using Newtonsoft.Json;
using Serilog; using Serilog;