Compare commits
4 Commits
53043bd286
...
fcf8e22fcd
Author | SHA1 | Date |
---|---|---|
Anna | fcf8e22fcd | |
Anna | 4b24649935 | |
Anna | c4f1c97bca | |
Anna | 22a3f97732 |
|
@ -1,7 +1,7 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>1.18.4</Version>
|
<Version>1.18.5</Version>
|
||||||
<TargetFramework>net7.0-windows</TargetFramework>
|
<TargetFramework>net7.0-windows</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
|
|
@ -20,7 +20,7 @@ internal sealed unsafe class Context {
|
||||||
[Signature("E8 ?? ?? ?? ?? EB 3F 83 F8 FE", Fallibility = Fallibility.Fallible)]
|
[Signature("E8 ?? ?? ?? ?? EB 3F 83 F8 FE", Fallibility = Fallibility.Fallible)]
|
||||||
private readonly delegate* unmanaged<AgentInterface*, ushort, uint, byte, void> _itemComparison = null!;
|
private readonly delegate* unmanaged<AgentInterface*, ushort, uint, byte, void> _itemComparison = null!;
|
||||||
|
|
||||||
[Signature("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 41 B4 01", Fallibility = Fallibility.Fallible)]
|
[Signature("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 48 83 F8 0F", Fallibility = Fallibility.Fallible)]
|
||||||
private readonly delegate* unmanaged<IntPtr, uint, void> _searchForRecipesUsingItem = null!;
|
private readonly delegate* unmanaged<IntPtr, uint, void> _searchForRecipesUsingItem = null!;
|
||||||
|
|
||||||
[Signature("E8 ?? ?? ?? ?? EB 45 45 33 C9", Fallibility = Fallibility.Fallible)]
|
[Signature("E8 ?? ?? ?? ?? EB 45 45 33 C9", Fallibility = Fallibility.Fallible)]
|
||||||
|
|
|
@ -227,7 +227,7 @@ internal unsafe class GameFunctions : IDisposable {
|
||||||
vf27(atkModule, addonId, 1);
|
vf27(atkModule, addonId, 1);
|
||||||
} else {
|
} else {
|
||||||
// 6.05: 8443DD
|
// 6.05: 8443DD
|
||||||
if (*(uint*) ((IntPtr) lfg + 0x2AB8) > 0) {
|
if (*(uint*) ((IntPtr) lfg + 0x2C20) > 0) {
|
||||||
lfg->Hide();
|
lfg->Hide();
|
||||||
} else {
|
} else {
|
||||||
lfg->Show();
|
lfg->Show();
|
||||||
|
|
|
@ -14,6 +14,8 @@ using ImGuiNET;
|
||||||
using ImGuiScene;
|
using ImGuiScene;
|
||||||
using Lumina.Excel.GeneratedSheets;
|
using Lumina.Excel.GeneratedSheets;
|
||||||
using Action = System.Action;
|
using Action = System.Action;
|
||||||
|
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
|
||||||
|
using ChatTwoPartyFinderPayload = ChatTwo.Util.PartyFinderPayload;
|
||||||
|
|
||||||
namespace ChatTwo;
|
namespace ChatTwo;
|
||||||
|
|
||||||
|
@ -294,7 +296,16 @@ internal sealed class PayloadHandler {
|
||||||
this.ClickLinkPayload(chunk, payload, link);
|
this.ClickLinkPayload(chunk, payload, link);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PartyFinderPayload pf: {
|
case DalamudPartyFinderPayload pf: {
|
||||||
|
if (pf.LinkType == DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification) {
|
||||||
|
GameFunctions.GameFunctions.OpenPartyFinder();
|
||||||
|
} else {
|
||||||
|
this.Ui.Plugin.Functions.OpenPartyFinder(pf.ListingId);
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case ChatTwoPartyFinderPayload pf: {
|
||||||
this.Ui.Plugin.Functions.OpenPartyFinder(pf.Id);
|
this.Ui.Plugin.Functions.OpenPartyFinder(pf.Id);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,6 +63,9 @@ internal static class ChunkUtil {
|
||||||
case PayloadType.Player:
|
case PayloadType.Player:
|
||||||
link = payload;
|
link = payload;
|
||||||
break;
|
break;
|
||||||
|
case PayloadType.PartyFinder:
|
||||||
|
link = payload;
|
||||||
|
break;
|
||||||
case PayloadType.Unknown:
|
case PayloadType.Unknown:
|
||||||
var rawPayload = (RawPayload) payload;
|
var rawPayload = (RawPayload) payload;
|
||||||
if (rawPayload.Data.Length > 1 && rawPayload.Data[1] == 0x13) {
|
if (rawPayload.Data.Length > 1 && rawPayload.Data[1] == 0x13) {
|
||||||
|
@ -80,8 +83,6 @@ internal static class ChunkUtil {
|
||||||
link = new AchievementPayload(id);
|
link = new AchievementPayload(id);
|
||||||
} else if (Equals(rawPayload, RawPayload.LinkTerminator)) {
|
} else if (Equals(rawPayload, RawPayload.LinkTerminator)) {
|
||||||
link = null;
|
link = null;
|
||||||
} else if (Equals(rawPayload, PeriodicRecruitmentLink)) {
|
|
||||||
link = rawPayload;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue