fix(core): Adapt latest steam api

Author: samyycX

managed/src/TestPlugin/TestPlugin.cs

@@ -327,7 +327,7 @@ public void TestCommand( ICommandContext context )
     public void TestCommand1( ICommandContext context )
     {
         var ret = SteamGameServerUGC.DownloadItem(new PublishedFileId_t(3596198331), true);
-        Console.WriteLine(ret);
+        Console.WriteLine(Core.Engine.ServerIP);
     }
 
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]

src/core/bridge/metamod.cpp

@@ -45,7 +45,6 @@ bool SwiftlyMMBridge::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxle
 
     if (late)
     {
-        g_SteamAPI.Init();
         static auto playermanager = g_ifaceService.FetchInterface<IPlayerManager>(PLAYERMANAGER_INTERFACE_VERSION);
         playermanager->SteamAPIServerActivated();
     }

src/core/entrypoint.cpp

@@ -53,7 +53,6 @@
 
 SwiftlyCore g_SwiftlyCore;
 InterfacesManager g_ifaceService;
-CSteamGameServerAPIContext g_SteamAPI;
 
 IVFunctionHook* g_pGameServerSteamAPIActivated = nullptr;
 IVFunctionHook* g_pGameServerSteamAPIDeactivated = nullptr;
@@ -263,10 +262,9 @@ bool SwiftlyCore::Unload()
 
 void GameServerSteamAPIActivatedHook(void* _this)
 {
-    if (!CommandLine()->HasParm("-dedicated") || g_SteamAPI.SteamUGC())
+    if (!CommandLine()->HasParm("-dedicated"))
         return;
 
-    g_SteamAPI.Init();
     static auto playermanager = g_ifaceService.FetchInterface<IPlayerManager>(PLAYERMANAGER_INTERFACE_VERSION);
     playermanager->SteamAPIServerActivated();
 

src/core/entrypoint.h

@@ -53,6 +53,5 @@ class SwiftlyCore
 };
 
 extern SwiftlyCore g_SwiftlyCore;
-extern CSteamGameServerAPIContext g_SteamAPI;
 
 #endif

src/engine/fixes/serverlist.cpp

@@ -21,6 +21,7 @@
 #include <core/bridge/metamod.h>
 
 #include <public/tier0/platform.h>
+#include <public/steam/isteamclient.h>
 #include <public/steam/isteamgameserver.h>
 
 #include <s2binlib/s2binlib.h>
@@ -82,7 +83,8 @@ void GameFrame(void* _this, bool simulate, bool first, bool last)
             auto controller = player->GetController();
             if (!controller) continue;
 
-            g_SteamAPI.SteamGameServer()->BUpdateUserData(*steamid, (const char*)(schema->GetPropPtr(controller, 4141622183986322747)), gameclients->GetPlayerScore(i)); // CBasePlayerController::PlayerName
+            if (SteamGameServer())
+                SteamGameServer()->BUpdateUserData(*steamid, (const char*)(schema->GetPropPtr(controller, 4141622183986322747)), gameclients->GetPlayerScore(i)); // CBasePlayerController::PlayerName
         }
     }
 }

src/scripting/engine/enginehelpers.cpp

@@ -42,9 +42,9 @@ struct CBaseGameSystemFactory_t : public IGameSystemFactory {
 int Bridge_EngineHelpers_GetServerIP(char* out)
 {
     static std::string s;
-    if (!g_SteamAPI.SteamGameServer()) s = "0.0.0.0";
+    if (!SteamGameServer()) s = "0.0.0.0";
     else {
-        auto ip_addr = g_SteamAPI.SteamGameServer()->GetPublicIP();
+        auto ip_addr = SteamGameServer()->GetPublicIP();
         s = fmt::format("{}.{}.{}.{}", (ip_addr.m_unIPv4 >> 24) & 0xFF, (ip_addr.m_unIPv4 >> 16) & 0xFF, (ip_addr.m_unIPv4 >> 8) & 0xFF, ip_addr.m_unIPv4 & 0xFF);
     }