Merge pull request #62 from apple1417/master

upgrade to unrealsdk v2

Author: apple1417

.cruft.json

@@ -11,8 +11,8 @@
       "_extensions": [
         "cookiecutter.extensions.SlugifyExtension"
       ],
-      "project_name": "willow-mod-manager",
-      "__project_slug": "willow_mod_manager",
+      "project_name": "willow2-mod-manager",
+      "__project_slug": "willow2_mod_manager",
       "include_cpp": true,
       "include_py": true,
       "_template": "[email protected]:bl-sdk/common_dotfiles.git",

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "src/console_mod_menu"]
 	path = src/console_mod_menu
 	url = ../../bl-sdk/console_mod_menu.git
+[submodule "src/keybinds"]
+	path = src/keybinds
+	url = ../../bl-sdk/willow_keybinds

CMakeLists.txt

@@ -1,9 +1,8 @@
 cmake_minimum_required(VERSION 3.24)
 
-project(willow_mod_manager)
+project(willow2_mod_manager)
 
-set(UNREALSDK_ARCH x86)
-set(UNREALSDK_UE_VERSION UE3)
+set(UNREALSDK_FLAVOUR WILLOW)
 set(EXPLICIT_PYTHON_ARCH win32)
 set(EXPLICIT_PYTHON_VERSION 3.13.1)
 

CMakePresets.json

@@ -30,9 +30,10 @@
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
       },
-      "environment": {
+      "cacheVariables": {
         "MSVC_WINE_ENV_SCRIPT": "/win-sdk/bin/x86/msvcenv.sh"
       },
+      "generator": "Ninja",
       "toolchainFile": "libs/pyunrealsdk/common_cmake/clang-cross-x86.cmake"
     },
     {
@@ -43,6 +44,7 @@
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
       },
+      "generator": "Ninja",
       "toolchainFile": "libs/pyunrealsdk/common_cmake/i686-w64-mingw32.cmake"
     },
     {
@@ -53,6 +55,7 @@
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
       },
+      "generator": "Ninja",
       "toolchainFile": "libs/pyunrealsdk/common_cmake/llvm-i686-w64-mingw32.cmake"
     },
     {

changelog.md

@@ -7,9 +7,20 @@
 
 ### Legacy Compat v1.6
 - Linting fixups.
+- Added fixups for Reign of Giants (for real this time).
 
 ### [Mods Base v1.10](https://github.com/bl-sdk/mods_base/blob/master/Readme.md#v19)
 > - Moved a few warnings to go through Python's system, so they get attributed to the right place.
+>
+> - Added more fixups for Reign of Giants (for real this time).
+
+### [pyunrealsdk v1.8.0](https://github.com/bl-sdk/pyunrealsdk/blob/master/changelog.md#v180)
+> - Trying to overwrite the return value of a void function will now return a more appropriate
+>   error.
+> 
+> - Upgraded to support unrealsdk v2 - native modules can expect some breakage. The most notable
+>   effect this has on Python code is a number of formerly read-only fields on core unreal types
+>   have become read-write.
 
 ### Save Options v1.2
 - Fixed issue where loading a character with no save option data inherited option values from
@@ -19,6 +30,31 @@
 ### UI Utils v1.3
 - Linting fixes.
 
+### [unrealsdk v2.0.0](https://github.com/bl-sdk/unrealsdk/blob/master/changelog.md#v200)
+> - Now supports Borderlands 1. Big thanks to Ry for doing basically all the reverse engineering.
+> 
+> - Major refactor of the core unreal types, to cleanly allow them to change layouts at runtime. All
+>   core fields have changed from members to zero-arg methods, which return a reference to the
+>   member. A few classes (e.g. `UProperty` subclasses) previous had existing methods to deal with
+>   the same problem, these have all been moved to the new system.
+>   
+>   Clang is able to detect this change, and gives a nice error recommending inserting brackets at
+>   the right spot.
+>   
+> - Removed the `UNREALSDK_UE_VERSION` and `UNREALSDK_ARCH` CMake variables, in favour a new merged
+>   `UNREALSDK_FLAVOUR` variable.
+> 
+> - Removed the (optional) dependency on libfmt, `std::format` support is now required.
+> 
+> - Console commands registered using `unrealsdk::commands::NEXT_LINE` now (try to) only fire on
+>   direct user input, and ignore commands send via automated means.
+> 
+> - Fixed that assigning an entire array, rather than getting the array and setting it's elements,
+>   would likely cause memory corruption. This was most common when using an array of large structs,
+>   and when assigning to one which was previously empty.
+> 
+> - Made `unrealsdk::memory::get_exe_range` public.
+
 ### Willow2 Mod Menu v3.5
 - Linting fixups.
 

libs/pluginloader

@@ -4,7 +4,7 @@
 # actual releases instead
 
 [project]
-name = "willow_mod_manager"
+name = "willow2_mod_manager"
 version = "3.7"
 authors = [{ name = "bl-sdk" }]
 

libs/pyunrealsdk

@@ -1,14 +1,14 @@
-# This file is part of the BL2/TPS/AoDK Willow Mod Manager.
-# <https://github.com/bl-sdk/willow-mod-manager>
+# This file is part of the BL2/TPS/AoDK Willow2 Mod Manager.
+# <https://github.com/bl-sdk/willow2-mod-manager>
 #
-# The Willow Mod Manager is free software: you can redistribute it and/or modify it under the terms
+# The Willow2 Mod Manager is free software: you can redistribute it and/or modify it under the terms
 # of the GNU Lesser General Public License Version 3 as published by the Free Software Foundation.
 #
-# The Willow Mod Manager is distributed in the hope that it will be useful, but WITHOUT ANY
+# The Willow2 Mod Manager is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 # PURPOSE. See the GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with the Willow Mod
+# You should have received a copy of the GNU General Public License along with the Willow2 Mod
 # Manager. If not, see <https://www.gnu.org/licenses/>.
 
 from __future__ import annotations