From 52fba4e50cf21ebdfaf266e5303d5d5fe5103a91 Mon Sep 17 00:00:00 2001 From: GMatrixGames Date: Sat, 3 Oct 2020 14:32:38 -0400 Subject: [PATCH] Disable all UWP functions due to crashing issue --- FModel/Utils/Paks.cs | 12 ++++++------ FModel/Windows/Launcher/FLauncher.xaml.cs | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/FModel/Utils/Paks.cs b/FModel/Utils/Paks.cs index 50b4473f..6ea7dcc9 100644 --- a/FModel/Utils/Paks.cs +++ b/FModel/Utils/Paks.cs @@ -160,13 +160,13 @@ namespace FModel.Utils "Minecraft Dungeons not found"); } - DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[launcher_settings.json]", "Launcher version not found, attempting to find Microsoft Store installation."); + //DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[launcher_settings.json]", "Launcher version not found, attempting to find Microsoft Store installation."); - var mcDungeonsUWPPath = GetUWPPakFilesPath("Microsoft.Lovika_8wekyb3d8bbwe"); - if (!string.IsNullOrEmpty(mcDungeonsUWPPath)) - { - return $"{mcDungeonsUWPPath}\\Dungeons\\Content\\Paks"; - } + //var mcDungeonsUWPPath = GetUWPPakFilesPath("Microsoft.Lovika_8wekyb3d8bbwe"); + //if (!string.IsNullOrEmpty(mcDungeonsUWPPath)) + //{ + // return $"{mcDungeonsUWPPath}\\Dungeons\\Content\\Paks"; + //} return string.Empty; } diff --git a/FModel/Windows/Launcher/FLauncher.xaml.cs b/FModel/Windows/Launcher/FLauncher.xaml.cs index 0b339158..2cc1874b 100644 --- a/FModel/Windows/Launcher/FLauncher.xaml.cs +++ b/FModel/Windows/Launcher/FLauncher.xaml.cs @@ -81,12 +81,12 @@ namespace FModel.Windows.Launcher ComboBoxVm.gamesCbViewModel.Add(new ComboBoxViewModel { Id = i++, Content = "Battle Breakers", Property = battlebreakersFilesPath }); } - string spellbreakerFilesPath = Paks.GetSpellbreakPakFilesPath(); - if (!string.IsNullOrEmpty(spellbreakerFilesPath)) + string spellbreakFilesPath = Paks.GetSpellbreakPakFilesPath(); + if (!string.IsNullOrEmpty(spellbreakFilesPath)) { - DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[LauncherInstalled.dat]", $"Spellbreak found at {spellbreakerFilesPath}"); + DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[LauncherInstalled.dat]", $"Spellbreak found at {spellbreakFilesPath}"); Globals.gNotifier.ShowCustomMessage("Spellbreak", Properties.Resources.PathAutoDetected, "/FModel;component/Resources/spellbreak.ico"); - ComboBoxVm.gamesCbViewModel.Add(new ComboBoxViewModel { Id = i++, Content = "Spellbreak", Property = spellbreakerFilesPath }); + ComboBoxVm.gamesCbViewModel.Add(new ComboBoxViewModel { Id = i++, Content = "Spellbreak", Property = spellbreakFilesPath }); } string theCyclePath = Paks.GetTheCyclePakFilesPath(); @@ -97,14 +97,14 @@ namespace FModel.Windows.Launcher ComboBoxVm.gamesCbViewModel.Add(new ComboBoxViewModel { Id = i++, Content = "The Cycle (Early Access)", Property = theCyclePath }); } - string sod2Path = Paks.GetStateOfDecay2PakFilesPath(); - if (!string.IsNullOrEmpty(sod2Path)) - { + //string sod2Path = Paks.GetStateOfDecay2PakFilesPath(); + //if (!string.IsNullOrEmpty(sod2Path)) + //{ // WIP - DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[UWP / LauncherInstalled.dat]", $"State of Decay 2 found at {sod2Path}"); - Globals.gNotifier.ShowCustomMessage("State of Decay 2", Properties.Resources.PathAutoDetected, "/FModel;component/Resources/sod2.ico"); - ComboBoxVm.gamesCbViewModel.Add(new ComboBoxViewModel { Id = i++, Content = "State of Decay 2", Property = sod2Path }); - } + // DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[UWP / LauncherInstalled.dat]", $"State of Decay 2 found at {sod2Path}"); + // Globals.gNotifier.ShowCustomMessage("State of Decay 2", Properties.Resources.PathAutoDetected, "/FModel;component/Resources/sod2.ico"); + // ComboBoxVm.gamesCbViewModel.Add(new ComboBoxViewModel { Id = i++, Content = "State of Decay 2", Property = sod2Path }); + //} Games_CbBox.SelectedItem = ComboBoxVm.gamesCbViewModel.Where(x => x.Property.ToString() == Properties.Settings.Default.PakPath).FirstOrDefault(); }