Add support for Windows Store build (#417)

ow-mods · Jan 6, 2022 · db68554 · db68554
1 parent d615a41
commit db68554
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 11 deletions.
diff --git a/src/OWML.Common/OWML.Common.csproj b/src/OWML.Common/OWML.Common.csproj
@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="OuterWildsGameLibs" Version="1.1.11.72" />
+	  <PackageReference Include="OuterWildsGameLibs" Version="1.1.12.125" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OWML.Common/OwmlConfig.cs b/src/OWML.Common/OwmlConfig.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.IO;
+using Newtonsoft.Json;
 
 namespace OWML.Common
 {
@@ -14,16 +15,19 @@ public class OwmlConfig : IOwmlConfig
 		public bool ForceExe { get; set; }
 
 		[JsonIgnore]
-		public string DataPath => $"{GamePath}/OuterWilds_Data";
+		public bool IsSpaced => Directory.Exists(Path.Combine(GamePath, "Outer Wilds_Data"));
 
 		[JsonIgnore]
-		public string ExePath => $"{GamePath}/OuterWilds.exe";
+		public string DataPath => Path.Combine(GamePath, IsSpaced ? "Outer Wilds_Data" : "OuterWilds_Data");
 
 		[JsonIgnore]
-		public string ManagedPath => $"{DataPath}/Managed";
+		public string ExePath => Path.Combine(GamePath, IsSpaced ? "Outer Wilds.exe" : "OuterWilds.exe");
 
 		[JsonIgnore]
-		public string PluginsPath => $"{DataPath}/Plugins";
+		public string ManagedPath => Path.Combine(DataPath, "Managed");
+
+		[JsonIgnore]
+		public string PluginsPath => Path.Combine(DataPath, "Plugins");
 
 		[JsonProperty("owmlPath")]
 		public string OWMLPath { get; set; }

diff --git a/src/OWML.GameFinder/BaseFinder.cs b/src/OWML.GameFinder/BaseFinder.cs
@@ -5,8 +5,10 @@ namespace OWML.GameFinder
 {
 	public abstract class BaseFinder
 	{
-		private const string ManagedPath = "OuterWilds_Data/Managed";
+		private readonly string ManagedPath = Path.Combine("OuterWilds_Data", "Managed");
 		private const string ExePath = "OuterWilds.exe";
+		private readonly string SpacedManagedPath = Path.Combine("Outer Wilds_Data", "Managed");
+		private const string SpacedExePath = "Outer Wilds.exe";
 
 		protected IOwmlConfig Config;
 		protected IModConsole Writer;
@@ -22,7 +24,14 @@ protected BaseFinder(IOwmlConfig config, IModConsole writer)
 		protected bool IsValidGamePath(string gamePath) =>
 			!string.IsNullOrEmpty(gamePath) &&
 			Directory.Exists(gamePath) &&
-			Directory.Exists($"{gamePath}/{ManagedPath}") &&
-			File.Exists($"{gamePath}/{ExePath}");
+			(HasGameFiles(gamePath) || HasSpacedGameFiles(gamePath));
+
+		private bool HasGameFiles(string gamePath) => 
+			Directory.Exists(Path.Combine(gamePath, ManagedPath)) && 
+			File.Exists(Path.Combine(gamePath, ExePath));
+
+		private bool HasSpacedGameFiles(string gamePath) => 
+			Directory.Exists(Path.Combine(gamePath, SpacedManagedPath)) && 
+			File.Exists(Path.Combine(gamePath, SpacedExePath));
 	}
 }
diff --git a/src/OWML.GameFinder/PathFinder.cs b/src/OWML.GameFinder/PathFinder.cs
@@ -18,6 +18,7 @@ public string FindGamePath() =>
 			FindPathWith<CurrentPathFinder>() ??
 			FindPathWith<SteamGameFinder>() ??
 			FindPathWith<EpicGameFinder>() ??
+			FindPathWith<UWPGameFinder>() ??
 			FindPathWith<DefaultLocationFinder>() ??
 			FindPathWith<PromptGameFinder>();
 

diff --git a/src/OWML.GameFinder/UWPGameFinder.cs b/src/OWML.GameFinder/UWPGameFinder.cs
@@ -0,0 +1,42 @@
+using System;
+using Microsoft.Win32;
+using OWML.Common;
+
+namespace OWML.GameFinder
+{
+	public class UWPGameFinder : BaseFinder
+	{
+		private const string RegistryPath = @"Software\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppModel\Repository\Packages";
+
+		public UWPGameFinder(IOwmlConfig config, IModConsole writer)
+			: base(config, writer)
+		{
+		}
+
+		public override string FindGamePath()
+		{
+			var appPackages = Registry.CurrentUser.OpenSubKey(RegistryPath);
+
+			var gamePath = "";
+			foreach(var appPackageName in appPackages?.GetSubKeyNames())
+			{
+				var appPackageKey = appPackages.OpenSubKey(appPackageName);
+				var packageDisplayName = (string)appPackageKey.GetValue("DisplayName");
+
+				if(!String.IsNullOrEmpty(packageDisplayName) && packageDisplayName.Contains("Outer Wilds"))
+				{
+					gamePath = (string)appPackageKey.GetValue("PackageRootFolder");
+					break;
+				}
+			}
+
+			if (IsValidGamePath(gamePath))
+			{
+				return gamePath;
+			}
+
+			Writer.WriteLine("Game not found in UWP.");
+			return null;
+		}
+	}
+}
diff --git a/src/OWML.Patcher/OWPatcher.cs b/src/OWML.Patcher/OWPatcher.cs
@@ -81,7 +81,7 @@ private void CopyFiles(string[] filesToCopy, string pathPrefix, string destinati
 			{
 				try
 				{
-					File.Copy($"{pathPrefix}{filename}", $"{destination}/{filename}", true);
+					File.Copy($"{pathPrefix}{filename}", Path.Combine(destination, filename), true);
 				}
 				catch
 				{
@@ -100,7 +100,7 @@ private void PatchAssembly()
 		{
 			_writer.WriteLine("Patching OW assembly...");
 
-			var patcher = new dnpatch.Patcher($"{_owmlConfig.ManagedPath}/Assembly-CSharp.dll");
+			var patcher = new dnpatch.Patcher(Path.Combine(_owmlConfig.ManagedPath, "Assembly-CSharp.dll"));
 
 			var target = new Target
 			{