trainerbase 4.2.3__tar.gz → 4.2.5__tar.gz

{trainerbase-4.2.3 → trainerbase-4.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: trainerbase
-Version: 4.2.3
+Version: 4.2.5
 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

{trainerbase-4.2.3 → trainerbase-4.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "trainerbase"
-version = "4.2.3"
+version = "4.2.5"
 description = "Framework for creating game trainers/mods"
 license = "MIT"
 authors = [

{trainerbase-4.2.3 → trainerbase-4.2.5}/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.3 → trainerbase-4.2.5}/trainerbase/config.py

@@ -22,7 +22,7 @@ except KeyError:
     del trainerbase_config["pymem"]
 
     config_warnings.append(
-        "Deprecated config! Use [process] section with field `name` instead of [pymem] with `process_names`"
+        "Deprecated config! Use [process] section with field `names` instead of [pymem] with `process_names`"
     )
 
 

{trainerbase-4.2.3 → trainerbase-4.2.5}/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.3 → trainerbase-4.2.5}/trainerbase/gui/teleport.py

@@ -58,7 +58,7 @@ class TeleportUI(AbstractUIComponent):
         self.tp.save_position(key)
 
         if self.tts_on_hotkey:
-            say("Position saved")
+            say("Position saved", allow_task_stacking=True)
 
     @suppress_memory_exceptions
     def on_hotkey_set_saved_position_press(self, key: Hashable):

{trainerbase-4.2.3 → trainerbase-4.2.5}/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.3 → trainerbase-4.2.5}/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)