Move around custom CS structs

Author: WorkingRobot

Craftimizer/SimulatorUtils.cs

@@ -15,6 +15,7 @@
 using Lumina.Text.Payloads;
 using Lumina.Excel.Sheets;
 using Dalamud.Utility;
+using FFXIVClientStructs.FFXIV.Client.Game.Event;
 
 namespace Craftimizer.Plugin;
 
@@ -54,7 +55,7 @@ static ActionUtils()
                         r.Icon == baseAction.Icon &&
                         r.ActionCategory.RowId == baseAction.ActionCategory.RowId &&
                         r.Name.Equals(baseAction.Name));
-                
+
                 foreach (var classJob in classJobs)
                     ActionRows[(int)actionType, (int)classJob] = (null, possibleActions.First(r => r.ClassJobCategory.ValueNullable?.IsClassJob(classJob) ?? false));
             }
@@ -144,7 +145,7 @@ public static unsafe short GetPlayerLevel(this ClassJob me) =>
     public static unsafe ushort GetWKSSyncedLevel(this ClassJob me)
     {
         var jobLevel = (ushort)me.GetPlayerLevel();
-        var handler = CSCraftEventHandler.Instance();
+        var handler = EventFramework.Instance()->GetCraftEventHandler();
         if (handler != null)
         {
             for (var i = 0; i < 2; ++i)

Craftimizer/Utils/CSCraftEventHandler.cs

@@ -1,4 +1,5 @@
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
+using FFXIVClientStructs.FFXIV.Client.System.String;
 using System.Runtime.InteropServices;
 
 namespace Craftimizer.Utils;
@@ -12,4 +13,29 @@ public unsafe struct CSRecipeNote
     {
         return (CSRecipeNote*)RecipeNote.Instance();
     }
+
+    [StructLayout(LayoutKind.Explicit, Size = 136)]
+    public struct RecipeIngredient
+    {
+        [FieldOffset(8)]
+        public byte NQCount;
+
+        [FieldOffset(9)]
+        public byte HQCount;
+
+        [FieldOffset(16)]
+        public Utf8String Name;
+
+        [FieldOffset(120)]
+        public uint ItemId;
+
+        [FieldOffset(124)]
+        public uint IconId;
+
+        [FieldOffset(130)]
+        public byte Amount;
+
+        [FieldOffset(131)]
+        public byte Flags;
+    }
 }

Craftimizer/Utils/CSRecipeNote.cs

@@ -30,6 +30,7 @@
 using ActionType = Craftimizer.Simulator.Actions.ActionType;
 using ClassJob = Craftimizer.Simulator.ClassJob;
 using CSRecipeNote = FFXIVClientStructs.FFXIV.Client.Game.UI.RecipeNote;
+using RecipeIngredient2 = Craftimizer.Utils.CSRecipeNote.RecipeIngredient;
 
 namespace Craftimizer.Windows;
 
@@ -312,31 +313,6 @@ bool ShouldUseWKSRecipeNote()
         return true;
     }
 
-    [StructLayout(LayoutKind.Explicit, Size = 136)]
-    public struct RecipeIngredient2
-    {
-        [FieldOffset(8)]
-        public byte NQCount;
-
-        [FieldOffset(9)]
-        public byte HQCount;
-
-        [FieldOffset(16)]
-        public Utf8String Name;
-
-        [FieldOffset(120)]
-        public uint ItemId;
-
-        [FieldOffset(124)]
-        public uint IconId;
-
-        [FieldOffset(130)]
-        public byte Amount;
-
-        [FieldOffset(131)]
-        public byte Flags;
-    }
-
     private IEnumerable<int> CalculateIngredientHqCounts()
     {
         if (RecipeData == null)