Merge pull request #35 from apple1417/master

pull in sdk updates

Author: apple1417

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.24)
+cmake_minimum_required(VERSION 3.25)
 
 project(oak_mod_manager)
 

changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.4
+
+Also see the unrealsdk v1.3.0 changelog [here](https://github.com/bl-sdk/unrealsdk/blob/master/changelog.md#v130)
+and the pyunrealsdk v1.3.0 changelog [here](https://github.com/bl-sdk/pyunrealsdk/blob/master/changelog.md#v130).
+
+## General
+- Fixed that in some cases a mod couldn't be disabled, or wouldn't enable actively, due to hooks not
+  getting added/removed properly.
+
+  [unrealsdk@227a93d2](https://github.com/bl-sdk/unrealsdk/commit/227a93d2)
+
 ## v1.3
 
 Also see the unrealsdk v1.2.0 changelog [here](https://github.com/bl-sdk/unrealsdk/blob/master/changelog.md#v120)

libs/pyunrealsdk

@@ -1,11 +1,11 @@
 # This file is primary for the mod db, the entry for the mod manager points at it
 # It is also used by the release script to get the version number
-# It *is* ok to edit the version in here before release,, the mod db checks the version on the
+# It *is* ok to edit the version in here before release, the mod db checks the version on the
 # actual releases instead
 
 [project]
 name = "oak_mod_manager"
-version = "1.3"
+version = "1.4"
 authors = [{ name = "bl-sdk" }]
 
 [tool.sdkmod]

manager_pyproject.toml

@@ -3,10 +3,11 @@
 from dataclasses import InitVar, dataclass, field
 from typing import TYPE_CHECKING, Any, ClassVar, Self
 
-from mods_base import ENGINE, hook
 from unrealsdk import logging, make_struct
 from unrealsdk.hooks import Block, Type
 
+from mods_base import ENGINE, hook
+
 from .native.dialog_box import show_dialog_box
 
 if TYPE_CHECKING:

src/bl3_mod_menu/dialog_box.py

@@ -1,9 +1,10 @@
 from enum import StrEnum
 
 import unrealsdk
+from unrealsdk.unreal import UObject
+
 from keybinds import raw_keybinds
 from mods_base import BoolOption, DropdownOption, EInputEvent, KeybindOption, get_pc
-from unrealsdk.unreal import UObject
 
 from .dialog_box import DialogBox
 from .native.options_setup import add_binding

src/bl3_mod_menu/keybinds.py

@@ -1,5 +1,8 @@
 from typing import Any
 
+from unrealsdk.hooks import Block, Type
+from unrealsdk.unreal import BoundFunction, UObject, WrappedStruct
+
 from mods_base import (
     BaseOption,
     BoolOption,
@@ -11,8 +14,6 @@
     SpinnerOption,
     hook,
 )
-from unrealsdk.hooks import Block, Type
-from unrealsdk.unreal import BoundFunction, UObject, WrappedStruct
 
 from .keybinds import handle_keybind_press
 from .native.options_getters import (

src/bl3_mod_menu/options_callbacks.py

@@ -4,6 +4,10 @@
 from typing import Any
 
 import unrealsdk
+from unrealsdk import logging
+from unrealsdk.hooks import Type
+from unrealsdk.unreal import BoundFunction, UObject, WrappedStruct
+
 from mods_base import (
     BaseOption,
     BoolOption,
@@ -19,9 +23,6 @@
     get_pc,
     hook,
 )
-from unrealsdk import logging
-from unrealsdk.hooks import Type
-from unrealsdk.unreal import BoundFunction, UObject, WrappedStruct
 
 from .keybinds import add_keybind_option
 from .native.options_setup import (

src/bl3_mod_menu/options_setup.py

@@ -2,10 +2,11 @@
 from typing import Any
 
 import unrealsdk
-from mods_base import BoolOption, Mod, get_ordered_mod_list, hook
 from unrealsdk.hooks import Block, Type
 from unrealsdk.unreal import BoundFunction, UObject, WrappedStruct
 
+from mods_base import BoolOption, Mod, get_ordered_mod_list, hook
+
 from .native.outer_menu import (
     add_menu_item,
     begin_configure_menu_items,

src/bl3_mod_menu/outer_menu.py

@@ -1,9 +1,8 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 
-from mods_base import capture_next_console_line
-
 from console_mod_menu.draw import draw
+from mods_base import capture_next_console_line
 
 
 @dataclass