Fix mypy issues (#74)

src/amulet_editor/application/_main.py

@@ -79,7 +79,7 @@ def __init__(self, logger: Callable[[str], None]) -> None:
             super().__init__(log_file)  # type: ignore
             self._logger = logger
 
-        def write(self, msg) -> int:
+        def write(self, msg: str) -> int:
             msg = msg.rstrip()
             if msg:
                 self._logger(msg)

src/amulet_editor/application/windows_/_amulet_landing_window/_landing_window.py

@@ -16,7 +16,7 @@ class Ui_AmuletLandingWindow(QMainWindow):
     def __init__(
         self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window
     ) -> None:
-        super().__init__(parent, f)
+        super().__init__(parent, flags)
         if not self.objectName():
             self.setObjectName("AmuletLandingWindow")
         self.resize(800, 600)

src/builtin_plugins/amulet_team_home_page/_plugin.py

@@ -44,6 +44,7 @@ def load_plugin() -> None:
 
 
 def _locale_changed() -> None:
+    assert _translator is not None
     _translator.load_lang(
         QLocale(),
         "",
@@ -52,8 +53,9 @@ def _locale_changed() -> None:
 
 
 def unload_plugin() -> None:
-    amulet_team_main_window2.unregister_widget(HomeWidget)
-    QCoreApplication.removeTranslator(_translator)
+    amulet_team_main_window.unregister_widget(HomeWidget)
+    if _translator is not None:
+        QCoreApplication.removeTranslator(_translator)
 
 
 plugin = PluginV1(load_plugin, unload_plugin)

src/builtin_plugins/amulet_team_home_page/home/__init__.py

@@ -23,17 +23,17 @@ def __init__(
         self._layout.setContentsMargins(0, 0, 0, 0)
         self._set_landing_page()
 
-    def activate_view(self):
+    def activate_view(self) -> None:
         self._set_landing_page()
 
-    def setCentralWidget(self, widget: QWidget):
+    def setCentralWidget(self, widget: QWidget) -> None:
         for _ in range(self._layout.count()):
             old_widget = self._layout.takeAt(0)
             if old_widget is not None:
                 old_widget.widget().deleteLater()
         self._layout.addWidget(widget)
 
-    def _set_landing_page(self):
+    def _set_landing_page(self) -> None:
         page = HomePage(self)
         # Connect signals
         page.btn_open_world.clicked.connect(self._set_open_world_page)
@@ -42,13 +42,13 @@ def _set_landing_page(self):
         # )
 
         @Slot(int)
-        def _locale_change(index: int):
+        def _locale_change(index: int) -> None:
             set_locale(page.cbo_language.currentData())
 
         page.cbo_language.currentIndexChanged.connect(_locale_change)
         self.setCentralWidget(page)
 
-    def _set_open_world_page(self):
+    def _set_open_world_page(self) -> None:
         page = OpenWorldPage()
         page.btn_back.clicked.connect(self._set_landing_page)
         self.setCentralWidget(page)

src/builtin_plugins/amulet_team_home_page/home/home/__init__.py

@@ -1,14 +1,15 @@
 from amulet_editor import __version__
 
+from PySide6.QtWidgets import QWidget
 from PySide6.QtCore import Qt, QLocale
 from PySide6.QtGui import QImage, QPixmap
 from amulet_editor.data import build
 from ._home import Ui_HomePage
 
 
 class HomePage(Ui_HomePage):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget):
+        super().__init__(parent, f)
         amulet_logo = QPixmap(QImage(build.get_resource("images/amulet_logo.png")))
         amulet_logo = amulet_logo.scaledToHeight(128)
         self._lbl_app_icon.setPixmap(amulet_logo)

src/builtin_plugins/amulet_team_home_page/home/open_world/__init__.py

@@ -1,19 +1,20 @@
 from PySide6.QtGui import QIcon
-from PySide6.QtWidgets import QFileDialog, QApplication
+from PySide6.QtWidgets import QFileDialog, QApplication, QWidget
+from PySide6.QtCore import Qt
 from ._open_world import Ui_OpenWorldPage
 from amulet_editor.application._cli import spawn_process
 from amulet_editor.data.project import get_level
 import tablericons
 
 
 class OpenWorldPage(Ui_OpenWorldPage):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget):
+        super().__init__(parent, f)
         self.btn_back.setIcon(QIcon(tablericons.arrow_left))
         self.load_file_button.clicked.connect(self.open_file)
         self.load_directory_button.clicked.connect(self.open_dir)
 
-    def open_file(self):
+    def open_file(self) -> None:
         dialog = QFileDialog(self)
         dialog.setFileMode(QFileDialog.FileMode.ExistingFile)
         dialog.setNameFilter("Minecraft files (*.*)")
@@ -24,7 +25,7 @@ def open_file(self):
             if get_level() is None:
                 QApplication.quit()
 
-    def open_dir(self):
+    def open_dir(self) -> None:
         dialog = QFileDialog(self)
         dialog.setFileMode(QFileDialog.FileMode.Directory)
         if dialog.exec():

src/builtin_plugins/amulet_team_layout/_plugin.py

@@ -14,13 +14,13 @@
 from amulet_team_3d_viewer._view_3d import View3D
 
 
-def load_plugin():
+def load_plugin() -> None:
     if get_level() is not None:
         register_view(View3D, tablericons.three_d_cube_sphere, "3D Editor")
         get_active_window().activate_view(View3D)
 
 
-def unload_plugin():
+def unload_plugin() -> None:
     unregister_view(View3D)
 
 

src/builtin_plugins/amulet_team_settings/_plugin.py

@@ -13,13 +13,13 @@
 _windows: list = []
 
 
-def load_plugin():
+def load_plugin() -> None:
     add_static_toolbar_button(
         "amulet_team:settings", tablericons.settings, "Settings", _on_click
     )
 
 
-def _on_click(self):
+def _on_click(self) -> None:
     settings = SettingsPage()
     settings.setWindowModality(Qt.WindowModality.ApplicationModal)
     settings.showNormal()

src/builtin_plugins/thread_manager/_plugin.py

@@ -24,7 +24,7 @@ def new_thread(name: str) -> QThread:
     return thread
 
 
-def unload_plugin():
+def unload_plugin() -> None:
     threads = tuple(_threads)
 
     # Quit all threads.

tools/compile_ui.py

@@ -39,7 +39,7 @@ def _get_enums(obj: Any) -> list[EnumType]:
 InitArgs: dict[str, str] = {
     "QWidget": "def __init__(self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget) -> None:\n        super().__init__(parent, f)",
     "QDialog": "def __init__(self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Dialog) -> None:\n        super().__init__(parent, f)",
-    "QMainWindow": "def __init__(self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window) -> None:\n        super().__init__(parent, f)",
+    "QMainWindow": "def __init__(self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window) -> None:\n        super().__init__(parent, flags)",
 }