Merge pull request #36 from sepluginloader/dev

austinvaness · web-flow · commit 8662c4dc288b · 2022-06-08T13:58:08.000-05:00
v1.10.2
diff --git a/.gitignore b/.gitignore
@@ -355,5 +355,8 @@ MigrationBackup/
 # SE's Bin64 folder symlinked for DLL dependencies
 /Bin64/
 
+# Steam's workshop folder symlinked for DLL dependencies
+/workshop/
+
 # JetBrains Rider project files
 .idea/
diff --git a/Edit-and-run-before-opening-solution.bat b/Edit-and-run-before-opening-solution.bat
@@ -3,4 +3,7 @@
 REM Location of your SpaceEngineers.exe
 mklink /J Bin64 "C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64"
 
+REM Location of your workshop
+mklink /J workshop "C:\Program Files (x86)\Steam\steamapps\workshop"
+
 pause
diff --git a/PluginLoader/Data/LocalFolderPlugin.cs b/PluginLoader/Data/LocalFolderPlugin.cs
@@ -20,6 +20,7 @@ namespace avaness.PluginLoader.Data
     public class LocalFolderPlugin : PluginData
     {
         const string XmlDataType = "Xml files (*.xml)|*.xml|All files (*.*)|*.*";
+        const int GitTimeout = 10000;
 
         public override string Source => MyTexts.GetString(MyCommonTexts.Local);
         private string[] sourceDirectories;
@@ -104,7 +105,11 @@ private IEnumerable<string> GetProjectFiles(string folder)
                 // Read the output stream first and then wait.
                 string gitOutput = p.StandardOutput.ReadToEnd();
                 gitError = p.StandardError.ReadToEnd();
-                p.WaitForExit();
+                if (!p.WaitForExit(GitTimeout))
+                {
+                    p.Kill();
+                    throw new TimeoutException("Git operation timed out.");
+                }
 
                 if (p.ExitCode == 0)
                 {
@@ -113,25 +118,25 @@ private IEnumerable<string> GetProjectFiles(string folder)
                 }
                 else
                 {
-                    StringBuilder sb = new StringBuilder("An error occurred while checking git for project files. " + p.HasExited);
+                    StringBuilder sb = new StringBuilder("An error occurred while checking git for project files.").AppendLine();
                     if (!string.IsNullOrWhiteSpace(gitError))
                     {
-                        sb.AppendLine(" Git output: ");
+                        sb.AppendLine("Git output: ");
                         sb.Append(gitError).AppendLine();
                     }
                     LogFile.WriteLine(sb.ToString());
                 }
             }
             catch (Exception e) 
             {
-                StringBuilder sb = new StringBuilder("An error occurred while checking git for project files.");
+                StringBuilder sb = new StringBuilder("An error occurred while checking git for project files.").AppendLine();
                 if(!string.IsNullOrWhiteSpace(gitError))
                 {
                     sb.AppendLine(" Git output: ");
                     sb.Append(gitError).AppendLine();
                 }
                 sb.AppendLine("Exception: ");
-                sb.Append(e);
+                sb.Append(e).AppendLine();
                 LogFile.WriteLine(sb.ToString());
             }
 
diff --git a/PluginLoader/Data/ModPlugin.cs b/PluginLoader/Data/ModPlugin.cs
@@ -99,7 +99,7 @@ public WorkshopItem(string folder)
         public MyModContext GetModContext()
         {
             MyModContext modContext = new MyModContext();
-            modContext.Init(new MyObjectBuilder_Checkpoint.ModItem(WorkshopId, "Steam"));
+            modContext.Init(GetModItem());
             modContext.Init(WorkshopId.ToString(), null, ModLocation);
             return modContext;
         }
diff --git a/PluginLoader/LoaderTools.cs b/PluginLoader/LoaderTools.cs
@@ -15,6 +15,7 @@
 using System.Windows.Forms;
 using VRage.FileSystem;
 using VRage.Input;
+using VRage.Plugins;
 using VRage.Utils;
 
 namespace avaness.PluginLoader
@@ -34,10 +35,12 @@ public static Form GetMainForm()
 
         public static void UnloadAndRestart()
         {
+            LogFile.Dispose();
             MySessionLoader.Unload();
             MySandboxGame.Config.ControllerDefaultOnStart = MyInput.Static.IsJoystickLastUsed;
             MySandboxGame.Config.Save();
             MyScreenManager.CloseAllScreensNowExcept(null);
+            MyPlugins.Unload();
             Restart();
         }
 
@@ -162,7 +165,7 @@ private static void OpenFileDialogThread(string title, string directory, string
             }
             catch (Exception e)
             {
-                MyLog.Default.WriteLine("Error while opening file dialog: " + e);
+                LogFile.WriteGameLog("Error while opening file dialog: " + e);
             }
         }
 
@@ -194,7 +197,7 @@ private static void OpenFolderDialogThread(string title, string directory, Actio
             }
             catch (Exception e)
             {
-                MyLog.Default.WriteLine("Error while opening file dialog: " + e);
+                LogFile.WriteGameLog("Error while opening file dialog: " + e);
             }
         }
     }
diff --git a/PluginLoader/LogFile.cs b/PluginLoader/LogFile.cs
@@ -12,7 +12,14 @@ public static class LogFile
         public static void Init(string mainPath)
         {
             string file = Path.Combine(mainPath, fileName);
-            writer = File.CreateText(file);
+            try
+            {
+                writer = File.CreateText(file);
+            }
+            catch
+            {
+                writer = null;
+            }
         }
 
         /// <summary>
@@ -21,18 +28,34 @@ public static void Init(string mainPath)
         /// </summary>
         public static void WriteLine(string text, bool gameLog = true)
         {
-            writer?.WriteLine($"{DateTime.UtcNow:O} {text}");
-            if(gameLog)
-                MyLog.Default.WriteLine($"[PluginLoader] {text}");
-            writer?.Flush();
+            try
+            {
+                writer?.WriteLine($"{DateTime.UtcNow:O} {text}");
+                if (gameLog)
+                    WriteGameLog(text);
+                writer?.Flush();
+            }
+            catch 
+            {
+                Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Writes the specifed text to the game log file.
+        /// This function is thread safe.
+        /// </summary>
+        public static void WriteGameLog(string text)
+        {
+            MyLog.Default.WriteLine($"[PluginLoader] {text}");
         }
 
         public static void WriteTrace(string text, bool gameLog = true)
         {
 #if DEBUG
             writer?.WriteLine($"{DateTime.UtcNow:O} {text}");
             if(gameLog)
-                MyLog.Default.WriteLine($"[PluginLoader] {text}");
+                LogFile.WriteGameLog($"[PluginLoader] {text}");
             writer?.Flush();
 #endif
         }
@@ -42,8 +65,12 @@ public static void Dispose()
             if (writer == null)
                 return;
 
-            writer.Flush();
-            writer.Close();
+            try
+            {
+                writer.Flush();
+                writer.Close();
+            }
+            catch { }
             writer = null;
         }
     }
diff --git a/PluginLoader/Properties/AssemblyInfo.cs b/PluginLoader/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.10.1.0")]
-[assembly: AssemblyFileVersion("1.10.1.0")]
+[assembly: AssemblyVersion("1.10.2.0")]
+[assembly: AssemblyFileVersion("1.10.2.0")]
diff --git a/PluginLoader/Stats/StatsClient.cs b/PluginLoader/Stats/StatsClient.cs
@@ -53,12 +53,12 @@ public static PluginStats DownloadStats()
         {
             if (!PlayerConsent.ConsentGiven)
             {
-                MyLog.Default.WriteLine("Downloading plugin statistics anonymously...");
+                LogFile.WriteGameLog("Downloading plugin statistics anonymously...");
                 votingToken = null;
                 return SimpleHttpClient.Get<PluginStats>(StatsUri);
             }
 
-            MyLog.Default.WriteLine("Downloading plugin statistics, ratings and votes for " + PlayerHash);
+            LogFile.WriteGameLog("Downloading plugin statistics, ratings and votes for " + PlayerHash);
 
             var parameters = new Dictionary<string, string> { ["playerHash"] = PlayerHash };
             var pluginStats = SimpleHttpClient.Get<PluginStats>(StatsUri, parameters);
diff --git a/PluginLoader/Tools/SimpleHttpClient.cs b/PluginLoader/Tools/SimpleHttpClient.cs
@@ -5,6 +5,7 @@
 using System.Net.Http;
 using System.Text;
 using LitJson;
+using VRage.Utils;
 
 namespace avaness.PluginLoader.Tools
 {
@@ -29,7 +30,7 @@ public static TV Get<TV>(string url)
             }
             catch (WebException e)
             {
-                LogFile.WriteLine($"REST API request failed: GET {url} [{e.Message}]");
+                LogFile.WriteGameLog($"REST API request failed: GET {url} [{e.Message}]");
                 return null;
             }
         }
@@ -54,7 +55,7 @@ public static TV Get<TV>(string url, Dictionary<string, string> parameters)
             }
             catch (WebException e)
             {
-                LogFile.WriteLine($"REST API request failed: GET {uri} [{e.Message}]");
+                LogFile.WriteGameLog($"REST API request failed: GET {uri} [{e.Message}]");
                 return null;
             }
         }
@@ -70,7 +71,7 @@ public static TV Post<TV>(string url)
             }
             catch (WebException e)
             {
-                LogFile.WriteLine($"REST API request failed: POST {url} [{e.Message}]");
+                LogFile.WriteGameLog($"REST API request failed: POST {url} [{e.Message}]");
                 return null;
             }
         }
@@ -91,7 +92,7 @@ public static TV Post<TV>(string url, Dictionary<string, string> parameters)
             }
             catch (WebException e)
             {
-                LogFile.WriteLine($"REST API request failed: POST {uri} [{e.Message}]");
+                LogFile.WriteGameLog($"REST API request failed: POST {uri} [{e.Message}]");
                 return null;
             }
         }
@@ -111,7 +112,7 @@ public static TV Post<TV, TR>(string url, TR body)
             }
             catch (WebException e)
             {
-                LogFile.WriteLine($"REST API request failed: POST {url} [{e.Message}]");
+                LogFile.WriteGameLog($"REST API request failed: POST {url} [{e.Message}]");
                 return null;
             }
         }
@@ -130,7 +131,7 @@ public static bool Post<TR>(string url, TR body)
             }
             catch (WebException e)
             {
-                LogFile.WriteLine($"REST API request failed: POST {url} [{e.Message}]");
+                LogFile.WriteGameLog($"REST API request failed: POST {url} [{e.Message}]");
                 return false;
             }
         }
diff --git a/PluginLoader/deploy.bat b/PluginLoader/deploy.bat
@@ -3,7 +3,7 @@ Rem Run this script with the full file path as argument
 
 if [%1] == [] goto eof
 
-set workshop="C:\Program Files (x86)\Steam\steamapps\workshop\content\244850\2407984968"
+set workshop="%~dp0..\workshop\content\244850\2407984968"
 set counter=1
 
 Rem Wait for the file to be ready
diff --git a/RunPluginLoader/Main.cs b/RunPluginLoader/Main.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
+using VRage.FileSystem;
 using VRage.Plugins;
 using VRage.Utils;
 
@@ -18,6 +19,8 @@ public Main()
             Log("Loading PluginLoader and dependencies...");
             try
             {
+                DeleteExtraHarmony();
+
                 string dir = GetAssemblyDirectory();
                 harmony = Assembly.LoadFile(Path.Combine(dir, "0Harmony"));
                 AppDomain.CurrentDomain.AssemblyResolve += ResolveHarmony;
@@ -62,6 +65,20 @@ private void CloseCustomSplashScreen()
             }
         }
 
+        private void DeleteExtraHarmony()
+        {
+            string dll = Path.Combine(MyFileSystem.ExePath, "0Harmony.dll");
+            if(File.Exists(dll))
+            {
+                try
+                {
+                    File.Delete(dll);
+                    Log("Deleted extra Harmony file.");
+                }
+                catch { }
+            }
+        }
+
         private void Log(string s)
         {
             MyLog.Default.WriteLine("[RunPluginLoader] " + s);
diff --git a/RunPluginLoader/Properties/AssemblyInfo.cs b/RunPluginLoader/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/RunPluginLoader/RunPluginLoader.csproj b/RunPluginLoader/RunPluginLoader.csproj
@@ -39,11 +39,18 @@
     <Reference Include="VRage">
       <HintPath>..\Bin64\VRage.dll</HintPath>
     </Reference>
+    <Reference Include="VRage.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Bin64\VRage.Library.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="deploy.bat" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>call "$(ProjectDir)\deploy.bat" "$(TargetPath) "</PostBuildEvent>
diff --git a/RunPluginLoader/deploy.bat b/RunPluginLoader/deploy.bat
@@ -3,13 +3,13 @@ Rem Run this script with the full file path as argument
 
 if [%1] == [] goto eof
 
-set workshop="C:\Program Files (x86)\Steam\steamapps\workshop\content\244850\2407984968\%~n1"
+set workshop="%~dp0..\workshop\content\244850\2407984968"
 set counter=1
 
 Rem Wait for the file to be ready
 :waitfile
 2>nul (
- >>%workshop% (call )
+ >>%workshop%\%~n1 (call )
 ) && (goto copyfile) || (echo File is in use.)
 set /a counter=counter+1
 echo Trying attempt #%counter%
@@ -19,7 +19,7 @@ goto waitfile
 Rem Copy the file to the target location
 :copyfile
 echo Copying file.
-copy /y "%~1" %workshop%
+copy /y "%~1" %workshop%\%~n1
 copy /y "%~1" "%appdata%\SpaceEngineers\Mods\Plugin Loader\%~n1"
 
 :eof

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ namespace avaness.PluginLoader.Data`
`20`	`20`	`public class LocalFolderPlugin : PluginData`
`21`	`21`	`{`
`22`	`22`	`const string XmlDataType = "Xml files (.xml)\|.xml\|All files (.)\|.";`
	`23`	`+ const int GitTimeout = 10000;`
`23`	`24`
`24`	`25`	`public override string Source => MyTexts.GetString(MyCommonTexts.Local);`
`25`	`26`	`private string[] sourceDirectories;`
`@@ -104,7 +105,11 @@ private IEnumerable<string> GetProjectFiles(string folder)`
`104`	`105`	`// Read the output stream first and then wait.`
`105`	`106`	`string gitOutput = p.StandardOutput.ReadToEnd();`
`106`	`107`	`gitError = p.StandardError.ReadToEnd();`
`107`		`- p.WaitForExit();`
	`108`	`+ if (!p.WaitForExit(GitTimeout))`
	`109`	`+ {`
	`110`	`+ p.Kill();`
	`111`	`+ throw new TimeoutException("Git operation timed out.");`
	`112`	`+ }`
`108`	`113`
`109`	`114`	`if (p.ExitCode == 0)`
`110`	`115`	`{`
`@@ -113,25 +118,25 @@ private IEnumerable<string> GetProjectFiles(string folder)`
`113`	`118`	`}`
`114`	`119`	`else`
`115`	`120`	`{`
`116`		`- StringBuilder sb = new StringBuilder("An error occurred while checking git for project files. " + p.HasExited);`
	`121`	`+ StringBuilder sb = new StringBuilder("An error occurred while checking git for project files.").AppendLine();`
`117`	`122`	`if (!string.IsNullOrWhiteSpace(gitError))`
`118`	`123`	`{`
`119`		`- sb.AppendLine(" Git output: ");`
	`124`	`+ sb.AppendLine("Git output: ");`
`120`	`125`	`sb.Append(gitError).AppendLine();`
`121`	`126`	`}`
`122`	`127`	`LogFile.WriteLine(sb.ToString());`
`123`	`128`	`}`
`124`	`129`	`}`
`125`	`130`	`catch (Exception e)`
`126`	`131`	`{`
`127`		`- StringBuilder sb = new StringBuilder("An error occurred while checking git for project files.");`
	`132`	`+ StringBuilder sb = new StringBuilder("An error occurred while checking git for project files.").AppendLine();`
`128`	`133`	`if(!string.IsNullOrWhiteSpace(gitError))`
`129`	`134`	`{`
`130`	`135`	`sb.AppendLine(" Git output: ");`
`131`	`136`	`sb.Append(gitError).AppendLine();`
`132`	`137`	`}`
`133`	`138`	`sb.AppendLine("Exception: ");`
`134`		`- sb.Append(e);`
	`139`	`+ sb.Append(e).AppendLine();`
`135`	`140`	`LogFile.WriteLine(sb.ToString());`
`136`	`141`	`}`
`137`	`142`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public WorkshopItem(string folder)`
`99`	`99`	`public MyModContext GetModContext()`
`100`	`100`	`{`
`101`	`101`	`MyModContext modContext = new MyModContext();`
`102`		`- modContext.Init(new MyObjectBuilder_Checkpoint.ModItem(WorkshopId, "Steam"));`
	`102`	`+ modContext.Init(GetModItem());`
`103`	`103`	`modContext.Init(WorkshopId.ToString(), null, ModLocation);`
`104`	`104`	`return modContext;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`using System.Windows.Forms;`
`16`	`16`	`using VRage.FileSystem;`
`17`	`17`	`using VRage.Input;`
	`18`	`+using VRage.Plugins;`
`18`	`19`	`using VRage.Utils;`
`19`	`20`
`20`	`21`	`namespace avaness.PluginLoader`
`@@ -34,10 +35,12 @@ public static Form GetMainForm()`
`34`	`35`
`35`	`36`	`public static void UnloadAndRestart()`
`36`	`37`	`{`
	`38`	`+ LogFile.Dispose();`
`37`	`39`	`MySessionLoader.Unload();`
`38`	`40`	`MySandboxGame.Config.ControllerDefaultOnStart = MyInput.Static.IsJoystickLastUsed;`
`39`	`41`	`MySandboxGame.Config.Save();`
`40`	`42`	`MyScreenManager.CloseAllScreensNowExcept(null);`
	`43`	`+ MyPlugins.Unload();`
`41`	`44`	`Restart();`
`42`	`45`	`}`
`43`	`46`
`@@ -162,7 +165,7 @@ private static void OpenFileDialogThread(string title, string directory, string`
`162`	`165`	`}`
`163`	`166`	`catch (Exception e)`
`164`	`167`	`{`
`165`		`- MyLog.Default.WriteLine("Error while opening file dialog: " + e);`
	`168`	`+ LogFile.WriteGameLog("Error while opening file dialog: " + e);`
`166`	`169`	`}`
`167`	`170`	`}`
`168`	`171`
`@@ -194,7 +197,7 @@ private static void OpenFolderDialogThread(string title, string directory, Actio`
`194`	`197`	`}`
`195`	`198`	`catch (Exception e)`
`196`	`199`	`{`
`197`		`- MyLog.Default.WriteLine("Error while opening file dialog: " + e);`
	`200`	`+ LogFile.WriteGameLog("Error while opening file dialog: " + e);`
`198`	`201`	`}`
`199`	`202`	`}`
`200`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,12 @@ public static PluginStats DownloadStats()`
`53`	`53`	`{`
`54`	`54`	`if (!PlayerConsent.ConsentGiven)`
`55`	`55`	`{`
`56`		`- MyLog.Default.WriteLine("Downloading plugin statistics anonymously...");`
	`56`	`+ LogFile.WriteGameLog("Downloading plugin statistics anonymously...");`
`57`	`57`	`votingToken = null;`
`58`	`58`	`return SimpleHttpClient.Get<PluginStats>(StatsUri);`
`59`	`59`	`}`
`60`	`60`
`61`		`- MyLog.Default.WriteLine("Downloading plugin statistics, ratings and votes for " + PlayerHash);`
	`61`	`+ LogFile.WriteGameLog("Downloading plugin statistics, ratings and votes for " + PlayerHash);`
`62`	`62`
`63`	`63`	`var parameters = new Dictionary<string, string> { ["playerHash"] = PlayerHash };`
`64`	`64`	`var pluginStats = SimpleHttpClient.Get<PluginStats>(StatsUri, parameters);`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Net.Http;`
`6`	`6`	`using System.Text;`
`7`	`7`	`using LitJson;`
	`8`	`+using VRage.Utils;`
`8`	`9`
`9`	`10`	`namespace avaness.PluginLoader.Tools`
`10`	`11`	`{`
`@@ -29,7 +30,7 @@ public static TV Get<TV>(string url)`
`29`	`30`	`}`
`30`	`31`	`catch (WebException e)`
`31`	`32`	`{`
`32`		`- LogFile.WriteLine($"REST API request failed: GET {url} [{e.Message}]");`
	`33`	`+ LogFile.WriteGameLog($"REST API request failed: GET {url} [{e.Message}]");`
`33`	`34`	`return null;`
`34`	`35`	`}`
`35`	`36`	`}`
`@@ -54,7 +55,7 @@ public static TV Get<TV>(string url, Dictionary<string, string> parameters)`
`54`	`55`	`}`
`55`	`56`	`catch (WebException e)`
`56`	`57`	`{`
`57`		`- LogFile.WriteLine($"REST API request failed: GET {uri} [{e.Message}]");`
	`58`	`+ LogFile.WriteGameLog($"REST API request failed: GET {uri} [{e.Message}]");`
`58`	`59`	`return null;`
`59`	`60`	`}`
`60`	`61`	`}`
`@@ -70,7 +71,7 @@ public static TV Post<TV>(string url)`
`70`	`71`	`}`
`71`	`72`	`catch (WebException e)`
`72`	`73`	`{`
`73`		`- LogFile.WriteLine($"REST API request failed: POST {url} [{e.Message}]");`
	`74`	`+ LogFile.WriteGameLog($"REST API request failed: POST {url} [{e.Message}]");`
`74`	`75`	`return null;`
`75`	`76`	`}`
`76`	`77`	`}`
`@@ -91,7 +92,7 @@ public static TV Post<TV>(string url, Dictionary<string, string> parameters)`
`91`	`92`	`}`
`92`	`93`	`catch (WebException e)`
`93`	`94`	`{`
`94`		`- LogFile.WriteLine($"REST API request failed: POST {uri} [{e.Message}]");`
	`95`	`+ LogFile.WriteGameLog($"REST API request failed: POST {uri} [{e.Message}]");`
`95`	`96`	`return null;`
`96`	`97`	`}`
`97`	`98`	`}`
`@@ -111,7 +112,7 @@ public static TV Post<TV, TR>(string url, TR body)`
`111`	`112`	`}`
`112`	`113`	`catch (WebException e)`
`113`	`114`	`{`
`114`		`- LogFile.WriteLine($"REST API request failed: POST {url} [{e.Message}]");`
	`115`	`+ LogFile.WriteGameLog($"REST API request failed: POST {url} [{e.Message}]");`
`115`	`116`	`return null;`
`116`	`117`	`}`
`117`	`118`	`}`
`@@ -130,7 +131,7 @@ public static bool Post<TR>(string url, TR body)`
`130`	`131`	`}`
`131`	`132`	`catch (WebException e)`
`132`	`133`	`{`
`133`		`- LogFile.WriteLine($"REST API request failed: POST {url} [{e.Message}]");`
	`134`	`+ LogFile.WriteGameLog($"REST API request failed: POST {url} [{e.Message}]");`
`134`	`135`	`return false;`
`135`	`136`	`}`
`136`	`137`	`}`