trainerbase 3.16.1__tar.gz → 3.16.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainerbase
-Version: 3.16.1
+Version: 3.16.3
 Summary: Framework for creating game trainers/mods
 Home-page: https://gitlab.com/python-trainers/trainer-base
 License: MIT
@@ -12,10 +12,10 @@ 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)
+Requires-Dist: pyttsx3 (>=2.91,<3.0)
 Project-URL: Repository, https://gitlab.com/python-trainers/trainer-base
 Description-Content-Type: text/markdown
 

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trainerbase"
-version = "3.16.1"
+version = "3.16.3"
 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"]
@@ -51,9 +51,9 @@ python = "^3.12"
 pymem = "^1.13.1"
 dearpygui = "^1.11.1"
 keyboard = "^0.13.5"
-pyttsx3 = "^2.90"
+pyttsx3 = "^2.91"
 pyinjector = "^1.3.0"
-psutil = "^5.9.8"
+psutil = "^6.0.0"
 
 [build-system]
 requires = ["poetry-core"]

{trainerbase-3.16.1 → trainerbase-3.16.3}/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.1 → trainerbase-3.16.3}/trainerbase/main.py

@@ -7,7 +7,7 @@ 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
+from trainerbase.process import shutdown_if_process_exited
 from trainerbase.scriptengine import (
     Script,
     process_healthcheck_script_engine,
@@ -52,7 +52,7 @@ 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))
+    process_healthcheck_script_engine.register_script(Script(shutdown_if_process_exited, enabled=True))
     rainbow_script_engine.register_script(Script(gradient_updater, enabled=True))
 
     try:

{trainerbase-3.16.1 → trainerbase-3.16.3}/trainerbase/process.py

@@ -6,8 +6,6 @@ from typing import cast
 from psutil import pid_exists
 from pymem import Pymem
 from pymem.exception import ProcessNotFound
-from win32api import MessageBox
-from win32con import MB_ICONERROR, MB_OK
 
 from trainerbase.config import pymem_config
 
@@ -38,18 +36,9 @@ def attach_to_process() -> Pymem:
     force_exit(0)
 
 
-def show_message_and_shutdown_if_process_exited():
-    if pid_exists(cast(int, _pm.process_id)):
-        return
-
-    MessageBox(
-        None,
-        "Shut down trainer?",
-        "Process Exited!",
-        MB_ICONERROR | MB_OK,
-    )
-
-    force_exit(0)
+def shutdown_if_process_exited():
+    if not pid_exists(cast(int, _pm.process_id)):
+        force_exit(0)
 
 
 _pm = attach_to_process()

{trainerbase-3.16.1 → trainerbase-3.16.3}/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: