ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-20 14:57:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Push AddonLifecycle event register/unregister to main thread

Browse source
This commit is contained in:
MidoriKami 2026-01-04 14:03:15 -08:00
parent 9538af0554
commit 1398054216
1 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs
View file

@ -27,6 +27,9 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
private static readonly ModuleLog Log = new("AddonLifecycle"); private static readonly ModuleLog Log = new("AddonLifecycle");
[ServiceManager.ServiceDependency]
private readonly Framework framework = Service<Framework>.Get();
private Hook<AtkUnitBase.Delegates.Initialize>? onInitializeAddonHook; private Hook<AtkUnitBase.Delegates.Initialize>? onInitializeAddonHook;
[ServiceManager.ServiceConstructor] [ServiceManager.ServiceConstructor]
@ -58,20 +61,23 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
/// <param name="listener">The listener to register.</param> /// <param name="listener">The listener to register.</param>
internal void RegisterListener(AddonLifecycleEventListener listener) internal void RegisterListener(AddonLifecycleEventListener listener)
{ {
if (!this.EventListeners.ContainsKey(listener.EventType)) this.framework.RunOnFrameworkThread(() =>
{ {
if (!this.EventListeners.TryAdd(listener.EventType, [])) if (!this.EventListeners.ContainsKey(listener.EventType))
return; {
} if (!this.EventListeners.TryAdd(listener.EventType, []))
return;
}
// Note: string.Empty is a valid addon name, as that will trigger on any addon for this event type // Note: string.Empty is a valid addon name, as that will trigger on any addon for this event type
if (!this.EventListeners[listener.EventType].ContainsKey(listener.AddonName)) if (!this.EventListeners[listener.EventType].ContainsKey(listener.AddonName))
{ {
if (!this.EventListeners[listener.EventType].TryAdd(listener.AddonName, [])) if (!this.EventListeners[listener.EventType].TryAdd(listener.AddonName, []))
return; return;
} }
this.EventListeners[listener.EventType][listener.AddonName].Add(listener); this.EventListeners[listener.EventType][listener.AddonName].Add(listener);
});
} }
/// <summary> /// <summary>
@ -80,13 +86,16 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
/// <param name="listener">The listener to unregister.</param> /// <param name="listener">The listener to unregister.</param>
internal void UnregisterListener(AddonLifecycleEventListener listener) internal void UnregisterListener(AddonLifecycleEventListener listener)
{ {
if (this.EventListeners.TryGetValue(listener.EventType, out var addonListeners)) this.framework.RunOnFrameworkThread(() =>
{ {
if (addonListeners.TryGetValue(listener.AddonName, out var addonListener)) if (this.EventListeners.TryGetValue(listener.EventType, out var addonListeners))
{ {
addonListener.Remove(listener); if (addonListeners.TryGetValue(listener.AddonName, out var addonListener))
{
addonListener.Remove(listener);
}
} }
} });
} }
/// <summary> /// <summary>