Build 1.1.4.0

This commit is contained in:
Markus Isberg
2023-03-31 18:40:44 +03:00
parent efba17e0ff
commit 9470edead3
483 changed files with 17487 additions and 8548 deletions
@@ -26,7 +26,7 @@ namespace Barotrauma.Steam
{ "language", 5 }
};
public static bool IsInitialized { get; private set; }
public static bool IsInitialized => IsInitializedProjectSpecific;
private static readonly List<string> popularTags = new List<string>();
public static IEnumerable<string> PopularTags
@@ -189,7 +189,6 @@ namespace Barotrauma.Steam
if (Steamworks.SteamClient.IsValid) { Steamworks.SteamClient.Shutdown(); }
if (Steamworks.SteamServer.IsValid) { Steamworks.SteamServer.Shutdown(); }
IsInitialized = false;
}
public static IEnumerable<ulong> ParseWorkshopIds(string workshopIdData)
@@ -194,7 +194,7 @@ namespace Barotrauma.Steam
{
try
{
System.IO.Directory.Delete(item.Directory, recursive: true);
System.IO.Directory.Delete(item.Directory ?? "", recursive: true);
}
catch
{
@@ -312,7 +312,7 @@ namespace Barotrauma.Steam
public static bool IsItemDirectoryUpToDate(in Steamworks.Ugc.Item item)
{
string itemDirectory = item.Directory;
string itemDirectory = item.Directory ?? "";
return Directory.Exists(itemDirectory)
&& File.GetLastWriteTime(itemDirectory).ToUniversalTime() >= item.LatestUpdateTime;
}
@@ -403,7 +403,7 @@ namespace Barotrauma.Steam
var ids = items.Select(it => it.Id.Value).ToHashSet();
var toUninstall = ContentPackageManager.WorkshopPackages
.Where(pkg
=> !pkg.UgcId.TryUnwrap(out SteamWorkshopId workshopId)
=> !pkg.UgcId.TryUnwrap<SteamWorkshopId>(out var workshopId)
|| !ids.Contains(workshopId.Value))
.ToArray();
if (toUninstall.Any())
@@ -432,9 +432,9 @@ namespace Barotrauma.Steam
if (!(itemNullable is { } item)) { return; }
await Task.Yield();
string itemTitle = item.Title.Trim();
string itemTitle = item.Title?.Trim() ?? "";
UInt64 itemId = item.Id;
string itemDirectory = item.Directory;
string itemDirectory = item.Directory ?? "";
DateTime updateTime = item.LatestUpdateTime;
if (!CanBeInstalled(item))