From cc91df01f68486e1533b47665e86be3f0f53358d Mon Sep 17 00:00:00 2001 From: GMatrixGames Date: Wed, 15 Jul 2020 13:37:43 -0400 Subject: [PATCH 1/3] Fix compile issues --- FModel/Utils/Paks.cs | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/FModel/Utils/Paks.cs b/FModel/Utils/Paks.cs index 81ec206d..3eeffc44 100644 --- a/FModel/Utils/Paks.cs +++ b/FModel/Utils/Paks.cs @@ -30,10 +30,12 @@ namespace FModel.Utils foreach (InstallationList installationList in launcherDat.InstallationList) { if (installationList.AppName.Equals(game)) - return (installationList.AppName, installationList.AppVersion, installationList.InstallLocation); + return (installationList.AppName, installationList.AppVersion, + installationList.InstallLocation); } - DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[LauncherInstalled.dat]", $"{game} not found"); + DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[LauncherInstalled.dat]", + $"{game} not found"); return (string.Empty, string.Empty, string.Empty); } } @@ -69,7 +71,7 @@ namespace FModel.Utils DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[WindowsApps]", "Folder not found"); return (string.Empty, string.Empty); } - + public static string GetFortnitePakFilesPath() { (_, string _, string fortniteFilesPath) = GetUEGameFilesPath("Fortnite"); @@ -94,7 +96,8 @@ namespace FModel.Utils if (KvP.Key.Contains("VALORANT/live/")) return $"{KvP.Key.Replace("/", "\\")}ShooterGame\\Content\\Paks"; - DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[RiotClientInstalls.json]", "Valorant not found"); + DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[RiotClientInstalls.json]", + "Valorant not found"); } } } @@ -106,14 +109,17 @@ namespace FModel.Utils public static string GetStateOfDecay2PakFilesPath() { // WIP - (_, string _, string sod2PakFilesPath) = (null, null, null); + (_, string sod2UWPPakFilesPath) = (string.Empty, string.Empty); + (_, string _, string sod2PakFilesPath) = (string.Empty, string.Empty, string.Empty); if (!GetUWPPakFilesPath("Microsoft.Dayton_1.3544.68.2_x64__8wekyb3d8bbwe").Equals(null)) - (_, sod2PakFilesPath) = GetUWPPakFilesPath("Microsoft.Dayton_1.3544.68.2_x64__8wekyb3d8bbwe"); + (_, sod2UWPPakFilesPath) = GetUWPPakFilesPath("Microsoft.Dayton_1.3544.68.2_x64__8wekyb3d8bbwe"); else (_, _, sod2PakFilesPath) = GetUEGameFilesPath(""); if (!string.IsNullOrEmpty(sod2PakFilesPath)) return $"{sod2PakFilesPath}\\StateOfDecay2\\Content\\Paks"; + else if (!string.IsNullOrEmpty(sod2UWPPakFilesPath)) + return $"{sod2UWPPakFilesPath}\\StateOfDecay2\\Content\\Paks"; return string.Empty; } @@ -125,21 +131,24 @@ namespace FModel.Utils else return string.Empty; } - + public static string GetMinecraftDungeonsPakFilesPath() { var appData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); var install = $"{appData}/.minecraft_dungeons/launcher_settings.json"; if (File.Exists(install)) - { + { DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[launcher_settings.json]", install); var launcherSettings = JsonConvert.DeserializeObject(File.ReadAllText(install)); - - if (launcherSettings.productLibraryDir != null && !string.IsNullOrEmpty(launcherSettings.productLibraryDir)) + + if (launcherSettings.productLibraryDir != null && + !string.IsNullOrEmpty(launcherSettings.productLibraryDir)) return $"{launcherSettings.productLibraryDir}\\dungeons\\dungeons\\Dungeons\\Content\\Paks"; - DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[launcher_settings.json]", "Minecraft Dungeons not found"); + DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[launcher_settings.json]", + "Minecraft Dungeons not found"); } + return string.Empty; } @@ -161,7 +170,8 @@ namespace FModel.Utils return string.Empty; } - public static void Merge(Dictionary tempFiles, out Dictionary files, string mount) + public static void Merge(Dictionary tempFiles, out Dictionary files, + string mount) { files = new Dictionary(); foreach (FPakEntry entry in tempFiles.Values) @@ -250,4 +260,4 @@ namespace FModel.Utils return false; } } -} +} \ No newline at end of file From 760ffe59ff4e34c7156ba8d86a4978647c98e115 Mon Sep 17 00:00:00 2001 From: GMatrixGames Date: Wed, 15 Jul 2020 13:48:02 -0400 Subject: [PATCH 2/3] Add icon for SOD2 --- FModel/FModel.csproj | 2 ++ FModel/Resources/sod2.ico | Bin 0 -> 67646 bytes FModel/Windows/Launcher/FLauncher.xaml.cs | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 FModel/Resources/sod2.ico diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 094b6beb..d957e9a6 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -97,6 +97,7 @@ + @@ -205,6 +206,7 @@ + diff --git a/FModel/Resources/sod2.ico b/FModel/Resources/sod2.ico new file mode 100644 index 0000000000000000000000000000000000000000..7e749089bf371b7c4e7aac297e1af488627a682f GIT binary patch literal 67646 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 x.Property.ToString() == Properties.Settings.Default.PakPath).FirstOrDefault(); From c3b3c42675a1e62eb6b1ddda4b6fee4613bef023 Mon Sep 17 00:00:00 2001 From: GMatrixGames Date: Wed, 15 Jul 2020 13:49:01 -0400 Subject: [PATCH 3/3] Nice formatting --- FModel/FModel.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index d957e9a6..55c78b85 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -97,7 +97,7 @@ - + @@ -206,7 +206,7 @@ - +