Use new SourceSDK FactoryLoader and ModuleLoader

Remove usage of Helpers::GetBinaryFileName

Author: danielga

source/hooks.cpp

@@ -95,8 +95,8 @@ namespace Hooks
 				SymbolFinder symfinder;
 
 				ProcessMessages_original =
-					reinterpret_cast<ProcessMessages_t>( symfinder.ResolveOnBinary(
-						global::engine_lib.c_str( ),
+					reinterpret_cast<ProcessMessages_t>( symfinder.Resolve(
+						global::engine_loader.GetModuleLoader( ).GetModule( ),
 						ProcessMessages_sig,
 						ProcessMessages_siglen
 					) );

source/main.cpp

@@ -24,7 +24,6 @@
 #endif
 
 #include <scanning/symbolfinder.hpp>
-#include <GarrysMod/Interfaces.hpp>
 #include <interface.h>
 #include <eiface.h>
 #include <cdll_int.h>
@@ -62,32 +61,13 @@ namespace global
 
 	static bool loaded = false;
 
-	const std::string engine_lib = Helpers::GetBinaryFileName(
-		"engine",
-		false,
-		IS_SERVERSIDE,
-		"bin/"
-	);
-
-	const std::string client_lib = Helpers::GetBinaryFileName(
-		"client",
-		false,
-		IS_SERVERSIDE,
-		"garrysmod/bin/"
-	);
-
-	const std::string server_lib = Helpers::GetBinaryFileName(
-		"server",
-		false,
-		IS_SERVERSIDE,
-		"garrysmod/bin/"
-	);
-
 	const char *tostring_format = "%s: %p";
 
 	GarrysMod::Lua::ILuaBase *lua = nullptr;
 
-	SourceSDK::FactoryLoader engine_loader( engine_lib, false, false );
+	const SourceSDK::FactoryLoader engine_loader( "engine" );
+	const SourceSDK::ModuleLoader client_loader( "client" );
+	const SourceSDK::ModuleLoader server_loader( "server" );
 
 	IVEngineServer *engine_server = nullptr;
 	IVEngineClient *engine_client = nullptr;
@@ -178,8 +158,10 @@ GMOD_MODULE_OPEN( )
 	{
 		SymbolFinder symfinder;
 
-		pserver = reinterpret_cast<IServer **>( symfinder.ResolveOnBinary(
-			global::engine_lib.c_str( ), global::IServer_sig, global::IServer_siglen
+		pserver = reinterpret_cast<IServer **>( symfinder.Resolve(
+			global::engine_loader.GetModuleLoader( ).GetModule( ),
+			global::IServer_sig,
+			global::IServer_siglen
 		) );
 	}
 

source/main.hpp

@@ -4,7 +4,7 @@
 #include <lua.hpp>
 #include <stdint.h>
 #include <string>
-#include <GarrysMod/Interfaces.hpp>
+#include <GarrysMod/FactoryLoader.hpp>
 #include <Platform.hpp>
 
 class IVEngineServer;
@@ -21,17 +21,13 @@ namespace GarrysMod
 
 namespace global
 {
-	extern const std::string engine_lib;
-
-	extern const std::string client_lib;
-
-	extern const std::string server_lib;
-
 	extern const char *tostring_format;
 
 	extern GarrysMod::Lua::ILuaBase *lua;
 
-	extern SourceSDK::FactoryLoader engine_loader;
+	extern const SourceSDK::FactoryLoader engine_loader;
+	extern const SourceSDK::ModuleLoader client_loader;
+	extern const SourceSDK::ModuleLoader server_loader;
 
 	extern IVEngineServer *engine_server;
 

source/netmessage.cpp

@@ -434,14 +434,14 @@ namespace NetMessage
 		{
 			SymbolFinder symfinder;
 
-			CBaseClient_ConnectionStart = static_cast<const uint8_t *>( symfinder.ResolveOnBinary(
-				global::engine_lib.c_str( ),
+			CBaseClient_ConnectionStart = static_cast<const uint8_t *>( symfinder.Resolve(
+				global::engine_loader.GetModuleLoader( ).GetModule( ),
 				CBaseClient_ConnectionStart_sig,
 				CBaseClient_ConnectionStart_siglen
 			) );
 
-			CBaseClientState_ConnectionStart = static_cast<const uint8_t *>( symfinder.ResolveOnBinary(
-				global::engine_lib.c_str( ),
+			CBaseClientState_ConnectionStart = static_cast<const uint8_t *>( symfinder.Resolve(
+				global::engine_loader.GetModuleLoader( ).GetModule( ),
 				CBaseClientState_ConnectionStart_sig,
 				CBaseClientState_ConnectionStart_siglen,
 				// starting point for sigscan

source/server/datapack.cpp

@@ -25,8 +25,8 @@ namespace DataPack
 				SymbolFinder symfinder;
 
 				SendFileToClient_original =
-					reinterpret_cast<SendFileToClient_t>( symfinder.ResolveOnBinary(
-						global::server_lib.c_str( ),
+					reinterpret_cast<SendFileToClient_t>( symfinder.Resolve(
+						global::server_loader.GetModule( ),
 						SendFileToClient_sig,
 						SendFileToClient_siglen
 					) );

source/server/gametags.cpp

@@ -33,17 +33,17 @@ namespace GameTags
 				SymbolFinder symfinder;
 
 				RecalculateTags_original =
-					reinterpret_cast<RecalculateTags_t>( symfinder.ResolveOnBinary(
-						global::engine_lib.c_str( ),
+					reinterpret_cast<RecalculateTags_t>( symfinder.Resolve(
+						global::engine_loader.GetModuleLoader( ).GetModule( ),
 						RecalculateTags_sig,
 						RecalculateTags_siglen
 					) );
 
 #if defined SYSTEM_WINDOWS
 
 				CSteamGameServerAPIContext **gameserver_context_pointer =
-					reinterpret_cast<CSteamGameServerAPIContext **>( symfinder.ResolveOnBinary(
-						global::server_lib.c_str( ),
+					reinterpret_cast<CSteamGameServerAPIContext **>( symfinder.Resolve(
+						global::server_loader.GetModule( ),
 						SteamGameServerAPIContext_sig,
 						SteamGameServerAPIContext_siglen
 					) );