diff --git a/scripts/client/locale.js b/scripts/client/locale.js index bdeb29de..e49e0d76 100644 --- a/scripts/client/locale.js +++ b/scripts/client/locale.js @@ -35,7 +35,7 @@ function getAvailableLocaleOptions() { // =========================================================================== function loadLocaleConfig() { - let configFile = loadTextFile("config/client/locale.json"); + let configFile = getContentsOfTextFile("config/client/locale.json"); getServerData().localeOptions = JSON.parse(configFile); //resetLocaleChooserOptions(); @@ -48,7 +48,7 @@ function loadAllLocaleStrings() { let localeOptions = getServerData().localeOptions; for (let i in localeOptions) { logToConsole(LOG_INFO, `[AGRP.Locale] Loading locale strings for ${localeOptions[i].englishName} (${i})`); - let localeStringFile = loadTextFile(`locale/${localeOptions[i].stringsFile}`); + let localeStringFile = getContentsOfTextFile(`locale/${localeOptions[i].stringsFile}`); let localeStringData = JSON.parse(localeStringFile); let localeId = localeOptions[i].id; diff --git a/scripts/server/config.js b/scripts/server/config.js index c3a1ed8e..d8dad804 100644 --- a/scripts/server/config.js +++ b/scripts/server/config.js @@ -982,7 +982,7 @@ function getServerIntroMusicURL() { function loadLocaleConfig() { logToConsole(LOG_DEBUG, "[AGRP.Config] Loading locale configuration"); - let localeConfig = JSON.parse(loadTextFile(`config/locale.json`)); + let localeConfig = JSON.parse(getContentsOfTextFile(`config/locale.json`)); if (localeConfig != null) { return localeConfig; } @@ -992,7 +992,7 @@ function loadLocaleConfig() { function loadEconomyConfig() { logToConsole(LOG_DEBUG, "[AGRP.Config] Loading economy configuration"); - let economyConfig = JSON.parse(loadTextFile(`config/economy.json`)); + let economyConfig = JSON.parse(getContentsOfTextFile(`config/economy.json`)); if (economyConfig != null) { return economyConfig; } @@ -1002,7 +1002,7 @@ function loadEconomyConfig() { function loadAccentConfig() { logToConsole(LOG_DEBUG, "[AGRP.Config] Loading accents configuration"); - let accentConfig = JSON.parse(loadTextFile(`config/accents.json`)); + let accentConfig = JSON.parse(getContentsOfTextFile(`config/accents.json`)); if (accentConfig != null) { return accentConfig; } @@ -1012,7 +1012,7 @@ function loadAccentConfig() { function loadDiscordConfig() { logToConsole(LOG_DEBUG, "[AGRP.Config] Loading discord configuration"); - let discordConfig = JSON.parse(loadTextFile(`config/discord.json`)); + let discordConfig = JSON.parse(getContentsOfTextFile(`config/discord.json`)); if (discordConfig != null) { return discordConfig; } @@ -1023,7 +1023,7 @@ function loadDiscordConfig() { function loadDatabaseConfig() { logToConsole(LOG_DEBUG, "[AGRP.Config] Loading database configuration"); - let databaseConfig = JSON.parse(loadTextFile("config/database.json")); + let databaseConfig = JSON.parse(getContentsOfTextFile("config/database.json")); if (databaseConfig != null) { return databaseConfig; } @@ -1034,7 +1034,7 @@ function loadDatabaseConfig() { function loadKeyBindConfig() { logToConsole(LOG_DEBUG, "[AGRP.Config] Loading keybind configuration"); - let keyBindConfig = JSON.parse(loadTextFile("config/keybind.json")); + let keyBindConfig = JSON.parse(getContentsOfTextFile("config/keybind.json")); if (keyBindConfig != null) { return keyBindConfig; } @@ -1045,7 +1045,7 @@ function loadKeyBindConfig() { function loadEmailConfig() { logToConsole(LOG_DEBUG, "[AGRP.Config] Loading email configuration"); - let emailConfig = JSON.parse(loadTextFile("config/email.json")); + let emailConfig = JSON.parse(getContentsOfTextFile("config/email.json")); if (emailConfig != null) { return emailConfig; } diff --git a/scripts/server/locale.js b/scripts/server/locale.js index e506a96e..12d31b47 100644 --- a/scripts/server/locale.js +++ b/scripts/server/locale.js @@ -164,7 +164,7 @@ function loadAllLocaleStrings() { let locales = getGlobalConfig().locale.locales; for (let i in locales) { let localeData = locales[i]; - let localeFile = JSON.parse(loadTextFile(`locale/${localeData.stringsFile}`)); + let localeFile = JSON.parse(getContentsOfTextFile(`locale/${localeData.stringsFile}`)); tempLocaleStrings[i] = localeFile; } diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js index bd05c88c..3d60d6f6 100644 --- a/scripts/server/native/connected.js +++ b/scripts/server/native/connected.js @@ -1481,4 +1481,10 @@ function shutdownServer() { server.shutdown(); } +// =========================================================================== + +function getContentsOfTextFile(filePath) { + return loadTextFile(filePath); +} + // =========================================================================== \ No newline at end of file diff --git a/scripts/server/native/ragemp.js b/scripts/server/native/ragemp.js index 02967687..3a168555 100644 --- a/scripts/server/native/ragemp.js +++ b/scripts/server/native/ragemp.js @@ -9,16 +9,6 @@ // =========================================================================== let builtInCommands = [ - "refresh", - "restart", - "stop", - "start", - "reconnect", - "setname", - "connect", - "disconnect", - "say", - "dumpdoc", ]; // =========================================================================== @@ -1267,4 +1257,10 @@ function setServerPassword(password) { server.setPassword(password); } +// =========================================================================== + +function getContentsOfTextFile(filePath) { + return ""; +} + // =========================================================================== \ No newline at end of file