upgrade to unrealsdk v2

CMakeLists.txt

@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.25)
 
 project(oak_mod_manager)
 
-set(UNREALSDK_ARCH x64)
-set(UNREALSDK_UE_VERSION UE4)
+set(UNREALSDK_FLAVOUR OAK)
 set(EXPLICIT_PYTHON_ARCH amd64)
 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/x64/msvcenv.sh"
       },
+      "generator": "Ninja",
       "toolchainFile": "libs/pyunrealsdk/common_cmake/clang-cross-x64.cmake"
     },
     {
@@ -43,6 +44,7 @@
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
       },
+      "generator": "Ninja",
       "toolchainFile": "libs/pyunrealsdk/common_cmake/x86_64-w64-mingw32.cmake"
     },
     {
@@ -53,6 +55,7 @@
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
       },
+      "generator": "Ninja",
       "toolchainFile": "libs/pyunrealsdk/common_cmake/llvm-x86_64-w64-mingw32.cmake"
     },
     {

changelog.md

@@ -1,5 +1,52 @@
 # Changelog
 
+## v1.9 (Upcoming)
+
+### BL3 Mod Menu v1.7
+ - Upgraded to support unrealsdk v2.0.0
+ - Linting fixes.
+
+### [Console Mod Menu v1.6](https://github.com/bl-sdk/console_mod_menu/blob/master/Readme.md#v16)
+> - Linting fixes.
+
+### [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.
+
+### [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.
+
 ## v1.8: Twin Soul
 
 ### BL3 Mod Menu v1.6

src/__main__.py

@@ -46,7 +46,7 @@
 class ModInfo:
     module: str
     location: Path
-    duplicates: list[ModInfo] = field(default_factory=list)
+    duplicates: list[ModInfo] = field(default_factory=list["ModInfo"])
 
 
 def init_debugpy() -> None:

src/bl3_mod_menu/__init__.py

@@ -7,7 +7,7 @@
     "__version_info__",
 ]
 
-__version_info__: tuple[int, int] = (1, 6)
+__version_info__: tuple[int, int] = (1, 7)
 __version__: str = f"{__version_info__[0]}.{__version_info__[1]}"
 __author__: str = "bl-sdk"
 

src/bl3_mod_menu/dialog_box.py

@@ -84,7 +84,7 @@ class vars will be passed as a fallback. These actions are:
 
     _controller_default_idx: int | None = field(default=None, init=False, repr=False)
     _result_mapping: dict[str, DialogBoxChoice] = field(
-        default_factory=dict,
+        default_factory=dict[str, DialogBoxChoice],
         init=False,
         repr=False,
     )

src/bl3_mod_menu/native/options_transition.cpp

@@ -282,11 +282,9 @@ scrolling_list_scroll_to_position_func scrolling_list_scroll_to_position_ptr;
 auto content_panel_prop = unrealsdk::unreal::find_class(L"GFxOptionBase"_fn)
                               ->find_prop_and_validate<UObjectProperty>(L"ContentPanel"_fn);
 auto ui_scroller_prop =
-    content_panel_prop->get_property_class()->find_prop_and_validate<UStructProperty>(
-        L"UiScroller"_fn);
+    content_panel_prop->PropertyClass()->find_prop_and_validate<UStructProperty>(L"UiScroller"_fn);
 auto scroll_position_prop =
-    ui_scroller_prop->get_inner_struct()->find_prop_and_validate<UFloatProperty>(
-        L"ScrollPosition"_fn);
+    ui_scroller_prop->Struct()->find_prop_and_validate<UFloatProperty>(L"ScrollPosition"_fn);
 
 /**
  * @brief Performs all required setup needed to be able to manipulate the options scrollbar.