move around new Addon services a bit to match folder structure

Dalamud/Dalamud.csproj

@@ -105,6 +105,10 @@
       </Content>
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Game\Addon\" />
+    </ItemGroup>
+
     <Target Name="AddRuntimeDependenciesToContent" BeforeTargets="GetCopyToOutputDirectoryItems" DependsOnTargets="GenerateBuildDependencyFile;GenerateBuildRuntimeConfigurationFiles">
         <ItemGroup>
             <ContentWithTargetPath Include="$(ProjectDepsFilePath)" CopyToOutputDirectory="PreserveNewest" TargetPath="$(ProjectDepsFileName)" />

Dalamud/Game/Addon/Events/AddonCursorType.cs

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

Dalamud/Game/Addon/Events/AddonEventEntry.cs

@@ -1,10 +1,8 @@
-using System;
-
-using Dalamud.Memory;
+using Dalamud.Memory;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Events;
 
 /// <summary>
 /// This class represents a registered event that a plugin registers with a native ui node.

Dalamud/Game/Addon/Events/AddonEventHandle.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Events;
 
 /// <summary>
 /// Class that represents a addon event handle.

Dalamud/Game/Addon/Events/AddonEventListener.cs

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

Dalamud/Game/Addon/Events/AddonEventManager.cs

@@ -1,7 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
+using Dalamud.Game.Addon.Lifecycle;
+using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Hooking;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
@@ -11,7 +12,7 @@ using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Events;
 
 /// <summary>
 /// Service provider for addon event management.

Dalamud/Game/Addon/Events/AddonEventManagerAddressResolver.cs

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

Dalamud/Game/Addon/Events/AddonEventType.cs

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

Dalamud/Game/Addon/Events/IAddonEventHandle.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Events;
 
 /// <summary>
 /// Interface representing the data used for managing AddonEvents.

Dalamud/Game/Addon/Events/PluginEventController.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
 using Dalamud.Game.Gui;
@@ -8,7 +7,7 @@ using Dalamud.Memory;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Events;
 
 /// <summary>
 /// Class to manage creating and cleaning up events per-plugin.

Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonArgs.cs

@@ -1,7 +1,7 @@
 using Dalamud.Memory;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 
 /// <summary>
 /// Base class for AddonLifecycle AddonArgTypes.

Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonDrawArgs.cs

@@ -1,4 +1,4 @@
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 
 /// <summary>
 /// Addon argument data for Finalize events.

Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonFinalizeArgs.cs

@@ -1,4 +1,4 @@
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 
 /// <summary>
 /// Addon argument data for Finalize events.

Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonRefreshArgs.cs

@@ -1,6 +1,6 @@
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 
 /// <summary>
 /// Addon argument data for Finalize events.

Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonRequestedUpdateArgs.cs

@@ -1,4 +1,4 @@
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 
 /// <summary>
 /// Addon argument data for Finalize events.

Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonSetupArgs.cs

@@ -1,8 +1,6 @@
-using System;
+using FFXIVClientStructs.FFXIV.Component.GUI;
 
-using FFXIVClientStructs.FFXIV.Component.GUI;
-
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 
 /// <summary>
 /// Addon argument data for Setup events.

Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonUpdateArgs.cs

@@ -1,4 +1,4 @@
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 
 /// <summary>
 /// Addon argument data for Finalize events.

Dalamud/Game/Addon/Lifecycle/AddonArgsType.cs

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

Dalamud/Game/Addon/Lifecycle/AddonEvent.cs

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

Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs

@@ -1,8 +1,8 @@
-using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 
+using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Hooking;
 using Dalamud.Hooking.Internal;
 using Dalamud.IoC;
@@ -11,7 +11,7 @@ using Dalamud.Logging.Internal;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
-namespace Dalamud.Game.Addon;
+namespace Dalamud.Game.Addon.Lifecycle;
 
 /// <summary>
 /// This class provides events for in-game addon lifecycles.

Dalamud/Game/Addon/Lifecycle/AddonLifecycleAddressResolver.cs

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

Dalamud/Game/Addon/Lifecycle/AddonLifecycleEventListener.cs

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

Dalamud/Game/Gui/Dtr/DtrBar.cs

@@ -4,6 +4,9 @@ using System.Linq;
 
 using Dalamud.Configuration.Internal;
 using Dalamud.Game.Addon;
+using Dalamud.Game.Addon.Events;
+using Dalamud.Game.Addon.Lifecycle;
+using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;

Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AddonLifecycleAgingStep.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 
 using Dalamud.Game.Addon;
+using Dalamud.Game.Addon.Lifecycle;
+using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using ImGuiNET;
 
 namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;

Dalamud/Plugin/Services/IAddonEventManager.cs

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

Dalamud/Plugin/Services/IAddonLifecycle.cs

@@ -2,6 +2,8 @@
 using System.Runtime.InteropServices;
 
 using Dalamud.Game.Addon;
+using Dalamud.Game.Addon.Lifecycle;
+using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 
 namespace Dalamud.Plugin.Services;