From 545edfd25f61f46f069a8a40647c0d5528962bcd Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 23 Jul 2025 21:47:20 +0100 Subject: [PATCH] Removed unnecessary annotation --- .../SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs | 3 --- .../Models/Eft/Common/Tables/BotBase.cs | 1 - .../SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs | 1 - .../Models/Eft/Ws/NotificationEventType.cs | 3 --- Libraries/SPTarkov.Server.Core/Models/Enums/AirdropType.cs | 3 --- .../SPTarkov.Server.Core/Models/Enums/ArmorMaterial.cs | 3 --- .../Models/Enums/BodyPartColliderType.cs | 5 +---- .../SPTarkov.Server.Core/Models/Enums/BonusSkillType.cs | 5 +---- Libraries/SPTarkov.Server.Core/Models/Enums/BuffType.cs | 3 --- Libraries/SPTarkov.Server.Core/Models/Enums/CurrencyType.cs | 3 --- .../SPTarkov.Server.Core/Models/Enums/DamageEffectType.cs | 3 --- Libraries/SPTarkov.Server.Core/Models/Enums/DamageType.cs | 5 +---- Libraries/SPTarkov.Server.Core/Models/Enums/DateTimeEnum.cs | 5 +---- .../SPTarkov.Server.Core/Models/Enums/EquipmentSlots.cs | 4 ---- Libraries/SPTarkov.Server.Core/Models/Enums/EventType.cs | 3 --- .../SPTarkov.Server.Core/Models/Enums/ExfiltrationType.cs | 3 --- Libraries/SPTarkov.Server.Core/Models/Enums/ExitStatus.cs | 5 +---- .../SPTarkov.Server.Core/Models/Enums/GiftSenderType.cs | 3 --- .../SPTarkov.Server.Core/Models/Enums/MemberCategory.cs | 5 +---- Libraries/SPTarkov.Server.Core/Models/Enums/PlayerGroup.cs | 5 +---- Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSide.cs | 6 +----- .../SPTarkov.Server.Core/Models/Enums/PlayerSideMask.cs | 3 --- .../SPTarkov.Server.Core/Models/Enums/PlayersSpawnPlace.cs | 5 +---- .../SPTarkov.Server.Core/Models/Enums/QuestStatusEnum.cs | 5 +---- .../SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs | 5 +---- .../SPTarkov.Server.Core/Models/Enums/RepairStrategyType.cs | 3 --- .../Models/Enums/RepeatableQuestType.cs | 5 +---- .../SPTarkov.Server.Core/Models/Enums/RequirementState.cs | 3 --- Libraries/SPTarkov.Server.Core/Models/Enums/RewardType.cs | 3 --- .../SPTarkov.Server.Core/Models/Enums/SeasonalEventType.cs | 3 --- Libraries/SPTarkov.Server.Core/Models/Enums/SideType.cs | 3 --- .../SPTarkov.Server.Core/Models/Enums/ThrowWeapType.cs | 3 --- .../SPTarkov.Server.Core/Models/Enums/TraderServiceType.cs | 3 --- .../Models/Logging/LogBackgroundColor.cs | 5 +---- .../SPTarkov.Server.Core/Models/Logging/LogTextColor.cs | 5 +---- Libraries/SPTarkov.Server.Core/Models/RadioStationType.cs | 3 --- .../Utils/Json/Converters/EftEnumConverter.cs | 6 ------ .../Utils/Json/Converters/EftListEnumConverter.cs | 6 ------ 38 files changed, 14 insertions(+), 132 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs index f866d269..9f1c1dc4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs @@ -2,7 +2,6 @@ using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Utils.Json; -using SPTarkov.Server.Core.Utils.Json.Converters; namespace SPTarkov.Server.Core.Models.Eft.Common; @@ -1137,8 +1136,6 @@ public record Area public XYZ? Size { get; set; } } -[EftEnumConverter] -[EftListEnumConverter] public enum WildSpawnType { marksman, diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs index 6fceb70c..ad6e7f0c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs @@ -302,7 +302,6 @@ public record Ban public long? DateTime { get; set; } } -[EftEnumConverter] public enum BanType { Chat, diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs index faacd170..649f77da 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs @@ -204,7 +204,6 @@ public record LockableComponent public LockableKeyComponent? KeyComponent { get; set; } } -[EftEnumConverter] public enum PinLockState { Free, diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/NotificationEventType.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/NotificationEventType.cs index f6156ce4..a17b834f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/NotificationEventType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/NotificationEventType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Eft.Ws; -[EftEnumConverter] public enum NotificationEventType { ping, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/AirdropType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/AirdropType.cs index 50e7c1db..ef71d6e8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/AirdropType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/AirdropType.cs @@ -1,5 +1,3 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; public enum AirdropTypeEnum @@ -10,7 +8,6 @@ public enum AirdropTypeEnum Weapon, } -[EftEnumConverter] public enum SptAirdropTypeEnum { mixed, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/ArmorMaterial.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ArmorMaterial.cs index 61d78c0f..d1168315 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/ArmorMaterial.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ArmorMaterial.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum ArmorMaterial { UHMWPE, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/BodyPartColliderType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/BodyPartColliderType.cs index 0d488411..3a095e53 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/BodyPartColliderType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/BodyPartColliderType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum BodyPartColliderType { None = -1, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/BonusSkillType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/BonusSkillType.cs index 1186ab95..7b430ba4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/BonusSkillType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/BonusSkillType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum BonusSkillType { Physical, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/BuffType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/BuffType.cs index 007e8892..97e7a651 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/BuffType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/BuffType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum BuffType { WeaponSpread, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/CurrencyType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/CurrencyType.cs index 82e457ca..3bf23f65 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/CurrencyType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/CurrencyType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum CurrencyType { RUB, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/DamageEffectType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/DamageEffectType.cs index 4db22db0..82f82d5f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/DamageEffectType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/DamageEffectType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum DamageEffectType { HeavyBleeding, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/DamageType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/DamageType.cs index cd602402..6207568d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/DamageType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/DamageType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftListEnumConverter] public enum DamageType { Undefined = 1, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/DateTimeEnum.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/DateTimeEnum.cs index 856a22e4..b8449b22 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/DateTimeEnum.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/DateTimeEnum.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum DateTimeEnum { CURR, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentSlots.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentSlots.cs index 6f90cfd3..7a74cf03 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentSlots.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentSlots.cs @@ -1,9 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] -[EftListEnumConverter] public enum EquipmentSlots { Headwear, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/EventType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/EventType.cs index 6dc712ae..574878e4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/EventType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/EventType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum EventType { None, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/ExfiltrationType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ExfiltrationType.cs index 6a49a4e1..9223c862 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/ExfiltrationType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ExfiltrationType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum ExfiltrationType { Individual, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/ExitStatus.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ExitStatus.cs index e02b0e86..d86b3da6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/ExitStatus.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ExitStatus.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum ExitStatus { SURVIVED, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/GiftSenderType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/GiftSenderType.cs index 4abb4117..c0ace9e8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/GiftSenderType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/GiftSenderType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum GiftSenderType { System, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/MemberCategory.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/MemberCategory.cs index 411d834b..c1096514 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/MemberCategory.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/MemberCategory.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum MemberCategory { Default = 0, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerGroup.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerGroup.cs index 444edb71..6872609b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerGroup.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerGroup.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum PlayerGroup { Pmc, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSide.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSide.cs index 7a5b5e68..9a64109b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSide.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSide.cs @@ -1,9 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] -[EftListEnumConverter] public enum PlayerSide { Usec = 1, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSideMask.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSideMask.cs index 0a0ab5bf..65a4ebd4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSideMask.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSideMask.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] [Flags] public enum PlayerSideMask { diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/PlayersSpawnPlace.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayersSpawnPlace.cs index f339410c..af58f703 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/PlayersSpawnPlace.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayersSpawnPlace.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum PlayersSpawnPlace { SamePlace, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/QuestStatusEnum.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestStatusEnum.cs index af2fb47a..03000e63 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/QuestStatusEnum.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestStatusEnum.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum QuestStatusEnum { Locked = 0, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs index c5bbf834..f4968046 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum QuestTypeEnum { PickUp, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/RepairStrategyType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RepairStrategyType.cs index d59baba7..7c353beb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/RepairStrategyType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RepairStrategyType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum RepairStrategyType { MeleeWeapon, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/RepeatableQuestType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RepeatableQuestType.cs index 1d6a3764..077c1db2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/RepeatableQuestType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RepeatableQuestType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Enums; -namespace SPTarkov.Server.Core.Models.Enums; - -[EftEnumConverter] public enum RepeatableQuestType { Elimination, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/RequirementState.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RequirementState.cs index b10a66d7..d7bb48f7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/RequirementState.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RequirementState.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum RequirementState { None, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/RewardType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RewardType.cs index a74d7f1a..db0013f5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/RewardType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RewardType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum RewardType { Experience, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/SeasonalEventType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/SeasonalEventType.cs index b13a05da..9f5b8e9a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/SeasonalEventType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/SeasonalEventType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum SeasonalEventType { None, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/SideType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/SideType.cs index fbba46ab..8cdc4e2c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/SideType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/SideType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum SideType { Pmc, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/ThrowWeapType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ThrowWeapType.cs index 983ddc00..b2a3da93 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/ThrowWeapType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ThrowWeapType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum ThrowWeapType { frag_grenade, diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/TraderServiceType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/TraderServiceType.cs index d17487e7..4addbb29 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/TraderServiceType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/TraderServiceType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models.Enums; -[EftEnumConverter] public enum TraderServiceType { ExUsecLoyalty, diff --git a/Libraries/SPTarkov.Server.Core/Models/Logging/LogBackgroundColor.cs b/Libraries/SPTarkov.Server.Core/Models/Logging/LogBackgroundColor.cs index 4551e73d..0b3c0fad 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Logging/LogBackgroundColor.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Logging/LogBackgroundColor.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Logging; -namespace SPTarkov.Server.Core.Models.Logging; - -[EftEnumConverter] public enum LogBackgroundColor { Black = 40, diff --git a/Libraries/SPTarkov.Server.Core/Models/Logging/LogTextColor.cs b/Libraries/SPTarkov.Server.Core/Models/Logging/LogTextColor.cs index 326fde55..1a1783f5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Logging/LogTextColor.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Logging/LogTextColor.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; +namespace SPTarkov.Server.Core.Models.Logging; -namespace SPTarkov.Server.Core.Models.Logging; - -[EftEnumConverter] public enum LogTextColor { Black = 30, diff --git a/Libraries/SPTarkov.Server.Core/Models/RadioStationType.cs b/Libraries/SPTarkov.Server.Core/Models/RadioStationType.cs index f6a28320..e2ce6b62 100644 --- a/Libraries/SPTarkov.Server.Core/Models/RadioStationType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/RadioStationType.cs @@ -1,8 +1,5 @@ -using SPTarkov.Server.Core.Utils.Json.Converters; - namespace SPTarkov.Server.Core.Models; -[EftEnumConverter] public enum RadioStationType { None, diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs index afe23889..68bd6330 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs @@ -114,9 +114,3 @@ public class EftEnumConverter : JsonConverter writer.WritePropertyName(propertyValue.ToString()); } } - -/// -/// This attribute should be applied to enums which should be added as a converter to the json converter -/// -[AttributeUsage(AttributeTargets.Enum)] -public class EftEnumConverterAttribute : Attribute { } diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs index a2a43302..f4651243 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs @@ -58,9 +58,3 @@ public class EftListEnumConverter : JsonConverter> writer.WriteEndArray(); } } - -/// -/// This attribute should be applied to enums which should be added as a converter to the json converter -/// -[AttributeUsage(AttributeTargets.Enum)] -public class EftListEnumConverterAttribute : Attribute { }