From 39c49f2319798eaecdf0c7d30af47debb9fe4f43 Mon Sep 17 00:00:00 2001 From: Citrinate Date: Mon, 30 Dec 2024 15:53:38 -0500 Subject: [PATCH] Cleanup --- CS2Interface/CSClient/Client.cs | 2 +- CS2Interface/GameData/GameObjects/Items/InspectItem.cs | 2 +- CS2Interface/GameData/GameObjects/Items/InventoryItem.cs | 2 -- CS2Interface/GameData/GameObjects/Items/Item.cs | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CS2Interface/CSClient/Client.cs b/CS2Interface/CSClient/Client.cs index f07a915..dd9409c 100644 --- a/CS2Interface/CSClient/Client.cs +++ b/CS2Interface/CSClient/Client.cs @@ -290,7 +290,7 @@ internal async Task In } } - internal async Task RequestPlayerProfile(ulong steam_id) { //uint account_id) { + internal async Task RequestPlayerProfile(ulong steam_id) { if (!HasGCSession) { throw new ClientException(EClientExceptionType.Failed, Strings.ClientNotConnectedToGC); } diff --git a/CS2Interface/GameData/GameObjects/Items/InspectItem.cs b/CS2Interface/GameData/GameObjects/Items/InspectItem.cs index f047d42..9a1dad5 100644 --- a/CS2Interface/GameData/GameObjects/Items/InspectItem.cs +++ b/CS2Interface/GameData/GameObjects/Items/InspectItem.cs @@ -21,7 +21,7 @@ internal InspectItem(CMsgGCCStrike15_v2_Client2GCEconPreviewDataBlockResponse it m = param_m.ToString(); DefIndex = ItemInfo.defindex; - PaintIndex = ItemInfo.paintindex; + PaintIndex = ItemInfo.paintindex; StickerID = ItemInfo.stickers.FirstOrDefault()?.sticker_id; TintID = ItemInfo.stickers.FirstOrDefault()?.tint_id; KeychainID = ItemInfo.keychains.FirstOrDefault()?.sticker_id; diff --git a/CS2Interface/GameData/GameObjects/Items/InventoryItem.cs b/CS2Interface/GameData/GameObjects/Items/InventoryItem.cs index f46c59e..cbc7cff 100644 --- a/CS2Interface/GameData/GameObjects/Items/InventoryItem.cs +++ b/CS2Interface/GameData/GameObjects/Items/InventoryItem.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Text.Json.Serialization; using SteamKit2.GC.CSGO.Internal; -using Swashbuckle.AspNetCore.Annotations; namespace CS2Interface { public sealed class InventoryItem : Item { @@ -21,7 +20,6 @@ public sealed class InventoryItem : Item { [JsonInclude] [JsonPropertyName("moveable")] - [SwaggerParameter(Description = "The S value from the item's inspect link (not needed if using the url parameter)")] public bool? Moveable { get; private set; } public bool ShouldSerializeAttributes() => Attributes != null && ShouldSerializeAdditionalProperties; diff --git a/CS2Interface/GameData/GameObjects/Items/Item.cs b/CS2Interface/GameData/GameObjects/Items/Item.cs index f1a45fc..b8d2f0a 100644 --- a/CS2Interface/GameData/GameObjects/Items/Item.cs +++ b/CS2Interface/GameData/GameObjects/Items/Item.cs @@ -195,11 +195,9 @@ protected override bool SetAdditionalProperties() { } { // Set the full name and type - // bool displayQualityName = Quality != 4; // Hide "Unique" quality from item names and types string? displayQualityName = Quality == 4 ? "" : QualityName; // Hide "Unique" quality from item names and types FullTypeName = String.Format("{0} {1} {2}", displayQualityName, RarityName, TypeName).Trim(); - // FullTypeName = String.Format(GameData.CsgoEnglish.Format("ItemTypeDescKillEater") ?? "{0} {1} {2}", displayQualityName, RarityName, TypeName).Trim(); if (PaintIndex == 0 && ItemData.StickerKitDef == null && ItemData.MusicDef == null && ItemData.KeychainDef == null) { FullName = String.Format("{0} {1}", displayQualityName, ToolName ?? WeaponName ?? ItemName).Trim(); // Collectibles (Pins, Coins), Vanilla Knives