Restructuring (#365)

* Remove launcher proxy

* Restructuring

* More restructuring

* Fix include dirs

* Fix merge

* Remove clang thing

* Filters

* Oops

6 files changed, 814 insertions, 0 deletions

diff --git a/NorthstarDLL/scripts/client/clientchathooks.cpp b/NorthstarDLL/scripts/client/clientchathooks.cpp
new file mode 100644
index 00000000..0fc68302
--- /dev/null
+++ b/NorthstarDLL/scripts/client/clientchathooks.cpp
@@ -0,0 +1,70 @@
+#include "pch.h"
+#include "squirrel/squirrel.h"
+
+#include "server/serverchathooks.h"
+#include "client/localchatwriter.h"
+
+#include <rapidjson/document.h>
+
+AUTOHOOK_INIT()
+
+// clang-format off
+AUTOHOOK(CHudChat__AddGameLine, client.dll + 0x22E580,
+void, __fastcall, (void* self, const char* message, int inboxId, bool isTeam, bool isDead))
+// clang-format on
+{
+	// This hook is called for each HUD, but we only want our logic to run once.
+	if (self != *CHudChat::allHuds)
+		return;
+
+	int senderId = inboxId & CUSTOM_MESSAGE_INDEX_MASK;
+	bool isAnonymous = senderId == 0;
+	bool isCustom = isAnonymous || (inboxId & CUSTOM_MESSAGE_INDEX_BIT);
+
+	// Type is set to 0 for non-custom messages, custom messages have a type encoded as the first byte
+	int type = 0;
+	const char* payload = message;
+	if (isCustom)
+	{
+		type = message[0];
+		payload = message + 1;
+	}
+
+	SQRESULT result = g_pSquirrel<ScriptContext::CLIENT>->Call(
+		"CHudChat_ProcessMessageStartThread", static_cast<int>(senderId) - 1, payload, isTeam, isDead, type);
+	if (result == SQRESULT_ERROR)
+		for (CHudChat* hud = *CHudChat::allHuds; hud != NULL; hud = hud->next)
+			CHudChat__AddGameLine(hud, message, inboxId, isTeam, isDead);
+}
+
+ADD_SQFUNC("void", NSChatWrite, "int context, string text", "", ScriptContext::CLIENT)
+{
+	int chatContext = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 1);
+	const char* str = g_pSquirrel<ScriptContext::CLIENT>->getstring(sqvm, 2);
+
+	LocalChatWriter((LocalChatWriter::Context)chatContext).Write(str);
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("void", NSChatWriteRaw, "int context, string text", "", ScriptContext::CLIENT)
+{
+	int chatContext = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 1);
+	const char* str = g_pSquirrel<ScriptContext::CLIENT>->getstring(sqvm, 2);
+
+	LocalChatWriter((LocalChatWriter::Context)chatContext).InsertText(str);
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("void", NSChatWriteLine, "int context, string text", "", ScriptContext::CLIENT)
+{
+	int chatContext = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 1);
+	const char* str = g_pSquirrel<ScriptContext::CLIENT>->getstring(sqvm, 2);
+
+	LocalChatWriter((LocalChatWriter::Context)chatContext).WriteLine(str);
+	return SQRESULT_NULL;
+}
+
+ON_DLL_LOAD_CLIENT("client.dll", ClientChatHooks, (CModule module))
+{
+	AUTOHOOK_DISPATCH()
+}
diff --git a/NorthstarDLL/scripts/client/scriptbrowserhooks.cpp b/NorthstarDLL/scripts/client/scriptbrowserhooks.cpp
new file mode 100644
index 00000000..df4014de
--- /dev/null
+++ b/NorthstarDLL/scripts/client/scriptbrowserhooks.cpp
@@ -0,0 +1,25 @@
+#include "pch.h"
+
+AUTOHOOK_INIT()
+
+bool* bIsOriginOverlayEnabled;
+
+// clang-format off
+AUTOHOOK(OpenExternalWebBrowser, engine.dll + 0x184E40, 
+void, __fastcall, (char* pUrl, char flags))
+// clang-format on
+{
+	bool bIsOriginOverlayEnabledOriginal = *bIsOriginOverlayEnabled;
+	if (flags & 2 && !strncmp(pUrl, "http", 4)) // custom force external browser flag
+		*bIsOriginOverlayEnabled = false; // if this bool is false, game will use an external browser rather than the origin overlay one
+
+	OpenExternalWebBrowser(pUrl, flags);
+	*bIsOriginOverlayEnabled = bIsOriginOverlayEnabledOriginal;
+}
+
+ON_DLL_LOAD_CLIENT("engine.dll", ScriptExternalBrowserHooks, (CModule module))
+{
+	AUTOHOOK_DISPATCH()
+
+	bIsOriginOverlayEnabled = module.Offset(0x13978255).As<bool*>();
+}
diff --git a/NorthstarDLL/scripts/client/scriptmainmenupromos.cpp b/NorthstarDLL/scripts/client/scriptmainmenupromos.cpp
new file mode 100644
index 00000000..0ea167f8
--- /dev/null
+++ b/NorthstarDLL/scripts/client/scriptmainmenupromos.cpp
@@ -0,0 +1,124 @@
+#include "pch.h"
+#include "squirrel/squirrel.h"
+#include "masterserver/masterserver.h"
+
+// mirror this in script
+enum eMainMenuPromoDataProperty
+{
+	newInfoTitle1,
+	newInfoTitle2,
+	newInfoTitle3,
+
+	largeButtonTitle,
+	largeButtonText,
+	largeButtonUrl,
+	largeButtonImageIndex,
+
+	smallButton1Title,
+	smallButton1Url,
+	smallButton1ImageIndex,
+
+	smallButton2Title,
+	smallButton2Url,
+	smallButton2ImageIndex
+};
+ADD_SQFUNC("void", NSRequestCustomMainMenuPromos, "", "", ScriptContext::UI)
+{
+	g_pMasterServerManager->RequestMainMenuPromos();
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("bool", NSHasCustomMainMenuPromoData, "", "", ScriptContext::UI)
+{
+	g_pSquirrel<ScriptContext::UI>->pushbool(sqvm, g_pMasterServerManager->m_bHasMainMenuPromoData);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("var", NSGetCustomMainMenuPromoData, "int promoDataKey", "", ScriptContext::UI)
+{
+	if (!g_pMasterServerManager->m_bHasMainMenuPromoData)
+		return SQRESULT_NULL;
+
+	switch (g_pSquirrel<ScriptContext::UI>->getinteger(sqvm, 1))
+	{
+	case eMainMenuPromoDataProperty::newInfoTitle1:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.newInfoTitle1.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::newInfoTitle2:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.newInfoTitle2.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::newInfoTitle3:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.newInfoTitle3.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::largeButtonTitle:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.largeButtonTitle.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::largeButtonText:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.largeButtonText.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::largeButtonUrl:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.largeButtonUrl.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::largeButtonImageIndex:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushinteger(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.largeButtonImageIndex);
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::smallButton1Title:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton1Title.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::smallButton1Url:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton1Url.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::smallButton1ImageIndex:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushinteger(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton1ImageIndex);
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::smallButton2Title:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton2Title.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::smallButton2Url:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton2Url.c_str());
+		break;
+	}
+
+	case eMainMenuPromoDataProperty::smallButton2ImageIndex:
+	{
+		g_pSquirrel<ScriptContext::UI>->pushinteger(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton2ImageIndex);
+		break;
+	}
+	}
+
+	return SQRESULT_NOTNULL;
+}
diff --git a/NorthstarDLL/scripts/client/scriptmodmenu.cpp b/NorthstarDLL/scripts/client/scriptmodmenu.cpp
new file mode 100644
index 00000000..75d05acc
--- /dev/null
+++ b/NorthstarDLL/scripts/client/scriptmodmenu.cpp
@@ -0,0 +1,166 @@
+#include "pch.h"
+#include "mods/modmanager.h"
+#include "squirrel/squirrel.h"
+
+ADD_SQFUNC("array<string>", NSGetModNames, "", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
+{
+	g_pSquirrel<context>->newarray(sqvm, 0);
+
+	for (Mod& mod : g_pModManager->m_LoadedMods)
+	{
+		g_pSquirrel<context>->pushstring(sqvm, mod.Name.c_str());
+		g_pSquirrel<context>->arrayappend(sqvm, -2);
+	}
+
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("bool", NSIsModEnabled, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
+{
+	const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
+
+	// manual lookup, not super performant but eh not a big deal
+	for (Mod& mod : g_pModManager->m_LoadedMods)
+	{
+		if (!mod.Name.compare(modName))
+		{
+			g_pSquirrel<context>->pushbool(sqvm, mod.m_bEnabled);
+			return SQRESULT_NOTNULL;
+		}
+	}
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("void", NSSetModEnabled, "string modName, bool enabled", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
+{
+	const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
+	const SQBool enabled = g_pSquirrel<context>->getbool(sqvm, 2);
+
+	// manual lookup, not super performant but eh not a big deal
+	for (Mod& mod : g_pModManager->m_LoadedMods)
+	{
+		if (!mod.Name.compare(modName))
+		{
+			mod.m_bEnabled = enabled;
+			return SQRESULT_NULL;
+		}
+	}
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("string", NSGetModDescriptionByModName, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
+{
+	const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
+
+	// manual lookup, not super performant but eh not a big deal
+	for (Mod& mod : g_pModManager->m_LoadedMods)
+	{
+		if (!mod.Name.compare(modName))
+		{
+			g_pSquirrel<context>->pushstring(sqvm, mod.Description.c_str());
+			return SQRESULT_NOTNULL;
+		}
+	}
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("string", NSGetModVersionByModName, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
+{
+	const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
+
+	// manual lookup, not super performant but eh not a big deal
+	for (Mod& mod : g_pModManager->m_LoadedMods)
+	{
+		if (!mod.Name.compare(modName))
+		{
+			g_pSquirrel<context>->pushstring(sqvm, mod.Version.c_str());
+			return SQRESULT_NOTNULL;
+		}
+	}
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("string", NSGetModDownloadLinkByModName, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
+{
+	const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
+
+	// manual lookup, not super performant but eh not a big deal
+	for (Mod& mod : g_pModManager->m_LoadedMods)
+	{
+		if (!mod.Name.compare(modName))
+		{
+			g_pSquirrel<context>->pushstring(sqvm, mod.DownloadLink.c_str());
+			return SQRESULT_NOTNULL;
+		}
+	}
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("int", NSGetModLoadPriority, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
+{
+	const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
+
+	// manual lookup, not super performant but eh not a big deal
+	for (Mod& mod : g_pModManager->m_LoadedMods)
+	{
+		if (!mod.Name.compare(modName))
+		{
+			g_pSquirrel<context>->pushinteger(sqvm, mod.LoadPriority);
+			return SQRESULT_NOTNULL;
+		}
+	}
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("bool", NSIsModRequiredOnClient, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
+{
+	const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
+
+	// manual lookup, not super performant but eh not a big deal
+	for (Mod& mod : g_pModManager->m_LoadedMods)
+	{
+		if (!mod.Name.compare(modName))
+		{
+			g_pSquirrel<context>->pushbool(sqvm, mod.RequiredOnClient);
+			return SQRESULT_NOTNULL;
+		}
+	}
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC(
+	"array<string>", NSGetModConvarsByModName, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
+{
+	const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
+	g_pSquirrel<context>->newarray(sqvm, 0);
+
+	// manual lookup, not super performant but eh not a big deal
+	for (Mod& mod : g_pModManager->m_LoadedMods)
+	{
+		if (!mod.Name.compare(modName))
+		{
+			for (ModConVar* cvar : mod.ConVars)
+			{
+				g_pSquirrel<context>->pushstring(sqvm, cvar->Name.c_str());
+				g_pSquirrel<context>->arrayappend(sqvm, -2);
+			}
+
+			return SQRESULT_NOTNULL;
+		}
+	}
+
+	return SQRESULT_NOTNULL; // return empty array
+}
+
+ADD_SQFUNC("void", NSReloadMods, "", "", ScriptContext::UI)
+{
+	g_pModManager->LoadMods();
+	return SQRESULT_NULL;
+}
diff --git a/NorthstarDLL/scripts/client/scriptserverbrowser.cpp b/NorthstarDLL/scripts/client/scriptserverbrowser.cpp
new file mode 100644
index 00000000..5f1287ad
--- /dev/null
+++ b/NorthstarDLL/scripts/client/scriptserverbrowser.cpp
@@ -0,0 +1,410 @@
+#include "pch.h"
+#include "squirrel/squirrel.h"
+#include "masterserver/masterserver.h"
+#include "server/auth/serverauthentication.h"
+#include "engine/r2engine.h"
+#include "client/r2client.h"
+
+// functions for viewing server browser
+
+ADD_SQFUNC("bool", NSIsMasterServerAuthenticated, "", "", ScriptContext::UI)
+{
+	g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bOriginAuthWithMasterServerDone);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("void", NSRequestServerList, "", "", ScriptContext::UI)
+{
+	g_pMasterServerManager->RequestServerList();
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("bool", NSIsRequestingServerList, "", "", ScriptContext::UI)
+{
+	g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bScriptRequestingServerList);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("bool", NSMasterServerConnectionSuccessful, "", "", ScriptContext::UI)
+{
+	g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bSuccessfullyConnected);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("int", NSGetServerCount, "", "", ScriptContext::UI)
+{
+	g_pSquirrel<context>->pushinteger(sqvm, g_pMasterServerManager->m_vRemoteServers.size());
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("string", NSGetServerName, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get name of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].name);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("string", NSGetServerDescription, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get description of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].description.c_str());
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("string", NSGetServerMap, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get map of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].map);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("string", NSGetServerPlaylist, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get playlist of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].playlist);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("int", NSGetServerPlayerCount, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get playercount of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushinteger(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].playerCount);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("int", NSGetServerMaxPlayerCount, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get max playercount of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushinteger(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].maxPlayers);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("string", NSGetServerID, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get id of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].id);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("bool", NSServerRequiresPassword, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get hasPassword of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].requiresPassword);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("int", NSGetServerRequiredModsCount, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get required mods count of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushinteger(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].requiredMods.size());
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("string", NSGetServerRegion, "int serverIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get region of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].region, -1);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("string", NSGetServerRequiredModName, "int serverIndex, int modIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+	SQInteger modIndex = g_pSquirrel<context>->getinteger(sqvm, 2);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get hasPassword of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	if (modIndex >= g_pMasterServerManager->m_vRemoteServers[serverIndex].requiredMods.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get required mod name of mod index {} when only {} mod are available",
+				modIndex,
+				g_pMasterServerManager->m_vRemoteServers[serverIndex].requiredMods.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].requiredMods[modIndex].Name.c_str());
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("string", NSGetServerRequiredModVersion, "int serverIndex, int modIndex", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+	SQInteger modIndex = g_pSquirrel<context>->getinteger(sqvm, 2);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get required mod version of server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	if (modIndex >= g_pMasterServerManager->m_vRemoteServers[serverIndex].requiredMods.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to get required mod version of mod index {} when only {} mod are available",
+				modIndex,
+				g_pMasterServerManager->m_vRemoteServers[serverIndex].requiredMods.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_vRemoteServers[serverIndex].requiredMods[modIndex].Version.c_str());
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("void", NSClearRecievedServerList, "", "", ScriptContext::UI)
+{
+	g_pMasterServerManager->ClearServerList();
+	return SQRESULT_NULL;
+}
+
+// functions for authenticating with servers
+
+ADD_SQFUNC("void", NSTryAuthWithServer, "int serverIndex, string password = ''", "", ScriptContext::UI)
+{
+	SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
+	const SQChar* password = g_pSquirrel<context>->getstring(sqvm, 2);
+
+	if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm,
+			fmt::format(
+				"Tried to auth with server index {} when only {} servers are available",
+				serverIndex,
+				g_pMasterServerManager->m_vRemoteServers.size())
+				.c_str());
+		return SQRESULT_ERROR;
+	}
+
+	// send off persistent data first, don't worry about server/client stuff, since m_additionalPlayerData should only have entries when
+	// we're a local server note: this seems like it could create a race condition, test later
+	for (auto& pair : g_pServerAuthentication->m_PlayerAuthenticationData)
+		g_pServerAuthentication->WritePersistentData(pair.first);
+
+	// do auth
+	g_pMasterServerManager->AuthenticateWithServer(
+		R2::g_pLocalPlayerUserID,
+		g_pMasterServerManager->m_sOwnClientAuthToken,
+		g_pMasterServerManager->m_vRemoteServers[serverIndex].id,
+		(char*)password);
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("bool", NSIsAuthenticatingWithServer, "", "", ScriptContext::UI)
+{
+	g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bScriptAuthenticatingWithGameServer);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("bool", NSWasAuthSuccessful, "", "", ScriptContext::UI)
+{
+	g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bSuccessfullyAuthenticatedWithGameServer);
+	return SQRESULT_NOTNULL;
+}
+
+ADD_SQFUNC("void", NSConnectToAuthedServer, "", "", ScriptContext::UI)
+{
+	if (!g_pMasterServerManager->m_bHasPendingConnectionInfo)
+	{
+		g_pSquirrel<context>->raiseerror(
+			sqvm, fmt::format("Tried to connect to authed server before any pending connection info was available").c_str());
+		return SQRESULT_ERROR;
+	}
+
+	RemoteServerConnectionInfo& info = g_pMasterServerManager->m_pendingConnectionInfo;
+
+	// set auth token, then try to connect
+	// i'm honestly not entirely sure how silentconnect works regarding ports and encryption so using connect for now
+	R2::g_pCVar->FindVar("serverfilter")->SetValue(info.authToken);
+	R2::Cbuf_AddText(
+		R2::Cbuf_GetCurrentPlayer(),
+		fmt::format(
+			"connect {}.{}.{}.{}:{}",
+			info.ip.S_un.S_un_b.s_b1,
+			info.ip.S_un.S_un_b.s_b2,
+			info.ip.S_un.S_un_b.s_b3,
+			info.ip.S_un.S_un_b.s_b4,
+			info.port)
+			.c_str(),
+		R2::cmd_source_t::kCommandSrcCode);
+
+	g_pMasterServerManager->m_bHasPendingConnectionInfo = false;
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("void", NSTryAuthWithLocalServer, "", "", ScriptContext::UI)
+{
+	// do auth request
+	g_pMasterServerManager->AuthenticateWithOwnServer(R2::g_pLocalPlayerUserID, g_pMasterServerManager->m_sOwnClientAuthToken);
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("void", NSCompleteAuthWithLocalServer, "", "", ScriptContext::UI)
+{
+	// literally just set serverfilter
+	// note: this assumes we have no authdata other than our own
+	if (g_pServerAuthentication->m_RemoteAuthenticationData.size())
+		R2::g_pCVar->FindVar("serverfilter")->SetValue(g_pServerAuthentication->m_RemoteAuthenticationData.begin()->first.c_str());
+
+	return SQRESULT_NULL;
+}
+
+ADD_SQFUNC("string", NSGetAuthFailReason, "", "", ScriptContext::UI)
+{
+	g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_sAuthFailureReason.c_str(), -1);
+	return SQRESULT_NOTNULL;
+}
diff --git a/NorthstarDLL/scripts/client/scriptservertoclientstringcommand.cpp b/NorthstarDLL/scripts/client/scriptservertoclientstringcommand.cpp
new file mode 100644
index 00000000..f3cb2f18
--- /dev/null
+++ b/NorthstarDLL/scripts/client/scriptservertoclientstringcommand.cpp
@@ -0,0 +1,19 @@
+#include "pch.h"
+#include "squirrel/squirrel.h"
+#include "core/convar/convar.h"
+#include "core/convar/concommand.h"
+
+void ConCommand_ns_script_servertoclientstringcommand(const CCommand& arg)
+{
+	if (g_pSquirrel<ScriptContext::CLIENT>->m_pSQVM)
+		g_pSquirrel<ScriptContext::CLIENT>->Call("NSClientCodeCallback_RecievedServerToClientStringCommand", arg.ArgS());
+}
+
+ON_DLL_LOAD_CLIENT_RELIESON("client.dll", ScriptServerToClientStringCommand, ClientSquirrel, (CModule module))
+{
+	RegisterConCommand(
+		"ns_script_servertoclientstringcommand",
+		ConCommand_ns_script_servertoclientstringcommand,
+		"",
+		FCVAR_CLIENTDLL | FCVAR_SERVER_CAN_EXECUTE);
+}