trainerbase 4.3.0__tar.gz → 4.4.0__tar.gz

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

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: trainerbase
-Version: 4.3.0
+Version: 4.4.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-Expression: MIT
 License-File: LICENSE
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.13

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

@@ -1,6 +1,6 @@
 [project]
 name = "trainerbase"
-version = "4.3.0"
+version = "4.4.0"
 description = "Framework for creating game trainers/mods"
 license = "MIT"
 authors = [
@@ -21,7 +21,6 @@ dependencies = [
 
 classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
-    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
 ]
 

{trainerbase-4.3.0 → trainerbase-4.4.0}/trainerbase/gameobject.py

@@ -52,13 +52,7 @@ class GameObject[PymemType, TrainerBaseType](AbstractReadableObject[TrainerBaseT
             self.value_range = value_range
 
     def __repr__(self):
-        return (
-            f"<{self.__class__.__name__}"
-            f" at {hex(self.address.resolve())}:"
-            f" value={self.value},"
-            f" frozen={self.frozen}"
-            ">"
-        )
+        return f"<{self.__class__.__name__} at {hex(self.address.resolve())}: value={self.value}, frozen={self.frozen}>"
 
     def after_read(self, value: PymemType) -> TrainerBaseType:
         return cast(TrainerBaseType, value)

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

@@ -1,14 +1,18 @@
 from collections.abc import Callable
-from typing import override
+from typing import Any, override
 
 from dearpygui import dearpygui as dpg
 
 from trainerbase.common.keyboard import (
     AbstractKeyboardHandler,
+    GameBoolReleaseHotkeySwitch,
     ReleaseHotkeySwitch,
     ShortLongHotkeyPressSwitch,
     SimpleHotkeyHandler,
 )
+from trainerbase.gameobject import GameBool
+from trainerbase.gui.helpers import add_components
+from trainerbase.gui.objects import GameObjectUI
 from trainerbase.gui.types import AbstractUIComponent
 
 
@@ -77,3 +81,63 @@ class HotkeyHandlerUI(AbstractUIComponent):
                 callable_object()
 
         return callback_with_dunder_code
+
+
+class HorizontalUI(AbstractUIComponent):
+    def __init__(self, *components: AbstractUIComponent):
+        self.components = components
+
+    @override
+    def add_to_ui(self) -> None:
+        with dpg.group(horizontal=True):
+            add_components(*self.components)
+
+        return super().add_to_ui()
+
+
+class SwitchableGameBoolUI(AbstractUIComponent):
+    def __init__(
+        self,
+        gameobject: GameBool,
+        toggle_hotkey: str,
+        label: str,
+        freeze_hotkey: str | None = None,
+        set_hotkey: str | None = None,
+        *,
+        default_setter_input_value: Any = 0,
+        before_set: Callable | None = None,
+        tts_on_hotkey: bool = True,
+        setter_input_width: int = 220,
+        toggle_text: str = "Toggle",
+    ):
+        self.gameobject = gameobject
+        self.toggle_hotkey = toggle_hotkey
+        self.toggle_text = toggle_text
+
+        self.pure_label = label
+        self.freeze_hotkey = freeze_hotkey
+        self.set_hotkey = set_hotkey
+        self.default_setter_input_value = default_setter_input_value
+        self.before_set = before_set
+        self.tts_on_hotkey = tts_on_hotkey
+        self.setter_input_width = setter_input_width
+
+    @override
+    def add_to_ui(self) -> None:
+        add_components(
+            HorizontalUI(
+                HotkeyHandlerUI(GameBoolReleaseHotkeySwitch(self.gameobject, self.toggle_hotkey), self.toggle_text),
+                GameObjectUI(
+                    self.gameobject,
+                    self.pure_label,
+                    self.freeze_hotkey,
+                    self.set_hotkey,
+                    default_setter_input_value=self.default_setter_input_value,
+                    before_set=self.before_set,
+                    tts_on_hotkey=self.tts_on_hotkey,
+                    setter_input_width=self.setter_input_width,
+                ),
+            )
+        )
+
+        return super().add_to_ui()

{trainerbase-4.3.0 → trainerbase-4.4.0}/trainerbase/scriptengine.py

@@ -36,7 +36,7 @@ class SimpleScript(AbstractBaseScript):
         self.enabled = enabled
 
     def __repr__(self):
-        return f"<Script {getattr(self._callback, "__name__", "Anon function-based script")}: enabled={self.enabled}>"
+        return f"<Script {getattr(self._callback, '__name__', 'Anon function-based script')}: enabled={self.enabled}>"
 
     @override
     def __call__(self):

{trainerbase-4.3.0 → trainerbase-4.4.0}/trainerbase/speedhack.py

@@ -4,11 +4,9 @@ from typing import Final, Self, cast
 
 from pyinjector import inject
 from pymem.exception import MemoryWriteError
-from pymem.process import module_from_name
-from pymem.ressources.structure import MODULEINFO
 
 from trainerbase.gameobject import GameDouble
-from trainerbase.memory import ARCH
+from trainerbase.memory import ARCH, get_module_address
 from trainerbase.process import pm
 
 
@@ -36,10 +34,7 @@ class SpeedHack:
 
     def _inject(self) -> int:
         inject(cast(int, pm.process_id), str(SPEEDHACK_DLL_PATH))
-
-        speedhack_address = cast(MODULEINFO, module_from_name(pm.process_handle, SPEEDHACK_DLL_MODULE_NAME)).lpBaseOfDll
-
-        return speedhack_address
+        return get_module_address(SPEEDHACK_DLL_MODULE_NAME)
 
     @property
     def factor(self):