revert

src/game/screens/base.py

@@ -1,8 +1,5 @@
 from abc import ABC, ABCMeta, abstractmethod
-from typing import TYPE_CHECKING
+from typing import Any
-
-if TYPE_CHECKING:
-    from typing import Any
 
 
 class BaseScreen(ABC, metaclass=ABCMeta):

src/game/screens/base_button.py

@@ -1,8 +1,5 @@
 from abc import ABC, ABCMeta, abstractmethod
-from typing import TYPE_CHECKING
+from typing import Any, Callable, Optional
-
-if TYPE_CHECKING:
-    from typing import Any, Callable, Optional
 
 import pygame
 

src/game/screens/button.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING
+from typing import Any, Callable, Optional
 
 import pygame
 from utils import CONFIG
@@ -6,9 +6,6 @@ from utils import CONFIG
 from .base import BaseScreen, SceenElement, TextScreen
 from .base_button import BaseButton
 
-if TYPE_CHECKING:
-    from typing import Any, Callable, Optional
-
 
 class Button(BaseButton, BaseScreen, SceenElement, TextScreen):
     def __init__(self, text: str, action: Optional[Callable[[], Optional[Any]]]) -> None:

src/game/screens/game.py

@@ -1,18 +1,13 @@
-from typing import TYPE_CHECKING
+from typing import Any
 
 import pygame
-from utils import CONFIG, GameMode
+from utils import CONFIG, Figure, GameMode
 
 from .base import BaseScreen
 from .preview import Preview
 from .score import Score
 from .tetris import Tetris
 
-if TYPE_CHECKING:
-    from typing import Any
-
-    from utils import Figure
-
 
 class Game(BaseScreen):
     """
@@ -56,14 +51,12 @@ class Game(BaseScreen):
 
     def run(self) -> None:
         """Run a single iteration of the game loop."""
-        self.draw()
 
         self.tetris.run()
         self.score.run()
         self.preview.update(self.next_figure)
         self.preview.run()
 
-        self.draw()
         self.clock.tick(CONFIG.game.fps)
 
     def mute(self) -> None:

src/game/screens/main.py

@@ -1,19 +1,14 @@
 import sys
-from typing import TYPE_CHECKING
+from typing import Optional
 
 import pygame
 from loguru import logger
-from utils import CONFIG, read_settings
+from utils import CONFIG, GameMode, read_settings
 
 from .base import BaseScreen, SceenElement, TextScreen
 from .button import Button
 from .game import Game
 
-if TYPE_CHECKING:
-    from typing import Optional
-
-    from utils import GameMode
-
 
 class Main(BaseScreen, SceenElement, TextScreen):
     """

src/game/screens/preview.py

@@ -1,13 +1,8 @@
-from typing import TYPE_CHECKING
-
 import pygame
-from utils import CONFIG
+from utils import CONFIG, Figure
 
 from .base import BaseScreen, SceenElement
 
-if TYPE_CHECKING:
-    from utils import Figure
-
 
 class Preview(BaseScreen, SceenElement):
     """

src/game/screens/tetris.py

@@ -1,20 +1,15 @@
-from typing import TYPE_CHECKING
+from typing import Any, Callable, Optional
 
 import numpy as np
 import pygame
 from loguru import logger
 from utils import CONFIG, Direction, Figure, GameMode, Rotation
 
-from game.sprites import Tetromino
+from game.sprites import Block, Tetromino
 from game.timer import Timer, Timers
 
 from .base import BaseScreen
 
-if TYPE_CHECKING:
-    from typing import Any, Callable, Optional
-
-    from game.sprites import Block
-
 
 class Tetris(BaseScreen):
     """

src/game/sprites/block.py

@@ -1,13 +1,9 @@
-from typing import TYPE_CHECKING
+from typing import Any, Optional
 
+import numpy as np
 import pygame
 from utils import CONFIG, Rotation
 
-if TYPE_CHECKING:
-    from typing import Any, Optional
-
-    import numpy as np
-
 
 class Block(pygame.sprite.Sprite):
     """

src/game/sprites/tetromino.py

@@ -1,14 +1,10 @@
-from typing import TYPE_CHECKING
+from typing import Any, Callable, Optional
 
+import numpy as np
 import pygame
 from utils import CONFIG, Direction, Figure, Rotation
 
-if TYPE_CHECKING:
+from .block import Block
-    from typing import Any, Callable, Optional
-
-    import numpy as np
-
-    from .block import Block
 
 
 class Tetromino:

src/game/timer.py

@@ -1,11 +1,8 @@
-from typing import TYPE_CHECKING
+from typing import Any, Callable, NamedTuple, Optional
 
 import pygame
 from attrs import define, field
 
-if TYPE_CHECKING:
-    from typing import Any, Callable, NamedTuple, Optional
-
 
 @define
 class Timer:

src/utils/config.py

@@ -1,6 +1,7 @@
-from typing import TYPE_CHECKING
+from pathlib import Path
 
 from attr import define
+from pygame import Vector2 as Vec2
 
 from .colors import COLOR_DICT, TokyoNightNight
 from .colors.tokyonight.base import Color
@@ -8,12 +9,6 @@ from .path import BASE_PATH
 from .settings import read_settings
 from .tuples import Size
 
-if TYPE_CHECKING:
-    from pathlib import Path
-
-    from pygame import Vector2 as Vec2
-
-
 PADDING = 20
 
 

src/utils/figure.py

@@ -1,15 +1,13 @@
 import random
 from enum import Enum
-from typing import TYPE_CHECKING, NamedTuple
+from typing import NamedTuple
 
 import pygame
+from pygame import Vector2 as Vec2
 
 from .colors import TokyoNightNight
 from .path import BASE_PATH
 
-if TYPE_CHECKING:
-    from pygame import Vector2 as Vec2
-
 
 class FigureConfig(NamedTuple):
     """

src/utils/settings.py

@@ -1,14 +1,11 @@
-from typing import TYPE_CHECKING
+from pathlib import Path
+from typing import Any
 
 import toml
 from loguru import logger
 
 from .path import BASE_PATH
 
-if TYPE_CHECKING:
-    from pathlib import Path
-    from typing import Any
-
 
 def save_settings(settings: dict[str, Any], file_path: Path) -> None:
     """

src/utils/tuples.py

@@ -1,7 +1,4 @@
-from typing import TYPE_CHECKING, NamedTuple
+from typing import NamedTuple, Union
-
-if TYPE_CHECKING:
-    from typing import Union
 
 
 class Size(NamedTuple):