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

update to se 1.202.120

Browse Source
This commit is contained in:
zznty
2023-06-13 22:47:03 +07:00
parent 3c6b79dc26
commit 856e7dce59
5 changed files with 20 additions and 18 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="HarmonyX" Version="2.10.2-prerelease.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
<PackageReference Include="NLog" Version="5.1.3" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.119" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120" 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/packages.lock.json
View File

@@ -28,9 +28,9 @@
},
"SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.202.119, )",
"resolved": "1.202.119",
"contentHash": "aH0zzzC4Mu4yx/Q0IFBUyHxqREtzIcT9ovwutD+XUnFiJEaMuu0F2a6s/9b8x1Fht7SuPzPjl+ekECtaS1oD+Q==",
"requested": "[1.202.120, )",
"resolved": "1.202.120",
"contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
"dependencies": {
"protobuf-net": "1.0.0"
}

2
PluginLoader/PluginLoader.csproj
View File

@@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.119" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="Steamworks.NET" Version="20.1.0" />
</ItemGroup>

22
PluginLoader/SteamAPI.cs
View File

@@ -4,6 +4,7 @@ using HarmonyLib;
using Sandbox.Engine.Networking;
using Steamworks;
using VRage.Game;
using VRage.GameServices;
using VRage.Utils;
using Parallel = ParallelTasks.Parallel;
@@ -11,7 +12,7 @@ namespace PluginLoader;
public static class SteamAPI
{
private static MethodInfo DownloadModsBlocking;
private static MethodInfo? _downloadModsBlocking;
public static bool IsSubscribed(ulong id)
{
@@ -26,12 +27,13 @@ public static class SteamAPI
public static void Update(IEnumerable<ulong> ids)
{
if (!ids.Any())
var enumerable = ids as ulong[] ?? ids.ToArray();
if (!enumerable.Any())
return;
var modItems =
new List<MyObjectBuilder_Checkpoint.ModItem>(
ids.Select(x => new MyObjectBuilder_Checkpoint.ModItem(x, "Steam")));
enumerable.Select(x => new MyObjectBuilder_Checkpoint.ModItem(x, "Steam")));
LogFile.WriteLine($"Updating {modItems.Count} workshop items");
// Source: MyWorkshop.DownloadWorldModsBlocking
@@ -43,10 +45,10 @@ public static class SteamAPI
Thread.Sleep(10);
}
if (!result.Success)
if (result.Result is not MyGameServiceCallResult.OK)
{
var exceptions = task.Exceptions;
if (exceptions != null && exceptions.Length > 0)
if (exceptions is { Length: > 0 })
{
var sb = new StringBuilder();
sb.AppendLine("An error occurred while updating workshop items:");
@@ -69,13 +71,13 @@ public static class SteamAPI
var list = new List<WorkshopId>(mods.Select(x => new WorkshopId(x.PublishedFileId, x.PublishedServiceName)));
if (DownloadModsBlocking == null)
DownloadModsBlocking = AccessTools.Method(typeof(MyWorkshop), "DownloadModsBlocking");
if (_downloadModsBlocking == null)
_downloadModsBlocking = AccessTools.Method(typeof(MyWorkshop), "DownloadModsBlocking");
var resultData = (MyWorkshop.ResultData)DownloadModsBlocking.Invoke(mods, new object[]
var resultData = (MyWorkshop.ResultData)_downloadModsBlocking.Invoke(mods, new object[]
{
mods, new MyWorkshop.ResultData { Success = true }, list, new MyWorkshop.CancelToken()
});
mods, new MyWorkshop.ResultData { Result = MyGameServiceCallResult.OK }, list, new MyWorkshop.CancelToken()
})!;
MyLog.Default.DecreaseIndent();
return resultData;

6
PluginLoader/packages.lock.json
View File

@@ -22,9 +22,9 @@
},
"SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.202.119, )",
"resolved": "1.202.119",
"contentHash": "aH0zzzC4Mu4yx/Q0IFBUyHxqREtzIcT9ovwutD+XUnFiJEaMuu0F2a6s/9b8x1Fht7SuPzPjl+ekECtaS1oD+Q==",
"requested": "[1.202.120, )",
"resolved": "1.202.120",
"contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
"dependencies": {
"protobuf-net": "1.0.0"
}