|
@@ -124,26 +124,32 @@ namespace BepInEx.Preloader.Unity
|
|
Log.LogFatal("Could not run preloader!");
|
|
Log.LogFatal("Could not run preloader!");
|
|
Log.LogFatal(ex);
|
|
Log.LogFatal(ex);
|
|
|
|
|
|
- PreloaderLog?.Dispose();
|
|
|
|
-
|
|
|
|
if (!ConsoleManager.ConsoleActive)
|
|
if (!ConsoleManager.ConsoleActive)
|
|
{
|
|
{
|
|
//if we've already attached the console, then the log will already be written to the console
|
|
//if we've already attached the console, then the log will already be written to the console
|
|
AllocateConsole();
|
|
AllocateConsole();
|
|
Console.Write(PreloaderLog);
|
|
Console.Write(PreloaderLog);
|
|
}
|
|
}
|
|
-
|
|
|
|
- PreloaderLog = null;
|
|
|
|
}
|
|
}
|
|
- finally
|
|
|
|
|
|
+ catch { }
|
|
|
|
+
|
|
|
|
+ string log = string.Empty;
|
|
|
|
+
|
|
|
|
+ try
|
|
{
|
|
{
|
|
- File.WriteAllText(
|
|
|
|
- Path.Combine(Paths.GameRootPath, $"preloader_{DateTime.Now:yyyyMMdd_HHmmss_fff}.log"),
|
|
|
|
- PreloaderLog + "\r\n" + ex);
|
|
|
|
|
|
+ // We could use platform-dependent newlines, however the developers use Windows so this will be easier to read :)
|
|
|
|
+
|
|
|
|
+ log = string.Join("\r\n", PreloaderConsoleListener.LogEvents.Select(x => x.ToString()).ToArray());
|
|
|
|
+ log += "\r\n";
|
|
|
|
|
|
PreloaderLog?.Dispose();
|
|
PreloaderLog?.Dispose();
|
|
PreloaderLog = null;
|
|
PreloaderLog = null;
|
|
}
|
|
}
|
|
|
|
+ catch { }
|
|
|
|
+
|
|
|
|
+ File.WriteAllText(
|
|
|
|
+ Path.Combine(Paths.GameRootPath, $"preloader_{DateTime.Now:yyyyMMdd_HHmmss_fff}.log"),
|
|
|
|
+ log + ex);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -165,7 +171,7 @@ namespace BepInEx.Preloader.Unity
|
|
var entryType = assembly.MainModule.Types.FirstOrDefault(x => x.Name == entrypointType);
|
|
var entryType = assembly.MainModule.Types.FirstOrDefault(x => x.Name == entrypointType);
|
|
|
|
|
|
if (entryType == null)
|
|
if (entryType == null)
|
|
- throw new Exception("The entrypoint type is invalid! Please check your config.ini");
|
|
|
|
|
|
+ throw new Exception("The entrypoint type is invalid! Please check your config/BepInEx.cfg file");
|
|
|
|
|
|
string chainloaderAssemblyPath = Path.Combine(Paths.BepInExAssemblyDirectory, "BepInEx.Unity.dll");
|
|
string chainloaderAssemblyPath = Path.Combine(Paths.BepInExAssemblyDirectory, "BepInEx.Unity.dll");
|
|
|
|
|