PvE/se-launcher
11
0
Fork 0
Code Actions Wiki Activity

Update for latest version of the game, and print plugin load errors to console if no window is currently open

Browse Source
This commit is contained in:
pas2704
2023-08-31 14:49:26 -04:00
parent 9d5f00b7e0
commit 888c14c694
7 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CringeLauncher/CringeLauncher.csproj
View File

@@ -17,7 +17,7 @@
<PackageReference Include="Lib.Harmony" Version="2.3.0-prerelease.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
<PackageReference Include="NLog" Version="5.1.3" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.124" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
<PackageReference Include="System.Management" Version="7.0.1" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.2" />

6
CringeLauncher/Launcher.cs
View File

@@ -6,7 +6,6 @@ using Sandbox.Engine.Networking;
using Sandbox.Engine.Platform.VideoMode;
using Sandbox.Engine.Utils;
using Sandbox.Game;
using Sandbox.Game.Localization;
using SpaceEngineers.Game;
using SpaceEngineers.Game.Achievements;
using SpaceEngineers.Game.GUI;
@@ -14,6 +13,7 @@ using VRage;
using VRage.EOS;
using VRage.FileSystem;
using VRage.Game;
using VRage.Game.Localization;
using VRage.GameServices;
using VRage.Mod.Io;
using VRage.Platform.Windows;
@@ -71,12 +71,12 @@ public class Launcher : IDisposable
private static void InitTexts()
{
MyLanguage.ObtainCurrentOSCulture();
//MyLanguage.Instance.ObtainCurrentOSCulture();
var textsPath = Path.Combine(MyFileSystem.RootPath, "Content\\Data\\Localization\\CoreTexts");
var hashSet = new HashSet<MyLanguagesEnum>();
MyTexts.LoadSupportedLanguages(textsPath, hashSet);
if (!MyTexts.Languages.TryGetValue(MyLanguage.GetOsLanguageCurrentOfficial(), out var description) &&
if (!MyTexts.Languages.TryGetValue(MyLanguage.Instance.GetOsLanguageCurrentOfficial(), out var description) &&
!MyTexts.Languages.TryGetValue(MyLanguagesEnum.English, out description))
return;

6
CringeLauncher/packages.lock.json
View File

@@ -29,9 +29,9 @@
},
"SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.202.124, )",
"resolved": "1.202.124",
"contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==",
"requested": "[1.203.22, )",
"resolved": "1.203.22",
"contentHash": "ruf6DT1sAh2DnpsJUsGG4ZSdPKrVr5ReKfHSDcYggeacge/nsdqpcij53HSNwnMxve6cfnTRG9SXE2iGSGEtEQ==",
"dependencies": {
"protobuf-net": "1.0.0"
}

11
PluginLoader/Data/GitHubPlugin.cs
View File

@@ -90,7 +90,16 @@ public class GitHubPlugin : PluginData
}
else
{
a = Assembly.LoadFile(dllFile);
try
{
a = Assembly.LoadFile(dllFile);
}
catch
{
LogFile.WriteLine($"Error loading {dllFile}, deleting file");
File.Delete(dllFile);
throw;
}
}
Version = a.GetName().Version;

5
PluginLoader/LoaderTools.cs
View File

@@ -57,6 +57,11 @@ public static class LoaderTools
if (hwnd != IntPtr.Zero)
WinRT.Interop.InitializeWithWindow.Initialize(dialog, hwnd);
else
{
Console.WriteLine(message);
return DialogResult.Cancel;
}
var result = dialog.ShowAsync().AsTask().Result;

2
PluginLoader/PluginLoader.csproj
View File

@@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.3.0-prerelease.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.124" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="Steamworks.NET" Version="20.1.0" />
</ItemGroup>

6
PluginLoader/packages.lock.json
View File

@@ -23,9 +23,9 @@
},
"SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.202.124, )",
"resolved": "1.202.124",
"contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==",
"requested": "[1.203.22, )",
"resolved": "1.203.22",
"contentHash": "ruf6DT1sAh2DnpsJUsGG4ZSdPKrVr5ReKfHSDcYggeacge/nsdqpcij53HSNwnMxve6cfnTRG9SXE2iGSGEtEQ==",
"dependencies": {
"protobuf-net": "1.0.0"
}