XIVChat
/
XIVChat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(plugin): update to new Lumina 

Use new Lumina to parse chat formats.
This commit is contained in:
Anna 2020-11-23 13:16:58 -05:00
parent 5e270e2540
commit 13a60994a8
3 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
XIVChatPlugin/GameFunctions.cs
View File

@ -211,11 +211,17 @@ namespace XIVChatPlugin {
[StructLayout(LayoutKind.Explicit)]
[SuppressMessage("ReSharper", "PrivateFieldCanBeConvertedToLocalVariable")]
readonly struct ChatPayload : IDisposable {
[FieldOffset(0)] readonly IntPtr textPtr;
[FieldOffset(16)] readonly ulong textLen;
[FieldOffset(0)]
readonly IntPtr textPtr;
[FieldOffset(8)] readonly ulong unk1;
[FieldOffset(24)] readonly ulong unk2;
[FieldOffset(16)]
readonly ulong textLen;
[FieldOffset(8)]
readonly ulong unk1;
[FieldOffset(24)]
readonly ulong unk2;
internal ChatPayload(string text) {
byte[] stringBytes = Encoding.UTF8.GetBytes(text);

61
XIVChatPlugin/Server.cs
View File

@ -191,9 +191,7 @@ namespace XIVChatPlugin {
var colour = this.plugin.Functions.GetChannelColour(chatCode) ?? chatCode.DefaultColour();
if (sender.Payloads.Count > 0) {
// FIXME: can't get format straight from game until Lumina stops returning LogKind.Format as a string (it's an SeString)
// var format = this.FormatFor(chatCode.Type);
var format = chatCode.NameFormat();
var format = this.FormatFor(chatCode.Type);
if (format != null && format.IsPresent) {
chunks.Add(new TextChunk(format.Before) {
FallbackColour = colour,
@ -445,12 +443,10 @@ namespace XIVChatPlugin {
});
}
/*
private Dictionary<ChatType, NameFormatting> Formats { get; } = new Dictionary<ChatType, NameFormatting>();
*/
/*
private NameFormatting FormatFor(ChatType type) {
private Dictionary<ChatType, NameFormatting> Formats { get; } = new Dictionary<ChatType, NameFormatting>();
private NameFormatting? FormatFor(ChatType type) {
if (this.Formats.TryGetValue(type, out var cached)) {
return cached;
}
@ -461,35 +457,46 @@ namespace XIVChatPlugin {
return null;
}
var sestring = this.plugin.Interface.SeStringManager.Parse(logKind.Format);
var format = logKind.Format;
var sestring = this.plugin.Interface.SeStringManager.Parse(format.RawData.ToArray());
//PluginLog.Log(string.Join("", Encoding.ASCII.GetBytes(logKind.Format).Select(b => b.ToString("x2"))));
static bool IsStringParam(Payload payload, byte num) {
if (payload.Type != PayloadType.Unknown) {
return false;
}
//var sestring = this.plugin.Interface.SeStringManager.Parse(Encoding.ASCII.GetBytes(logKind.Format));
var data = ((RawPayload)payload).Data;
//var format = colorRegex.Replace(logKind.Format, "")
// .Replace("</Color>", "")
// .Replace("<Highlight>", "")
// .Replace("</Highlight>", "");
return data.Length >= 5 && data[1] == 0x29 && data[4] == num + 1;
}
return NameFormatting.Empty();
var firstStringParam = sestring.Payloads.FindIndex(payload => IsStringParam(payload, 1));
var secondStringParam = sestring.Payloads.FindIndex(payload => IsStringParam(payload, 2));
//if (format.IndexOf("StringParameter(1)") == -1) {
// return NameFormatting.Empty();
//}
if (firstStringParam == -1 || secondStringParam == -1) {
return NameFormatting.Empty();
}
//var parts = format.Split(new string[] { "StringParameter(1)" }, StringSplitOptions.None);
var before = sestring.Payloads
.GetRange(0, firstStringParam)
.Where(payload => payload is ITextProvider)
.Cast<ITextProvider>()
.Select(text => text.Text);
var after = sestring.Payloads
.GetRange(firstStringParam + 1, secondStringParam - firstStringParam)
.Where(payload => payload is ITextProvider)
.Cast<ITextProvider>()
.Select(text => text.Text);
//var nameFormatting = NameFormatting.Of(
// before: parts[0],
// after: parts[1].Split(new string[] { "StringParameter(2)" }, StringSplitOptions.None)[0]
//);
var nameFormatting = NameFormatting.Of(
string.Join("", before),
string.Join("", after)
);
//this.Formats[type] = nameFormatting;
this.Formats[type] = nameFormatting;
//return nameFormatting;
return nameFormatting;
}
*/
private static async Task SendBacklogs(IEnumerable<ServerMessage> messages, Stream stream, Client client) {
var size = 5 + SecretMessage.MacSize(); // assume 5 bytes for payload lead-in, although it's likely to be less

4
XIVChatPlugin/XIVChatPlugin.csproj
View File

@ -53,8 +53,8 @@
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\Lumina.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Lumina.Generated">
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\Lumina.Generated.dll</HintPath>
<Reference Include="Lumina.Excel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\Lumina.Excel.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="MessagePack, Version=2.2.0.0, Culture=neutral, PublicKeyToken=b4a0369545f0a1be">