From d88db583c1b1dc2a8706d999ecb62cbb4346475e Mon Sep 17 00:00:00 2001 From: Chomp Date: Wed, 21 May 2025 11:34:02 +0100 Subject: [PATCH] Moved `ItemSize` into modules section, changed to record Updated `GetItemSize` to accept `ICollection` instead of list --- .../Helpers/ItemHelper.cs | 21 ++----------------- .../Models/Spt/Inventory/ItemSize.cs | 20 ++++++++++++++++++ 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs index d9592591..a78f3ce3 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs @@ -1,9 +1,9 @@ using System.Collections.Frozen; -using System.Text.Json.Serialization; using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; +using SPTarkov.Server.Core.Models.Spt.Inventory; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Services; using SPTarkov.Server.Core.Utils; @@ -1431,7 +1431,7 @@ public class ItemHelper( /// Item with children /// The base items root id /// ItemSize object (width and height) - public ItemSize GetItemSize(List items, string rootItemId) + public ItemSize GetItemSize(ICollection items, string rootItemId) { var rootTemplate = GetItem(items.Where(x => x.Id.Equals(rootItemId, StringComparison.OrdinalIgnoreCase)).ToList()[0].Template).Value; var width = rootTemplate.Properties.Width; @@ -2244,20 +2244,3 @@ public class ItemHelper( .ToArray(); } } - -public class ItemSize -{ - [JsonPropertyName("width")] - public int Width - { - get; - set; - } - - [JsonPropertyName("height")] - public int Height - { - get; - set; - } -} diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs new file mode 100644 index 00000000..10c9ecf3 --- /dev/null +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs @@ -0,0 +1,20 @@ +using System.Text.Json.Serialization; + +namespace SPTarkov.Server.Core.Models.Spt.Inventory; + +public record ItemSize +{ + [JsonPropertyName("width")] + public int Width + { + get; + set; + } + + [JsonPropertyName("height")] + public int Height + { + get; + set; + } +}