chore: organize imports

scenes/dan/dan_result.py

@@ -1,10 +1,11 @@
 import logging
+
 import pyray as ray
 
 from libs.animation import Animation
+from libs.audio import audio
 from libs.chara_2d import Chara2D
 from libs.global_data import PlayerNum, reset_session
-from libs.audio import audio
 from libs.global_objects import AllNetIcon, CoinOverlay, Nameplate
 from libs.screen import Screen
 from libs.texture import tex
@@ -13,7 +14,7 @@ from libs.utils import (
     get_current_ms,
     global_data,
     is_l_don_pressed,
-    is_r_don_pressed
+    is_r_don_pressed,
 )
 from scenes.game import Gauge
 from scenes.result import Background

scenes/dan/dan_select.py

@@ -1,16 +1,28 @@
-
 import logging
+
 import pyray as ray
 
 from libs.audio import audio
-from libs.global_data import PlayerNum, global_data
-from libs.texture import tex
 from libs.chara_2d import Chara2D
-from libs.global_objects import AllNetIcon, CoinOverlay, Indicator, Nameplate, Timer
-from libs.screen import Screen
 from libs.file_navigator import BackBox, DanCourse, navigator
+from libs.global_data import PlayerNum, global_data
+from libs.global_objects import (
+    AllNetIcon,
+    CoinOverlay,
+    Indicator,
+    Nameplate,
+    Timer,
+)
+from libs.screen import Screen
+from libs.texture import tex
 from libs.transition import Transition
-from libs.utils import get_current_ms, is_l_don_pressed, is_l_kat_pressed, is_r_don_pressed, is_r_kat_pressed
+from libs.utils import (
+    get_current_ms,
+    is_l_don_pressed,
+    is_l_kat_pressed,
+    is_r_don_pressed,
+    is_r_kat_pressed,
+)
 from scenes.song_select import State
 
 logger = logging.getLogger(__name__)

scenes/dan/game_dan.py

@@ -1,18 +1,33 @@
 import copy
-from typing import Optional, override
-import pyray as ray
 import logging
+from typing import Optional, override
+
+import pyray as ray
+
 from libs.animation import Animation
 from libs.audio import audio
 from libs.background import Background
 from libs.file_navigator import Exam
-from libs.global_data import DanResultExam, DanResultSong, PlayerNum, global_data
+from libs.global_data import (
+    DanResultExam,
+    DanResultSong,
+    PlayerNum,
+    global_data,
+)
 from libs.global_objects import AllNetIcon
+from libs.texture import tex
 from libs.tja import TJAParser
 from libs.transition import Transition
 from libs.utils import OutlinedText, get_current_ms
-from libs.texture import tex
-from scenes.game import ClearAnimation, FCAnimation, FailAnimation, GameScreen, Gauge, ResultTransition, SongInfo
+from scenes.game import (
+    ClearAnimation,
+    FailAnimation,
+    FCAnimation,
+    GameScreen,
+    Gauge,
+    ResultTransition,
+    SongInfo,
+)
 
 logger = logging.getLogger(__name__)
 

scenes/entry.py

@@ -1,13 +1,21 @@
 import logging
 from typing import Optional
+
 import pyray as ray
 
 from libs.audio import audio
 from libs.chara_2d import Chara2D
 from libs.global_data import PlayerNum
-from libs.global_objects import AllNetIcon, CoinOverlay, Nameplate, Indicator, EntryOverlay, Timer
-from libs.texture import tex
+from libs.global_objects import (
+    AllNetIcon,
+    CoinOverlay,
+    EntryOverlay,
+    Indicator,
+    Nameplate,
+    Timer,
+)
 from libs.screen import Screen
+from libs.texture import tex
 from libs.utils import (
     OutlinedText,
     get_current_ms,

scenes/game.py

@@ -1,12 +1,12 @@
 import bisect
-from enum import IntEnum
-import math
 import logging
+import math
 import sqlite3
 from collections import deque
+from enum import IntEnum
+from itertools import chain
 from pathlib import Path
 from typing import Optional
-from itertools import chain
 
 import pyray as ray
 
@@ -14,7 +14,13 @@ from libs.animation import Animation
 from libs.audio import audio
 from libs.background import Background
 from libs.chara_2d import Chara2D
-from libs.global_data import Crown, Difficulty, Modifiers, PlayerNum, ScoreMethod
+from libs.global_data import (
+    Crown,
+    Difficulty,
+    Modifiers,
+    PlayerNum,
+    ScoreMethod,
+)
 from libs.global_objects import AllNetIcon, Nameplate
 from libs.screen import Screen
 from libs.texture import tex
@@ -24,8 +30,8 @@ from libs.tja import (
     Note,
     NoteList,
     NoteType,
-    TJAParser,
     TimelineObject,
+    TJAParser,
     apply_modifiers,
     calculate_base_score,
 )

scenes/loading.py

@@ -1,17 +1,16 @@
 import logging
-from pathlib import Path
 import threading
+from pathlib import Path
 
 import pyray as ray
 
 from libs.animation import Animation
+from libs.file_navigator import navigator
 from libs.global_objects import AllNetIcon
 from libs.screen import Screen
 from libs.song_hash import build_song_hashes
 from libs.texture import tex
 from libs.utils import get_current_ms, global_data
-from libs.file_navigator import navigator
-
 
 logger = logging.getLogger(__name__)
 

scenes/practice/game.py

@@ -1,20 +1,41 @@
+import copy
+import logging
 import math
 from collections import deque
-import logging
 from pathlib import Path
 from typing import Optional
 
 import pyray as ray
-import copy
 
 from libs.animation import Animation
 from libs.audio import audio
 from libs.background import Background
 from libs.global_data import Modifiers, PlayerNum, global_data
-from libs.tja import Balloon, Drumroll, NoteType, TJAParser, TimelineObject, apply_modifiers
-from libs.utils import get_current_ms, is_l_don_pressed, is_l_kat_pressed, is_r_don_pressed, is_r_kat_pressed
 from libs.texture import tex
-from scenes.game import DrumHitEffect, DrumType, GameScreen, JudgeCounter, LaneHitEffect, Player, Side
+from libs.tja import (
+    Balloon,
+    Drumroll,
+    NoteType,
+    TimelineObject,
+    TJAParser,
+    apply_modifiers,
+)
+from libs.utils import (
+    get_current_ms,
+    is_l_don_pressed,
+    is_l_kat_pressed,
+    is_r_don_pressed,
+    is_r_kat_pressed,
+)
+from scenes.game import (
+    DrumHitEffect,
+    DrumType,
+    GameScreen,
+    JudgeCounter,
+    LaneHitEffect,
+    Player,
+    Side,
+)
 
 logger = logging.getLogger(__name__)
 

scenes/result.py

@@ -1,9 +1,10 @@
 import logging
+
 import pyray as ray
 
-from libs.global_data import Difficulty, PlayerNum, reset_session
 from libs.audio import audio
 from libs.chara_2d import Chara2D
+from libs.global_data import Difficulty, PlayerNum, reset_session
 from libs.global_objects import AllNetIcon, CoinOverlay, Nameplate
 from libs.screen import Screen
 from libs.texture import tex
@@ -12,7 +13,7 @@ from libs.utils import (
     get_current_ms,
     global_data,
     is_l_don_pressed,
-    is_r_don_pressed
+    is_r_don_pressed,
 )
 from scenes.game import ScoreMethod
 

scenes/settings.py

@@ -1,7 +1,9 @@
 import logging
+
 import pyray as ray
 
 from libs.audio import audio
+from libs.config import save_config
 from libs.screen import Screen
 from libs.texture import tex
 from libs.utils import (
@@ -11,7 +13,6 @@ from libs.utils import (
     is_r_don_pressed,
     is_r_kat_pressed,
 )
-from libs.config import save_config
 
 logger = logging.getLogger(__name__)
 

scenes/song_select.py

@@ -1,18 +1,31 @@
+import logging
 import random
 from dataclasses import fields
 from pathlib import Path
 
 import pyray as ray
-import logging
-
 from raylib import SHADER_UNIFORM_VEC3
 
-from libs.file_navigator import DEFAULT_COLORS, BackBox, DanCourse, GenreIndex, navigator
 from libs.audio import audio
 from libs.chara_2d import Chara2D
-from libs.file_navigator import Directory, SongBox, SongFile
+from libs.file_navigator import (
+    DEFAULT_COLORS,
+    BackBox,
+    DanCourse,
+    Directory,
+    GenreIndex,
+    SongBox,
+    SongFile,
+    navigator,
+)
 from libs.global_data import Difficulty, Modifiers, PlayerNum
-from libs.global_objects import AllNetIcon, CoinOverlay, Nameplate, Indicator, Timer
+from libs.global_objects import (
+    AllNetIcon,
+    CoinOverlay,
+    Indicator,
+    Nameplate,
+    Timer,
+)
 from libs.screen import Screen
 from libs.texture import tex
 from libs.transition import Transition

scenes/title.py

@@ -2,8 +2,11 @@ import logging
 import random
 from pathlib import Path
 
+import pyray as ray
+
 from libs.audio import audio
 from libs.global_objects import AllNetIcon, CoinOverlay, EntryOverlay
+from libs.screen import Screen
 from libs.texture import tex
 from libs.utils import (
     OutlinedText,
@@ -13,9 +16,7 @@ from libs.utils import (
     is_l_don_pressed,
     is_r_don_pressed,
 )
-import pyray as ray
 from libs.video import VideoPlayer
-from libs.screen import Screen
 
 logger = logging.getLogger(__name__)
 

scenes/two_player/game.py

@@ -1,14 +1,23 @@
-import logging
 import copy
+import logging
 from pathlib import Path
+
+import pyray as ray
+
+from libs.audio import audio
 from libs.global_data import PlayerNum
 from libs.tja import TJAParser
-from libs.utils import get_current_ms
-from libs.audio import audio
-from libs.utils import global_data
+from libs.utils import get_current_ms, global_data
 from libs.video import VideoPlayer
-import pyray as ray
-from scenes.game import ClearAnimation, FCAnimation, FailAnimation, GameScreen, Player, Background, ResultTransition
+from scenes.game import (
+    Background,
+    ClearAnimation,
+    FailAnimation,
+    FCAnimation,
+    GameScreen,
+    Player,
+    ResultTransition,
+)
 
 logger = logging.getLogger(__name__)
 

scenes/two_player/result.py

@@ -1,4 +1,5 @@
 import logging
+
 from libs.global_data import PlayerNum
 from libs.texture import tex
 from libs.utils import get_current_ms

scenes/two_player/song_select.py

@@ -1,10 +1,16 @@
 import logging
+
+from libs.audio import audio
 from libs.file_navigator import SongBox, SongFile
 from libs.global_data import PlayerNum
 from libs.transition import Transition
-from scenes.song_select import DiffSortSelect, SongSelectPlayer, SongSelectScreen, State
 from libs.utils import get_current_ms, global_data
-from libs.audio import audio
+from scenes.song_select import (
+    DiffSortSelect,
+    SongSelectPlayer,
+    SongSelectScreen,
+    State,
+)
 
 logger = logging.getLogger(__name__)