trainerbase 3.16.0__tar.gz → 3.16.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainerbase
-Version: 3.16.0
+Version: 3.16.2
 Summary: Framework for creating game trainers/mods
 Home-page: https://gitlab.com/python-trainers/trainer-base
 License: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: dearpygui (>=1.11.1,<2.0.0)
 Requires-Dist: keyboard (>=0.13.5,<0.14.0)
-Requires-Dist: psutil (>=5.9.8,<6.0.0)
+Requires-Dist: psutil (>=6.0.0,<7.0.0)
 Requires-Dist: pyinjector (>=1.3.0,<2.0.0)
 Requires-Dist: pymem (>=1.13.1,<2.0.0)
 Requires-Dist: pyttsx3 (>=2.90,<3.0)

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trainerbase"
-version = "3.16.0"
+version = "3.16.2"
 description = "Framework for creating game trainers/mods"
 authors = ["v01d <v01d@v01d.ru>", "doomayka <zd@doomayka.ru>"]
 license = "MIT"
@@ -17,7 +17,7 @@ include = [
 ]
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.4.10"
+ruff = "^0.5.7"
 
 [tool.ruff]
 src = ["trainerbase"]
@@ -53,7 +53,7 @@ dearpygui = "^1.11.1"
 keyboard = "^0.13.5"
 pyttsx3 = "^2.90"
 pyinjector = "^1.3.0"
-psutil = "^5.9.8"
+psutil = "^6.0.0"
 
 [build-system]
 requires = ["poetry-core"]

{trainerbase-3.16.0 → trainerbase-3.16.2}/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.2}/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.2}/trainerbase/gui/teleport.py

@@ -5,6 +5,7 @@ from typing import override
 from dearpygui import dearpygui as dpg
 from keyboard import add_hotkey
 
+from trainerbase.common.helpers import suppress_memory_exceptions
 from trainerbase.common.teleport import Teleport
 from trainerbase.gui.helpers import add_components
 from trainerbase.gui.objects import GameObjectUI
@@ -48,26 +49,31 @@ class TeleportUI(AbstractUIComponent):
 
         dpg.add_button(label="Clip Coords", callback=self.on_clip_coords)
 
+    @suppress_memory_exceptions
     def on_clip_coords(self):
         dpg.set_clipboard_text(repr(self.tp.get_coords()))
 
+    @suppress_memory_exceptions
     def on_hotkey_save_position_press(self, key: Hashable):
         self.tp.save_position(key)
 
         if self.tts_on_hotkey:
             say("Position saved")
 
+    @suppress_memory_exceptions
     def on_hotkey_set_saved_position_press(self, key: Hashable):
         is_position_restored = self.tp.restore_saved_position(key)
 
         if self.tts_on_hotkey:
             say("Position restored" if is_position_restored else "Save position at first")
 
+    @suppress_memory_exceptions
     def on_hotkey_dash_press(self):
         self.tp.dash()
         if self.tts_on_hotkey:
             say("Dash!")
 
+    @suppress_memory_exceptions
     def on_goto_label(self):
         self.tp.goto(dpg.get_value(self.DPG_TAG_TELEPORT_LABELS))
 

{trainerbase-3.16.0 → trainerbase-3.16.2}/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()
 

{trainerbase-3.16.0 → trainerbase-3.16.2}/trainerbase/scriptengine.py

@@ -1,4 +1,5 @@
 from collections.abc import Callable
+from contextlib import suppress
 from sys import stderr
 from threading import Thread
 from time import sleep
@@ -34,7 +35,9 @@ class ScriptEngine:
 
     def stop(self):
         self.should_run = False
-        self.thread.join()
+
+        with suppress(RuntimeError):
+            self.thread.join()
 
     def script_loop(self):
         while self.should_run: