trainerbase 3.16.0__tar.gz → 3.16.1__tar.gz

{trainerbase-3.16.0 → trainerbase-3.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainerbase
-Version: 3.16.0
+Version: 3.16.1
 Summary: Framework for creating game trainers/mods
 Home-page: https://gitlab.com/python-trainers/trainer-base
 License: MIT

{trainerbase-3.16.0 → trainerbase-3.16.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trainerbase"
-version = "3.16.0"
+version = "3.16.1"
 description = "Framework for creating game trainers/mods"
 authors = ["v01d <v01d@v01d.ru>", "doomayka <zd@doomayka.ru>"]
 license = "MIT"

{trainerbase-3.16.0 → trainerbase-3.16.1}/trainerbase/common/rainbow.py

@@ -3,8 +3,6 @@ from itertools import cycle
 
 from dearpygui import dearpygui as dpg
 
-from trainerbase.scriptengine import Script, rainbow_script_engine
-
 
 type TagList = list[int | str]
 type Color = tuple[int, int, int]
@@ -91,4 +89,3 @@ class GradientUpdater:
 
 
 gradient_updater = GradientUpdater()
-rainbow_script_engine.register_script(Script(gradient_updater, enabled=True))

{trainerbase-3.16.0 → trainerbase-3.16.1}/trainerbase/gui/helpers.py

@@ -23,7 +23,7 @@ def simple_trainerbase_menu(
 ):
     def menu_decorator(initializer: Callable[[], None]):
         @wraps(initializer)
-        def run_menu_wrapper(on_initialized: Callable[[], None]):
+        def run_menu_wrapper(on_initialized: Callable[[], None], on_shutdown: Callable[[], None]):
             dpg.create_context()
             dpg.create_viewport(
                 title=window_title,
@@ -59,6 +59,9 @@ def simple_trainerbase_menu(
             on_initialized()
 
             dpg.start_dearpygui()
+
+            on_shutdown()  # it's better to call it here, because after destroy_context it may not be possible
+
             dpg.destroy_context()
 
         return run_menu_wrapper

{trainerbase-3.16.0 → trainerbase-3.16.1}/trainerbase/main.py

@@ -4,6 +4,7 @@ from traceback import print_exc
 from typing import NoReturn
 
 from trainerbase.codeinjection import safely_eject_all_code_injections
+from trainerbase.common.rainbow import gradient_updater
 from trainerbase.gameobject import update_frozen_objects
 from trainerbase.gui.objects import update_displayed_objects
 from trainerbase.process import show_message_and_shutdown_if_process_exited
@@ -16,15 +17,18 @@ from trainerbase.scriptengine import (
 from trainerbase.speedhack import SpeedHack
 
 
+type Callback = Callable[[], None]
+
+
 def run(  # pylint: disable=too-complex
-    run_gui: Callable[[Callable], None],
-    on_gui_initialized_hook: Callable | None = None,
-    on_shutdown_hook: Callable | None = None,
+    run_gui: Callable[[Callback, Callback], None],
+    on_gui_initialized_hook: Callback | None = None,
+    on_shutdown_hook: Callback | None = None,
 ) -> NoReturn:
     def on_shutdown() -> NoReturn:
+        rainbow_script_engine.stop()
         system_script_engine.stop()
         process_healthcheck_script_engine.stop()
-        rainbow_script_engine.stop()
 
         safely_eject_all_code_injections()
         SpeedHack.disable()
@@ -49,9 +53,10 @@ def run(  # pylint: disable=too-complex
     system_script_engine.register_script(Script(update_frozen_objects, enabled=True))
     system_script_engine.register_script(Script(update_displayed_objects, enabled=True))
     process_healthcheck_script_engine.register_script(Script(show_message_and_shutdown_if_process_exited, enabled=True))
+    rainbow_script_engine.register_script(Script(gradient_updater, enabled=True))
 
     try:
-        run_gui(on_gui_initialized)
+        run_gui(on_gui_initialized, on_shutdown)
     except Exception:
         print_exc()