From f2d03730ce1638adb8542c786690807ebc355864 Mon Sep 17 00:00:00 2001
From: Asriel Camora <asriel@camora.dev>
Date: Sat, 27 Jul 2024 01:32:15 -0700
Subject: [PATCH] Remove Plugin.CopyMacro redundancy

---
 Craftimizer/Plugin.cs              | 3 ---
 Craftimizer/Utils/FoodStatus.cs    | 1 -
 Craftimizer/Utils/Gearsets.cs      | 4 +++-
 Craftimizer/Windows/MacroEditor.cs | 2 +-
 Craftimizer/Windows/MacroList.cs   | 2 +-
 Craftimizer/Windows/RecipeNote.cs  | 4 +---
 Craftimizer/Windows/SynthHelper.cs | 1 -
 7 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Craftimizer/Plugin.cs b/Craftimizer/Plugin.cs
index f627468..d0cf449 100644
--- a/Craftimizer/Plugin.cs
+++ b/Craftimizer/Plugin.cs
@@ -149,9 +149,6 @@ public sealed class Plugin : IDalamudPlugin
         ClipboardWindow = new(macros);
     }
 
-    public void CopyMacro(IReadOnlyList<ActionType> actions) =>
-        MacroCopy.Copy(actions);
-
     public IActiveNotification DisplayNotification(Notification notification)
     {
         var ret = Service.NotificationManager.AddNotification(notification);
diff --git a/Craftimizer/Utils/FoodStatus.cs b/Craftimizer/Utils/FoodStatus.cs
index 89f0afc..442244c 100644
--- a/Craftimizer/Utils/FoodStatus.cs
+++ b/Craftimizer/Utils/FoodStatus.cs
@@ -1,5 +1,4 @@
 using Craftimizer.Plugin;
-using Craftimizer.Plugin.Utils;
 using ExdSheets;
 using System.Collections.Frozen;
 using System.Collections.Generic;
diff --git a/Craftimizer/Utils/Gearsets.cs b/Craftimizer/Utils/Gearsets.cs
index b24dfe9..2ec7d8a 100644
--- a/Craftimizer/Utils/Gearsets.cs
+++ b/Craftimizer/Utils/Gearsets.cs
@@ -6,8 +6,10 @@ using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using ExdSheets;
 using System;
 using System.Linq;
+using Craftimizer.Plugin;
+
+namespace Craftimizer.Utils;
 
-namespace Craftimizer.Plugin.Utils;
 public static unsafe class Gearsets
 {
     public record struct GearsetStats(int CP, int Craftsmanship, int Control);
diff --git a/Craftimizer/Windows/MacroEditor.cs b/Craftimizer/Windows/MacroEditor.cs
index 28e1ba2..971296d 100644
--- a/Craftimizer/Windows/MacroEditor.cs
+++ b/Craftimizer/Windows/MacroEditor.cs
@@ -1288,7 +1288,7 @@ public sealed class MacroEditor : Window, IDisposable
         }
         ImGui.SameLine();
         if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Paste))
-            Service.Plugin.CopyMacro(Macro.Actions.ToArray());
+            MacroCopy.Copy(Macro.Actions.ToArray());
         if (ImGui.IsItemHovered())
             ImGuiUtils.Tooltip("Copy to Clipboard");
         ImGui.SameLine();
diff --git a/Craftimizer/Windows/MacroList.cs b/Craftimizer/Windows/MacroList.cs
index 9c67c1a..f7ab984 100644
--- a/Craftimizer/Windows/MacroList.cs
+++ b/Craftimizer/Windows/MacroList.cs
@@ -248,7 +248,7 @@ public sealed class MacroList : Window, IDisposable
                     ImGuiUtils.Tooltip("Rename");
 
                 if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Paste, miniRowHeight))
-                    Service.Plugin.CopyMacro(macro.Actions);
+                    MacroCopy.Copy(macro.Actions);
                 if (ImGui.IsItemHovered())
                     ImGuiUtils.Tooltip("Copy to Clipboard");
                 ImGui.SameLine(0, spacing);
diff --git a/Craftimizer/Windows/RecipeNote.cs b/Craftimizer/Windows/RecipeNote.cs
index d716724..5d9dc36 100644
--- a/Craftimizer/Windows/RecipeNote.cs
+++ b/Craftimizer/Windows/RecipeNote.cs
@@ -1,5 +1,4 @@
 using Craftimizer.Plugin;
-using Craftimizer.Plugin.Utils;
 using Craftimizer.Simulator;
 using Craftimizer.Simulator.Actions;
 using Craftimizer.Solver;
@@ -11,7 +10,6 @@ using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.GameFonts;
 using Dalamud.Interface.ManagedFontAtlas;
-using Dalamud.Interface.Textures;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Windowing;
@@ -987,7 +985,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
                     if (ImGui.IsItemHovered())
                         ImGuiUtils.Tooltip("Open in Macro Editor");
                     if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Paste, miniRowHeight))
-                        Service.Plugin.CopyMacro(actions);
+                        MacroCopy.Copy(actions);
                     if (ImGui.IsItemHovered())
                         ImGuiUtils.Tooltip("Copy to Clipboard");
                 }
diff --git a/Craftimizer/Windows/SynthHelper.cs b/Craftimizer/Windows/SynthHelper.cs
index 16f638d..07082b3 100644
--- a/Craftimizer/Windows/SynthHelper.cs
+++ b/Craftimizer/Windows/SynthHelper.cs
@@ -1,5 +1,4 @@
 using Craftimizer.Plugin;
-using Craftimizer.Plugin.Utils;
 using Craftimizer.Simulator;
 using Craftimizer.Simulator.Actions;
 using Craftimizer.Utils;