Merge branch 'master' into nitro

Author: Proxy-99

.github/workflows/crowdin-auto-merge.yml

@@ -0,0 +1,31 @@
+name: Crowdin Auto-Merge
+
+on:
+  schedule:
+    - cron: '0 0 * * 5'  # This cron expression runs the workflow every Friday at midnight (UTC)
+  workflow_dispatch:
+
+jobs:
+  crowdin-auto-merge:
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Git
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Auto-merge pull request
+        run: |
+          PR_NUMBER=$(gh pr list --repo ${{ github.repository }} --author 'MTABot' --base 'master' --head 'l10n/master' --state open --json number --jq '.[0].number')
+          if [ -n "$PR_NUMBER" ]; then
+            gh pr merge $PR_NUMBER --squash --repo ${{ github.repository }} --admin --subject "New Crowdin updates (PR #$PR_NUMBER)" --body ""
+            git push origin --delete l10n/master
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dockerimage.yaml

@@ -26,6 +26,7 @@ jobs:
           dockerfile: Dockerfile.armhf
         - tag: arm64
           dockerfile: Dockerfile.arm64
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

.github/workflows/rebuild-pots.yaml

@@ -4,6 +4,7 @@ on: [push, workflow_dispatch]
 
 jobs:
   test:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -23,6 +24,7 @@ jobs:
         run: pytest "utils/localization/tests"
         shell: bash -l {0}
   rebuild-pots:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     needs: test
     steps:

.github/workflows/run-generate-translators.yaml

@@ -0,0 +1,52 @@
+name: "Update crowdin-translators.json"
+
+on:
+  workflow_dispatch:
+  delete:
+    branches:
+      - l10n/master
+
+jobs:
+  generate_translators:
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: master
+          token: ${{ secrets.POT_CI_PAT }}
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: latest
+          cache: 'npm'
+          cache-dependency-path: ./utils/localization/generate-translators/package-lock.json
+      
+      - name: Install dependencies
+        working-directory: ./utils/localization/generate-translators
+        run: npm clean-install
+      
+      - name: Generate translators
+        working-directory: ./utils/localization/generate-translators
+        env:
+          CROWDIN_TOKEN: "${{ secrets.CROWDIN_TOKEN }}"
+          CROWDIN_ORGANIZATION: "multitheftauto"
+          CROWDIN_PROJECT_ID: "13"  # Multi Theft Auto
+          CROWDIN_IGNORE_USER_ID: "2"  # multitheftautoqa
+        run: npm run ci
+      
+      - name: Commit changes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+          git add ./utils/localization/generate-translators/crowdin-translators.json
+
+          if ! git diff-index --quiet HEAD; then
+            git commit -m "Update crowdin-translators.json" -m "[ci skip]"
+            git push
+          fi

.github/workflows/stale.yaml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   stale:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: multitheftauto/[email protected]

.github/workflows/sync-master-to-maetro.yaml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   sync-master-to-maetro:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -416,3 +416,4 @@ utils/DXFiles/
 !*.dll
 !*.exe
 utils/vswhere.exe
+*.generated.h

Client/cefweb/CWebCore.cpp

@@ -409,7 +409,7 @@ std::unordered_set<SString> CWebCore::AllowPendingPages(bool bRemember)
     }
 
     // Trigger an event now
-    auto pCurrentMod = g_pCore->GetModManager()->GetCurrentMod();
+    auto pCurrentMod = g_pCore->GetModManager()->GetClient();
     if (!pCurrentMod)
         return std::unordered_set<SString>();
 

Client/core/CChat.cpp

@@ -650,7 +650,29 @@ bool CChat::CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs)
 
             // If the input isn't empty and isn't identical to the previous entry in history, add it to the history
             if (!m_strInputText.empty() && (m_pInputHistory->Empty() || m_pInputHistory->GetLast() != m_strInputText))
-                m_pInputHistory->Add(m_strInputText);
+            {
+                if (m_strCommand.empty() && m_strInputText[0] != '/')
+                {
+                    // If the input is not a command, store it
+                    m_pInputHistory->Add(m_strInputText);
+                }
+                else if (m_strCommand.compare("login") != 0)
+                {
+                    // If the input is a command, check that it isn't the 'login' command, if it is censor it
+                    char szInput[256];
+                    unsigned int uiLength = sizeof(szInput) - 1;
+
+                    strncpy(szInput, m_strInputText.c_str() + 1, uiLength);
+                    szInput[uiLength] = '\0';
+
+                    const char* szCommand = strtok(szInput, " ");
+                    
+                    if (szCommand && (strcmp(szCommand, "login") != 0))
+                        m_pInputHistory->Add(m_strInputText);
+                    else if ((m_pInputHistory->Empty() || m_pInputHistory->GetLast() != std::string("/login")))
+                        m_pInputHistory->Add("/login");
+                }
+            }
 
             SetInputVisible(false);
 
@@ -677,11 +699,11 @@ bool CChat::CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs)
                 SString strPlayerNamePart = strCurrentInput.substr(iFound);
 
                 CModManager* pModManager = CModManager::GetSingletonPtr();
-                if (pModManager && pModManager->GetCurrentMod())
+                if (pModManager && pModManager->IsLoaded())
                 {
                     // Create vector and get playernames from deathmatch module
                     std::vector<SString> vPlayerNames;
-                    pModManager->GetCurrentMod()->GetPlayerNames(vPlayerNames);
+                    pModManager->GetClient()->GetPlayerNames(vPlayerNames);
 
                     for (std::vector<SString>::iterator iter = vPlayerNames.begin(); iter != vPlayerNames.end(); ++iter)
                     {

Client/core/CCommandFuncs.cpp

@@ -167,36 +167,13 @@ void CCommandFuncs::Clear(const char* szParameters)
 
 void CCommandFuncs::Load(const char* szParameters)
 {
-    if (!szParameters)
-    {
-        CCore::GetSingleton().GetConsole()->Printf("* Syntax: load <mod-name> [<arguments>]");
-        return;
-    }
-
-    // Copy the buffer
-    char* szTemp = new char[strlen(szParameters) + 1];
-    strcpy(szTemp, szParameters);
-
-    // Split it up into mod name and the arguments
-    char* szModName = strtok(szTemp, " ");
-    char* szArguments = strtok(NULL, "\0");
-
-    if (szModName)
-    {
-        // Load the mod with the given arguments
-        CModManager::GetSingleton().RequestLoad(szModName, szArguments);
-    }
-    else
-        CCore::GetSingleton().GetConsole()->Printf("* Syntax: load <mod-name> [<arguments>]");
-
-    // Free the temp buffer
-    delete[] szTemp;
+    CModManager::GetSingleton().RequestLoad(szParameters);
 }
 
 void CCommandFuncs::Unload(const char* szParameters)
 {
     // Any mod loaded?
-    if (CModManager::GetSingleton().GetCurrentMod())
+    if (CModManager::GetSingleton().IsLoaded())
     {
         // Unload it
         CModManager::GetSingleton().RequestUnload();
@@ -209,6 +186,12 @@ void CCommandFuncs::Unload(const char* szParameters)
 
 void CCommandFuncs::Connect(const char* szParameters)
 {
+    if (!CCore::GetSingleton().IsNetworkReady())
+    {
+        CCore::GetSingleton().GetConsole()->Print(_("connect: Network is not ready, please wait a moment"));
+        return;
+    }
+
     // Parse the arguments (host port nick pass)
     char szBuffer[256] = "";
     if (szParameters)
@@ -264,7 +247,7 @@ void CCommandFuncs::Connect(const char* szParameters)
     CModManager::GetSingleton().Unload();
 
     // Only connect if there is no mod loaded
-    if (!CModManager::GetSingleton().GetCurrentMod())
+    if (!CModManager::GetSingleton().IsLoaded())
     {
         // Start the connect
         if (CCore::GetSingleton().GetConnectManager()->Connect(szHost, usPort, strNick.c_str(), szPass))
@@ -284,7 +267,7 @@ void CCommandFuncs::Connect(const char* szParameters)
 
 void CCommandFuncs::ReloadNews(const char* szParameters)
 {
-    if (CModManager::GetSingleton().GetCurrentMod())
+    if (CModManager::GetSingleton().IsLoaded())
     {
         CCore::GetSingleton().GetConsole()->Print("reloadnews: can't do this whilst connected to server");
         return;
@@ -296,6 +279,12 @@ void CCommandFuncs::ReloadNews(const char* szParameters)
 
 void CCommandFuncs::Reconnect(const char* szParameters)
 {
+    if (!CCore::GetSingleton().IsNetworkReady())
+    {
+        CCore::GetSingleton().GetConsole()->Print(_("reconnect: Network is not ready, please wait a moment"));
+        return;
+    }
+
     CModManager::GetSingleton().Unload();
 
     std::string  strHost, strNick, strPassword;
@@ -309,7 +298,7 @@ void CCommandFuncs::Reconnect(const char* szParameters)
     CModManager::GetSingleton().Unload();
 
     // Any mod loaded?
-    if (!CModManager::GetSingleton().GetCurrentMod())
+    if (!CModManager::GetSingleton().IsLoaded())
     {
         // Verify and convert the port number
         if (uiPort <= 0 || uiPort > 0xFFFF)