Merge branch '1.21.4' into 1.21.11

Author: rfresh2

.gitignore

@@ -36,4 +36,5 @@ buildSrc/.gradle
 buildSrc/.kotlin
 buildSrc/build
 .python-version
-uv.lock
+src/launcher/uv.lock
+src/launcher/pyproject.toml

docs/wiki/Commands.md

@@ -479,6 +479,8 @@ Debug settings for features in testing or for use in development.
 
   ```debug uploadDebugLog```
 
+  ```debug uploadLauncherLog```
+
   ```debug passthroughResourcePacks on/off```
 
 

docs/wiki/Setup.md

@@ -10,9 +10,9 @@
     * `java` release channel (Any OS and CPU):
         * ~600MB RAM
 
-??? tip "Don't have enough RAM on your Linux VPS?"
+???+ tip "Don't have enough RAM on your Linux VPS?"
 
-    Use your hard drive as RAM: https://linuxize.com/post/create-a-linux-swap-file/
+    Use your hard drive as (slow) RAM: [https://linuxize.com/post/create-a-linux-swap-file/](https://linuxize.com/post/create-a-linux-swap-file/)
 
 ### Setup Guides
 
@@ -21,7 +21,16 @@
 
 ### Downloads
 
-1. Download [the launcher zip](https://github.com/rfresh2/ZenithProxy/releases/launcher-v3) for your OS and CPU
+* [Windows x64](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-windows-python-amd64.zip)
+* Linux: [x64](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-linux-amd64.zip) or [aarch64 (ARM)](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-linux-aarch64.zip)
+* Mac: [M-series CPU](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-macos-aarch64.zip) or [x64 (Intel)](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-macos-amd64.zip)
+* Other: [Python (Universal)](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-python.zip)
+
+Source: https://github.com/rfresh2/ZenithProxy/releases/tag/launcher-v3
+
+#### Instructions
+
+1. Download the above launcher release for your OS and CPU
 2. Unzip the file.
 3. Run the launcher in a terminal:
     * Linux/Mac: `./launch`
@@ -48,10 +57,6 @@
 
 The launcher will ask for required configuration on first launch
 
-??? note "How to Rerun Launcher Setup"
-
-    Run the launcher with the `--setup` flag. e.g. `./launch --setup`
-
 Use the `connect` command to link an MC account and log in once launched
 
 Command Prefixes:
@@ -60,6 +65,16 @@ Command Prefixes:
 * In-game: `/` OR `!` -> (e.g. `/help`)
 * Terminal: N/A -> (e.g. `help`)
 
+???+ tip "How to Rerun Launcher Setup"
+
+    Run the launcher with the `--setup` flag. e.g. `./launch --setup`
+
+???+ tip "How to exit a running instance"
+
+    Press the keybind: `control + c`
+
+    Some terminals have alternate keybinds. If all else fails, just close the window
+
 [Full Commands Documentation](Commands.md){ .md-button .md-button--primary }
 
 [Frequently Asked Questions](FAQ.md){ .md-button .md-button--primary }
@@ -71,7 +86,7 @@ ZenithProxy releases for multiple MC versions and OS/hardware platforms, known a
 **Platforms**
 
 * (Default) `java` - Works on all systems. Supports [Plugins](Plugins.md).
-* (Recommended) `linux` - Linux native x86_64 executable. ~50% reduced memory usage and instant startup
+* (Recommended) `linux` - Linux native x64 executable. ~50% reduced memory usage and instant startup
 
 **MC Versions**
 

docs/zensical.toml

@@ -243,7 +243,7 @@ features = [
     # automatically updated with the active anchor as highlighted in the table
     # of contents.
     # https://zensical.org/docs/setup/navigation/#anchor-tracking
-    "navigation.tracking",
+    # "navigation.tracking",
 
     # When search highlighting is enabled and a user clicks on a search result,
     # Zensical will highlight all occurrences after following the link.

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -3,24 +3,34 @@
 import sys
 import time
 
-import certifi
+if sys.version_info[0] < 3 or sys.version_info[1] < 6:
+    # f strings added in 3.6
+    # it's possible other things will break pre 3.10, not sure tho
+    print("CRITICAL: Python 3.10 or higher is required. Current version: " + str(sys.version_info[0]) + "." + str(sys.version_info[1]))
+    sys.exit(1)
+
+if sys.version_info[1] < 10:
+    print("WARNING: Python 3.10 or higher is required. Current version: " + str(sys.version_info[0]) + "." + str(sys.version_info[1]))
+
+from log import info, critical_error
 
+info("ZenithProxy Launcher Initializing...")
+info(f"Python Version: {sys.version_info[0]}.{sys.version_info[1]}.{sys.version_info[2]}")
+
+import certifi
 import github_api
 import launch_platform
 from launch_config import LaunchConfig, read_launch_config_file
 from launcher import launcher_exec
 from setup import setup_execute, rescue_invalid_system, setup_unattended
 from update_launcher import update_launcher_exec
 from update_zenith import update_zenith_exec
-from utils import critical_error
 
 ssl._create_default_https_context = lambda: ssl.create_default_context(cafile=certifi.where())
 
 config = LaunchConfig()
 api = github_api.GitHubAPI(config)
 
-print("ZenithProxy Launcher Initializing...")
-
 # Certain platforms like mac seem to not have the correct cwd set correctly when double clicking the executable
 if launch_platform.is_pyinstaller_bundle():
     current_cwd = os.getcwd()
@@ -56,17 +66,17 @@
         if json_data is None:
             if unattended:
                 critical_error("launch_config.json not found and unattended setup is enabled")
-            print("Running setup...")
+            info("Running setup...")
             setup_execute(config)
             continue
         config.load_launch_config_data(json_data)
         if not config.validate_launch_config():
             if unattended:
                 critical_error("launch_config.json has invalid values and unattended setup is enabled")
-            print("launch_config.json has invalid values, running setup...")
+            info("launch_config.json has invalid values, running setup...")
             setup_execute(config)
             continue
-        print("Loaded launch_config.json successfully")
+        info("Loaded launch_config.json successfully")
         if not launch_platform.validate_system_with_config(config):
             if unattended:
                 critical_error("System validation failed and unattended setup is enabled")
@@ -78,7 +88,7 @@
             update_launcher_exec(config, api)
         update_zenith_exec(config, api)
         launcher_exec(config)
-        print("Restarting in 3 seconds...")
+        info("Restarting in 3 seconds...")
         time.sleep(3)
 except KeyboardInterrupt:
     sys.exit(0)

src/launcher/__main__.py

@@ -4,6 +4,8 @@
 from requests.adapters import HTTPAdapter
 from urllib3 import Retry
 
+from log import info, error
+
 
 class GitHubAPI:
     launch_config = None
@@ -62,7 +64,7 @@ def get_latest_release_and_ver(self, channel):
             )
             return (latest_release["id"], latest_release["tag_name"]) if latest_release else None
         except Exception as e:
-            print("Failed to get releases:", e)
+            error("Failed to get releases: %s", e)
         return None
 
     def get_release_for_ver(self, tag_name):
@@ -72,7 +74,7 @@ def get_release_for_ver(self, tag_name):
             release = response.json()
             return release["id"], release["tag_name"]
         except Exception as e:
-            print("Failed to get release for version:", e)
+            error("Failed to get release for version: %s", e)
         return None
 
     def get_asset_id(self, release_id, asset_name, tag=False):
@@ -81,7 +83,7 @@ def get_asset_id(self, release_id, asset_name, tag=False):
             response = self._send_request(url, self.get_headers())
             return next((asset["id"] for asset in response.json()["assets"] if asset["name"] == asset_name), None)
         except Exception as e:
-            print("Failed to get release asset ID:", e)
+            error("Failed to get release asset ID: %s", e)
         return None
 
     def get_release_asset_id(self, release_id, asset_name):
@@ -103,6 +105,8 @@ def download_asset(self, asset_id, verbose=False):
             data = bytearray()
             # start timer when streaming begins
             start_time = time.time()
+            if verbose:
+                info(f"Downloading {url}:")
 
             for chunk in response.iter_content(chunk_size=chunk_size):
                 if not chunk:
@@ -121,14 +125,14 @@ def download_asset(self, asset_id, verbose=False):
                     percent = downloaded * 100 / total
                     total_kb = total / 1024
                     if verbose:
-                        print(f"\rDownloading {url}: {percent:.1f}% ({downloaded_kb:.1f}/{total_kb:.1f} KB) {elapsed_str}", end="", flush=True)
+                        print(f"\r{percent:.1f}% ({downloaded_kb:.1f}/{total_kb:.1f} KB) {elapsed_str}", end="", flush=True)
                 else:
                     if verbose:
-                        print(f"\rDownloading {url}: {asset_id}: {downloaded_kb:.1f} KB {elapsed_str}", end="", flush=True)
+                        print(f"\r{downloaded_kb:.1f} KB {elapsed_str}", end="", flush=True)
             if verbose:
                 print()
 
             return bytes(data)
         except Exception as e:
-            print("Failed to download asset:", e)
+            error("Failed to download asset: %s", e)
             return None

src/launcher/github_api.py

@@ -6,7 +6,7 @@
 import jdk
 
 import launch_platform
-from utils import critical_error
+from log import info, error, warn, critical_error
 
 _USER_DIR = os.path.expanduser("~")
 _JDK_DIR = os.path.join(_USER_DIR, ".jdk")
@@ -32,7 +32,7 @@ def get_java_executable(min_version=21, install_type=JavaInstallType.AUTO_INSTAL
         elif install_type == JavaInstallType.NO_INSTALL:
             critical_error("Java not found and both auto install and user prompt disabled.")
         if not java_path:
-            print("Failed to install Java.")
+            warn("Failed to install Java.")
             return None
     return java_path
 
@@ -73,9 +73,9 @@ def _locate_java_from_env(env_var, min_version):
 
 
 def _install_java():
-    print("Installing Java to:", _JDK_DIR)
+    info(f"Installing Java to: {_JDK_DIR}")
     install_dir = jdk.install("25", path=_JDK_DIR)
-    print("Java installed successfully to:", install_dir)
+    info(f"Java installed successfully to: {install_dir}")
 
 
 def _java_exe_extension():
@@ -131,13 +131,13 @@ def _locate_java(min_version):
 
 def _java_install_prompt():
     while True:
-        print("Automatically install Java? (y/n)")
+        info("Automatically install Java? (y/n)")
         i1 = input("> ")
         if i1 == "y":
             _install_java()
             break
         elif i1 == "n":
-            print("Please install Java 21+ and try again.")
+            error("Please install Java 21+ and try again.")
             break
         else:
-            print("Invalid input. Enter y or n")
+            error("Invalid input. Enter y or n")

src/launcher/jdk_install.py

@@ -2,7 +2,7 @@
 import os
 import re
 
-from utils import critical_error
+from log import info, error, critical_error
 
 
 def version_looks_valid(ver):
@@ -19,10 +19,10 @@ def read_launch_config_file():
             data = json.load(f)
             return data
     except FileNotFoundError:
-        print("launch_config.json not found")
+        info("launch_config.json not found")
         return None
     except json.decoder.JSONDecodeError:
-        print("launch_config.json is invalid")
+        error("launch_config.json is invalid")
         return None
 
 
@@ -51,7 +51,7 @@ def load_launch_config_data(self, data):
         self.repo_name = data.get("repo_name", self.repo_name)
         self.custom_jvm_args = data.get("custom_jvm_args", self.custom_jvm_args)
         if self.custom_jvm_args is not None and self.custom_jvm_args != "":
-            print("Using custom JVM args:", self.custom_jvm_args)
+            info(f"Using custom JVM args: {self.custom_jvm_args}")
 
     def write_launch_config(self):
         output = {
@@ -70,28 +70,30 @@ def write_launch_config(self):
         os.replace("launch_config.json.tmp", "launch_config.json")
 
     def create_default_launch_config(self):
-        print("Creating default launch_config.json")
+        info("Creating default launch_config.json")
         self.write_launch_config()
 
     def validate_launch_config(self):
         if not valid_release_channel(self.release_channel):
-            print("Invalid release channel:", self.release_channel)
+            error(f"Invalid release channel: {self.release_channel}")
             return False
         if not version_looks_valid(self.version):
-            print("Invalid version string:", self.version)
+            error(f"Invalid version string: {self.version}")
             return False
         if self.repo_name == "":
-            print("Invalid repo name:", self.repo_name)
+            error(f"Invalid repo name: {self.repo_name}")
             return False
         if self.repo_owner == "":
-            print("Invalid repo owner:", self.repo_owner)
+            error(f"Invalid repo owner: {self.repo_owner}")
             return False
         return True
 
     def get_mc_version(self):
         # extract mc version from release channel
         # e.g. java.1.20.1 -> 1.20.1 or linux.1.20.1 -> 1.20.1
-        channel = self.release_channel.removesuffix(".pre")
+        channel = self.release_channel
+        if channel.endswith(".pre"):
+            channel = channel[:-4]
         java = channel.startswith("java")
         linux = channel.startswith("linux")
         if channel.find(".") == -1 or (not java and not linux):