trainerbase 4.9.0__tar.gz → 4.9.2__tar.gz

{trainerbase-4.9.0 → trainerbase-4.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trainerbase
-Version: 4.9.0
+Version: 4.9.2
 Summary: Framework for creating game trainers/mods
 Author: v01d, doomayka
 Author-email: v01d <v01d@v01d.ru>, doomayka <doomaykaka@gmail.com>
@@ -11,7 +11,7 @@ Requires-Dist: dearpygui>=2.3.1
 Requires-Dist: keyboard>=0.13.5
 Requires-Dist: mouse>=0.7.1
 Requires-Dist: psutil>=7.2.2
-Requires-Dist: pydantic>=2.14.0
+Requires-Dist: pydantic>=2.14.1
 Requires-Dist: pymem>=1.14.0
 Requires-Dist: pyttsx3>=2.99
 Requires-Dist: trainerbase-injector>=1.0.1
@@ -20,19 +20,19 @@ Project-URL: Homepage, https://gitlab.com/python-trainers/
 Project-URL: Repository, https://gitlab.com/python-trainers/trainer-base
 Description-Content-Type: text/markdown
 
-# Trainer Base
-
-[![PyPI version](https://badge.fury.io/py/TrainerBase.svg)](https://badge.fury.io/py/TrainerBase)
-[![Downloads](https://static.pepy.tech/badge/trainerbase)](https://pepy.tech/project/trainerbase)
-
-![Logo](https://gitlab.com/python-trainers/trainer-base/-/raw/main/trainerbase/vendor/big_logo.png)
-
-## To create project from template using cookiecutter
-
-```bash
-cookiecutter https://gitlab.com/v01d-gl/basic-project-template.git --checkout trainerbase
-```
-
-## Examples
-
-[Python Trainers](https://gitlab.com/python-trainers)
+# Trainer Base
+
+[![PyPI version](https://badge.fury.io/py/TrainerBase.svg)](https://badge.fury.io/py/TrainerBase)
+[![Downloads](https://static.pepy.tech/badge/trainerbase)](https://pepy.tech/project/trainerbase)
+
+![Logo](https://gitlab.com/python-trainers/trainer-base/-/raw/main/trainerbase/vendor/big_logo.png)
+
+## To create project from template using cookiecutter
+
+```bash
+cookiecutter https://gitlab.com/v01d-gl/basic-project-template.git --checkout trainerbase
+```
+
+## Examples
+
+[Python Trainers](https://gitlab.com/python-trainers)

{trainerbase-4.9.0 → trainerbase-4.9.2}/README.md

@@ -1,16 +1,16 @@
-# Trainer Base
-
-[![PyPI version](https://badge.fury.io/py/TrainerBase.svg)](https://badge.fury.io/py/TrainerBase)
-[![Downloads](https://static.pepy.tech/badge/trainerbase)](https://pepy.tech/project/trainerbase)
-
-![Logo](https://gitlab.com/python-trainers/trainer-base/-/raw/main/trainerbase/vendor/big_logo.png)
-
-## To create project from template using cookiecutter
-
-```bash
-cookiecutter https://gitlab.com/v01d-gl/basic-project-template.git --checkout trainerbase
-```
-
-## Examples
-
-[Python Trainers](https://gitlab.com/python-trainers)
+# Trainer Base
+
+[![PyPI version](https://badge.fury.io/py/TrainerBase.svg)](https://badge.fury.io/py/TrainerBase)
+[![Downloads](https://static.pepy.tech/badge/trainerbase)](https://pepy.tech/project/trainerbase)
+
+![Logo](https://gitlab.com/python-trainers/trainer-base/-/raw/main/trainerbase/vendor/big_logo.png)
+
+## To create project from template using cookiecutter
+
+```bash
+cookiecutter https://gitlab.com/v01d-gl/basic-project-template.git --checkout trainerbase
+```
+
+## Examples
+
+[Python Trainers](https://gitlab.com/python-trainers)

{trainerbase-4.9.0 → trainerbase-4.9.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "trainerbase"
-version = "4.9.0"
+version = "4.9.2"
 description = "Framework for creating game trainers/mods"
 license = "MIT"
 requires-python = ">=3.14"
@@ -10,7 +10,7 @@ dependencies = [
     "keyboard>=0.13.5",
     "mouse>=0.7.1",
     "psutil>=7.2.2",
-    "pydantic>=2.14.0",
+    "pydantic>=2.14.1",
     "pymem>=1.14.0",
     "pyttsx3>=2.99",
     "trainerbase-injector>=1.0.1",
@@ -32,6 +32,21 @@ email = "doomaykaka@gmail.com"
 Homepage = "https://gitlab.com/python-trainers/"
 Repository = "https://gitlab.com/python-trainers/trainer-base"
 
+[[tool.poe.tasks.lint]]
+cmd = "ruff format ."
+
+[[tool.poe.tasks.lint]]
+cmd = "ruff check --fix ."
+
+[[tool.poe.tasks.lint]]
+cmd = "basedpyright"
+
+[[tool.poe.tasks.build]]
+script = "poethepoet.scripts:rm('dist')"
+
+[[tool.poe.tasks.build]]
+cmd = "uv build"
+
 [tool.ruff]
 src = ["trainerbase"]
 line-length = 120
@@ -66,27 +81,23 @@ lines-after-imports = 2
 [tool.ruff.format]
 line-ending = "lf"
 
-[tool.pyright]
+[tool.basedpyright]
 include = ["trainerbase"]
 typeCheckingMode = "standard"
 pythonPlatform = "All"
 pythonVersion = "3.14"
 
-[[tool.pyright.executionEnvironments]]
-root = "."
-extraPaths = ["src"]
-
 [tool.uv.build-backend]
 module-name = "trainerbase"
 module-root = ""
 
 [build-system]
-requires = ["uv_build>=0.11.3,<1.0.0"]
+requires = ["uv_build>=0.13.6,<1.0.0"]
 build-backend = "uv_build"
 
 [dependency-groups]
 dev = [
-    "invoke>=3.0.3",
-    "pyright>=1.1.414",
-    "ruff>=0.17.0",
+    "basedpyright>=1.40.2",
+    "poethepoet>=0.49.0",
+    "ruff>=0.17.3",
 ]

{trainerbase-4.9.0 → trainerbase-4.9.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "trainerbase"
-version = "4.9.0"
+version = "4.9.2"
 description = "Framework for creating game trainers/mods"
 license = "MIT"
 authors = [
@@ -14,7 +14,7 @@ dependencies = [
     "keyboard>=0.13.5",
     "mouse>=0.7.1",
     "psutil>=7.2.2",
-    "pydantic>=2.14.0",
+    "pydantic>=2.14.1",
     "pymem>=1.14.0",
     "pyttsx3>=2.99",
     "trainerbase-injector>=1.0.1",
@@ -29,6 +29,14 @@ classifiers = [
 Homepage = "https://gitlab.com/python-trainers/"
 Repository = "https://gitlab.com/python-trainers/trainer-base"
 
+[tool.poe.tasks]
+lint = [
+    { cmd = "ruff format ." },
+    { cmd = "ruff check --fix ." },
+    { cmd = "basedpyright" },
+]
+build = [{ script = "poethepoet.scripts:rm('dist')" }, { cmd = "uv build" }]
+
 [tool.ruff]
 src = ["trainerbase"]
 line-length = 120
@@ -63,26 +71,19 @@ lines-after-imports = 2
 [tool.ruff.format]
 line-ending = "lf"
 
-[tool.pyright]
+[tool.basedpyright]
 include = ["trainerbase"]
 typeCheckingMode = "standard"
 pythonPlatform = "All"
 pythonVersion = "3.14"
-executionEnvironments = [
-    { root = ".", extraPaths = ["src"] }
-]
 
 [tool.uv.build-backend]
 module-name = "trainerbase"
 module-root = ""
 
 [build-system]
-requires = ["uv_build>=0.11.3,<1.0.0"]
+requires = ["uv_build>=0.13.6,<1.0.0"]
 build-backend = "uv_build"
 
 [dependency-groups]
-dev = [
-    "invoke>=3.0.3",
-    "pyright>=1.1.414",
-    "ruff>=0.17.0",
-]
+dev = ["basedpyright>=1.40.2", "poethepoet>=0.49.0", "ruff>=0.17.3"]

{trainerbase-4.9.0 → trainerbase-4.9.2}/trainerbase/common/keyboard.py

@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from time import time
+from time import monotonic
 from typing import override
 
 from keyboard import add_hotkey, on_press_key, on_release_key
@@ -78,7 +78,7 @@ class ShortLongHotkeyPressSwitch(AbstractKeyboardHandler):
 
     def _on_press(self, _):
         if self._press_timestamp is None:
-            self._press_timestamp = time()
+            self._press_timestamp = monotonic()
         self.on_press()
 
     def _on_release(self, _):
@@ -93,7 +93,7 @@ class ShortLongHotkeyPressSwitch(AbstractKeyboardHandler):
         if self._press_timestamp is None:
             return 0
 
-        return time() - self._press_timestamp
+        return monotonic() - self._press_timestamp
 
     def _is_short_delta(self):
         return self._get_press_delta() <= self._short_press_max_delta

{trainerbase-4.9.0 → trainerbase-4.9.2}/trainerbase/config.py

@@ -19,14 +19,8 @@ class Process(BaseModel):
     ignore_case: bool = False
 
 
-class SpeedhackConfig(BaseModel):
-    offset_x64: int = 0x47098
-    offset_x32: int = 0x40058
-
-
 class Vendor(BaseModel):
     extra_search_paths: list[Path] | None = None
-    speedhack: SpeedhackConfig = SpeedhackConfig()
 
     @property
     def folder(self) -> Path:

{trainerbase-4.9.0 → trainerbase-4.9.2}/trainerbase/gui/helpers.py

@@ -37,6 +37,7 @@ def simple_trainerbase_menu(
                 height=height,
                 resizable=False,
                 small_icon=ICON_PATH,
+                large_icon=ICON_PATH,
             )
             dpg.setup_dearpygui()
 

{trainerbase-4.9.0 → trainerbase-4.9.2}/trainerbase/gui/injections.py

@@ -1,4 +1,3 @@
-from traceback import print_exc
 from typing import override
 from uuid import uuid4
 
@@ -8,6 +7,7 @@ from pymem.exception import MemoryReadError, MemoryWriteError
 
 from trainerbase.codeinjection import AbstractCodeInjection
 from trainerbase.gui.types import AbstractUIComponent
+from trainerbase.logger import logger
 from trainerbase.tts import say
 
 
@@ -44,7 +44,7 @@ class CodeInjectionUI(AbstractUIComponent):
             change_codeinjection_state()
         except MemoryReadError, MemoryWriteError, ValueError:
             dpg.set_value(self.dpg_tag, not dpg.get_value(self.dpg_tag))
-            print_exc()
+            logger.exception("Failed to change code injection state: %s", self.pure_label)
 
     def on_hotkey_press(self):
         dpg.set_value(self.dpg_tag, not dpg.get_value(self.dpg_tag))

{trainerbase-4.9.0 → trainerbase-4.9.2}/trainerbase/main.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
 from os import _exit as force_exit
-from traceback import print_exc
+from signal import SIG_IGN, SIGBREAK, SIGINT, SIGTERM, default_int_handler, signal
 from typing import NoReturn
 
 from trainerbase.codeinjection import safely_eject_all_code_injections
@@ -28,6 +28,11 @@ def run(
     on_shutdown_hook: Callback | None = None,
 ) -> NoReturn:
     def on_shutdown() -> NoReturn:
+        # Poe repeats console signals while waiting for cleanup to finish.
+        signal(SIGINT, SIG_IGN)
+        signal(SIGTERM, SIG_IGN)
+        signal(SIGBREAK, SIG_IGN)
+
         logger.info("Shutting down...")
 
         logger.debug("Ejecting Code Injections.")
@@ -60,10 +65,12 @@ def run(
             try:
                 on_gui_initialized_hook()
             except Exception:
-                logger.error("Exception occurred while calling on_gui_initialized_hook. See stderr.")
-                print_exc()
+                logger.exception("Exception occurred while calling on_gui_initialized_hook.")
                 on_shutdown()
 
+    signal(SIGTERM, default_int_handler)
+    signal(SIGBREAK, default_int_handler)
+
     logger.info("Starting...")
     logger.debug("Registering core scripts")
     system_script_engine.simple_script(update_frozen_objects, enabled=True)
@@ -77,8 +84,8 @@ def run(
     try:
         run_gui(on_gui_initialized, on_shutdown)
     except Exception:
-        print_exc()
+        logger.exception("Exception occurred while running GUI.")
     except KeyboardInterrupt:
-        logger.info("KeyboardInterrupt (Ctrl+C)")
+        logger.info("Shutdown requested (KeyboardInterrupt)")
 
     on_shutdown()

{trainerbase-4.9.0 → trainerbase-4.9.2}/trainerbase/speedhack.py

@@ -7,15 +7,13 @@ from trainerbase_injector import inject
 
 from trainerbase.config import config
 from trainerbase.gameobject import GameDouble
-from trainerbase.memory import ARCH, get_module_address
+from trainerbase.memory import ARCH, AOBScan
 from trainerbase.process import pm
 
 
 SPEEDHACK_DLL_MODULE_NAME: Final[str] = f"speedhack{ARCH}.dll"
 SPEEDHACK_DLL_PATH: Final[Path] = config.vendor.folder / SPEEDHACK_DLL_MODULE_NAME
-SPEED_MODIFIER_OFFSET: Final[int] = (
-    config.vendor.speedhack.offset_x32 if ARCH == 32 else config.vendor.speedhack.offset_x64
-)
+SPEED_MODIFIER_ANCHOR: Final[bytes] = b"trainerbase__speedhackrs__anchor"
 
 
 class SpeedHack:
@@ -28,14 +26,19 @@ class SpeedHack:
         return cls._instance
 
     def __init__(self):
-        self._dll_injection_address = self._inject()
-        self._speed_modifier = GameDouble(self._dll_injection_address + SPEED_MODIFIER_OFFSET)
+        self._inject()
+        self._speed_modifier = GameDouble(
+            AOBScan(
+                SPEED_MODIFIER_ANCHOR,
+                add=len(SPEED_MODIFIER_ANCHOR),
+                module_name=SPEEDHACK_DLL_MODULE_NAME,
+            ),
+        )
 
         self.factor = 1.0
 
-    def _inject(self) -> int:
+    def _inject(self):
         inject(cast(int, pm.process_id), str(SPEEDHACK_DLL_PATH))
-        return get_module_address(SPEEDHACK_DLL_MODULE_NAME)
 
     @property
     def factor(self):