From 084f8b55e77c50dd2d01710783676a48ca66500a Mon Sep 17 00:00:00 2001
From: Kaz Wolfe <root@kazwolfe.io>
Date: Mon, 11 Nov 2024 08:54:57 -0800
Subject: [PATCH] fix cs breaks

---
 Dalamud/Game/Addon/Events/PluginEventController.cs        | 2 +-
 .../Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs    | 4 ++--
 Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dalamud/Game/Addon/Events/PluginEventController.cs b/Dalamud/Game/Addon/Events/PluginEventController.cs
index d33e2e253..403a812db 100644
--- a/Dalamud/Game/Addon/Events/PluginEventController.cs
+++ b/Dalamud/Game/Addon/Events/PluginEventController.cs
@@ -165,7 +165,7 @@ internal unsafe class PluginEventController : IDisposable
         {
             var paramKeyMatches = currentEvent->Param == eventEntry.ParamKey;
             var eventListenerAddressMatches = (nint)currentEvent->Listener == this.EventListener.Address;
-            var eventTypeMatches = currentEvent->Type == eventType;
+            var eventTypeMatches = currentEvent->State.EventType == eventType;
             
             if (paramKeyMatches && eventListenerAddressMatches && eventTypeMatches)
             {
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs
index 51b572985..8affa1eac 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs
+++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs
@@ -16,7 +16,7 @@ public unsafe partial class AddonTree
 {
     private static readonly Dictionary<string, Type?> AddonTypeDict = [];
 
-    private static readonly Assembly? ClientStructsAssembly = typeof(Addon).Assembly;
+    private static readonly Assembly? ClientStructsAssembly = typeof(AddonAttribute).Assembly;
 
     /// <summary>
     /// Gets or sets a collection of names for field offsets that have been documented in FFXIVClientStructs.
@@ -36,7 +36,7 @@ public unsafe partial class AddonTree
             {
                 foreach (var t in from t in ClientStructsAssembly.GetTypes()
                                   where t.IsPublic
-                                  let xivAddonAttr = (Addon?)t.GetCustomAttribute(typeof(Addon), false)
+                                  let xivAddonAttr = (AddonAttribute?)t.GetCustomAttribute(typeof(AddonAttribute), false)
                                   where xivAddonAttr != null
                                   where xivAddonAttr.AddonIdentifiers.Contains(this.AddonName)
                                   select t)
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs
index 6869763c8..0c3a947dd 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs
+++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs
@@ -36,7 +36,7 @@ public static class Events
                 ImGui.TableSetupColumn("Type", WidthFixed);
                 ImGui.TableSetupColumn("Param", WidthFixed);
                 ImGui.TableSetupColumn("Flags", WidthFixed);
-                ImGui.TableSetupColumn("Unk29", WidthFixed);
+                ImGui.TableSetupColumn("StateFlags1", WidthFixed);
                 ImGui.TableSetupColumn("Target", WidthFixed);
                 ImGui.TableSetupColumn("Listener", WidthFixed);
 
@@ -48,13 +48,13 @@ public static class Events
                     ImGui.TableNextColumn();
                     ImGui.TextUnformatted($"{i++}");
                     ImGui.TableNextColumn();
-                    ImGui.TextUnformatted($"{evt->Type}");
+                    ImGui.TextUnformatted($"{evt->State.EventType}");
                     ImGui.TableNextColumn();
                     ImGui.TextUnformatted($"{evt->Param}");
                     ImGui.TableNextColumn();
-                    ImGui.TextUnformatted($"{evt->Flags}");
+                    ImGui.TextUnformatted($"{evt->State.StateFlags}");
                     ImGui.TableNextColumn();
-                    ImGui.TextUnformatted($"{evt->Unk29}");
+                    ImGui.TextUnformatted($"{evt->State.UnkFlags1}");
                     ImGui.TableNextColumn();
                     Gui.ClickToCopyText($"{(nint)evt->Target:X}");
                     ImGui.TableNextColumn();