Merge remote-tracking branch 'upstream/master' into pr/19567

.github/SECURITY.md

@@ -15,23 +15,16 @@ Versions of AzerothCore:
 | AzerothCore Branch | Supported          |
 | ------------------ | ------------------ |
 | master             | :white_check_mark: |
+| Any playerbot fork | :red_circle:       |
+| Any NPCBot fork    | :red_circle:       |
 
 Versions of MySQL:
 
 | MySQL Version | Supported          |
 | ------------- | ------------------ |
-| 8.1           | :white_check_mark: |
+| 8.4           | :white_check_mark: |
 | 8.0           | :white_check_mark: |
-| 5.7           | :white_check_mark: |
-| 5.6 and lower | :red_circle:       |
-
-Versions of MariaDB:
-
-| MariaDB Version | Supported          |
-| --------------- | ------------------ |
-| 10.6            | :white_check_mark: |
-| 10.5            | :white_check_mark: |
-| 10.4 and lower  | :red_circle:       |
+| 5.7 and lower | :red_circle:       |
 
 Versions of CLang:
 
@@ -43,26 +36,26 @@ Versions of CLang:
 
 Versions of GCC:
 
-| GCC Version | Supported          |
-| ----------- | ------------------ |
-| 14          | :white_check_mark: |
-| 12          | :white_check_mark: |
-| 11 and lower| :red_circle:       |
+| GCC Version  | Supported          |
+| ------------ | ------------------ |
+| 14           | :white_check_mark: |
+| 12           | :white_check_mark: |
+| 11 and lower | :red_circle:       |
 
 Versions of Ubuntu:
 
-| Ubuntu version | Supported          |
-| -------------- | ------------------ |
-| 24.04          | :white_check_mark: |
-| 22.04          | :white_check_mark: |
-| 20.04 and lower| :red_circle:       |
+| Ubuntu version  | Supported          |
+| --------------- | ------------------ |
+| 24.04           | :white_check_mark: |
+| 22.04           | :white_check_mark: |
+| 20.04 and lower | :red_circle:       |
 
 Versions of macOS:
 
-| macOS Version  | Supported          |
-| -------------- | ------------------ |
-| 12             | :white_check_mark: |
-| 11 and lower   | :red_circle:       |
+| macOS Version | Supported          |
+| ------------- | ------------------ |
+| 14            | :white_check_mark: |
+| 12 and lower  | :red_circle:       |
 
 **Note**: We do NOT support any repacks that may or may not have been made based on AzerothCore. This is because they are usually based on older versions and there is no way to know what is in the precompiled binaries. Instead, you should compile your binaries from the AzerothCore source. To get started, read the [Installation Guide](https://www.azerothcore.org/wiki/installation).
 

.github/workflows/codestyle.yml

@@ -13,8 +13,12 @@ jobs:
     if: github.repository == 'azerothcore/azerothcore-wotlk'
     steps:
       - uses: actions/checkout@v4
+      - name: Setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
       - name: AzerothCore codestyle
-        run: source ./apps/ci/ci-codestyle.sh
+        run: python ./apps/codestyle/codestyle.py
       - name: C++ Advanced
         run: |
           sudo apt update -y

.github/workflows/macos_build.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-12
+          - macos-14
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }}
     if: |

AUTHORS

@@ -16,21 +16,21 @@ Development of this project dates back to 2004, and was developed under various
 * SD2 project, 2008-2009, located at http://www.scriptdev2.com/
 * TrinityCore, 2008-2012, located at https://www.trinitycore.org/
 * SunwellCore 2012-2016, privately developed, more info at https://www.azerothcore.org/pages/sunwell.pl/
-* AzerothCore, 2016-2023, located at https://www.azerothcore.org/
+* AzerothCore, 2016-CURRENT, located at https://www.azerothcore.org/
 
 ## Authorship of the code
 Authorship is assigned for each commit within the git history, which is stored in these git repositories:
 * github.com/cmangos/mangos-svn (History from MaNGOS project from 2005-2008, originally hosted at http://mangos.svn.sourceforge.net)
 * github.com/TrinityCore/TrinityCore
 * github.com/azerothcore/azerothcore-wotlk
 
-Unfortunately we have no detailed information of the history of the WoWD project;
+Unfortunately, we have no detailed information on the history of the WoWD project;
 if somebody can provide information, please contact us, so that we can make this history available
 
-SunwellCore developed privately and has no git history.
+SunwellCore was developed privately and has unfortunately no git history.
 
-## Exceptions with third party libraries
-The third party libraries have their own way of addressing authorship, and the authorship of commits importing/ updating
-a third party library reflects who did the importing instead of who wrote the code within the commit.
+## Exceptions with third-party libraries
+The third-party libraries have their own way of addressing authorship, and the authorship of commits importing/updating
+a third-party library reflects who did the importing instead of who wrote the code within the commit.
 
-The Authors of third party libraries are not explicitly mentioned, and usually are possible to obtain from the files belonging to the third party libraries.
+The Authors of third-party libraries are not explicitly mentioned, and usually is possible to obtain from the files belonging to the third-party libraries.

apps/Fmt/FormatReplace.py

@@ -62,12 +62,12 @@ def isPAppend(line):
     else :
         return False
 
-# def isStringFormat(line):
-#     substring = 'StringFormat'
-#     if substring in line:
-#         return True
-#     else :
-#         return False
+def isStringFormat(line):
+    substring = 'StringFormat'
+    if substring in line:
+        return True
+    else :
+        return False
 
 def haveDelimeter(line):
     if ';' in line:
@@ -96,8 +96,8 @@ def checkSoloLine(line):
     #     return handleCleanup(line), False
     # elif isPSendSysMessage(line):
     #     return handleCleanup(line), False
-    # elif isStringFormat(line):
-    #     return handleCleanup(line), False
+    elif isStringFormat(line):
+        return handleCleanup(line), False
     else:
         return line, False
 
@@ -122,8 +122,8 @@ def startMultiLine(line):
     elif isPAppend(line):
         line = line.replace("PAppend", "Append");
         return handleCleanup(line), True
-    # elif isStringFormat(line):
-    #     return handleCleanup(line), True
+    elif isStringFormat(line):
+        return handleCleanup(line), True
     else :
         return line, False
 

apps/ci/mac/ci-compile.sh

@@ -10,15 +10,26 @@ ccache -s
 
 cd var/build/obj
 
+mysql_include_path=$(brew --prefix mysql)/include/mysql
+mysql_lib_path=$(brew --prefix mysql)/lib/libmysqlclient.dylib
+
+if [ ! -d "$mysql_include_path" ]; then
+    echo "Original mysql include directory doesn't exist. Lets try to use the first available folder in mysql dir."
+    base_dir=$(brew --cellar mysql)/$(basename $(ls -d $(brew --cellar mysql)/*/ | head -n 1))
+    echo "Trying the next mysql base dir: $base_dir"
+    mysql_include_path=$base_dir/include/mysql
+    mysql_lib_path=$base_dir/lib/libmysqlclient.dylib
+fi
+
 time cmake ../../../ \
 -DTOOLS=1 \
 -DBUILD_TESTING=1 \
 -DSCRIPTS=static \
 -DCMAKE_BUILD_TYPE=Release \
--DMYSQL_ADD_INCLUDE_PATH=/usr/local/include \
--DMYSQL_LIBRARY=/usr/local/lib/libmysqlclient.dylib \
--DREADLINE_INCLUDE_DIR=/usr/local/opt/readline/include \
--DREADLINE_LIBRARY=/usr/local/opt/readline/lib/libreadline.dylib \
+-DMYSQL_ADD_INCLUDE_PATH=$mysql_include_path \
+-DMYSQL_LIBRARY=$mysql_lib_path \
+-DREADLINE_INCLUDE_DIR=$(brew --prefix readline)/include \
+-DREADLINE_LIBRARY=$(brew --prefix readline)/lib/libreadline.dylib \
 -DOPENSSL_INCLUDE_DIR="$OPENSSL_ROOT_DIR/include" \
 -DOPENSSL_SSL_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libssl.dylib" \
 -DOPENSSL_CRYPTO_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libcrypto.dylib" \