fix

.gitmodules

@@ -29,3 +29,6 @@
 [submodule "deps/SQLiteCpp"]
 	path = deps/SQLiteCpp
 	url = https://github.com/SRombauts/SQLiteCpp
+[submodule "deps/plutonium-sdk"]
+	path = deps/plutonium-sdk
+	url = https://github.com/plutoniummod/plutonium-sdk.git

README.md

@@ -3,6 +3,9 @@ A plugin that has code that hopefully compiles and the game will load it to do t
 
 Requires Git (https://git-scm.com/), Premake5 (https://premake.github.io/), and MSVC 2022 (https://visualstudio.microsoft.com/vs/features/cplusplus/) to build.
 
+# Installation
+Move the `t4sp-server-plugin.dll` to `%LOCALAPPDATA%\Plutonium\plugins\`, the plugin will be loaded when you start up a dedicated server for Plutonium T4SP.
+
 # Features
 
 Detours and reimplements the entire GSC VM + compiler.
@@ -17,7 +20,7 @@ However, all reads and writes will take place strictly and only in the `scriptda
 All files will be closed upon GSC restart (map_restart or fast_restart or missionfailed, etc), only a maximum of 10 files may be opened at once.
 
 * `<bool> FS_TestFile(<filename string>)` Returns `true` if the file exists, `false` otherwise.
-* `<bool> FS_Remove(<filename string>)` Deletes the file, return `true` if successful, `false` otherwise.
+* `<bool> FS_Remove(<filename string>, <(optional) use_global bool>)` Deletes the file, return `true` if successful, `false` otherwise. `use_global` will use non mod specific folder.
   ```gsc
   // test to see if "scriptdata/test.txt" file exists
   if (FS_TestFile("test.txt")) // not a typo, all file io will take place inside the "scriptdata" folder
@@ -39,7 +42,7 @@ All files will be closed upon GSC restart (map_restart or fast_restart or missio
   FS_FCloseAll(); // close them all
   ```
 
-* `<int> FS_FOpen(<filename string>, <mode string>)` Tries to open the file, mode must be one of `read`, `write` (clears the file), `append` (appends to the file), returns the filehandle. Will return `0` if failed to open.
+* `<int> FS_FOpen(<filename string>, <mode string>, <(optional) use_global bool>)` Tries to open the file, mode must be one of `read`, `write` (clears the file), `append` (appends to the file), returns the filehandle. Will return `0` if failed to open. `use_global` will use non mod specific folder (only applies to `write` mode).
 * `FS_FClose(<filehandle int>)` Closes the file pointed by the filehandle given, which was returned from `FS_FOpen`.
   ```gsc
   // opens "scriptdata/test.txt", all io will take place inside the "scriptdata" folder
@@ -91,18 +94,21 @@ All files will be closed upon GSC restart (map_restart or fast_restart or missio
 
 * `<array of strings> FS_ListFiles(<folder string>)` Returns a list of files inside of the folder given.
   ```gsc
-  files = FS_ListFiles("testfolder/");
+  folder = "testfolder/";
+  files = FS_ListFiles(folder);
 
   for (i = 0; i < files.size; i++)
   {
-    file = files[i]; // will be "testfolder/<filename>"
+    filename = files[i];
 
     // do something with the filename
+    filepath = folder + filename;
   }
   ```
-
-# Installation
-Move the `t4sp-server-plugin.dll` to `%LOCALAPPDATA%\Plutonium\storage\t4\plugins\`, the plugin will be loaded when you start up a dedicated server for Plutonium T4SP.
+  
+* `<int> FS_Length(<filehandle int>)` Returns the length in bytes of the open'd file.
+* `<int> FS_GetSeek(<filehandle int>)` Returns the seek of the open'd file (only for reading).
+* `<int> FS_Seek(<filehandle int>, <seek int>)` Sets the seek of the open'd file (only for reading).
 
 # Credits
 - momo5502 (https://github.com/momo5502)

deps/plutonium-sdk

@@ -0,0 +1 @@
+Subproject commit 17e9a0a4d5e1133b50f879e3db07e97d1bf92e10

deps/premake/plutonium-sdk.lua

@@ -0,0 +1,18 @@
+plutonium_sdk = {
+    source = path.join(dependencies.basePath, "plutonium-sdk"),
+}
+
+function plutonium_sdk.import()
+    plutonium_sdk.includes()
+end
+
+function plutonium_sdk.includes()
+    includedirs {
+        plutonium_sdk.source,
+    }
+end
+
+function plutonium_sdk.project()
+end
+
+table.insert(dependencies, plutonium_sdk)

premake5.lua

@@ -108,13 +108,13 @@ workspace "t4sp-server-plugin"
 		else
 			filter "configurations:Release"
 				postbuildcommands {
-					"if \"%COMPUTERNAME%\" == \"NEW-BUILT\" ( copy /y \"$(TargetPath)\" \"$(CODWAW_PATH)\\t4\\plugins\\\" )"
+					"if \"%COMPUTERNAME%\" == \"\" ( copy /y \"$(TargetPath)\" \"$(LOCALAPPDATA)\\Plutonium\\plugins\\\" )"
 				}
 			filter {}
 			
 			filter "configurations:Debug"
 				postbuildcommands {
-					"if \"%COMPUTERNAME%\" == \"NEW-BUILT\" ( copy /y \"$(TargetPath)\" \"$(CODWAW_PATH)\\t4staging\\plugins\\\" )"
+					"if \"%COMPUTERNAME%\" == \"\" ( copy /y \"$(TargetPath)\" \"$(LOCALAPPDATA)\\Plutonium-staging\\plugins\\\" )"
 				}
 			filter {}
 		end

src/codsrc/clientscript/cscr_compiler.cpp

@@ -2011,14 +2011,6 @@ LABEL_17:
 
 		}
 
-		// our addition
-		auto f = gsc::function::get(pName, type);
-		if (f != nullptr)
-		{
-			return f;
-		}
-		//
-
 		// pluto
 		if (game::plutonium::scr_get_function_hook != nullptr)
 		{
@@ -2154,14 +2146,6 @@ LABEL_17:
 			}
 		}
 
-		// our addition
-		auto f = gsc::method::get(pName, type);
-		if (f != nullptr)
-		{
-			return f;
-		}
-		//
-
 		// pluto
 		if (game::plutonium::scr_get_method_hook != nullptr)
 		{

src/codsrc/clientscript/cscr_main.cpp

@@ -304,7 +304,6 @@ namespace codsrc
 		{
 			game::plutonium::script_preprocess(sourceBuffer, inst, &parseData); // the pluto hook will call ScriptParse, so we dont have to
 		}
-
 		//
 		else
 		{

src/codsrc/clientscript/cscr_parser.cpp

@@ -723,19 +723,20 @@ namespace codsrc
 			{
 				if (game::Scr_IsInOpcodeMemory(scriptInstance, codepos - 1))
 				{
-					// pluto
 					const char* s;
+
+					// pluto
 					if (game::plutonium::at_codepose_va != nullptr)
 					{
 						s = game::plutonium::at_codepose_va(scriptInstance, codepos - game::gScrVarPub[scriptInstance].programBuffer);
 					}
+					//
 					else
 					{
 						s = game::va("@ %d\n", codepos - game::gScrVarPub[scriptInstance].programBuffer);
 					}
 
 					game::Com_PrintMessage(channel, s, 0);
-					//
 					return;
 				}
 			}

src/codsrc/clientscript/cscr_vm.cpp

@@ -4702,10 +4702,6 @@ namespace codsrc
 	// Decomp Status: Tested, Completed
 	void Scr_InitSystem(game::scriptInstance_t inst)
 	{
-		// our additions
-		scheduler::exec_pre_scr_init_funcs(inst);
-		//
-
 		assert(!game::gScrVarPub[inst].timeArrayId);
 
 		//assert(!game::gScrVarPub[inst].ext_threadcount);
@@ -4731,10 +4727,6 @@ namespace codsrc
 		assert(!game::gScrVarPub[inst].freeEntList);
 
 		game::g_script_error_level[inst] = -1;
-
-		// our additions
-		scheduler::exec_post_scr_init_funcs(inst);
-		//
 	}
 
 	//Restored function

src/component/fileio.cpp

@@ -34,15 +34,16 @@ namespace fileio
 
 		bool validate_scr_path(const std::string& fpath)
 		{
-			if (fpath.empty())
-			{
-				return true;
-			}
+			auto toks = utils::string::split(fpath, '/');
 
-			constexpr static std::array bad_strings { R"(..)", R"(../)", R"(..\)" };
-			for (auto i = 0u; i < bad_strings.size(); i++)
+			for (const auto& tok : toks)
 			{
-				if (fpath.find(bad_strings[i]) != std::string::npos)
+				if (tok == "." || tok == "..")
+				{
+					return false;
+				}
+
+				if (tok.find(":") != std::string::npos)
 				{
 					return false;
 				}
@@ -51,17 +52,21 @@ namespace fileio
 			return true;
 		}
 
-		std::string build_base_path(const std::string& path)
+		std::string build_base_path(const std::string& path_)
 		{
+			auto path = path_;
+			std::replace(path.begin(), path.end(), '\\', '/');
+
 			if (!validate_scr_path(path))
 			{
-				game::Scr_Error(utils::string::va("Invalid path: %s", path.c_str()), game::SCRIPTINSTANCE_SERVER, false);
+				game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, utils::string::va("Invalid path: %s", path_.c_str()));
 			}
 
+			// its sandboxed, but what about symlinks?
 			return path.starts_with("scriptdata/") ? path : "scriptdata/" + path;
 		}
 
-		std::filesystem::path build_full_path(const std::string& path)
+		std::filesystem::path build_full_path(const std::string& path, bool use_global)
 		{
 			static game::dvar_s* fs_localAppData = nullptr;
 			static game::dvar_s* fs_gamedir = nullptr;
@@ -76,13 +81,13 @@ namespace fileio
 				fs_gamedir = game::Dvar_FindVar("fs_game");
 			}
 
-			return std::filesystem::path(fs_localAppData->current.string) / (*fs_gamedir->current.string ? fs_gamedir->current.string : "raw") / path;
+			return std::filesystem::path(fs_localAppData->current.string) / (!use_global && *fs_gamedir->current.string ? fs_gamedir->current.string : "raw") / path;
 		}
 
 		void free_scr_fh(scr_fh_t& scr_fh)
 		{
 #ifdef DEBUG
-			printf("free_scr_fh: closing %s\n", scr_fh.base_path.c_str());
+			plugin::get()->get_interface()->logging()->info(utils::string::va("free_scr_fh: closing %s\n", scr_fh.base_path.c_str()));
 #endif
 
 			scr_fh = {};
@@ -102,18 +107,25 @@ namespace fileio
 			}
 		}
 
-		void fwrite_to_file(bool append_newline)
+		int scr_get_fh()
 		{
 			auto fh = game::Scr_GetInt(game::SCRIPTINSTANCE_SERVER, 0) - 1;
 
 			if (fh < 0 || fh >= max_fhs)
 			{
-				game::Scr_Error("fs_fwrite: invalid filehandle", game::SCRIPTINSTANCE_SERVER, false);
+				game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "fs_fwrite: invalid filehandle");
 			}
 
+			return fh;
+		}
+
+		void fwrite_to_file(bool append_newline)
+		{
+			auto fh = scr_get_fh();
+
 			if (scr_fhs[fh].type != scr_fh_type_e::WRITE && scr_fhs[fh].type != scr_fh_type_e::APPEND)
 			{
-				game::Scr_Error("File not opened for writing", game::SCRIPTINSTANCE_SERVER, false);
+				game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "File not opened for writing");
 			}
 
 			std::string to_write = game::Scr_GetString(1, game::SCRIPTINSTANCE_SERVER);
@@ -134,13 +146,8 @@ namespace fileio
 
 		void add_file_io()
 		{
-			scheduler::on_pre_scr_init_system([]([[maybe_unused]] game::scriptInstance_t inst)
+			scheduler::on_scr_execute([]()
 				{
-					if (inst != game::SCRIPTINSTANCE_SERVER)
-					{
-						return;
-					}
-
 					close_all_scr_fh();
 				});
 
@@ -170,7 +177,7 @@ namespace fileio
 					{
 						if (scr_fd.type != scr_fh_type_e::UNUSED && scr_fd.base_path == fpath)
 						{
-							game::Scr_Error("File already opened", game::SCRIPTINSTANCE_SERVER, false);
+							game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "File already opened");
 						}
 					}
 
@@ -186,7 +193,7 @@ namespace fileio
 
 					if (i >= max_fhs)
 					{
-						game::Scr_Error("Too many files opened", game::SCRIPTINSTANCE_SERVER, false);
+						game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "Too many files opened");
 					}
 
 					// check mode
@@ -225,7 +232,7 @@ namespace fileio
 					}
 					else if (mode == "write"s || mode == "append"s)
 					{
-						auto full_path = build_full_path(fpath);
+						auto full_path = build_full_path(fpath, game::Scr_GetNumParam(game::SCRIPTINSTANCE_SERVER) >= 3 && game::Scr_GetType(game::SCRIPTINSTANCE_SERVER, 2) == game::VAR_INTEGER && game::Scr_GetInt(game::SCRIPTINSTANCE_SERVER, 2));
 
 						if (!utils::io::write_file(full_path.string(), "", (mode == "append"s)))
 						{
@@ -240,11 +247,11 @@ namespace fileio
 					}
 					else
 					{
-						game::Scr_Error(utils::string::va("Invalid mode: %s", mode), game::SCRIPTINSTANCE_SERVER, false);
+						game::Scr_ParamError(1, game::SCRIPTINSTANCE_SERVER, utils::string::va("Invalid mode: %s", mode));
 					}
 
 #ifdef DEBUG
-					printf("gscr_fs_fopen: opening %s, mode %s\n", fpath.c_str(), mode);
+					plugin::get()->get_interface()->logging()->info(utils::string::va("gscr_fs_fopen: opening %s, mode %s\n", fpath.c_str(), mode));
 #endif
 					game::Scr_AddInt(game::SCRIPTINSTANCE_SERVER, i + 1);
 				});
@@ -261,16 +268,11 @@ namespace fileio
 
 			gsc::function::add("fs_readline", []()
 				{
-					auto fh = game::Scr_GetInt(game::SCRIPTINSTANCE_SERVER, 0) - 1;
-
-					if (fh < 0 || fh >= max_fhs)
-					{
-						game::Scr_Error("Invalid filehandle", game::SCRIPTINSTANCE_SERVER, false);
-					}
+					auto fh = scr_get_fh();
 
 					if (scr_fhs[fh].type != scr_fh_type_e::READ)
 					{
-						game::Scr_Error("File not opened for reading", game::SCRIPTINSTANCE_SERVER, false);
+						game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "File not opened for reading");
 					}
 
 					// file is completed being read
@@ -319,16 +321,11 @@ namespace fileio
 
 			gsc::function::add("fs_read", []()
 				{
-					auto fh = game::Scr_GetInt(game::SCRIPTINSTANCE_SERVER, 0) - 1;
-
-					if (fh < 0 || fh >= max_fhs)
-					{
-						game::Scr_Error("Invalid filehandle", game::SCRIPTINSTANCE_SERVER, false);
-					}
+					auto fh = scr_get_fh();
 
 					if (scr_fhs[fh].type != scr_fh_type_e::READ)
 					{
-						game::Scr_Error("File not opened for reading", game::SCRIPTINSTANCE_SERVER, false);
+						game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "File not opened for reading");
 					}
 
 					// file is completed being read
@@ -345,7 +342,7 @@ namespace fileio
 
 						if (bytes_to_read <= 0)
 						{
-							game::Scr_Error("Trying to read <1 bytes", game::SCRIPTINSTANCE_SERVER, false);
+							game::Scr_ParamError(1, game::SCRIPTINSTANCE_SERVER, "Trying to read <1 bytes");
 						}
 					}
 
@@ -370,16 +367,11 @@ namespace fileio
 
 			gsc::function::add("fs_fclose", []()
 				{
-					auto fh = game::Scr_GetInt(game::SCRIPTINSTANCE_SERVER, 0) - 1;
-
-					if (fh < 0 || fh >= max_fhs)
-					{
-						game::Scr_Error("Invalid filehandle", game::SCRIPTINSTANCE_SERVER, false);
-					}
+					auto fh = scr_get_fh();
 
 					if (scr_fhs[fh].type == scr_fh_type_e::UNUSED)
 					{
-						game::Scr_Error("File not opened", game::SCRIPTINSTANCE_SERVER, false);
+						game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "File not opened");
 					}
 
 					free_scr_fh(scr_fhs[fh]);
@@ -387,10 +379,48 @@ namespace fileio
 					game::Scr_AddInt(game::SCRIPTINSTANCE_SERVER, 1);
 				});
 
+			gsc::function::add("fs_length", []()
+				{
+					auto fh = scr_get_fh();
+
+					if (scr_fhs[fh].type == scr_fh_type_e::UNUSED)
+					{
+						game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "File not opened");
+					}
+
+					game::Scr_AddInt(game::SCRIPTINSTANCE_SERVER, scr_fhs[fh].file_length);
+				});
+
+			gsc::function::add("fs_getseek", []()
+				{
+					auto fh = scr_get_fh();
+
+					// write seek would require completely redoing how we write files...
+					if (scr_fhs[fh].type != scr_fh_type_e::READ)
+					{
+						game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "File not opened for reading");
+					}
+
+					game::Scr_AddInt(game::SCRIPTINSTANCE_SERVER, scr_fhs[fh].seek);
+				});
+
+			gsc::function::add("fs_seek", []()
+				{
+					auto fh = scr_get_fh();
+
+					if (scr_fhs[fh].type != scr_fh_type_e::READ)
+					{
+						game::Scr_ParamError(0, game::SCRIPTINSTANCE_SERVER, "File not opened for reading");
+					}
+
+					scr_fhs[fh].seek = std::clamp(game::Scr_GetInt(game::SCRIPTINSTANCE_SERVER, 1), 0, scr_fhs[fh].file_length);
+					game::Scr_AddInt(game::SCRIPTINSTANCE_SERVER, 1);
+				});
+
 			gsc::function::add("fs_remove", []()
 				{
 					auto fpath = build_base_path(game::Scr_GetString(0, game::SCRIPTINSTANCE_SERVER));
-					auto full_path = build_full_path(fpath);
+					auto full_path = build_full_path(fpath, game::Scr_GetNumParam(game::SCRIPTINSTANCE_SERVER) >= 2 && game::Scr_GetType(game::SCRIPTINSTANCE_SERVER, 1) == game::VAR_INTEGER && game::Scr_GetInt(game::SCRIPTINSTANCE_SERVER, 1));
 
 					if (!utils::io::remove_file(full_path.string()))
 					{
@@ -404,14 +434,7 @@ namespace fileio
 
 			gsc::function::add("fs_listfiles", []()
 				{
-					std::string dir = game::Scr_GetString(0, game::SCRIPTINSTANCE_SERVER);
-
-					if (dir.ends_with("\\") || dir.ends_with("/"))
-					{
-						dir = dir.substr(0, dir.length() - 1);
-					}
-
-					auto fpath = build_base_path(dir);
+					auto fpath = build_base_path(game::Scr_GetString(0, game::SCRIPTINSTANCE_SERVER));
 
 					int numfiles;
 					auto* files = game::FS_ListFiles(fpath.c_str(), "", game::FS_LIST_ALL, &numfiles);
@@ -419,7 +442,7 @@ namespace fileio
 					game::Scr_MakeArray(game::SCRIPTINSTANCE_SERVER);
 					for (int i = 0; i < numfiles; i++)
 					{
-						game::Scr_AddString(game::SCRIPTINSTANCE_SERVER, (dir + "/" + files[i]).c_str());
+						game::Scr_AddString(game::SCRIPTINSTANCE_SERVER, files[i]);
 						game::Scr_AddArray(game::SCRIPTINSTANCE_SERVER);
 					}
 

src/component/gsc.cpp

@@ -1,125 +1,14 @@
 #include <stdinc.hpp>
-#include "loader/component_loader.hpp"
+
 #include "gsc.hpp"
 
-#include "scheduler.hpp"
-
-#include <json.hpp>
-#include <utils/io.hpp>
-#include <utils/hook.hpp>
-#include <utils/string.hpp>
-
 namespace gsc
 {
-	std::unordered_map<std::string, game::BuiltinFunction> functions;
-	std::unordered_map<std::string, game::BuiltinMethod> methods;
-
-	utils::hook::detour scr_getmethod_hook;
-	void* scr_getfunction_stub_ret_loc;
-
-	namespace
-	{
-		game::BuiltinFunction scr_getfunction_call(const char** pName, int* pType)
-		{
-			auto itr = functions.find(*pName);
-
-			if (itr == functions.end())
-			{
-				return nullptr;
-			}
-
-			*pType = 0;
-			return itr->second;
-		}
-
-		game::BuiltinFunction NAKED scr_getfunction_stub()
-		{
-			__asm
-			{
-				push eax;
-				pushad;
-
-				lea eax, [esp + 0x24 + 0x2C - 0x1C];
-				push eax;
-				push edx;
-				call scr_getfunction_call;
-				add esp, 8;
-				mov [esp + 0x20], eax;
-
-				popad;
-				pop eax;
-
-				test eax, eax;
-				jnz just_ret;
-
-				// go do original code
-				push scr_getfunction_stub_ret_loc;
-				ret;
-
-			just_ret:
-				add esp, 4;
-				push 0x682DC8;
-				ret;
-			}
-		}
-
-		game::BuiltinMethod scr_getmethod_call(const char** pName, int* pType)
-		{
-			auto itr = methods.find(*pName);
-
-			if (itr == methods.end())
-			{
-				// call og
-				const auto og_addr = scr_getmethod_hook.get_original();
-				game::BuiltinMethod answer;
-
-				__asm
-				{
-					mov edi, pType;
-					mov esi, pName;
-					call og_addr;
-					mov answer, eax;
-				}
-
-				return answer;
-			}
-
-			*pType = 0;
-			return itr->second;
-		}
-
-		game::BuiltinMethod NAKED scr_getmethod_stub()
-		{
-			__asm
-			{
-				push edi;
-				push esi;
-				call scr_getmethod_call;
-				add esp, 8;
-
-				ret;
-			}
-		}
-	}
-
 	namespace function
 	{
 		void add(const std::string& name, const game::BuiltinFunction function)
 		{
-			functions.insert_or_assign(name, function);
-		}
-
-		game::BuiltinFunction get(const char** name, int* type)
-		{
-			auto got = functions.find(*name);
-
-			if (got == functions.end())
-			{
-				return nullptr;
-			}
-
-			*type = 0;
-			return got->second;
+			plugin::get()->get_interface()->gsc()->register_function(name, function);
 		}
 	}
 
@@ -127,46 +16,8 @@ namespace gsc
 	{
 		void add(const std::string& name, const game::BuiltinMethod method)
 		{
-			methods.insert_or_assign(name, method);
-		}
-
-		game::BuiltinMethod get(const char** name, int* type)
-		{
-			auto got = methods.find(*name);
-
-			if (got == methods.end())
-			{
-				return nullptr;
-			}
-
-			*type = 0;
-			return got->second;
+			plugin::get()->get_interface()->gsc()->register_method(name, (plutonium::sdk::v1::interfaces::gsc::method_callback)method);
 		}
 	}
-
-	class component final : public component_interface
-	{
-	public:
-		void post_unpack() override
-		{
-			// for when we dont use the decomp
-			// custom gsc methods
-			if (game::plutonium::scr_get_method_stub != nullptr)
-			{
-				scr_getmethod_hook.create(game::plutonium::scr_get_method_stub.get(), scr_getmethod_stub);
-			}
-			
-			// custom gsc funcs
-			if (game::plutonium::scr_get_function_stub != nullptr)
-			{
-				scr_getfunction_stub_ret_loc = game::plutonium::scr_get_function_stub.get();
-				utils::hook::jump(SELECT(0x0, 0x682D99), scr_getfunction_stub);
-			}
-		}
-
-	private:
-	};
 }
 
-REGISTER_COMPONENT(gsc::component)
-

src/component/gsc.hpp

@@ -5,12 +5,10 @@ namespace gsc
 	namespace function
 	{
 		void add(const std::string& name, const game::BuiltinFunction function);
-		game::BuiltinFunction get(const char** name, int* type);
 	}
 
 	namespace method
 	{
 		void add(const std::string& name, const game::BuiltinMethod method);
-		game::BuiltinMethod get(const char** name, int* type);
 	}
 }

src/component/scheduler.cpp

@@ -1,266 +1,11 @@
 #include <stdinc.hpp>
-#include "loader/component_loader.hpp"
 
 #include "scheduler.hpp"
 
-#include <utils/concurrency.hpp>
-#include <utils/hook.hpp>
-
 namespace scheduler
 {
-	namespace
+	void on_scr_execute(void(*callback)())
 	{
-		struct task
-		{
-			std::function<bool()> handler{};
-			std::chrono::milliseconds interval{};
-			std::chrono::high_resolution_clock::time_point last_call{};
-		};
-
-		using task_list = std::vector<task>;
-
-		class task_pipeline
-		{
-		public:
-			void add(task&& task)
-			{
-				new_callbacks_.access([&task](task_list& tasks)
-				{
-					tasks.emplace_back(std::move(task));
-				});
-			}
-
-			void execute()
-			{
-				callbacks_.access([&](task_list& tasks)
-				{
-					this->merge_callbacks();
-
-					for (auto i = tasks.begin(); i != tasks.end();)
-					{
-						const auto now = std::chrono::high_resolution_clock::now();
-						const auto diff = now - i->last_call;
-
-						if (diff < i->interval)
-						{
-							++i;
-							continue;
-						}
-
-						i->last_call = now;
-
-						const auto res = i->handler();
-						if (res == cond_end)
-						{
-							i = tasks.erase(i);
-						}
-						else
-						{
-							++i;
-						}
-					}
-				});
-			}
-
-		private:
-			utils::concurrency::container<task_list> new_callbacks_;
-			utils::concurrency::container<task_list, std::recursive_mutex> callbacks_;
-
-			void merge_callbacks()
-			{
-				callbacks_.access([&](task_list& tasks)
-				{
-					new_callbacks_.access([&](task_list& new_tasks)
-					{
-						tasks.insert(tasks.end(), std::move_iterator<task_list::iterator>(new_tasks.begin()), std::move_iterator<task_list::iterator>(new_tasks.end()));
-						new_tasks = {};
-					});
-				});
-			}
-		};
-
-		std::thread thread;
-		task_pipeline pipelines[pipeline::count];
-
-		void execute(const pipeline type)
-		{
-			assert(type >= 0 && type < pipeline::count);
-			pipelines[type].execute();
-		}
-
-		void execute_server()
-		{
-			execute(pipeline::server);
-		}
-
-		void execute_main()
-		{
-			execute(pipeline::main);
-		}
-
-		utils::hook::detour com_init_hook;
-		utils::hook::detour gscr_postloadscripts_hook;
-
-		std::vector<std::function<void()>> post_init_funcs;
-		bool com_inited = false;
-
-		void on_post_init_hook()
-		{
-			if (com_inited)
-			{
-				return;
-			}
-			com_inited = true;
-			for (const auto& func : post_init_funcs)
-			{
-				func();
-			}
-
-			post_init_funcs.clear();
-		}
-
-		void com_init_stub()
-		{
-			com_init_hook.invoke<void>();
-			on_post_init_hook();
-		}
-
-		std::vector<std::function<void(game::scriptInstance_t)>> pre_scr_init_funcs;
-		std::vector<std::function<void(game::scriptInstance_t)>> post_scr_init_funcs;
-
-		utils::hook::detour pre_scr_init_system_hook;
-		utils::hook::detour post_scr_init_system_hook;
-
-		void* pre_scr_init_system_original;
-		void* post_scr_init_system_original;
-
-		NAKED void pre_scr_init_system_stub()
-		{
-			__asm
-			{
-				pushad;
-				push eax;
-				call exec_pre_scr_init_funcs;
-				add esp, 4;
-				popad;
-
-				push pre_scr_init_system_original;
-				ret;
-			}
-		}
-
-		NAKED void post_scr_init_system_stub()
-		{
-			__asm
-			{
-				pushad;
-				push eax;
-				call exec_post_scr_init_funcs;
-				add esp, 4;
-				popad;
-
-				push post_scr_init_system_original;
-				ret;
-			}
-		}
+		plugin::get()->get_interface()->callbacks()->on_scripts_execute(callback);
 	}
-
-	void schedule(const std::function<bool()>& callback, const pipeline type,
-		const std::chrono::milliseconds delay)
-	{
-		assert(type >= 0 && type < pipeline::count);
-
-		task task;
-		task.handler = callback;
-		task.interval = delay;
-		task.last_call = std::chrono::high_resolution_clock::now();
-
-		pipelines[type].add(std::move(task));
-	}
-
-	void loop(const std::function<void()>& callback, const pipeline type,
-		const std::chrono::milliseconds delay)
-	{
-		schedule([callback]()
-		{
-			callback();
-			return cond_continue;
-		}, type, delay);
-	}
-
-	void once(const std::function<void()>& callback, const pipeline type,
-		const std::chrono::milliseconds delay)
-	{
-		schedule([callback]()
-		{
-			callback();
-			return cond_end;
-		}, type, delay);
-	}
-
-	void on_init(const std::function<void()>& callback)
-	{
-		if (com_inited)
-		{
-			once(callback, pipeline::main);
-		}
-		else
-		{
-			post_init_funcs.push_back(callback);
-		}
-	}
-
-	void on_pre_scr_init_system(const std::function<void(game::scriptInstance_t)>& callback)
-	{
-		pre_scr_init_funcs.push_back(callback);
-	}
-
-	void on_post_scr_init_system(const std::function<void(game::scriptInstance_t)>& callback)
-	{
-		post_scr_init_funcs.push_back(callback);
-	}
-
-	void exec_pre_scr_init_funcs(game::scriptInstance_t inst)
-	{
-		for (const auto& func : pre_scr_init_funcs)
-		{
-			func(inst);
-		}
-	}
-
-	void exec_post_scr_init_funcs(game::scriptInstance_t inst)
-	{
-		for (const auto& func : post_scr_init_funcs)
-		{
-			func(inst);
-		}
-	}
-
-	class component final : public component_interface
-	{
-	public:
-		void post_unpack() override
-		{
-			thread = std::thread([]()
-			{
-				while (true)
-				{
-					execute(pipeline::async);
-					std::this_thread::sleep_for(10ms);
-				}
-			});
-
-			com_init_hook.create(SELECT(0x0, 0x59D710), com_init_stub);
-			utils::hook::call(SELECT(0x0, 0x503B5D), execute_server);
-			utils::hook::call(SELECT(0x0, 0x59DCFD), execute_main);
-
-			// for when we dont use decomp
-			pre_scr_init_system_hook.create(0x699865, pre_scr_init_system_stub);
-			pre_scr_init_system_original = pre_scr_init_system_hook.get_original();
-			post_scr_init_system_hook.create(0x699924, post_scr_init_system_stub);
-			post_scr_init_system_original = post_scr_init_system_hook.get_original();
-		}
-	};
 }
-
-REGISTER_COMPONENT(scheduler::component)

src/component/scheduler.hpp

@@ -2,28 +2,5 @@
 
 namespace scheduler
 {
-	enum pipeline
-	{
-		server,
-		async,
-		main,
-		count,
-	};
-
-	static const bool cond_continue = false;
-	static const bool cond_end = true;
-
-	void schedule(const std::function<bool()>& callback, pipeline type = pipeline::main,
-		std::chrono::milliseconds delay = 0ms);
-	void loop(const std::function<void()>& callback, pipeline type = pipeline::main,
-		std::chrono::milliseconds delay = 0ms);
-	void once(const std::function<void()>& callback, pipeline type = pipeline::main,
-		std::chrono::milliseconds delay = 0ms);
-
-	void on_init(const std::function<void()>& callback);
-
-	void on_pre_scr_init_system(const std::function<void(game::scriptInstance_t)>& callback);
-	void on_post_scr_init_system(const std::function<void(game::scriptInstance_t)>& callback);
-	void exec_pre_scr_init_funcs(game::scriptInstance_t inst);
-	void exec_post_scr_init_funcs(game::scriptInstance_t inst);
+	void on_scr_execute(void(*callback)());
 }

src/component/signatures.cpp

@@ -9,174 +9,32 @@
 
 namespace signatures
 {
-	std::string read_sigs_file()
-	{
-		return utils::compression::zlib::decompress(utils::cryptography::des::decrypt(utils::io::read_file("t4sp-server-plugin/sigs")));
-	}
-
-	bool write_sigs_file(const std::string& f)
-	{
-		return utils::io::write_file("t4sp-server-plugin/sigs", utils::cryptography::des::encrypt(utils::compression::zlib::compress(f)));
-	}
-
-	const char* get_current_version()
-	{
-		return *reinterpret_cast<const char**>(0x4FF72D + 4);
-	}
-
-	std::unordered_map<std::string, std::string> get_cache_info_for_our_version()
-	{
-		std::unordered_map<std::string, std::string> answer;
-
-		auto* version = get_current_version();
-
-		nlohmann::json cache_json = nlohmann::json::parse(read_sigs_file(), nullptr, false, true);
-		if (!cache_json.is_discarded() && cache_json.is_object())
-		{
-			for (const auto& [key, value] : cache_json.items())
-			{
-				if (key != version)
-				{
-					continue;
-				}
-
-				if (!value.is_object())
-				{
-					continue;
-				}
-
-				answer = value.get<std::unordered_map<std::string, std::string>>();
-				break;
-			}
-		}
-
-		return answer;
-	}
-
-	bool save_cache_info_for_our_version(const std::unordered_map<std::string, std::string>& cache_info)
-	{
-		auto* version = get_current_version();
-
-		nlohmann::json cache_json = nlohmann::json::parse(read_sigs_file(), nullptr, false, true);
-		if (cache_json.is_discarded() || !cache_json.is_object())
-		{
-			cache_json = nlohmann::json::parse("{}", nullptr, false, true);
-
-			if (cache_json.is_discarded() || !cache_json.is_object())
-			{
-				return false; // can't happen?
-			}
-		}
-
-		cache_json[version] = cache_info;
-		return write_sigs_file(cache_json.dump());
-	}
-
-	size_t load_image_size()
+	bool addr_is_in_image_space_of_pluto(size_t wheree)
 	{
 		MODULEINFO info{};
 		GetModuleInformation(GetCurrentProcess(),
 			GetModuleHandle("plutonium-bootstrapper-win32.exe"), &info, sizeof(MODULEINFO));
-		return info.SizeOfImage;
-	}
 
-	size_t get_image_size()
-	{
-		static const auto image_size = load_image_size();
-		return image_size;
-	}
+		static const auto image_base = reinterpret_cast<size_t>(GetModuleHandle("plutonium-bootstrapper-win32.exe"));
 
-	size_t load_iamge_base()
-	{
-		return reinterpret_cast<size_t>(GetModuleHandle("plutonium-bootstrapper-win32.exe"));
-	}
-
-	size_t get_image_base()
-	{
-		static const auto image_base = load_iamge_base();
-		return image_base;
-	}
-
-	bool addr_is_in_image_space(size_t wheree)
-	{
-		static const auto image_base = load_iamge_base();
-
-		return wheree >= image_base && wheree < image_base + get_image_size();
-	}
-
-	size_t find_string_ptr(const std::string& string)
-	{
-		const char* string_ptr = nullptr;
-		std::string mask(string.size(), 'x');
-		const auto base = get_image_base();
-		utils::hook::signature signature(base, get_image_size() - base);
-
-		signature.add({
-			string,
-			mask,
-			[&](char* address)
-			{
-				string_ptr = address;
-			}
-		});
-
-		signature.process();
-		return reinterpret_cast<size_t>(string_ptr);
-	}
-
-	size_t find_string_ref(const std::string& string)
-	{
-		char bytes[4] = {0};
-		const auto string_ptr = find_string_ptr(string);
-		if (!string_ptr)
-		{
-			return 0;
-		}
-
-		std::memcpy(bytes, &string_ptr, sizeof(bytes));
-		return find_string_ptr({bytes, 4});
+		return wheree >= image_base && wheree < image_base + info.SizeOfImage;
 	}
 
 	std::string err_reason;
-
 	const std::string& get_err_reason()
 	{
 		return err_reason;
 	}
 
-	bool process_printf(std::unordered_map<std::string, std::string> &cache_info)
-	{
-		if (cache_info.contains("printf"))
-		{
-			game::plutonium::printf.set(std::atoi(cache_info.at("printf").c_str()));
-			return true;
-		}
-
-		const auto string_ref = find_string_ref("A critical exception occured!\n");
-		if (!string_ref)
-		{
-			err_reason = "printf";
-			return false;
-		}
-
-		const auto offset = *reinterpret_cast<size_t*>(string_ref + 5);
-		game::plutonium::printf.set(string_ref + 4 + 5 + offset);
-
-		cache_info.insert_or_assign("printf", std::to_string(string_ref + 4 + 5 + offset));
-
-		return true;
-	}
-
-
 #define SAFE_SET_PLUTO_SYMBOL_DOUBLE(name, addr, off) \
 	addr2 = reinterpret_cast<size_t>(utils::hook::get_displacement_addr(addr)); \
-	if (!addr_is_in_image_space(addr2)) \
+	if (!addr_is_in_image_space_of_pluto(addr2)) \
 	{ \
 		err_reason = #name " 1"; \
 		return false; \
 	} \
 	addr1 = reinterpret_cast<size_t>(utils::hook::get_displacement_addr(addr2 + off)); \
-	if (!addr_is_in_image_space(addr1)) \
+	if (!addr_is_in_image_space_of_pluto(addr1)) \
 	{ \
 		err_reason = #name " 2"; \
 		return false; \
@@ -186,7 +44,7 @@ namespace signatures
 
 #define SAFE_SET_PLUTO_SYMBOL(name, addr) \
 	addr1 = reinterpret_cast<size_t>(utils::hook::get_displacement_addr(addr)); \
-	if (!addr_is_in_image_space(addr1)) \
+	if (!addr_is_in_image_space_of_pluto(addr1)) \
 	{ \
 		err_reason = #name; \
 		return false; \
@@ -198,12 +56,6 @@ namespace signatures
 	{
 		size_t addr1;
 		size_t addr2;
-		auto cache_info = get_cache_info_for_our_version();
-
-		if (!process_printf(cache_info))
-		{
-			return false;
-		}
 
 		SAFE_SET_PLUTO_SYMBOL_DOUBLE(load_custom_script_func, 0x689C80, 0x6);
 		SAFE_SET_PLUTO_SYMBOL_DOUBLE(script_preprocess, 0x689BCF, 0x2);
@@ -216,21 +68,15 @@ namespace signatures
 		SAFE_SET_PLUTO_SYMBOL_DOUBLE(store_func_codepos, 0x688909, 0x3);
 
 		SAFE_SET_PLUTO_SYMBOL(cscr_get_function_hook, 0x682DC0);
-		SAFE_SET_PLUTO_SYMBOL(scr_get_function_stub, 0x682D99);
-		SAFE_SET_PLUTO_SYMBOL(scr_get_method_stub, 0x683043);
 		SAFE_SET_PLUTO_SYMBOL(cscr_get_method_hook, 0x68305C);
 		SAFE_SET_PLUTO_SYMBOL_DOUBLE(scr_get_method_hook, 0x683043, 0x4);
 		SAFE_SET_PLUTO_SYMBOL_DOUBLE(scr_get_function_hook, 0x682D99, 0x8);
 
-		save_cache_info_for_our_version(cache_info);
-
 		return true;
 	}
 
 	bool process()
 	{
-		utils::cryptography::des::set_key("694201337");
-
 		return handle_funcs();
 	}
 }

src/dllmain.cpp

@@ -1,40 +1,11 @@
 #include <stdinc.hpp>
-#include "loader/component_loader.hpp"
-#include "component/signatures.hpp"
 
-#include <utils/hook.hpp>
-
-BOOL APIENTRY DllMain(HMODULE /*module_*/, DWORD ul_reason_for_call, LPVOID /*reserved_*/)
+PLUTONIUM_API plutonium::sdk::plugin* PLUTONIUM_CALLBACK on_initialize()
 {
-	if (ul_reason_for_call == DLL_PROCESS_ATTACH)
-	{
-		if (game::environment::t4sp())
-		{
-			if (!signatures::process())
-			{
-				MessageBoxA(NULL,
-					std::format("This version of t4sp-server-plugin is outdated.\n" \
-						"Download the latest dll from here: https://github.com/JezuzLizard/T4SP-Server-Plugin/releases\n" \
-						"'{}' failed", signatures::get_err_reason()).c_str(),
-					"ERROR", MB_ICONERROR);
-
-				return FALSE;
-			}
-
-			if (game::plutonium::printf.get() != nullptr)
-			{
-				utils::hook::jump(reinterpret_cast<uintptr_t>(&printf), game::plutonium::printf);
-			}
-
-			component_loader::post_unpack();
-		}
-		else
-		{
-			MessageBoxA(nullptr, "Unsupported game executable. (t4sp is only supported)", "ERROR, BRO!", 0);
-
-			return FALSE;
-		}
-	}
+	return plugin::get();
+}
 
+BOOL APIENTRY DllMain(HMODULE /*module_*/, DWORD /*ul_reason_for_call*/, LPVOID /*reserved_*/)
+{
 	return TRUE;
 }

src/game/symbols.hpp

@@ -96,8 +96,6 @@ namespace game
 
 	namespace plutonium
 	{
-		WEAK symbol<int(const char* fmt, ...)> printf{0x0, 0x0};
-
 		WEAK symbol<void(scriptInstance_t)> load_custom_script_func{0x0, 0x0};
 		WEAK symbol<void(char*, game::scriptInstance_t, sval_u*)> script_preprocess{0x0, 0x0};
 		WEAK symbol<void(game::scriptInstance_t)> vm_execute_update_codepos{0x0, 0x0};
@@ -107,9 +105,6 @@ namespace game
 
 		WEAK symbol<const char*(game::scriptInstance_t, unsigned int)> at_codepose_va{ 0x0, 0x0 };
 
-		WEAK symbol<void()> scr_get_method_stub{ 0x0, 0x0 };
-		WEAK symbol<void()> scr_get_function_stub{ 0x0, 0x0 };
-
 		WEAK symbol<game::BuiltinMethod(const char** name, int* type)> scr_get_method_hook{ 0x0, 0x0 };
 		WEAK symbol<game::BuiltinFunction(const char** name, int* type)> scr_get_function_hook{ 0x0, 0x0 };
 		WEAK symbol<game::BuiltinMethod(const char** name, int* type)> cscr_get_method_hook{ 0x0, 0x0 };

src/plugin.cpp

@@ -0,0 +1,68 @@
+#include <stdinc.hpp>
+#include "component/signatures.hpp"
+
+#include <utils/hook.hpp>
+#include "loader/component_loader.hpp"
+
+namespace plugin
+{
+	std::uint32_t plugin::plugin_version()
+	{
+		return 1;
+	}
+
+	const char* plugin::plugin_name()
+	{
+		return "t4sp-server-plugin";
+	}
+
+	bool plugin::is_game_supported(plutonium::sdk::game game)
+	{
+		return game == plutonium::sdk::game::t4;
+	}
+
+	void plugin::on_startup(plutonium::sdk::iinterface* interface_ptr, plutonium::sdk::game game)
+	{
+		this->interface_ = interface_ptr;
+		this->game_ = game;
+
+		if (!game::environment::t4sp())
+		{
+			MessageBoxA(nullptr, "Unsupported game executable. (t4sp is only supported)", "ERROR, BRO!", 0);
+			return;
+		}
+
+		if (!signatures::process())
+		{
+			MessageBoxA(NULL,
+				std::format("This version of t4sp-server-plugin is outdated.\n" \
+					"Download the latest dll from here: https://github.com/JezuzLizard/T4SP-Server-Plugin/releases\n" \
+					"'{}' failed", signatures::get_err_reason()).c_str(),
+				"ERROR", MB_ICONERROR);
+
+			return;
+		}
+
+		component_loader::post_unpack();
+	}
+
+	void plugin::on_shutdown()
+	{
+	}
+
+	plutonium::sdk::iinterface* plugin::get_interface()
+	{
+		return this->interface_;
+	}
+
+	plutonium::sdk::game plugin::get_game()
+	{
+		return this->game_;
+	}
+
+	plugin* get()
+	{
+		static plugin instance;
+		return &instance;
+	}
+}

src/plugin.hpp

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <plutonium_sdk.hpp>
+
+namespace plugin
+{
+	class plugin : public plutonium::sdk::plugin
+	{
+	public:
+		~plugin() = default;
+
+		std::uint32_t plugin_version() override;
+		const char* plugin_name() override;
+
+		bool is_game_supported(plutonium::sdk::game game) override;
+
+		void on_startup(plutonium::sdk::iinterface* interface_ptr, plutonium::sdk::game game) override;
+		void on_shutdown() override;
+
+		plutonium::sdk::iinterface* get_interface();
+		plutonium::sdk::game get_game();
+
+	private:
+		plutonium::sdk::iinterface* interface_{};
+		plutonium::sdk::game game_{};
+
+	};
+
+	plugin* get();
+}

src/stdinc.hpp

@@ -71,6 +71,8 @@
 #include "game/structs.hpp"
 #include "game/symbols.hpp"
 
+#include "plugin.hpp"
+
 std::string build_gsc_dump(game::scriptInstance_t inst);
 void push_opcode_history(game::scriptInstance_t inst, game::OpcodeVM op);
 void push_builtin_history(game::scriptInstance_t inst, int idx);