Add sub parts to internal blacklist, add config for additional blacklisted items
This commit is contained in:
parent
3c986562b2
commit
e0e69e9b6a
@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0-windows</TargetFramework>
|
<TargetFramework>net8.0-windows</TargetFramework>
|
||||||
<Version>5.0</Version>
|
<Version>5.1</Version>
|
||||||
<LangVersion>12</LangVersion>
|
<LangVersion>12</LangVersion>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
||||||
|
@ -50,7 +50,6 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
|||||||
IGameGui gameGui, ITextureProvider textureProvider, IContextMenu contextMenu)
|
IGameGui gameGui, ITextureProvider textureProvider, IContextMenu contextMenu)
|
||||||
{
|
{
|
||||||
ArgumentNullException.ThrowIfNull(dataManager);
|
ArgumentNullException.ThrowIfNull(dataManager);
|
||||||
ItemCache itemCache = new ItemCache(dataManager);
|
|
||||||
|
|
||||||
_pluginInterface = pluginInterface;
|
_pluginInterface = pluginInterface;
|
||||||
_configuration = (Configuration?)_pluginInterface.GetPluginConfig() ?? new Configuration();
|
_configuration = (Configuration?)_pluginInterface.GetPluginConfig() ?? new Configuration();
|
||||||
@ -72,7 +71,12 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
|||||||
{
|
{
|
||||||
HelpMessage = "Show what will be discarded with your current configuration",
|
HelpMessage = "Show what will be discarded with your current configuration",
|
||||||
});
|
});
|
||||||
_inventoryUtils = new InventoryUtils(_configuration, itemCache, _pluginLog);
|
|
||||||
|
ListManager listManager = new ListManager(_configuration);
|
||||||
|
ItemCache itemCache = new ItemCache(dataManager, listManager);
|
||||||
|
_inventoryUtils = new InventoryUtils(_configuration, itemCache, listManager, _pluginLog);
|
||||||
|
listManager.FinishInitialization();
|
||||||
|
|
||||||
_iconCache = new IconCache(textureProvider);
|
_iconCache = new IconCache(textureProvider);
|
||||||
|
|
||||||
_pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
|
_pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
|
||||||
@ -81,7 +85,7 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
|||||||
_discardWindow = new(_inventoryUtils, itemCache, _iconCache, clientState, condition, _configuration);
|
_discardWindow = new(_inventoryUtils, itemCache, _iconCache, clientState, condition, _configuration);
|
||||||
_windowSystem.AddWindow(_discardWindow);
|
_windowSystem.AddWindow(_discardWindow);
|
||||||
|
|
||||||
_configWindow = new(_pluginInterface, _configuration, itemCache, clientState, condition);
|
_configWindow = new(_pluginInterface, _configuration, itemCache, listManager, clientState, condition);
|
||||||
_windowSystem.AddWindow(_configWindow);
|
_windowSystem.AddWindow(_configWindow);
|
||||||
|
|
||||||
_configWindow.DiscardNowClicked += (_, _) => OpenDiscardWindow(string.Empty, string.Empty);
|
_configWindow.DiscardNowClicked += (_, _) => OpenDiscardWindow(string.Empty, string.Empty);
|
||||||
@ -93,7 +97,7 @@ public sealed class AutoDiscardPlogon : IDalamudPlugin
|
|||||||
ECommonsMain.Init(_pluginInterface, this);
|
ECommonsMain.Init(_pluginInterface, this);
|
||||||
_autoRetainerApi = new();
|
_autoRetainerApi = new();
|
||||||
_taskManager = new();
|
_taskManager = new();
|
||||||
_contextMenuIntegration = new(_chatGui, itemCache, _configuration, _configWindow, _gameGui, contextMenu);
|
_contextMenuIntegration = new(_chatGui, itemCache, _configuration, listManager, _configWindow, _gameGui, contextMenu);
|
||||||
_autoDiscardIpc = new(_pluginInterface, _configuration);
|
_autoDiscardIpc = new(_pluginInterface, _configuration);
|
||||||
|
|
||||||
_clientState.Login += _discardWindow.Login;
|
_clientState.Login += _discardWindow.Login;
|
||||||
|
@ -9,6 +9,7 @@ internal sealed class Configuration : IPluginConfiguration
|
|||||||
public bool RunAfterVenture { get; set; }
|
public bool RunAfterVenture { get; set; }
|
||||||
public bool RunBeforeLogout { get; set; }
|
public bool RunBeforeLogout { get; set; }
|
||||||
public List<uint> DiscardingItems { get; set; } = new();
|
public List<uint> DiscardingItems { get; set; } = new();
|
||||||
|
public List<uint> BlacklistedItems { get; set; } = new();
|
||||||
public List<CharacterInfo> ExcludedCharacters { get; set; } = new();
|
public List<CharacterInfo> ExcludedCharacters { get; set; } = new();
|
||||||
|
|
||||||
public ArmouryConfiguration Armoury { get; set; } = new();
|
public ArmouryConfiguration Armoury { get; set; } = new();
|
||||||
|
@ -14,6 +14,7 @@ internal sealed class ContextMenuIntegration : IDisposable
|
|||||||
private readonly IChatGui _chatGui;
|
private readonly IChatGui _chatGui;
|
||||||
private readonly ItemCache _itemCache;
|
private readonly ItemCache _itemCache;
|
||||||
private readonly Configuration _configuration;
|
private readonly Configuration _configuration;
|
||||||
|
private readonly IListManager _listManager;
|
||||||
private readonly ConfigWindow _configWindow;
|
private readonly ConfigWindow _configWindow;
|
||||||
private readonly IGameGui _gameGui;
|
private readonly IGameGui _gameGui;
|
||||||
private readonly IContextMenu _contextMenu;
|
private readonly IContextMenu _contextMenu;
|
||||||
@ -21,11 +22,12 @@ internal sealed class ContextMenuIntegration : IDisposable
|
|||||||
private readonly MenuItem _removeInventoryItem;
|
private readonly MenuItem _removeInventoryItem;
|
||||||
|
|
||||||
public ContextMenuIntegration(IChatGui chatGui, ItemCache itemCache, Configuration configuration,
|
public ContextMenuIntegration(IChatGui chatGui, ItemCache itemCache, Configuration configuration,
|
||||||
ConfigWindow configWindow, IGameGui gameGui, IContextMenu contextMenu)
|
IListManager listManager, ConfigWindow configWindow, IGameGui gameGui, IContextMenu contextMenu)
|
||||||
{
|
{
|
||||||
_chatGui = chatGui;
|
_chatGui = chatGui;
|
||||||
_itemCache = itemCache;
|
_itemCache = itemCache;
|
||||||
_configuration = configuration;
|
_configuration = configuration;
|
||||||
|
_listManager = listManager;
|
||||||
_configWindow = configWindow;
|
_configWindow = configWindow;
|
||||||
_gameGui = gameGui;
|
_gameGui = gameGui;
|
||||||
_contextMenu = contextMenu;
|
_contextMenu = contextMenu;
|
||||||
@ -65,7 +67,7 @@ internal sealed class ContextMenuIntegration : IDisposable
|
|||||||
if (_configuration.DiscardingItems.Contains(item.ItemId))
|
if (_configuration.DiscardingItems.Contains(item.ItemId))
|
||||||
args.AddMenuItem(_removeInventoryItem);
|
args.AddMenuItem(_removeInventoryItem);
|
||||||
else if (_itemCache.TryGetItem(item.ItemId, out ItemCache.CachedItemInfo? cachedItemInfo) &&
|
else if (_itemCache.TryGetItem(item.ItemId, out ItemCache.CachedItemInfo? cachedItemInfo) &&
|
||||||
cachedItemInfo.CanBeDiscarded())
|
cachedItemInfo.CanBeDiscarded(_listManager))
|
||||||
args.AddMenuItem(_addInventoryItem);
|
args.AddMenuItem(_addInventoryItem);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -91,7 +93,7 @@ internal sealed class ContextMenuIntegration : IDisposable
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if (_itemCache.TryGetItem(itemId, out ItemCache.CachedItemInfo? cachedItemInfo) &&
|
else if (_itemCache.TryGetItem(itemId, out ItemCache.CachedItemInfo? cachedItemInfo) &&
|
||||||
cachedItemInfo.CanBeDiscarded())
|
cachedItemInfo.CanBeDiscarded(_listManager))
|
||||||
{
|
{
|
||||||
args.AddMenuItem(new MenuItem
|
args.AddMenuItem(new MenuItem
|
||||||
{
|
{
|
||||||
|
12
ARDiscard/GameData/IListManager.cs
Normal file
12
ARDiscard/GameData/IListManager.cs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace ARDiscard.GameData;
|
||||||
|
|
||||||
|
internal interface IListManager
|
||||||
|
{
|
||||||
|
bool IsBlacklisted(uint itemId, bool checkConfiguration = true);
|
||||||
|
|
||||||
|
IReadOnlyList<uint> GetInternalBlacklist();
|
||||||
|
|
||||||
|
bool IsWhitelisted(uint itemId);
|
||||||
|
}
|
@ -12,46 +12,48 @@ namespace ARDiscard.GameData;
|
|||||||
internal sealed class InventoryUtils
|
internal sealed class InventoryUtils
|
||||||
{
|
{
|
||||||
private static readonly InventoryType[] DefaultInventoryTypes =
|
private static readonly InventoryType[] DefaultInventoryTypes =
|
||||||
{
|
[
|
||||||
InventoryType.Inventory1,
|
InventoryType.Inventory1,
|
||||||
InventoryType.Inventory2,
|
InventoryType.Inventory2,
|
||||||
InventoryType.Inventory3,
|
InventoryType.Inventory3,
|
||||||
InventoryType.Inventory4
|
InventoryType.Inventory4
|
||||||
};
|
];
|
||||||
|
|
||||||
private static readonly InventoryType[] MainHandOffHandInventoryTypes =
|
private static readonly InventoryType[] MainHandOffHandInventoryTypes =
|
||||||
{
|
[
|
||||||
InventoryType.ArmoryMainHand,
|
InventoryType.ArmoryMainHand,
|
||||||
InventoryType.ArmoryOffHand,
|
InventoryType.ArmoryOffHand
|
||||||
};
|
];
|
||||||
|
|
||||||
private static readonly InventoryType[] LeftSideGearInventoryTypes =
|
private static readonly InventoryType[] LeftSideGearInventoryTypes =
|
||||||
{
|
[
|
||||||
InventoryType.ArmoryHead,
|
InventoryType.ArmoryHead,
|
||||||
InventoryType.ArmoryBody,
|
InventoryType.ArmoryBody,
|
||||||
InventoryType.ArmoryHands,
|
InventoryType.ArmoryHands,
|
||||||
InventoryType.ArmoryLegs,
|
InventoryType.ArmoryLegs,
|
||||||
InventoryType.ArmoryFeets
|
InventoryType.ArmoryFeets
|
||||||
};
|
];
|
||||||
|
|
||||||
private static readonly InventoryType[] RightSideGearInventoryTypes =
|
private static readonly InventoryType[] RightSideGearInventoryTypes =
|
||||||
{
|
[
|
||||||
InventoryType.ArmoryEar,
|
InventoryType.ArmoryEar,
|
||||||
InventoryType.ArmoryNeck,
|
InventoryType.ArmoryNeck,
|
||||||
InventoryType.ArmoryWrist,
|
InventoryType.ArmoryWrist,
|
||||||
InventoryType.ArmoryRings
|
InventoryType.ArmoryRings
|
||||||
};
|
];
|
||||||
|
|
||||||
private static readonly IReadOnlyList<uint> NoGearsetItems = new List<uint>();
|
private static readonly IReadOnlyList<uint> NoGearsetItems = new List<uint>();
|
||||||
|
|
||||||
private readonly Configuration _configuration;
|
private readonly Configuration _configuration;
|
||||||
private readonly ItemCache _itemCache;
|
private readonly ItemCache _itemCache;
|
||||||
|
private readonly IListManager _listManager;
|
||||||
private readonly IPluginLog _pluginLog;
|
private readonly IPluginLog _pluginLog;
|
||||||
|
|
||||||
public InventoryUtils(Configuration configuration, ItemCache itemCache, IPluginLog pluginLog)
|
public InventoryUtils(Configuration configuration, ItemCache itemCache, IListManager listManager, IPluginLog pluginLog)
|
||||||
{
|
{
|
||||||
_configuration = configuration;
|
_configuration = configuration;
|
||||||
_itemCache = itemCache;
|
_itemCache = itemCache;
|
||||||
|
_listManager = listManager;
|
||||||
_pluginLog = pluginLog;
|
_pluginLog = pluginLog;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,12 +120,11 @@ internal sealed class InventoryUtils
|
|||||||
else
|
else
|
||||||
itemCounts[item->ItemID] = item->Quantity;
|
itemCounts[item->ItemID] = item->Quantity;
|
||||||
|
|
||||||
if (InternalConfiguration.BlacklistedItems.Contains(item->ItemID) ||
|
if (_listManager.IsBlacklisted(item->ItemID))
|
||||||
InternalConfiguration.UltimateWeapons.Contains(item->ItemID))
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!_itemCache.TryGetItem(item->ItemID, out ItemCache.CachedItemInfo? itemInfo) ||
|
if (!_itemCache.TryGetItem(item->ItemID, out ItemCache.CachedItemInfo? itemInfo) ||
|
||||||
!itemInfo.CanBeDiscarded())
|
!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
|
||||||
@ -194,8 +195,7 @@ internal sealed class InventoryUtils
|
|||||||
|
|
||||||
public unsafe void Discard(InventoryItem* item)
|
public unsafe void Discard(InventoryItem* item)
|
||||||
{
|
{
|
||||||
if (InternalConfiguration.BlacklistedItems.Contains(item->ItemID) ||
|
if (_listManager.IsBlacklisted(item->ItemID))
|
||||||
InternalConfiguration.UltimateWeapons.Contains(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);
|
||||||
|
@ -11,7 +11,7 @@ internal sealed class ItemCache
|
|||||||
{
|
{
|
||||||
private readonly Dictionary<uint, CachedItemInfo> _items = new();
|
private readonly Dictionary<uint, CachedItemInfo> _items = new();
|
||||||
|
|
||||||
public ItemCache(IDataManager dataManager)
|
public ItemCache(IDataManager dataManager, ListManager listManager)
|
||||||
{
|
{
|
||||||
foreach (var item in dataManager.GetExcelSheet<Item>()!)
|
foreach (var item in dataManager.GetExcelSheet<Item>()!)
|
||||||
{
|
{
|
||||||
@ -35,9 +35,10 @@ internal sealed class ItemCache
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (item is { Rarity: 3, MateriaSlotCount: 3, RowId: < 33154 or > 33358 })
|
if (item is { Rarity: 3, MateriaSlotCount: 3, RowId: < 33154 or > 33358 })
|
||||||
{
|
listManager.AddToInternalBlacklist(item.RowId);
|
||||||
InternalConfiguration.UltimateWeapons.Add(item.RowId);
|
|
||||||
}
|
if (item is { ItemSearchCategory.Row: 79, ItemUICategory.Row: >= 101 and <= 104 })
|
||||||
|
listManager.AddToInternalBlacklist(item.RowId);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var shopItem in dataManager.GetExcelSheet<GilShopItem>()!)
|
foreach (var shopItem in dataManager.GetExcelSheet<GilShopItem>()!)
|
||||||
@ -48,7 +49,7 @@ internal sealed class ItemCache
|
|||||||
|
|
||||||
// the item can be discarded already
|
// the item can be discarded already
|
||||||
if (!_items.TryGetValue(shopItem.Item.Row, out CachedItemInfo? cachedItemInfo) ||
|
if (!_items.TryGetValue(shopItem.Item.Row, out CachedItemInfo? cachedItemInfo) ||
|
||||||
cachedItemInfo.CanBeDiscarded())
|
cachedItemInfo.CanBeDiscarded(listManager))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (shopItem.AchievementRequired.Row != 0)
|
if (shopItem.AchievementRequired.Row != 0)
|
||||||
@ -68,7 +69,7 @@ internal sealed class ItemCache
|
|||||||
{
|
{
|
||||||
var item = dataManager.GetExcelSheet<Item>()!.GetRow(itemId);
|
var item = dataManager.GetExcelSheet<Item>()!.GetRow(itemId);
|
||||||
if (item is { Rarity: 1, ItemAction.Row: 388 } && item.RowId != 38809 && item.RowId != 29679)
|
if (item is { Rarity: 1, ItemAction.Row: 388 } && item.RowId != 38809 && item.RowId != 29679)
|
||||||
InternalConfiguration.DiscardableGearCoffers.Add(item.RowId);
|
listManager.AddToInternalWhitelist(item.RowId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -129,17 +130,15 @@ internal sealed class ItemCache
|
|||||||
public required string UiCategoryName { get; init; }
|
public required string UiCategoryName { get; init; }
|
||||||
public required uint EquipSlotCategory { get; init; }
|
public required uint EquipSlotCategory { get; init; }
|
||||||
|
|
||||||
public bool CanBeDiscarded()
|
public bool CanBeDiscarded(IListManager listManager, bool checkConfiguration = true)
|
||||||
{
|
{
|
||||||
if (InternalConfiguration.BlacklistedItems.Contains(ItemId) ||
|
if (listManager.IsBlacklisted(ItemId, checkConfiguration))
|
||||||
InternalConfiguration.UltimateWeapons.Contains(ItemId))
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (UiCategory is UiCategories.Currency or UiCategories.Crystals or UiCategories.Unobtainable)
|
if (UiCategory is UiCategories.Currency or UiCategories.Crystals or UiCategories.Unobtainable)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (InternalConfiguration.WhitelistedItems.Contains(ItemId) ||
|
if (listManager.IsWhitelisted(ItemId))
|
||||||
InternalConfiguration.DiscardableGearCoffers.Contains(ItemId))
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return CanBeBoughtFromCalamitySalvager ||
|
return CanBeBoughtFromCalamitySalvager ||
|
||||||
|
@ -1,20 +1,22 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
namespace ARDiscard.GameData;
|
namespace ARDiscard.GameData;
|
||||||
|
|
||||||
internal static class InternalConfiguration
|
internal sealed class ListManager : IListManager
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Not all of these *can* be discarded, but we shouldn't attempt it either.
|
/// Not all of these *can* be discarded, but we shouldn't attempt it either.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly IReadOnlyList<uint> BlacklistedItems = new List<uint>
|
private ISet<uint> _blacklistedItems = new List<uint>
|
||||||
{
|
{
|
||||||
2820, // red onion helm
|
2820, // red onion helm
|
||||||
|
|
||||||
16039, // ala mhigan earrings
|
16039, // ala mhigan earrings
|
||||||
24589, // aetheryte earrings
|
24589, // aetheryte earrings
|
||||||
33648, // menphina's earrings
|
33648, // menphina's earrings
|
||||||
|
41081, // azeyma's earrings
|
||||||
|
|
||||||
10155, // Ceruleum Tank
|
10155, // Ceruleum Tank
|
||||||
10373, // Magitek Repair Materials
|
10373, // Magitek Repair Materials
|
||||||
@ -26,16 +28,13 @@ internal static class InternalConfiguration
|
|||||||
38951, // TOP token
|
38951, // TOP token
|
||||||
}
|
}
|
||||||
.Concat(Enumerable.Range(1, 99).Select(x => (uint)x))
|
.Concat(Enumerable.Range(1, 99).Select(x => (uint)x))
|
||||||
.ToList()
|
.ToHashSet();
|
||||||
.AsReadOnly();
|
|
||||||
|
|
||||||
public static readonly IList<uint> UltimateWeapons = new List<uint>();
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Items that are unique/untradeable, but should still be possible to discard. This is moreso because
|
/// Items that are unique/untradeable, but should still be possible to discard. This is moreso because
|
||||||
/// 99% of the unique/untradeable items should NOT be selectable for discard, but these are OK.
|
/// 99% of the unique/untradeable items should NOT be selectable for discard, but these are OK.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly IReadOnlyList<uint> WhitelistedItems = new List<uint>
|
private ISet<uint> _whitelistedItems = new HashSet<uint>()
|
||||||
{
|
{
|
||||||
2962, // Onion Doublet
|
2962, // Onion Doublet
|
||||||
3279, // Onion Gaskins
|
3279, // Onion Gaskins
|
||||||
@ -268,7 +267,37 @@ internal static class InternalConfiguration
|
|||||||
32048, // Umbral Levinsand
|
32048, // Umbral Levinsand
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}.AsReadOnly();
|
};
|
||||||
|
|
||||||
public static readonly IList<uint> DiscardableGearCoffers = new List<uint>();
|
private readonly Configuration _configuration;
|
||||||
|
|
||||||
|
public ListManager(Configuration configuration)
|
||||||
|
{
|
||||||
|
_configuration = configuration;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void FinishInitialization()
|
||||||
|
{
|
||||||
|
_blacklistedItems = _blacklistedItems.ToImmutableHashSet();
|
||||||
|
_whitelistedItems = _whitelistedItems.ToImmutableHashSet();
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsBlacklisted(uint itemId, bool checkConfiguration = true)
|
||||||
|
{
|
||||||
|
if (_blacklistedItems.Contains(itemId))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (checkConfiguration && _configuration.BlacklistedItems.Contains(itemId))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IReadOnlyList<uint> GetInternalBlacklist() => _blacklistedItems.ToList().AsReadOnly();
|
||||||
|
|
||||||
|
public void AddToInternalBlacklist(uint itemId) => _blacklistedItems.Add(itemId);
|
||||||
|
|
||||||
|
public bool IsWhitelisted(uint itemId) => _whitelistedItems.Contains(itemId);
|
||||||
|
|
||||||
|
public void AddToInternalWhitelist(uint itemId) => _whitelistedItems.Add(itemId);
|
||||||
}
|
}
|
@ -8,7 +8,6 @@ using Dalamud.Interface.Colors;
|
|||||||
using Dalamud.Interface.Utility;
|
using Dalamud.Interface.Utility;
|
||||||
using Dalamud.Plugin;
|
using Dalamud.Plugin;
|
||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
using ECommons;
|
|
||||||
using ImGuiNET;
|
using ImGuiNET;
|
||||||
using LLib.ImGui;
|
using LLib.ImGui;
|
||||||
|
|
||||||
@ -16,30 +15,28 @@ namespace ARDiscard.Windows;
|
|||||||
|
|
||||||
internal sealed class ConfigWindow : LWindow
|
internal sealed class ConfigWindow : LWindow
|
||||||
{
|
{
|
||||||
private const int ResultLimit = 200;
|
|
||||||
|
|
||||||
private readonly DalamudPluginInterface _pluginInterface;
|
private readonly DalamudPluginInterface _pluginInterface;
|
||||||
private readonly Configuration _configuration;
|
private readonly Configuration _configuration;
|
||||||
private readonly ItemCache _itemCache;
|
private readonly ItemCache _itemCache;
|
||||||
|
private readonly IListManager _listManager;
|
||||||
private readonly IClientState _clientState;
|
private readonly IClientState _clientState;
|
||||||
private readonly ICondition _condition;
|
private readonly ICondition _condition;
|
||||||
private string _itemName = string.Empty;
|
private readonly DiscardListTab _discardListTab;
|
||||||
|
private readonly ExcludedListTab _excludedListTab;
|
||||||
|
|
||||||
private List<(uint ItemId, string Name)> _searchResults = new();
|
|
||||||
private List<(uint ItemId, string Name)> _discarding = new();
|
|
||||||
private List<(uint ItemId, string Name)>? _allItems;
|
private List<(uint ItemId, string Name)>? _allItems;
|
||||||
private bool _resetKeyboardFocus = true;
|
|
||||||
|
|
||||||
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(DalamudPluginInterface pluginInterface, Configuration configuration, ItemCache itemCache,
|
||||||
IClientState clientState, ICondition condition)
|
IListManager listManager, IClientState clientState, ICondition condition)
|
||||||
: base("Auto Discard###AutoDiscardConfig")
|
: base("Auto Discard###AutoDiscardConfig")
|
||||||
{
|
{
|
||||||
_pluginInterface = pluginInterface;
|
_pluginInterface = pluginInterface;
|
||||||
_configuration = configuration;
|
_configuration = configuration;
|
||||||
_itemCache = itemCache;
|
_itemCache = itemCache;
|
||||||
|
_listManager = listManager;
|
||||||
_clientState = clientState;
|
_clientState = clientState;
|
||||||
_condition = condition;
|
_condition = condition;
|
||||||
|
|
||||||
@ -52,8 +49,11 @@ internal sealed class ConfigWindow : LWindow
|
|||||||
MaximumSize = new Vector2(9999, 9999),
|
MaximumSize = new Vector2(9999, 9999),
|
||||||
};
|
};
|
||||||
|
|
||||||
_discarding.AddRange(_configuration.DiscardingItems
|
_excludedListTab = new ExcludedListTab(this, itemCache, _configuration.BlacklistedItems, listManager);
|
||||||
.Select(x => (x, itemCache.GetItemName(x))).ToList());
|
_discardListTab = new DiscardListTab(this, itemCache, _configuration.DiscardingItems)
|
||||||
|
{
|
||||||
|
ExcludedTab = _excludedListTab,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Draw()
|
public override void Draw()
|
||||||
@ -84,6 +84,7 @@ internal sealed class ConfigWindow : LWindow
|
|||||||
{
|
{
|
||||||
DrawDiscardList();
|
DrawDiscardList();
|
||||||
DrawExcludedCharacters();
|
DrawExcludedCharacters();
|
||||||
|
DrawExcludedItems();
|
||||||
DrawExperimentalSettings();
|
DrawExperimentalSettings();
|
||||||
|
|
||||||
ImGui.EndTabBar();
|
ImGui.EndTabBar();
|
||||||
@ -94,100 +95,7 @@ internal sealed class ConfigWindow : LWindow
|
|||||||
{
|
{
|
||||||
if (ImGui.BeginTabItem("Items to Discard"))
|
if (ImGui.BeginTabItem("Items to Discard"))
|
||||||
{
|
{
|
||||||
var ws = ImGui.GetWindowSize();
|
_discardListTab.Draw();
|
||||||
if (ImGui.BeginChild("Left", new Vector2(Math.Max(10, ws.X / 2), -1), true))
|
|
||||||
{
|
|
||||||
if (!string.IsNullOrEmpty(_itemName))
|
|
||||||
{
|
|
||||||
if (_searchResults.Count > ResultLimit)
|
|
||||||
ImGui.Text($"Search ({ResultLimit:N0} out of {_searchResults.Count:N0} matches)");
|
|
||||||
else
|
|
||||||
ImGui.Text($"Search ({_searchResults.Count:N0} matches)");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
ImGui.Text("Search");
|
|
||||||
|
|
||||||
ImGui.SetNextItemWidth(ws.X / 2 - 20);
|
|
||||||
if (_resetKeyboardFocus)
|
|
||||||
{
|
|
||||||
ImGui.SetKeyboardFocusHere();
|
|
||||||
_resetKeyboardFocus = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
string previousName = _itemName;
|
|
||||||
if (ImGui.InputText("", ref _itemName, 256, ImGuiInputTextFlags.EnterReturnsTrue))
|
|
||||||
{
|
|
||||||
_resetKeyboardFocus = true;
|
|
||||||
if (_searchResults.Count > 0)
|
|
||||||
{
|
|
||||||
var itemToAdd = _searchResults.FirstOrDefault();
|
|
||||||
if (_discarding.All(x => x.ItemId != itemToAdd.ItemId))
|
|
||||||
{
|
|
||||||
_discarding.Add(itemToAdd);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
_discarding.Remove(itemToAdd);
|
|
||||||
}
|
|
||||||
|
|
||||||
Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previousName != _itemName)
|
|
||||||
UpdateResults();
|
|
||||||
|
|
||||||
ImGui.Separator();
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(_itemName))
|
|
||||||
{
|
|
||||||
ImGui.Text("Type item name...");
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var (id, name) in _searchResults.Take(ResultLimit))
|
|
||||||
{
|
|
||||||
bool selected = _discarding.Any(x => x.Item1 == id);
|
|
||||||
if (ImGui.Selectable(name, selected))
|
|
||||||
{
|
|
||||||
if (!selected)
|
|
||||||
{
|
|
||||||
_discarding.Add((id, name));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
_discarding.Remove((id, name));
|
|
||||||
}
|
|
||||||
|
|
||||||
Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.EndChild();
|
|
||||||
ImGui.SameLine();
|
|
||||||
|
|
||||||
if (ImGui.BeginChild("Right", new Vector2(-1, -1), true, ImGuiWindowFlags.NoSavedSettings))
|
|
||||||
{
|
|
||||||
ImGui.Text("Items that will be automatically discarded");
|
|
||||||
ImGui.Separator();
|
|
||||||
|
|
||||||
List<(uint, string)> toRemove = new();
|
|
||||||
foreach (var (id, name) in _discarding.OrderBy(x => x.Name, StringComparer.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
if (ImGui.Selectable(name, true))
|
|
||||||
toRemove.Add((id, name));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (toRemove.Count > 0)
|
|
||||||
{
|
|
||||||
foreach (var tr in toRemove)
|
|
||||||
_discarding.Remove(tr);
|
|
||||||
|
|
||||||
Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.EndChild();
|
|
||||||
ImGui.EndTabItem();
|
ImGui.EndTabItem();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -269,6 +177,19 @@ internal sealed class ConfigWindow : LWindow
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void DrawExcludedItems()
|
||||||
|
{
|
||||||
|
if (ImGui.BeginTabItem("Excluded Items"))
|
||||||
|
{
|
||||||
|
ImGui.Text(
|
||||||
|
"Items configured here will never be discarded, and have priority over the 'Items to Discard' tab.");
|
||||||
|
ImGui.Text("Some items (such as Ultimate weapons) can not be un-blacklisted.");
|
||||||
|
|
||||||
|
_excludedListTab.Draw();
|
||||||
|
ImGui.EndTabItem();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void DrawExperimentalSettings()
|
private void DrawExperimentalSettings()
|
||||||
{
|
{
|
||||||
if (ImGui.BeginTabItem("Experimental Settings"))
|
if (ImGui.BeginTabItem("Experimental Settings"))
|
||||||
@ -378,26 +299,12 @@ internal sealed class ConfigWindow : LWindow
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateResults()
|
internal List<(uint ItemId, string Name)> EnsureAllItemsLoaded()
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(_itemName))
|
|
||||||
_searchResults = new();
|
|
||||||
else
|
|
||||||
{
|
|
||||||
_searchResults = EnsureAllItemsLoaded().Where(x =>
|
|
||||||
x.Name.Contains(_itemName, StringComparison.CurrentCultureIgnoreCase)
|
|
||||||
|| (uint.TryParse(_itemName, out uint itemId) && x.ItemId == itemId))
|
|
||||||
.OrderBy(x => _itemName.EqualsIgnoreCase(x.Name) ? string.Empty : x.Name)
|
|
||||||
.ToList();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<(uint ItemId, string Name)> EnsureAllItemsLoaded()
|
|
||||||
{
|
{
|
||||||
if (_allItems == null)
|
if (_allItems == null)
|
||||||
{
|
{
|
||||||
_allItems = _itemCache.AllItems
|
_allItems = _itemCache.AllItems
|
||||||
.Where(x => x.CanBeDiscarded())
|
.Where(x => x.CanBeDiscarded(_listManager, false))
|
||||||
.Select(x => (x.ItemId, x.Name.ToString()))
|
.Select(x => (x.ItemId, x.Name.ToString()))
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
@ -405,37 +312,18 @@ internal sealed class ConfigWindow : LWindow
|
|||||||
return _allItems;
|
return _allItems;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Save()
|
internal void Save()
|
||||||
{
|
{
|
||||||
_configuration.DiscardingItems = _discarding.Select(x => x.ItemId).ToList();
|
_configuration.DiscardingItems = _discardListTab.ToSavedItems().ToList();
|
||||||
|
_configuration.BlacklistedItems = _excludedListTab.ToSavedItems().ToList();
|
||||||
_pluginInterface.SavePluginConfig(_configuration);
|
_pluginInterface.SavePluginConfig(_configuration);
|
||||||
|
|
||||||
ConfigSaved?.Invoke(this, EventArgs.Empty);
|
ConfigSaved?.Invoke(this, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal bool AddToDiscardList(uint itemId)
|
internal bool AddToDiscardList(uint itemId) => _discardListTab.AddToDiscardList(itemId);
|
||||||
{
|
|
||||||
var item = EnsureAllItemsLoaded().SingleOrDefault(x => x.ItemId == itemId);
|
|
||||||
if (item.ItemId != 0)
|
|
||||||
{
|
|
||||||
_discarding.Add(item);
|
|
||||||
Save();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
internal bool RemoveFromDiscardList(uint itemId) => _discardListTab.RemoveFromDiscardList(itemId);
|
||||||
}
|
|
||||||
|
|
||||||
internal bool RemoveFromDiscardList(uint itemId)
|
|
||||||
{
|
|
||||||
if (_discarding.RemoveAll(x => x.ItemId == itemId) > 0)
|
|
||||||
{
|
|
||||||
Save();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool CanItemBeConfigured(uint itemId)
|
public bool CanItemBeConfigured(uint itemId)
|
||||||
{
|
{
|
||||||
|
55
ARDiscard/Windows/DiscardListTab.cs
Normal file
55
ARDiscard/Windows/DiscardListTab.cs
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using ARDiscard.GameData;
|
||||||
|
|
||||||
|
namespace ARDiscard.Windows
|
||||||
|
{
|
||||||
|
internal sealed class DiscardListTab : ItemListTab
|
||||||
|
{
|
||||||
|
public DiscardListTab(ConfigWindow parent, ItemCache itemCache, List<uint> initialItems)
|
||||||
|
: base(parent, itemCache, initialItems)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override string RightSideLabel => "Items that will be automatically discarded";
|
||||||
|
internal required ExcludedListTab ExcludedTab { private get; init; }
|
||||||
|
|
||||||
|
public override IEnumerable<uint> ToSavedItems()
|
||||||
|
{
|
||||||
|
SelectedItems.RemoveAll(x => ExcludedTab.IsBlacklistedInConfiguration(x.ItemId));
|
||||||
|
return SelectedItems.Select(x => x.ItemId);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override (string, bool) AsLeftSideDisplay(uint itemId, string name)
|
||||||
|
{
|
||||||
|
if (ExcludedTab.IsBlacklistedInConfiguration(itemId))
|
||||||
|
return ($"{name} (Blacklisted/Excluded Item)", false);
|
||||||
|
|
||||||
|
return base.AsLeftSideDisplay(itemId, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal bool AddToDiscardList(uint itemId)
|
||||||
|
{
|
||||||
|
var item = EnsureAllItemsLoaded().SingleOrDefault(x => x.ItemId == itemId);
|
||||||
|
if (item.ItemId != 0)
|
||||||
|
{
|
||||||
|
SelectedItems.Add(item);
|
||||||
|
Save();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal bool RemoveFromDiscardList(uint itemId)
|
||||||
|
{
|
||||||
|
if (SelectedItems.RemoveAll(x => x.ItemId == itemId) > 0)
|
||||||
|
{
|
||||||
|
Save();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
35
ARDiscard/Windows/ExcludedListTab.cs
Normal file
35
ARDiscard/Windows/ExcludedListTab.cs
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using ARDiscard.GameData;
|
||||||
|
|
||||||
|
namespace ARDiscard.Windows;
|
||||||
|
|
||||||
|
internal sealed class ExcludedListTab : ItemListTab
|
||||||
|
{
|
||||||
|
private readonly IListManager _listManager;
|
||||||
|
|
||||||
|
public ExcludedListTab(ConfigWindow parent, ItemCache itemCache, List<uint> initialItems, IListManager listManager)
|
||||||
|
: base(parent, itemCache, initialItems)
|
||||||
|
{
|
||||||
|
_listManager = listManager;
|
||||||
|
SelectedItems.AddRange(
|
||||||
|
listManager.GetInternalBlacklist()
|
||||||
|
.Select(x => (x, itemCache.GetItemName(x)))
|
||||||
|
.Where(x => x.Item1 >= 100 && !string.IsNullOrEmpty(x.Item2)));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override string RightSideLabel => "Items that will never be discarded";
|
||||||
|
|
||||||
|
public override IEnumerable<uint> ToSavedItems()
|
||||||
|
{
|
||||||
|
return SelectedItems
|
||||||
|
.Select(x => x.ItemId)
|
||||||
|
.Where(x => !_listManager.IsBlacklisted(x, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsBlacklistedInConfiguration(uint itemId)
|
||||||
|
=> !_listManager.IsBlacklisted(itemId, false) && SelectedItems.Any(x => x.ItemId == itemId);
|
||||||
|
|
||||||
|
protected override (string Name, bool Enabled) AsLeftSideDisplay(uint itemId, string name)
|
||||||
|
=> (name, !_listManager.IsBlacklisted(itemId, false));
|
||||||
|
}
|
165
ARDiscard/Windows/ItemListTab.cs
Normal file
165
ARDiscard/Windows/ItemListTab.cs
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Numerics;
|
||||||
|
using ARDiscard.GameData;
|
||||||
|
using ImGuiNET;
|
||||||
|
|
||||||
|
namespace ARDiscard.Windows;
|
||||||
|
|
||||||
|
internal abstract class ItemListTab
|
||||||
|
{
|
||||||
|
private const int ResultLimit = 200;
|
||||||
|
|
||||||
|
private readonly ConfigWindow _parent;
|
||||||
|
|
||||||
|
private List<(uint ItemId, string Name)> _searchResults = new();
|
||||||
|
private string _itemName = string.Empty;
|
||||||
|
private bool _resetKeyboardFocus = true;
|
||||||
|
|
||||||
|
protected ItemListTab(ConfigWindow parent, ItemCache itemCache, List<uint> initialItems)
|
||||||
|
{
|
||||||
|
_parent = parent;
|
||||||
|
SelectedItems.AddRange(initialItems.Select(x => (x, itemCache.GetItemName(x))).ToList());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract string RightSideLabel { get; }
|
||||||
|
protected List<(uint ItemId, string Name)> SelectedItems { get; } = new();
|
||||||
|
|
||||||
|
public abstract IEnumerable<uint> ToSavedItems();
|
||||||
|
|
||||||
|
public void Draw()
|
||||||
|
{
|
||||||
|
var ws = ImGui.GetWindowSize();
|
||||||
|
if (ImGui.BeginChild("Left", new Vector2(Math.Max(10, ws.X / 2), -1), true))
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(_itemName))
|
||||||
|
{
|
||||||
|
if (_searchResults.Count > ResultLimit)
|
||||||
|
ImGui.Text($"Search ({ResultLimit:N0} out of {_searchResults.Count:N0} matches)");
|
||||||
|
else
|
||||||
|
ImGui.Text($"Search ({_searchResults.Count:N0} matches)");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
ImGui.Text("Search");
|
||||||
|
|
||||||
|
ImGui.SetNextItemWidth(ws.X / 2 - 20);
|
||||||
|
if (_resetKeyboardFocus)
|
||||||
|
{
|
||||||
|
ImGui.SetKeyboardFocusHere();
|
||||||
|
_resetKeyboardFocus = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
string previousName = _itemName;
|
||||||
|
if (ImGui.InputText("", ref _itemName, 256, ImGuiInputTextFlags.EnterReturnsTrue))
|
||||||
|
{
|
||||||
|
_resetKeyboardFocus = true;
|
||||||
|
if (_searchResults.Count > 0)
|
||||||
|
{
|
||||||
|
var itemToAdd = _searchResults.FirstOrDefault();
|
||||||
|
if (SelectedItems.All(x => x.ItemId != itemToAdd.ItemId))
|
||||||
|
{
|
||||||
|
SelectedItems.Add(itemToAdd);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SelectedItems.Remove(itemToAdd);
|
||||||
|
}
|
||||||
|
|
||||||
|
Save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (previousName != _itemName)
|
||||||
|
UpdateResults();
|
||||||
|
|
||||||
|
ImGui.Separator();
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(_itemName))
|
||||||
|
{
|
||||||
|
ImGui.Text("Type item name...");
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var (id, name) in _searchResults.Take(ResultLimit))
|
||||||
|
{
|
||||||
|
bool selected = SelectedItems.Any(x => x.Item1 == id);
|
||||||
|
|
||||||
|
var display = AsLeftSideDisplay(id, name);
|
||||||
|
if (!display.Enabled)
|
||||||
|
ImGui.BeginDisabled();
|
||||||
|
|
||||||
|
if (ImGui.Selectable($"{display.Name}##Item{id}", selected))
|
||||||
|
{
|
||||||
|
if (!selected)
|
||||||
|
{
|
||||||
|
SelectedItems.Add((id, name));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SelectedItems.Remove((id, name));
|
||||||
|
}
|
||||||
|
|
||||||
|
Save();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!display.Enabled)
|
||||||
|
ImGui.EndDisabled();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui.EndChild();
|
||||||
|
ImGui.SameLine();
|
||||||
|
|
||||||
|
if (ImGui.BeginChild("Right", new Vector2(-1, -1), true, ImGuiWindowFlags.NoSavedSettings))
|
||||||
|
{
|
||||||
|
ImGui.Text(RightSideLabel);
|
||||||
|
ImGui.Separator();
|
||||||
|
|
||||||
|
List<(uint, string)> toRemove = new();
|
||||||
|
foreach (var (id, name) in SelectedItems.OrderBy(x => x.Name, StringComparer.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
var display = AsLeftSideDisplay(id, name);
|
||||||
|
if (!display.Enabled)
|
||||||
|
ImGui.BeginDisabled();
|
||||||
|
|
||||||
|
if (ImGui.Selectable($"{display.Name}##Item{id}", true))
|
||||||
|
toRemove.Add((id, name));
|
||||||
|
|
||||||
|
if (!display.Enabled)
|
||||||
|
ImGui.EndDisabled();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (toRemove.Count > 0)
|
||||||
|
{
|
||||||
|
foreach (var tr in toRemove)
|
||||||
|
SelectedItems.Remove(tr);
|
||||||
|
|
||||||
|
Save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui.EndChild();
|
||||||
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
|
||||||
|
private void UpdateResults()
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(_itemName))
|
||||||
|
_searchResults = new();
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_searchResults = EnsureAllItemsLoaded().Where(x =>
|
||||||
|
x.Name.Contains(_itemName, StringComparison.CurrentCultureIgnoreCase)
|
||||||
|
|| (uint.TryParse(_itemName, out uint itemId) && x.ItemId == itemId))
|
||||||
|
.OrderBy(x => _itemName.Equals(x.Name, StringComparison.OrdinalIgnoreCase) ? string.Empty : x.Name)
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected List<(uint ItemId, string Name)> EnsureAllItemsLoaded() => _parent.EnsureAllItemsLoaded();
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user