Merge branch 'master' into master

apple1417 · web-flow · commit 98ef2b07c64f · 2025-05-08T19:38:37.000+12:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,10 +12,6 @@ on:
         type: string
         required: false
 
-env:
-  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
diff --git a/changelog.md b/changelog.md
@@ -1,9 +1,26 @@
 # Changelog
 
+## v3.7 (Upcoming)
+
+### [Console Mod Menu v1.6](https://github.com/bl-sdk/console_mod_menu/blob/master/Readme.md#v16)
+> - Linting fixes.
+
+### Legacy Compat v1.6
+- Linting fixups.
+
+### [Mods Base v1.10](https://github.com/bl-sdk/mods_base/blob/master/Readme.md#v19)
+> - Linting fixups.
+
 ### Save Options v1.2
 - Fixed issue where loading a character with no save option data inherited option values from
   previous character.
 
+### UI Utils v1.3
+- Linting fixes.
+
+### Willow2 Mod Menu v3.5
+- Linting fixups.
+
 ## v3.6: Easy Mode
 Fixed that `save_options.sdkmod` wasn't actually being included in the release zip. Whoops.
 
diff --git a/manager_pyproject.toml b/manager_pyproject.toml
@@ -5,7 +5,7 @@
 
 [project]
 name = "willow_mod_manager"
-version = "3.6"
+version = "3.7"
 authors = [{ name = "bl-sdk" }]
 
 [tool.sdkmod]
diff --git a/src/__main__.py b/src/__main__.py
@@ -48,7 +48,7 @@ class ModInfo:
     module: str
     legacy: bool
     location: Path
-    duplicates: list[ModInfo] = field(default_factory=list)
+    duplicates: list[ModInfo] = field(default_factory=list["ModInfo"])
 
 
 def init_debugpy() -> None:
diff --git a/src/console_mod_menu b/src/console_mod_menu
@@ -1 +1 @@
-Subproject commit 60baff20493b6536351df70c6681db25f402ebab
+Subproject commit 135892d678c1d00fa38cb923fde2005cfcd50f42
diff --git a/src/legacy_compat/ModMenu/ModObjects.py b/src/legacy_compat/ModMenu/ModObjects.py
@@ -150,8 +150,10 @@ def supported_games(self, val: Game) -> None:  # pyright: ignore[reportIncompati
 
     # Unlike options, binds can have an external persistent state, so we need to keep our list of
     # binds around to reuse them when possible
-    _last_seen_legacy_binds: list[KeybindManager.Keybind] = field(default_factory=list)
-    _cached_keybinds: list[KeybindType] = field(default_factory=list)
+    _last_seen_legacy_binds: list[KeybindManager.Keybind] = field(
+        default_factory=list[KeybindManager.Keybind],
+    )
+    _cached_keybinds: list[KeybindType] = field(default_factory=list[KeybindType])
 
     @property
     def keybinds(self) -> Sequence[KeybindType]:
diff --git a/src/legacy_compat/ModMenu/Options.py b/src/legacy_compat/ModMenu/Options.py
@@ -471,7 +471,7 @@ def on_change[J: JSON](
                         on_change=on_change,
                     )
                 case Hidden():
-                    hidden_option: Hidden[Any] = option
+                    hidden_option: Hidden[Any] = option  # pyright: ignore[reportUnknownVariableType]
                     converted_option = HiddenOption(
                         hidden_option.Caption,
                         hidden_option.CurrentValue,
diff --git a/src/legacy_compat/__init__.py b/src/legacy_compat/__init__.py
@@ -14,7 +14,7 @@
     "legacy_compat",
 )
 
-__version_info__: tuple[int, int] = (1, 5)
+__version_info__: tuple[int, int] = (1, 6)
 __version__: str = f"{__version_info__[0]}.{__version_info__[1]}"
 __author__: str = "bl-sdk"
 
diff --git a/src/mods_base b/src/mods_base
@@ -1 +1 @@
-Subproject commit 3d557e0a1c9dfa529b0da413d3002a97f2be928e
+Subproject commit ec78c07b53d4f37f661487e2b7ad2d8979a1992d
diff --git a/src/ui_utils/__init__.py b/src/ui_utils/__init__.py
@@ -22,7 +22,7 @@
     "show_hud_message",
 )
 
-__version_info__: tuple[int, int] = (1, 2)
+__version_info__: tuple[int, int] = (1, 3)
 __version__: str = f"{__version_info__[0]}.{__version_info__[1]}"
 __author__: str = "bl-sdk"
 
diff --git a/src/ui_utils/option_box.py b/src/ui_utils/option_box.py
@@ -88,7 +88,7 @@ def create_tooltip_string(enter_message: str = "Select", esc_message: str = "Can
 
     _gfx_object: WeakPointer = field(init=False, repr=False, default=WeakPointer())
 
-    _pages: list[Page] = field(init=False, repr=False, default_factory=list)
+    _pages: list[Page] = field(init=False, repr=False, default_factory=list["Page"])
     _current_page_idx: int = field(init=False, repr=False, default=0)
 
     # While we don't display previous page, defining one for use in subclasses
diff --git a/src/willow2_mod_menu/__init__.py b/src/willow2_mod_menu/__init__.py
@@ -7,7 +7,7 @@
     "__version_info__",
 ]
 
-__version_info__: tuple[int, int] = (3, 4)
+__version_info__: tuple[int, int] = (3, 5)
 __version__: str = f"{__version_info__[0]}.{__version_info__[1]}"
 __author__: str = "bl-sdk"
 
diff --git a/src/willow2_mod_menu/data_providers/mod_list.py b/src/willow2_mod_menu/data_providers/mod_list.py
@@ -11,7 +11,7 @@
 
 @dataclass
 class ModListDataProvider(DataProvider):
-    drawn_mod_list: list[Mod] = field(default_factory=list, repr=False)
+    drawn_mod_list: list[Mod] = field(default_factory=list[Mod], repr=False)
 
     def populate(self, data_provider: UObject, the_list: UObject) -> None:  # noqa: D102
         del data_provider
diff --git a/src/willow2_mod_menu/data_providers/mod_options.py b/src/willow2_mod_menu/data_providers/mod_options.py
@@ -42,7 +42,10 @@ class ModOptionsDataProvider(OptionsDataProvider):
     _: KW_ONLY
     mod: Mod
 
-    drawn_keybinds: dict[int, KeybindOption] = field(default_factory=dict, repr=False)
+    drawn_keybinds: dict[int, KeybindOption] = field(
+        default_factory=dict[int, KeybindOption],
+        repr=False,
+    )
 
     def __post_init__(self) -> None:
         self.options = tuple(self.gen_options_list())
diff --git a/src/willow2_mod_menu/data_providers/options.py b/src/willow2_mod_menu/data_providers/options.py
@@ -23,7 +23,7 @@
 @dataclass
 class OptionsDataProvider(DataProvider):
     options: Sequence[BaseOption]
-    drawn_options: list[BaseOption] = field(default_factory=list, repr=False)
+    drawn_options: list[BaseOption] = field(default_factory=list[BaseOption], repr=False)
 
     @staticmethod
     def create_option_description(option: BaseOption) -> str:

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ def on_change[J: JSON](`
`471`	`471`	`on_change=on_change,`
`472`	`472`	`)`
`473`	`473`	`case Hidden():`
`474`		`- hidden_option: Hidden[Any] = option`
	`474`	`+ hidden_option: Hidden[Any] = option # pyright: ignore[reportUnknownVariableType]`
`475`	`475`	`converted_option = HiddenOption(`
`476`	`476`	`hidden_option.Caption,`
`477`	`477`	`hidden_option.CurrentValue,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"legacy_compat",`
`15`	`15`	`)`
`16`	`16`
`17`		`-__version_info__: tuple[int, int] = (1, 5)`
	`17`	`+__version_info__: tuple[int, int] = (1, 6)`
`18`	`18`	`__version__: str = f"{__version_info__[0]}.{__version_info__[1]}"`
`19`	`19`	`__author__: str = "bl-sdk"`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"show_hud_message",`
`23`	`23`	`)`
`24`	`24`
`25`		`-__version_info__: tuple[int, int] = (1, 2)`
	`25`	`+__version_info__: tuple[int, int] = (1, 3)`
`26`	`26`	`__version__: str = f"{__version_info__[0]}.{__version_info__[1]}"`
`27`	`27`	`__author__: str = "bl-sdk"`
`28`	`28`