From 70b69b786e254338daf6a32a5736ce4af6a45060 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 2 Jul 2024 21:28:51 +0200 Subject: [PATCH] API 10 --- Deliveroo/CharacterConfiguration.cs | 8 +-- Deliveroo/Deliveroo.csproj | 58 ++------------- Deliveroo/DeliverooPlugin.cs | 12 ++-- Deliveroo/External/AllaganToolsIpc.cs | 2 +- Deliveroo/External/DeliverooIpc.cs | 2 +- Deliveroo/External/ExternalPluginHandler.cs | 4 +- Deliveroo/External/PandoraIpc.cs | 2 +- Deliveroo/GameFunctions.cs | 12 ++-- Deliveroo/Handlers/ExchangeHandler.cs | 2 +- Deliveroo/Handlers/SupplyHandler.cs | 14 ++-- Deliveroo/Windows/ConfigWindow.cs | 26 ++++--- Deliveroo/Windows/TurnInWindow.cs | 32 ++++----- Deliveroo/packages.lock.json | 79 +++++++++++++++++++-- LLib | 2 +- 14 files changed, 140 insertions(+), 115 deletions(-) diff --git a/Deliveroo/CharacterConfiguration.cs b/Deliveroo/CharacterConfiguration.cs index 6e5026d..6a26798 100644 --- a/Deliveroo/CharacterConfiguration.cs +++ b/Deliveroo/CharacterConfiguration.cs @@ -17,10 +17,10 @@ internal sealed class CharacterConfiguration public bool OverrideItemsToPurchase { get; set; } public List ItemsToPurchase { get; set; } = new(); - public static string ResolveFilePath(DalamudPluginInterface pluginInterface, ulong localContentId) + public static string ResolveFilePath(IDalamudPluginInterface pluginInterface, ulong localContentId) => Path.Join(pluginInterface.GetPluginConfigDirectory(), $"char.{localContentId:X}.json"); - public static CharacterConfiguration? Load(DalamudPluginInterface pluginInterface, ulong localContentId) + public static CharacterConfiguration? Load(IDalamudPluginInterface pluginInterface, ulong localContentId) { string path = ResolveFilePath(pluginInterface, localContentId); if (!File.Exists(path)) @@ -29,11 +29,11 @@ internal sealed class CharacterConfiguration return JsonConvert.DeserializeObject(File.ReadAllText(path)); } - public void Save(DalamudPluginInterface pluginInterface) + public void Save(IDalamudPluginInterface pluginInterface) { File.WriteAllText(ResolveFilePath(pluginInterface, LocalContentId), JsonConvert.SerializeObject(this, Formatting.Indented)); } - public void Delete(DalamudPluginInterface pluginInterface) => + public void Delete(IDalamudPluginInterface pluginInterface) => File.Delete(ResolveFilePath(pluginInterface, LocalContentId)); } diff --git a/Deliveroo/Deliveroo.csproj b/Deliveroo/Deliveroo.csproj index 49d79b4..9d78b0b 100644 --- a/Deliveroo/Deliveroo.csproj +++ b/Deliveroo/Deliveroo.csproj @@ -1,63 +1,13 @@ - + - net8.0-windows - 4.10 - 12 - enable - true - false - false + 5.0 dist - true - true - portable - $(SolutionDir)=X:\ - - $(appdata)\XIVLauncher\addon\Hooks\dev\ - - - - $(DALAMUD_HOME)/ - + + - - - - - - - - $(DalamudLibPath)Dalamud.dll - false - - - $(DalamudLibPath)ImGui.NET.dll - false - - - $(DalamudLibPath)Lumina.dll - false - - - $(DalamudLibPath)Lumina.Excel.dll - false - - - $(DalamudLibPath)Newtonsoft.Json.dll - false - - - $(DalamudLibPath)FFXIVClientStructs.dll - false - - - - - - diff --git a/Deliveroo/DeliverooPlugin.cs b/Deliveroo/DeliverooPlugin.cs index c581b28..6c9a8e6 100644 --- a/Deliveroo/DeliverooPlugin.cs +++ b/Deliveroo/DeliverooPlugin.cs @@ -25,7 +25,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin { private readonly WindowSystem _windowSystem = new(typeof(DeliverooPlugin).AssemblyQualifiedName); - private readonly DalamudPluginInterface _pluginInterface; + private readonly IDalamudPluginInterface _pluginInterface; private readonly IChatGui _chatGui; private readonly IGameGui _gameGui; private readonly IFramework _framework; @@ -55,7 +55,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin private Stage _currentStageInternal = Stage.Stopped; - public DeliverooPlugin(DalamudPluginInterface pluginInterface, IChatGui chatGui, IGameGui gameGui, + public DeliverooPlugin(IDalamudPluginInterface pluginInterface, IChatGui chatGui, IGameGui gameGui, IFramework framework, IClientState clientState, IObjectTable objectTable, ITargetManager targetManager, IDataManager dataManager, ICondition condition, ICommandManager commandManager, IPluginLog pluginLog, IAddonLifecycle addonLifecycle, ITextureProvider textureProvider, IGameConfig gameConfig, IKeyState keyState) @@ -89,7 +89,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin _pluginLog, _iconCache, _gameFunctions); _windowSystem.AddWindow(_configWindow); _turnInWindow = new TurnInWindow(this, _pluginInterface, _configuration, _condition, _clientState, - _gcRewardsCache, _configWindow, _iconCache, _keyState, _gameGui, _gameFunctions); + _gcRewardsCache, _configWindow, _iconCache, _keyState, _gameFunctions); _windowSystem.AddWindow(_turnInWindow); _framework.Update += FrameworkUpdate; @@ -114,7 +114,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "GrandCompanySupplyReward", GrandCompanySupplyRewardPostSetup); } - private void ChatMessage(XivChatType type, uint senderId, ref SeString sender, ref SeString message, + private void ChatMessage(XivChatType type, int timestamp, ref SeString sender, ref SeString message, ref bool isHandled) { if (_configuration.PauseAtRank <= 0) @@ -233,8 +233,8 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin if (!_clientState.IsLoggedIn || _clientState.TerritoryType is not 128 and not 130 and not 132 || _condition[ConditionFlag.OccupiedInCutSceneEvent] || - _gameFunctions.GetDistanceToNpc(_gameFunctions.GetQuartermasterId(), out GameObject? quartermaster) >= 7f || - _gameFunctions.GetDistanceToNpc(_gameFunctions.GetPersonnelOfficerId(), out GameObject? personnelOfficer) >= + _gameFunctions.GetDistanceToNpc(_gameFunctions.GetQuartermasterId(), out IGameObject? quartermaster) >= 7f || + _gameFunctions.GetDistanceToNpc(_gameFunctions.GetPersonnelOfficerId(), out IGameObject? personnelOfficer) >= 7f || CharacterConfiguration is { DisableForCharacter: true } || _configWindow.IsOpen) diff --git a/Deliveroo/External/AllaganToolsIpc.cs b/Deliveroo/External/AllaganToolsIpc.cs index 035b9a8..a83371e 100644 --- a/Deliveroo/External/AllaganToolsIpc.cs +++ b/Deliveroo/External/AllaganToolsIpc.cs @@ -25,7 +25,7 @@ internal sealed class AllaganToolsIpc private readonly ICallGateSubscriber _itemCountOwned; - public AllaganToolsIpc(DalamudPluginInterface pluginInterface, IPluginLog pluginLog) + public AllaganToolsIpc(IDalamudPluginInterface pluginInterface, IPluginLog pluginLog) { _pluginLog = pluginLog; _itemCountOwned = pluginInterface.GetIpcSubscriber("AllaganTools.ItemCountOwned"); diff --git a/Deliveroo/External/DeliverooIpc.cs b/Deliveroo/External/DeliverooIpc.cs index bcba033..fa7a7f2 100644 --- a/Deliveroo/External/DeliverooIpc.cs +++ b/Deliveroo/External/DeliverooIpc.cs @@ -16,7 +16,7 @@ internal sealed class DeliverooIpc : IDisposable private bool _running; - public DeliverooIpc(DalamudPluginInterface pluginInterface) + public DeliverooIpc(IDalamudPluginInterface pluginInterface) { _isTurnInRunning = pluginInterface.GetIpcProvider(IsTurnInRunning); _turnInStarted = pluginInterface.GetIpcProvider(TurnInStarted); diff --git a/Deliveroo/External/ExternalPluginHandler.cs b/Deliveroo/External/ExternalPluginHandler.cs index a546b8b..d8e182d 100644 --- a/Deliveroo/External/ExternalPluginHandler.cs +++ b/Deliveroo/External/ExternalPluginHandler.cs @@ -7,7 +7,7 @@ namespace Deliveroo.External; internal sealed class ExternalPluginHandler : IDisposable { - private readonly DalamudPluginInterface _pluginInterface; + private readonly IDalamudPluginInterface _pluginInterface; private readonly IGameConfig _gameConfig; private readonly Configuration _configuration; private readonly IPluginLog _pluginLog; @@ -19,7 +19,7 @@ internal sealed class ExternalPluginHandler : IDisposable private SystemConfigState? _limitFrameRateWhenClientInactive; private SystemConfigState? _uncapFrameRate; - public ExternalPluginHandler(DalamudPluginInterface pluginInterface, IGameConfig gameConfig, + public ExternalPluginHandler(IDalamudPluginInterface pluginInterface, IGameConfig gameConfig, Configuration configuration, IPluginLog pluginLog) { _pluginInterface = pluginInterface; diff --git a/Deliveroo/External/PandoraIpc.cs b/Deliveroo/External/PandoraIpc.cs index da188fc..2f2183a 100644 --- a/Deliveroo/External/PandoraIpc.cs +++ b/Deliveroo/External/PandoraIpc.cs @@ -13,7 +13,7 @@ internal sealed class PandoraIpc private readonly ICallGateSubscriber _getEnabled; private readonly ICallGateSubscriber _setEnabled; - public PandoraIpc(DalamudPluginInterface pluginInterface, IPluginLog pluginLog) + public PandoraIpc(IDalamudPluginInterface pluginInterface, IPluginLog pluginLog) { _pluginLog = pluginLog; _getEnabled = pluginInterface.GetIpcSubscriber("PandorasBox.GetFeatureEnabled"); diff --git a/Deliveroo/GameFunctions.cs b/Deliveroo/GameFunctions.cs index 0fbfd1f..a8cf5a3 100644 --- a/Deliveroo/GameFunctions.cs +++ b/Deliveroo/GameFunctions.cs @@ -79,10 +79,10 @@ internal sealed class GameFunctions : IDisposable _retainerItemCache.Clear(); } - public unsafe void InteractWithTarget(GameObject obj) + public unsafe void InteractWithTarget(IGameObject obj) { _pluginLog.Information($"Setting target to {obj}"); - if (_targetManager.Target == null || _targetManager.Target != obj) + if (_targetManager.Target == null || _targetManager.Target.EntityId != obj.EntityId) { _targetManager.Target = obj; } @@ -111,13 +111,13 @@ internal sealed class GameFunctions : IDisposable public unsafe byte GetGrandCompanyRank() => PlayerState.Instance()->GetGrandCompanyRank(); - public float GetDistanceToNpc(int npcId, out GameObject? o) + public float GetDistanceToNpc(int npcId, out IGameObject? o) { foreach (var obj in _objectTable) { - if (obj.ObjectKind == ObjectKind.EventNpc && obj is Character c) + if (obj.ObjectKind == ObjectKind.EventNpc && obj is ICharacter c) { - if (GetNpcId(obj) == npcId) + if (c.DataId == npcId) { o = obj; return Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, c.Position); @@ -129,7 +129,7 @@ internal sealed class GameFunctions : IDisposable return float.MaxValue; } - public static int GetNpcId(GameObject obj) + public static int GetNpcId(IGameObject obj) { return Marshal.ReadInt32(obj.Address + 128); } diff --git a/Deliveroo/Handlers/ExchangeHandler.cs b/Deliveroo/Handlers/ExchangeHandler.cs index dc4e701..53a96ee 100644 --- a/Deliveroo/Handlers/ExchangeHandler.cs +++ b/Deliveroo/Handlers/ExchangeHandler.cs @@ -31,7 +31,7 @@ internal sealed class ExchangeHandler _pluginLog = pluginLog; } - public void InteractWithQuartermaster(GameObject personnelOfficer, GameObject quartermaster) + public void InteractWithQuartermaster(IGameObject personnelOfficer, IGameObject quartermaster) { if (_gameFunctions.GetCurrentSealCount() < _plugin.EffectiveReservedSealCount) { diff --git a/Deliveroo/Handlers/SupplyHandler.cs b/Deliveroo/Handlers/SupplyHandler.cs index ee5dcc1..57fb907 100644 --- a/Deliveroo/Handlers/SupplyHandler.cs +++ b/Deliveroo/Handlers/SupplyHandler.cs @@ -32,9 +32,9 @@ internal sealed class SupplyHandler _pluginLog = pluginLog; } - public void InteractWithPersonnelOfficer(GameObject personnelOfficer, GameObject quartermaster) + public void InteractWithPersonnelOfficer(IGameObject personnelOfficer, IGameObject quartermaster) { - if (_targetManager.Target == quartermaster) + if (_targetManager.Target?.EntityId == quartermaster.EntityId) return; _gameFunctions.InteractWithTarget(personnelOfficer); @@ -46,7 +46,7 @@ internal sealed class SupplyHandler var agentInterface = AgentModule.Instance()->GetAgentByInternalId(AgentId.GrandCompanySupply); if (agentInterface != null && agentInterface->IsAgentActive()) { - var addonId = agentInterface->GetAddonID(); + var addonId = agentInterface->GetAddonId(); if (addonId == 0) return; @@ -89,7 +89,7 @@ internal sealed class SupplyHandler var agentInterface = AgentModule.Instance()->GetAgentByInternalId(AgentId.GrandCompanySupply); if (agentInterface != null && agentInterface->IsAgentActive()) { - var addonId = agentInterface->GetAddonID(); + var addonId = agentInterface->GetAddonId(); if (addonId == 0) return; @@ -99,7 +99,7 @@ internal sealed class SupplyHandler var addonGc = (AddonGrandCompanySupplyList*)addon; if (addonGc->ExpertDeliveryList == null || - !addonGc->ExpertDeliveryList->AtkComponentBase.OwnerNode->AtkResNode.IsVisible) + !addonGc->ExpertDeliveryList->AtkComponentBase.OwnerNode->AtkResNode.IsVisible()) return; if (addonGc->SelectedTab != 2) @@ -117,7 +117,7 @@ internal sealed class SupplyHandler } int currentListSize = addonGc->ExpertDeliveryList->ListLength; - if (addonGc->ListEmptyTextNode->AtkResNode.IsVisible || currentListSize == 0) + if (addonGc->ListEmptyTextNode->AtkResNode.IsVisible() || currentListSize == 0) { _pluginLog.Information( $"No items to turn in ({addonGc->ListEmptyTextNode->AtkResNode.IsVisible}, {currentListSize})"); @@ -226,7 +226,7 @@ internal sealed class SupplyHandler var agentInterface = AgentModule.Instance()->GetAgentByInternalId(AgentId.GrandCompanySupply); if (agentInterface != null && agentInterface->IsAgentActive()) { - var addonId = agentInterface->GetAddonID(); + var addonId = agentInterface->GetAddonId(); if (addonId == 0) return; diff --git a/Deliveroo/Windows/ConfigWindow.cs b/Deliveroo/Windows/ConfigWindow.cs index 9d27559..643bc03 100644 --- a/Deliveroo/Windows/ConfigWindow.cs +++ b/Deliveroo/Windows/ConfigWindow.cs @@ -6,7 +6,7 @@ using Dalamud.Game.ClientState.Keys; using Dalamud.Game.Text; using Dalamud.Interface; using Dalamud.Interface.Components; -using Dalamud.Interface.Internal; +using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; using Dalamud.Plugin; using Dalamud.Plugin.Services; @@ -20,7 +20,7 @@ namespace Deliveroo.Windows; internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig { - private readonly DalamudPluginInterface _pluginInterface; + private readonly IDalamudPluginInterface _pluginInterface; private readonly DeliverooPlugin _plugin; private readonly Configuration _configuration; private readonly GcRewardsCache _gcRewardsCache; @@ -42,7 +42,7 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig private string _searchString = string.Empty; private uint _dragDropSource; - public ConfigWindow(DalamudPluginInterface pluginInterface, DeliverooPlugin plugin, Configuration configuration, + public ConfigWindow(IDalamudPluginInterface pluginInterface, DeliverooPlugin plugin, Configuration configuration, GcRewardsCache gcRewardsCache, IClientState clientState, IPluginLog pluginLog, IconCache iconCache, GameFunctions gameFunctions) : base("Deliveroo - Configuration###DeliverooConfig") @@ -103,10 +103,12 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig _configuration.ItemsAvailableForPurchase.Count == 1 && itemId == ItemIds.Venture); var item = _itemLookup[itemId]; - IDalamudTextureWrap? icon = _iconCache.GetIcon(item.IconId); + var icon = _iconCache.GetIcon(item.IconId); Vector2 pos = ImGui.GetCursorPos(); Vector2 iconSize = new Vector2(ImGui.GetTextLineHeight() + ImGui.GetStyle().ItemSpacing.Y); - if (icon != null) + + icon.TryGetWrap(out IDalamudTextureWrap? wrap, out _); + if (wrap != null) { ImGui.SetCursorPos(pos + new Vector2(iconSize.X + ImGui.GetStyle().FramePadding.X, ImGui.GetStyle().ItemSpacing.Y / 2)); @@ -115,13 +117,15 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig ImGui.Selectable($"{item.Name}{(item.Limited ? $" {SeIconChar.Hyadelyn.ToIconString()}" : "")}", false, ImGuiSelectableFlags.SpanAllColumns); - if (icon != null) + if (wrap != null) { ImGui.SameLine(0, 0); ImGui.SetCursorPos(pos); - ImGui.Image(icon.ImGuiHandle, iconSize); + ImGui.Image(wrap.ImGuiHandle, iconSize); } + wrap?.Dispose(); + if (ImGui.BeginDragDropSource()) { ImGui.SetDragDropPayload("DeliverooDragDrop", nint.Zero, 0); @@ -190,12 +194,14 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig foreach (var item in comboValues.Where(x => x.Name.Contains(_searchString, StringComparison.OrdinalIgnoreCase))) { - IDalamudTextureWrap? icon = _iconCache.GetIcon(item.IconId); - if (icon != null) + var icon = _iconCache.GetIcon(item.IconId); + if (icon.TryGetWrap(out IDalamudTextureWrap? wrap, out _)) { - ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight())); + ImGui.Image(wrap.ImGuiHandle, new Vector2(ImGui.GetFrameHeight())); ImGui.SameLine(); ImGui.SetCursorPosY(ImGui.GetCursorPosY() + ImGui.GetStyle().FramePadding.X); + + wrap.Dispose(); } bool addThis = diff --git a/Deliveroo/Windows/TurnInWindow.cs b/Deliveroo/Windows/TurnInWindow.cs index 5d0efb7..5e03fc0 100644 --- a/Deliveroo/Windows/TurnInWindow.cs +++ b/Deliveroo/Windows/TurnInWindow.cs @@ -7,17 +7,15 @@ using Dalamud.Game.ClientState.Keys; using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Components; -using Dalamud.Interface.Internal; +using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; using Dalamud.Plugin; using Dalamud.Plugin.Services; using Deliveroo.GameData; using FFXIVClientStructs.FFXIV.Client.Game; -using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI.Agent; using ImGuiNET; using LLib; -using LLib.GameUI; using LLib.ImGui; namespace Deliveroo.Windows; @@ -47,7 +45,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig private static readonly string[] StockingTypeLabels = { "Purchase Once", "Keep in Stock" }; private readonly DeliverooPlugin _plugin; - private readonly DalamudPluginInterface _pluginInterface; + private readonly IDalamudPluginInterface _pluginInterface; private readonly Configuration _configuration; private readonly ICondition _condition; private readonly IClientState _clientState; @@ -55,14 +53,13 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig private readonly ConfigWindow _configWindow; private readonly IconCache _iconCache; private readonly IKeyState _keyState; - private readonly IGameGui _gameGui; private readonly GameFunctions _gameFunctions; private bool _state; - public TurnInWindow(DeliverooPlugin plugin, DalamudPluginInterface pluginInterface, Configuration configuration, + public TurnInWindow(DeliverooPlugin plugin, IDalamudPluginInterface pluginInterface, Configuration configuration, ICondition condition, IClientState clientState, GcRewardsCache gcRewardsCache, ConfigWindow configWindow, - IconCache iconCache, IKeyState keyState, IGameGui gameGui, GameFunctions gameFunctions) + IconCache iconCache, IKeyState keyState, GameFunctions gameFunctions) : base("GC Delivery###DeliverooTurnIn") { _plugin = plugin; @@ -74,7 +71,6 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig _configWindow = configWindow; _iconCache = iconCache; _keyState = keyState; - _gameGui = gameGui; _gameFunctions = gameFunctions; Position = new Vector2(100, 100); @@ -296,7 +292,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig uint requiredSeals = _gameFunctions.GetSealsRequiredForNextRank(); int currentHuntingLog = - MonsterNoteManager.Instance()->RankDataArraySpan[(int)_gameFunctions.GetGrandCompany() + 7] + MonsterNoteManager.Instance()->RankData[(int)_gameFunctions.GetGrandCompany() + 7] .Rank; byte requiredHuntingLog = _gameFunctions.GetRequiredHuntingLogForNextRank(); @@ -430,11 +426,13 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig } var comboItem = comboValues[comboValueIndex]; - IDalamudTextureWrap? icon = _iconCache.GetIcon(comboItem.Item.IconId); - if (icon != null) + var icon = _iconCache.GetIcon(comboItem.Item.IconId); + if (icon.TryGetWrap(out IDalamudTextureWrap? wrap, out _)) { - ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight())); + ImGui.Image(wrap.ImGuiHandle, new Vector2(ImGui.GetFrameHeight())); ImGui.SameLine(0, 3); + + wrap.Dispose(); } indentX = ImGui.GetCursorPosX() - indentX; @@ -577,7 +575,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig for (int i = 0; i < container->Size; ++i) { var item = container->GetInventorySlot(i); - if (item == null || item->ItemID == 0 || item->ItemID == itemId) + if (item == null || item->ItemId == 0 || item->ItemId == itemId) { slotsThatCanBeUsed++; } @@ -605,10 +603,10 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig private sealed class CharacterSpecificItemsToPurchase : IItemsToPurchase { private readonly CharacterConfiguration _characterConfiguration; - private readonly DalamudPluginInterface _pluginInterface; + private readonly IDalamudPluginInterface _pluginInterface; public CharacterSpecificItemsToPurchase(CharacterConfiguration characterConfiguration, - DalamudPluginInterface pluginInterface) + IDalamudPluginInterface pluginInterface) { _characterConfiguration = characterConfiguration; _pluginInterface = pluginInterface; @@ -638,9 +636,9 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig private sealed class GlobalItemsToPurchase : IItemsToPurchase { private readonly Configuration _configuration; - private readonly DalamudPluginInterface _pluginInterface; + private readonly IDalamudPluginInterface _pluginInterface; - public GlobalItemsToPurchase(Configuration configuration, DalamudPluginInterface pluginInterface) + public GlobalItemsToPurchase(Configuration configuration, IDalamudPluginInterface pluginInterface) { _configuration = configuration; _pluginInterface = pluginInterface; diff --git a/Deliveroo/packages.lock.json b/Deliveroo/packages.lock.json index 9cba519..f5ad582 100644 --- a/Deliveroo/packages.lock.json +++ b/Deliveroo/packages.lock.json @@ -4,12 +4,83 @@ "net8.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[2.1.12, )", - "resolved": "2.1.12", - "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg==" + "requested": "[2.1.13, )", + "resolved": "2.1.13", + "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ==" + }, + "DotNet.ReproducibleBuilds": { + "type": "Direct", + "requested": "[1.1.1, )", + "resolved": "1.1.1", + "contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==", + "dependencies": { + "Microsoft.SourceLink.AzureRepos.Git": "1.1.1", + "Microsoft.SourceLink.Bitbucket.Git": "1.1.1", + "Microsoft.SourceLink.GitHub": "1.1.1", + "Microsoft.SourceLink.GitLab": "1.1.1" + } + }, + "Microsoft.SourceLink.Gitea": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "KOBodmDnlWGIqZt2hT47Q69TIoGhIApDVLCyyj9TT5ct8ju16AbHYcB4XeknoHX562wO1pMS/1DfBIZK+V+sxg==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.SourceLink.AzureRepos.Git": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } + }, + "Microsoft.SourceLink.Bitbucket.Git": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } + }, + "Microsoft.SourceLink.GitLab": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } }, "llib": { - "type": "Project" + "type": "Project", + "dependencies": { + "DalamudPackager": "[2.1.13, )" + } } } } diff --git a/LLib b/LLib index b5125d4..7027d29 160000 --- a/LLib +++ b/LLib @@ -1 +1 @@ -Subproject commit b5125d4b3f7cdc0c7514a01764e5b5d4d85f80a7 +Subproject commit 7027d291efbbff6a55944dd521d3907210ddecbe