ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 21:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use GameInventoryType in InventoryWidget (#2257)

Browse source
This commit is contained in:
Haselnussbomber 2025-04-26 19:19:51 +02:00 • committed by GitHub
parent ced601e2f5
commit 82cdcf0a0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs
View file

@ -26,7 +26,7 @@ internal class InventoryWidget : IDataWindowWidget
{ {
private DataManager dataManager; private DataManager dataManager;
private TextureManager textureManager; private TextureManager textureManager;
private InventoryType? selectedInventoryType = InventoryType.Inventory1; private GameInventoryType? selectedInventoryType = GameInventoryType.Inventory1;
/// <inheritdoc/> /// <inheritdoc/>
public string[]? CommandShortcuts { get; init; } = ["inv", "inventory"]; public string[]? CommandShortcuts { get; init; } = ["inv", "inventory"];
@ -56,7 +56,7 @@ internal class InventoryWidget : IDataWindowWidget
ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X); ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X);
this.DrawInventoryType((InventoryType)this.selectedInventoryType); this.DrawInventoryType(this.selectedInventoryType.Value);
} }
private static string StripSoftHypen(string input) private static string StripSoftHypen(string input)
@ -74,9 +74,9 @@ internal class InventoryWidget : IDataWindowWidget
ImGui.TableSetupScrollFreeze(2, 1); ImGui.TableSetupScrollFreeze(2, 1);
ImGui.TableHeadersRow(); ImGui.TableHeadersRow();
foreach (var inventoryType in Enum.GetValues<InventoryType>()) foreach (var inventoryType in Enum.GetValues<GameInventoryType>())
{ {
var items = GameInventoryItem.GetReadOnlySpanOfInventory((GameInventoryType)inventoryType); var items = GameInventoryItem.GetReadOnlySpanOfInventory(inventoryType);
using var itemDisabled = ImRaii.Disabled(items.IsEmpty); using var itemDisabled = ImRaii.Disabled(items.IsEmpty);
@ -98,7 +98,7 @@ internal class InventoryWidget : IDataWindowWidget
if (ImGui.MenuItem("Copy Address")) if (ImGui.MenuItem("Copy Address"))
{ {
var container = InventoryManager.Instance()->GetInventoryContainer(inventoryType); var container = InventoryManager.Instance()->GetInventoryContainer((InventoryType)inventoryType);
ImGui.SetClipboardText($"0x{(nint)container:X}"); ImGui.SetClipboardText($"0x{(nint)container:X}");
} }
} }
@ -109,9 +109,9 @@ internal class InventoryWidget : IDataWindowWidget
} }
} }
private unsafe void DrawInventoryType(InventoryType inventoryType) private unsafe void DrawInventoryType(GameInventoryType inventoryType)
{ {
var items = GameInventoryItem.GetReadOnlySpanOfInventory((GameInventoryType)inventoryType); var items = GameInventoryItem.GetReadOnlySpanOfInventory(inventoryType);
if (items.IsEmpty) if (items.IsEmpty)
{ {
ImGui.TextUnformatted($"{inventoryType} is empty."); ImGui.TextUnformatted($"{inventoryType} is empty.");