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

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

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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 {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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
{
/// <summary>
/// This class represents a parsed SeString payload.

View file

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

View file

@ -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
{
/// <summary>
/// An SeString Payload containing an auto-translation/completion chat message.

View file

@ -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 {
/// <summary>
///

View file

@ -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
{
/// <summary>
/// An SeString Payload containing information about enabling or disabling italics formatting on following text.

View file

@ -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 {
/// <summary>
/// SeString payload representing a bitmap icon from fontIcon

View file

@ -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
{
/// <summary>
/// An SeString Payload representing an interactable item link.

View file

@ -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
{
/// <summary>
/// An SeString Payload representing an interactable map position link.

View file

@ -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
{
/// <summary>
/// An SeString Payload representing a player link.

View file

@ -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 {
/// <summary>
/// An SeString Payload representing an interactable quest link.
/// </summary>

View file

@ -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
{
/// <summary>
/// An SeString Payload representing unhandled raw payload data.

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>
/// A wrapped ''
/// </summary>

View file

@ -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
{
/// <summary>
/// An SeString Payload representing an interactable status link.

View file

@ -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
{
/// <summary>
/// An SeString Payload representing a plain text string.

View file

@ -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
{
/// <summary>
/// An SeString Payload representing a UI foreground color applied to following text payloads.

View file

@ -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
{
/// <summary>
/// An SeString Payload representing a UI glow color applied to following text payloads.

View file

@ -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
{
/// <summary>
/// This class represents a parsed SeString.

View file

@ -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
{

View file

@ -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;

View file

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

View file

@ -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;

View file

@ -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

View file

@ -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;
}

View file

@ -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;