Added "Open Crafting Log", "Open Gathering Log", "Open Fishing Log" c…

…ontext menu options Added "Open Crafting Log", "Open Gathering Log", "Open Fishing Log", "Open Log" hotkeys All sources/uses now have detailed tooltips(with more improvements to come), grouping, click actions, right click actions The "Acquisition" column can now have which icons it shows configured(uses column to come in a later version) When uptimes are listed, it will show the soonest uptime along with an icon that shows all uptimes for that item Added a "Expert Delivery Seal Count" column/filter Issues with searching for items when adding to craft/curated lists are fixed
Critical-Impact · Nov 27, 2024 · d48d4d6 · d48d4d6
1 parent 0d56bda
commit d48d4d6
Show file tree

Hide file tree

Showing 151 changed files with 4,497 additions and 1,838 deletions.
diff --git a/CriticalCommonLib b/CriticalCommonLib
diff --git a/InventoryTools/Commands/PluginCommands.cs b/InventoryTools/Commands/PluginCommands.cs
@@ -6,6 +6,7 @@
 using CriticalCommonLib.Extensions;
 using CriticalCommonLib.Services;
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Attributes;
 using InventoryTools.Mediator;
 using InventoryTools.Services.Interfaces;

diff --git a/InventoryTools/Hotkeys/AirshipsWindowHotkey.cs b/InventoryTools/Hotkeys/AirshipsWindowHotkey.cs
@@ -1,4 +1,5 @@
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Logic.Settings;
 using InventoryTools.Mediator;
 using InventoryTools.Ui;

diff --git a/InventoryTools/Hotkeys/ConfigurationWindowHotkey.cs b/InventoryTools/Hotkeys/ConfigurationWindowHotkey.cs
@@ -1,4 +1,5 @@
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Logic.Settings;
 using InventoryTools.Mediator;
 using InventoryTools.Ui;

diff --git a/InventoryTools/Hotkeys/CraftWindowHotkey.cs b/InventoryTools/Hotkeys/CraftWindowHotkey.cs
@@ -1,4 +1,5 @@
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Logic.Settings;
 using InventoryTools.Mediator;
 using InventoryTools.Ui;

diff --git a/InventoryTools/Hotkeys/DutiesWindowHotkey.cs b/InventoryTools/Hotkeys/DutiesWindowHotkey.cs
@@ -1,4 +1,5 @@
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Logic.Settings;
 using InventoryTools.Mediator;
 using InventoryTools.Ui;

diff --git a/InventoryTools/Hotkeys/HotKey.cs b/InventoryTools/Hotkeys/HotKey.cs
@@ -1,5 +1,6 @@
 using System;
 using CriticalCommonLib.Services.Mediator;
+
 using Dalamud.Game.ClientState.Keys;
 using InventoryTools.Extensions;
 using Microsoft.Extensions.Logging;

diff --git a/InventoryTools/Hotkeys/ListsWindowHotkey.cs b/InventoryTools/Hotkeys/ListsWindowHotkey.cs
@@ -1,4 +1,5 @@
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Logic.Settings;
 using InventoryTools.Mediator;
 using InventoryTools.Ui;

diff --git a/InventoryTools/Hotkeys/MobWindowHotkey.cs b/InventoryTools/Hotkeys/MobWindowHotkey.cs
@@ -1,4 +1,5 @@
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Logic.Settings;
 using InventoryTools.Mediator;
 using InventoryTools.Ui;

diff --git a/InventoryTools/Hotkeys/MoreInfoWindowHotkey.cs b/InventoryTools/Hotkeys/MoreInfoWindowHotkey.cs
@@ -1,6 +1,7 @@
 using AllaganLib.GameSheets.Sheets;
 using CriticalCommonLib;
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Mediator;
 using InventoryTools.Ui;
 using Microsoft.Extensions.Logging;

diff --git a/InventoryTools/Hotkeys/OpenCraftingLogHotkey.cs b/InventoryTools/Hotkeys/OpenCraftingLogHotkey.cs
@@ -0,0 +1,35 @@
+using AllaganLib.GameSheets.Sheets;
+using CriticalCommonLib;
+using CriticalCommonLib.Services;
+using CriticalCommonLib.Services.Mediator;
+
+using InventoryTools.Mediator;
+using InventoryTools.Ui;
+using Microsoft.Extensions.Logging;
+using OtterGui.Classes;
+
+namespace InventoryTools.Hotkeys;
+
+public class OpenCraftingLogHotkey : Hotkey
+{
+    private readonly ItemSheet _itemSheet;
+    private readonly IGameInterface _gameInterface;
+
+    public OpenCraftingLogHotkey(ILogger<OpenCraftingLogHotkey> logger, MediatorService mediatorService, ItemSheet itemSheet, InventoryToolsConfiguration configuration, IGameInterface gameInterface) : base(logger, mediatorService, configuration)
+    {
+        _itemSheet = itemSheet;
+        _gameInterface = gameInterface;
+    }
+    public override ModifiableHotkey? ModifiableHotkey => Configuration.OpenCraftingLogHotKey;
+
+    public override bool OnHotKey()
+    {
+        var id = Service.GameGui.HoveredItem;
+        if (id >= 2000000 || id == 0) return false;
+        id %= 500000;
+        var item = _itemSheet.GetRowOrDefault((uint) id);
+        if (item == null || !item.CanOpenCraftingLog) return false;
+        _gameInterface.OpenCraftingLog(item.RowId);
+        return true;
+    }
+}
diff --git a/InventoryTools/Hotkeys/OpenFishingLogHotkey.cs b/InventoryTools/Hotkeys/OpenFishingLogHotkey.cs
@@ -0,0 +1,35 @@
+using AllaganLib.GameSheets.Sheets;
+using CriticalCommonLib;
+using CriticalCommonLib.Services;
+using CriticalCommonLib.Services.Mediator;
+
+using InventoryTools.Mediator;
+using InventoryTools.Ui;
+using Microsoft.Extensions.Logging;
+using OtterGui.Classes;
+
+namespace InventoryTools.Hotkeys;
+
+public class OpenFishingLogHotkey : Hotkey
+{
+    private readonly ItemSheet _itemSheet;
+    private readonly IGameInterface _gameInterface;
+
+    public OpenFishingLogHotkey(ILogger<OpenFishingLogHotkey> logger, MediatorService mediatorService, ItemSheet itemSheet, InventoryToolsConfiguration configuration, IGameInterface gameInterface) : base(logger, mediatorService, configuration)
+    {
+        _itemSheet = itemSheet;
+        _gameInterface = gameInterface;
+    }
+    public override ModifiableHotkey? ModifiableHotkey => Configuration.OpenFishingLogHotKey;
+
+    public override bool OnHotKey()
+    {
+        var id = Service.GameGui.HoveredItem;
+        if (id >= 2000000 || id == 0) return false;
+        id %= 500000;
+        var item = _itemSheet.GetRowOrDefault((uint) id);
+        if (item == null || !item.CanOpenFishingLog) return false;
+        _gameInterface.OpenFishingLog(item.RowId, item.ObtainedSpearFishing);
+        return true;
+    }
+}
diff --git a/InventoryTools/Hotkeys/OpenGatheringLogHotkey.cs b/InventoryTools/Hotkeys/OpenGatheringLogHotkey.cs
@@ -0,0 +1,35 @@
+using AllaganLib.GameSheets.Sheets;
+using CriticalCommonLib;
+using CriticalCommonLib.Services;
+using CriticalCommonLib.Services.Mediator;
+
+using InventoryTools.Mediator;
+using InventoryTools.Ui;
+using Microsoft.Extensions.Logging;
+using OtterGui.Classes;
+
+namespace InventoryTools.Hotkeys;
+
+public class OpenGatheringLogHotkey : Hotkey
+{
+    private readonly ItemSheet _itemSheet;
+    private readonly IGameInterface _gameInterface;
+
+    public OpenGatheringLogHotkey(ILogger<OpenGatheringLogHotkey> logger, MediatorService mediatorService, ItemSheet itemSheet, InventoryToolsConfiguration configuration, IGameInterface gameInterface) : base(logger, mediatorService, configuration)
+    {
+        _itemSheet = itemSheet;
+        _gameInterface = gameInterface;
+    }
+    public override ModifiableHotkey? ModifiableHotkey => Configuration.OpenGatheringLogHotKey;
+
+    public override bool OnHotKey()
+    {
+        var id = Service.GameGui.HoveredItem;
+        if (id >= 2000000 || id == 0) return false;
+        id %= 500000;
+        var item = _itemSheet.GetRowOrDefault((uint) id);
+        if (item == null || !item.CanOpenGatheringLog) return false;
+        _gameInterface.OpenGatheringLog(item.RowId);
+        return true;
+    }
+}
diff --git a/InventoryTools/Hotkeys/OpenItemLogHotkey.cs b/InventoryTools/Hotkeys/OpenItemLogHotkey.cs
@@ -0,0 +1,47 @@
+using AllaganLib.GameSheets.Sheets;
+using CriticalCommonLib;
+using CriticalCommonLib.Services;
+using CriticalCommonLib.Services.Mediator;
+
+using InventoryTools.Mediator;
+using InventoryTools.Ui;
+using Microsoft.Extensions.Logging;
+using OtterGui.Classes;
+
+namespace InventoryTools.Hotkeys;
+
+public class OpenItemLogHotkey : Hotkey
+{
+    private readonly ItemSheet _itemSheet;
+    private readonly IGameInterface _gameInterface;
+
+    public OpenItemLogHotkey(ILogger<OpenItemLogHotkey> logger, MediatorService mediatorService, ItemSheet itemSheet, InventoryToolsConfiguration configuration, IGameInterface gameInterface) : base(logger, mediatorService, configuration)
+    {
+        _itemSheet = itemSheet;
+        _gameInterface = gameInterface;
+    }
+    public override ModifiableHotkey? ModifiableHotkey => Configuration.OpenItemLogHotKey;
+
+    public override bool OnHotKey()
+    {
+        var id = Service.GameGui.HoveredItem;
+        if (id >= 2000000 || id == 0) return false;
+        id %= 500000;
+        var item = _itemSheet.GetRowOrDefault((uint) id);
+        if (item == null || item is { CanOpenGatheringLog: false, CanOpenFishingLog: false, CanOpenCraftingLog: false }) return false;
+        if (item.CanOpenGatheringLog)
+        {
+            _gameInterface.OpenGatheringLog(item.RowId);
+        }
+        else if (item.CanOpenFishingLog)
+        {
+            _gameInterface.OpenFishingLog(item.RowId, item.ObtainedSpearFishing);
+        }
+        else if (item.CanOpenCraftingLog)
+        {
+            _gameInterface.OpenCraftingLog(item.RowId);
+        }
+
+        return true;
+    }
+}
diff --git a/InventoryTools/Hotkeys/RetainerTasksWindowHotkey.cs b/InventoryTools/Hotkeys/RetainerTasksWindowHotkey.cs
@@ -1,4 +1,5 @@
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Logic.Settings;
 using InventoryTools.Mediator;
 using InventoryTools.Ui;

diff --git a/InventoryTools/Hotkeys/SubmarinesWindowHotkey.cs b/InventoryTools/Hotkeys/SubmarinesWindowHotkey.cs
@@ -1,4 +1,5 @@
 using CriticalCommonLib.Services.Mediator;
+
 using InventoryTools.Logic.Settings;
 using InventoryTools.Mediator;
 using InventoryTools.Ui;

diff --git a/InventoryTools/InventoryTools.csproj b/InventoryTools/InventoryTools.csproj
@@ -17,7 +17,7 @@
     <ItemGroup>
         <PackageReference Include="Autofac" Version="8.0.0" />
         <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
-        <PackageReference Include="DalaMock.Host" Version="2.1.4" />
+        <PackageReference Include="DalaMock.Host" Version="2.1.5" />
         <PackageReference Include="Humanizer.Core" Version="3.0.0-beta.54" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.11" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.11" />
+26 −1		Crafting/CraftingCache.cs
+1 −6		CriticalCommonLib.csproj
+1 −1		Extensions/ItemInfoTypeExtension.cs
+16 −0		GameStructs/HousingTerritory2.cs
+1 −0		MarketBoard/MarketCache.cs
+2 −0		Models/Icons.cs
+4 −2		Services/CharacterMonitor.cs
+11 −4		Services/InventoryScanner.cs
+19 −4		Services/Ui/AtkRetainerList.cs
+15 −1		Utils.cs
+9 −15		packages.lock.json