trainerbase 4.4.1__tar.gz → 4.5.1__tar.gz

{trainerbase-4.4.1 → trainerbase-4.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trainerbase
-Version: 4.4.1
+Version: 4.5.1
 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
@@ -13,7 +13,8 @@ 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.1
+Requires-Dist: psutil>=7.0.0
+Requires-Dist: pydantic>=2.10.6
 Requires-Dist: pyinjector>=1.3.0
 Requires-Dist: pymem>=1.14.0
 Requires-Dist: pyttsx3>=2.98

{trainerbase-4.4.1 → trainerbase-4.5.1}/pyproject.toml

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

{trainerbase-4.4.1 → trainerbase-4.5.1}/trainerbase/codeinjection.py

@@ -8,12 +8,13 @@ from typing import ClassVar, Final, Self, override
 
 from pymem.exception import MemoryWriteError
 
+from trainerbase.config import config
 from trainerbase.logger import logger
 from trainerbase.memory import ARCH, ConvertibleToAddress, allocate, ensure_address
 from trainerbase.process import pm
 
 
-FASM_EXECUTABLE_PATH: Final[Path] = Path(__file__).resolve().parent.parent / "trainerbase_vendor" / "FASM.EXE"
+FASM_EXECUTABLE_PATH: Final[Path] = config.vendor.folder / "FASM.EXE"
 
 
 type Code = bytes | str

trainerbase-4.5.1/trainerbase/config.py

@@ -0,0 +1,56 @@
+from pathlib import Path
+from tomllib import load as load_toml
+from typing import Any, Final
+
+from pydantic import AliasChoices, BaseModel, Field
+
+
+CONFIG_FILE: Final[Path] = Path("./trainerbase.toml")
+
+DEFAULT_VENDOR_FOLDER_PATHS: Final[list[Path]] = [
+    Path(__file__).resolve().parent.parent / "trainerbase_vendor",
+    Path().resolve() / "trainerbase_vendor",
+]
+
+
+class Process(BaseModel):
+    names: list[str] = Field(alias=AliasChoices("names", "process_names"))
+    exact_match: bool = True
+    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:
+        search_paths = DEFAULT_VENDOR_FOLDER_PATHS.copy()
+
+        if self.extra_search_paths is not None:
+            search_paths.extend(self.extra_search_paths)
+
+        try:
+            path = next(filter(Path.is_dir, search_paths))
+        except StopIteration as e:
+            raise ValueError("Failed to find Trainer Base vendor folder") from e
+
+        return path.resolve()
+
+
+class Config(BaseModel):
+    process: Process = Field(alias=AliasChoices("process", "pymem"))
+    vendor: Vendor | None = Vendor()
+    logging: dict[str, Any] | None = None  # Must be managed by logging.dictConfig
+
+
+with CONFIG_FILE.resolve().open("rb") as trainerbase_toml:
+    trainerbase_config = load_toml(trainerbase_toml)
+
+
+config = Config.model_validate(trainerbase_config)

{trainerbase-4.4.1 → trainerbase-4.5.1}/trainerbase/gui/teleport.py

@@ -16,6 +16,9 @@ from trainerbase.tts import say
 class TeleportUI(AbstractUIComponent):
     DPG_TAG_TELEPORT_LABELS = "__teleport_labels"
     DPG_TAG_TELEPORT_LABEL_FILTER_INPUT = "__dpg_tag_teleport_label_filter_input"
+    POSITION_ID_MANUAL_PRIMARY = "__position_id_manual_primary"
+    POSITION_ID_MANUAL_SECONDARY = "__position_id_manual_secondary"
+    POSITION_ID_BEFORE_DASH = "__position_id_before_dash"
 
     def __init__(
         self,
@@ -24,6 +27,7 @@ class TeleportUI(AbstractUIComponent):
         hotkey_set_saved_position: str | None = "Home",
         hotkey_dash: str | None = "End",
         hotkey_secondary_position_modifier: str = "Shift",
+        hotkey_dash_rollback: str = "Shift+End",
         *,
         tts_on_hotkey: bool = True,
     ):
@@ -32,6 +36,7 @@ class TeleportUI(AbstractUIComponent):
         self.hotkey_set_saved_position = hotkey_set_saved_position
         self.hotkey_secondary_position_modifier = hotkey_secondary_position_modifier
         self.hotkey_dash = hotkey_dash
+        self.hotkey_dash_rollback = hotkey_dash_rollback
         self.tts_on_hotkey = tts_on_hotkey
 
     @override
@@ -69,10 +74,19 @@ class TeleportUI(AbstractUIComponent):
 
     @suppress_memory_exceptions
     def on_hotkey_dash_press(self):
+        self.tp.save_position(self.POSITION_ID_BEFORE_DASH)
         self.tp.dash()
+
         if self.tts_on_hotkey:
             say("Dash!")
 
+    @suppress_memory_exceptions
+    def on_hotkey_dash_rollback_press(self):
+        self.tp.restore_saved_position(self.POSITION_ID_BEFORE_DASH)
+
+        if self.tts_on_hotkey:
+            say("Dash Rollback!")
+
     @suppress_memory_exceptions
     def on_goto_label(self):
         self.tp.goto(dpg.get_value(self.DPG_TAG_TELEPORT_LABELS))
@@ -81,8 +95,14 @@ class TeleportUI(AbstractUIComponent):
         if self.hotkey_save_position is None or self.hotkey_set_saved_position is None:
             return
 
-        add_hotkey(self.hotkey_save_position, partial(self.on_hotkey_save_position_press, 0))
-        add_hotkey(self.hotkey_set_saved_position, partial(self.on_hotkey_set_saved_position_press, 0))
+        add_hotkey(
+            self.hotkey_save_position,
+            partial(self.on_hotkey_save_position_press, self.POSITION_ID_MANUAL_PRIMARY),
+        )
+        add_hotkey(
+            self.hotkey_set_saved_position,
+            partial(self.on_hotkey_set_saved_position_press, self.POSITION_ID_MANUAL_PRIMARY),
+        )
 
         hotkey_secondary_position_hint = ""
         if self.hotkey_secondary_position_modifier:
@@ -91,8 +111,14 @@ class TeleportUI(AbstractUIComponent):
                 f"{self.hotkey_secondary_position_modifier} + {self.hotkey_set_saved_position}"
             )
             hotkey_secondary_position_hint = f"[{self.hotkey_secondary_position_modifier} +] "
-            add_hotkey(hotkey_save_secondary_position, partial(self.on_hotkey_save_position_press, 1))
-            add_hotkey(hotkey_set_secondary_saved_position, partial(self.on_hotkey_set_saved_position_press, 1))
+            add_hotkey(
+                hotkey_save_secondary_position,
+                partial(self.on_hotkey_save_position_press, self.POSITION_ID_MANUAL_SECONDARY),
+            )
+            add_hotkey(
+                hotkey_set_secondary_saved_position,
+                partial(self.on_hotkey_set_saved_position_press, self.POSITION_ID_MANUAL_SECONDARY),
+            )
 
         dpg.add_text(f"[{hotkey_secondary_position_hint}{self.hotkey_save_position}] Save Position")
         dpg.add_text(f"[{hotkey_secondary_position_hint}{self.hotkey_set_saved_position}] Restore Position")
@@ -101,9 +127,15 @@ class TeleportUI(AbstractUIComponent):
         if self.hotkey_dash is None:
             return
 
-        add_hotkey(self.hotkey_dash, self.on_hotkey_dash_press)
+        with dpg.group(horizontal=True):
+            add_hotkey(self.hotkey_dash, self.on_hotkey_dash_press)
+            dpg.add_text(f"[{self.hotkey_dash}] Dash")
+
+            if self.hotkey_dash_rollback is None:
+                return
 
-        dpg.add_text(f"[{self.hotkey_dash}] Dash")
+            add_hotkey(self.hotkey_dash_rollback, self.on_hotkey_dash_rollback_press)
+            dpg.add_text(f"/ [{self.hotkey_dash_rollback}] Dash Rollback")
 
     def _tp_add_labels_if_needed(self):
         if not self.tp.labels:

{trainerbase-4.4.1 → trainerbase-4.5.1}/trainerbase/logger.py

@@ -1,10 +1,10 @@
 from logging import ERROR, getLogger
 from logging.config import dictConfig
 
-from trainerbase.config import CONFIG_FILE, config_warnings, logging_config
+from trainerbase.config import CONFIG_FILE, config
 
 
-if logging_config is None:
+if config.logging is None:
     logging_config = {
         "version": 1,
         "disable_existing_loggers": True,
@@ -28,9 +28,9 @@ if logging_config is None:
     }
     using_default_config = True
 else:
+    logging_config = config.logging
     using_default_config = False
 
-
 dictConfig(logging_config)
 getLogger("comtypes").setLevel(ERROR)
 
@@ -38,6 +38,3 @@ logger = getLogger("TrainerBase")
 
 if using_default_config:
     logger.debug(f"No logging config in {CONFIG_FILE}! Using default one.")
-
-for warning_message in config_warnings:
-    logger.warning(warning_message)

{trainerbase-4.4.1 → trainerbase-4.5.1}/trainerbase/process.py

@@ -9,7 +9,7 @@ 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.config import config
 from trainerbase.logger import logger
 
 
@@ -70,15 +70,15 @@ def ensure_main_module_is_initialized(pm: Pymem) -> int:
 
 
 def attach_to_process() -> Pymem:
-    process_names = process_config["names"]
-    exact_match = process_config["exact_match"]
-    ignore_case = process_config["ignore_case"]
-
-    if not process_names:
+    if not config.process.names:
         raise ValueError("Empty process name list")
 
     with suppress(KeyboardInterrupt):
-        pid = get_target_pid(process_names, exact_match=exact_match, ignore_case=ignore_case)
+        pid = get_target_pid(
+            config.process.names,
+            exact_match=config.process.exact_match,
+            ignore_case=config.process.ignore_case,
+        )
 
         pm = Pymem(pid)
         ensure_main_module_is_initialized(pm)

{trainerbase-4.4.1 → trainerbase-4.5.1}/trainerbase/speedhack.py

@@ -5,16 +5,17 @@ from typing import Final, Self, cast
 from pyinjector import inject
 from pymem.exception import MemoryWriteError
 
+from trainerbase.config import config
 from trainerbase.gameobject import GameDouble
 from trainerbase.memory import ARCH, get_module_address
 from trainerbase.process import pm
 
 
 SPEEDHACK_DLL_MODULE_NAME: Final[str] = f"speedhack{ARCH}.dll"
-SPEEDHACK_DLL_PATH: Final[Path] = (
-    Path(__file__).resolve().parent.parent / "trainerbase_vendor" / SPEEDHACK_DLL_MODULE_NAME
+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_OFFSET: Final[int] = 0x40058 if ARCH == 32 else 0x47098
 
 
 class SpeedHack:

trainerbase-4.4.1/trainerbase/config.py

@@ -1,29 +0,0 @@
-from pathlib import Path
-from tomllib import load as load_toml
-from typing import Final
-
-
-CONFIG_FILE: Final[Path] = Path("./trainerbase.toml")
-
-
-with CONFIG_FILE.resolve().open("rb") as trainerbase_toml:
-    trainerbase_config = load_toml(trainerbase_toml)
-
-
-config_warnings = []
-
-
-try:
-    process_config = trainerbase_config["process"]
-except KeyError:
-    # Legacy section support
-    process_config = trainerbase_config["pymem"]
-    process_config["names"] = process_config["process_names"]
-    del trainerbase_config["pymem"]
-
-    config_warnings.append(
-        "Deprecated config! Use [process] section with field `names` instead of [pymem] with `process_names`"
-    )
-
-
-logging_config = trainerbase_config.get("logging")