big refactor (#171)v1.10.0-rc1

* use in-file macros rather than global funcs for registering dll load callbacks

* move more things to macros

* fix debug crashes

* move sqvm funcs to sq managers

* get rid of context file

* refactor some squirrel stuff and ingame compilation error message

* move tier0 and playlist funcs to namespaces

* uiscript_reset concommand: don't loop forever if compilation fails

* improve showing console for ui script compile errors

* standardise concommand func naming in c++

* use lambdas for dll load callbacks so intellisense shits itself less

* use cvar change callbacks for unescaping ns_server_name and ns_server_desc

* add proper helpstrings to masterserver cvars

* add cvar help and find

* allow parsing of convar flags from string

* normalise mod fs paths to be lowercase

* move hoststate to its own file and add host_init hooks

* better IsFlagSet def

* replace files in ReadFromCache

* rename g_ModManager to g_pModManager

* formatting changes

* make cvar print work on dedi, move demo fix stuff, add findflags

* add proper map autocompletes and maps command

* formatting changes

* separate gameutils into multiple r2 headers

* Update keyvalues.cpp

* move sqvm funcs into wrappers in the manager class

* remove unnecessary header files

* lots of cleanup and starting moving to new hooking macros

* update more stuff to new hook macros

* rename project folder (:tf: commit log)

* fix up postbuild commands to use relative dir

* almost fully replaced hooking lib

* completely remove old hooking

* add nsprefix because i forgot to include it

* move exploit prevention and limits code out of serverauthentication, and have actual defs for CBasePlayer

* use modular ServerPresence system for registering servers

* add new memory lib

* accidentally pushed broke code oops

* lots of stuff idk

* implement some more prs

* improve rpakfilesystem

* fix line endings on vcxproj

* Revert "fix line endings on vcxproj"

This reverts commit 4ff7d022d2602c2dba37beba8b8df735cf5cd7d9.

* add more prs

* i swear i committed these how are they not there

* Add ability to load Datatables from files (#238)

* first version of kinda working custom datatables

* Fix copy error

* Finish custom datatables

* Fix Merge

* Fix line endings

* Add fallback to rpak when ns_prefere_datatable_from_disk is true

* fix typo

* Bug fixess

* Fix Function Registration hook

* Set convar value

* Fix Client and Ui VM

* enable server auth with ms agian

* Add Filters

* FIx unused import

* Merge remote-tracking branch 'upsteam/bobs-big-refactor-pr' into datatables

Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>

* Add some changes from main to refactor (#243)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Fix line endings (hopefully) (#244)

* Fix line endings (hopefully)

* Fix more line endings

* Update refactor (#250)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Add editorconfig file (#246)

* Add editorconfig file

It's a cross-editor compatible config file that defines certain editor
behaviour (e.g. adding/removing newline at end of file)

It is supported by major editors like Visual Studio (Code) and by
version control  providers like GitHub.

Should end the constant adding/removing of final newline in PRs

* More settings

- unicode by default
- trim newlines
- use tabs for indentation (ugh)

* Ignore folder rename (#245)

* Hot reload banlist on player join (#233)

* added banlist hotreload

* fix formatting

* didnt append, cleared whole file oopsie

* unfuckedunban not rewriting file

* fixed not checking for new line

Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>

* Refactor cleanup (#256)

* Fix indentation

* Fix path in clang-format command in readme

* Refactor cleanup (some formatting fixes) (#257)

* Fix some formatting

* More formatting fixes

* add scriptdatatable.cpp rewrite

* Some formatting fixes (#260)

* More formatting stuff (#261)

* various formatting changes and fixes

* Fix changed icon (#264)

* clang format, fix issues with server registration and rpak loading

* fix more formatting

* update postbuild step

* set launcher directory and error on fail creating log files

* change some stuff in exploitfixes

* only unrestrict dev commands when commandline flag is present

* fix issues with cvar flag commit

* fixup command flags better and reformat

* bring up to date with main

* fixup formatting

* improve cvar flag fixup and remove temp thing from findflags

* set serverfilter better

* avoid ptr decay when setting auth token

* add more entity functions

* Fix the MS server registration issues. (#285)

* Port ms presence reporter to std::async

* Fix crash due to std::optional being assigned nullptr.

* Fix formatting.

* Wait 20 seconds if MS returns DUPLICATE_SERVER.

* Change PERSISTENCE_MAX_SIZE to fix player authentication (#287)

The size check added in the refactor was incorrect:

- 56306: expected pdata size based on the pdef
- 512: allowance for trailing junk (r2 adds 137 bytes of trailing junk)
- 100: for some wiggle room

Co-Authored-By: pg9182 <96569817+pg9182@users.noreply.github.com>

* change miscserverscript to use actual entity arguments rather than
player index jank

* Fix token clearing hook (#290)

A certain someone forgot to put an `0x` in front of their hex number, meaning the offset is wrong.
This would cause token to be leaked again

Co-authored-by: Maya <malte.hoermeyer@web.de>
Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>
Co-authored-by: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>
Co-authored-by: Erlite <ys.aameziane@gmail.com>
Co-authored-by: Emma Miler <emma.pi@protonmail.com>
Co-authored-by: pg9182 <96569817+pg9182@users.noreply.github.com>

1 files changed, 54 insertions, 54 deletions

diff --git a/NorthstarDLL/scriptmodmenu.cpp b/NorthstarDLL/scriptmodmenu.cpp
index 767ede91..d2f35285 100644
--- a/NorthstarDLL/scriptmodmenu.cpp
+++ b/NorthstarDLL/scriptmodmenu.cpp
@@ -1,33 +1,32 @@
 #include "pch.h"
-#include "scriptmodmenu.h"
 #include "modmanager.h"
 #include "squirrel.h"
 
 // array<string> function NSGetModNames()
-SQRESULT SQ_GetModNames(void* sqvm)
+SQRESULT SQ_GetModNames(HSquirrelVM* sqvm)
 {
-	ClientSq_newarray(sqvm, 0);
+	g_pSquirrel<ScriptContext::UI>->newarray(sqvm, 0);
 
-	for (Mod& mod : g_ModManager->m_loadedMods)
+	for (Mod& mod : g_pModManager->m_LoadedMods)
 	{
-		ClientSq_pushstring(sqvm, mod.Name.c_str(), -1);
-		ClientSq_arrayappend(sqvm, -2);
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, mod.Name.c_str());
+		g_pSquirrel<ScriptContext::UI>->arrayappend(sqvm, -2);
 	}
 
 	return SQRESULT_NOTNULL;
 }
 
 // bool function NSIsModEnabled(string modName)
-SQRESULT SQ_IsModEnabled(void* sqvm)
+SQRESULT SQ_IsModEnabled(HSquirrelVM* sqvm)
 {
-	const SQChar* modName = ClientSq_getstring(sqvm, 1);
+	const SQChar* modName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
 
 	// manual lookup, not super performant but eh not a big deal
-	for (Mod& mod : g_ModManager->m_loadedMods)
+	for (Mod& mod : g_pModManager->m_LoadedMods)
 	{
 		if (!mod.Name.compare(modName))
 		{
-			ClientSq_pushbool(sqvm, mod.Enabled);
+			g_pSquirrel<ScriptContext::UI>->pushbool(sqvm, mod.m_bEnabled);
 			return SQRESULT_NOTNULL;
 		}
 	}
@@ -36,17 +35,17 @@ SQRESULT SQ_IsModEnabled(void* sqvm)
 }
 
 // void function NSSetModEnabled(string modName, bool enabled)
-SQRESULT SQ_SetModEnabled(void* sqvm)
+SQRESULT SQ_SetModEnabled(HSquirrelVM* sqvm)
 {
-	const SQChar* modName = ClientSq_getstring(sqvm, 1);
-	const SQBool enabled = ClientSq_getbool(sqvm, 2);
+	const SQChar* modName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
+	const SQBool enabled = g_pSquirrel<ScriptContext::UI>->getbool(sqvm, 2);
 
 	// manual lookup, not super performant but eh not a big deal
-	for (Mod& mod : g_ModManager->m_loadedMods)
+	for (Mod& mod : g_pModManager->m_LoadedMods)
 	{
 		if (!mod.Name.compare(modName))
 		{
-			mod.Enabled = enabled;
+			mod.m_bEnabled = enabled;
 			return SQRESULT_NULL;
 		}
 	}
@@ -55,16 +54,16 @@ SQRESULT SQ_SetModEnabled(void* sqvm)
 }
 
 // string function NSGetModDescriptionByModName(string modName)
-SQRESULT SQ_GetModDescription(void* sqvm)
+SQRESULT SQ_GetModDescription(HSquirrelVM* sqvm)
 {
-	const SQChar* modName = ClientSq_getstring(sqvm, 1);
+	const SQChar* modName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
 
 	// manual lookup, not super performant but eh not a big deal
-	for (Mod& mod : g_ModManager->m_loadedMods)
+	for (Mod& mod : g_pModManager->m_LoadedMods)
 	{
 		if (!mod.Name.compare(modName))
 		{
-			ClientSq_pushstring(sqvm, mod.Description.c_str(), -1);
+			g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, mod.Description.c_str());
 			return SQRESULT_NOTNULL;
 		}
 	}
@@ -73,16 +72,16 @@ SQRESULT SQ_GetModDescription(void* sqvm)
 }
 
 // string function NSGetModVersionByModName(string modName)
-SQRESULT SQ_GetModVersion(void* sqvm)
+SQRESULT SQ_GetModVersion(HSquirrelVM* sqvm)
 {
-	const SQChar* modName = ClientSq_getstring(sqvm, 1);
+	const SQChar* modName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
 
 	// manual lookup, not super performant but eh not a big deal
-	for (Mod& mod : g_ModManager->m_loadedMods)
+	for (Mod& mod : g_pModManager->m_LoadedMods)
 	{
 		if (!mod.Name.compare(modName))
 		{
-			ClientSq_pushstring(sqvm, mod.Version.c_str(), -1);
+			g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, mod.Version.c_str());
 			return SQRESULT_NOTNULL;
 		}
 	}
@@ -91,16 +90,16 @@ SQRESULT SQ_GetModVersion(void* sqvm)
 }
 
 // string function NSGetModDownloadLinkByModName(string modName)
-SQRESULT SQ_GetModDownloadLink(void* sqvm)
+SQRESULT SQ_GetModDownloadLink(HSquirrelVM* sqvm)
 {
-	const SQChar* modName = ClientSq_getstring(sqvm, 1);
+	const SQChar* modName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
 
 	// manual lookup, not super performant but eh not a big deal
-	for (Mod& mod : g_ModManager->m_loadedMods)
+	for (Mod& mod : g_pModManager->m_LoadedMods)
 	{
 		if (!mod.Name.compare(modName))
 		{
-			ClientSq_pushstring(sqvm, mod.DownloadLink.c_str(), -1);
+			g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, mod.DownloadLink.c_str());
 			return SQRESULT_NOTNULL;
 		}
 	}
@@ -109,16 +108,16 @@ SQRESULT SQ_GetModDownloadLink(void* sqvm)
 }
 
 // int function NSGetModLoadPriority(string modName)
-SQRESULT SQ_GetModLoadPriority(void* sqvm)
+SQRESULT SQ_GetModLoadPriority(HSquirrelVM* sqvm)
 {
-	const SQChar* modName = ClientSq_getstring(sqvm, 1);
+	const SQChar* modName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
 
 	// manual lookup, not super performant but eh not a big deal
-	for (Mod& mod : g_ModManager->m_loadedMods)
+	for (Mod& mod : g_pModManager->m_LoadedMods)
 	{
 		if (!mod.Name.compare(modName))
 		{
-			ClientSq_pushinteger(sqvm, mod.LoadPriority);
+			g_pSquirrel<ScriptContext::UI>->pushinteger(sqvm, mod.LoadPriority);
 			return SQRESULT_NOTNULL;
 		}
 	}
@@ -127,16 +126,16 @@ SQRESULT SQ_GetModLoadPriority(void* sqvm)
 }
 
 // bool function NSIsModRequiredOnClient(string modName)
-SQRESULT SQ_IsModRequiredOnClient(void* sqvm)
+SQRESULT SQ_IsModRequiredOnClient(HSquirrelVM* sqvm)
 {
-	const SQChar* modName = ClientSq_getstring(sqvm, 1);
+	const SQChar* modName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
 
 	// manual lookup, not super performant but eh not a big deal
-	for (Mod& mod : g_ModManager->m_loadedMods)
+	for (Mod& mod : g_pModManager->m_LoadedMods)
 	{
 		if (!mod.Name.compare(modName))
 		{
-			ClientSq_pushbool(sqvm, mod.RequiredOnClient);
+			g_pSquirrel<ScriptContext::UI>->pushbool(sqvm, mod.RequiredOnClient);
 			return SQRESULT_NOTNULL;
 		}
 	}
@@ -145,20 +144,20 @@ SQRESULT SQ_IsModRequiredOnClient(void* sqvm)
 }
 
 // array<string> function NSGetModConvarsByModName(string modName)
-SQRESULT SQ_GetModConvars(void* sqvm)
+SQRESULT SQ_GetModConvars(HSquirrelVM* sqvm)
 {
-	const SQChar* modName = ClientSq_getstring(sqvm, 1);
-	ClientSq_newarray(sqvm, 0);
+	const SQChar* modName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
+	g_pSquirrel<ScriptContext::UI>->newarray(sqvm, 0);
 
 	// manual lookup, not super performant but eh not a big deal
-	for (Mod& mod : g_ModManager->m_loadedMods)
+	for (Mod& mod : g_pModManager->m_LoadedMods)
 	{
 		if (!mod.Name.compare(modName))
 		{
 			for (ModConVar* cvar : mod.ConVars)
 			{
-				ClientSq_pushstring(sqvm, cvar->Name.c_str(), -1);
-				ClientSq_arrayappend(sqvm, -2);
+				g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, cvar->Name.c_str());
+				g_pSquirrel<ScriptContext::UI>->arrayappend(sqvm, -2);
 			}
 
 			return SQRESULT_NOTNULL;
@@ -169,35 +168,36 @@ SQRESULT SQ_GetModConvars(void* sqvm)
 }
 
 // void function NSReloadMods()
-SQRESULT SQ_ReloadMods(void* sqvm)
+SQRESULT SQ_ReloadMods(HSquirrelVM* sqvm)
 {
-	g_ModManager->LoadMods();
+	g_pModManager->LoadMods();
 	return SQRESULT_NULL;
 }
 
-void InitialiseScriptModMenu(HMODULE baseAddress)
+ON_DLL_LOAD_CLIENT_RELIESON("client.dll", ScriptModMenu, ClientSquirrel, (CModule module))
 {
-	g_UISquirrelManager->AddFuncRegistration("array<string>", "NSGetModNames", "", "Returns the names of all loaded mods", SQ_GetModNames);
-	g_UISquirrelManager->AddFuncRegistration(
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
+		"array<string>", "NSGetModNames", "", "Returns the names of all loaded mods", SQ_GetModNames);
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 		"bool", "NSIsModEnabled", "string modName", "Returns whether a given mod is enabled", SQ_IsModEnabled);
-	g_UISquirrelManager->AddFuncRegistration(
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 		"void", "NSSetModEnabled", "string modName, bool enabled", "Sets whether a given mod is enabled", SQ_SetModEnabled);
-	g_UISquirrelManager->AddFuncRegistration(
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 		"string", "NSGetModDescriptionByModName", "string modName", "Returns a given mod's description", SQ_GetModDescription);
-	g_UISquirrelManager->AddFuncRegistration(
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 		"string", "NSGetModVersionByModName", "string modName", "Returns a given mod's version", SQ_GetModVersion);
-	g_UISquirrelManager->AddFuncRegistration(
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 		"string", "NSGetModDownloadLinkByModName", "string modName", "Returns a given mod's download link", SQ_GetModDownloadLink);
-	g_UISquirrelManager->AddFuncRegistration(
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 		"bool",
 		"NSIsModRequiredOnClient",
 		"string modName",
 		"Returns whether a given mod is required on connecting clients",
 		SQ_IsModRequiredOnClient);
-	g_UISquirrelManager->AddFuncRegistration(
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 		"int", "NSGetModLoadPriority", "string modName", "Returns a given mod's load priority", SQ_GetModLoadPriority);
-	g_UISquirrelManager->AddFuncRegistration(
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 		"array<string>", "NSGetModConvarsByModName", "string modName", "Returns the names of all a given mod's cvars", SQ_GetModConvars);
 
-	g_UISquirrelManager->AddFuncRegistration("void", "NSReloadMods", "", "Reloads mods", SQ_ReloadMods);
+	g_pSquirrel<ScriptContext::UI>->AddFuncRegistration("void", "NSReloadMods", "", "Reloads mods", SQ_ReloadMods);
 }