eos support is back
Some checks failed
Build / Compute Version (push) Successful in 6s
Build / Build Nuget package (CringeBootstrap.Abstractions) (push) Successful in 4m8s
Build / Build Nuget package (NuGet) (push) Successful in 4m13s
Build / Build Nuget package (SharedCringe) (push) Successful in 4m12s
Build / Build Nuget package (CringePlugins) (push) Successful in 4m28s
Build / Build Launcher (push) Failing after 4m34s
Some checks failed
Build / Compute Version (push) Successful in 6s
Build / Build Nuget package (CringeBootstrap.Abstractions) (push) Successful in 4m8s
Build / Build Nuget package (NuGet) (push) Successful in 4m13s
Build / Build Nuget package (SharedCringe) (push) Successful in 4m12s
Build / Build Nuget package (CringePlugins) (push) Successful in 4m28s
Build / Build Launcher (push) Failing after 4m34s
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Basic.Reference.Assemblies.Net90" Version="1.8.0" />
|
||||
<PackageReference Include="dnlib" Version="4.4.0" />
|
||||
<PackageReference Include="EOSSDK" Version="1.0.1" />
|
||||
<PackageReference Include="Krafs.Publicizer" Version="2.3.0">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
|
@@ -1,5 +1,4 @@
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Reflection;
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Runtime.Loader;
|
||||
@@ -10,12 +9,14 @@ using CringePlugins.Loader;
|
||||
using CringePlugins.Render;
|
||||
using CringePlugins.Services;
|
||||
using CringePlugins.Splash;
|
||||
using Epic.OnlineServices.VRage;
|
||||
using HarmonyLib;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using NLog;
|
||||
using Polly;
|
||||
using Polly.Extensions.Http;
|
||||
using Sandbox;
|
||||
using Sandbox.Engine.Multiplayer;
|
||||
using Sandbox.Engine.Networking;
|
||||
using Sandbox.Engine.Platform.VideoMode;
|
||||
using Sandbox.Engine.Utils;
|
||||
@@ -81,6 +82,7 @@ public class Launcher : ICorePlugin
|
||||
// hook up steam as we ship it inside base context as an override
|
||||
if (AssemblyLoadContext.GetLoadContext(typeof(Launcher).Assembly) is ICoreLoadContext coreLoadContext)
|
||||
NativeLibrary.SetDllImportResolver(typeof(Steamworks.Constants).Assembly, (name, _, _) => coreLoadContext.ResolveUnmanagedDll(name));
|
||||
NativeLibrary.SetDllImportResolver(typeof(EosService).Assembly, (name, _, _) => NativeLibrary.Load(Path.Join(AppContext.BaseDirectory, name)));
|
||||
|
||||
_harmony.PatchAll(typeof(Launcher).Assembly);
|
||||
|
||||
@@ -275,13 +277,12 @@ public class Launcher : ICorePlugin
|
||||
|
||||
var aggregator = new MyServerDiscoveryAggregator();
|
||||
MySteamGameService.InitNetworking(false, steamGameService, MyPerGameSettings.GameName, aggregator);
|
||||
// MyEOSService.InitNetworking(false, false, MyPerGameSettings.GameName, steamGameService, "xyza7891964JhtVD93nm3nZp8t1MbnhC",
|
||||
// "AKGM16qoFtct0IIIA8RCqEIYG4d4gXPPDNpzGuvlhLA", "24b1cd652a18461fa9b3d533ac8d6b5b",
|
||||
// "1958fe26c66d4151a327ec162e4d49c8", "07c169b3b641401496d352cad1c905d6",
|
||||
// "https://retail.epicgames.com/", MyEOSService.CreatePlatform(),
|
||||
// MyPlatformGameSettings.VERBOSE_NETWORK_LOGGING, ArraySegment<string>.Empty, aggregator,
|
||||
// MyMultiplayer.Channels);
|
||||
// EOS networking is disabled due to memory leak, waiting for update with EOSSDK >= 1.15.4
|
||||
EosService.InitNetworking(false, false, MyPerGameSettings.GameName, steamGameService, "xyza7891964JhtVD93nm3nZp8t1MbnhC",
|
||||
"AKGM16qoFtct0IIIA8RCqEIYG4d4gXPPDNpzGuvlhLA", "24b1cd652a18461fa9b3d533ac8d6b5b",
|
||||
"1958fe26c66d4151a327ec162e4d49c8", "07c169b3b641401496d352cad1c905d6",
|
||||
"https://retail.epicgames.com/", EosService.CreatePlatform(),
|
||||
MyPlatformGameSettings.VERBOSE_NETWORK_LOGGING, ArraySegment<string>.Empty, aggregator,
|
||||
MyMultiplayer.Channels);
|
||||
|
||||
MyServiceManager.Instance.AddService<IMyServerDiscovery>(aggregator);
|
||||
|
||||
|
@@ -17,6 +17,15 @@
|
||||
"resolved": "4.4.0",
|
||||
"contentHash": "cKHI720q+zfEEvzklWVGt6B0TH3AibAyJbpUJl4U6KvTP13tycfnqJpkGHRZ/oQ45BTIoIxIwltHIJVDN+iCqQ=="
|
||||
},
|
||||
"EOSSDK": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.0.1, )",
|
||||
"resolved": "1.0.1",
|
||||
"contentHash": "KIV+oWbAjUgIm22WmMQEQEFanWQ992F9VASVkP9JDpLHb41rN9Asco3eJM70X1V8j3PZO237KrZur0yKYkO/rg==",
|
||||
"dependencies": {
|
||||
"CringePlugins": "0.1.73"
|
||||
}
|
||||
},
|
||||
"Krafs.Publicizer": {
|
||||
"type": "Direct",
|
||||
"requested": "[2.3.0, )",
|
||||
@@ -472,6 +481,15 @@
|
||||
}
|
||||
},
|
||||
"net9.0-windows10.0.19041/win-x64": {
|
||||
"EOSSDK": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.0.1, )",
|
||||
"resolved": "1.0.1",
|
||||
"contentHash": "KIV+oWbAjUgIm22WmMQEQEFanWQ992F9VASVkP9JDpLHb41rN9Asco3eJM70X1V8j3PZO237KrZur0yKYkO/rg==",
|
||||
"dependencies": {
|
||||
"CringePlugins": "0.1.73"
|
||||
}
|
||||
},
|
||||
"System.Diagnostics.PerformanceCounter": {
|
||||
"type": "Direct",
|
||||
"requested": "[9.0.4, )",
|
||||
|
Reference in New Issue
Block a user