trainerbase 4.1.5__tar.gz → 4.2.1__tar.gz

{trainerbase-4.1.5 → trainerbase-4.2.1}/.gitignore

@@ -93,7 +93,7 @@ ipython_config.py
 # pyenv
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
-# .python-version
+.python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.

{trainerbase-4.1.5 → trainerbase-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: trainerbase
-Version: 4.1.5
+Version: 4.2.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

{trainerbase-4.1.5 → trainerbase-4.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "trainerbase"
-version = "4.1.5"
+version = "4.2.1"
 description = "Framework for creating game trainers/mods"
 license = "MIT"
 authors = [
@@ -74,5 +74,5 @@ build-backend = "hatchling.build"
 
 [dependency-groups]
 dev = [
-    "ruff>=0.7.2",
+    "ruff>=0.7.3",
 ]

{trainerbase-4.1.5 → trainerbase-4.2.1}/trainerbase/codeinjection.py

@@ -8,7 +8,8 @@ from typing import ClassVar, Final, Self, override
 
 from pymem.exception import MemoryWriteError
 
-from trainerbase.memory import ARCH, ConvertibleToAddress, allocate, ensure_address, pm
+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"

{trainerbase-4.1.5 → trainerbase-4.2.1}/trainerbase/common/helpers.py

@@ -7,7 +7,8 @@ from uuid import uuid4
 from pymem.exception import MemoryReadError, MemoryWriteError
 
 from trainerbase.gameobject import AbstractReadableObject, GameObject
-from trainerbase.memory import POINTER_SIZE, Address, allocate, pm
+from trainerbase.memory import POINTER_SIZE, Address, allocate
+from trainerbase.process import pm
 
 
 type Number = int | float

{trainerbase-4.1.5 → trainerbase-4.2.1}/trainerbase/common/rainbow.py

@@ -26,7 +26,7 @@ class GradientUpdater(AbstractBaseScript):
         if self.tags is None or self.colors is None:
             raise RuntimeError("Call setup(...)")
 
-        for tag, color in zip(self.tags, self.get_colors(len(self.tags))):
+        for tag, color in zip(self.tags, self.get_colors(len(self.tags)), strict=False):
             dpg.configure_item(tag, color=color)
 
     def setup(

{trainerbase-4.1.5 → trainerbase-4.2.1}/trainerbase/common/teleport.py

@@ -35,12 +35,12 @@ class Vector3:
         return self.__apply_binary_function(other, add)
 
     def __apply_binary_function(self, other, function) -> Self:
-        if isinstance(other, (float, int)):
+        if isinstance(other, float | int):
             other = repeat(other, 3)
         elif not isinstance(other, self.__class__):
             raise TypeError(f"Can't apply function {function}. Wrong type: {type(other)}")
 
-        return self.__class__(*starmap(function, zip(self, other)))
+        return self.__class__(*starmap(function, zip(self, other, strict=False)))
 
     @classmethod
     def from_coords(cls, x1, y1, z1, x2, y2, z2) -> Self:

{trainerbase-4.1.5 → trainerbase-4.2.1}/trainerbase/config.py

@@ -1,7 +1,6 @@
 from pathlib import Path
-from typing import Final
-
 from tomllib import load as load_toml
+from typing import Final
 
 
 CONFIG_FILE: Final[Path] = Path("./trainerbase.toml")

{trainerbase-4.1.5 → trainerbase-4.2.1}/trainerbase/gameobject.py

@@ -7,7 +7,8 @@ from typing import ClassVar, Self, cast, override
 from pymem.exception import MemoryWriteError
 
 from trainerbase.abc import Switchable
-from trainerbase.memory import ConvertibleToAddress, ensure_address, pm
+from trainerbase.memory import ConvertibleToAddress, ensure_address
+from trainerbase.process import pm
 
 
 class AbstractReadableObject[T](ABC):
@@ -69,7 +70,7 @@ class GameObject[PymemType, TrainerBaseType](AbstractReadableObject[TrainerBaseT
         if self.value_range is None:
             return True
 
-        if not isinstance(value, (int, float)):
+        if not isinstance(value, int | float):
             raise TypeError(f"Unable to validate range for non-numeric value: {value} (type: {type(value)})")
 
         min_value, max_value = self.value_range

{trainerbase-4.1.5 → trainerbase-4.2.1}/trainerbase/memory.py

@@ -10,7 +10,7 @@ from pymem.pattern import pattern_scan_all, pattern_scan_module
 from pymem.process import module_from_name
 
 from trainerbase.logger import logger
-from trainerbase.process import _pm as pm
+from trainerbase.process import pm
 
 
 ARCH: Final[int] = 64 if pm.is_64_bit else 32
@@ -46,6 +46,7 @@ class AOBScan(AbstractAddress):
         should_cache: bool = True,
         should_escape: bool = True,
         any_byte_marker: str = "??",
+        check_memory_protection: bool = True,
     ):
         self._should_cache = should_cache
         self._saved_scan_result: int | None = None
@@ -60,6 +61,7 @@ class AOBScan(AbstractAddress):
         self.add = add
         self.module_name = module_name
         self.multiple_result_index = multiple_result_index
+        self.check_memory_protection = check_memory_protection
 
     def __add__(self, extra_add: int) -> Self:
         new_add = self.add + extra_add
@@ -82,7 +84,7 @@ class AOBScan(AbstractAddress):
 
             find_aob = partial(pattern_scan_module, pm.process_handle, module, return_multiple=return_multiple)
 
-        scan_result: list[int] | int | None = find_aob(self.aob, check_memory_protection=False)
+        scan_result: list[int] | int | None = find_aob(self.aob, check_memory_protection=self.check_memory_protection)
 
         if not scan_result:
             raise ValueError(f"AOB not found: {self.aob}")

{trainerbase-4.1.5 → trainerbase-4.2.1}/trainerbase/process.py

@@ -74,14 +74,14 @@ def attach_to_process() -> Pymem:
 
 
 def shutdown_if_process_exited():
-    if not pid_exists(cast(int, _pm.process_id)):
+    if not pid_exists(cast(int, pm.process_id)):
         logger.info("Game process exited. Shutting down.")
         force_exit(0)
 
 
 def kill_game_process():
     logger.info("Killing game process.")
-    Process(_pm.process_id).kill()
+    Process(pm.process_id).kill()
 
 
-_pm = attach_to_process()
+pm = attach_to_process()

{trainerbase-4.1.5 → trainerbase-4.2.1}/trainerbase/speedhack.py

@@ -8,7 +8,8 @@ from pymem.process import module_from_name
 from pymem.ressources.structure import MODULEINFO
 
 from trainerbase.gameobject import GameDouble
-from trainerbase.memory import ARCH, pm
+from trainerbase.memory import ARCH
+from trainerbase.process import pm
 
 
 SPEEDHACK_DLL_MODULE_NAME: Final[str] = f"speedhack{ARCH}.dll"