From 37ca6aa3c961cf4e2e69990559f6226ce621c57d Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 1 Oct 2023 23:50:08 +0200 Subject: [PATCH] Include DoH condition, context menu to remove --- Workshoppa/Windows/MainWindow.cs | 28 ++++++++++++++++++++++++++-- Workshoppa/WorkshopPlugin.cs | 2 +- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Workshoppa/Windows/MainWindow.cs b/Workshoppa/Windows/MainWindow.cs index e06b9f4..f91645d 100644 --- a/Workshoppa/Windows/MainWindow.cs +++ b/Workshoppa/Windows/MainWindow.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Numerics; +using Dalamud.Game.ClientState; using Dalamud.Interface; using Dalamud.Interface.Components; using Dalamud.Interface.Windowing; @@ -14,16 +15,18 @@ internal sealed class MainWindow : Window { private readonly WorkshopPlugin _plugin; private readonly DalamudPluginInterface _pluginInterface; + private readonly ClientState _clientState; private readonly Configuration _configuration; private readonly WorkshopCache _workshopCache; private string _searchString = string.Empty; - public MainWindow(WorkshopPlugin plugin, DalamudPluginInterface pluginInterface, Configuration configuration, WorkshopCache workshopCache) + public MainWindow(WorkshopPlugin plugin, DalamudPluginInterface pluginInterface, ClientState clientState, Configuration configuration, WorkshopCache workshopCache) : base("Workshoppa###WorkshoppaMainWindow") { _plugin = plugin; _pluginInterface = pluginInterface; + _clientState = clientState; _configuration = configuration; _workshopCache = workshopCache; @@ -42,6 +45,9 @@ internal sealed class MainWindow : Window public bool NearFabricationStation { get; set; } = false; public ButtonState State { get; set; } = ButtonState.None; + public bool IsDiscipleOfHand => + _clientState.LocalPlayer != null && _clientState.LocalPlayer.ClassJob.Id is >= 8 and <= 15; + public override void Draw() { var currentItem = _configuration.CurrentlyCraftedItem; @@ -53,6 +59,7 @@ internal sealed class MainWindow : Window ImGui.BeginDisabled(!NearFabricationStation); if (_plugin.CurrentStage == Stage.Stopped) { + ImGui.BeginDisabled(!IsDiscipleOfHand); if (currentItem.StartedCrafting) { if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Play, "Resume")) @@ -63,6 +70,7 @@ internal sealed class MainWindow : Window if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Play, "Start Crafting")) State = ButtonState.Start; } + ImGui.EndDisabled(); ImGui.SameLine(); ImGui.BeginDisabled(!ImGui.GetIO().KeyCtrl); @@ -92,7 +100,7 @@ internal sealed class MainWindow : Window { ImGui.Text("Currently Crafting: ---"); - ImGui.BeginDisabled(!NearFabricationStation || _configuration.ItemQueue.Sum(x => x.Quantity) == 0 || _plugin.CurrentStage != Stage.Stopped); + ImGui.BeginDisabled(!NearFabricationStation || _configuration.ItemQueue.Sum(x => x.Quantity) == 0 || _plugin.CurrentStage != Stage.Stopped || !IsDiscipleOfHand); if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Play, "Start Crafting")) State = ButtonState.Start; ImGui.EndDisabled(); @@ -101,6 +109,7 @@ internal sealed class MainWindow : Window ImGui.Separator(); ImGui.Text("Queue:"); ImGui.BeginDisabled(_plugin.CurrentStage != Stage.Stopped); + Configuration.QueuedItem? itemToRemove = null; for (int i = 0; i < _configuration.ItemQueue.Count; ++ i) { ImGui.PushID($"ItemQueue{i}"); @@ -115,9 +124,24 @@ internal sealed class MainWindow : Window Save(); } + ImGui.OpenPopupOnItemClick($"###Context{i}"); + if (ImGui.BeginPopupContextItem($"###Context{i}")) + { + if (ImGui.MenuItem($"Remove {craft.Name}")) + itemToRemove = item; + + ImGui.EndPopup(); + } + ImGui.PopID(); } + if (itemToRemove != null) + { + _configuration.ItemQueue.Remove(itemToRemove); + Save(); + } + ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X); if (ImGui.BeginCombo("##CraftSelection", "Add Craft...")) { diff --git a/Workshoppa/WorkshopPlugin.cs b/Workshoppa/WorkshopPlugin.cs index 9f22431..5deeaa4 100644 --- a/Workshoppa/WorkshopPlugin.cs +++ b/Workshoppa/WorkshopPlugin.cs @@ -68,7 +68,7 @@ public sealed partial class WorkshopPlugin : IDalamudPlugin _configuration = (Configuration?)_pluginInterface.GetPluginConfig() ?? new Configuration(); _workshopCache = new WorkshopCache(dataManager); - _mainWindow = new(this, _pluginInterface, _configuration, _workshopCache) { IsOpen = true }; + _mainWindow = new(this, _pluginInterface, _clientState, _configuration, _workshopCache) { IsOpen = true }; _windowSystem.AddWindow(_mainWindow); _pluginInterface.UiBuilder.Draw += _windowSystem.Draw;