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

[AddonLifecycle] Fixes

Browse source
This commit is contained in:
MidoriKami 2023-08-29 14:01:53 -07:00
parent efefcd70cf
commit cfef50af0c
2 changed files with 11 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Dalamud/Game/AddonLifecycle/AddonLifecycle.cs
View file

@ -1,5 +1,4 @@
using System; using System;
using System.Runtime.InteropServices;
using Dalamud.Hooking; using Dalamud.Hooking;
using Dalamud.IoC; using Dalamud.IoC;
@ -29,13 +28,11 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType, IAddonLifecycl
this.address.Setup(sigScanner); this.address.Setup(sigScanner);
this.onAddonSetupHook = Hook<AddonSetupDelegate>.FromAddress(this.address.AddonSetup, this.OnAddonSetup); this.onAddonSetupHook = Hook<AddonSetupDelegate>.FromAddress(this.address.AddonSetup, this.OnAddonSetup);
this.onAddonFinalizeHook = Hook<AddonFinalizeDelegate>.FromAddress(this.address.AddonSetup, this.OnAddonFinalize); this.onAddonFinalizeHook = Hook<AddonFinalizeDelegate>.FromAddress(this.address.AddonFinalize, this.OnAddonFinalize);
} }
[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
private delegate nint AddonSetupDelegate(AtkUnitBase* addon); private delegate nint AddonSetupDelegate(AtkUnitBase* addon);
[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
private delegate void AddonFinalizeDelegate(AtkUnitManager* unitManager, AtkUnitBase** atkUnitBase); private delegate void AddonFinalizeDelegate(AtkUnitManager* unitManager, AtkUnitBase** atkUnitBase);
/// <inheritdoc/> /// <inheritdoc/>
@ -47,9 +44,6 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType, IAddonLifecycl
/// <inheritdoc/> /// <inheritdoc/>
public event Action<IAddonLifecycle.AddonArgs>? AddonPreFinalize; public event Action<IAddonLifecycle.AddonArgs>? AddonPreFinalize;
/// <inheritdoc/>
public event Action<IAddonLifecycle.AddonArgs>? AddonPostFinalize;
/// <inheritdoc/> /// <inheritdoc/>
public void Dispose() public void Dispose()
{ {
@ -66,6 +60,9 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType, IAddonLifecycl
private nint OnAddonSetup(AtkUnitBase* addon) private nint OnAddonSetup(AtkUnitBase* addon)
{ {
if (addon is null)
return this.onAddonSetupHook.Original(addon);
try try
{ {
this.AddonPreSetup?.Invoke(new IAddonLifecycle.AddonArgs { Addon = (nint)addon }); this.AddonPreSetup?.Invoke(new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
@ -91,6 +88,12 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType, IAddonLifecycl
private void OnAddonFinalize(AtkUnitManager* unitManager, AtkUnitBase** atkUnitBase) private void OnAddonFinalize(AtkUnitManager* unitManager, AtkUnitBase** atkUnitBase)
{ {
if (atkUnitBase is null)
{
this.onAddonFinalizeHook.Original(unitManager, atkUnitBase);
return;
}
try try
{ {
this.AddonPreFinalize?.Invoke(new IAddonLifecycle.AddonArgs { Addon = (nint)atkUnitBase[0] }); this.AddonPreFinalize?.Invoke(new IAddonLifecycle.AddonArgs { Addon = (nint)atkUnitBase[0] });
@ -101,15 +104,6 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType, IAddonLifecycl
} }
this.onAddonFinalizeHook.Original(unitManager, atkUnitBase); this.onAddonFinalizeHook.Original(unitManager, atkUnitBase);
try
{
this.AddonPostFinalize?.Invoke(new IAddonLifecycle.AddonArgs { Addon = (nint)atkUnitBase[0] });
}
catch (Exception e)
{
Log.Error(e, "Exception in OnAddonFinalize post-finalize invoke.");
}
} }
} }
@ -135,7 +129,6 @@ internal class AddonLifecyclePluginScoped : IDisposable, IServiceType, IAddonLif
this.addonLifecycleService.AddonPreSetup += this.AddonPreSetupForward; this.addonLifecycleService.AddonPreSetup += this.AddonPreSetupForward;
this.addonLifecycleService.AddonPostSetup += this.AddonPostSetupForward; this.addonLifecycleService.AddonPostSetup += this.AddonPostSetupForward;
this.addonLifecycleService.AddonPreFinalize += this.AddonPreFinalizeForward; this.addonLifecycleService.AddonPreFinalize += this.AddonPreFinalizeForward;
this.addonLifecycleService.AddonPostFinalize += this.AddonPostFinalizeForward;
} }
/// <inheritdoc/> /// <inheritdoc/>
@ -147,16 +140,12 @@ internal class AddonLifecyclePluginScoped : IDisposable, IServiceType, IAddonLif
/// <inheritdoc/> /// <inheritdoc/>
public event Action<IAddonLifecycle.AddonArgs>? AddonPreFinalize; public event Action<IAddonLifecycle.AddonArgs>? AddonPreFinalize;
/// <inheritdoc/>
public event Action<IAddonLifecycle.AddonArgs>? AddonPostFinalize;
/// <inheritdoc/> /// <inheritdoc/>
public void Dispose() public void Dispose()
{ {
this.addonLifecycleService.AddonPreSetup -= this.AddonPreSetupForward; this.addonLifecycleService.AddonPreSetup -= this.AddonPreSetupForward;
this.addonLifecycleService.AddonPostSetup -= this.AddonPostSetupForward; this.addonLifecycleService.AddonPostSetup -= this.AddonPostSetupForward;
this.addonLifecycleService.AddonPreFinalize -= this.AddonPreFinalizeForward; this.addonLifecycleService.AddonPreFinalize -= this.AddonPreFinalizeForward;
this.addonLifecycleService.AddonPostFinalize -= this.AddonPostFinalizeForward;
} }
private void AddonPreSetupForward(IAddonLifecycle.AddonArgs args) => this.AddonPreSetup?.Invoke(args); private void AddonPreSetupForward(IAddonLifecycle.AddonArgs args) => this.AddonPreSetup?.Invoke(args);
@ -164,6 +153,4 @@ internal class AddonLifecyclePluginScoped : IDisposable, IServiceType, IAddonLif
private void AddonPostSetupForward(IAddonLifecycle.AddonArgs args) => this.AddonPostSetup?.Invoke(args); private void AddonPostSetupForward(IAddonLifecycle.AddonArgs args) => this.AddonPostSetup?.Invoke(args);
private void AddonPreFinalizeForward(IAddonLifecycle.AddonArgs args) => this.AddonPreFinalize?.Invoke(args); private void AddonPreFinalizeForward(IAddonLifecycle.AddonArgs args) => this.AddonPreFinalize?.Invoke(args);
private void AddonPostFinalizeForward(IAddonLifecycle.AddonArgs args) => this.AddonPostFinalize?.Invoke(args);
} }

7
Dalamud/Plugin/Services/IAddonLifecycle.cs
View file

@ -25,11 +25,6 @@ public interface IAddonLifecycle
/// </summary> /// </summary>
public event Action<AddonArgs> AddonPreFinalize; public event Action<AddonArgs> AddonPreFinalize;
/// <summary>
/// Event that fires after an addon is done being finalized.
/// </summary>
public event Action<AddonArgs> AddonPostFinalize;
/// <summary> /// <summary>
/// Addon argument data for use in event subscribers. /// Addon argument data for use in event subscribers.
/// </summary> /// </summary>
@ -40,7 +35,7 @@ public interface IAddonLifecycle
/// <summary> /// <summary>
/// Gets the name of the addon this args referrers to. /// Gets the name of the addon this args referrers to.
/// </summary> /// </summary>
public string AddonName => this.addonName ??= MemoryHelper.ReadString((nint)((AtkUnitBase*)this.Addon)->Name, 0x20); public string AddonName => this.Addon == nint.Zero ? "NullAddon" : this.addonName ??= MemoryHelper.ReadString((nint)((AtkUnitBase*)this.Addon)->Name, 0x20);
/// <summary> /// <summary>
/// Gets the pointer to the addons AtkUnitBase. /// Gets the pointer to the addons AtkUnitBase.