trainerbase 4.2.4__tar.gz → 4.3.0__tar.gz

{trainerbase-4.2.4 → trainerbase-4.3.0}/LICENSE

@@ -1,7 +1,7 @@
 MIT License
 
-Copyright (c) 2021 - 2024 v01d
-Copyright (c) 2022 - 2024 doomayka
+Copyright (c) 2021 - 2025 v01d
+Copyright (c) 2022 - 2025 doomayka
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{trainerbase-4.2.4 → trainerbase-4.3.0}/PKG-INFO

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: trainerbase
-Version: 4.2.4
+Version: 4.3.0
 Summary: Framework for creating game trainers/mods
 Project-URL: Homepage, https://gitlab.com/python-trainers/
 Project-URL: Repository, https://gitlab.com/python-trainers/trainer-base
 Author-email: v01d <v01d@v01d.ru>, doomayka <zd@doomayka.ru>
-License: MIT
+License-Expression: MIT
+License-File: LICENSE
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
@@ -13,7 +14,7 @@ Requires-Python: >=3.13
 Requires-Dist: dearpygui>=2.0.0
 Requires-Dist: keyboard>=0.13.5
 Requires-Dist: mouse>=0.7.1
-Requires-Dist: psutil>=6.1.0
+Requires-Dist: psutil>=6.1.1
 Requires-Dist: pyinjector>=1.3.0
 Requires-Dist: pymem>=1.14.0
 Requires-Dist: pyttsx3>=2.98

{trainerbase-4.2.4 → trainerbase-4.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "trainerbase"
-version = "4.2.4"
+version = "4.3.0"
 description = "Framework for creating game trainers/mods"
 license = "MIT"
 authors = [
@@ -13,7 +13,7 @@ dependencies = [
     "dearpygui>=2.0.0",
     "keyboard>=0.13.5",
     "mouse>=0.7.1",
-    "psutil>=6.1.0",
+    "psutil>=6.1.1",
     "pyinjector>=1.3.0",
     "pymem>=1.14.0",
     "pyttsx3>=2.98",
@@ -74,5 +74,5 @@ build-backend = "hatchling.build"
 
 [dependency-groups]
 dev = [
-    "ruff>=0.8.2",
+    "ruff>=0.8.6",
 ]

{trainerbase-4.2.4 → trainerbase-4.3.0}/trainerbase/codeinjection.py

@@ -8,6 +8,7 @@ from typing import ClassVar, Final, Self, override
 
 from pymem.exception import MemoryWriteError
 
+from trainerbase.logger import logger
 from trainerbase.memory import ARCH, ConvertibleToAddress, allocate, ensure_address
 from trainerbase.process import pm
 
@@ -51,16 +52,22 @@ class CodeInjection(AbstractCodeInjection):
     @override
     def inject(self):
         self.injection_point = self.address.resolve()
-
         self.original_code = pm.read_bytes(self.injection_point, len(self.code_to_inject))
+
+        logger.debug(f"Injecting {len(self.code_to_inject)} byte(s) at 0x{self.injection_point:X}")
+
         pm.write_bytes(self.injection_point, self.code_to_inject, len(self.code_to_inject))
         self._injected = True
 
     @override
     def eject(self):
         if self._injected:
+            logger.debug(f"Ejecting {len(self.code_to_inject)} byte(s) from 0x{self.injection_point:X}")
+
             pm.write_bytes(self.injection_point, self.original_code, len(self.original_code))
             self._injected = False
+        else:
+            logger.debug("Nothing to eject")
 
 
 class AllocatingCodeInjection(AbstractCodeInjection):  # pylint: disable=too-many-instance-attributes
@@ -118,16 +125,24 @@ class AllocatingCodeInjection(AbstractCodeInjection):  # pylint: disable=too-man
 
         code_to_inject = self.code_to_inject + jump_back
 
+        logger.debug(f"Injecting {len(code_to_inject)} byte(s) (INJECTION) at 0x{self.new_memory_address:X}")
         pm.write_bytes(self.new_memory_address, code_to_inject, len(code_to_inject))
+
+        logger.debug(f"Injecting {len(jump_to_new_mem)} byte(s) (JUMPER) at 0x{self.injection_point:X}")
         pm.write_bytes(self.injection_point, jump_to_new_mem, len(jump_to_new_mem))
 
     @override
     def eject(self):
         if self.new_memory_address and self.injection_point:
+            logger.debug(f"Ejecting {self.original_code_length} byte(s) (JUMPER) from 0x{self.injection_point:X}")
             pm.write_bytes(self.injection_point, self.original_code, self.original_code_length)
+
+            logger.debug(f"Freeing memory at 0x{self.new_memory_address:X}")
             pm.free(self.new_memory_address)
             self.new_memory_address = 0
             self.injection_point = 0
+        else:
+            logger.debug("Nothing to eject")
 
 
 class MultipleCodeInjection(AbstractCodeInjection):
@@ -147,6 +162,8 @@ class MultipleCodeInjection(AbstractCodeInjection):
 
 def compile_asm(code: Code) -> bytes:
     if isinstance(code, str):
+        logger.debug(f"Assembling for x{ARCH}:\n{code}")
+
         fasm_mode = f"use{ARCH}"
         with TemporaryDirectory() as tmp_dir:
             asm_file = Path(tmp_dir) / "injection.asm"

{trainerbase-4.2.4 → trainerbase-4.3.0}/trainerbase/gui/helpers.py

@@ -6,6 +6,7 @@ from dearpygui import dearpygui as dpg
 from trainerbase.common.rainbow import Color, gradient_updater
 from trainerbase.gui.rainbow import RainbowUI
 from trainerbase.gui.types import AbstractUIComponent
+from trainerbase.logger import logger
 
 
 def add_components(*components: AbstractUIComponent):
@@ -58,8 +59,12 @@ def simple_trainerbase_menu(
 
             on_initialized()
 
+            logger.debug("Showing Window")
+
             dpg.start_dearpygui()
 
+            logger.debug("Window has been closed")
+
             on_shutdown()  # it's better to call it here, because after destroy_context it may not be possible
 
             dpg.destroy_context()

{trainerbase-4.2.4 → trainerbase-4.3.0}/trainerbase/gui/misc.py

@@ -50,8 +50,7 @@ class HotkeyHandlerUI(AbstractUIComponent):
     def add_to_ui(self) -> None:
         match self.handler:
             case ShortLongHotkeyPressSwitch():
-                dpg.add_text(f"Hold [{self.handler.hotkey}] Enable {self.label}")
-                dpg.add_text(f"Press [{self.handler.hotkey}] Toggle {self.label}")
+                dpg.add_text(f"Press/Hold [{self.handler.hotkey}] Toggle/Enable {self.label}")
             case ReleaseHotkeySwitch():
                 dpg.add_text(f"[{self.handler.hotkey}] Toggle {self.label}")
             case SimpleHotkeyHandler():

{trainerbase-4.2.4 → trainerbase-4.3.0}/trainerbase/gui/speedhack.py

@@ -1,8 +1,9 @@
+from functools import partial
 from typing import override
 
 from dearpygui import dearpygui as dpg
 
-from trainerbase.common.keyboard import ShortLongHotkeyPressSwitch, Switchable
+from trainerbase.common.keyboard import ShortLongHotkeyPressSwitch, SimpleHotkeyHandler, Switchable
 from trainerbase.gui.helpers import add_components
 from trainerbase.gui.misc import HotkeyHandlerUI
 from trainerbase.gui.types import AbstractUIComponent
@@ -34,9 +35,15 @@ class SpeedHackUI(AbstractUIComponent):
         speedhack: SpeedHack | None = None,
         key: str = "Delete",
         default_factor_input_value: float = 3.0,
+        next_preset_hotkey: str | None = "Shift+PageUp",
+        previous_preset_hotkey: str | None = "Shift+PageDown",
     ):
         self.speedhack = SpeedHack() if speedhack is None else speedhack
+
         self.key = key
+        self.next_preset_hotkey = next_preset_hotkey
+        self.previous_preset_hotkey = previous_preset_hotkey
+
         self.default_factor_input_value = default_factor_input_value
         self.handler = ShortLongHotkeyPressSwitch(
             SpeedHackUISwitch(self.speedhack, self.DPG_TAG_SPEEDHACK_FACTOR_INPUT),
@@ -47,6 +54,19 @@ class SpeedHackUI(AbstractUIComponent):
     def add_to_ui(self) -> None:
         add_components(HotkeyHandlerUI(self.handler, "SpeedHack"))
 
+        if self.next_preset_hotkey is not None and self.previous_preset_hotkey is not None:
+            with dpg.group(horizontal=True):
+                add_components(
+                    HotkeyHandlerUI(
+                        SimpleHotkeyHandler(partial(self.change_preset, -1), self.previous_preset_hotkey),
+                        "Preset -",
+                    ),
+                    HotkeyHandlerUI(
+                        SimpleHotkeyHandler(partial(self.change_preset, 1), self.next_preset_hotkey),
+                        "Preset +",
+                    ),
+                )
+
         dpg.add_input_double(
             tag=self.DPG_TAG_SPEEDHACK_FACTOR_INPUT,
             label="SpeedHack Factor",
@@ -68,6 +88,15 @@ class SpeedHackUI(AbstractUIComponent):
             callback=self.on_preset_change,
         )
 
+    def change_preset(self, diff: int):
+        new_preset_index = dpg.get_value(self.DPG_TAG_SPEEDHACK_PRESET_INPUT) + diff
+
+        if not (0 <= new_preset_index < len(self.PRESETS)):
+            return
+
+        dpg.set_value(self.DPG_TAG_SPEEDHACK_PRESET_INPUT, new_preset_index)
+        self.on_preset_change()
+
     def on_preset_change(self):
         new_factor = self.PRESETS[dpg.get_value(self.DPG_TAG_SPEEDHACK_PRESET_INPUT)]
         dpg.set_value(self.DPG_TAG_SPEEDHACK_FACTOR_INPUT, new_factor)

{trainerbase-4.2.4 → trainerbase-4.3.0}/trainerbase/main.py

@@ -28,20 +28,19 @@ def run(  # pylint: disable=too-complex
     on_shutdown_hook: Callback | None = None,
 ) -> NoReturn:
     def on_shutdown() -> NoReturn:
-        logger.debug("Shutting down. Stopping Script Engines.")
-
-        rainbow_script_engine.stop()
-        system_script_engine.stop()
-        process_healthcheck_script_engine.stop()
+        logger.debug("Shutting down...")
 
         logger.debug("Ejecting Code Injections.")
-
         safely_eject_all_code_injections()
 
         logger.debug("Disabling SpeedHack")
-
         SpeedHack.disable()
 
+        logger.debug("Stopping Script Engines.")
+        rainbow_script_engine.stop()
+        system_script_engine.stop()
+        process_healthcheck_script_engine.stop()
+
         if on_shutdown_hook is not None:
             logger.debug("on_shutdown_hook provided. Calling.")
             on_shutdown_hook()

{trainerbase-4.2.4 → trainerbase-4.3.0}/trainerbase/process.py

@@ -2,10 +2,12 @@ from collections.abc import Iterable
 from contextlib import suppress
 from itertools import cycle
 from os import _exit as force_exit
+from time import sleep
 from typing import cast
 
 from psutil import Process, pid_exists, process_iter
 from pymem import Pymem
+from pymem.exception import ProcessError
 
 from trainerbase.config import process_config
 from trainerbase.logger import logger
@@ -58,6 +60,15 @@ def get_target_pid(process_names: Iterable[str], *, exact_match: bool, ignore_ca
     raise RuntimeError("This place must be unreachable! `process_names` is probably empty.")
 
 
+def ensure_main_module_is_initialized(pm: Pymem) -> int:
+    while True:
+        try:
+            return pm.base_address
+        except ProcessError:
+            logger.debug("Main module is not initialized. Waiting...")
+            sleep(0.25)
+
+
 def attach_to_process() -> Pymem:
     process_names = process_config["names"]
     exact_match = process_config["exact_match"]
@@ -68,7 +79,11 @@ def attach_to_process() -> Pymem:
 
     with suppress(KeyboardInterrupt):
         pid = get_target_pid(process_names, exact_match=exact_match, ignore_case=ignore_case)
-        return Pymem(pid)
+
+        pm = Pymem(pid)
+        ensure_main_module_is_initialized(pm)
+
+        return pm
 
     force_exit(0)