* owml quits when game quits (#60)

* forwarding args to game
ow-mods · Jan 13, 2020 · 906607f · 906607f
1 parent f4b0a2d
commit 906607f
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 8 deletions.
diff --git a/OWML.Common/Constants.cs b/OWML.Common/Constants.cs
@@ -0,0 +1,7 @@
+namespace OWML.Common
+{
+    public class Constants
+    {
+        public const string QuitKeyPhrase = "{RageAgainstTheDyingOfTheLight}";
+    }
+}
diff --git a/OWML.Common/OWML.Common.csproj b/OWML.Common/OWML.Common.csproj
@@ -62,6 +62,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Constants.cs" />
     <Compile Include="Events.cs" />
     <Compile Include="IHarmonyHelper.cs" />
     <Compile Include="IModAssets.cs" />

diff --git a/OWML.Launcher/App.cs b/OWML.Launcher/App.cs
@@ -12,7 +12,7 @@ namespace OWML.Launcher
 {
     public class App
     {
-        private const string Version = "0.3.25";
+        private const string Version = "0.3.26";
 
         private readonly IOwmlConfig _owmlConfig;
         private readonly IModConsole _writer;
@@ -36,7 +36,7 @@ public App(IOwmlConfig owmlConfig, IModConsole writer, IModFinder modFinder,
             _update = update;
         }
 
-        public void Run()
+        public void Run(string[] args)
         {
             _writer.WriteLine($"Started OWML version {Version}");
             _writer.WriteLine("For detailed log, see Logs/OWML.Log.txt");
@@ -55,7 +55,7 @@ public void Run()
 
             PatchGame(mods);
 
-            StartGame();
+            StartGame(args);
 
             Console.ReadLine();
         }
@@ -132,6 +132,10 @@ private void OnOutput(string s)
             foreach (var line in lines)
             {
                 _writer.WriteLine(line);
+                if (line == Constants.QuitKeyPhrase)
+                {
+                    Environment.Exit(0);
+                }
             }
         }
 
@@ -145,12 +149,12 @@ private void PatchGame(IList<IModData> mods)
             _vrPatcher.PatchVR(enableVR);
         }
 
-        private void StartGame()
+        private void StartGame(string[] args)
         {
             _writer.WriteLine("Starting game...");
             try
             {
-                Process.Start($"{_owmlConfig.GamePath}/OuterWilds.exe");
+                Process.Start($"{_owmlConfig.GamePath}/OuterWilds.exe", string.Join(" ", args));
             }
             catch (Exception ex)
             {

diff --git a/OWML.Launcher/Program.cs b/OWML.Launcher/Program.cs
@@ -22,7 +22,7 @@ static void Main(string[] args)
             var vrPatcher = new VRPatcher(owmlConfig, writer);
             var update = new ModUpdate(writer);
             var app = new App(owmlConfig, writer, modFinder, outputListener, pathFinder, owPatcher, vrPatcher, update);
-            app.Run();
+            app.Run(args);
         }
 
         private static IOwmlConfig GetOwmlConfig()

diff --git a/OWML.ModHelper/OWML.ModHelper.csproj b/OWML.ModHelper/OWML.ModHelper.csproj
@@ -67,6 +67,7 @@
   <ItemGroup>
     <Compile Include="ModBehaviour.cs" />
     <Compile Include="ModConfig.cs" />
+    <Compile Include="OwmlBehaviour.cs" />
     <Compile Include="OwmlConfig.cs" />
     <Compile Include="ModConsole.cs" />
     <Compile Include="ModHelper.cs" />

diff --git a/OWML.ModHelper/OwmlBehaviour.cs b/OWML.ModHelper/OwmlBehaviour.cs
@@ -0,0 +1,13 @@
+using OWML.Common;
+using UnityEngine;
+
+namespace OWML.ModHelper
+{
+    public class OwmlBehaviour : MonoBehaviour
+    {
+        void OnApplicationQuit()
+        {
+            ModConsole.Instance.WriteLine(Constants.QuitKeyPhrase);
+        }
+    }
+}
diff --git a/OWML.ModLoader/ModLoader.cs b/OWML.ModLoader/ModLoader.cs
@@ -15,6 +15,8 @@ public class ModLoader
 
         public static void LoadMods()
         {
+            var owmlGo = new GameObject();
+            owmlGo.AddComponent<OwmlBehaviour>();
             var owmlConfig = GetOwmlConfig();
             if (owmlConfig == null)
             {

diff --git a/OWML.SampleMods/OWML.EnableDebugMode/manifest.json b/OWML.SampleMods/OWML.EnableDebugMode/manifest.json
@@ -4,5 +4,5 @@
   "name": "EnableDebugMode",
   "uniqueName": "Alek.EnableDebugMode",
   "version": "0.2",
-  "owmlVersion": "0.3.25"
+  "owmlVersion": "0.3.26"
 }
diff --git a/OWML.SampleMods/OWML.LoadCustomAssets/manifest.json b/OWML.SampleMods/OWML.LoadCustomAssets/manifest.json
@@ -4,5 +4,5 @@
   "name": "LoadCustomAssets",
   "uniqueName": "Alek.LoadCustomAssets",
   "version": "0.4",
-  "owmlVersion": "0.3.25"
+  "owmlVersion": "0.3.26"
 }