Compare commits
3 Commits
68a598410b
...
25ca6cf2cb
Author | SHA1 | Date | |
---|---|---|---|
25ca6cf2cb | |||
e20bbab5d7 | |||
484aca0a2a |
@ -79,9 +79,10 @@ class HSR:
|
|||||||
print(
|
print(
|
||||||
"Windows is supported officialy by the game, so no patching is needed."
|
"Windows is supported officialy by the game, so no patching is needed."
|
||||||
)
|
)
|
||||||
if not ask("Do you still want to patch?"):
|
print("By patching you are breaking the ToS, use at your own risk.")
|
||||||
print("Patching aborted.")
|
if not ask("Do you want to patch the game?"):
|
||||||
return
|
print("Patching aborted.")
|
||||||
|
return
|
||||||
print("Checking telemetry hosts...", end=" ")
|
print("Checking telemetry hosts...", end=" ")
|
||||||
telemetry_list = self._patcher.check_telemetry()
|
telemetry_list = self._patcher.check_telemetry()
|
||||||
if telemetry_list:
|
if telemetry_list:
|
||||||
@ -89,10 +90,13 @@ class HSR:
|
|||||||
print("Telemetry hosts found: ")
|
print("Telemetry hosts found: ")
|
||||||
for host in telemetry_list:
|
for host in telemetry_list:
|
||||||
print(f" - {host}")
|
print(f" - {host}")
|
||||||
if not ask(
|
print(
|
||||||
"Do you want to block these hosts? (Without blocking you can't use the patch)"
|
"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?"):
|
||||||
print("Patching aborted.")
|
print("Patching aborted.")
|
||||||
|
print("Please block these hosts manually then try again.")
|
||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
self._patcher.block_telemetry(telemetry_list=telemetry_list)
|
self._patcher.block_telemetry(telemetry_list=telemetry_list)
|
||||||
|
4
vollerei/common/__init__.py
Normal file
4
vollerei/common/__init__.py
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
from vollerei.common.configfile import ConfigFile
|
||||||
|
from vollerei.common.telemetry import block_telemetry, check_telemetry
|
||||||
|
|
||||||
|
__all__ = ["ConfigFile", "block_telemetry", "check_telemetry"]
|
15
vollerei/common/configfile.py
Normal file
15
vollerei/common/configfile.py
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
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)
|
@ -2,6 +2,7 @@ from hashlib import md5
|
|||||||
from os import PathLike
|
from os import PathLike
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
from vollerei.common import ConfigFile
|
||||||
from vollerei.abc.launcher.game import GameABC
|
from vollerei.abc.launcher.game import GameABC
|
||||||
from vollerei.hsr.constants import MD5SUMS
|
from vollerei.hsr.constants import MD5SUMS
|
||||||
|
|
||||||
@ -89,6 +90,24 @@ class Game(GameABC):
|
|||||||
return False
|
return False
|
||||||
return True
|
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]:
|
def get_version(self) -> tuple[int, int, int]:
|
||||||
"""
|
"""
|
||||||
Get the current installed game version.
|
Get the current installed game version.
|
||||||
@ -116,36 +135,40 @@ class Game(GameABC):
|
|||||||
version_bytes: list[list[bytes]] = [[], [], []]
|
version_bytes: list[list[bytes]] = [[], [], []]
|
||||||
version_ptr = 0
|
version_ptr = 0
|
||||||
correct = True
|
correct = True
|
||||||
with self.data_folder().joinpath("data.unity3d").open("rb") as f:
|
try:
|
||||||
f.seek(0x7D0) # 2000 in decimal
|
with self.data_folder().joinpath("data.unity3d").open("rb") as f:
|
||||||
for byte in f.read(10000):
|
f.seek(0x7D0) # 2000 in decimal
|
||||||
match byte:
|
for byte in f.read(10000):
|
||||||
case 0:
|
match byte:
|
||||||
version_bytes = [[], [], []]
|
case 0:
|
||||||
version_ptr = 0
|
version_bytes = [[], [], []]
|
||||||
correct = True
|
version_ptr = 0
|
||||||
case 46:
|
correct = True
|
||||||
version_ptr += 1
|
case 46:
|
||||||
if version_ptr > 2:
|
version_ptr += 1
|
||||||
correct = False
|
if version_ptr > 2:
|
||||||
case 38:
|
correct = False
|
||||||
if (
|
case 38:
|
||||||
correct
|
if (
|
||||||
and len(version_bytes[0]) > 0
|
correct
|
||||||
and len(version_bytes[1]) > 0
|
and len(version_bytes[0]) > 0
|
||||||
and len(version_bytes[2]) > 0
|
and len(version_bytes[1]) > 0
|
||||||
):
|
and len(version_bytes[2]) > 0
|
||||||
return (
|
):
|
||||||
bytes_to_int(version_bytes[0]),
|
return (
|
||||||
bytes_to_int(version_bytes[1]),
|
bytes_to_int(version_bytes[0]),
|
||||||
bytes_to_int(version_bytes[2]),
|
bytes_to_int(version_bytes[1]),
|
||||||
)
|
bytes_to_int(version_bytes[2]),
|
||||||
case _:
|
)
|
||||||
if correct and byte in allowed:
|
case _:
|
||||||
version_bytes[version_ptr].append(byte)
|
if correct and byte in allowed:
|
||||||
else:
|
version_bytes[version_ptr].append(byte)
|
||||||
correct = False
|
else:
|
||||||
return (0, 0, 0)
|
correct = False
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
# Fallback to config.ini
|
||||||
|
return self._get_version_config()
|
||||||
|
|
||||||
def get_version_str(self) -> str:
|
def get_version_str(self) -> str:
|
||||||
"""
|
"""
|
||||||
|
@ -218,6 +218,4 @@ class Patcher(PatcherABC):
|
|||||||
Args:
|
Args:
|
||||||
telemetry_list (list[str], optional): A list of telemetry servers to block.
|
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)
|
telemetry.block_telemetry(telemetry_list)
|
||||||
|
Loading…
Reference in New Issue
Block a user