kaiserbh/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests Activity

Fix when context menu appears when right-clicking satisfaction NPC menus

Browse Source
This commit is contained in:
Liza 2024-11-25 18:24:46 +01:00
parent 422a98cc1c
commit f51a51c547
Signed by: liza
GPG Key ID: 8DD6D21C03BB0848
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Questionable/Controller/ContextMenuController.cs
View File

@ -4,8 +4,10 @@ using Dalamud.Game.Gui.ContextMenu;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game; using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using LLib.GameData; using LLib.GameData;
using LLib.GameUI;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Questionable.Data; using Questionable.Data;
using Questionable.Functions; using Questionable.Functions;
@ -59,10 +61,17 @@ internal sealed class ContextMenuController : IDisposable
private void MenuOpened(IMenuOpenedArgs args) private void MenuOpened(IMenuOpenedArgs args)
{ {
uint itemId = (uint)_gameGui.HoveredItem; // no clue why this isn't the actual name, but here we are
if (itemId == 0) if (args.AddonName != null)
return; return;
uint itemId = GetHoveredSatisfactionSupplyItemId();
if (itemId == 0)
{
_logger.LogTrace("Ignoring context menu, no item hovered");
return;
}
if (itemId > 1_000_000) if (itemId > 1_000_000)
itemId -= 1_000_000; itemId -= 1_000_000;
@ -74,6 +83,25 @@ internal sealed class ContextMenuController : IDisposable
AddContextMenuEntry(args, itemId, npcId, EExtendedClassJob.Miner, "Mine"); AddContextMenuEntry(args, itemId, npcId, EExtendedClassJob.Miner, "Mine");
AddContextMenuEntry(args, itemId, npcId, EExtendedClassJob.Botanist, "Harvest"); AddContextMenuEntry(args, itemId, npcId, EExtendedClassJob.Botanist, "Harvest");
} }
else
_logger.LogDebug("No custom delivery NPC found for item {ItemId}.", itemId);
}
private unsafe uint GetHoveredSatisfactionSupplyItemId()
{
AgentSatisfactionSupply* agent = AgentSatisfactionSupply.Instance();
if (agent == null || !agent->IsAgentActive())
return 0;
if (_gameGui.TryGetAddonByName("SatisfactionSupply", out AddonSatisfactionSupply* addon) &&
LAddon.IsAddonReady(&addon->AtkUnitBase) &&
addon->HoveredElementIndex is >= 0 and <= 2)
{
return agent->Items[addon->HoveredElementIndex].Id;
}
return 0;
} }
private void AddContextMenuEntry(IMenuOpenedArgs args, uint itemId, uint npcId, EExtendedClassJob extendedClassJob, private void AddContextMenuEntry(IMenuOpenedArgs args, uint itemId, uint npcId, EExtendedClassJob extendedClassJob,
@ -86,7 +114,7 @@ internal sealed class ContextMenuController : IDisposable
if (!_gatheringData.TryGetGatheringPointId(itemId, classJob, out _)) if (!_gatheringData.TryGetGatheringPointId(itemId, classJob, out _))
{ {
_logger.LogInformation("No gathering point found for current job."); _logger.LogInformation("No gathering point found for {ClassJob}.", classJob);
return; return;
} }