Merge pull request #67 from apple1417/master

pull in library updates

Author: apple1417

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "git@github.com:bl-sdk/common_dotfiles.git",
-  "commit": "cee5c9dbf5b95f57bb636e5138171aa6a4964cf1",
+  "commit": "86622ce16a73e4286684f9987d836abd9cf1b65a",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -16,7 +16,7 @@
       "include_cpp": true,
       "include_py": true,
       "_template": "git@github.com:bl-sdk/common_dotfiles.git",
-      "_commit": "cee5c9dbf5b95f57bb636e5138171aa6a4964cf1"
+      "_commit": "86622ce16a73e4286684f9987d836abd9cf1b65a"
     }
   },
   "directory": null

.devcontainer/Dockerfile

@@ -41,10 +41,10 @@ RUN <<EOF
             python3-requests    \
             wget                \
             xz-utils
-    wget -nv https://github.com/mstorsjo/llvm-mingw/releases/download/20250114/llvm-mingw-20250114-msvcrt-ubuntu-20.04-x86_64.tar.xz
-    tar -xf llvm-mingw-20250114-msvcrt-ubuntu-20.04-x86_64.tar.xz
-    rm llvm-mingw-20250114-msvcrt-ubuntu-20.04-x86_64.tar.xz
-    mv llvm-mingw-20250114-msvcrt-ubuntu-20.04-x86_64 /llvm-mingw
+    wget -nv https://github.com/mstorsjo/llvm-mingw/releases/download/20260224/llvm-mingw-20260224-msvcrt-ubuntu-22.04-x86_64.tar.xz
+    tar -xf llvm-mingw-20260224-msvcrt-ubuntu-22.04-x86_64.tar.xz
+    rm llvm-mingw-20260224-msvcrt-ubuntu-22.04-x86_64.tar.xz
+    mv llvm-mingw-20260224-msvcrt-ubuntu-22.04-x86_64 /llvm-mingw
 EOF
 ENV PATH="/llvm-mingw/bin:$PATH"
 

.gitattributes

@@ -0,0 +1 @@
+stubs/**        linguist-generated gitlab-generated

.github/workflows/build.yml

@@ -12,11 +12,6 @@ on:
         type: string
         required: false
 
-env:
-  # LLVM MinGW download
-  LLVM_MINGW_VERSION: llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64
-  LLVM_MINGW_DOWNLOAD: https://github.com/mstorsjo/llvm-mingw/releases/download/20240619/llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64.tar.xz
-
 jobs:
   build-windows:
     runs-on: windows-latest
@@ -35,48 +30,35 @@ jobs:
 
     - name: Add MSVC to PATH
       if: startswith(matrix.preset, 'msvc')
-      uses: TheMrMilchmann/setup-msvc-dev@v3
+      uses: TheMrMilchmann/setup-msvc-dev@v4
       with:
         arch: x64
 
     - name: Setup CMake and Ninja
       uses: lukka/get-cmake@latest
 
-    # We only actually need this python version to run the download script, we're not going to link
-    # against it, so don't need to specify arch
     - name: Setup Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
-        python-version: ">=3.11"
+        python-version: ">=3.13"
 
     - name: Checkout repository and submodules
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: recursive
 
-    - name: Configure build
-      run: |
-        pip install requests
-
-        cmake . --preset ${{ matrix.preset }} -G Ninja
-
     - name: Build
-      run: cmake --build out/build/${{ matrix.preset }} --target install
-
-    - name: Prepare Release Zip (dev ci)
-      if: inputs.new-release-tag == ''
-      run: python prepare_release.py ${{ matrix.preset }} --skip-install --no-bl3 --no-wl --unified
+      run: python ./prepare_release.py ${{ matrix.preset }} --configure
 
-    - name: Prepare Release Zip (draft full)
+    - name: Rename Release Zips (draft full release)
       if: inputs.new-release-tag != '' && startswith(matrix.preset, 'msvc')
       run: |
-        python prepare_release.py ${{ matrix.preset }} --skip-install
         mv bl3-sdk-${{ matrix.preset }}.zip bl3-sdk.zip
         mv wl-sdk-${{ matrix.preset }}.zip wl-sdk.zip
 
     - name: Upload Artifact
       if: inputs.new-release-tag == '' || startswith(matrix.preset, 'msvc')
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ${{ matrix.preset }}
         path: "*.zip"
@@ -97,12 +79,12 @@ jobs:
 
     steps:
     - name: Checkout repository and submodules
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: recursive
 
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v4
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
@@ -124,16 +106,11 @@ jobs:
 
           set -e
 
-          cmake . --preset ${{ matrix.toolchain.preset }} -G Ninja
-          cmake --build out/build/${{ matrix.toolchain.preset }}  --target install
-
-          if [ ${{ inputs.new-release-tag == '' && 1 || 0 }} -ne 0 ]; then
-            python prepare_release.py ${{ matrix.toolchain.preset }} --skip-install --no-bl3 --no-wl --unified
-          fi
+          python prepare_release.py ${{ matrix.toolchain.preset }} --configure
 
     - name: Upload Artifact
       if: inputs.new-release-tag == ''
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ${{ matrix.toolchain.preset }}
         path: "*.zip"
@@ -158,16 +135,16 @@ jobs:
       uses: lukka/get-cmake@latest
 
     - name: Setup Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
-        python-version: ">=3.11"
+        python-version: ">=3.13"
 
-    # Needed pyyaml for clang tidy to enable `-export-fixes` and requests for the python lib downloader
+    # Needed pyyaml for clang tidy to enable `-export-fixes`
     - name: Install pip packages
-      run: pip install pyyaml requests
+      run: pip install pyyaml
 
     - name: Checkout repository and submodules
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: recursive
 
@@ -201,7 +178,7 @@ jobs:
       uses: egor-tensin/setup-clang@v1
 
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Run clang-format
       run: |
@@ -219,7 +196,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Check spelling
       uses: crate-ci/typos@master
@@ -229,32 +206,58 @@ jobs:
 
     steps:
     - name: Checkout repository and submodules
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: recursive
 
     - name: Run pyright
-      uses: jakebailey/pyright-action@v2
+      uses: jakebailey/pyright-action@v3
       with:
-        working-directory: "./src/"
+        working-directory: ./src
 
   ruff:
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+      with:
+        submodules: recursive
 
     - name: Run Ruff Linting
-      uses: chartboost/ruff-action@v1
+      uses: astral-sh/ruff-action@v4.0.0
       with:
-        src: ./src
+        src: src
 
     - name: Run Ruff Formatting
-      uses: chartboost/ruff-action@v1
+      uses: astral-sh/ruff-action@v4.0.0
+      with:
+        args: format --check --diff
+        src: src
+
+  stubs:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository and submodules
+      uses: actions/checkout@v6
+      with:
+        submodules: recursive
+
+    - name: Setup Python
+      uses: actions/setup-python@v6
       with:
-        src: ./src
-        args: format --check
+        python-version: ">=3.13"
+
+    - name: Install pip packages
+      run: pip install -r libs/pyunrealsdk/stubgen/requirements.txt
+
+    - name: Generate stubs
+      working-directory: libs/pyunrealsdk/
+      run: python -m stubgen OAK ../../expected_stubs
+
+    - name: Make sure stubs are up to date
+      run: diff -r -s stubs expected_stubs
 
 # ==============================================================================
 
@@ -279,7 +282,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
 
     - name: Upload releases
       uses: andelf/nightly-release@main
@@ -315,7 +318,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Download artifacts
       uses: actions/download-artifact@v4

.gitignore

@@ -1,16 +1,13 @@
 .vs
 .vscode
 .idea
+.nvim.lua
 
 # C/C++ excludes
 .cache/clangd
 .gdbinit
 out
 
-# User scripts with templates
-postbuild
-postbuild.bat
-
 # CMake (from https://github.com/github/gitignore/blob/main/CMake.gitignore)
 CMakeLists.txt.user
 CMakeCache.txt

CMakeLists.txt

@@ -4,7 +4,10 @@ project(oak_mod_manager)
 
 set(UNREALSDK_FLAVOUR OAK)
 set(EXPLICIT_PYTHON_ARCH amd64)
-set(EXPLICIT_PYTHON_VERSION 3.13.1)
+set(EXPLICIT_PYTHON_VERSION 3.14.6)
+set(EXPLICIT_PYTHON_HASH_BASE SHA256=75afa83f93b284d19040e24bc440ab741c09582c0d5310504d607a4e08c3dbaf)
+set(EXPLICIT_PYTHON_HASH_TEST SHA256=2e903c82f7fc7081aa59e21752309dd6a1180297950d6b0587c39da606549867)
+set(EXPLICIT_PYTHON_HASH_EMBEDDABLE SHA256=c3a89aa7ead530bcac4729f3db7d000fbadb6ca7aa0461c2841867172aa0752a)
 
 add_subdirectory(libs/pyunrealsdk)
 

changelog.md

@@ -1,5 +1,63 @@
 # Changelog
 
+## v1.11 (Upcoming)
+- Upgraded to Python 3.14.
+- Added the `mod_manager.extra_sys_path` config option.
+- Added support for launching launching an IPython kernel inside the SDK, which lets you interact
+  with the SDK from Jupyter.
+
+### BL3 Mod Menu v1.8
+- Linting fixes.
+
+### Keybinds v2.6
+- Linting fixes
+
+### [Mods Base v1.12](https://github.com/bl-sdk/mods_base/blob/master/Readme.md#v19)
+> - Added extra typing overloads to the `keybind` factory, to allow cases such as
+>   `keybind("name", callback=func)`
+>
+> - Added support for BL4 and BL1E.
+>
+> - Deprecated `ValueOption.on_change`, as well as setting it via `__call__`, in favour of separate,
+>   more explicit, `on_change_anytime` and `on_change_while_enabled` callbacks.
+>
+> - Added a `HookType.pause()` context manager. This may sometimes be preferable over the
+>   `unrealsdk.hooks.prevent_hooking_direct_calls()` context manager.
+
+### [pyunrealsdk v1.10.0](https://github.com/bl-sdk/pyunrealsdk/blob/master/changelog.md#v180)
+> - The `pyunrealsdk.init_script` and `pyunrealsdk.pyexec_root` config options are now relative to the
+>   folder containing the `pyunrealsdk.dll`. Previously, they were relative to the cwd, which could
+>   cause issues if it changed.
+> 
+> - Type stubs are now automatically generated based off of the source code, rather than being kept in
+>   sync by hand. This caught several places they weren't fully accurate.
+> 
+> - The `unrealsdk.hooks.Type` and `unrealsdk.logging.Level` enums should now use native Python enums,
+>   rather than pybind's older version. These should be fully backwards compatible.
+> 
+> - `UProperty`, and all it's subclasses, have been renamed to `ZProperty`, like they were in
+>   unrealsdk. The existing names are all still available as deprecated aliases.
+> 
+> - Upgraded to Pybind 3.0, which may matter for native modules.
+> 
+> - Assigning one wrapped array to another with a compatible, but different, property, will now
+>   automatically do the "convert to list" workaround for you.
+
+### UI Utils v1.4
+- Linting fixes.
+
+### [unrealsdk v3.2.0](https://github.com/bl-sdk/unrealsdk/blob/master/changelog.md#v320)
+> - Now supports Borderlands 1 Enhanced and Borderlands 4, including several new types.
+>
+> - Renamed all `UProperty` types to `ZProperty`, and moved their headers from
+>   `unrealsdk/unreal/classes/properties` to `unrealsdk/unreal/properties`.
+>
+> - Introduced `unrealsdk/flavour.h`, which splits flavour defines down into more specific feature
+>   flags. Using these may be more appropriate in places.
+>
+> - The log file now includes thread id, and added highlighting to the external console logs.
+
+
 ## v1.10: Stinger
 Increased the visual version number. This also fixes the "update available" notification still
 showing.

libs/pluginloader

@@ -5,7 +5,7 @@
 
 [project]
 name = "oak_mod_manager"
-version = "1.10"
+version = "1.11"
 authors = [{ name = "bl-sdk" }]
 
 [tool.sdkmod]