ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 21:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Adjust Namespaces

Browse source
This commit is contained in:
MidoriKami 2023-09-20 09:46:16 -07:00
parent f48c6d499b
commit 6f40449ab3
15 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/AddonEventManager/AddonCursorType.cs
View file

@ -1,4 +1,4 @@
namespace Dalamud.Game.AddonEventManager;
namespace Dalamud.Game.Addon;
/// <summary>
/// Reimplementation of CursorType.

2
Dalamud/Game/AddonEventManager/AddonEventEntry.cs
View file

@ -2,7 +2,7 @@
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Component.GUI;
namespace Dalamud.Game.AddonEventManager;
namespace Dalamud.Game.Addon;
/// <summary>
/// This class represents a registered event that a plugin registers with a native ui node.

2
Dalamud/Game/AddonEventManager/AddonEventListener.cs
View file

@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
using FFXIVClientStructs.FFXIV.Component.GUI;
namespace Dalamud.Game.AddonEventManager;
namespace Dalamud.Game.Addon;
/// <summary>
/// Event listener class for managing custom events.

5
Dalamud/Game/AddonEventManager/AddonEventManager.cs
View file

@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using Dalamud.Game.AddonLifecycle;
using Dalamud.Hooking;
using Dalamud.IoC;
using Dalamud.IoC.Internal;
@ -12,7 +11,7 @@ using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Component.GUI;
namespace Dalamud.Game.AddonEventManager;
namespace Dalamud.Game.Addon;
/// <summary>
/// Service provider for addon event management.
@ -29,7 +28,7 @@ internal unsafe class AddonEventManager : IDisposable, IServiceType
private static readonly ModuleLog Log = new("AddonEventManager");
[ServiceManager.ServiceDependency]
private readonly AddonLifecycle.AddonLifecycle addonLifecycle = Service<AddonLifecycle.AddonLifecycle>.Get();
private readonly AddonLifecycle addonLifecycle = Service<AddonLifecycle>.Get();
private readonly AddonLifecycleEventListener finalizeEventListener;

2
Dalamud/Game/AddonEventManager/AddonEventManagerAddressResolver.cs
View file

@ -1,4 +1,4 @@
namespace Dalamud.Game.AddonEventManager;
namespace Dalamud.Game.Addon;
/// <summary>
/// AddonEventManager memory address resolver.

2
Dalamud/Game/AddonEventManager/AddonEventType.cs
View file

@ -1,4 +1,4 @@
namespace Dalamud.Game.AddonEventManager;
namespace Dalamud.Game.Addon;
/// <summary>
/// Reimplementation of AtkEventType.

2
Dalamud/Game/AddonEventManager/PluginEventController.cs
View file

@ -7,7 +7,7 @@ using Dalamud.Logging.Internal;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Component.GUI;
namespace Dalamud.Game.AddonEventManager;
namespace Dalamud.Game.Addon;
/// <summary>
/// Class to manage creating and cleaning up events per-plugin.

2
Dalamud/Game/AddonLifecycle/AddonArgs.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Memory;
using FFXIVClientStructs.FFXIV.Component.GUI;
namespace Dalamud.Game.AddonLifecycle;
namespace Dalamud.Game.Addon;
/// <summary>
/// Addon argument data for use in event subscribers.

2
Dalamud/Game/AddonLifecycle/AddonEvent.cs
View file

@ -1,4 +1,4 @@
namespace Dalamud.Game.AddonLifecycle;
namespace Dalamud.Game.Addon;
/// <summary>
/// Enumeration for available AddonLifecycle events.

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

@ -11,7 +11,7 @@ using Dalamud.Logging.Internal;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Component.GUI;
namespace Dalamud.Game.AddonLifecycle;
namespace Dalamud.Game.Addon;
/// <summary>
/// This class provides events for in-game addon lifecycles.

2
Dalamud/Game/AddonLifecycle/AddonLifecycleAddressResolver.cs
View file

@ -1,4 +1,4 @@
namespace Dalamud.Game.AddonLifecycle;
namespace Dalamud.Game.Addon;
/// <summary>
/// AddonLifecycleService memory address resolver.

2
Dalamud/Game/AddonLifecycle/AddonLifecycleEventListener.cs
View file

@ -1,6 +1,6 @@
using Dalamud.Plugin.Services;
namespace Dalamud.Game.AddonLifecycle;
namespace Dalamud.Game.Addon;
/// <summary>
/// This class is a helper for tracking and invoking listener delegates.

13
Dalamud/Game/Gui/Dtr/DtrBar.cs
View file

@ -4,8 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using Dalamud.Configuration.Internal;
using Dalamud.Game.AddonEventManager;
using Dalamud.Game.AddonLifecycle;
using Dalamud.Game.Addon;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.IoC;
using Dalamud.IoC.Internal;
@ -42,10 +41,10 @@ public sealed unsafe class DtrBar : IDisposable, IServiceType, IDtrBar
private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
[ServiceManager.ServiceDependency]
private readonly AddonEventManager.AddonEventManager uiEventManager = Service<AddonEventManager.AddonEventManager>.Get();
private readonly AddonEventManager uiEventManager = Service<AddonEventManager>.Get();
[ServiceManager.ServiceDependency]
private readonly AddonLifecycle.AddonLifecycle addonLifecycle = Service<AddonLifecycle.AddonLifecycle>.Get();
private readonly AddonLifecycle addonLifecycle = Service<AddonLifecycle>.Get();
private readonly AddonLifecycleEventListener dtrPostDrawListener;
private readonly AddonLifecycleEventListener dtrPostRequestedUpdateListener;
@ -361,6 +360,9 @@ public sealed unsafe class DtrBar : IDisposable, IServiceType, IDtrBar
this.uiEventManager.AddEvent(AddonEventManager.AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseOverEventIdOffset, (nint)dtr, (nint)node, AddonEventType.MouseOver, this.DtrEventHandler);
this.uiEventManager.AddEvent(AddonEventManager.AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseOutEventIdOffset, (nint)dtr, (nint)node, AddonEventType.MouseOut, this.DtrEventHandler);
this.uiEventManager.AddEvent(AddonEventManager.AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseClickEventIdOffset, (nint)dtr, (nint)node, AddonEventType.MouseClick, this.DtrEventHandler);
this.uiEventManager.AddEvent(AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseOverEventIdOffset, (nint)dtr, (nint)node, AddonEventType.MouseOver, this.DtrEventHandler);
this.uiEventManager.AddEvent(AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseOutEventIdOffset, (nint)dtr, (nint)node, AddonEventType.MouseOut, this.DtrEventHandler);
this.uiEventManager.AddEvent(AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseClickEventIdOffset, (nint)dtr, (nint)node, AddonEventType.MouseClick, this.DtrEventHandler);
var lastChild = dtr->RootNode->ChildNode;
while (lastChild->PrevSiblingNode != null) lastChild = lastChild->PrevSiblingNode;
@ -386,6 +388,9 @@ public sealed unsafe class DtrBar : IDisposable, IServiceType, IDtrBar
this.uiEventManager.RemoveEvent(AddonEventManager.AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseOverEventIdOffset);
this.uiEventManager.RemoveEvent(AddonEventManager.AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseOutEventIdOffset);
this.uiEventManager.RemoveEvent(AddonEventManager.AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseClickEventIdOffset);
this.uiEventManager.RemoveEvent(AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseOverEventIdOffset);
this.uiEventManager.RemoveEvent(AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseOutEventIdOffset);
this.uiEventManager.RemoveEvent(AddonEventManager.DalamudInternalKey, node->AtkResNode.NodeID + MouseClickEventIdOffset);
var tmpPrevNode = node->AtkResNode.PrevSiblingNode;
var tmpNextNode = node->AtkResNode.NextSiblingNode;

2
Dalamud/Plugin/Services/IAddonEventManager.cs
View file

@ -1,4 +1,4 @@
using Dalamud.Game.AddonEventManager;
using Dalamud.Game.Addon;
namespace Dalamud.Plugin.Services;

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

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Runtime.InteropServices;
using Dalamud.Game.AddonLifecycle;
using Dalamud.Game.Addon;
namespace Dalamud.Plugin.Services;