diff --git a/games/game_oblivion_remaster.py b/games/game_oblivion_remaster.py index 0548557..218bb04 100644 --- a/games/game_oblivion_remaster.py +++ b/games/game_oblivion_remaster.py @@ -13,9 +13,9 @@ import mobase from ..basic_features import BasicGameSaveGameInfo from ..basic_game import BasicGame -from .oblivion_remaster.constants import DEFAULT_UE4SS_MODS, PLUGIN_NAME +from .oblivion_remaster.constants import DEFAULT_UE4SS_MODS, PLUGIN_NAME, UE4SSModInfo from .oblivion_remaster.paks.widget import PaksTabWidget -from .oblivion_remaster.ue4ss.widget import UE4SSModInfo, UE4SSTabWidget +from .oblivion_remaster.ue4ss.widget import UE4SSTabWidget def getLootPath() -> Path | None: diff --git a/games/oblivion_remaster/constants.py b/games/oblivion_remaster/constants.py index d705915..656e296 100644 --- a/games/oblivion_remaster/constants.py +++ b/games/oblivion_remaster/constants.py @@ -1,5 +1,14 @@ +from typing import TypedDict + PLUGIN_NAME = "Oblivion Remastered Support Plugin" -DEFAULT_UE4SS_MODS = [ + + +class UE4SSModInfo(TypedDict): + mod_name: str + mod_enabled: bool + + +DEFAULT_UE4SS_MODS: list[UE4SSModInfo] = [ {"mod_name": "BPML_GenericFunctions", "mod_enabled": True}, {"mod_name": "BPModLoaderMod", "mod_enabled": True}, ] diff --git a/games/oblivion_remaster/paks/widget.py b/games/oblivion_remaster/paks/widget.py index 10c684c..efc3038 100644 --- a/games/oblivion_remaster/paks/widget.py +++ b/games/oblivion_remaster/paks/widget.py @@ -68,7 +68,7 @@ class PaksTabWidget(QWidget): def write_pak_files(self): for index, pak in sorted(self._model.paks.items()): - name, _, current_path, target_path = pak + _, _, current_path, target_path = pak if current_path and current_path != target_path: path_dir = Path(current_path) target_dir = Path(target_path) diff --git a/games/oblivion_remaster/ue4ss/widget.py b/games/oblivion_remaster/ue4ss/widget.py index 863502b..246b7fa 100644 --- a/games/oblivion_remaster/ue4ss/widget.py +++ b/games/oblivion_remaster/ue4ss/widget.py @@ -2,23 +2,17 @@ import json from functools import cmp_to_key from json import JSONDecodeError from pathlib import Path -from typing import TypedDict from PyQt6.QtCore import QDir, QFileInfo, Qt from PyQt6.QtWidgets import QGridLayout, QWidget import mobase -from ..constants import DEFAULT_UE4SS_MODS +from ..constants import DEFAULT_UE4SS_MODS, UE4SSModInfo from .model import UE4SSListModel from .view import UE4SSView -class UE4SSModInfo(TypedDict): - mod_name: str - mod_enabled: bool - - class UE4SSTabWidget(QWidget): def __init__(self, parent: QWidget | None, organizer: mobase.IOrganizer): super().__init__(parent)