Compare commits
7 Commits
Author | SHA1 | Date |
---|---|---|
Liza | cfbd064d4a | |
Liza | d730e2c039 | |
Liza | ed2f8b9c86 | |
Liza | 33c9facad4 | |
Liza | 32775ac409 | |
Liza | 51d94c923a | |
Liza | 7396aa97d1 |
|
@ -990,7 +990,7 @@ csharp_space_around_binary_operators = before_and_after
|
||||||
csharp_using_directive_placement = outside_namespace:silent
|
csharp_using_directive_placement = outside_namespace:silent
|
||||||
csharp_prefer_simple_using_statement = true:suggestion
|
csharp_prefer_simple_using_statement = true:suggestion
|
||||||
csharp_prefer_braces = true:silent
|
csharp_prefer_braces = true:silent
|
||||||
csharp_style_namespace_declarations = block_scoped:silent
|
csharp_style_namespace_declarations = file_scoped:silent
|
||||||
csharp_style_prefer_method_group_conversion = true:silent
|
csharp_style_prefer_method_group_conversion = true:silent
|
||||||
csharp_style_prefer_top_level_statements = true:silent
|
csharp_style_prefer_top_level_statements = true:silent
|
||||||
csharp_style_prefer_primary_constructors = true:suggestion
|
csharp_style_prefer_primary_constructors = true:suggestion
|
||||||
|
|
|
@ -1,66 +1,15 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Dalamud.NET.Sdk/9.0.2">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0-windows</TargetFramework>
|
<Version>6.2</Version>
|
||||||
<Version>5.1</Version>
|
|
||||||
<LangVersion>12</LangVersion>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
|
||||||
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
|
|
||||||
<OutputPath>dist</OutputPath>
|
<OutputPath>dist</OutputPath>
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
|
||||||
<DebugType>portable</DebugType>
|
|
||||||
<PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
|
|
||||||
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
|
|
||||||
<DebugType>portable</DebugType>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<Import Project="..\LLib\LLib.targets"/>
|
||||||
<DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
|
<Import Project="..\LLib\RenameZip.targets"/>
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
|
|
||||||
<DalamudLibPath>$(DALAMUD_HOME)/</DalamudLibPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj"/>
|
<ProjectReference Include="..\AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj"/>
|
||||||
<ProjectReference Include="..\ECommons\ECommons\ECommons.csproj"/>
|
<ProjectReference Include="..\ECommons\ECommons\ECommons.csproj"/>
|
||||||
<ProjectReference Include="..\LLib\LLib.csproj"/>
|
<ProjectReference Include="..\LLib\LLib.csproj"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="DalamudPackager" Version="2.1.12"/>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="Dalamud">
|
|
||||||
<HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
|
|
||||||
<Private>false</Private>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="ImGui.NET">
|
|
||||||
<HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
|
|
||||||
<Private>false</Private>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Lumina">
|
|
||||||
<HintPath>$(DalamudLibPath)Lumina.dll</HintPath>
|
|
||||||
<Private>false</Private>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Lumina.Excel">
|
|
||||||
<HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath>
|
|
||||||
<Private>false</Private>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Newtonsoft.Json">
|
|
||||||
<HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
|
|
||||||
<Private>false</Private>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="FFXIVClientStructs">
|
|
||||||
<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
|
|
||||||
<Private>false</Private>
|
|
||||||
</Reference>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<Target Name="RenameLatestZip" AfterTargets="PackagePlugin">
|
|
||||||
<Exec Command="rename $(OutDir)$(AssemblyName)\latest.zip $(AssemblyName)-$(Version).zip"/>
|
|
||||||
</Target>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -2,7 +2,13 @@
|
||||||
"Name": "Discard Helper",
|
"Name": "Discard Helper",
|
||||||
"Author": "Liza Carvelli",
|
"Author": "Liza Carvelli",
|
||||||
"Punchline": "Discard items automatically via a command or as a post-venture task for AutoRetainer",
|
"Punchline": "Discard items automatically via a command or as a post-venture task for AutoRetainer",
|
||||||
"Description": "",
|
"Description": "Small plugin to help keep your inventory organized (especially when automating retainers or submersibles) by discarding items you don't want (e.g. Stuffed Alphas)",
|
||||||
"RepoUrl": "https://git.carvel.li/liza/ARDiscard",
|
"RepoUrl": "https://git.carvel.li/liza/ARDiscard",
|
||||||
"IconUrl": "https://plugins.carvel.li/icons/ARDiscard.png"
|
"IconUrl": "https://plugins.carvel.li/icons/ARDiscard.png",
|
||||||
|
"Tags": [
|
||||||
|
"autoretainer",
|
||||||
|
"automation",
|
||||||
|
"discard",
|
||||||
|
"yeet"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ using Dalamud.Memory;
|
||||||
using Dalamud.Plugin;
|
using Dalamud.Plugin;
|
||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
using ECommons;
|
using ECommons;
|
||||||
using ECommons.Automation;
|
using ECommons.Automation.NeoTaskManager;
|
||||||
using FFXIVClientStructs.FFXIV.Client.Game;
|
using FFXIVClientStructs.FFXIV.Client.Game;
|
||||||
using FFXIVClientStructs.FFXIV.Client.UI;
|
using FFXIVClientStructs.FFXIV.Client.UI;
|
||||||
using FFXIVClientStructs.FFXIV.Component.GUI;
|
using FFXIVClientStructs.FFXIV.Component.GUI;
|
||||||
|
@ -27,7 +27,7 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
private readonly ConfigWindow _configWindow;
|
private readonly ConfigWindow _configWindow;
|
||||||
private readonly DiscardWindow _discardWindow;
|
private readonly DiscardWindow _discardWindow;
|
||||||
|
|
||||||
private readonly DalamudPluginInterface _pluginInterface;
|
private readonly IDalamudPluginInterface _pluginInterface;
|
||||||
private readonly IChatGui _chatGui;
|
private readonly IChatGui _chatGui;
|
||||||
private readonly IClientState _clientState;
|
private readonly IClientState _clientState;
|
||||||
private readonly IPluginLog _pluginLog;
|
private readonly IPluginLog _pluginLog;
|
||||||
|
@ -35,6 +35,7 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
private readonly ICommandManager _commandManager;
|
private readonly ICommandManager _commandManager;
|
||||||
private readonly InventoryUtils _inventoryUtils;
|
private readonly InventoryUtils _inventoryUtils;
|
||||||
private readonly IconCache _iconCache;
|
private readonly IconCache _iconCache;
|
||||||
|
private readonly GameStrings _gameStrings;
|
||||||
private readonly AutoRetainerApi _autoRetainerApi;
|
private readonly AutoRetainerApi _autoRetainerApi;
|
||||||
|
|
||||||
[SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Obsolete in ECommons")]
|
[SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Obsolete in ECommons")]
|
||||||
|
@ -45,7 +46,8 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
|
|
||||||
private DateTime _cancelDiscardAfter = DateTime.MaxValue;
|
private DateTime _cancelDiscardAfter = DateTime.MaxValue;
|
||||||
|
|
||||||
public AutoDiscardPlogon(DalamudPluginInterface pluginInterface, ICommandManager commandManager, IChatGui chatGui,
|
[SuppressMessage("Maintainability", "CA1506")]
|
||||||
|
public AutoDiscardPlogon(IDalamudPluginInterface pluginInterface, ICommandManager commandManager, IChatGui chatGui,
|
||||||
IDataManager dataManager, IClientState clientState, ICondition condition, IPluginLog pluginLog,
|
IDataManager dataManager, IClientState clientState, ICondition condition, IPluginLog pluginLog,
|
||||||
IGameGui gameGui, ITextureProvider textureProvider, IContextMenu contextMenu)
|
IGameGui gameGui, ITextureProvider textureProvider, IContextMenu contextMenu)
|
||||||
{
|
{
|
||||||
|
@ -78,8 +80,10 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
listManager.FinishInitialization();
|
listManager.FinishInitialization();
|
||||||
|
|
||||||
_iconCache = new IconCache(textureProvider);
|
_iconCache = new IconCache(textureProvider);
|
||||||
|
_gameStrings = new GameStrings(dataManager, pluginLog);
|
||||||
|
|
||||||
_pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
|
_pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
|
||||||
|
_pluginInterface.UiBuilder.OpenMainUi += OpenDiscardUi;
|
||||||
_pluginInterface.UiBuilder.OpenConfigUi += OpenConfigUi;
|
_pluginInterface.UiBuilder.OpenConfigUi += OpenConfigUi;
|
||||||
|
|
||||||
_discardWindow = new(_inventoryUtils, itemCache, _iconCache, clientState, condition, _configuration);
|
_discardWindow = new(_inventoryUtils, itemCache, _iconCache, clientState, condition, _configuration);
|
||||||
|
@ -92,7 +96,10 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
_configWindow.ConfigSaved += (_, _) => _discardWindow.RefreshInventory(true);
|
_configWindow.ConfigSaved += (_, _) => _discardWindow.RefreshInventory(true);
|
||||||
_discardWindow.OpenConfigurationClicked += (_, _) => OpenConfigUi();
|
_discardWindow.OpenConfigurationClicked += (_, _) => OpenConfigUi();
|
||||||
_discardWindow.DiscardAllClicked += (_, filter) =>
|
_discardWindow.DiscardAllClicked += (_, filter) =>
|
||||||
_taskManager!.Enqueue(() => DiscardNextItem(PostProcessType.ManuallyStarted, filter));
|
{
|
||||||
|
_taskManager?.Abort();
|
||||||
|
_taskManager?.Enqueue(() => DiscardNextItem(PostProcessType.ManuallyStarted, filter));
|
||||||
|
};
|
||||||
|
|
||||||
ECommonsMain.Init(_pluginInterface, this);
|
ECommonsMain.Init(_pluginInterface, this);
|
||||||
_autoRetainerApi = new();
|
_autoRetainerApi = new();
|
||||||
|
@ -151,11 +158,13 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
|
|
||||||
private void DoRetainerPostProcess(string retainerName)
|
private void DoRetainerPostProcess(string retainerName)
|
||||||
{
|
{
|
||||||
|
_taskManager.Abort();
|
||||||
_taskManager.Enqueue(() => DiscardNextItem(PostProcessType.Retainer, ItemFilter.None));
|
_taskManager.Enqueue(() => DiscardNextItem(PostProcessType.Retainer, ItemFilter.None));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DoCharacterPostProcess()
|
private void DoCharacterPostProcess()
|
||||||
{
|
{
|
||||||
|
_taskManager.Abort();
|
||||||
_taskManager.Enqueue(() => DiscardNextItem(PostProcessType.Character, ItemFilter.None));
|
_taskManager.Enqueue(() => DiscardNextItem(PostProcessType.Character, ItemFilter.None));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -168,10 +177,13 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
|
|
||||||
private void DiscardAll(string command, string arguments)
|
private void DiscardAll(string command, string arguments)
|
||||||
{
|
{
|
||||||
|
_taskManager.Abort();
|
||||||
_taskManager.Enqueue(() => DiscardNextItem(PostProcessType.ManuallyStarted, ItemFilter.None));
|
_taskManager.Enqueue(() => DiscardNextItem(PostProcessType.ManuallyStarted, ItemFilter.None));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OpenDiscardWindow(string command, string arguments)
|
private void OpenDiscardWindow(string command, string arguments) => OpenDiscardUi();
|
||||||
|
|
||||||
|
private void OpenDiscardUi()
|
||||||
{
|
{
|
||||||
_discardWindow.IsOpen = !_discardWindow.IsOpen;
|
_discardWindow.IsOpen = !_discardWindow.IsOpen;
|
||||||
}
|
}
|
||||||
|
@ -192,11 +204,11 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
var (inventoryType, slot) = (nextItem->Container, nextItem->Slot);
|
var (inventoryType, slot) = (nextItem->Container, nextItem->Slot);
|
||||||
|
|
||||||
_pluginLog.Information(
|
_pluginLog.Information(
|
||||||
$"Discarding itemId {nextItem->ItemID} in slot {nextItem->Slot} of container {nextItem->Container}.");
|
$"Discarding itemId {nextItem->ItemId} in slot {nextItem->Slot} of container {nextItem->Container}.");
|
||||||
_inventoryUtils.Discard(nextItem);
|
_inventoryUtils.Discard(nextItem);
|
||||||
_cancelDiscardAfter = DateTime.Now.AddSeconds(15);
|
_cancelDiscardAfter = DateTime.Now.AddSeconds(15);
|
||||||
|
|
||||||
_taskManager.DelayNext(20);
|
_taskManager.EnqueueDelay(20);
|
||||||
_taskManager.Enqueue(() => ConfirmDiscardItem(type, itemFilter, inventoryType, slot));
|
_taskManager.Enqueue(() => ConfirmDiscardItem(type, itemFilter, inventoryType, slot));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -211,7 +223,7 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
((AddonSelectYesno*)addon)->YesButton->AtkComponentBase.SetEnabledState(true);
|
((AddonSelectYesno*)addon)->YesButton->AtkComponentBase.SetEnabledState(true);
|
||||||
addon->FireCallbackInt(0);
|
addon->FireCallbackInt(0);
|
||||||
|
|
||||||
_taskManager.DelayNext(20);
|
_taskManager.EnqueueDelay(20);
|
||||||
_taskManager.Enqueue(() => ContinueAfterDiscard(type, itemFilter, inventoryType, slot));
|
_taskManager.Enqueue(() => ContinueAfterDiscard(type, itemFilter, inventoryType, slot));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -226,14 +238,14 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
{
|
{
|
||||||
_pluginLog.Information(
|
_pluginLog.Information(
|
||||||
$"Addon is not (yet) visible, still trying to discard item in slot {slot} in inventory {inventoryType}");
|
$"Addon is not (yet) visible, still trying to discard item in slot {slot} in inventory {inventoryType}");
|
||||||
_taskManager.DelayNext(100);
|
_taskManager.EnqueueDelay(100);
|
||||||
_taskManager.Enqueue(() => ConfirmDiscardItem(type, itemFilter, inventoryType, slot));
|
_taskManager.Enqueue(() => ConfirmDiscardItem(type, itemFilter, inventoryType, slot));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_pluginLog.Information(
|
_pluginLog.Information(
|
||||||
$"Addon is not (yet) visible, but slot or inventory type changed, retrying from start");
|
$"Addon is not (yet) visible, but slot or inventory type changed, retrying from start");
|
||||||
_taskManager.DelayNext(100);
|
_taskManager.EnqueueDelay(100);
|
||||||
_taskManager.Enqueue(() => DiscardNextItem(type, itemFilter));
|
_taskManager.Enqueue(() => DiscardNextItem(type, itemFilter));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -259,14 +271,14 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
{
|
{
|
||||||
_pluginLog.Verbose(
|
_pluginLog.Verbose(
|
||||||
$"ContinueAfterDiscard: Waiting for server response until {_cancelDiscardAfter}");
|
$"ContinueAfterDiscard: Waiting for server response until {_cancelDiscardAfter}");
|
||||||
_taskManager.DelayNext(20);
|
_taskManager.EnqueueDelay(20);
|
||||||
_taskManager.Enqueue(() => ContinueAfterDiscard(type, itemFilter, inventoryType, slot));
|
_taskManager.Enqueue(() => ContinueAfterDiscard(type, itemFilter, inventoryType, slot));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_pluginLog.Information($"ContinueAfterDiscard: Discovered different item to discard");
|
_pluginLog.Information("ContinueAfterDiscard: Discovered different item to discard");
|
||||||
_taskManager.EnqueueImmediate(() => DiscardNextItem(type, itemFilter));
|
_taskManager.Enqueue(() => DiscardNextItem(type, itemFilter));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -304,6 +316,7 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
_iconCache.Dispose();
|
_iconCache.Dispose();
|
||||||
|
|
||||||
_pluginInterface.UiBuilder.OpenConfigUi -= OpenConfigUi;
|
_pluginInterface.UiBuilder.OpenConfigUi -= OpenConfigUi;
|
||||||
|
_pluginInterface.UiBuilder.OpenMainUi -= OpenDiscardUi;
|
||||||
_pluginInterface.UiBuilder.Draw -= _windowSystem.Draw;
|
_pluginInterface.UiBuilder.Draw -= _windowSystem.Draw;
|
||||||
_commandManager.RemoveHandler("/discard");
|
_commandManager.RemoveHandler("/discard");
|
||||||
_commandManager.RemoveHandler("/discardall");
|
_commandManager.RemoveHandler("/discardall");
|
||||||
|
@ -323,7 +336,7 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
||||||
var textNode = addon->UldManager.NodeList[15]->GetAsAtkTextNode();
|
var textNode = addon->UldManager.NodeList[15]->GetAsAtkTextNode();
|
||||||
var text = MemoryHelper.ReadSeString(&textNode->NodeText).ExtractText();
|
var text = MemoryHelper.ReadSeString(&textNode->NodeText).ExtractText();
|
||||||
_pluginLog.Information($"YesNo prompt: {text}");
|
_pluginLog.Information($"YesNo prompt: {text}");
|
||||||
if (text.StartsWith("Discard", StringComparison.Ordinal))
|
if (_gameStrings.DiscardItem.IsMatch(text) || _gameStrings.DiscardCollectable.IsMatch(text))
|
||||||
{
|
{
|
||||||
return addon;
|
return addon;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ internal sealed class ContextMenuIntegration : IDisposable
|
||||||
_contextMenu.OnMenuOpened += MenuOpened;
|
_contextMenu.OnMenuOpened += MenuOpened;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void MenuOpened(MenuOpenedArgs args)
|
private void MenuOpened(IMenuOpenedArgs args)
|
||||||
{
|
{
|
||||||
if (!IsEnabled())
|
if (!IsEnabled())
|
||||||
return;
|
return;
|
||||||
|
@ -106,7 +106,7 @@ internal sealed class ContextMenuIntegration : IDisposable
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AddToDiscardList(MenuItemClickedArgs args) =>
|
private void AddToDiscardList(IMenuItemClickedArgs args) =>
|
||||||
AddToDiscardList(((MenuTargetInventory)args.Target).TargetItem!.Value.ItemId);
|
AddToDiscardList(((MenuTargetInventory)args.Target).TargetItem!.Value.ItemId);
|
||||||
|
|
||||||
private void AddToDiscardList(uint itemId)
|
private void AddToDiscardList(uint itemId)
|
||||||
|
@ -126,7 +126,7 @@ internal sealed class ContextMenuIntegration : IDisposable
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RemoveFromDiscardList(MenuItemClickedArgs args) =>
|
private void RemoveFromDiscardList(IMenuItemClickedArgs args) =>
|
||||||
RemoveFromDiscardList(((MenuTargetInventory)args.Target).TargetItem!.Value.ItemId);
|
RemoveFromDiscardList(((MenuTargetInventory)args.Target).TargetItem!.Value.ItemId);
|
||||||
|
|
||||||
private void RemoveFromDiscardList(uint itemId)
|
private void RemoveFromDiscardList(uint itemId)
|
||||||
|
|
|
@ -12,7 +12,7 @@ internal sealed class AutoDiscardIpc
|
||||||
private readonly Configuration _configuration;
|
private readonly Configuration _configuration;
|
||||||
private readonly ICallGateProvider<IReadOnlySet<uint>> _getItemsToDiscard;
|
private readonly ICallGateProvider<IReadOnlySet<uint>> _getItemsToDiscard;
|
||||||
|
|
||||||
public AutoDiscardIpc(DalamudPluginInterface pluginInterface, Configuration configuration)
|
public AutoDiscardIpc(IDalamudPluginInterface pluginInterface, Configuration configuration)
|
||||||
{
|
{
|
||||||
_configuration = configuration;
|
_configuration = configuration;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
using System.Data;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using Dalamud.Plugin.Services;
|
||||||
|
using LLib;
|
||||||
|
using Lumina.Excel.GeneratedSheets;
|
||||||
|
|
||||||
|
namespace ARDiscard.GameData;
|
||||||
|
|
||||||
|
internal sealed class GameStrings
|
||||||
|
{
|
||||||
|
public GameStrings(IDataManager dataManager, IPluginLog pluginLog)
|
||||||
|
{
|
||||||
|
DiscardItem = dataManager.GetRegex<Addon>(110, addon => addon.Text, pluginLog)
|
||||||
|
?? throw new ConstraintException($"Unable to resolve {nameof(DiscardItem)}");
|
||||||
|
DiscardCollectable = dataManager.GetRegex<Addon>(153, addon => addon.Text, pluginLog)
|
||||||
|
?? throw new ConstraintException($"Unable to resolve {nameof(DiscardCollectable)}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public Regex DiscardItem { get; }
|
||||||
|
public Regex DiscardCollectable { get; }
|
||||||
|
}
|
|
@ -78,7 +78,7 @@ internal sealed class InventoryUtils
|
||||||
}
|
}
|
||||||
|
|
||||||
return toDiscard
|
return toDiscard
|
||||||
.Where(x => itemCounts[x.InventoryItem->ItemID] < _configuration.IgnoreItemCountWhenAbove)
|
.Where(x => itemCounts[x.InventoryItem->ItemId] < _configuration.IgnoreItemCountWhenAbove)
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ internal sealed class InventoryUtils
|
||||||
{
|
{
|
||||||
List<ItemWrapper> allItemsToDiscard = GetAllItemsToDiscard();
|
List<ItemWrapper> allItemsToDiscard = GetAllItemsToDiscard();
|
||||||
ItemWrapper? toDiscard = allItemsToDiscard.FirstOrDefault(x =>
|
ItemWrapper? toDiscard = allItemsToDiscard.FirstOrDefault(x =>
|
||||||
itemFilter == null || itemFilter.ItemIds.Contains(x.InventoryItem->ItemID));
|
itemFilter == null || itemFilter.ItemIds.Contains(x.InventoryItem->ItemId));
|
||||||
return toDiscard != null ? toDiscard.InventoryItem : null;
|
return toDiscard != null ? toDiscard.InventoryItem : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -113,36 +113,36 @@ internal sealed class InventoryUtils
|
||||||
for (int i = 0; i < container->Size; ++i)
|
for (int i = 0; i < container->Size; ++i)
|
||||||
{
|
{
|
||||||
var item = container->GetInventorySlot(i);
|
var item = container->GetInventorySlot(i);
|
||||||
if (item != null && item->ItemID != 0)
|
if (item != null && item->ItemId != 0)
|
||||||
{
|
{
|
||||||
if (itemCounts.TryGetValue(item->ItemID, out uint itemCount))
|
if (itemCounts.TryGetValue(item->ItemId, out uint itemCount))
|
||||||
itemCounts[item->ItemID] = itemCount + item->Quantity;
|
itemCounts[item->ItemId] = itemCount + item->Quantity;
|
||||||
else
|
else
|
||||||
itemCounts[item->ItemID] = item->Quantity;
|
itemCounts[item->ItemId] = item->Quantity;
|
||||||
|
|
||||||
if (_listManager.IsBlacklisted(item->ItemID))
|
if (_listManager.IsBlacklisted(item->ItemId))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!_itemCache.TryGetItem(item->ItemID, out ItemCache.CachedItemInfo? itemInfo) ||
|
if (!_itemCache.TryGetItem(item->ItemId, out ItemCache.CachedItemInfo? itemInfo) ||
|
||||||
!itemInfo.CanBeDiscarded(_listManager))
|
!itemInfo.CanBeDiscarded(_listManager))
|
||||||
continue; // no info, who knows what that item is
|
continue; // no info, who knows what that item is
|
||||||
|
|
||||||
// skip gear if we're unable to load gearsets or it is used in a gearset
|
// skip gear if we're unable to load gearsets or it is used in a gearset
|
||||||
if (itemInfo.EquipSlotCategory > 0 && (gearsetItems == null || gearsetItems.Contains(item->ItemID)))
|
if (itemInfo.EquipSlotCategory > 0 && (gearsetItems == null || gearsetItems.Contains(item->ItemId)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (itemInfo is { EquipSlotCategory: > 0, CanBeBoughtFromCalamitySalvager: false } &&
|
if (itemInfo is { EquipSlotCategory: > 0, CanBeBoughtFromCalamitySalvager: false } &&
|
||||||
itemInfo.ILvl >= _configuration.Armoury.MaximumGearItemLevel)
|
itemInfo.ILvl >= _configuration.Armoury.MaximumGearItemLevel)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (_configuration.IgnoreItemWithSignature && item->CrafterContentID != 0)
|
if (_configuration.IgnoreItemWithSignature && item->CrafterContentId != 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
//PluginLog.Verbose($"{i} → {item->ItemID}");
|
//PluginLog.Verbose($"{i} → {item->ItemID}");
|
||||||
if (_configuration.DiscardingItems.Contains(item->ItemID))
|
if (_configuration.DiscardingItems.Contains(item->ItemId))
|
||||||
{
|
{
|
||||||
_pluginLog.Verbose(
|
_pluginLog.Verbose(
|
||||||
$"Found item {item->ItemID} to discard in inventory {inventoryType} in slot {i}");
|
$"Found item {item->ItemId} to discard in inventory {inventoryType} in slot {i}");
|
||||||
toDiscard.Add(new ItemWrapper { InventoryItem = item });
|
toDiscard.Add(new ItemWrapper { InventoryItem = item });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -169,23 +169,23 @@ internal sealed class InventoryUtils
|
||||||
{
|
{
|
||||||
var gearsetItems = new[]
|
var gearsetItems = new[]
|
||||||
{
|
{
|
||||||
gearset->MainHand,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.MainHand),
|
||||||
gearset->OffHand,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.OffHand),
|
||||||
gearset->Head,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.Head),
|
||||||
gearset->Body,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.Body),
|
||||||
gearset->Hands,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.Hands),
|
||||||
gearset->Legs,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.Legs),
|
||||||
gearset->Feet,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.Feet),
|
||||||
gearset->Ears,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.Ears),
|
||||||
gearset->Neck,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.Neck),
|
||||||
gearset->Wrists,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.Wrists),
|
||||||
gearset->RingRight,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.RingLeft),
|
||||||
gearset->RingLeft,
|
gearset->GetItem(RaptureGearsetModule.GearsetItemIndex.RingRight),
|
||||||
};
|
};
|
||||||
foreach (var gearsetItem in gearsetItems)
|
foreach (var gearsetItem in gearsetItems)
|
||||||
{
|
{
|
||||||
if (gearsetItem.ItemID != 0)
|
if (gearsetItem.ItemId != 0)
|
||||||
allGearsetItems.Add(gearsetItem.ItemID);
|
allGearsetItems.Add(gearsetItem.ItemId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -195,8 +195,8 @@ internal sealed class InventoryUtils
|
||||||
|
|
||||||
public unsafe void Discard(InventoryItem* item)
|
public unsafe void Discard(InventoryItem* item)
|
||||||
{
|
{
|
||||||
if (_listManager.IsBlacklisted(item->ItemID))
|
if (_listManager.IsBlacklisted(item->ItemId))
|
||||||
throw new ArgumentException($"Can't discard {item->ItemID}", nameof(item));
|
throw new ArgumentException($"Can't discard {item->ItemId}", nameof(item));
|
||||||
|
|
||||||
AgentInventoryContext.Instance()->DiscardItem(item, item->Container, item->Slot, 0);
|
AgentInventoryContext.Instance()->DiscardItem(item, item->Container, item->Slot, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,8 +72,14 @@ internal sealed class ItemCache
|
||||||
listManager.AddToInternalWhitelist(item.RowId);
|
listManager.AddToInternalWhitelist(item.RowId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MaxDungeonItemLevel = _items.Values.Where(x => x.Rarity == 2)
|
||||||
|
.Select(x => (int)x.ILvl)
|
||||||
|
.Max();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int MaxDungeonItemLevel { get; }
|
||||||
|
|
||||||
private bool CanDiscardItemsFromQuest(LazyRow<Quest> quest)
|
private bool CanDiscardItemsFromQuest(LazyRow<Quest> quest)
|
||||||
{
|
{
|
||||||
return quest.Row > 0 &&
|
return quest.Row > 0 &&
|
||||||
|
|
|
@ -189,7 +189,7 @@ internal sealed class ListManager : IListManager
|
||||||
40300, // Unsung Chausses of Anabaseios
|
40300, // Unsung Chausses of Anabaseios
|
||||||
40301, // Unsung Greaves of Anabaseios
|
40301, // Unsung Greaves of Anabaseios
|
||||||
40302, // Unsung Ring of Anabaseios
|
40302, // Unsung Ring of Anabaseios
|
||||||
// 40317, // Unsung Blade of Anabaseios // TODO: Add when the weekly restriction is removed
|
40317, // Unsung Blade of Anabaseios
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
@ -267,6 +267,25 @@ internal sealed class ListManager : IListManager
|
||||||
32048, // Umbral Levinsand
|
32048, // Umbral Levinsand
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region Irregular Tomestones (after the event is over)
|
||||||
|
|
||||||
|
24909, // Philosophy
|
||||||
|
26536, // Mythology
|
||||||
|
28648, // Soldiery
|
||||||
|
30272, // Law
|
||||||
|
31339, // Esoterics
|
||||||
|
33329, // Pageantry
|
||||||
|
33330, // Lore
|
||||||
|
35834, // Scripture
|
||||||
|
36658, // Verity
|
||||||
|
38211, // Creation
|
||||||
|
39365, // Mendacity
|
||||||
|
39919, // Tenfold Pageantry
|
||||||
|
41305, // Genesis I
|
||||||
|
41306, // Genesis II
|
||||||
|
|
||||||
|
#endregion
|
||||||
};
|
};
|
||||||
|
|
||||||
private readonly Configuration _configuration;
|
private readonly Configuration _configuration;
|
||||||
|
|
|
@ -15,7 +15,7 @@ namespace ARDiscard.Windows;
|
||||||
|
|
||||||
internal sealed class ConfigWindow : LWindow
|
internal sealed class ConfigWindow : LWindow
|
||||||
{
|
{
|
||||||
private readonly DalamudPluginInterface _pluginInterface;
|
private readonly IDalamudPluginInterface _pluginInterface;
|
||||||
private readonly Configuration _configuration;
|
private readonly Configuration _configuration;
|
||||||
private readonly ItemCache _itemCache;
|
private readonly ItemCache _itemCache;
|
||||||
private readonly IListManager _listManager;
|
private readonly IListManager _listManager;
|
||||||
|
@ -29,7 +29,7 @@ internal sealed class ConfigWindow : LWindow
|
||||||
public event EventHandler? DiscardNowClicked;
|
public event EventHandler? DiscardNowClicked;
|
||||||
public event EventHandler? ConfigSaved;
|
public event EventHandler? ConfigSaved;
|
||||||
|
|
||||||
public ConfigWindow(DalamudPluginInterface pluginInterface, Configuration configuration, ItemCache itemCache,
|
public ConfigWindow(IDalamudPluginInterface pluginInterface, Configuration configuration, ItemCache itemCache,
|
||||||
IListManager listManager, IClientState clientState, ICondition condition)
|
IListManager listManager, IClientState clientState, ICondition condition)
|
||||||
: base("Auto Discard###AutoDiscardConfig")
|
: base("Auto Discard###AutoDiscardConfig")
|
||||||
{
|
{
|
||||||
|
@ -65,7 +65,10 @@ internal sealed class ConfigWindow : LWindow
|
||||||
Save();
|
Save();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui.SameLine(ImGui.GetWindowWidth() - 115 * ImGuiHelpers.GlobalScale);
|
ImGui.SameLine(ImGui.GetContentRegionAvail().X +
|
||||||
|
ImGui.GetStyle().WindowPadding.X -
|
||||||
|
ImGui.CalcTextSize("Preview Discards").X -
|
||||||
|
ImGui.GetStyle().ItemSpacing.X);
|
||||||
ImGui.BeginDisabled(!_clientState.IsLoggedIn ||
|
ImGui.BeginDisabled(!_clientState.IsLoggedIn ||
|
||||||
!(_condition[ConditionFlag.NormalConditions] || _condition[ConditionFlag.Mounted]) ||
|
!(_condition[ConditionFlag.NormalConditions] || _condition[ConditionFlag.Mounted]) ||
|
||||||
DiscardNowClicked == null);
|
DiscardNowClicked == null);
|
||||||
|
@ -231,7 +234,8 @@ internal sealed class ConfigWindow : LWindow
|
||||||
if (ImGui.InputInt("Ignore items >= this ilvl (Armoury Chest only)",
|
if (ImGui.InputInt("Ignore items >= this ilvl (Armoury Chest only)",
|
||||||
ref maximumItemLevel))
|
ref maximumItemLevel))
|
||||||
{
|
{
|
||||||
_configuration.Armoury.MaximumGearItemLevel = Math.Max(0, Math.Min(625, maximumItemLevel));
|
_configuration.Armoury.MaximumGearItemLevel =
|
||||||
|
Math.Max(0, Math.Min(_itemCache.MaxDungeonItemLevel, maximumItemLevel));
|
||||||
Save();
|
Save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ namespace ARDiscard.Windows
|
||||||
protected override string RightSideLabel => "Items that will be automatically discarded";
|
protected override string RightSideLabel => "Items that will be automatically discarded";
|
||||||
internal required ExcludedListTab ExcludedTab { private get; init; }
|
internal required ExcludedListTab ExcludedTab { private get; init; }
|
||||||
|
|
||||||
public override IEnumerable<uint> ToSavedItems()
|
public IEnumerable<uint> ToSavedItems()
|
||||||
{
|
{
|
||||||
SelectedItems.RemoveAll(x => ExcludedTab.IsBlacklistedInConfiguration(x.ItemId));
|
SelectedItems.RemoveAll(x => ExcludedTab.IsBlacklistedInConfiguration(x.ItemId));
|
||||||
return SelectedItems.Select(x => x.ItemId);
|
return SelectedItems.Select(x => x.ItemId);
|
||||||
|
|
|
@ -5,6 +5,8 @@ using System.Linq;
|
||||||
using ARDiscard.GameData;
|
using ARDiscard.GameData;
|
||||||
using Dalamud.Game.ClientState.Conditions;
|
using Dalamud.Game.ClientState.Conditions;
|
||||||
using Dalamud.Interface.Internal;
|
using Dalamud.Interface.Internal;
|
||||||
|
using Dalamud.Interface.Textures;
|
||||||
|
using Dalamud.Interface.Textures.TextureWraps;
|
||||||
using Dalamud.Interface.Utility;
|
using Dalamud.Interface.Utility;
|
||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
using FFXIVClientStructs.FFXIV.Common.Math;
|
using FFXIVClientStructs.FFXIV.Common.Math;
|
||||||
|
@ -96,7 +98,11 @@ internal sealed class DiscardWindow : LWindow
|
||||||
if (ImGui.Button("Open Configuration"))
|
if (ImGui.Button("Open Configuration"))
|
||||||
OpenConfigurationClicked!.Invoke(this, EventArgs.Empty);
|
OpenConfigurationClicked!.Invoke(this, EventArgs.Empty);
|
||||||
ImGui.EndDisabled();
|
ImGui.EndDisabled();
|
||||||
ImGui.SameLine(ImGui.GetWindowWidth() - 160 * ImGuiHelpers.GlobalScale);
|
|
||||||
|
ImGui.SameLine(ImGui.GetContentRegionAvail().X +
|
||||||
|
ImGui.GetStyle().WindowPadding.X -
|
||||||
|
ImGui.CalcTextSize("Discard all selected items").X -
|
||||||
|
ImGui.GetStyle().ItemSpacing.X);
|
||||||
ImGui.BeginDisabled(Locked ||
|
ImGui.BeginDisabled(Locked ||
|
||||||
!_clientState.IsLoggedIn ||
|
!_clientState.IsLoggedIn ||
|
||||||
!(_condition[ConditionFlag.NormalConditions] || _condition[ConditionFlag.Mounted]) ||
|
!(_condition[ConditionFlag.NormalConditions] || _condition[ConditionFlag.Mounted]) ||
|
||||||
|
@ -117,12 +123,14 @@ internal sealed class DiscardWindow : LWindow
|
||||||
{
|
{
|
||||||
if (_configuration.Preview.ShowIcons)
|
if (_configuration.Preview.ShowIcons)
|
||||||
{
|
{
|
||||||
IDalamudTextureWrap? icon = _iconCache.GetIcon(displayedItem.IconId);
|
ISharedImmediateTexture icon = _iconCache.GetIcon(displayedItem.IconId);
|
||||||
if (icon != null)
|
if (icon.TryGetWrap(out IDalamudTextureWrap? wrap, out _))
|
||||||
{
|
{
|
||||||
ImGui.Image(icon.ImGuiHandle, new Vector2(23, 23));
|
ImGui.Image(wrap.ImGuiHandle, new Vector2(23, 23));
|
||||||
ImGui.SameLine();
|
ImGui.SameLine();
|
||||||
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
|
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
|
||||||
|
|
||||||
|
wrap.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -150,8 +158,8 @@ internal sealed class DiscardWindow : LWindow
|
||||||
_displayedItems = _inventoryUtils.GetAllItemsToDiscard()
|
_displayedItems = _inventoryUtils.GetAllItemsToDiscard()
|
||||||
.GroupBy(x => new
|
.GroupBy(x => new
|
||||||
{
|
{
|
||||||
ItemId = x.InventoryItem->ItemID,
|
ItemId = x.InventoryItem->ItemId,
|
||||||
ItemInfo = _itemCache.GetItem(x.InventoryItem->ItemID),
|
ItemInfo = _itemCache.GetItem(x.InventoryItem->ItemId),
|
||||||
})
|
})
|
||||||
.Where(x => x.Key.ItemInfo != null)
|
.Where(x => x.Key.ItemInfo != null)
|
||||||
.Select(x => new SelectableItem
|
.Select(x => new SelectableItem
|
||||||
|
|
|
@ -20,7 +20,7 @@ internal sealed class ExcludedListTab : ItemListTab
|
||||||
|
|
||||||
protected override string RightSideLabel => "Items that will never be discarded";
|
protected override string RightSideLabel => "Items that will never be discarded";
|
||||||
|
|
||||||
public override IEnumerable<uint> ToSavedItems()
|
public IEnumerable<uint> ToSavedItems()
|
||||||
{
|
{
|
||||||
return SelectedItems
|
return SelectedItems
|
||||||
.Select(x => x.ItemId)
|
.Select(x => x.ItemId)
|
||||||
|
|
|
@ -26,8 +26,6 @@ internal abstract class ItemListTab
|
||||||
protected abstract string RightSideLabel { get; }
|
protected abstract string RightSideLabel { get; }
|
||||||
protected List<(uint ItemId, string Name)> SelectedItems { get; } = new();
|
protected List<(uint ItemId, string Name)> SelectedItems { get; } = new();
|
||||||
|
|
||||||
public abstract IEnumerable<uint> ToSavedItems();
|
|
||||||
|
|
||||||
public void Draw()
|
public void Draw()
|
||||||
{
|
{
|
||||||
var ws = ImGui.GetWindowSize();
|
var ws = ImGui.GetWindowSize();
|
||||||
|
@ -143,8 +141,6 @@ internal abstract class ItemListTab
|
||||||
|
|
||||||
protected virtual (string Name, bool Enabled) AsLeftSideDisplay(uint itemId, string name) => (name, true);
|
protected virtual (string Name, bool Enabled) AsLeftSideDisplay(uint itemId, string name) => (name, true);
|
||||||
|
|
||||||
protected virtual (string Name, bool Enabled) AsRightSideDisplay(uint itemId, string name) => (name, true);
|
|
||||||
|
|
||||||
protected void Save() => _parent.Save();
|
protected void Save() => _parent.Save();
|
||||||
|
|
||||||
private void UpdateResults()
|
private void UpdateResults()
|
||||||
|
|
|
@ -4,21 +4,92 @@
|
||||||
"net8.0-windows7.0": {
|
"net8.0-windows7.0": {
|
||||||
"DalamudPackager": {
|
"DalamudPackager": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[2.1.12, )",
|
"requested": "[2.1.13, )",
|
||||||
"resolved": "2.1.12",
|
"resolved": "2.1.13",
|
||||||
"contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
|
"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"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"autoretainerapi": {
|
"autoretainerapi": {
|
||||||
"type": "Project",
|
"type": "Project",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ECommons": "[2.1.0.7, )"
|
"ECommons": "[2.2.0.2, )"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ecommons": {
|
"ecommons": {
|
||||||
"type": "Project"
|
"type": "Project"
|
||||||
},
|
},
|
||||||
"llib": {
|
"llib": {
|
||||||
"type": "Project"
|
"type": "Project",
|
||||||
|
"dependencies": {
|
||||||
|
"DalamudPackager": "[2.1.13, )"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6f0aaa55bce6ec79fd4d72f84f21597b39e5445d
|
Subproject commit a63c8e7154e272374ffa03d5c801736d4229e38a
|
2
ECommons
2
ECommons
|
@ -1 +1 @@
|
||||||
Subproject commit d238d4188e8b47b11252d75cb5e4b678b8da2756
|
Subproject commit 38080f2a3733aa19b6928f4d2984fac7b9a7fab7
|
2
LLib
2
LLib
|
@ -1 +1 @@
|
||||||
Subproject commit 3792244261a9f5426a7916f5a6dd1966238ba84a
|
Subproject commit 7027d291efbbff6a55944dd521d3907210ddecbe
|
Loading…
Reference in New Issue