vollerei/cli/hsr.py

@@ -79,10 +79,9 @@ class HSR:
             print(
                 "Windows is supported officialy by the game, so no patching is needed."
             )
-        print("By patching you are breaking the ToS, use at your own risk.")
-        if not ask("Do you want to patch the game?"):
-            print("Patching aborted.")
-            return
+            if not ask("Do you still want to patch?"):
+                print("Patching aborted.")
+                return
         print("Checking telemetry hosts...", end=" ")
         telemetry_list = self._patcher.check_telemetry()
         if telemetry_list:
@@ -90,13 +89,10 @@ class HSR:
             print("Telemetry hosts found: ")
             for host in telemetry_list:
                 print(f" - {host}")
-            print(
-                "To prevent the game from sending data about the patch, "
-                + "we need to block these hosts."
-            )
-            if not ask("Do you want to block these hosts?"):
+            if not ask(
+                "Do you want to block these hosts? (Without blocking you can't use the patch)"
+            ):
                 print("Patching aborted.")
-                print("Please block these hosts manually then try again.")
                 return
             try:
                 self._patcher.block_telemetry(telemetry_list=telemetry_list)

vollerei/common/__init__.py

@@ -1,4 +0,0 @@
-from vollerei.common.configfile import ConfigFile
-from vollerei.common.telemetry import block_telemetry, check_telemetry
-
-__all__ = ["ConfigFile", "block_telemetry", "check_telemetry"]

vollerei/common/configfile.py

@@ -1,15 +0,0 @@
-from configparser import ConfigParser
-from pathlib import Path
-
-
-class ConfigFile(ConfigParser):
-    path: Path
-
-    def __init__(self, path, **kwargs):
-        super().__init__(**kwargs)
-        self.path = Path(path)
-        self.read(self.path)
-
-    def save(self):
-        with self.path.open("w") as f:
-            self.write(f)

vollerei/hsr/launcher/game.py

@@ -2,7 +2,6 @@ from hashlib import md5
 from os import PathLike
 from pathlib import Path
 from enum import Enum
-from vollerei.common import ConfigFile
 from vollerei.abc.launcher.game import GameABC
 from vollerei.hsr.constants import MD5SUMS
 
@@ -90,24 +89,6 @@ class Game(GameABC):
             return False
         return True
 
-    def _get_version_config(self) -> tuple[int, int, int]:
-        cfg_file = self._path.joinpath("config.ini")
-        if not cfg_file.exists():
-            return (0, 0, 0)
-        cfg = ConfigFile(cfg_file)
-        if "General" not in cfg.sections():
-            return (0, 0, 0)
-        if "game_version" not in cfg["General"]:
-            return (0, 0, 0)
-        version_str = cfg["General"]["game_version"]
-        if version_str.count(".") != 2:
-            return (0, 0, 0)
-        try:
-            version = tuple(int(i) for i in version_str.split("."))
-        except Exception:
-            return (0, 0, 0)
-        return version
-
     def get_version(self) -> tuple[int, int, int]:
         """
         Get the current installed game version.
@@ -135,40 +116,36 @@ class Game(GameABC):
         version_bytes: list[list[bytes]] = [[], [], []]
         version_ptr = 0
         correct = True
-        try:
-            with self.data_folder().joinpath("data.unity3d").open("rb") as f:
-                f.seek(0x7D0)  # 2000 in decimal
-                for byte in f.read(10000):
-                    match byte:
-                        case 0:
-                            version_bytes = [[], [], []]
-                            version_ptr = 0
-                            correct = True
-                        case 46:
-                            version_ptr += 1
-                            if version_ptr > 2:
-                                correct = False
-                        case 38:
-                            if (
-                                correct
-                                and len(version_bytes[0]) > 0
-                                and len(version_bytes[1]) > 0
-                                and len(version_bytes[2]) > 0
-                            ):
-                                return (
-                                    bytes_to_int(version_bytes[0]),
-                                    bytes_to_int(version_bytes[1]),
-                                    bytes_to_int(version_bytes[2]),
-                                )
-                        case _:
-                            if correct and byte in allowed:
-                                version_bytes[version_ptr].append(byte)
-                            else:
-                                correct = False
-        except Exception:
-            pass
-        # Fallback to config.ini
-        return self._get_version_config()
+        with self.data_folder().joinpath("data.unity3d").open("rb") as f:
+            f.seek(0x7D0)  # 2000 in decimal
+            for byte in f.read(10000):
+                match byte:
+                    case 0:
+                        version_bytes = [[], [], []]
+                        version_ptr = 0
+                        correct = True
+                    case 46:
+                        version_ptr += 1
+                        if version_ptr > 2:
+                            correct = False
+                    case 38:
+                        if (
+                            correct
+                            and len(version_bytes[0]) > 0
+                            and len(version_bytes[1]) > 0
+                            and len(version_bytes[2]) > 0
+                        ):
+                            return (
+                                bytes_to_int(version_bytes[0]),
+                                bytes_to_int(version_bytes[1]),
+                                bytes_to_int(version_bytes[2]),
+                            )
+                    case _:
+                        if correct and byte in allowed:
+                            version_bytes[version_ptr].append(byte)
+                        else:
+                            correct = False
+        return (0, 0, 0)
 
     def get_version_str(self) -> str:
         """

vollerei/hsr/patcher.py

@@ -218,4 +218,6 @@ class Patcher(PatcherABC):
         Args:
             telemetry_list (list[str], optional): A list of telemetry servers to block.
         """
+        if not telemetry_list:
+            telemetry_list = telemetry.check_telemetry()
         telemetry.block_telemetry(telemetry_list)