R2Northstar · uniboi · Feb 26, 2023 · Feb 26, 2023 · Feb 28, 2023 · Mar 2, 2023
diff --git a/.github/nativefuncs.json b/.github/nativefuncs.json
@@ -1,58 +1,28 @@
 {
 	"SERVER":[
-		{
-			"name":"NSGetModNames",
-			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":""
-		},
-		{
-			"name":"NSIsModEnabled",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
 		{
 			"name":"NSSetModEnabled",
 			"helpText":"",
 			"returnTypeString":"void",
-			"argTypes":"string modName, bool enabled"
-		},
-		{
-			"name":"NSGetModDescriptionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModVersionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDownloadLinkByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
+			"argTypes":"int index, bool enabled"
 		},
 		{
-			"name":"NSGetModLoadPriority",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"string modName"
+			"name":"NSGetMods",
+			"helpText":"Get all installed mods",
+			"returnTypeString":"array<Mod>",
+			"argTypes":""
 		},
 		{
-			"name":"NSIsModRequiredOnClient",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
+			"name":"NSGetInvalidMods",
+			"helpText":"Get all mods that are installed in a subfolder",
+			"returnTypeString":"array<Mod>",
+			"argTypes":""
 		},
 		{
-			"name":"NSGetModConvarsByModName",
+			"name":"NSReloadMods",
 			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":"string modName"
+			"returnTypeString":"void",
+			"argTypes":""
 		},
 		{
 			"name":"DecodeJSON",
@@ -248,59 +218,29 @@
 			"returnTypeString":"void",
 			"argTypes":"int context, string text"
 		},
-		{
-			"name":"NSGetModNames",
-			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":""
-		},
-		{
-			"name":"NSIsModEnabled",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
 		{
 			"name":"NSSetModEnabled",
 			"helpText":"",
 			"returnTypeString":"void",
-			"argTypes":"string modName, bool enabled"
+			"argTypes":"int index, bool enabled"
 		},
 		{
-			"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":"NSGetMods",
+			"helpText":"Get all installed mods",
+			"returnTypeString":"array<Mod>",
+			"argTypes":""
 		},
 		{
-			"name":"NSIsModRequiredOnClient",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
+			"name":"NSGetInvalidMods",
+			"helpText":"Get all mods that are installed in a subfolder",
+			"returnTypeString":"array<Mod>",
+			"argTypes":""
 		},
 		{
-			"name":"NSGetModConvarsByModName",
+			"name":"NSReloadMods",
 			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":"string modName"
+			"returnTypeString":"void",
+			"argTypes":""
 		},
 		{
 			"name":"DecodeJSON",
@@ -454,59 +394,23 @@
 			"returnTypeString":"var",
 			"argTypes":"int promoDataKey"
 		},
-		{
-			"name":"NSGetModNames",
-			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":""
-		},
-		{
-			"name":"NSIsModEnabled",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
 		{
 			"name":"NSSetModEnabled",
 			"helpText":"",
 			"returnTypeString":"void",
-			"argTypes":"string modName, bool enabled"
-		},
-		{
-			"name":"NSGetModDescriptionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModVersionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
+			"argTypes":"int index, bool enabled"
 		},
 		{
-			"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":"NSGetMods",
+			"helpText":"Get all installed mods",
+			"returnTypeString":"array<Mod>",
+			"argTypes":""
 		},
 		{
-			"name":"NSGetModConvarsByModName",
-			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":"string modName"
+			"name":"NSGetInvalidMods",
+			"helpText":"Get all mods that are installed in a subfolder",
+			"returnTypeString":"array<Mod>",
+			"argTypes":""
 		},
 		{
 			"name":"NSReloadMods",

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
@@ -321,6 +321,11 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"INVALID_MASTERSERVER_TOKEN" 	"Invalid or expired masterserver token"
 		"JSON_PARSE_ERROR" 				"Error parsing json response"
 		"UNSUPPORTED_VERSION" 			"The version you are using is no longer supported"
+
+		// Incorrect Mod Installation
+		"INCORRECT_MOD_INSTALL_TOAST"		"Some of your mods are incorrectly installed. Click here for more info."
+		"INCORRECT_MODS_MODLIST_HEADER"		"Incorrectly Installed Mods (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION"	"This mod is incorrectly installed. Every mod has a file called \"mod.json\" in its root directory, however for this mod it was not found.\n\nExpected location: %s1/mod.json\nFound location: %s2/mod.json\n\nMake sure both mod.json file and mod directory are direct children of your mod folder."
 
 		// Mod Settings
 		"MOD_SETTINGS"					"Mod Settings"

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_french.txt b/Northstar.Client/mod/resource/northstar_client_localisation_french.txt
@@ -320,6 +320,11 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"JSON_PARSE_ERROR"                 "Une erreur est survenue durant l'analyse JSON"
 		"UNSUPPORTED_VERSION"             "La version que vous utilisez n'est plus supportée"
 
+		// Incorrect Mod Installation
+		"INCORRECT_MOD_INSTALL_TOAST" "Certains de vos mods sont incorrectement installés. Cliquez ici pour plus d'informations."
+		"INCORRECT_MODS_MODLIST_HEADER" "Mods Incorrectement Installés (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION" "Ce mod est incorrectement installé. Chaque mod a un fichier appelé "mod.json" dans son répertoire principal, cependant pour ce mod, il n'a pas été trouvé.\n\nEmplacement attendu : %s1/mod.json\nEmplacement trouvé : %s2/mod.json\n\nAssurez-vous que le fichier mod.json et le répertoire mod sont des enfants directs de votre dossier mod."
+
 		"MOD_SETTINGS"                    "Paramètres de mod"
 		"NORTHSTAR_BASE_SETTINGS"        "Paramètres de base de Northstar"
 		"ONLY_HOST_MATCH_SETTINGS"        "Seul l'hôte peut changer les paramètres de match privé"

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_german.txt b/Northstar.Client/mod/resource/northstar_client_localisation_german.txt
@@ -310,6 +310,11 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü
 		"INVALID_MASTERSERVER_TOKEN"     "Ungültiger oder abgelaufener Token vom Masterserver"
 		"JSON_PARSE_ERROR"                 "Fehler beim Verarbeiten der JSON-Antwort"
 		"UNSUPPORTED_VERSION"             "Die Version die du benutzt ist nicht länger unterstützt"
+
+		// Incorrect Mod Installation
+		"INCORRECT_MOD_INSTALL_TOAST" "Einige Ihrer Mods sind nicht korrekt installiert. Klicken Sie hier für weitere Informationen."
+		"INCORRECT_MODS_MODLIST_HEADER" "Fehlerhaft installierte Mods (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION" "Dieser Mod ist nicht korrekt installiert. Jede Mod hat eine Datei namens "mod.json" in ihrem Stammverzeichnis, aber für diese Mod wurde sie nicht gefunden.\n\nErwarteter Speicherort: %s1/mod.json\nGefundener Speicherort: %s2/mod.json\n\nStellen Sie sicher, dass sowohl die mod.json-Datei als auch das mod-Verzeichnis direkte Unterordner Ihres mod-Ordners sind."
 		"SNS_LEADER_BANKRUPT_SUB"             "%s1 Wurde Von %s2 Zurückgesetzt"
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_italian.txt b/Northstar.Client/mod/resource/northstar_client_localisation_italian.txt
@@ -320,6 +320,11 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
 		"JSON_PARSE_ERROR"                 "Errore nell'analisi della risposta json"
 		"UNSUPPORTED_VERSION"             "La versione che stai usando non è più supportata"
 
+		// Incorrect Mod Installation
+		"INCORRECT_MOD_INSTALL_TOAST" "Alcune delle tue mods sono state installate incorrettamente. Clicca qui per avere più info."
+		"INCORRECT_MODS_MODLIST_HEADER" "Mods Installate Incorrettamente (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION" "Questa mod è installata incorrettamente. Tutte le mod hanno un file chiamato \"mod.json\" nella loro cartella principale, ma non è stata trovata in questa mod.\n\nPosizione aspettata: %s1/mod.json\nFound location: %s2/mod.json\n\nAssicurati che sia il file mod.json che mod directory siano sottocategorie dirette della tua cartella mod."	}
+
 		"MOD_SETTINGS"				"Impostazioni Mod"
 		"NORTHSTAR_BASE_SETTINGS"		"Impostazioni base Northstar"
 		"ONLY_HOST_MATCH_SETTINGS"		"Solo l'Host può modificare le impostazioni della Partita Privata"

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt b/Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt
@@ -349,5 +349,10 @@
 		"UNSUPPORTED_VERSION" 			"現在使用しているバージョンはサポートされていません\n(The version you are using is no longer supported)"
 
 		// Translation done by Zetryox and CYakigasi
+
+		// Incorrect Mod Installation
+		"INCORRECT_MOD_INSTALL_TOAST" "一部のMODが誤ってインストールされています。詳しくはここをクリックしてください。"
+		"INCORRECT_MODS_MODLIST_HEADER" "不正にインストールされたMOD (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION" "このMODは正しくインストールされていません。すべてのMODはルートディレクトリに「mod.json」というファイルを持ちますが、このMODでは見つかりませんでした\n\nExpected location: %s1/mod.json\nFound location: %s2/mod.json\n\nMODフォルダから直接MODディレクトリとmod.jsonファイルの両方を確認する"
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_mspanish.txt b/Northstar.Client/mod/resource/northstar_client_localisation_mspanish.txt
@@ -318,6 +318,11 @@ Si estas de acuerdo con esto, presiona SI. Esta decision puede ser cambiada en e
 		"PLAYER_NOT_FOUND"                "No se encontró la cuenta del jugador"
 		"INVALID_MASTERSERVER_TOKEN"      "Token de jugador expirado o invalido"
 		"JSON_PARSE_ERROR"                "Error procesando respuesta json"
-		"UNSUPPORTED_VERSION"             "La versión que estas usando ya no esta soportada" 
+		"UNSUPPORTED_VERSION"             "La versión que estas usando ya no esta soportada"
+
+		// Incorrect Mod Installation
+		"INCORRECT_MOD_INSTALL_TOAST" "Algunos de tus mods están instalados incorrectamente. Haz clic aquí para obtener más información."
+		"INCORRECT_MODS_MODLIST_HEADER" "Mods instalados incorrectamente (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION" "Este mod está instalado incorrectamente. Cada mod tiene un archivo llamado "mod.json" en su directorio raíz, sin embargo para este mod no fue encontrado.\n\nUbicación esperada: %s1/mod.json\nUbicación encontrada: %s2/mod.json\n\nAsegúrese de que tanto el archivo mod.json como el directorio mod son hijos directos de su carpeta mod."
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_portuguese.txt b/Northstar.Client/mod/resource/northstar_client_localisation_portuguese.txt
@@ -306,5 +306,10 @@ Clique em Sim se você concorda. Esta escolha pode ser alterada a qualquer momen
 		// In-game chat
 		"HUD_CHAT_WHISPER_PREFIX" "[WHISPER]"
 		"HUD_CHAT_SERVER_PREFIX" "[SERVER]"
+
+		// Incorrect Mod Install
+		"INCORRECT_MOD_INSTALL_TOAST" "Alguns dos teus mods estão incorrectamente instalados. Clique aqui para mais informações."
+		"INCORRECT_MODS_MODLIST_HEADER" "Mods instalados incorrectamente (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION" "Este mod está instalado incorrectamente. Todos os mods têm um ficheiro chamado \"mod.json\" no seu directório raiz, mas para este mod não foi encontrado.\n\nLocalização esperada: %s1/mod.json\nLocalização encontrada: %s2/mod.json\n\nCertifica-te de que o ficheiro mod.json e o directório mod são filhos directos da tua pasta mod."
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_russian.txt b/Northstar.Client/mod/resource/northstar_client_localisation_russian.txt
@@ -253,6 +253,11 @@
 		"INVALID_MASTERSERVER_TOKEN"    "Срок действия жетона главного сервера истек или не является правильным"
 		"JSON_PARSE_ERROR"                              "Ошибка разбора ответа json"
 		"UNSUPPORTED_VERSION"                    "Используемая вами версия больше не поддерживается"
+
+		// Incorrect Mod Install
+		"INCORRECT_MOD_INSTALL_TOAST"        "Некоторые из ваших модов неправильно установлены. Нажмите здесь для подробной информации."
+		"INCORRECT_MODS_MODLIST_HEADER"        "Неправильно Установленных Модов (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION"    "Этот мод неправильно установлен. Каждый мод имеет файл \"mod.json\" в его корневой директории, но для этого мода он не был найден.\n\nОжидаемое место: %s1/mod.json\nНайдено место: %s2/mod.json\n\nУдостоверьтесь, что файл mod.json и директория мода находятся в вашей папке модов."
 		"DISABLE"                    "Выключить"
 		"DIALOG_AUTHENTICATING_MASTERSERVER"                    "Аутентификация на главном сервере."
 		"WARNING"                    "Предупреждение"

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_spanish.txt b/Northstar.Client/mod/resource/northstar_client_localisation_spanish.txt
@@ -318,6 +318,11 @@ Presiona Sí al estar de acuerdo. Esta opcion se puede cambiar en el menú de mo
 		"PLAYER_NOT_FOUND"                "No se encontró la cuenta del jugador"
 		"INVALID_MASTERSERVER_TOKEN"      "Token de jugador expirado o invalido"
 		"JSON_PARSE_ERROR"                "Error procesando respuesta json"
-		"UNSUPPORTED_VERSION"             "La versión que estas usando ya no esta soportada" 
+		"UNSUPPORTED_VERSION"             "La versión que estas usando ya no esta soportada"
+
+		// Incorrect Mod Installation
+		"INCORRECT_MOD_INSTALL_TOAST" "Algunos de tus mods están instalados incorrectamente. Haz clic aquí para obtener más información."
+		"INCORRECT_MODS_MODLIST_HEADER" "Mods instalados incorrectamente (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION" "Este mod está instalado incorrectamente. Cada mod tiene un archivo llamado "mod.json" en su directorio raíz, sin embargo para este mod no fue encontrado.\n\nUbicación esperada: %s1/mod.json\nUbicación encontrada: %s2/mod.json\n\nAsegúrese de que tanto el archivo mod.json como el directorio mod son hijos directos de su carpeta mod."
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_tchinese.txt b/Northstar.Client/mod/resource/northstar_client_localisation_tchinese.txt
@@ -323,6 +323,12 @@
 		"INVALID_MASTERSERVER_TOKEN"     "主伺服器token過期或無效"
 		"JSON_PARSE_ERROR"                 "讀取json回應時發生錯誤"
 		"UNSUPPORTED_VERSION"             "您的遊戲版本過低"
+
+		// Incorrect Mod Installation
+		"INCORRECT_MOD_INSTALL_TOAST" "你的一些MOD被错误地安装。点击这里获取更多信息。"
+		"INCORRECT_MODS_MODLIST_HEADER" "不正确地安装了MODs (%s1)"
+		"INCORRECT_MOD_INSTALL_DESCRIPTION" "这个MOD的安装不正确。每个mod在它的根目录下都有一个叫mod.json的文件，但是对于这个mod来说，它没有被找到。\n\n预期的位置：%s1/mod.json/n找到的位置：%s2/mod.json\n\n确保mod.json文件和mod目录都是你mod文件夹的直接子文件夹。"
+
 		"NORTHSTAR_BASE_SETTINGS"             "北极星基础设置"
 		"ONLY_HOST_CAN_START_MATCH"             "只有服主可以開始對局"
 		"MATCH_COUNTDOWN_LENGTH"             "私人對局倒計時時間"