Update Steamworks.NET and steam_api

This allows mods to make use of the newer features provided by
Steamworks.NET.

Author: roblabla

Celeste.Mod.mm/Celeste.Mod.mm.csproj

@@ -26,10 +26,6 @@
       <HintPath>..\lib-stripped\FNA.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Steamworks.NET">
-      <HintPath>..\lib-stripped\Steamworks.NET.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>
@@ -45,6 +41,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <ProjectReference Include="..\external\NLua\build\net6.0\NLua.net6.0.csproj" />
     <PackageReference Include="MAB.DotIgnore" Version="3.0.2" />
+    <PackageReference Include="Steamworks.NET" Version="2024.8.0" />
 
     <!-- Dependency not used by Everest itself, but kept for mod compatibility reasons -->
     <PackageReference Include="DotNetZip" Version="1.16.0" />

MiniInstaller/DepCalls.cs

@@ -105,9 +105,11 @@ public static void ConvertToNETCore(string asmFrom, string asmTo = null, HashSet
         foreach (string dep in deps) {
             string srcDepPath = Path.Combine(Path.GetDirectoryName(asmFrom), $"{dep}.dll");
             string dstDepPath = Path.Combine(Path.GetDirectoryName(asmTo), $"{dep}.dll");
-            if (File.Exists(srcDepPath) && !MiscUtil.IsSystemLibrary(srcDepPath))
+            // Don't convert steamworks - doing so would copy it from the vanilla backup location instead of taking our updated version.
+            bool isSteamworks = MiscUtil.IsSteamworksNet(srcDepPath);
+            if (File.Exists(srcDepPath) && !MiscUtil.IsSystemLibrary(srcDepPath) && !isSteamworks)
                 ConvertToNETCore(srcDepPath, dstDepPath, convertedAsms);
-            else if (File.Exists(dstDepPath) && !MiscUtil.IsSystemLibrary(srcDepPath))
+            else if (File.Exists(dstDepPath) && !MiscUtil.IsSystemLibrary(srcDepPath) && !isSteamworks)
                 ConvertToNETCore(dstDepPath, convertedAsms: convertedAsms);
         }
 

MiniInstaller/LibAndDepHandling.cs

@@ -26,33 +26,38 @@ public static void DeleteSystemLibs() {
     public static void SetupNativeLibs() {
         string[] libSrcs; // Later entries take priority
         string libDstDir;
+        string steamworksLibSrc;
         Dictionary<string, string> dllMap = new Dictionary<string, string>();
 
         switch (Globals.Platform) {
             case Globals.InstallPlatform.Windows: {
                 // Setup Windows native libs
                 if (Environment.Is64BitOperatingSystem) {
+                    steamworksLibSrc = Path.Combine(Globals.PathGame, "runtimes", "win-x64", "lib", "netstandard2.1", "Steamworks.NET.dll");
                     libSrcs = new string[] { Path.Combine(Globals.PathEverestLib, "lib64-win-x64"), Path.Combine(Globals.PathGame, "runtimes", "win-x64", "native") };
                     libDstDir = Path.Combine(Globals.PathGame, "lib64-win-x64");
                     dllMap.Add("fmodstudio64.dll", "fmodstudio.dll");
                 } else {
                     // We can take some native libraries from the vanilla install
+                    steamworksLibSrc = Path.Combine(Globals.PathGame, "runtimes", "win-x86", "lib", "netstandard2.1", "Steamworks.NET.dll");
                     libSrcs = new string[] {
-                        Path.Combine(Globals.PathOrig, "fmod.dll"), Path.Combine(Globals.PathOrig, "fmodstudio.dll"), Path.Combine(Globals.PathOrig, "steam_api.dll"),
+                        Path.Combine(Globals.PathOrig, "fmod.dll"), Path.Combine(Globals.PathOrig, "fmodstudio.dll"),
                         Path.Combine(Globals.PathEverestLib, "lib64-win-x86"), Path.Combine(Globals.PathGame, "runtimes", "win-x86", "native")
                     };
                     libDstDir = Path.Combine(Globals.PathGame, "lib64-win-x86");
                 }
             } break;
             case Globals.InstallPlatform.Linux: {
                 // Setup Linux native libs
+                steamworksLibSrc = Path.Combine(Globals.PathGame, "runtimes", "linux-x86", "lib", "netstandard2.1", "Steamworks.NET.dll");
                 libSrcs = new string[] { Path.Combine(Globals.PathOrig, "lib64"), Path.Combine(Globals.PathEverestLib, "lib64-linux"), Path.Combine(Globals.PathGame, "runtimes", "linux-x64", "native") };
                 libDstDir = Path.Combine(Globals.PathGame, "lib64-linux");
                 MiscUtil.ParseMonoNativeLibConfig(Path.Combine(Globals.PathOrig, "Celeste.exe.config"), "linux", dllMap, "lib{0}.so");
                 MiscUtil.ParseMonoNativeLibConfig(Path.Combine(Globals.PathOrig, "FNA.dll.config"), "linux", dllMap, "lib{0}.so");
             } break;
             case Globals.InstallPlatform.MacOS:{
                 // Setup MacOS native libs
+                steamworksLibSrc = Path.Combine(Globals.PathGame, "runtimes", "osx-x64", "lib", "netstandard2.1", "Steamworks.NET.dll");
                 libSrcs = new string[] { Path.Combine(Globals.PathOrig, "osx"), Path.Combine(Globals.PathEverestLib, "lib64-osx"), Path.Combine(Globals.PathGame, "runtimes", "osx", "native") };
                 libDstDir = Path.Combine(Globals.PathGame, "lib64-osx");
                 MiscUtil.ParseMonoNativeLibConfig(Path.Combine(Globals.PathOrig, "Celeste.exe.config"), "osx", dllMap, "lib{0}.dylib");
@@ -99,6 +104,11 @@ void CopyNativeLib(string src, string dst) {
             }
         }
 
+        // Copy our Steamworks.NET.dll
+        string steamworksLibDst = Path.Combine(Globals.PathGame, "Steamworks.NET.dll");
+        File.Delete(steamworksLibDst);
+        File.Copy(steamworksLibSrc, steamworksLibDst);
+
         // Delete old libraries
         foreach (string libFile in Globals.WindowsNativeLibFileNames)
             File.Delete(Path.Combine(Globals.PathGame, libFile));

MiniInstaller/MiscUtil.cs

@@ -64,7 +64,10 @@ public static bool IsSystemLibrary(string file) {
             "Mono.Security.dll"
         }.Any(name => Path.GetFileName(file).Equals(name, StringComparison.OrdinalIgnoreCase));
     }
-    
+
+    public static bool IsSteamworksNet(string file) {
+        return Path.GetFileName(file).Equals("Steamworks.NET.dll", StringComparison.OrdinalIgnoreCase);
+    }
     // This is not "pure" but I guess it also somewhat fits here
     public static void MoveExecutable(string srcPath, string dstPath) {
         File.Delete(dstPath);