Skip to content

Commit

Permalink
Remove Plugin.CopyMacro redundancy
Browse files Browse the repository at this point in the history
  • Loading branch information
WorkingRobot committed Jul 27, 2024
1 parent 4a00589 commit f2d0373
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 11 deletions.
3 changes: 0 additions & 3 deletions Craftimizer/Plugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,6 @@ public void OpenMacroClipboard(List<string> macros)
ClipboardWindow = new(macros);
}

public void CopyMacro(IReadOnlyList<ActionType> actions) =>
MacroCopy.Copy(actions);

public IActiveNotification DisplayNotification(Notification notification)
{
var ret = Service.NotificationManager.AddNotification(notification);
Expand Down
1 change: 0 additions & 1 deletion Craftimizer/Utils/FoodStatus.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Craftimizer.Plugin;
using Craftimizer.Plugin.Utils;
using ExdSheets;
using System.Collections.Frozen;
using System.Collections.Generic;
Expand Down
4 changes: 3 additions & 1 deletion Craftimizer/Utils/Gearsets.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
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);
Expand Down
2 changes: 1 addition & 1 deletion Craftimizer/Windows/MacroEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1288,7 +1288,7 @@ private void DrawMacroActions(float availWidth)
}
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();
Expand Down
2 changes: 1 addition & 1 deletion Craftimizer/Windows/MacroList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private void DrawMacro(Macro macro, float width = -1)
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);
Expand Down
4 changes: 1 addition & 3 deletions Craftimizer/Windows/RecipeNote.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Craftimizer.Plugin;
using Craftimizer.Plugin.Utils;
using Craftimizer.Simulator;
using Craftimizer.Simulator.Actions;
using Craftimizer.Solver;
Expand All @@ -11,7 +10,6 @@
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;
Expand Down Expand Up @@ -987,7 +985,7 @@ private void DrawMacro(in MacroTaskState state, float panelWidth)
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");
}
Expand Down
1 change: 0 additions & 1 deletion Craftimizer/Windows/SynthHelper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Craftimizer.Plugin;
using Craftimizer.Plugin.Utils;
using Craftimizer.Simulator;
using Craftimizer.Simulator.Actions;
using Craftimizer.Utils;
Expand Down

0 comments on commit f2d0373

Please sign in to comment.