Merge branch 'main' into feat/mad-abort

Alystrasz · Nov 22, 2024 · 3ffbf5f · 3ffbf5f
2 parents 71bf2ba + e7aa1c2
commit 3ffbf5f
Show file tree

Hide file tree

Showing 7 changed files with 1,154 additions and 280 deletions.
diff --git a/.github/nativefuncs.json b/.github/nativefuncs.json
@@ -7,59 +7,17 @@
 			"argTypes":""
 		},
 		{
-			"name":"NSIsModEnabled",
+			"name":"NSGetModsInformation",
 			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
+			"returnTypeString":"array<ModInfo>",
+			"argTypes":""
 		},
 		{
 			"name":"NSSetModEnabled",
 			"helpText":"",
 			"returnTypeString":"void",
 			"argTypes":"string modName, bool enabled"
 		},
-		{
-			"name":"NSIsModRemote",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDescriptionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModVersionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDownloadLinkByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModLoadPriority",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSIsModRequiredOnClient",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModConvarsByModName",
-			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":"string modName"
-		},
 		{
 			"name":"DecodeJSON",
 			"helpText":"converts a json string to a squirrel table",
@@ -260,60 +218,12 @@
 			"returnTypeString":"array<string>",
 			"argTypes":""
 		},
-		{
-			"name":"NSIsModEnabled",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
 		{
 			"name":"NSSetModEnabled",
 			"helpText":"",
 			"returnTypeString":"void",
 			"argTypes":"string modName, bool enabled"
 		},
-		{
-			"name":"NSIsModRemote",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDescriptionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModVersionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDownloadLinkByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModLoadPriority",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSIsModRequiredOnClient",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModConvarsByModName",
-			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":"string modName"
-		},
 		{
 			"name":"DecodeJSON",
 			"helpText":"converts a json string to a squirrel table",
@@ -467,58 +377,22 @@
 			"argTypes":""
 		},
 		{
-			"name":"NSIsModEnabled",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSSetModEnabled",
-			"helpText":"",
-			"returnTypeString":"void",
-			"argTypes":"string modName, bool enabled"
-		},
-		{
-			"name":"NSIsModRemote",
+			"name":"NSGetModsInformation",
 			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDescriptionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModVersionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDownloadLinkByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModLoadPriority",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"string modName"
+			"returnTypeString":"array<ModInfo>",
+			"argTypes":""
 		},
 		{
-			"name":"NSIsModRequiredOnClient",
+			"name":"NSGetModInformation",
 			"helpText":"",
-			"returnTypeString":"bool",
+			"returnTypeString":"array<ModInfo>",
 			"argTypes":"string modName"
 		},
 		{
-			"name":"NSGetModConvarsByModName",
+			"name":"NSSetModEnabled",
 			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":"string modName"
+			"returnTypeString":"void",
+			"argTypes":"string modName, bool enabled"
 		},
 		{
 			"name": "NSFetchVerifiedModsManifesto",

diff --git a/Northstar.Client/mod/scripts/vscripts/cl_northstar_client_init.nut b/Northstar.Client/mod/scripts/vscripts/cl_northstar_client_init.nut
@@ -29,6 +29,19 @@ global struct UIPresenceStruct {
     int gameState
 }
 
+global struct ModInfo
+{
+    string name = ""
+    string description = ""
+    string version = ""
+    string downloadLink = ""
+    int loadPriority = 0
+    bool enabled = false
+    bool requiredOnClient = false
+    bool isRemote
+    array<string> conVars = []
+}
+
 global struct RequiredModInfo
 {
     string name