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, 49 insertions, 47 deletions

diff --git a/NorthstarDLL/plugins.cpp b/NorthstarDLL/plugins.cpp
index 57701fcd..790439d1 100644
--- a/NorthstarDLL/plugins.cpp
+++ b/NorthstarDLL/plugins.cpp
@@ -1,9 +1,11 @@
 #include "pch.h"
 #include "squirrel.h"
 #include "plugins.h"
-#include <chrono>
 #include "masterserver.h"
 #include "convar.h"
+#include "serverpresence.h"
+
+#include <chrono>
 #include <windows.h>
 
 /// <summary>
@@ -109,31 +111,31 @@ void initGameState()
 }
 
 // string gamemode, string gamemodeName, string map, string mapName, bool connected, bool loading
-SQRESULT SQ_UpdateGameStateUI(void* sqvm)
+SQRESULT SQ_UpdateGameStateUI(HSquirrelVM* sqvm)
 {
 	AcquireSRWLockExclusive(&gameStateLock);
-	gameState.map = ClientSq_getstring(sqvm, 1);
-	gameState.mapDisplayName = ClientSq_getstring(sqvm, 2);
-	gameState.playlist = ClientSq_getstring(sqvm, 3);
-	gameState.playlistDisplayName = ClientSq_getstring(sqvm, 4);
-	gameState.connected = ClientSq_getbool(sqvm, 5);
-	gameState.loading = ClientSq_getbool(sqvm, 6);
+	gameState.map = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
+	gameState.mapDisplayName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 2);
+	gameState.playlist = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 3);
+	gameState.playlistDisplayName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 4);
+	gameState.connected = g_pSquirrel<ScriptContext::UI>->getbool(sqvm, 5);
+	gameState.loading = g_pSquirrel<ScriptContext::UI>->getbool(sqvm, 6);
 	ReleaseSRWLockExclusive(&gameStateLock);
 	return SQRESULT_NOTNULL;
 }
 
 // int playerCount, int outScore, int secondHighestScore, int highestScore, bool roundBased, int scoreLimit
-SQRESULT SQ_UpdateGameStateClient(void* sqvm)
+SQRESULT SQ_UpdateGameStateClient(HSquirrelVM* sqvm)
 {
 	AcquireSRWLockExclusive(&gameStateLock);
 	AcquireSRWLockExclusive(&serverInfoLock);
-	gameState.players = ClientSq_getinteger(sqvm, 1);
-	serverInfo.maxPlayers = ClientSq_getinteger(sqvm, 2);
-	gameState.ourScore = ClientSq_getinteger(sqvm, 3);
-	gameState.secondHighestScore = ClientSq_getinteger(sqvm, 4);
-	gameState.highestScore = ClientSq_getinteger(sqvm, 5);
-	serverInfo.roundBased = ClientSq_getbool(sqvm, 6);
-	serverInfo.scoreLimit = ClientSq_getbool(sqvm, 7);
+	gameState.players = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 1);
+	serverInfo.maxPlayers = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 2);
+	gameState.ourScore = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 3);
+	gameState.secondHighestScore = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 4);
+	gameState.highestScore = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 5);
+	serverInfo.roundBased = g_pSquirrel<ScriptContext::CLIENT>->getbool(sqvm, 6);
+	serverInfo.scoreLimit = g_pSquirrel<ScriptContext::CLIENT>->getbool(sqvm, 7);
 	ReleaseSRWLockExclusive(&gameStateLock);
 	ReleaseSRWLockExclusive(&serverInfoLock);
 	return SQRESULT_NOTNULL;
@@ -141,59 +143,59 @@ SQRESULT SQ_UpdateGameStateClient(void* sqvm)
 
 // string id, string name, string password, int players, int maxPlayers, string map, string mapDisplayName, string playlist, string
 // playlistDisplayName
-SQRESULT SQ_UpdateServerInfo(void* sqvm)
+SQRESULT SQ_UpdateServerInfo(HSquirrelVM* sqvm)
 {
 	AcquireSRWLockExclusive(&gameStateLock);
 	AcquireSRWLockExclusive(&serverInfoLock);
-	serverInfo.id = ClientSq_getstring(sqvm, 1);
-	serverInfo.name = ClientSq_getstring(sqvm, 2);
-	serverInfo.password = ClientSq_getstring(sqvm, 3);
-	gameState.players = ClientSq_getinteger(sqvm, 4);
-	serverInfo.maxPlayers = ClientSq_getinteger(sqvm, 5);
-	gameState.map = ClientSq_getstring(sqvm, 6);
-	gameState.mapDisplayName = ClientSq_getstring(sqvm, 7);
-	gameState.playlist = ClientSq_getstring(sqvm, 8);
-	gameState.playlistDisplayName = ClientSq_getstring(sqvm, 9);
+	serverInfo.id = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 1);
+	serverInfo.name = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 2);
+	serverInfo.password = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 3);
+	gameState.players = g_pSquirrel<ScriptContext::UI>->getinteger(sqvm, 4);
+	serverInfo.maxPlayers = g_pSquirrel<ScriptContext::UI>->getinteger(sqvm, 5);
+	gameState.map = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 6);
+	gameState.mapDisplayName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 7);
+	gameState.playlist = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 8);
+	gameState.playlistDisplayName = g_pSquirrel<ScriptContext::UI>->getstring(sqvm, 9);
 	ReleaseSRWLockExclusive(&gameStateLock);
 	ReleaseSRWLockExclusive(&serverInfoLock);
 	return SQRESULT_NOTNULL;
 }
 
 // int maxPlayers
-SQRESULT SQ_UpdateServerInfoBetweenRounds(void* sqvm)
+SQRESULT SQ_UpdateServerInfoBetweenRounds(HSquirrelVM* sqvm)
 {
 	AcquireSRWLockExclusive(&serverInfoLock);
-	serverInfo.id = ClientSq_getstring(sqvm, 1);
-	serverInfo.name = ClientSq_getstring(sqvm, 2);
-	serverInfo.password = ClientSq_getstring(sqvm, 3);
-	serverInfo.maxPlayers = ClientSq_getinteger(sqvm, 4);
+	serverInfo.id = g_pSquirrel<ScriptContext::CLIENT>->getstring(sqvm, 1);
+	serverInfo.name = g_pSquirrel<ScriptContext::CLIENT>->getstring(sqvm, 2);
+	serverInfo.password = g_pSquirrel<ScriptContext::CLIENT>->getstring(sqvm, 3);
+	serverInfo.maxPlayers = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 4);
 	ReleaseSRWLockExclusive(&serverInfoLock);
 	return SQRESULT_NOTNULL;
 }
 
 // float timeInFuture
-SQRESULT SQ_UpdateTimeInfo(void* sqvm)
+SQRESULT SQ_UpdateTimeInfo(HSquirrelVM* sqvm)
 {
 	AcquireSRWLockExclusive(&serverInfoLock);
-	serverInfo.endTime = ceil(ClientSq_getfloat(sqvm, 1));
+	serverInfo.endTime = ceil(g_pSquirrel<ScriptContext::CLIENT>->getfloat(sqvm, 1));
 	ReleaseSRWLockExclusive(&serverInfoLock);
 	return SQRESULT_NOTNULL;
 }
 
 // bool loading
-SQRESULT SQ_SetConnected(void* sqvm)
+SQRESULT SQ_SetConnected(HSquirrelVM* sqvm)
 {
 	AcquireSRWLockExclusive(&gameStateLock);
-	gameState.loading = ClientSq_getbool(sqvm, 1);
+	gameState.loading = g_pSquirrel<ScriptContext::UI>->getbool(sqvm, 1);
 	ReleaseSRWLockExclusive(&gameStateLock);
 	return SQRESULT_NOTNULL;
 }
 
-SQRESULT SQ_UpdateListenServer(void* sqvm)
+SQRESULT SQ_UpdateListenServer(HSquirrelVM* sqvm)
 {
 	AcquireSRWLockExclusive(&serverInfoLock);
-	serverInfo.id = g_MasterServerManager->m_sOwnServerId;
-	serverInfo.password = Cvar_ns_server_password->GetString();
+	serverInfo.id = g_pMasterServerManager->m_sOwnServerId;
+	serverInfo.password = ""; // g_pServerPresence->Cvar_ns_server_password->GetString(); todo this fr
 	ReleaseSRWLockExclusive(&serverInfoLock);
 	return SQRESULT_NOTNULL;
 }
@@ -384,26 +386,26 @@ int getPlayerInfoBool(bool* out_ptr, PlayerInfoType var)
 	return n;
 }
 
-void InitialisePluginCommands(HMODULE baseAddress)
+ON_DLL_LOAD_CLIENT_RELIESON("client.dll", PluginCommands, ClientSquirrel, (CModule module))
 {
 	// i swear there's a way to make this not have be run in 2 contexts but i can't figure it out
 	// some funcs i need are just not available in UI or CLIENT
 
-	if (g_UISquirrelManager && g_ClientSquirrelManager)
+	if (g_pSquirrel<ScriptContext::UI> && g_pSquirrel<ScriptContext::CLIENT>)
 	{
-		g_UISquirrelManager->AddFuncRegistration(
+		g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 			"void",
 			"NSUpdateGameStateUI",
 			"string gamemode, string gamemodeName, string map, string mapName, bool connected, bool loading",
 			"",
 			SQ_UpdateGameStateUI);
-		g_ClientSquirrelManager->AddFuncRegistration(
+		g_pSquirrel<ScriptContext::CLIENT>->AddFuncRegistration(
 			"void",
 			"NSUpdateGameStateClient",
 			"int playerCount, int maxPlayers, int outScore, int secondHighestScore, int highestScore, bool roundBased, int scoreLimit",
 			"",
 			SQ_UpdateGameStateClient);
-		g_UISquirrelManager->AddFuncRegistration(
+		g_pSquirrel<ScriptContext::UI>->AddFuncRegistration(
 			"void",
 			"NSUpdateServerInfo",
 			"string id, string name, string password, int players, int maxPlayers, string map, string mapDisplayName, string playlist, "
@@ -411,10 +413,10 @@ void InitialisePluginCommands(HMODULE baseAddress)
 			"playlistDisplayName",
 			"",
 			SQ_UpdateServerInfo);
-		g_ClientSquirrelManager->AddFuncRegistration(
+		g_pSquirrel<ScriptContext::CLIENT>->AddFuncRegistration(
 			"void", "NSUpdateServerInfoReload", "int maxPlayers", "", SQ_UpdateServerInfoBetweenRounds);
-		g_ClientSquirrelManager->AddFuncRegistration("void", "NSUpdateTimeInfo", "float timeInFuture", "", SQ_UpdateTimeInfo);
-		g_UISquirrelManager->AddFuncRegistration("void", "NSSetLoading", "bool loading", "", SQ_SetConnected);
-		g_UISquirrelManager->AddFuncRegistration("void", "NSUpdateListenServer", "", "", SQ_UpdateListenServer);
+		g_pSquirrel<ScriptContext::CLIENT>->AddFuncRegistration("void", "NSUpdateTimeInfo", "float timeInFuture", "", SQ_UpdateTimeInfo);
+		g_pSquirrel<ScriptContext::UI>->AddFuncRegistration("void", "NSSetLoading", "bool loading", "", SQ_SetConnected);
+		g_pSquirrel<ScriptContext::UI>->AddFuncRegistration("void", "NSUpdateListenServer", "", "", SQ_UpdateListenServer);
 	}
 }