Build 0.18.9.0

This commit is contained in:
Markus Isberg
2022-06-14 04:14:47 +09:00
parent 4f5a3bf8b9
commit 856f894203
39 changed files with 459 additions and 377 deletions
@@ -119,9 +119,11 @@ namespace Barotrauma.Steam
onComplete?.Invoke();
}
msgBox.Close();
ContentPackageManager.WorkshopPackages.Refresh();
ContentPackageManager.EnabledPackages.RefreshUpdatedMods();
if (SettingsMenu.Instance?.WorkshopMenu is MutableWorkshopMenu mutableWorkshopMenu)
{
mutableWorkshopMenu.PopulateInstalledModLists();
mutableWorkshopMenu.PopulateInstalledModLists(forceRefreshEnabled: true);
}
});
}
@@ -589,7 +589,7 @@ namespace Barotrauma.Steam
isEnabled: true,
onSelected: () =>
{
TaskPool.Add($"UnsubFromSelected", Task.WhenAll(selectedMods.Select(m => SteamManager.Workshop.GetItem(m.SteamWorkshopId))),
TaskPool.AddIfNotFound($"UnsubFromSelected", Task.WhenAll(selectedMods.Select(m => SteamManager.Workshop.GetItem(m.SteamWorkshopId))),
t =>
{
if (!t.TryGetResult(out Steamworks.Ugc.Item?[] items)) { return; }
@@ -668,7 +668,7 @@ namespace Barotrauma.Steam
{
infoButton.Enabled = false;
}
TaskPool.Add(
TaskPool.AddIfNotFound(
$"DetermineUpdateRequired{mod.SteamWorkshopId}",
mod.IsUpToDate(),
t =>
@@ -709,7 +709,7 @@ namespace Barotrauma.Steam
addRegularModsToList(enabledMods, enabledRegularModsList);
if (refreshDisabled) { addRegularModsToList(disabledMods, disabledRegularModsList); }
TaskPool.Add(
TaskPool.AddIfNotFound(
$"DetermineWorkshopModIcons",
SteamManager.Workshop.GetPublishedItems(),
t =>
@@ -418,7 +418,7 @@ namespace Barotrauma.Steam
itemListBox.ClearChildren();
itemListBox.Deselect();
itemListBox.ScrollBar.BarScroll = 0.0f;
TaskPool.Add("PopulateTabWithItemList", items,
TaskPool.AddIfNotFound("PopulateTabWithItemList", items,
(t) =>
{
taskCancelSrc = taskCancelSrc.IsCancellationRequested ? new CancellationTokenSource() : taskCancelSrc;
@@ -591,16 +591,16 @@ namespace Barotrauma.Steam
bool reinstallAction(GUIButton button, object o)
{
TaskPool.Add($"Reinstall{workshopItem.Id}", SteamManager.Workshop.Reinstall(workshopItem), t =>
int prevIndex = ContentPackageManager.EnabledPackages.Regular.IndexOf(contentPackage);
TaskPool.AddIfNotFound($"Reinstall{workshopItem.Id}",
SteamManager.Workshop.Reinstall(workshopItem), t =>
{
ContentPackageManager.WorkshopPackages.Refresh();
ContentPackageManager.EnabledPackages.RefreshUpdatedMods();
var package = ContentPackageManager.WorkshopPackages.FirstOrDefault(p => p.SteamWorkshopId == workshopItem.Id);
if (package is RegularPackage regular)
if (SettingsMenu.Instance?.WorkshopMenu is MutableWorkshopMenu mutableWorkshopMenu)
{
ContentPackageManager.EnabledPackages.EnableRegular(regular);
mutableWorkshopMenu.PopulateInstalledModLists(forceRefreshEnabled: true);
}
PopulateInstalledModLists(forceRefreshEnabled: true);
});
return false;
}
@@ -615,7 +615,7 @@ namespace Barotrauma.Steam
if (contentPackage != null)
{
TaskPool.Add(
TaskPool.AddIfNotFound(
$"DetermineUpdateRequired{contentPackage.SteamWorkshopId}",
contentPackage.IsUpToDate(),
t =>