liza/LLib
liza/LLib
1
0
Fork 0
Code Issues Pull Requests Activity

Replace new lines with "" in localized GetString calls

Browse Source
This commit is contained in:
Liza 2024-11-23 14:17:29 +01:00
parent 783fea977a
commit ecf759121f
Signed by: liza
GPG Key ID: 8DD6D21C03BB0848
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DataManagerExtensions.cs
View File

@ -9,6 +9,7 @@ using Dalamud.Utility;
using Lumina.Excel; using Lumina.Excel;
using Lumina.Excel.Sheets; using Lumina.Excel.Sheets;
using Lumina.Text; using Lumina.Text;
using Lumina.Text.Payloads;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
namespace LLib; namespace LLib;
@ -29,7 +30,7 @@ public static class DataManagerExtensions
public static string? GetString<T>(this IDataManager dataManager, string key, IPluginLog? pluginLog) public static string? GetString<T>(this IDataManager dataManager, string key, IPluginLog? pluginLog)
where T : struct, IQuestDialogueText, IExcelRow<T> where T : struct, IQuestDialogueText, IExcelRow<T>
{ {
string? text = GetSeString<T>(dataManager, key)?.ToString(); string? text = GetSeString<T>(dataManager, key)?.WithCertainMacroCodeReplacements();
pluginLog?.Verbose($"{typeof(T).Name}.{key} => {text}"); pluginLog?.Verbose($"{typeof(T).Name}.{key} => {text}");
return text; return text;
@ -70,7 +71,7 @@ public static class DataManagerExtensions
IPluginLog? pluginLog = null) IPluginLog? pluginLog = null)
where T : struct, IExcelRow<T> where T : struct, IExcelRow<T>
{ {
string? text = GetSeString(dataManager, rowId, mapper)?.ToString(); string? text = GetSeString(dataManager, rowId, mapper)?.WithCertainMacroCodeReplacements();
pluginLog?.Verbose($"{typeof(T).Name}.{rowId} => {text}"); pluginLog?.Verbose($"{typeof(T).Name}.{rowId} => {text}");
return text; return text;
@ -114,6 +115,19 @@ public static class DataManagerExtensions
return "(.*)"; return "(.*)";
}))); })));
} }
public static string WithCertainMacroCodeReplacements(this ReadOnlySeString text)
{
return string.Join("", text.Select(payload =>
{
if (payload.Type == ReadOnlySePayloadType.Text)
return Regex.Escape(payload.ToString());
else if (payload is { Type: ReadOnlySePayloadType.Macro, MacroCode: MacroCode.NewLine })
return "";
else
return payload.ToString();
}));
}
} }
public interface IQuestDialogueText public interface IQuestDialogueText