update to ASF 6.0.1.24

Author: Rudokhvist

ArchiSteamFarm

@@ -5,7 +5,7 @@
 namespace ItemDispenser {
 
 	public sealed class DispenseItem {
-		public static readonly ImmutableHashSet<Asset.EType> EmptyTypes = [];
+		public static readonly ImmutableHashSet<EAssetType> EmptyTypes = [];
 		[JsonInclude]
 		[JsonRequired]
 		public uint AppID { get; private init; }
@@ -14,6 +14,6 @@ public sealed class DispenseItem {
 		public ulong ContextID { get; private init; }
 
 		[JsonInclude]
-		public ImmutableHashSet<Asset.EType> Types { get; private init; } = EmptyTypes;
+		public ImmutableHashSet<EAssetType> Types { get; private init; } = EmptyTypes;
 }
 }

ItemDispenser/DispenseItems.cs

@@ -19,7 +19,7 @@ namespace ItemDispenser;
 [Export(typeof(IPlugin))]
 
 internal sealed class ItemDispenser : IBotTradeOffer, IBotModules {
-	private static readonly ConcurrentDictionary<Bot, FrozenDictionary<(uint AppID, ulong ContextID), FrozenSet<Asset.EType>>> BotSettings = new();
+	private static readonly ConcurrentDictionary<Bot, FrozenDictionary<(uint AppID, ulong ContextID), FrozenSet<EAssetType>>> BotSettings = new();
 
 	public string Name => nameof(ItemDispenser);
 
@@ -40,7 +40,7 @@ public Task OnBotInitModules(Bot bot, IReadOnlyDictionary<string, JsonElement>?
 			return Task.CompletedTask;
 		}
 
-		Dictionary<(uint AppID, ulong ContextID), HashSet<Asset.EType>> botSettings = [];
+		Dictionary<(uint AppID, ulong ContextID), HashSet<EAssetType>> botSettings = [];
 
 		try {
 			foreach (DispenseItem? dispenseItem in jsonElement.EnumerateArray().Select(static elem => elem.ToJsonObject<DispenseItem>())) {
@@ -50,7 +50,7 @@ public Task OnBotInitModules(Bot bot, IReadOnlyDictionary<string, JsonElement>?
 
 				(uint AppID, ulong ContextID) key = (dispenseItem.AppID, dispenseItem.ContextID);
 
-				if (!botSettings.TryGetValue(key, out HashSet<Asset.EType>? types)) {
+				if (!botSettings.TryGetValue(key, out HashSet<EAssetType>? types)) {
 					types = [];
 					botSettings[key] = types;
 				}
@@ -73,7 +73,7 @@ public async Task<bool> OnBotTradeOffer(Bot bot, TradeOffer tradeOffer) {
 		ArgumentNullException.ThrowIfNull(bot);
 		ArgumentNullException.ThrowIfNull(tradeOffer);
 
-		if (!BotSettings.TryGetValue(bot, out FrozenDictionary<(uint AppID, ulong ContextID), FrozenSet<Asset.EType>>? itemsToDispense)) {
+		if (!BotSettings.TryGetValue(bot, out FrozenDictionary<(uint AppID, ulong ContextID), FrozenSet<EAssetType>>? itemsToDispense)) {
 			// Settings not declared for this bot, skip overhead
 			return false;
 		}
@@ -85,8 +85,8 @@ public async Task<bool> OnBotTradeOffer(Bot bot, TradeOffer tradeOffer) {
 
 		byte? holdDuration = await bot.GetTradeHoldDuration(tradeOffer.OtherSteamID64, tradeOffer.TradeOfferID).ConfigureAwait(false);
 
-		return holdDuration != null && (!(holdDuration > 0) || holdDuration.Value <= (ASF.GlobalConfig?.MaxTradeHoldDuration ?? 0)) && !tradeOffer.ItemsToGiveReadOnly.Any(static item => item.Type is Asset.EType.FoilTradingCard or Asset.EType.TradingCard && CardsFarmer.SalesBlacklist.Contains(item.RealAppID))
-&& tradeOffer.ItemsToGiveReadOnly.All(item => itemsToDispense.TryGetValue((item.AppID, item.ContextID), out FrozenSet<Asset.EType>? dispense) && ((dispense.Count == 0) || dispense.Contains(item.Type)));
+		return holdDuration != null && (!(holdDuration > 0) || holdDuration.Value <= (ASF.GlobalConfig?.MaxTradeHoldDuration ?? 0)) && !tradeOffer.ItemsToGiveReadOnly.Any(static item => item.Type is EAssetType.FoilTradingCard or EAssetType.TradingCard && CardsFarmer.SalesBlacklist.Contains(item.RealAppID))
+&& tradeOffer.ItemsToGiveReadOnly.All(item => itemsToDispense.TryGetValue((item.AppID, item.ContextID), out FrozenSet<EAssetType>? dispense) && ((dispense.Count == 0) || dispense.Contains(item.Type)));
 	}
 
 	public Task OnLoaded() {