sasheg/launcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sasheg/launcher:main
Branches Tags
sasheg/launcher:main sasheg/launcher:ui sasheg/launcher:UI sasheg/launcher:alpha sasheg/launcher:ui-backup
..
compare: sasheg/launcher:929d5a4ad684484b761b0c1ec2efcb1211582d97
Branches Tags
sasheg/launcher:main sasheg/launcher:ui sasheg/launcher:UI sasheg/launcher:alpha sasheg/launcher:ui-backup

132 Commits
main .. 929d5a4ad6

Author SHA1 Message Date
SashegDev 929d5a4ad6 debug: print classpath entries to identify _1._20._1.forge module source 2026-07-14 11:02:28 +00:00
SashegDev 9a853a6134 fix: ensure version jar exists for Forge to prevent _1._20._1 module name 
findVersionJar() falls back to versions/1.20.1/1.20.1.jar when the Forge
version jar doesnt exist. Filename 1.20.1.jar produces automatic module _1._20._1
which conflicts with module minecraft (split-package on net.minecraft.server).

Fix: ensureVersionJarForForge() copies vanilla jar to versions/<versionId>/
<versionId>.jar before findVersionJar() is called. Vanilla jar has
Automatic-Module-Name: minecraft so it becomes module minecraft, not _1._20._1.
 2026-07-14 10:49:54 +00:00
SashegDev 6368c32a83 fix: remove duplicate --width/--height for Forge - version.json already includes them via resolution_width/resolution_height placeholders 2026-07-14 10:43:43 +00:00
SashegDev d7ba06f24c fix: rewrite Forge launch to pass version.json args directly (AstralRinth approach) 
Root cause: our launcher was fighting with version.json by manually constructing
-p, -cp, --add-modules, --add-opens, -DignoreList, and -DlibraryDirectory.
AstralRinth passes version.json JVM args through with placeholder substitution,
then appends memory/GC/custom args.

Changes:
- VersionManifest: add getAllJvmArguments() and getAllGameArguments() that merge
  parent (vanilla) args with child (forge) args
- LaunchCommandBuilder.build(): rewrite Forge/NeoForge branch to parse ALL
  version.json JVM args and game args with placeholder substitution
- Removed: ensureVersionJarForForge(), findSrgClientJar(),
  filterClasspathAgainstModulePath(), manual -Djava.library.path for Forge
- Classpath: built from version.json libraries + client jar (first position)
- Memory/GC args appended AFTER version.json args (like AstralRinth)
- Fallback to manual args if version.json has no JVM/game args
 2026-07-14 10:30:55 +00:00
SashegDev dcb3412a58 bump: version 1.0.9 → 1.0.10 2026-07-14 07:50:54 +00:00
SashegDev c2150aa7d2 fix: check version jar manifest before assuming correct module - force overwrite vanilla jar with SRG jar if missing Automatic-Module-Name: minecraft - broaden SRG client jar search to multiple paths 2026-07-14 07:46:37 +00:00
SashegDev 03a1a1533e fix: use SRG client jar for securejarhandler minecraft module 
ensureVersionJarForForge() was copying the vanilla Mojang jar
(obfuscated class names) to versions/<forgeId>/<forgeId>.jar.
securejarhandler creates the minecraft module from this jar, but
obfuscated names dont match SRG names like PreparableReloadListener.
The package is claimed by the module but class is not found → crash.

Now prioritizes the SRG-mapped client jar from Forge libraries
(client-*-srg.jar) which has Automatic-Module-Name: minecraft and
correct SRG class names. Falls back to vanilla jar only if SRG jar
is not found.

Also removed redundant -DlibraryDirectory already in manifest args.
 2026-07-14 07:27:48 +00:00
SashegDev 03c908c80c fix: Forge split-package ResolutionException - remove ignoreList manipulation and call ensureVersionJarForForge 2026-07-13 22:07:31 +00:00
SashegDev b9bd642605 refactor: deduplicate classpath, improve forge jar detection, clean up comments 2026-07-13 20:29:53 +00:00
SashegDev f58db7f941 Fix 12: Add forge client jar to classpath (missing from version JSON libs) 
The forge patched client jar (forge-<version>-client.jar) contains all
Minecraft classes with Automatic-Module-Name: minecraft, but it is NOT
listed in the version JSON libraries array - so buildClasspathFromManifest
does not include it on the -cp. FML discovers it by scanning the library
directory, but securejarhandler only processes classpath entries to create
named modules.

This fix explicitly finds and prepends forge-<version>-client.jar to the
classpath when launching Forge/NeoForge, so securejarhandler can create
the minecraft module from it.
 2026-07-13 16:33:26 +00:00
SashegDev 0a388c90fd Fix 11: Remove forge- from ignoreList, let forge client jar create minecraft module 
Instead of copying the vanilla jar to versions/<versionId>/ and adding it to
-cp (Fix 9/10), we now simply remove forge- from the -DignoreList pattern.
This allows securejarhandler to process forge-1.20.1-47.4.20-client.jar on
the classpath, which has Automatic-Module-Name: minecraft in its MANIFEST,
and create the minecraft module from it.

The forge client jar contains all patched MC classes, so PreparableReloadListener
and all other vanilla classes are accessible in the minecraft module.
No duplicate module creation, no split-package errors.
 2026-07-13 16:27:29 +00:00
SashegDev 6cbf8a6549 Fix 10: Add copied version jar to classpath for securejarhandler minecraft module 
The copied version jar (1.20.1-forge-47.4.20.jar) is now on -cp so
securejarhandler can scan it and create the minecraft module. The jar
name does not match the ignoreList pattern forge- (starts with 1),
so it is included in the module layer. This ensures PreparableReloadListener
and other vanilla classes are findable in the minecraft module.
 2026-07-13 16:05:28 +00:00
SashegDev d4b6ea081e fix: copy vanilla jar to versions/<versionId>/ for securejarhandler minecraft module 
securejarhandler creates the minecraft module from versions/<versionId>/<versionId>.jar.
The Forge installer only creates the JSON there, not the jar. Without the jar,
securejarhandler cannot create the minecraft module, causing ClassNotFoundException
for PreparableReloadListener (a vanilla MC class expected in the minecraft module).

Fix: copy the vanilla version jar (e.g. versions/1.20.1/1.20.1.jar) to the
Forge version directory (e.g. versions/1.20.1-forge-47.4.20/1.20.1-forge-47.4.20.jar)
before launch. The jar is NOT put on -cp to prevent automatic module _1._20._1
from being created, which would conflict with the minecraft module (split-package).

Also removed patched forge client jar from -cp since securejarhandler excludes it
via -DignoreList (forge-* pattern).
 2026-07-13 15:53:04 +00:00
SashegDev 96e68dab89 fix: use patched Forge client jar instead of vanilla version jar 
Vanilla 1.20.1.jar on -cp creates automatic module _1._20._1 which
conflicts with Forge minecraft module. Use forge-*-client.jar from
libraries/ instead (contains all MC classes). Falls back to vanilla.
 2026-07-13 15:37:20 +00:00
SashegDev e6a6392565 fix: dont intercept Forge -p, its a hardcoded bootstrap list not ${classpath} 
Forge manifest -p is 8 hardcoded bootstrap JARs using ${library_directory},
not ${classpath}. Intercepting it replaced those with ALL libraries causing
duplicate module errors. Version jar stays on -cp only (not -p).
 2026-07-13 14:37:31 +00:00
SashegDev 1efd283234 fix: split classpath from module path to prevent Forge split-package error 
- Build two separate classpaths: modulePath (libraries only) and classpath (libraries + version jar)
- Intercept manifest -p to use modulePath (no version jar) preventing _1._20._1 vs minecraft module conflict
- Intercept manifest -cp to skip (our explicit -cp already added)
- Fix --version to use getVersionId() instead of instance.getName()
 2026-07-13 14:24:25 +00:00
SashegDev 546652f44c fix: include version jar in classpath for Forge/NeoForge module resolution 
The Minecraft client jar (version jar) contains all MC classes including
PreparableReloadListener. Forges
 2026-07-13 14:02:20 +00:00
SashegDev 5c8e93fd95 fix: include net.minecraft libs in classpath for Forge module path resolution 
Forge version.json uses -p ${classpath} to set the module path to the same
argfile as the classpath. Previously we filtered net.minecraft:* libs from the
classpath string, which meant they were absent from the module path too, causing
ClassNotFoundException for PreparableReloadListener and other MC classes.

Now net.minecraft:* libs are included in the Forge classpath argfile so
securejarhandler can load them as modules.
 2026-07-13 13:43:29 +00:00
SashegDev 1d069811e3 fix: Forge/NeoForge split-package ResolutionException — skip version jar on classpath, fix ${classpath} variable resolution 2026-07-13 13:32:34 +00:00
SashegDev 201269efea ForgeFix и новые фичи в интерфейсе 2026-07-13 13:16:51 +00:00
SashegDev 0d61ad1107 DevBlog №4 | массовый фикс JFX и фиксы связанные с самим лаунчером, добавление админ меню 2026-07-01 19:36:52 +00:00
SashegDev e49e630afe fix: автодетект --cli в Bootstrap, отображение локальных сборок в JFX, обработка ошибок установки и друзей 2026-06-30 13:44:26 +00:00
SashegDev 0a2b80ed06 fix: критичные баги — отсутствие auth на pack файлах, сломанный proxy fallback, race condition installInProgress, JSON парсинг, падение loadMetadata 2026-06-30 10:58:24 +00:00
SashegDev b493b3278b minor fixes 2026-06-07 16:36:50 +03:00
SashegDev ec7ef01760 иним чиним чиним чиним а так же новая система друзей и бутстраппера 2026-06-07 12:32:34 +00:00
SashegDev 166dbf8935 чиним cli + ui | Cli 99% готовность, UI примерно 70% 2026-05-24 18:38:16 +00:00
SashegDev 7014c4a455 fix: использовать java.exe вместо javaw.exe для отладки, inheritIO вместо ручного чтения 2026-05-11 12:21:29 +00:00
SashegDev d956bce921 fix: добавить UTF-8 параметры при запуске процессов и исправить обработку стрелок в ArrowMenu 2026-05-10 23:53:45 +00:00
SashegDev a765d064c4 чиним cli + ui..... ДА БЛЯ НУ СКОЛЬКО МОЖНО ТО А 2026-05-10 02:48:13 +00:00
SashegDev 1d5241075b ИНТЕРФЕЙС ФИКСЕСССС БЛЯЯЯ а так же фикс CLI 2026-05-10 01:46:38 +00:00
SashegDev 2c670b1103 попытка оптимизации и ДЖЛЫВОСШФРСЖДЛВОФЖДЛОВСМДЖЛФ ИНТЕРФЕЙС ФИКСЕСССС БЛЯЯЯ 2026-05-10 01:24:47 +00:00
SashegDev 389280f7f1 Fix: JFX launcher inherit console, no game output capture, SSE log optimization 2026-05-10 00:25:49 +00:00
SashegDev ee1e4fa8d2 Real-time log streaming via SSE 2026-05-10 00:05:10 +00:00
SashegDev e17b1d073a Launcher UI: MC/loader versions from server, split instances, console log sync, disable ZernMC for FREE 2026-05-09 23:55:08 +00:00
SashegDev a8f3ca5049 Launcher UI redesign + server mirror sync + file download optimization 2026-05-09 23:47:04 +00:00
SashegDev 59480217aa Server: generate meta.json for builds/ on startup for incremental updates 2026-05-08 18:51:15 +00:00
SashegDev 4697b16ab4 Bootstrap: incremental update via meta, server: fix file endpoint paths 2026-05-08 18:45:42 +00:00
SashegDev 099df80cc6 Pass launcher.server system property from Bootstrap to JFXLauncher 2026-05-08 18:38:18 +00:00
SashegDev 74cd5ffdf3 Assets: try meta download first, fallback to JAR extract 2026-05-08 18:37:24 +00:00
SashegDev 01668dd3bf Extract UI assets from JAR on first launch 2026-05-08 18:33:55 +00:00
SashegDev b2dbbac6ca Fix: NPE in AuthManager, game logs display in UI 2026-05-08 17:58:18 +00:00
SashegDev e32a057684 Fix: use vanilla classpath for modloaders (fabric/forge/neoforge), add JS debug logging 2026-05-08 17:50:33 +00:00
SashegDev d4dc35aac3 Debug: classpath for modloaders, game logs in UI 2026-05-08 17:43:12 +00:00
SashegDev 1e7231af57 Debug: add stdout/stderr capture, log game logs to console 2026-05-08 17:36:49 +00:00
SashegDev fd6e292d6e Add game log file writing, debug modloader launch 2026-05-08 17:23:38 +00:00
SashegDev 1e876ffe28 Clean up debug logging 2026-05-08 15:49:33 +00:00
SashegDev 2d515108f0 Debug: log server version response 2026-05-08 15:45:23 +00:00
SashegDev 13c9f67f6e Simplify: read version only from JAR manifest, remove .version file 2026-05-08 15:09:59 +00:00
SashegDev 659265c2f0 Fix version reading - fallback to JAR manifest, fix server version URL 2026-05-08 14:51:53 +00:00
SashegDev d8f189558a Fix Bootstrap to use bin/ directory properly 
- Read version from bin/.version file (reliable, no JAR locking)
- Save version to bin/.version when downloading JAR
- Use getLauncherJar() for all JAR path references
- Create binDir in main()
- Remove build.version dependency completely
 2026-05-08 13:17:30 +00:00
SashegDev 6f56012e3a Fix version reading from JAR manifest 
- Read version from bin/.version file (reliable, no JAR locking issues)
- Save version to bin/.version when downloading JAR
- Remove complex JAR/ZIP reading code
- Use simple file-based version storage
 2026-05-08 12:39:14 +00:00
SashegDev 3a0570e7da Remove build.version dependency 
- Read version only from JAR manifest (Implementation-Version)
- Remove all VERSION_FILE references from Bootstrap
- Remove build.version from scanLocalFiles() and update methods
 2026-05-08 12:15:43 +00:00
SashegDev 985abf7440 Fix: Bootstrap update and meta parsing 
- Rewrite getLauncherMeta() to properly parse server meta response
- Change downloadUpdate() fallback to JAR-only (not ZIP) to avoid JRE lock issues
- Simplify downloadUpdateLegacy() to skip ZIP (which locks JRE files)
- Add handling for AccessDeniedException when updating locked files
- Improve error logging for meta parsing failures
 2026-05-08 11:19:10 +00:00
SashegDev ec551ab2e3 Fix: Fabric loader launch and Bootstrap paths 
- Add Fabric support in LaunchCommandBuilder.findVersionJson()
- Fix Bootstrap to properly use bin/ directory for launcher JAR
- Fix server.py to accept both ZernMC-win-*.zip and ZernMCLauncher-*.zip
- Add debug output for version.json resolution
 2026-05-08 11:04:45 +00:00
SashegDev e5948b5337 Fix: Multiple launcher issues 
- Fix CLI arrow keys: remove 50ms timeout in escape sequence handling (ArrowMenu, LoginMenu)
- Add network logs polling to UI via /api/logs endpoint
- Display user role in launcher header (AuthManager, AuthService, JFXLauncher, UI)
- Capture and display game logs in launcher via /api/game-logs endpoint
- Fix demo mode bug in VersionManifest.ruleMatches() - was incorrectly adding --demo flag
- Fix modloader launch: pass proper auth info (accessToken, uuid) from AuthManager
- Add game log capture in MinecraftLib and LaunchService
 2026-05-08 10:11:49 +00:00
SashegDev 5a826c8511 Server: Add launcher version scanning on startup 
- Scan versions/ directory and generate meta.json for each version
- Log progress: 'Scanning launcher versions...', 'Launcher meta ready: vX (Y files)'
- Meta cached in memory for faster access
 2026-05-07 18:50:07 +00:00
SashegDev ce12854e1b Bootstrap: Add incremental update support via meta system 
- Get server version from /launcher/meta (new method)
- Scan local files and calculate SHA256 hashes
- POST to /launcher/diff to get what files need update
- Download only changed files via /launcher/file/{version}/{path}
- Delete obsolete files
- Fallback to ZIP/JAR if meta system fails
- Works with legacy method as backup
 2026-05-07 18:41:35 +00:00
SashegDev e566703332 Server: Add launcher meta system for incremental updates 
- Create versions/ folder structure for new format builds
- Generate meta.json with SHA256 hashes for each file
- Add endpoints:
  - GET /launcher/meta - list all versions with meta
  - GET /launcher/meta/{version} - meta for specific version
  - POST /launcher/diff - get diff between local and server files
  - GET /launcher/file/{version}/{path} - download individual file
  - GET /launcher/download/zip/{version} - download full ZIP for new install
- Legacy builds (ZIP files) remain unchanged
 2026-05-07 18:40:00 +00:00
SashegDev aaa19df5e4 Server: Default to 1 worker - better for file downloads 
- Multiple workers cause contention and slow down large file downloads
- Single worker with async handles concurrent requests fine
 2026-05-07 18:03:37 +00:00
SashegDev 0ee8077787 Server: Reduce rate limit log spam - periodic summary only 
- Instead of logging every rate limit warning, now logs summary every 60s
- Shows: IP_blocked=X, rate_limited=Y
 2026-05-07 17:56:46 +00:00
SashegDev fba944b4b8 Server: Add direct_passthrough for faster file serving 
- FileResponse with direct_passthrough=True bypasses buffering
- Should improve file download speeds
 2026-05-07 17:54:03 +00:00
SashegDev d39b40053a Server: Skip logging for file downloads 
- Don't log every /pack/*/file/* request to reduce overhead
- Helps with large file downloads
 2026-05-07 17:53:08 +00:00
SashegDev 1199ca9e21 Server: Fix /docs endpoint - allow openapi.json and swagger 
- Remove openapi.json, swagger-ui, api/docs from suspicious paths
- Fix is_suspicious_path() to allow swagger/openapi patterns
 2026-05-07 17:48:54 +00:00
SashegDev 50080d890f Server: Remove broken PID-based logging 
- is_master() doesn't work with uvicorn workers
- Keeping clean logs from cache + disabled httpx debug
 2026-05-07 17:46:42 +00:00
SashegDev f6fbb66cdc Server: PID-based logging - only master logs startup 
- Only master PID logs blocklist loading, pack scanning, etc.
- Worker processes stay silent during startup
- Much cleaner logs
 2026-05-07 17:45:36 +00:00
SashegDev d7a928cce4 Server: Add file lock for blocklist loading 
- Only one worker downloads blocklist
- Other workers wait and read from cache
- Prevents duplicate downloads on startup
 2026-05-07 17:43:21 +00:00
SashegDev 3bd3d1d0e8 Server: Cache blocklist to file + disable httpx debug logs 
- Blocklist now cached to data/blocklist_cache.txt
- Only downloads once, then reuses cache
- Disable httpx/httpcore debug logs to reduce noise
 2026-05-07 17:42:15 +00:00
SashegDev df9fa7b867 Server: Fix blocklist loading - only once at startup 
- Move public blocklist loading into lifespan (not on import)
- Avoids loading 8 times with 4 workers
- Cleaner startup logs
 2026-05-07 17:40:32 +00:00
SashegDev 81fbe028e8 Server: Auto-load public IP blocklists 
- Load known bad IPs from FireHOL blocklists on startup
- ~4400 IPs blocked by default
- Set PUBLIC_BLOCKLIST=false to disable
- Combined with manual BLOCKED_IPS env var
 2026-05-07 17:38:08 +00:00
SashegDev 513c07666b Server: Simplify IP filtering - only blacklist 
- Remove whitelist (not needed for public launcher)
- Only BLOCKED_IPS env var supported now
 2026-05-07 17:14:47 +00:00
SashegDev 04f97c3c80 Server: Add bot protection middleware 
- Global rate limiting (60 requests/minute per IP)
- IP whitelist/blacklist via ALLOWED_IPS and BLOCKED_IPS env vars
- Bot detection - silent 404 for suspicious paths (.env, phpinfo, etc.)
- Path traversal detection
- Reduced noise in logs from bot scanners
 2026-05-07 17:09:45 +00:00
SashegDev f40cf7afed Server: Add legacy build support 
- Add version parsing to distinguish new vs legacy format builds
- New format: ZernMC-win-*.zip (1.0.8+ with bundled JRE21/JavaFX)
- Legacy: ZernMCLauncher-*.zip (< 1.0.8 or with suffix)
- /launcher/download/latest now returns new format by default
- Add /launcher/download/legacy endpoint for old builds
- Add legacy info to /launcher/info and /launcher/version responses
- Update download_zip to accept both ZernMCLauncher- and ZernMC-win- patterns
 2026-05-07 16:44:10 +00:00
SashegDev 0cef411125 Refactor: Multi-module Maven project structure 
- Restructured to multi-module Maven project (bootstrap + launcher)
- Removed duplicate code (launcher/launcher/ with JCEF)
- Added JavaFX modules to lib/javafx in ZIP
- Added JRE 21 to lib/jre21 in ZIP
- Fixed Bootstrap with UTF-8 encoding and JavaFX module-path
- Fixed JAR naming (zernmclauncher.jar)
- Added Windows build configuration (ZernMC-win-*.zip)
- Fixed version parsing for -any, -alpha, -beta suffixes
 2026-05-06 21:35:14 +00:00
SashegDev 523f659269 коммит последних действий 2026-05-06 15:49:14 +00:00
SashegDev 04620d76c4 Multi-module project: bootstrap + launcher, UI updates 
- Split into 2 Maven modules: bootstrap (updater) + launcher (UI)
- New UI: blue-orange theme, grid animation background
- Fixed version parsing bug (start += 11)
- Added unit tests for version parsing
- Server: adapted to new build structure (builds/zernmc)
 2026-05-06 10:33:08 +00:00
SashegDev d0b4e187c8 feat(api): add internal API foundation for UI 
- Create api package with AuthService, InstanceService, LaunchService
- Add ApiResponse<T> model for consistent responses
- Create LauncherAPI central facade for all services
- Update Main.java to use new API for session checking
- All services compile successfully
 2026-05-05 04:12:39 +00:00
SashegDev f2d3de82f7 refactor(launch): dynamic version JSON parsing for Forge/NeoForge compatibility 
- Replace hardcoded Forge/NeoForge args with version.json parsing
- Add VersionManifest.java — parses mainClass, arguments, libraries from JSON
- Implement rule matching for OS-specific library/argument filtering
- Build classpath dynamically from manifest libraries with fallback resolution
- Resolve game args with variable substitution (${version_name}, ${game_directory}, etc.)
- Auto-discover version.json path with multiple candidate formats
- Support all Forge versions (1.12.2 through 1.21+) and NeoForge out of the box
 2026-05-04 22:58:49 +00:00
SashegDev b4431702dc feat: add NeoForge support, fix Forge installPack bug, update server proxy 
- Fix MinecraftLib.installPack() returning false for Forge (was dead code)
- Add NeoForgeInstaller.java with installer download and execution
- Update LaunchCommandBuilder with NeoForge JVM args, classpath, launch args
- Update LaunchMenu with NeoForge option, version selector, support check
- Update Instance.java loader type comment (vanilla, fabric, forge, neoforge)
- Update PackDownloader to handle neoforge loader type
- Update ZHttpClient with NEOFORGE_MAVEN service type and detection
- Add NeoForge proxy endpoints (/proxy/neoforge/versions, /proxy/neoforge/maven)
- Add maven.neoforged.net to proxy allowed_domains
- Add asset_index to PackMeta model and pack_manager scanning
- Include asset_index in /packs list endpoint response
 2026-05-04 22:53:22 +00:00
SashegDev cd2cf44d9c test(client): add JUnit 5 tests (30 tests) — unit + integration 
- Add JUnit 5 dependency to pom.xml with surefire plugin
- Add setBaseUrl() to ZHttpClient for test server override
- AuthManagerParsingTest (7 tests): error extraction from JSON responses
  (simple detail, validation array, multiple errors, plain text, truncation)
- PackDownloaderParsingTest (13 tests): JSON contract for packs, manifests,
  diffs, file info, ServerPack toString
- ServerIntegrationTest (10 tests): real Java client ↔ real FastAPI server
  (register, login, duplicate, wrong password, /admin/me, validate token,
  refresh, packs auth, pack manifest public, launcher version)
- Integration tests auto-start test server via venv python3 subprocess
  on random port with isolated temp DB, graceful skip if unavailable

All 30 tests pass, 0 failures
 2026-05-04 22:40:10 +00:00
SashegDev 8939e24e69 test(server): add client-facing endpoint tests (20 tests), fix pack contract assertions 
- Add test_client.py with comprehensive client-server contract tests:
  - TestAuthFlowClient: full register → login → refresh → validate → /admin/me → logout lifecycle
  - TestPacksClientContract: /packs response fields matching ServerPack.java
  - TestPackManifestClientContract: /pack/{name} fields matching PackManifest.java
  - TestPackDiffClientContract: /pack/{name}/diff matching DiffResponse/FileInfo.java
    (all-new, no-changes, outdated-file, extra-local-file scenarios)
  - TestPackFileDownload: file serving, 404, path traversal security
  - TestPackPermissions: auth/pass requirements for /packs and /diff
  - TestLauncherVersion: /launcher/version endpoint
  - TestProxyEndpoints: /proxy/status, /proxy/fabric/versions/loader
- Add logged_in_user_with_pass fixture (role=1) for pack-related tests
- Add pack_fixture: creates temp pack with mod file, scans it, cleans up
- Fix manifest test: files don't have 'url' field (only in diff response)
- Fix /pack/{name} test: endpoint is public, no auth required

Total: 67 tests passing (47 existing + 20 new)
 2026-05-04 22:28:12 +00:00
SashegDev c0310ed573 test(server): add comprehensive test suite (47 tests), fix DB lock and schema bugs 
- Add pytest test suite: test_auth.py, test_admin.py, test_pass.py,
  test_proxy.py, test_rate_limit.py, test_client_contract.py
- Fix SQLite 'database is locked' errors: moved log_audit() calls outside
  with get_db() blocks in register, login, logout, refresh, activate_pass
- Enable WAL mode and busy_timeout in get_db() for concurrent access
- Fix /admin/me: removed non-existent 'email' column from query
- Fix /admin/users list: disambiguated activated_at column in JOIN query
- Fix /auth/refresh: now returns refresh_token + expires_in + username/uuid/role
  to match AuthManager.AuthSession expectations; revokes old refresh token
- Fix conftest.py: unique usernames per test to avoid conflicts
- All 47 tests passing
 2026-05-04 22:14:06 +00:00
SashegDev c96b502ad4 fix(server,security): add ban check to validate_token, replace rate_limit DB with TTLCache 2026-05-04 21:12:35 +00:00
SashegDev bfcffdd88d chore(server): remove unused models, delete http_logger.py, rename viev_logs.py → view_logs.py 2026-05-04 21:10:11 +00:00
SashegDev 331fc9a863 refactor(server): clean main.py — remove duplicate imports, dead code, unify logging, fix proxy lifecycle 2026-05-04 21:09:10 +00:00
SashegDev e347c042d5 feat(server): add /auth/pass/activate endpoint for pass code activation 2026-05-04 21:06:56 +00:00
SashegDev bb564e6e9b feat(server): connect admin_router to FastAPI app 2026-05-04 21:06:02 +00:00
SashegDev 6f53002266 fix(server): add role aliases in roles.py to fix broken admin_router imports 2026-05-04 21:04:44 +00:00
SashegDev 9688509df5 fix(pom.xml): correct launch4j JAR path for exe build 2026-05-04 20:52:28 +00:00
SashegDev efc4b086d1 fix(TUI): proper arrow key handling — parse ESC sequences instead of treating as Esc 2026-05-04 20:39:29 +00:00
SashegDev 2cdc438411 just workin on the todo 2026-05-04 20:26:27 +00:00
Sashegdev b60e414d37 last commit to uuuuh idl 2026-05-04 15:19:46 +00:00
Sashegdev 10ec8625b9 The fuck was hapanned тут 2026-04-22 12:54:57 +00:00
Sashegdev f24cc078c5 Merge branch 'main' into alpha 2026-04-22 15:26:39 +03:00
Sashegdev adde40d921 Коммит, для того что бы если что роллбекать 2026-04-22 12:23:51 +00:00
Sashegdev 6bf6c1634a Фиксы проходок (нормально, в отличии от main ветки) 
ОНО РАБОТАЕТ СУКАААА
 2026-04-20 19:30:17 +00:00
Sashegdev 98462ba4a3 Update issue templates 2026-04-20 19:59:07 +03:00
Sashegdev 11ec84fe24 Create LICENSE 2026-04-20 19:57:52 +03:00
Sashegdev 8b56652a73 test penis 2026-04-09 18:13:21 +00:00
Sashegdev d7a6eb760e fixes 2026-04-09 18:03:00 +00:00
Sashegdev c6dd215e9b рефакторинг + новая система модерации 2026-04-09 17:28:48 +00:00
Sashegdev a3f9871d6e СУКА ЛАСТ ФИКСЫ ДЛЯ ПРОХОДОК (логин работает) 2026-04-08 20:22:47 +00:00
Sashegdev 2b6cb6b3ad ДА БЛЯ Я ЗАБЕАЛСЯ ФИКСИТЬ ПОМОГИТЕ Я КОНЧЕННЫЫЫЙ 2026-04-08 20:16:51 +00:00
Sashegdev cca6ef3eca SuperMinor Fixes (надеюсь последние для аккаунтов) 2026-04-08 20:04:52 +00:00
Sashegdev 8733e359e6 Minor fixes(важные блять) 2026-04-08 20:02:09 +00:00
Sashegdev 89c0057759 Server Fixes 2026-04-08 19:56:38 +00:00
Sashegdev bf26baaf93 1.0.7 типоооо и фиксы 2026-04-08 19:45:15 +00:00
Sashegdev 13a43a01ef utf-8 рефактор чутка 2026-04-07 19:00:42 +00:00
Sashegdev 296f564b39 небольшой рефактор 2026-04-07 18:54:16 +00:00
Sashegdev de703a4ddd ВАЖНИ ФИКСЕС 2026-04-07 18:40:51 +00:00
Sashegdev a501329956 Изменил версию и немного фиксов 2026-04-07 18:28:26 +00:00
Sashegdev 5516aeb12f Readme модификейшин 2026-04-07 18:08:11 +00:00
Sashegdev 7b48ae2ab6 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-04-07 18:01:49 +00:00
Sashegdev 9bee361ea4 Попытка добавления проходок, аккаунтов, а так же доработка прокси 2026-04-07 17:50:29 +00:00
Sashegdev 8cbad9af96 Update README.md 2026-04-07 18:11:54 +03:00
Sashegdev 33cb7830e3 Орфографическая правка 2026-04-07 12:24:06 +03:00
Sashegdev 920330bbab REAMDE.md update, мяу 2026-04-07 11:17:36 +03:00
Sashegdev c03d7a788f ДОБАВЛЕНИЕ ПРОКСИ РЕЖИМА ЙОООУ 1.0.5 2026-04-06 19:57:32 +00:00
Sashegdev b47793b618 Багфиксы ClassPath 2026-04-06 18:17:07 +00:00
Sashegdev 94968e8e77 Smol Fixes Yoooo 2026-04-06 17:00:39 +00:00
Sashegdev 0b4af1353d Both | БЛЯЯЯ ЗАГРУЗКА ПАКОВ С СЕРВЕРА СЮДААА 2026-04-06 00:32:36 +00:00
Sashegdev 4edbe7e910 Server BugFixes + убрал генерацию sevrer команды т.к это уже в клиенте лол 2026-04-05 22:25:43 +00:00
Sashegdev 3d8313f7d2 Немного рефактора 2026-04-05 18:45:31 +00:00
Sashegdev e21fd922ab Попытка заставить работать Forge 2026-04-05 16:18:39 +00:00
Sashegdev b29222af68 ФАБРИК ПОДДЕРЖКАААААААА 2026-04-05 15:43:16 +00:00
Sashegdev ac3ce1800f Починил загрузку ассетов, добавлена оптимизация 
запуск Vanilla версий работает
 2026-04-05 14:56:01 +00:00
Sashegdev 2babe53e99 uuuh почему бы и нет 2026-04-05 10:47:28 +00:00
Sashegdev 369f8c2f9d Изменение получения self-version 2026-04-05 10:46:32 +00:00
Sashegdev c0a85658f4 КЛИЕНТ ЛАУНЧЕРА ЙОООО 2026-04-05 00:18:57 +00:00
Sashegdev 7568e34d91 перенос readme т.к я криворукий 2026-04-04 14:59:00 +00:00
Sashegdev 7670edbff7 server update 2026-04-04 14:57:15 +00:00
Sashegdev cf4a5c74e5 test 2026-04-04 14:55:18 +00:00
Sashegdev 1a5336a996 first commit 2026-04-04 14:49:24 +00:00
80 changed files with 1325 additions and 10809 deletions
Expand all files Collapse all files
.gitignore
+2 -3
View File
@@ -10,7 +10,6 @@ server/data
jre
.vscode
dependency-reduced-pom.xml
.flattened-pom.xml
OpenJDK21U-jre_x64_windows_hotspot_21.0.6_7.zip
telegram-bot/
builds/
@@ -19,5 +18,5 @@ data/
packs/
.__pycache__
.pytest_cache
.venvtodo.txt
*.bak
.venv
resources
README.md
+41 -66
View File
@@ -8,50 +8,32 @@
- Написан полностью с нуля, без использования готовых решений
- Удобная загрузка и обновление сборок прямо с сервера ZernMC
- Чистый и относительно читаемый код как клиента, так и сервера
- Графический интерфейс на **JavaFX** (по умолчанию) + **TUI** (режим `--cli`)
- Поддержка **прокси-режима** через свой сервер при проблемах с внешними ресурсами (Fabric/Forge Maven, Mojang и т.д.), обход блокировок через выбор домена и SNI
- Поддержка загрузчиков **Fabric**, **Forge**, **NeoForge** и ванильных версий (установка через встроенный JRE)
- Ротационные логи в стиле Minecraft: `latest.log` + архивы `.log.gz`
- Инкрементальное обновление JavaFX и автообновление лаунчера
- Подпись exe самоподписным сертификатом Zern.cc (jsign/Authenticode)
- Поддержка **прокси-режима** через свой сервер при проблемах с внешними ресурсами (Fabric/Forge Maven, Mojang и т.д.)
- Возможность запуска клиента даже без графического интерфейса (TUI-режим)
- Полное отсутствие рекламы и телеметрии
- Не собирает никаких данных о пользователе
- Работает «из коробки»: достаточно распаковать архив и запустить `zernmc.exe`
- Работает «из коробки»: достаточно распаковать архив и запустить `ZernMCLauncher.exe`
- Есть система аккаунтов и проходок
## Состав дистрибутива
**Онлайн-установщик `ZernMC-Online-Setup.exe` (Go, ~5.7М, без Java):**
- Спрашивает папку установки (default `C:\ZernMC`) + чекбокс `Ярлык ZernMC Launcher.lnk на рабочем столе`
- Качает `JRE 47М` → `lib/jre21`, затем `meta/file` для `lib/javafx`, `bin/`, `assets/`, `zernmc.exe`
- Пишет `build.version`, создаёт `uninstall.exe` (`C:\ZernMC\uninstall.exe`), ярлык
- Локальные файлы `~/.zernmc` не трогает
**Оффлайн `ZernMC-win-<версия>.zip` (или `ZernMC-Offline-Setup.exe` — тот же выбор папки + ярлык):**
- `zernmc.exe` — GUI (JavaFX)
- `zernmc-cli.exe` — TUI
- `zernmc-cli-jfx.exe` — консоль + JavaFX
- `lib/jre21` — JRE 21 (только оффлайн)
- `lib/javafx` — JavaFX 23.0.1
Bootstrap встроен в `.exe`.
## Чего пока нет в лаунчере
- Готовых пресетов оптимизации JVM (настраиваются Java и выделенная память)
- Поддержки Quilt, LabyMod и других лоадеров
- Графического интерфейса (GUI) — только TUI
- Нормальных настроек (пока доступна только настройка Java и выделенной оперативной памяти)
- Поддержки **Forge** (в разработке)
- Поддержки Quilt, LabyMod, NeoForge и других лоадеров
- Раздела новостей об обновлениях Minecraft и лаунчера
- Выбора готовых пресетов оптимизации JVM
- Кастомных модов (UI, спавнеры, DPI, карточки)
- Сайта для лаунчера и сервера (текущий требует переделки)
- Трекинга наигранного времени (обновление раз в час вместо минуты)
- Сайта для лаунчера и сервера
- Трекинга наигранного времени
## Что планируется доработать в ближайшее время
- **UI мод** — переписать мод на UI: красивое главное меню, анимации, анимированный задний фон, эмбиент звуки, интерактивность, урезание ванильных элементов до используемых
- **GUI мод** — привести в единый стиль с главным меню
- **Мод на спавнеры** — кастомные спавнеры с лимитами (5-15 спавнов), отслеживание спавнов вокруг, замена на базовый спавнер при достижении предела с эффектами и звуками, данжи «временного парадокса» с процедурной генерацией этажей, минибоссы, лут
- **DPI мод** — отслеживание не-ZernMC лаунчеров, защита от форков с выпиленной проверкой, уведомления админу в Telegram с технической информацией
- **Сайт** — полноценный сайт для лаунчера и сервера
- **DPI мод** — отслеживание не-ZernMC лаунчеров, защита от форков с выпеленной проверкой, уведомления админу в Telegram с технической информацией
- **Сайт** — полноценный сайт для лаунчера и сервера (текущий «полу-живой» нуждается в полной переделке)
- **Система карточек** — дроп случайных карточек (обучена на датасете скинов CS2), просмотр, продажа, крафт, обмен между игроками, внутриигровая валюта «йоны», начисление йонов на баланс, обмен йонов на предметы, вывод йонов в отдельный предмет, анимации и эффекты
- **Web API** — OpenAPI документация, уровни доступа к API (например, получение списка игроков требует проходку)
- **Трекинг наигранного времени** — обновление каждую минуту вместо часа для нормальных графиков игроков
@@ -68,43 +50,35 @@ Bootstrap встроен в `.exe`.
### Управление в лаунчере (TUI)
Консольные версии (`zernmc-cli.exe`, а также режим `--cli`) используют **текстовый интерфейс (TUI)**:
Лаунчер использует **текстовый интерфейс (TUI)**:
- `W` / `S` (или `Ц` / `Ы`) или `↑` / `↓` — перемещение по меню
- `ENTER` — выбор пункта
- `W` / `S` (или `Ц` / `Ы`) или `↑` / `↓` — перемещение по меню
- `ENTER` — выбор пункта
- `ESC` или пункт «Назад» — возврат назад
Если вы случайно кликнули мышкой в окне лаунчера и он «заморозился» — просто нажмите **любую клавишу** на клавиатуре.
Основная версия `zernmc.exe` запускает графический интерфейс JavaFX.
### Расположение сборок
Все установленные сборки хранятся в папке:
- **Windows**: `%USERPROFILE%\.zernmc\instances`
- **Linux**: `~/.zernmc\instances`
- **Linux**: `~/.zernmc/instances`
Если сборка не удаляется корректно — удалите папку вручную.
### Логи
Логи лаунчера пишутся в файл `latest.log` рядом с исполняемым файлом; старые логи архивируются в `.log.gz` (в стиле Minecraft).
## Как скачать и запустить
**Скачать лаунчер (выбери один):**
- **Онлайн-установщик (рекомендуется)** — `ZernMC-Online-Setup.exe` (~5.7М, Go, без Java): скачай → выбери папку установки (по умолчанию `C:\ZernMC`) → [x] Создать ярлык ZernMC Launcher на рабочем столе → Установить. Первый запуск докачает JRE 47М + файлы лаунчера 50М. Данные сборок `~/.zernmc` остаются в профиле пользователя. Деинсталляция — `C:\ZernMC\uninstall.exe` или удаление папки.
- **Оффлайн ZIP** — `ZernMC-win-<версия>.zip` (98М, с JRE): скачай → выбери папку куда распаковать (диалог в `ZernMC-Offline-Setup.exe` или вручную) → [x] Ярлык → готово. Для air-gapped.
Пока автообновления и GitHub Releases не настроены, скачать последнюю версию можно по ссылкам:
**Зеркала (оба варианта):**
- https://api.zern.cc/launcher/download/jre — JRE для онлайн
- https://api.zernmc.ru/launcher/download/latest / https://api.zernmc.online/launcher/download/latest — ZIP
**Скачать лаунчер:**
- https://api.zernmc.ru/launcher/download/latest
- https://api.zernmc.online/launcher/download/latest
**Инструкция (оба):**
1. Скачай online exe **или** offline zip
2. Запусти установщик → выбери папку (по умолчанию `C:\ZernMC`, можно `D:\Games\ZernMC`) → ярлык
3. Запусти `zernmc.exe` (или `zernmc-cli.exe`) из папки установки
4. Войди в аккаунт и нажми **«Начать игру»**
**Инструкция:**
1. Скачайте zip-архив
2. Распакуйте в удобную папку
3. Запустите `ZernMCLauncher.exe`
4. Нажмите **«Начать игру»**
### Установка первой сборки
@@ -112,31 +86,28 @@ Bootstrap встроен в `.exe`.
1. Выберите **«Установить новую сборку»**
2. Выберите тип сборки:
- **ZernMC** — готовые сборки с нашего сервера
- **Модовый загрузчик** — Fabric / Forge / NeoForge
- **Модовый загрузчик** — Fabric / Forge / Quilt и т.д.
- **Ваниль** — чистая версия от Mojang
**Рекомендация:** Не используйте кириллицу в названии сборки! (science 1.0.0-1.0.5)
## Возможные проблемы и решения
### «Error: Invalid or corrupt jarfile» при запуске exe
Перекачайте архив целиком из https://api.zernmc.ru/launcher/download/latest и распакуйте заново — старые версии (до 1.0.16.17) были повреждены подписью и не запускаются.
### Проблемы с загрузкой ассетов
Иногда лаунчер неправильно определяет Asset Index.
Иногда лаунчер неправильно определяет Asset Index.
**Решение:**
1. Запустите версию и посмотрите в логах, какой `.json` файл он пытается загрузить.
2. Скопируйте правильный файл из `assets/indexes/` и переименуйте его в нужное имя.
### Forge / NeoForge
Работает через установщики лоадеров. Если у вас нет внешнего доступа к Maven-репозиториям — используйте прокси-режим.
### Forge версии
Запуск Forge пока работает нестабильно. Рекомендуется дождаться исправления генерации команды запуска.
### Прокси-режим
Если нет доступа к Fabric/Forge Maven или серверам Mojang — лаунчер пытается использовать наш сервер как прокси. Если и к нему нет доступа — загрузка может не работать.
## Как сообщить об ошибке (Issue)
1. Скопируйте весь текст ошибки из логов (`latest.log`)
1. Скопируйте весь текст ошибки из логов (лаунчер не очищает экран, поэтому просто скролльте вверх)
2. Укажите, что вы делали перед ошибкой
3. Укажите версию лаунчера
4. Создайте Issue на GitHub
@@ -147,21 +118,25 @@ Bootstrap встроен в `.exe`.
git clone https://github.com/SashegDev/launcher
```
Откройте `launcher/launcher/pom.xml`
отредактируйте пути для билда, так как сейчас - он рассчитан на разработку только на своём сервере
отредактируете пути для билда, так как сейчас - он расчитан на разработку только на моём сервере
```bash
mvn clean package
```
можете начинать!
**Сборка exe на Linux требует:** `jsign` (`~/tools/jsign/jsign.jar`), файлы сертификата в `/root/cert/codesign/`, встроенный JRE в `~/launcher/jre/jre21`.
### Благодарность
- Glitch135 — за бета-тест лаунчера и фидбеки
Glitch135 - За бета-тест лаунчера и фидбеки
### помощь
Я был бы рад если нашлись люди кто мог бы помочь в разработке лаунчера и добавления к нему хотя бы базового UI чтоб было намногл удобнее работать с ним
Буду рад помощи в разработке!
Особенно приветствуется помощь с:
- Переходом на нормальный графический интерфейс (GUI)
- Улучшением генерации команды запуска
- Добавлением поддержки Quilt / LabyMod
- Добавлением поддержки Forge / NeoForge / Quilt
- Стабилизацией серверной части
- Вообще улучшением клиента
- вообще улучшением клиента
installer/go.mod
-12
View File
@@ -1,12 +0,0 @@
module zernmc-installer
go 1.21
require (
github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf // indirect
github.com/lxn/walk v0.0.0-20210112085537-c389da54e794 // indirect
github.com/lxn/win v0.0.0-20210218163916-a377121e959e // indirect
github.com/sqweek/dialog v0.0.0-20260123140253-64c163d53aac // indirect
golang.org/x/sys v0.28.0 // indirect
gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect
)
installer/go.sum
-13
View File
@@ -1,13 +0,0 @@
github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf h1:FPsprx82rdrX2jiKyS17BH6IrTmUBYqZa/CXT4uvb+I=
github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I=
github.com/lxn/walk v0.0.0-20210112085537-c389da54e794 h1:NVRJ0Uy0SOFcXSKLsS65OmI1sgCCfiDUPj+cwnH7GZw=
github.com/lxn/walk v0.0.0-20210112085537-c389da54e794/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ=
github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc=
github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
github.com/sqweek/dialog v0.0.0-20260123140253-64c163d53aac h1:/QqP+ajFMma4hNWQyBDVaQQhz9Z1kDyXScNWMO3owx0=
github.com/sqweek/dialog v0.0.0-20260123140253-64c163d53aac/go.mod h1:/qNPSY91qTz/8TgHEMioAUc6q7+3SOybeKczHMXFcXw=
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
gopkg.in/Knetic/govaluate.v3 v3.0.0 h1:18mUyIt4ZlRlFZAAfVetz4/rzlJs9yhN+U02F4u1AOc=
gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E=
installer/main.go
-324
View File
@@ -1,324 +0,0 @@
package main
import (
"archive/zip"
"crypto/sha256"
"embed"
"encoding/hex"
"encoding/json"
"flag"
"fmt"
"io"
"net/http"
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"time"
"github.com/sqweek/dialog"
)
//go:embed offline.zip
var offlineFS embed.FS
var (
installDirFlag = flag.String("dir", "", "Installation directory (default C:\\ZernMC or chosen via dialog)")
onlineFlag = flag.Bool("online", true, "Online mode (download JRE + files)")
offlineFlag = flag.Bool("offline", false, "Offline mode (unpack from embedded zip)")
offlineZipFlag = flag.String("offline-zip", "", "Path to offline zip for offline mode")
shortcutFlag = flag.Bool("shortcut", true, "Create desktop shortcut")
)
const (
defaultInstallDir = "C:\\ZernMC"
serverBase = "https://api.zern.cc"
jreZipName = "OpenJDK21U-jre_x64_windows_hotspot_21.0.6_7.zip"
)
func main() {
flag.Parse()
isOnline := *onlineFlag && !*offlineFlag
// GUI mode on Windows unless --cli
hasCLI := false
for _, a := range os.Args { if a=="--cli" { hasCLI=true } }
if runtime.GOOS=="windows" && !hasCLI {
// try GUI, fallback to console on error
if err := runGUI(isOnline); err != nil {
fmt.Printf("GUI failed %v, fallback console\n", err)
runConsole(isOnline)
}
return
}
runConsole(isOnline)
}
func runConsole(isOnline bool) {
dir := *installDirFlag
if dir == "" { dir = askInstallDir() }
if dir == "" { fmt.Println("Installation cancelled"); os.Exit(0) }
fmt.Printf("Install dir: %s (online=%v)\n", dir, isOnline)
if err := os.MkdirAll(dir, 0755); err != nil { fatal("Cannot create directory: %v", err) }
createShortcut := *shortcutFlag
if !isFlagSet("shortcut") { createShortcut = askShortcut() }
var err error
if isOnline { err = installOnline(dir, createShortcut, nil) } else {
zipPath := *offlineZipFlag
if zipPath=="" { zipPath = findAdjacentOfflineZip() }
if zipPath=="" {
// try embedded
err = installOfflineEmbedded(dir, createShortcut)
} else { err = installOffline(dir, zipPath, createShortcut) }
}
if err != nil { fatal("%v", err) }
fmt.Println("\nInstallation complete!")
}
func runGUI(isOnline bool) error {
// Fallback to console dialogs if GUI not available (walk requires windows)
// For now use sqweek/dialog wizard to mimic Inno bootstrap
dir := *installDirFlag
if dir == "" {
// Welcome
ok := dialog.Message("Добро пожаловать в ZernMC\n\nМастер установит ZernMC Launcher на ваш компьютер.\nОнлайн — скачает 47М JRE + 50М лаунчер | Оффлайн — распакует встроенный архив\n\nНажмите ОК чтобы выбрать папку C:\\ZernMC").Title("ZernMC Setup — Приветствие").YesNo()
if !ok { return fmt.Errorf("cancelled") }
d, err := dialog.Directory().Title("Выберите папку установки — ZernMC").Browse()
if err != nil || d=="" { d = defaultInstallDir }
if !strings.Contains(strings.ToLower(d), "zernmc") { d = filepath.Join(d, "ZernMC") }
dir = d
}
if err := os.MkdirAll(dir, 0755); err != nil { dialog.Message("Ошибка создания папки: %v", err).Title("Ошибка").Error(); return err }
createShortcut := *shortcutFlag
if !isFlagSet("shortcut") { createShortcut = dialog.Message("Создать ярлык на рабочем столе?").Title("Ярлык").YesNo() }
// Progress via console + dialog
fmt.Printf("Установка в %s ...\n", dir)
var err error
if isOnline {
err = installOnline(dir, createShortcut, func(cur, total int, name string){
fmt.Printf("[%d/%d] %s\n", cur, total, name)
})
} else {
zipPath := *offlineZipFlag
if zipPath=="" { zipPath = findAdjacentOfflineZip() }
if zipPath!="" { err = installOffline(dir, zipPath, createShortcut) } else { err = installOfflineEmbedded(dir, createShortcut) }
}
if err != nil { dialog.Message("Ошибка установки: %v", err).Title("Ошибка").Error(); return err }
dialog.Message("Установка завершена!\n\nЗапустите с ярлыка или C:\\ZernMC\\zernmc.exe").Title("ZernMC Setup — Готово").Info()
// launch?
if dialog.Message("Запустить ZernMC сейчас?").Title("Готово").YesNo() {
exec.Command(filepath.Join(dir, "zernmc.exe")).Start()
}
return nil
}
func isFlagSet(name string) bool { found:=false; flag.Visit(func(f *flag.Flag){ if f.Name==name { found=true } }); return found }
func askInstallDir() string {
if runtime.GOOS=="windows" {
dir, err := dialog.Directory().Title("Куда установить ZernMC").Browse()
if err==nil && dir!="" {
if !strings.Contains(strings.ToLower(dir), "zernmc") { dir = filepath.Join(dir, "ZernMC") }
return dir
}
fmt.Printf("Dialog cancelled (%v), using default %s\n", err, defaultInstallDir)
}
fmt.Printf("Куда установить ZernMC [%s]: ", defaultInstallDir)
var input string; fmt.Scanln(&input); input=strings.TrimSpace(input)
if input=="" { input=defaultInstallDir }
return input
}
func askShortcut() bool {
if runtime.GOOS!="windows" { return false }
return dialog.Message("Создать ярлык на рабочем столе (ZernMC Launcher)?").Title("Ярлык").YesNo()
}
func fatal(format string, args ...interface{}) {
msg:=fmt.Sprintf(format, args...); fmt.Fprintln(os.Stderr, msg)
if runtime.GOOS=="windows" { dialog.Message(msg).Title("ZernMC Installer — Ошибка").Error() }
os.Exit(1)
}
func installOnline(dir string, createShortcut bool, progress func(cur,total int, name string)) error {
fmt.Println("Online installation — downloading JRE + launcher files...")
jreDir:=filepath.Join(dir, "lib", "jre21"); javaExe:=filepath.Join(jreDir, "bin", "java.exe")
if _, err:=os.Stat(javaExe); err!=nil {
fmt.Println("Downloading JRE 21 (47 MB)...")
jreURL:=serverBase+"/launcher/download/jre"; tmpZip:=filepath.Join(os.TempDir(), jreZipName)
if err:=downloadFile(jreURL, tmpZip); err!=nil {
mirrors:=[]string{"https://api.zernmc.ru/launcher/download/jre","https://api.zernmc.online/launcher/download/jre"}
var lastErr error
for _, m:=range mirrors { fmt.Printf("Retry mirror %s\n", m); if err:=downloadFile(m, tmpZip); err==nil { lastErr=nil; break } else { lastErr=err } }
if lastErr!=nil { return fmt.Errorf("JRE download failed: %w", lastErr) }
}
fmt.Printf("Unpacking JRE to %s ...\n", jreDir)
if err:=unzip(tmpZip, dir); err!=nil { return fmt.Errorf("unzip JRE: %w", err) }
candidate:=filepath.Join(dir, "jre21")
if _, err:=os.Stat(candidate); err==nil { os.MkdirAll(filepath.Join(dir, "lib"), 0755); os.RemoveAll(jreDir); if err:=os.Rename(candidate, jreDir); err!=nil { if err:=copyDir(candidate, jreDir); err!=nil { return err }; os.RemoveAll(candidate) } }
os.Remove(tmpZip)
if _, err:=os.Stat(javaExe); err!=nil { return fmt.Errorf("JRE unpack failed, %s not found", javaExe) }
fmt.Println("JRE ready")
} else { fmt.Println("JRE already present, skipping") }
fmt.Println("Fetching launcher meta...")
meta, err:=fetchMeta()
if err!=nil { return fmt.Errorf("fetch meta: %w", err) }
fmt.Printf("Latest: %s (%d files)\n", meta.Version, len(meta.Files))
for i, f:=range meta.Files {
rel:=f.Path
if strings.HasPrefix(rel, "jre21/") || strings.HasPrefix(rel, "lib/jre21") { continue }
dest:=filepath.Join(dir, filepath.FromSlash(rel))
need:=true
if fi, err:=os.Stat(dest); err==nil && !fi.IsDir() {
hash, _:=fileSHA256(dest)
if hash==strings.TrimPrefix(f.Hash, "sha256:") { need=false }
}
if !need { continue }
if progress!=nil { progress(i+1, len(meta.Files), rel) }
fmt.Printf("[%d/%d] %s (%.1f KB)\n", i+1, len(meta.Files), rel, float64(f.Size)/1024)
if err:=os.MkdirAll(filepath.Dir(dest), 0755); err!=nil { return err }
url:=fmt.Sprintf("%s/launcher/file/%s/%s", serverBase, meta.Version, rel)
if err:=downloadFile(url, dest); err!=nil { return fmt.Errorf("download %s: %w", rel, err) }
hash, _:=fileSHA256(dest)
if hash!=strings.TrimPrefix(f.Hash, "sha256:") { fmt.Printf(" WARNING hash mismatch for %s\n", rel) }
}
if err:=os.WriteFile(filepath.Join(dir, "build.version"), []byte(meta.Version), 0644); err!=nil { fmt.Printf("warning write build.version: %v\n", err) }
fmt.Println("Launcher files ready")
if createShortcut { if err:=createDesktopShortcut(dir); err!=nil { fmt.Printf("shortcut failed: %v\n", err) } }
if err:=createUninstaller(dir); err!=nil { fmt.Printf("uninstall.exe failed: %v\n", err) }
return nil
}
func installOfflineEmbedded(dir string, createShortcut bool) error {
fmt.Println("Offline embedded installation...")
data, err:=offlineFS.ReadFile("offline.zip")
if err!=nil {
// try adjacent
zp:=findAdjacentOfflineZip()
if zp!="" { return installOffline(dir, zp, createShortcut) }
return fmt.Errorf("offline.zip not embedded, put ZernMC-win-*.zip next to installer or rebuild with offline.zip: %w", err)
}
tmp:=filepath.Join(os.TempDir(), fmt.Sprintf("offline-%d.zip", time.Now().UnixNano()))
if err:=os.WriteFile(tmp, data, 0644); err!=nil { return err }
defer os.Remove(tmp)
fmt.Println("Unpacking embedded (98 MB)...")
if err:=unzip(tmp, dir); err!=nil { return fmt.Errorf("unzip: %w", err) }
if createShortcut { if err:=createDesktopShortcut(dir); err!=nil { fmt.Printf("shortcut failed: %v\n", err) } }
if err:=createUninstaller(dir); err!=nil { fmt.Printf("uninstall.exe failed: %v\n", err) }
fmt.Println("Offline unpack complete")
return nil
}
func installOffline(dir, zipPath string, createShortcut bool) error {
fmt.Printf("Offline installation from %s to %s\n", zipPath, dir)
if _, err:=os.Stat(zipPath); err!=nil { return fmt.Errorf("offline zip not found: %s", zipPath) }
fmt.Println("Unpacking (98 MB)...")
if err:=unzip(zipPath, dir); err!=nil { return fmt.Errorf("unzip: %w", err) }
if createShortcut { if err:=createDesktopShortcut(dir); err!=nil { fmt.Printf("shortcut failed: %v\n", err) } }
if err:=createUninstaller(dir); err!=nil { fmt.Printf("uninstall.exe failed: %v\n", err) }
fmt.Println("Offline unpack complete")
return nil
}
func downloadFile(url, dest string) error {
client:=&http.Client{Timeout: 120*time.Second}
resp, err:=client.Get(url)
if err!=nil { return err }
defer resp.Body.Close()
if resp.StatusCode!=200 { return fmt.Errorf("HTTP %d", resp.StatusCode) }
if err:=os.MkdirAll(filepath.Dir(dest), 0755); err!=nil { return err }
tmp:=dest+".tmp"
out, err:=os.Create(tmp)
if err!=nil { return err }
defer out.Close()
total:=resp.ContentLength
var written int64
buf:=make([]byte, 64*1024)
start:=time.Now()
for {
n, err:=resp.Body.Read(buf)
if n>0 {
if _, werr:=out.Write(buf[:n]); werr!=nil { return werr }
written+=int64(n)
if total>0 {
pct:=float64(written)/float64(total)*100
elapsed:=time.Since(start).Seconds()
speed:=float64(written)/1024/1024/(elapsed+0.001)
fmt.Printf("\r %.1f%% %.1f/%.1f MB %.1f MB/s ", pct, float64(written)/1024/1024, float64(total)/1024/1024, speed)
} else { fmt.Printf("\r %.1f MB ", float64(written)/1024/1024) }
}
if err==io.EOF { break }
if err!=nil { return err }
}
fmt.Println()
out.Close()
if err:=os.Rename(tmp, dest); err!=nil { if err2:=copyFile(tmp, dest); err2!=nil { return err2 }; os.Remove(tmp) }
return nil
}
func unzip(src, dest string) error {
r, err:=zip.OpenReader(src)
if err!=nil { return err }
defer r.Close()
for _, f:=range r.File {
fpath:=filepath.Join(dest, f.Name)
if !strings.HasPrefix(fpath, filepath.Clean(dest)+string(os.PathSeparator)) { return fmt.Errorf("illegal file path: %s", fpath) }
if f.FileInfo().IsDir() { os.MkdirAll(fpath, f.Mode()); continue }
if err:=os.MkdirAll(filepath.Dir(fpath), 0755); err!=nil { return err }
out, err:=os.OpenFile(fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
if err!=nil { return err }
rc, err:=f.Open()
if err!=nil { out.Close(); return err }
_, err=io.Copy(out, rc)
out.Close(); rc.Close()
if err!=nil { return err }
}
return nil
}
func copyFile(src, dst string) error { in, err:=os.Open(src); if err!=nil { return err }; defer in.Close(); out, err:=os.Create(dst); if err!=nil { return err }; defer out.Close(); _, err=io.Copy(out, in); return err }
func copyDir(src, dst string) error { return filepath.Walk(src, func(path string, info os.FileInfo, err error) error { if err!=nil { return err }; rel, _:=filepath.Rel(path, src); target:=filepath.Join(dst, rel); if info.IsDir() { return os.MkdirAll(target, info.Mode()) }; return copyFile(path, target) }) }
func fileSHA256(path string) (string, error) { f, err:=os.Open(path); if err!=nil { return "", err }; defer f.Close(); h:=sha256.New(); if _, err:=io.Copy(h, f); err!=nil { return "", err }; return hex.EncodeToString(h.Sum(nil)), nil }
type Meta struct { Version string `json:"version"`; Files []struct{ Path string `json:"path"`; Size int64 `json:"size"`; Hash string `json:"hash"` } `json:"files"` }
func fetchMeta() (*Meta, error) {
resp, err:=http.Get(serverBase+"/launcher/version")
if err!=nil { return nil, err }
defer resp.Body.Close()
var verResp struct{ Version string `json:"version"` }
if err:=json.NewDecoder(resp.Body).Decode(&verResp); err!=nil { return nil, err }
ver:=verResp.Version
if ver=="" { ver="1.1.1" }
metaResp, err:=http.Get(serverBase+"/launcher/meta/"+ver)
if err!=nil { return nil, err }
defer metaResp.Body.Close()
if metaResp.StatusCode!=200 { return nil, fmt.Errorf("meta %d", metaResp.StatusCode) }
var meta Meta
if err:=json.NewDecoder(metaResp.Body).Decode(&meta); err!=nil { return nil, err }
if meta.Version=="" { meta.Version=ver }
return &meta, nil
}
func findAdjacentOfflineZip() string {
exe, _:=os.Executable(); dir:=filepath.Dir(exe)
matches, _:=filepath.Glob(filepath.Join(dir, "ZernMC-Offline*.zip"))
if len(matches)>0 { return matches[0] }
matches, _=filepath.Glob(filepath.Join(dir, "ZernMC-win*.zip"))
if len(matches)>0 { return matches[0] }
matches, _=filepath.Glob("ZernMC-Offline*.zip")
if len(matches)>0 { return matches[0] }
return ""
}
func createDesktopShortcut(installDir string) error {
if runtime.GOOS!="windows" { return nil }
desktop:=filepath.Join(os.Getenv("USERPROFILE"), "Desktop")
if _, err:=os.Stat(desktop); err!=nil { desktop=filepath.Join(os.Getenv("USERPROFILE"), "OneDrive", "Desktop") }
if _, err:=os.Stat(desktop); err!=nil { return fmt.Errorf("desktop not found") }
lnk:=filepath.Join(desktop, "ZernMC Launcher.lnk")
target:=filepath.Join(installDir, "zernmc.exe")
ps:=fmt.Sprintf(`$WshShell = New-Object -comObject WScript.Shell; $Shortcut = $WshShell.CreateShortcut('%s'); $Shortcut.TargetPath = '%s'; $Shortcut.WorkingDirectory = '%s'; $Shortcut.IconLocation = '%s'; $Shortcut.Save()`, lnk, target, installDir, target)
tmp:=filepath.Join(os.TempDir(), "zernmc_shortcut.ps1")
if err:=os.WriteFile(tmp, []byte(ps), 0644); err!=nil { return err }
defer os.Remove(tmp)
cmd:=exec.Command("powershell", "-ExecutionPolicy", "Bypass", "-File", tmp)
cmd.Stdout=os.Stdout; cmd.Stderr=os.Stderr
return cmd.Run()
}
func createUninstaller(dir string) error {
exe, _:=os.Executable(); uninstExe:=filepath.Join(dir, "uninstall.exe")
if exe!="" && exe!=uninstExe { _=copyFile(exe, uninstExe) }
bat:=filepath.Join(dir, "uninstall.bat")
content:=fmt.Sprintf("@echo off\necho Uninstalling ZernMC from %s\ntimeout /t 2 >nul\ndel \"%%%%USERPROFILE%%%%\\Desktop\\ZernMC Launcher.lnk\" 2>nul\ndel \"%%%%USERPROFILE%%%%\\OneDrive\\Desktop\\ZernMC Launcher.lnk\" 2>nul\necho Data in %%%%USERPROFILE%%%%\\.zernmc will be kept.\n", dir)
_=os.WriteFile(bat, []byte(content), 0644)
return nil
}
func runCmd(name string, args ...string) error { cmd:=exec.Command(name, args...); cmd.Stdout=os.Stdout; cmd.Stderr=os.Stderr; return cmd.Run() }
launcher/bootstrap/pom.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>me.sashegdev</groupId>
<artifactId>ZernMCLauncher</artifactId>
<version>${revision}</version>
<version>1.0.10</version>
</parent>
<artifactId>zernmc-bootstrap</artifactId>
launcher/bootstrap/src/main/java/me/sashegdev/zernmc/launcher/Bootstrap.java
+30 -596
View File
@@ -13,14 +13,11 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import javax.swing.*;
import javax.swing.plaf.basic.BasicProgressBarUI;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
@@ -32,7 +29,6 @@ public class Bootstrap {
private static final String JAR_NAME = "zernmclauncher.jar";
private static final String BASE_URL = "https://api.zernmc.ru";
private static List<String> MIRRORS = new ArrayList<>();
private static final List<String> stagedSelfUpdates = new ArrayList<>();
private static volatile boolean jfxChildExiting = false;
private static Path baseDir;
@@ -47,43 +43,13 @@ public class Bootstrap {
return binDir.resolve(JAR_NAME);
}
private static Path resolveBaseDir() {
// 1) Стартуем от папки, где лежит сам .exe (для launch4j codeSource -> путь к exe).
Path exeDir = null;
try {
java.security.CodeSource cs = Bootstrap.class.getProtectionDomain().getCodeSource();
if (cs != null && cs.getLocation() != null) {
Path loc = Paths.get(cs.getLocation().toURI()).toAbsolutePath();
if (!Files.isDirectory(loc)) {
loc = loc.getParent(); // jar/exe -> его папка
}
exeDir = loc;
}
} catch (Exception ignored) {
}
if (exeDir != null) {
// exe в bin/ -> база родитель (lib/jre21/assets в корне)
Path parent = exeDir.getParent();
Path candidates[] = { exeDir, parent }; // порядок: корень дистрибутива, затем родитель
for (Path c : candidates) {
if (c == null) continue;
if (Files.exists(c.resolve("bin").resolve(JAR_NAME))) {
return c;
}
}
}
// 2) Fallback: текущая рабочая папка (старое поведение).
return Paths.get("").toAbsolutePath();
}
public static void main(String[] args) throws Exception {
baseDir = resolveBaseDir();
baseDir = Paths.get("").toAbsolutePath();
binDir = baseDir.resolve("bin");
Files.createDirectories(binDir);
logDir = baseDir.resolve("logs");
Files.createDirectories(logDir);
javafxPath = baseDir.resolve("lib").resolve("javafx");
rotateLogs();
log("=== ZernMC Launcher ===");
@@ -107,19 +73,6 @@ public class Bootstrap {
log("Local version: " + currentVersion);
log("Server version: " + serverVersion);
setVersionInfo(currentVersion, serverVersion);
if ("unknown".equals(serverVersion)) {
boolean ranDiagnostics = runDiagnosticsIfPossible();
if (ranDiagnostics) {
serverVersion = getServerVersion();
log("Server version after diagnostics: " + serverVersion);
setVersionInfo(currentVersion, serverVersion);
}
if ("unknown".equals(serverVersion) && !argList.contains("--offline")) {
log("Server still unreachable. Launcher will start in offline mode.");
argList.add("--offline");
}
}
loadMirrors();
log("Primary server: " + BASE_URL);
@@ -130,15 +83,10 @@ public class Bootstrap {
downloadUpdate(serverVersion);
} else {
log("Version is up to date");
if (hasMissingFiles(serverVersion)) {
log("Repairing missing files...");
downloadUpdate(serverVersion);
}
}
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
log("Shutdown signal received...");
applyStagedSelfUpdates();
}));
if (ui != null) {
@@ -149,12 +97,6 @@ public class Bootstrap {
ui.close();
}
if (!stagedSelfUpdates.isEmpty()) {
notifyRestartRequired();
System.exit(0);
return;
}
launchMain(argList.toArray(new String[0]));
}
@@ -167,119 +109,6 @@ public class Bootstrap {
launchInNewProcess(args);
}
}
private static boolean runDiagnosticsIfPossible() {
Path diagJar = binDir.resolve("zernmcdiag.jar");
if (!Files.exists(diagJar)) {
log("Diagnostics tool not found: bin/zernmcdiag.jar is missing.");
log("Please download the latest launcher manually from the ZernMC website.");
showMessageUi("ZernMC — нет связи с сервером",
"Не удалось связаться с серверами Zern.\n\n"
+ "Файл диагностики (bin/zernmcdiag.jar) отсутствует.\n"
+ "Скачайте свежий лаунчер вручную с официального сайта ZernMC.");
return false;
}
boolean confirmed;
if (isCliMode) {
confirmed = askCliConfirm();
} else {
confirmed = confirmUi("ZernMC — нет связи с сервером",
"Не удалось связаться с серверами Zern.\nПровести диагностику сети?");
}
if (!confirmed) {
log("Diagnostics declined by user.");
return false;
}
try {
launchDiag(diagJar);
return true;
} catch (Exception e) {
log("Failed to launch diagnostics: " + e.getMessage());
return false;
}
}
private static void launchDiag(Path diagJar) throws Exception {
String os = System.getProperty("os.name").toLowerCase();
Path javaBin = findJava(false);
if (os.contains("windows")) {
Path javawPath = javaBin.resolveSibling("javaw.exe");
if (Files.exists(javawPath)) {
javaBin = javawPath;
}
}
List<String> cmd = new ArrayList<>();
cmd.add(javaBin.toAbsolutePath().toString());
cmd.add("-Dfile.encoding=UTF-8");
cmd.add("-jar");
cmd.add(diagJar.toAbsolutePath().toString());
if (isCliMode) {
cmd.add("--cli");
}
log("Starting diagnostics: " + String.join(" ", cmd));
ProcessBuilder pb = new ProcessBuilder(cmd);
pb.directory(baseDir.toFile());
pb.redirectErrorStream(false);
Process p = pb.start();
drainOutput(p.getInputStream(), "diag");
drainOutput(p.getErrorStream(), "diag-err");
int exit = p.waitFor();
log("Diagnostics finished, exit code: " + exit);
}
private static void drainOutput(InputStream stream, String tag) {
Thread t = new Thread(() -> {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
String line;
while ((line = reader.readLine()) != null) {
log("[" + tag + "] " + line);
}
} catch (IOException ignored) {
}
}, "diag-drain-" + tag);
t.setDaemon(true);
t.start();
}
private static boolean askCliConfirm() {
System.out.println("Server unreachable. Run network diagnostics? [y/N]");
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
String line = reader.readLine();
return line != null && (line.equalsIgnoreCase("y") || line.equalsIgnoreCase("yes"));
} catch (IOException e) {
return false;
}
}
private static boolean confirmUi(String title, String message) {
final boolean[] result = new boolean[1];
try {
SwingUtilities.invokeAndWait(() -> {
int choice = JOptionPane.showConfirmDialog(null, message, title,
JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
result[0] = choice == JOptionPane.YES_OPTION;
});
} catch (Exception e) {
log("UI confirm error: " + e.getMessage());
}
return result[0];
}
private static void showMessageUi(String title, String message) {
try {
SwingUtilities.invokeAndWait(() ->
JOptionPane.showMessageDialog(null, message, title, JOptionPane.INFORMATION_MESSAGE));
} catch (Exception e) {
log("UI message error: " + e.getMessage());
}
}
private static void launchInProcess(String[] args) throws Exception {
ClassLoader parent = Bootstrap.class.getClassLoader();
@@ -327,52 +156,18 @@ public class Bootstrap {
cmd.add("-jar");
cmd.add(getLauncherJar().toAbsolutePath().toString());
cmd.add("--jfx");
for (String arg : args) {
if (!"--jfx".equals(arg) && !"--cli".equals(arg) && !cmd.contains(arg)) {
cmd.add(arg);
}
}
ProcessBuilder pb = new ProcessBuilder(cmd);
pb.directory(baseDir.toFile());
pb.redirectErrorStream(false);
pb.inheritIO();
log("Starting process: " + String.join(" ", cmd));
Process p = pb.start();
// Read stderr in background thread for crash reporting
StringBuilder errorOutput = new StringBuilder();
Thread errorReader = new Thread(() -> {
try (BufferedReader reader = new BufferedReader(
new InputStreamReader(p.getErrorStream(), StandardCharsets.UTF_8))) {
String line;
while ((line = reader.readLine()) != null) {
errorOutput.append(line).append("\n");
log("[JFX] " + line);
}
} catch (Exception ignored) {}
});
errorReader.setDaemon(true);
errorReader.start();
int code = p.waitFor();
errorReader.join(2000);
log("JFX process exited with code: " + code);
if (code == 240) {
// Deliberate exit requested for applying a staged self-update.
// Run the shutdown hook (swaps the .update file via the detached
// helper) and exit silently - this is not a crash.
System.exit(240);
} else if (code != 0 && !GraphicsEnvironment.isHeadless()) {
String stderr = errorOutput.toString();
SwingUtilities.invokeLater(() -> showCrashDialog(code, stderr));
} else {
System.exit(code);
}
System.exit(code);
}
private static Path findJava(boolean preferConsole) {
@@ -401,50 +196,11 @@ public class Bootstrap {
return javaBin;
}
private static void rotateLogs() {
// Minecraft-style: archive previous latest.log as .log.gz, keep unlimited.
try {
Path latest = logDir.resolve("latest.log");
if (Files.exists(latest) && Files.size(latest) > 0) {
String ts = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss"));
int n = 1;
Path archive;
do {
archive = logDir.resolve(ts + (n == 1 ? "" : "-" + n) + ".log.gz");
n++;
} while (Files.exists(archive));
gzip(archive, latest);
Files.deleteIfExists(latest);
}
} catch (Exception e) {
System.out.println("[Bootstrap] rotate error: " + e.getMessage());
}
// Migrate old unlimited log.
try {
Files.deleteIfExists(logDir.resolve("launcher.log"));
} catch (Exception ignored) {
}
}
private static void gzip(Path archive, Path source) {
try (java.io.InputStream in = Files.newInputStream(source);
java.io.OutputStream out = Files.newOutputStream(archive);
java.util.zip.GZIPOutputStream gz = new java.util.zip.GZIPOutputStream(out)) {
byte[] buf = new byte[65536];
int n;
while ((n = in.read(buf)) > 0) {
gz.write(buf, 0, n);
}
} catch (Exception e) {
System.out.println("[Bootstrap] gzip error: " + e.getMessage());
}
}
private static void log(String msg) {
String entry = "[" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")) + "] " + msg;
System.out.println(entry);
try {
Files.writeString(logDir.resolve("latest.log"), entry + "\n",
Files.writeString(logDir.resolve("launcher.log"), entry + "\n",
StandardOpenOption.CREATE, StandardOpenOption.APPEND);
} catch (Exception ignored) {}
if (ui != null) ui.setStatus(msg);
@@ -545,7 +301,8 @@ public class Bootstrap {
int downloaded = 0;
int skipped = 0;
int failed = 0;
int staged = 0;
String selfName = getSelfFileName();
for (Map.Entry<String, FileMeta> entry : serverFiles.entrySet()) {
String filePath = entry.getKey();
@@ -559,6 +316,13 @@ public class Bootstrap {
continue;
}
// Skip self-update (can't overwrite running executable)
if (selfName != null && (filePath.equalsIgnoreCase(selfName) || filePath.endsWith("/" + selfName))) {
log("Skipping self-update: " + filePath + " (file in use)");
skipped++;
continue;
}
if (localHash != null) {
log("Updating: " + filePath);
} else {
@@ -566,24 +330,6 @@ public class Bootstrap {
}
try {
// Self-update: a running .exe cannot be overwritten on Windows,
// so download to a temp name and swap it after exit.
if (isSelfExe(filePath)) {
downloadFile(newVersion, filePath, serverMeta.size, filePath + ".update");
Path updatePath = baseDir.resolve(filePath + ".update");
Path targetPath = baseDir.resolve(filePath);
try {
Files.move(updatePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
log("Self-update applied: " + filePath);
} catch (Exception e) {
stagedSelfUpdates.add(filePath);
staged++;
log("Self-update staged (applied on exit): " + filePath);
}
downloaded++;
continue;
}
downloadFile(newVersion, filePath, serverMeta.size);
downloaded++;
} catch (Exception e) {
@@ -592,126 +338,22 @@ public class Bootstrap {
}
}
String summary = "Updated files: " + downloaded + ", skipped: " + skipped + ", failed: " + failed;
if (staged > 0) summary += ", staged self-update: " + staged;
log(summary);
cleanStaleJavaFxJars(serverFiles);
log("Updated files: " + downloaded + ", skipped: " + skipped + ", failed: " + failed);
log("Updated to v" + newVersion);
}
/**
* Removes old lib/javafx/*-win.jar files that are no longer part of the
* server meta (e.g. the previous JavaFX 23 jars after an upgrade to
* 23.0.1). Keeping both would put two JARs exporting the same module on
* the --module-path, which breaks module resolution.
*/
private static void cleanStaleJavaFxJars(Map<String, FileMeta> serverFiles) {
Path javafxDir = baseDir.resolve("lib").resolve("javafx");
if (!Files.isDirectory(javafxDir)) return;
java.util.Set<String> keep = new java.util.HashSet<>();
for (String filePath : serverFiles.keySet()) {
String normalized = filePath.toLowerCase().replace("\\", "/");
if (normalized.startsWith("lib/javafx/") && normalized.endsWith("-win.jar")) {
keep.add(new File(filePath).getName().toLowerCase());
private static String getSelfFileName() {
try {
String classPath = Bootstrap.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
if (classPath != null) {
String fn = Paths.get(classPath).getFileName().toString();
// If running from a JAR, the exe has the same stem
if (fn.endsWith(".jar")) {
return fn.replace(".jar", ".exe");
}
}
}
try (java.util.stream.Stream<Path> stream = Files.list(javafxDir)) {
stream.filter(Files::isRegularFile)
.filter(p -> {
String name = p.getFileName().toString().toLowerCase();
return name.endsWith("-win.jar") && !keep.contains(name);
})
.forEach(p -> {
try {
Files.delete(p);
log("Removed stale JavaFX jar: " + p.getFileName());
} catch (Exception e) {
log("Warning: could not remove stale JavaFX jar " + p.getFileName() + " - " + e.getMessage());
}
});
} catch (Exception e) {
log("Warning: failed to scan JavaFX dir: " + e.getMessage());
}
}
private static boolean isSelfExe(String filePath) {
String lower = filePath.toLowerCase().replace("\\", "/");
return lower.equals("zernmc.exe") || lower.equals("zernmc-cli.exe")
|| lower.endsWith("/zernmc.exe") || lower.endsWith("/zernmc-cli.exe");
}
/**
* Checks whether any file from the current version's meta is missing
* locally (e.g. a deleted zernmc.exe). Only presence is checked, no
* hashing, so this stays cheap on every launch.
*/
private static boolean hasMissingFiles(String version) {
Map<String, FileMeta> serverFiles = fetchServerMeta(version);
if (serverFiles.isEmpty()) {
log("Warning: Could not fetch meta for repair check");
return false;
}
for (String filePath : serverFiles.keySet()) {
if (!Files.exists(baseDir.resolve(filePath))) {
log("Missing file: " + filePath);
return true;
}
}
return false;
}
/**
* Applies self-updates that were staged because the target .exe was
* locked (the launcher itself was running). A detached helper waits a
* few seconds for this process to fully exit, then swaps the file.
*/
private static void applyStagedSelfUpdates() {
String os = System.getProperty("os.name", "").toLowerCase();
if (!os.contains("win") || stagedSelfUpdates.isEmpty()) return;
for (String filePath : stagedSelfUpdates) {
String targetName = new File(filePath).getName();
String updateName = targetName + ".update";
Path updatePath = baseDir.resolve(updateName);
if (!Files.exists(updatePath)) continue;
Path bat = baseDir.resolve("apply-update-" + System.currentTimeMillis() + ".cmd");
try {
String content = "@echo off\r\n"
+ "ping -n 4 127.0.0.1 > nul\r\n"
+ "move /y \"" + updatePath.toAbsolutePath() + "\" \"" + baseDir.resolve(targetName).toAbsolutePath() + "\" > nul\r\n"
+ "del /q \"%~f0\"\r\n";
Files.writeString(bat, content, StandardCharsets.UTF_8);
log("Applying staged self-update after exit: " + targetName);
new ProcessBuilder("cmd.exe", "/c", "start", "", "/min", bat.toAbsolutePath().toString()).start();
} catch (Exception e) {
log("Warning: Could not stage self-update for " + targetName + " - " + e.getMessage());
}
}
}
/**
* Informs the user that a staged self-update was downloaded and needs a
* launcher restart to take effect, then lets the JVM exit so the
* detached helper can swap the .exe.
*/
private static void notifyRestartRequired() {
String message = "Обновление лаунчера загружено.\n"
+ "Перезапустите лаунчер для применения изменений в обновлении.";
log("Self-update staged - restart required to apply changes");
if (!isCliMode && !GraphicsEnvironment.isHeadless()) {
try {
SwingUtilities.invokeAndWait(() ->
JOptionPane.showMessageDialog(null, message,
"ZernMC Launcher", JOptionPane.INFORMATION_MESSAGE));
} catch (Exception e) {
log("Warning: could not show restart dialog: " + e.getMessage());
}
}
} catch (Exception ignored) {}
return null;
}
private static Map<String, FileMeta> fetchServerMeta(String version) {
@@ -779,10 +421,6 @@ public class Bootstrap {
}
private static void downloadFile(String version, String filePath, long expectedSize) throws Exception {
downloadFile(version, filePath, expectedSize, filePath);
}
private static void downloadFile(String version, String filePath, long expectedSize, String saveAs) throws Exception {
List<String> servers = new ArrayList<>();
if (isServerReachable(BASE_URL)) servers.add(BASE_URL);
servers.addAll(MIRRORS);
@@ -791,17 +429,17 @@ public class Bootstrap {
Exception lastError = null;
for (String server : servers) {
try {
downloadFileFromServer(server + "/launcher/file/" + version + "/" + filePath, expectedSize, saveAs);
downloadFileFromServer(server + "/launcher/file/" + version + "/" + filePath, expectedSize, filePath);
return;
} catch (Exception e) {
lastError = e;
}
}
downloadFileFromServer(BASE_URL + "/launcher/file/" + version + "/" + filePath, expectedSize, saveAs);
downloadFileFromServer(BASE_URL + "/launcher/file/" + version + "/" + filePath, expectedSize, filePath);
}
private static void downloadFileFromServer(String urlStr, long expectedSize, String saveAs) throws Exception {
private static void downloadFileFromServer(String urlStr, long expectedSize, String fileName) throws Exception {
URL url = new URL(urlStr);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setConnectTimeout(10000);
@@ -815,13 +453,13 @@ public class Bootstrap {
expectedSize = conn.getContentLengthLong();
}
Path outPath = baseDir.resolve(saveAs);
Path outPath = baseDir.resolve(fileName);
Files.createDirectories(outPath.getParent());
long downloaded = 0;
long lastUpdate = 0;
long startTime = System.currentTimeMillis();
setTitle("Downloading " + new File(saveAs).getName());
setTitle("Downloading " + fileName);
try (InputStream in = conn.getInputStream();
OutputStream out = new FileOutputStream(outPath.toFile())) {
@@ -925,210 +563,6 @@ public class Bootstrap {
}
}
// ====================== CRASH HANDLER ======================
private static String readFileSafe(Path path, int maxLines) {
if (!Files.exists(path)) return "(file not found)";
try {
List<String> lines = Files.readAllLines(path, StandardCharsets.UTF_8);
if (lines.size() <= maxLines) {
return String.join("\n", lines);
}
List<String> tail = lines.subList(lines.size() - maxLines, lines.size());
return "... (" + (lines.size() - maxLines) + " lines omitted)\n" + String.join("\n", tail);
} catch (Exception e) {
return "(error reading: " + e.getMessage() + ")";
}
}
private static Map<String, Object> collectCrashInfo(int exitCode, String stderr) {
Map<String, Object> info = new HashMap<>();
// Version
info.put("launcher_version", readCurrentVersion());
// Exit
info.put("exit_code", exitCode);
info.put("stderr", stderr != null ? stderr : "");
info.put("launcher_log", readFileSafe(logDir.resolve("latest.log"), 200));
// System
Map<String, Object> system = new HashMap<>();
system.put("os_name", System.getProperty("os.name", "unknown"));
system.put("os_version", System.getProperty("os.version", "unknown"));
system.put("os_arch", System.getProperty("os.arch", "unknown"));
system.put("java_version", System.getProperty("java.version", "unknown"));
system.put("java_vendor", System.getProperty("java.vendor", "unknown"));
system.put("available_processors", Runtime.getRuntime().availableProcessors());
system.put("total_memory_mb", Runtime.getRuntime().maxMemory() / (1024 * 1024));
info.put("system", system);
// User (from auth.json, tokens excluded)
Map<String, Object> user = new HashMap<>();
try {
Path authFile = Path.of(System.getProperty("user.home"), ".zernmc", "auth.json");
if (Files.exists(authFile)) {
String authContent = Files.readString(authFile, StandardCharsets.UTF_8);
JsonObject authJson = JsonParser.parseString(authContent).getAsJsonObject();
if (authJson.has("username")) user.put("username", authJson.get("username").getAsString());
if (authJson.has("uuid")) user.put("uuid", authJson.get("uuid").getAsString());
if (authJson.has("role")) user.put("role", authJson.get("role").getAsInt());
}
} catch (Exception ignored) {}
info.put("user", user);
return info;
}
private static void showCrashDialog(int exitCode, String stderr) {
Map<String, Object> crashInfo = collectCrashInfo(exitCode, stderr);
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String fullReport = gson.toJson(crashInfo);
JFrame frame = new JFrame("ZernMC Launcher - Crash Report");
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.setSize(700, 520);
frame.setLocationRelativeTo(null);
frame.setResizable(true);
Color bgColor = new Color(0x0c, 0x0c, 0x12);
Color surfaceColor = new Color(0x16, 0x16, 0x1f);
Color accentColor = new Color(0xe9, 0x45, 0x60);
Color textColor = new Color(0xee, 0xee, 0xf0);
Color mutedColor = new Color(0x88, 0x88, 0x9a);
JPanel root = new JPanel(new BorderLayout());
root.setBackground(bgColor);
root.setBorder(BorderFactory.createEmptyBorder(16, 20, 16, 20));
// Title
JLabel titleLabel = new JLabel("ZernMC Launcher Crashed (code: " + exitCode + ")");
titleLabel.setFont(new Font("Segoe UI", Font.BOLD, 16));
titleLabel.setForeground(accentColor);
titleLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 12, 0));
root.add(titleLabel, BorderLayout.NORTH);
// Log area
JTextArea logArea = new JTextArea(fullReport);
logArea.setEditable(false);
logArea.setFont(new Font("Consolas", Font.PLAIN, 12));
logArea.setBackground(surfaceColor);
logArea.setForeground(textColor);
logArea.setCaretColor(textColor);
logArea.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
JScrollPane scrollPane = new JScrollPane(logArea);
scrollPane.setBorder(BorderFactory.createLineBorder(new Color(0x2a, 0x2a, 0x3a)));
scrollPane.getViewport().setBackground(surfaceColor);
root.add(scrollPane, BorderLayout.CENTER);
// Buttons
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT, 8, 12));
buttonPanel.setOpaque(false);
JLabel statusLabel = new JLabel(" ");
statusLabel.setFont(new Font("Segoe UI", Font.PLAIN, 12));
statusLabel.setForeground(mutedColor);
buttonPanel.add(statusLabel);
JButton openLogsBtn = new JButton("Open Logs Folder");
styleCrashButton(openLogsBtn, mutedColor, bgColor);
openLogsBtn.addActionListener(e -> {
try {
Desktop.getDesktop().open(logDir.toFile());
} catch (Exception ignored) {}
});
buttonPanel.add(openLogsBtn);
JButton sendBtn = new JButton("Send to Server");
styleCrashButton(sendBtn, new Color(0x45, 0xe9, 0x60), bgColor);
sendBtn.addActionListener(e -> {
sendBtn.setEnabled(false);
sendBtn.setText("Sending...");
new Thread(() -> {
boolean ok = sendCrashReport(crashInfo);
SwingUtilities.invokeLater(() -> {
if (ok) {
statusLabel.setForeground(new Color(0x45, 0xe9, 0x60));
statusLabel.setText("Crash report sent. Thank you!");
sendBtn.setText("Sent");
new Thread(() -> {
try { Thread.sleep(1200); } catch (InterruptedException ignored) {}
SwingUtilities.invokeLater(() -> {
frame.dispose();
System.exit(exitCode);
});
}).start();
} else {
statusLabel.setForeground(accentColor);
statusLabel.setText("Failed to send. Check logs folder.");
sendBtn.setEnabled(true);
sendBtn.setText("Send to Server");
}
});
}).start();
});
buttonPanel.add(sendBtn);
JButton closeBtn = new JButton("Close");
styleCrashButton(closeBtn, new Color(0x45, 0x60, 0xe9), bgColor);
closeBtn.addActionListener(e -> {
frame.dispose();
System.exit(exitCode);
});
buttonPanel.add(closeBtn);
root.add(buttonPanel, BorderLayout.SOUTH);
frame.setContentPane(root);
frame.setVisible(true);
frame.toFront();
}
private static void styleCrashButton(JButton btn, Color fg, Color bg) {
btn.setFont(new Font("Segoe UI", Font.PLAIN, 13));
btn.setForeground(fg);
btn.setBackground(bg);
btn.setBorderPainted(false);
btn.setFocusPainted(false);
btn.setContentAreaFilled(false);
btn.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
btn.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseEntered(java.awt.event.MouseEvent e) { btn.setForeground(Color.WHITE); }
public void mouseExited(java.awt.event.MouseEvent e) { btn.setForeground(fg); }
});
}
private static boolean sendCrashReport(Map<String, Object> data) {
try {
Gson gson = new Gson();
String jsonBody = gson.toJson(data);
byte[] bodyBytes = jsonBody.getBytes(StandardCharsets.UTF_8);
URL url = new URL(BASE_URL + "/launcher/crash-report");
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("POST");
conn.setRequestProperty("Content-Type", "application/json; charset=utf-8");
conn.setRequestProperty("Accept", "application/json");
conn.setRequestProperty("Content-Length", String.valueOf(bodyBytes.length));
conn.setDoOutput(true);
conn.setConnectTimeout(10000);
conn.setReadTimeout(10000);
try (java.io.OutputStream os = conn.getOutputStream()) {
os.write(bodyBytes);
os.flush();
}
int status = conn.getResponseCode();
conn.disconnect();
return status == 200;
} catch (Exception e) {
log("Crash report send failed: " + e.getMessage());
return false;
}
}
// ====================== SWING UI ======================
private static class BootstrapUI {
launcher/diag/pom.xml
-75
View File
@@ -1,75 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>me.sashegdev</groupId>
<artifactId>ZernMCLauncher</artifactId>
<version>${revision}</version>
</parent>
<artifactId>zernmc-diag</artifactId>
<packaging>jar</packaging>
<name>ZernMC Network Diagnostics</name>
<description>Standalone network diagnostics utility (DNS, connectivity, report upload)</description>
<dependencies>
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<outputFile>../../server/builds/bin/zernmcdiag.jar</outputFile>
<filters>
<filter>
<artifact>dnsjava:dnsjava</artifact>
<excludes>
<exclude>META-INF/services/java.net.spi.InetAddressResolverProvider</exclude>
<exclude>META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>me.sashegdev.zernmc.launcher.diag.DiagMain</mainClass>
<manifestEntries>
<Implementation-Version>${project.version}.${hotfix}</Implementation-Version>
<Implementation-Title>ZernMC Network Diagnostics</Implementation-Title>
<Implementation-Vendor>SashegDev</Implementation-Vendor>
</manifestEntries>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
launcher/diag/src/main/java/me/sashegdev/zernmc/launcher/diag/DiagCheck.java
-29
View File
@@ -1,29 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import java.nio.file.Path;
public record DiagCheck(String category, String name, String status, String detail, long latencyMs) {
public boolean ok() {
return "OK".equals(status);
}
public String renderLine() {
StringBuilder sb = new StringBuilder();
if ("OK".equals(status)) {
sb.append(" [OK] ");
} else if ("FAIL".equals(status)) {
sb.append(" [FAIL]");
} else {
sb.append(" [SKIP]");
}
sb.append(' ').append(category).append(" / ").append(name);
if (latencyMs >= 0) {
sb.append(" (").append(latencyMs).append(" ms)");
}
if (detail != null && !detail.isEmpty()) {
sb.append(" -> ").append(detail);
}
return sb.toString();
}
}
launcher/diag/src/main/java/me/sashegdev/zernmc/launcher/diag/DiagConstants.java
-55
View File
@@ -1,55 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import java.util.List;
import java.util.Map;
public final class DiagConstants {
public static final String HOST_API = "api.zern.cc";
public static final List<String> HOSTS = List.of(
HOST_API,
"api.zernmc.ru",
"api.zernmc.online",
"api.pl.zern.cc",
"api.swe.zern.cc",
"api.ru.zern.cc"
);
public static final List<String> KNOWN_SERVER_IPS = List.of(
"87.120.187.36", // main (Frankfurt)
"212.22.82.243", // ru geo (Moscow)
"2.26.5.202", // pl geo (Warsaw)
"2.26.55.218" // swe geo (Stockholm)
);
public static final String PRIMARY_API = "https://" + HOST_API;
public static final String DIRECT_API = "http://87.120.187.36:1582";
public static final List<Integer> TLS_PORTS = List.of(443, 80);
public static final int DIRECT_PORT = 1582;
public static final String VERSION_PATH = "/launcher/version";
public static final String CLIENT_IP_PATH = "/launcher/ip";
public static final String DIAG_UPLOAD_PATH = "/diag/upload";
public static final String DOH_GOOGLE_URL = "https://dns.google/resolve?name=%s&type=A";
public static final String DOH_CLOUDFLARE_URL = "https://cloudflare-dns.com/dns-query?name=%s&type=A";
public static final Map<String, String> DNS_PROVIDERS = Map.ofEntries(
Map.entry("Google 8.8.8.8", "8.8.8.8"),
Map.entry("Google 8.8.4.4", "8.8.4.4"),
Map.entry("Cloudflare 1.1.1.1", "1.1.1.1"),
Map.entry("Cloudflare 1.0.0.1", "1.0.0.1"),
Map.entry("Yandex 77.88.8.8", "77.88.8.8"),
Map.entry("Yandex 77.88.8.1", "77.88.8.1"),
Map.entry("OpenDNS 208.67.222.222", "208.67.222.222"),
Map.entry("Quad9 9.9.9.9", "9.9.9.9")
);
public static final int CONNECT_TIMEOUT_MS = 8000;
public static final int READ_TIMEOUT_MS = 8000;
private DiagConstants() {
}
}
launcher/diag/src/main/java/me/sashegdev/zernmc/launcher/diag/DiagMain.java
-79
View File
@@ -1,79 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
public final class DiagMain {
public static void main(String[] args) {
List<String> argList = Arrays.asList(args);
boolean cliMode = argList.contains("--cli");
Path baseDir = baseDirFromArgs(argList);
if (cliMode) {
runCli(baseDir);
return;
}
SwingUtilities.invokeLater(() -> {
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Exception ignored) {
}
DiagnosticsUI ui = new DiagnosticsUI(baseDir);
ui.addWindowListener(new WindowAdapter() {
@Override
public void windowClosed(WindowEvent e) {
System.exit(0);
}
});
ui.setVisible(true);
ui.start();
});
}
private static Path baseDirFromArgs(List<String> args) {
int idx = args.indexOf("--dir");
if (idx >= 0 && idx + 1 < args.size()) {
return Path.of(args.get(idx + 1)).toAbsolutePath();
}
return Path.of("").toAbsolutePath();
}
private static void runCli(Path baseDir) {
NetworkDiagnostics diag = new NetworkDiagnostics(baseDir, System.out::println, null);
Path log = diag.run();
System.out.println("Diagnostics log: " + (log != null ? log.toAbsolutePath() : "n/a"));
System.out.println("Client IP: " + diag.getClientIp());
if (log != null) {
System.out.print("Send report to the Zern server? [y/N]: ");
System.out.flush();
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
String line = reader.readLine();
if (line != null && (line.equalsIgnoreCase("y") || line.equalsIgnoreCase("yes"))) {
ReportSender.SendResult r = ReportSender.send(log, diag.getClientIp());
System.out.println("Send result: " + (r.ok() ? "OK via " + r.endpoint() : "FAILED (" + r.detail() + ")"));
}
} catch (Exception e) {
System.out.println("Send skipped: " + e.getMessage());
}
}
int exitCode = 0;
for (DiagCheck c : diag.getChecks()) {
if ("FAIL".equals(c.status()) && c.category().equals("HTTP")) {
exitCode = 1;
}
}
System.exit(exitCode);
}
}
launcher/diag/src/main/java/me/sashegdev/zernmc/launcher/diag/DiagnosticsUI.java
-194
View File
@@ -1,194 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Desktop;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.GridLayout;
import java.nio.file.Files;
import java.nio.file.Path;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.SwingWorker;
import javax.swing.border.EmptyBorder;
public final class DiagnosticsUI extends JFrame {
private static final Color BG = new Color(0x15151a);
private static final Color PANEL = new Color(0x1e1e24);
private static final Color TEXT = new Color(0xe8e8ea);
private static final Color ACCENT = new Color(0x5dade2);
private final Path baseDir;
private final JTextArea output = new JTextArea();
private final JButton sendButton = new JButton("Отправить на сервер");
private final JLabel statusLabel = new JLabel("Запуск диагностики...");
private volatile Path diagLog;
private volatile String clientIp = "unknown";
public DiagnosticsUI(Path baseDir) {
this.baseDir = baseDir;
setTitle("ZernMC — Диагностика сети");
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setSize(760, 560);
setMinimumSize(new Dimension(600, 420));
setLocationRelativeTo(null);
getContentPane().setBackground(BG);
((JPanel) getContentPane()).setBorder(new EmptyBorder(16, 16, 16, 16));
JLabel header = new JLabel("Проверка связи с серверами Zern");
header.setFont(new Font("Segoe UI", Font.BOLD, 17));
header.setForeground(ACCENT);
header.setBorder(new EmptyBorder(0, 0, 10, 0));
output.setEditable(false);
output.setFont(new Font("Consolas", Font.PLAIN, 12));
output.setBackground(PANEL);
output.setForeground(TEXT);
output.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
JScrollPane scroll = new JScrollPane(output);
scroll.setBorder(BorderFactory.createLineBorder(PANEL));
statusLabel.setForeground(TEXT);
statusLabel.setBorder(new EmptyBorder(8, 0, 0, 0));
JButton openButton = new JButton("Открыть папку с логом");
JButton closeButton = new JButton("Закрыть");
sendButton.setEnabled(false);
JPanel buttons = new JPanel(new FlowLayout(FlowLayout.RIGHT, 8, 0));
buttons.setOpaque(false);
buttons.add(openButton);
buttons.add(sendButton);
buttons.add(closeButton);
JPanel south = new JPanel(new BorderLayout());
south.setOpaque(false);
south.add(statusLabel, BorderLayout.NORTH);
south.add(buttons, BorderLayout.SOUTH);
setLayout(new BorderLayout());
add(header, BorderLayout.NORTH);
add(scroll, BorderLayout.CENTER);
add(south, BorderLayout.SOUTH);
openButton.addActionListener(e -> openFolder());
closeButton.addActionListener(e -> dispose());
sendButton.addActionListener(e -> sendReport());
}
public void start() {
SwingWorker<Void, String> worker = new SwingWorker<>() {
@Override
protected Void doInBackground() {
publish("\u2014 Сервер Zern недоступен, выполняем диагностику \u2014");
NetworkDiagnostics diag = new NetworkDiagnostics(baseDir,
this::publish,
c -> publish(renderCheck(c)));
diagLog = diag.run();
clientIp = diag.getClientIp();
publish("Диагностика завершена. Лог: " + (diagLog != null ? diagLog.toAbsolutePath() : "n/a"));
return null;
}
@Override
protected void process(java.util.List<String> chunks) {
for (String line : chunks) {
appendLine(line);
}
}
@Override
protected void done() {
sendButton.setEnabled(diagLog != null);
statusLabel.setText("Готово. Можете отправить лог на сервер или сохранить его.");
}
};
worker.execute();
}
private static String renderCheck(DiagCheck c) {
String prefix = switch (c.status()) {
case "OK" -> "[OK] ";
case "FAIL" -> "[FAIL]";
default -> "[SKIP]";
};
StringBuilder sb = new StringBuilder(prefix).append(' ').append(c.category()).append(" / ").append(c.name());
if (c.latencyMs() >= 0) {
sb.append(" (").append(c.latencyMs()).append(" ms)");
}
if (c.detail() != null && !c.detail().isEmpty()) {
sb.append(" -> ").append(c.detail());
}
return sb.toString();
}
private void appendLine(String line) {
output.append(line);
if (!line.endsWith("\n")) {
output.append("\n");
}
output.setCaretPosition(output.getDocument().getLength());
}
private void openFolder() {
try {
Path dir = diagLog != null ? diagLog.getParent() : baseDir;
if (dir != null && Files.exists(dir)) {
Desktop.getDesktop().open(dir.toFile());
} else {
JOptionPane.showMessageDialog(this, "Папка ещё не создана.");
}
} catch (Exception e) {
JOptionPane.showMessageDialog(this, "Не удалось открыть папку: " + e.getMessage());
}
}
private void sendReport() {
if (diagLog == null) {
return;
}
sendButton.setEnabled(false);
statusLabel.setText("Отправка отчёта на сервер...");
SwingWorker<ReportSender.SendResult, Void> worker = new SwingWorker<>() {
@Override
protected ReportSender.SendResult doInBackground() throws Exception {
return ReportSender.send(diagLog, clientIp);
}
@Override
protected void done() {
sendButton.setEnabled(true);
try {
ReportSender.SendResult r = get();
if (r.ok()) {
statusLabel.setText("Отчёт отправлен: " + r.endpoint());
JOptionPane.showMessageDialog(DiagnosticsUI.this,
"Отчёт успешно отправлен на сервер Zern.",
"Отправлено", JOptionPane.INFORMATION_MESSAGE);
} else {
statusLabel.setText("Не удалось отправить отчёт.");
JOptionPane.showMessageDialog(DiagnosticsUI.this,
"Не удалось отправить отчёт на сервер.\n"
+ "Сохраните лог и отправьте его вручную:\n" + diagLog.toAbsolutePath()
+ "\n\nОшибка: " + r.detail(),
"Ошибка отправки", JOptionPane.WARNING_MESSAGE);
}
} catch (Exception e) {
statusLabel.setText("Ошибка отправки: " + e.getMessage());
}
}
};
worker.execute();
}
}
launcher/diag/src/main/java/me/sashegdev/zernmc/launcher/diag/DnsResolver.java
-128
View File
@@ -1,128 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import java.net.InetAddress;
import java.net.URL;
import java.net.URLConnection;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import org.json.JSONArray;
import org.json.JSONObject;
import org.xbill.DNS.ARecord;
import org.xbill.DNS.Lookup;
import org.xbill.DNS.Record;
import org.xbill.DNS.SimpleResolver;
import org.xbill.DNS.Type;
public final class DnsResolver {
private DnsResolver() {
}
public static List<String> resolveSystem(String host) {
try {
InetAddress[] addrs = InetAddress.getAllByName(host);
List<String> ips = new ArrayList<>();
for (InetAddress a : addrs) {
String ip = a.getHostAddress();
if (ip != null && !ips.contains(ip)) {
ips.add(ip);
}
}
return ips;
} catch (Exception e) {
return List.of();
}
}
public static List<String> resolveDoHGoogle(String host) {
try {
String url = String.format(DiagConstants.DOH_GOOGLE_URL, host);
String body = doGet(url, "application/json");
JSONObject json = new JSONObject(body);
JSONArray answers = json.optJSONArray("Answer");
if (answers == null) {
return List.of();
}
List<String> ips = new ArrayList<>();
for (int i = 0; i < answers.length(); i++) {
JSONObject a = answers.optJSONObject(i);
if (a != null && a.optInt("type", 0) == 1) {
String data = a.optString("data", null);
if (data != null && !ips.contains(data)) {
ips.add(data);
}
}
}
return ips;
} catch (Exception e) {
return List.of();
}
}
public static List<String> resolveDoHCloudflare(String host) {
try {
String url = String.format(DiagConstants.DOH_CLOUDFLARE_URL, host);
String body = doGet(url, "application/dns-json");
JSONObject json = new JSONObject(body);
JSONArray answers = json.optJSONArray("Answer");
if (answers == null) {
return List.of();
}
List<String> ips = new ArrayList<>();
for (int i = 0; i < answers.length(); i++) {
JSONObject a = answers.optJSONObject(i);
if (a != null && a.optInt("type", 0) == 1) {
String data = a.optString("data", null);
if (data != null && !ips.contains(data)) {
ips.add(data);
}
}
}
return ips;
} catch (Exception e) {
return List.of();
}
}
public static List<String> resolveUdp(String providerIp, String host) {
try {
SimpleResolver resolver = new SimpleResolver(providerIp);
resolver.setTimeout(Duration.ofSeconds(5));
Lookup lookup = new Lookup(org.xbill.DNS.Name.fromString(host + "."), Type.A);
lookup.setResolver(resolver);
lookup.setCache(null);
Record[] records = lookup.run();
if (records == null) {
return List.of();
}
List<String> ips = new ArrayList<>();
for (Record r : records) {
if (r instanceof ARecord a) {
String ip = a.getAddress().getHostAddress();
if (ip != null && !ips.contains(ip)) {
ips.add(ip);
}
}
}
return ips;
} catch (Exception e) {
return List.of();
}
}
private static String doGet(String url, String accept) throws Exception {
URLConnection conn = new URL(url).openConnection();
conn.setConnectTimeout(DiagConstants.CONNECT_TIMEOUT_MS);
conn.setReadTimeout(DiagConstants.READ_TIMEOUT_MS);
conn.setRequestProperty("Accept", accept);
conn.setRequestProperty("User-Agent", "ZernMC-Diag");
conn.connect();
byte[] buf;
try (var in = conn.getInputStream()) {
buf = in.readAllBytes();
}
return new String(buf, java.nio.charset.StandardCharsets.UTF_8);
}
}
launcher/diag/src/main/java/me/sashegdev/zernmc/launcher/diag/NetProbe.java
-58
View File
@@ -1,58 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URI;
import java.nio.charset.StandardCharsets;
public final class NetProbe {
public record TcpResult(boolean ok, long latencyMs, String detail) {
}
public record HttpResult(boolean ok, int status, long latencyMs, String bodySnippet, String detail) {
}
private NetProbe() {
}
public static TcpResult tcpConnect(String host, int port, int timeoutMs) {
long t0 = System.currentTimeMillis();
try (Socket socket = new Socket()) {
socket.connect(new InetSocketAddress(host, port), timeoutMs);
return new TcpResult(true, System.currentTimeMillis() - t0, host + ":" + port);
} catch (Exception e) {
return new TcpResult(false, System.currentTimeMillis() - t0, host + ":" + port + " -> " + e.getMessage());
}
}
public static HttpResult httpGet(String url, int timeoutMs) {
long t0 = System.currentTimeMillis();
HttpURLConnection conn = null;
try {
conn = (HttpURLConnection) URI.create(url).toURL().openConnection();
conn.setConnectTimeout(timeoutMs);
conn.setReadTimeout(timeoutMs);
conn.setRequestProperty("User-Agent", "ZernMC-Diag/1.0");
conn.setInstanceFollowRedirects(false);
int status = conn.getResponseCode();
InputStream in = status >= 400 ? conn.getErrorStream() : conn.getInputStream();
String snippet = "";
if (in != null) {
byte[] bytes = in.readAllBytes();
String body = new String(bytes, StandardCharsets.UTF_8).trim();
snippet = body.length() > 200 ? body.substring(0, 200) + "..." : body;
}
boolean ok = status >= 200 && status < 400;
return new HttpResult(ok, status, System.currentTimeMillis() - t0, snippet, "HTTP " + status);
} catch (Exception e) {
return new HttpResult(false, 0, System.currentTimeMillis() - t0, "", e.getMessage());
} finally {
if (conn != null) {
conn.disconnect();
}
}
}
}
launcher/diag/src/main/java/me/sashegdev/zernmc/launcher/diag/NetworkDiagnostics.java
-263
View File
@@ -1,263 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import org.json.JSONObject;
public final class NetworkDiagnostics {
private final Path baseDir;
private final Consumer<String> onLine;
private final Consumer<DiagCheck> onCheck;
private final List<DiagCheck> checks = new CopyOnWriteArrayList<>();
private final StringBuilder report = new StringBuilder();
private String clientIp = "unknown";
public NetworkDiagnostics(Path baseDir, Consumer<String> onLine, Consumer<DiagCheck> onCheck) {
this.baseDir = baseDir;
this.onLine = onLine;
this.onCheck = onCheck;
}
public List<DiagCheck> getChecks() {
return checks;
}
public String getClientIp() {
return clientIp;
}
public Path run() {
checks.clear();
report.setLength(0);
report.append("=== ZernMC Network Diagnostics Report ===\n");
report.append("Timestamp: ").append(timestamp()).append('\n');
report.append("Base dir: ").append(baseDir.toAbsolutePath()).append('\n');
report.append("Zern server known IP(s): ").append(String.join(", ", DiagConstants.KNOWN_SERVER_IPS)).append('\n');
report.append("Primary API: ").append(DiagConstants.PRIMARY_API).append('\n');
report.append("Direct API: ").append(DiagConstants.DIRECT_API).append('\n');
runDnsChecks();
runConnectivityChecks();
runHttpChecks();
clientIp = determineClientIp();
int ok = 0, fail = 0, skip = 0;
for (DiagCheck c : checks) {
switch (c.status()) {
case "OK" -> ok++;
case "FAIL" -> fail++;
default -> skip++;
}
}
report.append("=== Summary ===\n");
report.append("OK: ").append(ok).append(", FAIL: ").append(fail).append(", SKIP: ").append(skip).append('\n');
report.append("--- JSON ---\n");
JSONObject json = new JSONObject();
json.put("client_ip", clientIp);
json.put("timestamp", timestamp());
JSONObject jsonChecks = new JSONObject();
for (DiagCheck c : checks) {
JSONObject j = new JSONObject();
j.put("status", c.status());
j.put("detail", c.detail() == null ? "" : c.detail());
j.put("latency_ms", c.latencyMs());
jsonChecks.put(c.category() + "/" + c.name(), j);
}
json.put("checks", jsonChecks);
report.append(json.toString(2)).append('\n');
return writeLog();
}
private Path writeLog() {
try {
Files.createDirectories(baseDir);
Path log = baseDir.resolve("diag.log");
Files.writeString(log, report.toString(), StandardCharsets.UTF_8);
if (onLine != null) {
onLine.accept("\nDiagnostic log written to: " + log.toAbsolutePath());
}
return log;
} catch (IOException e) {
if (onLine != null) {
onLine.accept("Failed to write diag.log: " + e.getMessage());
}
return null;
}
}
private void runDnsChecks() {
report.append("\n=== DNS resolution ===\n");
for (String host : DiagConstants.HOSTS) {
report.append("Host: ").append(host).append('\n');
submit(resolveToCheck(host, "system", DnsResolver.resolveSystem(host)));
}
List<Callable<DiagCheck>> tasks = new ArrayList<>();
List<String> taskKeys = new ArrayList<>();
for (String host : DiagConstants.HOSTS) {
tasks.add(() -> resolveToCheck(host, "DoH Google", DnsResolver.resolveDoHGoogle(host)));
taskKeys.add("DoH Google/" + host);
tasks.add(() -> resolveToCheck(host, "DoH Cloudflare", DnsResolver.resolveDoHCloudflare(host)));
taskKeys.add("DoH Cloudflare/" + host);
for (String provider : DiagConstants.DNS_PROVIDERS.keySet()) {
String providerIp = DiagConstants.DNS_PROVIDERS.get(provider);
tasks.add(() -> resolveToCheck(host, "UDP " + provider, DnsResolver.resolveUdp(providerIp, host)));
taskKeys.add("UDP " + provider + "/" + host);
}
}
ExecutorService pool = Executors.newFixedThreadPool(Math.min(8, tasks.size()), r -> {
Thread t = new Thread(r, "diag-dns");
t.setDaemon(true);
return t;
});
try {
List<Future<DiagCheck>> futures = new ArrayList<>();
for (Callable<DiagCheck> task : tasks) {
futures.add(pool.submit(task));
}
int idx = 0;
for (Future<DiagCheck> f : futures) {
String key = taskKeys.get(idx);
try {
DiagCheck c = f.get(20, TimeUnit.SECONDS);
submit(c);
} catch (Exception e) {
submit(new DiagCheck("DNS", key, "FAIL", "query error: " + e.getMessage(), -1));
}
idx++;
}
} finally {
pool.shutdownNow();
}
}
static DiagCheck resolveToCheck(String host, String source, List<String> ips) {
if (ips.isEmpty()) {
return new DiagCheck("DNS", host + " / " + source, "FAIL", "no A records", -1);
}
boolean matchesKnown = false;
for (String ip : ips) {
if (DiagConstants.KNOWN_SERVER_IPS.contains(ip)) {
matchesKnown = true;
break;
}
}
if (matchesKnown) {
return new DiagCheck("DNS", host + " / " + source, "OK", String.join(", ", ips), -1);
}
String detail = "resolved to " + String.join(", ", ips) + " (DIFFERENT from known " + String.join(", ", DiagConstants.KNOWN_SERVER_IPS) + ")";
return new DiagCheck("DNS", host + " / " + source, "FAIL", detail, -1);
}
private void runConnectivityChecks() {
report.append("\n=== Connectivity ===\n");
for (String ip : DiagConstants.KNOWN_SERVER_IPS) {
for (int port : DiagConstants.TLS_PORTS) {
submit(tcpToCheck(ip, port));
}
}
submit(tcpToCheck("87.120.187.36", DiagConstants.DIRECT_PORT));
List<String> systemIps = DnsResolver.resolveSystem(DiagConstants.HOST_API);
for (String ip : systemIps) {
if (!DiagConstants.KNOWN_SERVER_IPS.contains(ip)) {
submit(tcpToCheck(ip, 443));
}
}
}
private DiagCheck tcpToCheck(String host, int port) {
NetProbe.TcpResult r = NetProbe.tcpConnect(host, port, DiagConstants.CONNECT_TIMEOUT_MS);
return new DiagCheck("TCP", host + ":" + port, r.ok() ? "OK" : "FAIL", r.detail(), r.latencyMs());
}
private void runHttpChecks() {
report.append("\n=== HTTP ===\n");
for (String host : DiagConstants.HOSTS) {
submit(httpToCheck("https://" + host + DiagConstants.VERSION_PATH));
}
submit(httpToCheck(DiagConstants.DIRECT_API + DiagConstants.VERSION_PATH));
}
private DiagCheck httpToCheck(String url) {
NetProbe.HttpResult r = NetProbe.httpGet(url, DiagConstants.READ_TIMEOUT_MS);
String detail = r.ok() ? r.detail() + (r.bodySnippet().isEmpty() ? "" : " body=" + r.bodySnippet()) : r.detail();
return new DiagCheck("HTTP", url, r.ok() ? "OK" : "FAIL", detail, r.latencyMs());
}
private String determineClientIp() {
String ip = null;
NetProbe.HttpResult direct = NetProbe.httpGet(DiagConstants.DIRECT_API + DiagConstants.CLIENT_IP_PATH, DiagConstants.READ_TIMEOUT_MS);
if (direct.ok()) {
ip = parseIp(direct.bodySnippet());
}
if (ip == null) {
NetProbe.HttpResult primary = NetProbe.httpGet(DiagConstants.PRIMARY_API + DiagConstants.CLIENT_IP_PATH, DiagConstants.READ_TIMEOUT_MS);
if (primary.ok()) {
ip = parseIp(primary.bodySnippet());
}
}
String result = ip != null ? ip : "unknown";
submit(new DiagCheck("INFO", "client public IP", ip != null ? "OK" : "FAIL", ip != null ? ip : "could not determine", -1));
report.append("=== Client IP ===\nClient public IP: ").append(result).append('\n');
return result;
}
static String parseIp(String snippet) {
if (snippet == null) {
return null;
}
try {
int start = snippet.indexOf("\"ip\"");
if (start < 0) {
return null;
}
int colon = snippet.indexOf(':', start);
int q1 = snippet.indexOf('"', colon);
int q2 = snippet.indexOf('"', q1 + 1);
if (q1 < 0 || q2 < 0) {
return null;
}
String ip = snippet.substring(q1 + 1, q2);
return ip.matches("[\\d.]+") ? ip : null;
} catch (Exception e) {
return null;
}
}
private void submit(DiagCheck c) {
checks.add(c);
report.append(c.renderLine()).append('\n');
if (onCheck != null) {
onCheck.accept(c);
}
if (onLine != null) {
onLine.accept(c.renderLine());
}
}
private static String timestamp() {
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
}
}
launcher/diag/src/main/java/me/sashegdev/zernmc/launcher/diag/ReportSender.java
-69
View File
@@ -1,69 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import java.io.IOException;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
public final class ReportSender {
public record SendResult(boolean ok, String endpoint, String detail) {
}
private ReportSender() {
}
public static String buildFilename(String clientIp) {
String ts = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
String ip = (clientIp == null || clientIp.isBlank()) ? "unknown" : clientIp;
return "diag_" + ts + "_" + ip + ".log";
}
public static SendResult send(Path logFile, String clientIp) throws IOException {
String content = Files.readString(logFile, StandardCharsets.UTF_8);
String name = buildFilename(clientIp);
String encoded = URLEncoder.encode(name, StandardCharsets.UTF_8);
List<String> endpoints = List.of(
DiagConstants.PRIMARY_API + DiagConstants.DIAG_UPLOAD_PATH + "?name=" + encoded,
DiagConstants.DIRECT_API + DiagConstants.DIAG_UPLOAD_PATH + "?name=" + encoded
);
String lastDetail = null;
for (String endpoint : endpoints) {
try {
HttpURLConnection conn = (HttpURLConnection) URI.create(endpoint).toURL().openConnection();
conn.setRequestMethod("POST");
conn.setConnectTimeout(DiagConstants.CONNECT_TIMEOUT_MS);
conn.setReadTimeout(DiagConstants.READ_TIMEOUT_MS);
conn.setDoOutput(true);
conn.setRequestProperty("Content-Type", "text/plain; charset=utf-8");
conn.setRequestProperty("User-Agent", "ZernMC-Diag/1.0");
byte[] body = content.getBytes(StandardCharsets.UTF_8);
conn.setFixedLengthStreamingMode(body.length);
try (OutputStream out = conn.getOutputStream()) {
out.write(body);
}
int status = conn.getResponseCode();
boolean ok = status >= 200 && status < 300;
String detail = "HTTP " + status;
conn.disconnect();
return new SendResult(ok, endpoint, detail);
} catch (Exception e) {
lastDetail = e.getMessage();
}
}
return new SendResult(false, lastEndpointUsed(endpoints), lastDetail != null ? lastDetail : "all endpoints failed");
}
private static String lastEndpointUsed(List<String> endpoints) {
return endpoints.get(endpoints.size() - 1);
}
}
launcher/diag/src/test/java/me/sashegdev/zernmc/launcher/diag/DiagCheckTest.java
-35
View File
@@ -1,35 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class DiagCheckTest {
@Test
void renderLine_ok() {
DiagCheck c = new DiagCheck("DNS", "api.zernmc.ru / system", "OK", "87.120.187.36", 12);
String line = c.renderLine();
assertTrue(line.contains("[OK]"));
assertTrue(line.contains("api.zernmc.ru / system"));
assertTrue(line.contains("12 ms"));
assertTrue(line.contains("87.120.187.36"));
}
@Test
void renderLine_fail() {
DiagCheck c = new DiagCheck("TCP", "1.2.3.4:443", "FAIL", "connection refused", -1);
String line = c.renderLine();
assertTrue(line.contains("[FAIL]"));
assertFalse(line.contains("ms)"));
assertTrue(line.contains("connection refused"));
}
@Test
void ok_returnsStatus() {
assertTrue(new DiagCheck("a", "b", "OK", null, -1).ok());
assertFalse(new DiagCheck("a", "b", "FAIL", null, -1).ok());
}
}
launcher/diag/src/test/java/me/sashegdev/zernmc/launcher/diag/DnsResolverTest.java
-52
View File
@@ -1,52 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import org.junit.jupiter.api.Test;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
class DnsResolverTest {
@Test
void resolveToCheck_emptyIsFail() {
DiagCheck c = NetworkDiagnostics.resolveToCheck("api.zernmc.ru", "Google 8.8.8.8", List.of());
assertEquals("FAIL", c.status());
assertEquals("no A records", c.detail());
}
@Test
void resolveToCheck_knownIpIsOk() {
DiagCheck c = NetworkDiagnostics.resolveToCheck("api.zernmc.ru", "system", List.of("87.120.187.36"));
assertEquals("OK", c.status());
assertTrue(c.detail().contains("87.120.187.36"));
}
@Test
void resolveToCheck_unknownIpIsFail() {
DiagCheck c = NetworkDiagnostics.resolveToCheck("api.zernmc.ru", "system", List.of("1.2.3.4"));
assertEquals("FAIL", c.status());
assertTrue(c.detail().contains("DIFFERENT from known"));
assertTrue(c.detail().contains("1.2.3.4"));
}
@Test
void resolveToCheck_multipleIpsOneKnown() {
DiagCheck c = NetworkDiagnostics.resolveToCheck("zern.cc", "system", List.of("1.2.3.4", "87.120.187.36"));
assertEquals("OK", c.status());
}
@Test
void parseIp_valid() {
assertEquals("1.2.3.4", NetworkDiagnostics.parseIp("{\"ip\":\"1.2.3.4\"}"));
}
@Test
void parseIp_invalidReturnsNull() {
assertEquals(null, NetworkDiagnostics.parseIp("not json"));
assertEquals(null, NetworkDiagnostics.parseIp("{\"other\":\"x\"}"));
assertEquals(null, NetworkDiagnostics.parseIp(null));
assertEquals(null, NetworkDiagnostics.parseIp("{\"ip\":\"not-an-ip\"}"));
}
}
launcher/diag/src/test/java/me/sashegdev/zernmc/launcher/diag/ReportSenderTest.java
-24
View File
@@ -1,24 +0,0 @@
package me.sashegdev.zernmc.launcher.diag;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
class ReportSenderTest {
@Test
void buildFilename_containsTimestampAndIp() {
String name = ReportSender.buildFilename("1.2.3.4");
assertTrue(name.matches("diag_\\d{8}_\\d{6}_[\\d.]+[.]log"), name);
assertTrue(name.contains("1.2.3.4"));
}
@Test
void buildFilename_unknownIp() {
String name = ReportSender.buildFilename(null);
assertTrue(name.contains("unknown"), name);
assertTrue(name.matches("diag_\\d{8}_\\d{6}_unknown[.]log"), name);
String blank = ReportSender.buildFilename(" ");
assertTrue(blank.contains("unknown"), blank);
}
}
launcher/launcher/pom.xml
+32 -188
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>me.sashegdev</groupId>
<artifactId>ZernMCLauncher</artifactId>
<version>${revision}</version>
<version>1.0.10</version>
</parent>
<artifactId>zernmclauncher</artifactId>
@@ -61,37 +61,32 @@
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>23.0.1</version>
<version>23</version>
<classifier>win</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>23.0.1</version>
<version>23</version>
<classifier>win</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>23.0.1</version>
<version>23</version>
<classifier>win</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>23.0.1</version>
<version>23</version>
<classifier>win</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-media</artifactId>
<version>23.0.1</version>
<version>23</version>
<classifier>win</classifier>
<scope>provided</scope>
</dependency>
<!-- Test -->
@@ -104,15 +99,6 @@
</dependencies>
<build>
<resources>
<resource>
<directory>src/resources</directory>
<targetPath>assets</targetPath>
<includes>
<include>ui/**</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -130,7 +116,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>me.sashegdev.zernmc.launcher.Main</mainClass>
<manifestEntries>
<Implementation-Version>${project.version}.${hotfix}</Implementation-Version>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Title>ZernMC Launcher</Implementation-Title>
</manifestEntries>
</transformer>
@@ -156,28 +142,21 @@
<configuration>
<outfile>../../server/builds/zernmc.exe</outfile>
<jar>../../server/builds/zernmc-bootstrap.jar</jar>
<icon>${project.basedir}/src/main/icons/zernmc.ico</icon>
<headerType>gui</headerType>
<dontWrapJar>false</dontWrapJar>
<classPath>
<mainClass>me.sashegdev.zernmc.launcher.Bootstrap</mainClass>
<addDependencies>false</addDependencies>
</classPath>
<cmdLine>--jfx</cmdLine>
<mainClass>me.sashegdev.zernmc.launcher.Bootstrap</mainClass>
<jre>
<path>lib/jre21</path>
<minVersion>21</minVersion>
</jre>
<versionInfo>
<fileVersion>${project.version}.${hotfix}</fileVersion>
<txtFileVersion>${project.version}.${hotfix}</txtFileVersion>
<fileVersion>${project.version}.0</fileVersion>
<txtFileVersion>${project.version}</txtFileVersion>
<fileDescription>ZernMC Launcher</fileDescription>
<copyright>Copyright (c) 2023-2026 ZernMC</copyright>
<productVersion>${project.version}.${hotfix}</productVersion>
<txtProductVersion>${project.version}.${hotfix}</txtProductVersion>
<productVersion>${project.version}.0</productVersion>
<txtProductVersion>${project.version}</txtProductVersion>
<productName>ZernMC</productName>
<companyName>ZernMC</companyName>
<trademarks>ZernMC</trademarks>
<internalName>zernmc</internalName>
<originalFilename>zernmc.exe</originalFilename>
</versionInfo>
@@ -196,67 +175,24 @@
<jar>../../server/builds/zernmc-bootstrap.jar</jar>
<headerType>console</headerType>
<dontWrapJar>false</dontWrapJar>
<classPath>
<mainClass>me.sashegdev.zernmc.launcher.Bootstrap</mainClass>
<addDependencies>false</addDependencies>
</classPath>
<cmdLine>--cli</cmdLine>
<mainClass>me.sashegdev.zernmc.launcher.Bootstrap</mainClass>
<jre>
<path>lib/jre21</path>
<minVersion>21</minVersion>
</jre>
<versionInfo>
<fileVersion>${project.version}.${hotfix}</fileVersion>
<txtFileVersion>${project.version}.${hotfix}</txtFileVersion>
<fileVersion>${project.version}.0</fileVersion>
<txtFileVersion>${project.version}</txtFileVersion>
<fileDescription>ZernMC Launcher CLI</fileDescription>
<copyright>Copyright (c) 2023-2026 ZernMC</copyright>
<productVersion>${project.version}.${hotfix}</productVersion>
<txtProductVersion>${project.version}.${hotfix}</txtProductVersion>
<productVersion>${project.version}.0</productVersion>
<txtProductVersion>${project.version}</txtProductVersion>
<productName>ZernMC CLI</productName>
<companyName>ZernMC</companyName>
<trademarks>ZernMC</trademarks>
<internalName>zernmc-cli</internalName>
<originalFilename>zernmc-cli.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
<!-- CLI+JFX версия: консоль видима + форсим JFX UI -->
<execution>
<id>l4j-cli-jfx</id>
<phase>package</phase>
<goals>
<goal>launch4j</goal>
</goals>
<configuration>
<outfile>../../server/builds/zernmc-cli-jfx.exe</outfile>
<jar>../../server/builds/zernmc-bootstrap.jar</jar>
<headerType>console</headerType>
<dontWrapJar>false</dontWrapJar>
<classPath>
<mainClass>me.sashegdev.zernmc.launcher.Bootstrap</mainClass>
<addDependencies>false</addDependencies>
</classPath>
<cmdLine>--jfx</cmdLine>
<jre>
<path>lib/jre21</path>
<minVersion>21</minVersion>
</jre>
<versionInfo>
<fileVersion>${project.version}.${hotfix}</fileVersion>
<txtFileVersion>${project.version}.${hotfix}</txtFileVersion>
<fileDescription>ZernMC Launcher CLI + JFX</fileDescription>
<copyright>Copyright (c) 2023-2026 ZernMC</copyright>
<productVersion>${project.version}.${hotfix}</productVersion>
<txtProductVersion>${project.version}.${hotfix}</txtProductVersion>
<productName>ZernMC CLI JFX</productName>
<companyName>ZernMC</companyName>
<trademarks>ZernMC</trademarks>
<internalName>zernmc-cli-jfx</internalName>
<originalFilename>zernmc-cli-jfx.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
</executions>
</plugin>
@@ -271,7 +207,7 @@
<goals><goal>run</goal></goals>
<configuration>
<target>
<echo file="../../server/builds/build.version">${project.version}.${hotfix}</echo>
<echo file="../../server/builds/build.version">${project.version}</echo>
<!-- Удаляем старую папку lib если есть -->
<delete dir="../../server/builds/lib"/>
@@ -290,27 +226,27 @@
<!-- Копируем JavaFX модули в lib/javafx -->
<mkdir dir="../../server/builds/lib/javafx"/>
<copy todir="../../server/builds/lib/javafx" overwrite="true">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-controls/23.0.1">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-controls/23">
<include name="*win.jar"/>
</fileset>
</copy>
<copy todir="../../server/builds/lib/javafx" overwrite="true">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-graphics/23.0.1">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-graphics/23">
<include name="*win.jar"/>
</fileset>
</copy>
<copy todir="../../server/builds/lib/javafx" overwrite="true">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-base/23.0.1">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-base/23">
<include name="*win.jar"/>
</fileset>
</copy>
<copy todir="../../server/builds/lib/javafx" overwrite="true">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-web/23.0.1">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-web/23">
<include name="*win.jar"/>
</fileset>
</copy>
<copy todir="../../server/builds/lib/javafx" overwrite="true">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-media/23.0.1">
<fileset dir="${user.home}/.m2/repository/org/openjfx/javafx-media/23">
<include name="*win.jar"/>
</fileset>
</copy>
@@ -328,118 +264,26 @@
</fileset>
</copy>
<!-- Подпись экзешников самоподписным сертификатом Zern.cc (publisher: ZernMC Launcher) -->
<loadfile property="pfxpass" srcFile="/root/cert/codesign/.pfxpass">
<filterchain>
<striplinebreaks/>
</filterchain>
</loadfile>
<exec executable="java" failonerror="true">
<arg value="-jar"/>
<arg value="${user.home}/tools/jsign/jsign.jar"/>
<arg value="--keystore"/>
<arg value="/root/cert/codesign/zerncc.pfx"/>
<arg value="--storepass"/>
<arg value="${pfxpass}"/>
<arg value="--alias"/>
<arg value="1"/>
<arg value="--tsaurl"/>
<arg value="http://timestamp.digicert.com"/>
<arg value="--alg"/>
<arg value="SHA-256"/>
<arg value="../../server/builds/zernmc.exe"/>
</exec>
<exec executable="java" failonerror="true">
<arg value="-jar"/>
<arg value="${user.home}/tools/jsign/jsign.jar"/>
<arg value="--keystore"/>
<arg value="/root/cert/codesign/zerncc.pfx"/>
<arg value="--storepass"/>
<arg value="${pfxpass}"/>
<arg value="--alias"/>
<arg value="1"/>
<arg value="--tsaurl"/>
<arg value="http://timestamp.digicert.com"/>
<arg value="--alg"/>
<arg value="SHA-256"/>
<arg value="../../server/builds/zernmc-cli.exe"/>
</exec>
<exec executable="java" failonerror="true">
<arg value="-jar"/>
<arg value="${user.home}/tools/jsign/jsign.jar"/>
<arg value="--keystore"/>
<arg value="/root/cert/codesign/zerncc.pfx"/>
<arg value="--storepass"/>
<arg value="${pfxpass}"/>
<arg value="--alias"/>
<arg value="1"/>
<arg value="--tsaurl"/>
<arg value="http://timestamp.digicert.com"/>
<arg value="--alg"/>
<arg value="SHA-256"/>
<arg value="../../server/builds/zernmc-cli-jfx.exe"/>
</exec>
<!-- Создаём README -->
<echo file="../../server/builds/README.txt">
ZernMC Launcher
Files:
- zernmc.exe - Main launcher with GUI (default)
- zernmc-cli.exe - CLI version (console, architecture-independent)
- zernmc-cli-jfx.exe - CLI + JFX UI (console visible + JavaFX frontend)
- zernmc.exe - Main launcher with GUI (no console window)
- zernmc-cli.exe - CLI version for servers/advanced users (with console)
How to use:
Just run zernmc.exe (or zernmc-cli.exe / zernmc-cli-jfx.exe for CLI)
How to use GUI:
Just run zernmc.exe
How to use CLI:
Run from command line: zernmc-cli.exe --cli
</echo>
<!-- Создаём один архив со всем -->
<zip destfile="../../server/builds/ZernMC-win-${revision}.${hotfix}.zip"
<zip destfile="../../server/builds/ZernMC-win-${project.version}.zip"
basedir="../../server/builds"
includes="zernmc.exe,zernmc-cli.exe,zernmc-cli-jfx.exe,bin/**,assets/**,lib/**,README.txt"
includes="zernmc.exe,zernmc-cli.exe,bin/**,assets/**,lib/**,README.txt"
excludes="build.version,*.jar"/>
<!-- Go online/offline инсталляторы (нативные, без JRE) -->
<exec executable="bash" failonerror="false">
<arg value="-c"/>
<arg value="if command -v /usr/local/go/bin/go >/dev/null 2>&amp;1; then echo 'Building Go installers (Go absolute)...'; mkdir -p ../../server/builds; rm -f ../../installer/offline.zip; touch ../../installer/offline.zip; cd ../../installer &amp;&amp; GOOS=windows GOARCH=amd64 CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags='-s -w' -o ../server/builds/ZernMC-Online-Setup-${revision}.${hotfix}.exe . 2>&amp;1 || echo 'Go online build failed'; cd ../launcher/launcher; echo 'Building offline with embedded ZIP...'; cp ../../server/builds/ZernMC-win-${revision}.${hotfix}.zip ../../installer/offline.zip 2>/dev/null || cp ../../server/builds/ZernMC-win-1.1.1.4.zip ../../installer/offline.zip 2>/dev/null || true; cd ../../installer &amp;&amp; GOOS=windows GOARCH=amd64 CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags='-s -w' -o ../server/builds/ZernMC-Offline-Setup-${revision}.${hotfix}.exe . 2>&amp;1 || echo 'Go offline build failed'; cd ../launcher/launcher; rm -f ../../installer/offline.zip; touch ../../installer/offline.zip; fi"/>
</exec>
<!-- Подпись Go инсталляторов -->
<exec executable="java" failonerror="false">
<arg value="-jar"/>
<arg value="${user.home}/tools/jsign/jsign.jar"/>
<arg value="--keystore"/>
<arg value="/root/cert/codesign/zerncc.pfx"/>
<arg value="--storepass"/>
<arg value="${pfxpass}"/>
<arg value="--alias"/>
<arg value="1"/>
<arg value="--tsaurl"/>
<arg value="http://timestamp.digicert.com"/>
<arg value="--alg"/>
<arg value="SHA-256"/>
<arg value="../../server/builds/ZernMC-Online-Setup-${revision}.${hotfix}.exe"/>
</exec>
<exec executable="java" failonerror="false">
<arg value="-jar"/>
<arg value="${user.home}/tools/jsign/jsign.jar"/>
<arg value="--keystore"/>
<arg value="/root/cert/codesign/zerncc.pfx"/>
<arg value="--storepass"/>
<arg value="${pfxpass}"/>
<arg value="--alias"/>
<arg value="1"/>
<arg value="--tsaurl"/>
<arg value="http://timestamp.digicert.com"/>
<arg value="--alg"/>
<arg value="SHA-256"/>
<arg value="../../server/builds/ZernMC-Offline-Setup-${revision}.${hotfix}.exe"/>
</exec>
</target>
</configuration>
</execution>
launcher/launcher/src/main/icons/zernmc.ico
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 103 KiB

launcher/launcher/src/main/icons/zernmc.svg
-10
View File
@@ -1,10 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
<defs>
<linearGradient id="g" x1="0" y1="0" x2="1" y2="1">
<stop offset="0%" stop-color="#e94560"/>
<stop offset="100%" stop-color="#ff6b6b"/>
</linearGradient>
</defs>
<rect width="256" height="256" rx="64" fill="url(#g)"/>
<path d="M82 128 L128 82 L174 128 L128 174 Z" fill="white" opacity="0.9"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 423 B

launcher/launcher/src/main/icons/zernmc_master.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.5 KiB

launcher/launcher/src/main/java/sashegdev/zernmc/launcher/Bootstrap.java
+79 -161
View File
@@ -10,162 +10,55 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;
public class Bootstrap {
private static final String VERSION_FILE = "build.version";
private static final String JAR_NAME = "ZernMCLauncher.jar";
private static final String BASE_URL = "https://api.zernmc.ru";
private static Path baseDir;
private static Path logDir;
public static void main(String[] args) throws Exception {
baseDir = Paths.get("").toAbsolutePath();
logDir = baseDir.resolve("logs");
Files.createDirectories(logDir);
log("=== ZernMC Launcher ===");
List<String> argList = Arrays.asList(args);
boolean cliMode = argList.contains("--cli");
boolean jfxMode = !cliMode;
cleanupStaleUpdates();
String currentVersion = readCurrentVersion();
String serverVersion = getServerVersion();
log("Local version: " + currentVersion);
log("Server version: " + serverVersion);
if (isNewer(serverVersion, currentVersion)) {
log("Update available!");
updateJar(serverVersion);
Path ownExe = getOwnExe();
if (ownExe != null) {
log("Self-updating bootstrap...");
selfUpdate(ownExe);
return;
}
Files.writeString(baseDir.resolve(VERSION_FILE), serverVersion);
log("Updated to v" + serverVersion);
downloadUpdate(serverVersion);
} else {
log("Version is up to date");
}
if (jfxMode) {
launchJFX();
} else {
launchCLI();
}
}
private static void cleanupStaleUpdates() {
try (Stream<Path> files = Files.list(baseDir)) {
files.filter(p -> p.toString().endsWith(".update"))
.forEach(p -> {
try {
Files.deleteIfExists(p);
log("Cleaned stale: " + p.getFileName());
} catch (Exception ignored) {}
});
private static void log(String msg) {
String entry = "[" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")) + "] " + msg;
System.out.println(entry);
try {
Files.writeString(logDir.resolve("launcher.log"), entry + "\n",
StandardOpenOption.CREATE, StandardOpenOption.APPEND);
} catch (Exception ignored) {}
}
private static void updateJar(String newVersion) throws Exception {
Path jarFile = baseDir.resolve(JAR_NAME);
Path jarUpdate = baseDir.resolve(JAR_NAME + ".update");
if (Files.exists(jarFile)) {
try {
Files.move(jarFile, jarUpdate, StandardCopyOption.REPLACE_EXISTING);
log("Renamed " + JAR_NAME + " → " + JAR_NAME + ".update");
} catch (Exception e) {
log("Could not rename " + JAR_NAME + ": " + e.getMessage());
}
}
downloadFile(BASE_URL + "/launcher/download/jar", jarFile);
log("Downloaded new " + JAR_NAME);
try {
Files.deleteIfExists(jarUpdate);
log("Removed " + JAR_NAME + ".update");
} catch (Exception e) {
log("Could not remove " + JAR_NAME + ".update: " + e.getMessage());
}
Files.writeString(baseDir.resolve(VERSION_FILE), newVersion);
}
private static void selfUpdate(Path exePath) throws Exception {
String exeName = exePath.getFileName().toString();
Path exeUpdate = baseDir.resolve(exeName + ".update");
try {
Files.move(exePath, exeUpdate, StandardCopyOption.REPLACE_EXISTING);
log("Renamed " + exeName + " → " + exeName + ".update");
} catch (Exception e) {
log("Could not rename " + exeName + ": " + e.getMessage());
return;
}
downloadFile(BASE_URL + "/launcher/download/exe", exePath);
log("Launching new " + exeName + "...");
new ProcessBuilder(exePath.toAbsolutePath().toString())
.directory(baseDir.toFile())
.inheritIO()
.start();
Thread.sleep(500);
log("Exiting old process");
System.exit(0);
}
private static Path getOwnExe() {
try {
String cmd = ProcessHandle.current().info().command().orElse(null);
if (cmd != null) {
Path p = Paths.get(cmd);
String name = p.getFileName().toString().toLowerCase();
if (name.contains("zernmc")) return p;
}
} catch (Exception ignored) {}
for (String name : Arrays.asList("zernmc.exe", "zernmc-cli.exe")) {
Path p = baseDir.resolve(name);
if (Files.exists(p)) return p;
}
return null;
}
private static void downloadFile(String urlStr, Path target) throws Exception {
URL url = new URL(urlStr);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
if (conn.getResponseCode() == 200) {
try (InputStream in = conn.getInputStream();
OutputStream out = new FileOutputStream(target.toFile())) {
byte[] buf = new byte[8192];
int len;
long total = 0;
while ((len = in.read(buf)) > 0) {
out.write(buf, 0, len);
total += len;
System.out.print("\rDownloaded: " + (total / 1024 / 1024) + " MB");
}
}
System.out.println();
} else {
throw new IOException("Server returned code: " + conn.getResponseCode());
}
}
private static String readCurrentVersion() {
Path f = baseDir.resolve(VERSION_FILE);
try {
@@ -173,7 +66,7 @@ public class Bootstrap {
} catch (Exception ignored) {}
return "0.0.0";
}
private static String getServerVersion() {
try {
URL url = new URL(BASE_URL + "/launcher/version");
@@ -190,40 +83,65 @@ public class Bootstrap {
} catch (Exception ignored) {}
return "unknown";
}
private static boolean isNewer(String server, String current) {
try {
String[] sa = server.split("\\.");
String[] ca = current.split("\\.");
int max = Math.max(sa.length, ca.length);
for (int i = 0; i < max; i++) {
int sv = i < sa.length ? Integer.parseInt(sa[i]) : 0;
int cv = i < ca.length ? Integer.parseInt(ca[i]) : 0;
for (int i = 0; i < Math.min(sa.length, ca.length); i++) {
int sv = Integer.parseInt(sa[i]);
int cv = Integer.parseInt(ca[i]);
if (sv > cv) return true;
if (sv < cv) return false;
}
return false;
return sa.length > ca.length;
} catch (Exception ignored) {}
return false;
}
private static void log(String msg) {
String entry = "[" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")) + "] " + msg;
System.out.println(entry);
try {
Files.writeString(logDir.resolve("latest.log"), entry + "\n",
StandardOpenOption.CREATE, StandardOpenOption.APPEND);
} catch (Exception ignored) {}
private static void downloadUpdate(String newVersion) throws Exception {
URL url = new URL(BASE_URL + "/launcher/download/jar");
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
if (conn.getResponseCode() == 200) {
Path jarFile = baseDir.resolve(JAR_NAME);
Path tmp = jarFile.resolveSibling("zernmc-launcher-new.jar");
try (InputStream in = conn.getInputStream();
OutputStream out = new FileOutputStream(tmp.toFile())) {
byte[] buf = new byte[8192];
int len;
long total = 0;
while ((len = in.read(buf)) > 0) {
out.write(buf, 0, len);
total += len;
System.out.print("\rDownloaded: " + (total/1024/1024) + " MB");
}
}
log("Downloaded");
Path backup = jarFile.resolveSibling(JAR_NAME + ".old");
if (Files.exists(jarFile)) Files.move(jarFile, backup, StandardCopyOption.REPLACE_EXISTING);
Files.move(tmp, jarFile, StandardCopyOption.REPLACE_EXISTING);
if (Files.exists(backup)) Files.delete(backup);
Files.writeString(baseDir.resolve(VERSION_FILE), newVersion);
log("Updated to v" + newVersion);
} else {
throw new IOException("Server returned code: " + conn.getResponseCode());
}
}
private static void launchJFX() throws Exception {
Path javaBin = findJava();
Path jarPath = baseDir.resolve(JAR_NAME);
log("Starting JFX mode...");
log("Java: " + javaBin);
log("JAR: " + jarPath);
List<String> cmd = new ArrayList<>();
cmd.add(javaBin.toAbsolutePath().toString());
cmd.add("-Dfile.encoding=UTF-8");
@@ -232,17 +150,17 @@ public class Bootstrap {
cmd.add("-jar");
cmd.add(jarPath.toAbsolutePath().toString());
cmd.add("--jfx");
ProcessBuilder pb = new ProcessBuilder(cmd);
pb.directory(baseDir.toFile());
if (System.getProperty("os.name").toLowerCase().contains("windows")) {
pb.environment().put("JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8");
}
pb.redirectErrorStream(true);
Process p = pb.start();
Thread outputThread = new Thread(() -> {
try (BufferedReader reader = new BufferedReader(
new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
@@ -253,21 +171,21 @@ public class Bootstrap {
} catch (Exception ignored) {}
});
outputThread.start();
int code = p.waitFor();
try { outputThread.interrupt(); } catch (Exception ignored) {}
log("Exited with code: " + code);
System.exit(code);
}
private static void launchCLI() throws Exception {
Path javaBin = findJava();
Path jarPath = baseDir.resolve(JAR_NAME);
log("Starting CLI mode...");
log("Java: " + javaBin);
log("JAR: " + jarPath);
List<String> cmd = new ArrayList<>();
cmd.add(javaBin.toAbsolutePath().toString());
cmd.add("-Dfile.encoding=UTF-8");
@@ -276,17 +194,17 @@ public class Bootstrap {
cmd.add("-jar");
cmd.add(jarPath.toAbsolutePath().toString());
cmd.add("--cli");
ProcessBuilder pb = new ProcessBuilder(cmd);
pb.directory(baseDir.toFile());
if (System.getProperty("os.name").toLowerCase().contains("windows")) {
pb.environment().put("JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8");
}
pb.redirectErrorStream(true);
Process p = pb.start();
Thread outputThread = new Thread(() -> {
try (BufferedReader reader = new BufferedReader(
new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
@@ -297,23 +215,23 @@ public class Bootstrap {
} catch (Exception ignored) {}
});
outputThread.start();
int code = p.waitFor();
try { outputThread.interrupt(); } catch (Exception ignored) {}
log("Exited with code: " + code);
System.exit(code);
}
private static Path findJava() {
String os = System.getProperty("os.name").toLowerCase();
String javaExe = os.contains("windows") ? "java.exe" : "java";
Path javaBin = baseDir.resolve("jre21").resolve("bin").resolve(javaExe);
if (!Files.exists(javaBin)) {
javaBin = Paths.get(System.getProperty("java.home"), "bin", javaExe);
}
if (!Files.exists(javaBin)) {
try {
Process p = new ProcessBuilder("which", javaExe).start();
@@ -327,11 +245,11 @@ public class Bootstrap {
}
} catch (Exception ignored) {}
}
if (!Files.exists(javaBin)) {
throw new RuntimeException("Java not found. Make sure jre21 is present in the launcher folder or Java is installed on the system");
}
return javaBin;
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/Main.java
+1 -7
View File
@@ -37,11 +37,6 @@ public class Main {
boolean jfxMode = argList.contains("--jfx");
boolean cliMode = argList.contains("--cli");
if (argList.contains("--offline")) {
System.setProperty("zernmc.offline", "true");
LauncherLogger.info("Offline mode requested (--offline)");
}
if (jfxMode) {
launchJFX();
return;
@@ -55,7 +50,7 @@ public class Main {
private static void launchJFX() {
try {
System.setProperty("javafx.runtime.version", "23.0.1");
System.setProperty("javafx.runtime.version", "21");
JFXLauncher.main(new String[]{});
} catch (Exception e) {
@@ -70,7 +65,6 @@ public class Main {
}
private static void startCLI() throws IOException {
DomainSelector.selectBest();
ZHttpClient.checkAllServicesOnStartup(true);
System.out.println(ZAnsi.cyan("Checking authorization..."));
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/api/LauncherAPI.java
+11 -8
View File
@@ -88,7 +88,7 @@ public class LauncherAPI {
}
return ApiResponse.success(mcVersions);
} catch (Exception e) {
LauncherLogger.warn("[API] MC versions fetch failed: " + e.getMessage());
System.out.println("[API] MC versions fetch failed: " + e.getMessage());
}
return ApiResponse.error("Failed to load Minecraft versions");
}
@@ -136,7 +136,7 @@ public class LauncherAPI {
}
return ApiResponse.success(versions);
} catch (Exception e) {
LauncherLogger.warn("[API] Loader versions fetch failed: " + e.getMessage());
System.out.println("[API] Loader versions fetch failed: " + e.getMessage());
return ApiResponse.error("Failed to load loader versions");
}
}
@@ -144,15 +144,18 @@ public class LauncherAPI {
private static int compareVersions(String a, String b) {
String[] partsA = a.split("\\.");
String[] partsB = b.split("\\.");
int max = Math.max(partsA.length, partsB.length);
for (int i = 0; i < max; i++) {
int len = Math.min(partsA.length, partsB.length);
for (int i = 0; i < len; i++) {
try {
int numA = i < partsA.length ? Integer.parseInt(partsA[i]) : 0;
int numB = i < partsB.length ? Integer.parseInt(partsB[i]) : 0;
int numA = Integer.parseInt(partsA[i]);
int numB = Integer.parseInt(partsB[i]);
if (numA != numB) return Integer.compare(numB, numA);
} catch (NumberFormatException ignored) {}
} catch (NumberFormatException e) {
int cmp = partsA[i].compareTo(partsB[i]);
if (cmp != 0) return cmp;
}
}
return 0;
return Integer.compare(partsB.length, partsA.length);
}
private boolean isNeoForgeCompatible(String version, String mcVersion) {
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/api/auth/AuthService.java
+5 -10
View File
@@ -26,15 +26,10 @@ public class AuthService {
return ApiResponse.error(result.error != null ? result.error : "Registration failed");
} catch (Exception e) {
String msg = e.getMessage();
if (msg != null) {
java.util.regex.Matcher m = java.util.regex.Pattern.compile("HTTP (\\d{3})").matcher(msg);
if (m.find()) {
int code = Integer.parseInt(m.group(1));
String body = msg.substring(m.end()).trim();
return ApiResponse.error(AuthManager.friendlyHttpError(code, body));
}
if (msg != null && msg.contains("HTTP 409")) {
return ApiResponse.error("Username already taken");
}
return ApiResponse.error(AuthManager.friendlyConnectionError(e));
return ApiResponse.error("Registration error: " + msg);
}
}
@@ -45,9 +40,9 @@ public class AuthService {
LoginResult loginResult = new LoginResult(AuthManager.getUsername(), AuthManager.getAccessToken());
return ApiResponse.success(loginResult);
}
return ApiResponse.error(result.error != null ? result.error : "Неверный логин или пароль");
return ApiResponse.error(result.error != null ? result.error : "Invalid login or password");
} catch (Exception e) {
return ApiResponse.error(AuthManager.friendlyConnectionError(e));
return ApiResponse.error("Auth error: " + e.getMessage());
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/api/launch/LaunchService.java
+9 -59
View File
@@ -6,7 +6,7 @@ import me.sashegdev.zernmc.launcher.minecraft.Instance;
import me.sashegdev.zernmc.launcher.minecraft.InstanceManager;
import me.sashegdev.zernmc.launcher.minecraft.launch.LaunchCommandBuilder;
import me.sashegdev.zernmc.launcher.minecraft.model.LaunchOptions;
import me.sashegdev.zernmc.launcher.ui.jfx.JFXBridge;
import me.sashegdev.zernmc.launcher.ui.jfx.JFXLauncher;
import me.sashegdev.zernmc.launcher.utils.Config;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
@@ -24,7 +24,7 @@ public class LaunchService {
static {
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
LauncherLogger.info("[LAUNCH] Shutting down all running processes...");
System.out.println("[LAUNCH] Shutting down all running processes...");
runningProcesses.values().forEach(p -> {
try {
p.destroy();
@@ -67,50 +67,16 @@ public class LaunchService {
LauncherLogger.info("Launching: " + instanceName + " (serverPack=" + instance.isServerPack() + ")");
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
LaunchOptions options = createOptions();
options.setUsername(AuthManager.getUsername());
options.setAccessToken(AuthManager.getAccessToken());
options.setUuid(AuthManager.getUuid());
return launchProcess(instance, instanceName, options);
} catch (Exception e) {
LauncherLogger.error("Launch error for " + instanceName, e);
return ApiResponse.error("Launch error: " + e.getMessage());
}
}
public ApiResponse<ProcessInfo> launchOffline(String instanceName, String nickname) {
try {
Instance instance = InstanceManager.getInstance(instanceName);
if (instance == null) {
return ApiResponse.error("Pack not found: " + instanceName);
}
LauncherLogger.info("Offline launch: " + instanceName);
String safeName = (nickname == null || nickname.isBlank()) ? "Player" : nickname.trim();
LaunchOptions options = createOptions();
options.setUsername(safeName);
options.setAccessToken("0");
options.setUuid(java.util.UUID.nameUUIDFromBytes(
("OfflinePlayer:" + safeName).getBytes(java.nio.charset.StandardCharsets.UTF_8)).toString());
return launchProcess(instance, instanceName, options);
} catch (Exception e) {
LauncherLogger.error("Offline launch error for " + instanceName, e);
return ApiResponse.error("Offline launch error: " + e.getMessage());
}
}
private ApiResponse<ProcessInfo> launchProcess(Instance instance, String instanceName, LaunchOptions options) {
try {
long t0 = System.currentTimeMillis();
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
LauncherLogger.info("Launch: command built in " + (System.currentTimeMillis() - t0) + " ms");
LauncherLogger.info("Generated command for " + instanceName + ":");
command.forEach(arg -> LauncherLogger.debug(" " + arg));
long t1 = System.currentTimeMillis();
ProcessBuilder processBuilder = new ProcessBuilder(command);
processBuilder.directory(instance.getPath().toFile());
processBuilder.redirectErrorStream(true);
@@ -121,7 +87,6 @@ public class LaunchService {
Process process = processBuilder.start();
long pid = process.pid();
LauncherLogger.info("Launch: process started in " + (System.currentTimeMillis() - t1) + " ms (total " + (System.currentTimeMillis() - t0) + " ms), pid=" + pid);
runningProcesses.put(pid, process);
LauncherLogger.info("Process started, pid=" + pid);
@@ -133,14 +98,14 @@ public class LaunchService {
String line;
while ((line = reader.readLine()) != null) {
String timestamped = "[" + java.time.LocalTime.now().format(java.time.format.DateTimeFormatter.ofPattern("HH:mm:ss")) + "] " + line;
JFXBridge.appendGameLog(line);
JFXLauncher.appendGameLog(line);
try {
logFileOut.write((timestamped + "\n").getBytes(java.nio.charset.StandardCharsets.UTF_8));
logFileOut.flush();
} catch (Exception ignored) {}
}
} catch (Exception e) {
JFXBridge.appendGameLog("[Error reading logs: " + e.getMessage() + "]");
JFXLauncher.appendGameLog("[Error reading logs: " + e.getMessage() + "]");
} finally {
try { logFileOut.close(); } catch (Exception ignored) {}
}
@@ -148,25 +113,10 @@ public class LaunchService {
logReader.setDaemon(true);
logReader.start();
// Watch the child on a DAEMON thread via Process.waitFor() instead of
// process.onExit().thenRun(...): Process.onExit() completes its action on
// the common ForkJoinPool, whose worker threads are non-daemon and keep
// the launcher JVM alive on exit (the v1.0.14.2 "JFX hang (ForkJoinPool)"
// regression, re-introduced in v1.0.14.3's sendBounded). A daemon watcher
// does not prevent JVM shutdown and avoids pinning the common pool.
Thread processWatcher = new Thread(() -> {
try {
int exitCode = process.waitFor();
runningProcesses.remove(pid);
JFXBridge.appendGameLog("[Minecraft exited with code: " + exitCode + "]");
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (Exception e) {
JFXBridge.appendGameLog("[Error watching process: " + e.getMessage() + "]");
}
}, "ProcessWatcher-" + instanceName);
processWatcher.setDaemon(true);
processWatcher.start();
process.onExit().thenRun(() -> {
runningProcesses.remove(pid);
JFXLauncher.appendGameLog("[Minecraft exited with code: " + process.exitValue() + "]");
});
ProcessInfo info = new ProcessInfo(instanceName, pid, "RUNNING");
return ApiResponse.success(info);
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/auth/AuthManager.java
+5 -50
View File
@@ -113,62 +113,17 @@ public class AuthManager {
saveSession();
userInfo = fetchUserInfo();
return AuthResult.ok();
} else if (resp.statusCode() == 422) {
return AuthResult.fail("Validation error: " + extractError(resp.body()));
} else {
return AuthResult.fail(friendlyHttpError(resp.statusCode(), resp.body()));
return AuthResult.fail(extractError(resp.body()));
}
} catch (Exception e) {
LauncherLogger.warn("authRequest failed (" + endpoint + "): " + e.getMessage());
return AuthResult.fail(friendlyConnectionError(e));
e.printStackTrace();
return AuthResult.fail("Connection error: " + e.getMessage());
}
}
/**
* Maps an HTTP status code + raw body to a short, human-readable error message
* (in Russian) suitable for showing directly to the user.
*/
public static String friendlyHttpError(int statusCode, String body) {
switch (statusCode) {
case 401:
case 403:
return "Неверный логин или пароль";
case 404:
return "Сервис временно недоступен, попробуйте позже";
case 409:
return "Логин уже занят";
case 422:
return "Некорректные данные: " + extractError(body);
case 429:
return "Слишком много попыток. Подождите немного.";
default:
if (statusCode >= 500) {
return "Сервер временно недоступен, попробуйте позже";
}
}
String detail = extractError(body);
if (detail.isEmpty() || detail.startsWith("<")) {
return "Ошибка сервера (код " + statusCode + ")";
}
if (detail.length() > 120) {
detail = detail.substring(0, 117) + "...";
}
return detail;
}
/**
* Maps a network/IO exception to a short, human-readable message.
*/
public static String friendlyConnectionError(Exception e) {
String m = e == null ? "" : String.valueOf(e.getMessage()).toLowerCase();
if (e instanceof java.net.SocketTimeoutException
|| e instanceof java.net.ConnectException
|| e instanceof java.net.UnknownHostException
|| m.contains("timeout") || m.contains("connect") || m.contains("unknownhost")
|| m.contains("refused")) {
return "Нет соединения с сервером. Проверьте интернет.";
}
return "Ошибка соединения с сервером. Попробуйте позже.";
}
public static void logout() {
if (session != null && session.refreshToken != null) {
try {
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/Instance.java
+1 -3
View File
@@ -1,7 +1,5 @@
package me.sashegdev.zernmc.launcher.minecraft;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.io.IOException;
@@ -144,7 +142,7 @@ public class Instance {
this.serverPackName = meta.serverPackName;
this.presetId = meta.presetId;
} catch (Exception e) {
LauncherLogger.warn("[Instance] Failed to load metadata for " + name + ": " + e.getMessage());
System.err.println("[Instance] Failed to load metadata for " + name + ": " + e.getMessage());
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/InstanceManager.java
+1 -3
View File
@@ -1,7 +1,5 @@
package me.sashegdev.zernmc.launcher.minecraft;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import me.sashegdev.zernmc.launcher.utils.Config;
import java.io.IOException;
@@ -53,7 +51,7 @@ public class InstanceManager {
try {
Files.deleteIfExists(path);
} catch (IOException e) {
LauncherLogger.warn("Не удалось удалить: " + path);
System.err.println("Не удалось удалить: " + path);
}
});
return true;
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/MinecraftLib.java
+26 -33
View File
@@ -1,11 +1,12 @@
package me.sashegdev.zernmc.launcher.minecraft;
import me.sashegdev.zernmc.launcher.minecraft.installer.FabricInstaller;
import me.sashegdev.zernmc.launcher.minecraft.installer.ModLoaderInstaller;
import me.sashegdev.zernmc.launcher.minecraft.installer.ForgeInstaller;
import me.sashegdev.zernmc.launcher.minecraft.installer.NeoForgeInstaller;
import me.sashegdev.zernmc.launcher.minecraft.installer.VersionInstaller;
import me.sashegdev.zernmc.launcher.minecraft.launch.LaunchCommandBuilder;
import me.sashegdev.zernmc.launcher.minecraft.model.LaunchOptions;
import me.sashegdev.zernmc.launcher.ui.jfx.JFXBridge;
import me.sashegdev.zernmc.launcher.ui.jfx.JFXLauncher;
import me.sashegdev.zernmc.launcher.utils.ConsoleUtils;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import me.sashegdev.zernmc.launcher.utils.ZAnsi;
@@ -44,13 +45,13 @@ public class MinecraftLib {
}
public boolean installForge(String minecraftVersion, String forgeVersion) throws Exception {
return new ModLoaderInstaller(instance)
.install(minecraftVersion, forgeVersion, ModLoaderInstaller.LoaderType.FORGE);
ForgeInstaller installer = new ForgeInstaller(instance);
return installer.install(minecraftVersion, forgeVersion);
}
public boolean installNeoForge(String minecraftVersion, String neoforgeVersion) throws Exception {
return new ModLoaderInstaller(instance)
.install(minecraftVersion, neoforgeVersion, ModLoaderInstaller.LoaderType.NEOFORGE);
NeoForgeInstaller installer = new NeoForgeInstaller(instance);
return installer.install(minecraftVersion, neoforgeVersion);
}
public boolean installFabric(String minecraftVersion, String loaderVersion) throws Exception {
@@ -71,12 +72,12 @@ public class MinecraftLib {
* Stub - will be expanded
*/
public boolean installPack(String packName, String minecraftVersion, String loaderType, String loaderVersion) throws Exception {
LauncherLogger.info("Starting full pack install: " + packName);
System.out.println(ZAnsi.cyan("Starting full pack install: " + packName));
// 1. Install Minecraft
boolean mcInstalled = installMinecraft(minecraftVersion);
if (!mcInstalled) {
LauncherLogger.error("Failed to install Minecraft " + minecraftVersion);
System.out.println(ZAnsi.brightRed("Failed to install Minecraft " + minecraftVersion));
return false;
}
@@ -84,53 +85,45 @@ public class MinecraftLib {
if ("fabric".equalsIgnoreCase(loaderType)) {
boolean fabricInstalled = installFabric(minecraftVersion, loaderVersion);
if (!fabricInstalled) {
LauncherLogger.error("Failed to install Fabric");
System.out.println(ZAnsi.brightRed("Failed to install Fabric"));
return false;
}
} else if ("forge".equalsIgnoreCase(loaderType)) {
boolean forgeInstalled = installForge(minecraftVersion, loaderVersion);
if (!forgeInstalled) {
LauncherLogger.error("Failed to install Forge");
System.out.println(ZAnsi.brightRed("Failed to install Forge"));
return false;
}
} else if ("neoforge".equalsIgnoreCase(loaderType)) {
boolean neoforgeInstalled = installNeoForge(minecraftVersion, loaderVersion);
if (!neoforgeInstalled) {
LauncherLogger.error("Failed to install NeoForge");
System.out.println(ZAnsi.brightRed("Failed to install NeoForge"));
return false;
}
}
// 3. In the future: diff and mod download
LauncherLogger.info("Basic pack install complete!");
System.out.println(ZAnsi.brightGreen("Basic pack install complete!"));
return true;
}
//Launch
public void launch(LaunchOptions options) throws Exception {
LauncherLogger.info("Launching pack: " + instance.getName());
System.out.println(ZAnsi.brightGreen("Launching pack: " + instance.getName()));
cleanupOldLoaders();
validateJarFiles();
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
LauncherLogger.info("Launch command (" + command.size() + " args) written below");
System.out.println(ZAnsi.cyan("Launch command (" + command.size() + " args):"));
command.forEach(arg -> System.out.println(" " + arg));
ProcessBuilder pb = new ProcessBuilder(command);
pb.directory(instance.getPath().toFile());
// Write launch command to file for debugging
Path cmdLogFile = instance.getPath().resolve("launch-command.log");
try {
Files.writeString(cmdLogFile, String.join(" \\\n ", command));
LauncherLogger.info("Launch command written to " + cmdLogFile.toAbsolutePath());
} catch (Exception e) {
LauncherLogger.warn("Failed to write launch command log: " + e.getMessage());
}
LauncherLogger.info("Starting Minecraft...");
System.out.println(ZAnsi.brightGreen("\nStarting Minecraft...\n"));
ConsoleUtils.clearScreen();
Process process = pb.start();
@@ -140,10 +133,10 @@ public class MinecraftLib {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
String line;
while ((line = reader.readLine()) != null) {
JFXBridge.appendGameLog(line);
JFXLauncher.appendGameLog(line);
}
} catch (Exception e) {
JFXBridge.appendGameLog("[Error reading output: " + e.getMessage() + "]");
JFXLauncher.appendGameLog("[Error reading output: " + e.getMessage() + "]");
}
});
outThread.setDaemon(true);
@@ -154,10 +147,10 @@ public class MinecraftLib {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
String line;
while ((line = reader.readLine()) != null) {
JFXBridge.appendGameLog("[ERR] " + line);
JFXLauncher.appendGameLog("[ERR] " + line);
}
} catch (Exception e) {
JFXBridge.appendGameLog("[Error reading stderr: " + e.getMessage() + "]");
JFXLauncher.appendGameLog("[Error reading stderr: " + e.getMessage() + "]");
}
});
errThread.setDaemon(true);
@@ -167,7 +160,7 @@ public class MinecraftLib {
outThread.join(1000);
errThread.join(1000);
LauncherLogger.info("Minecraft exited with code: " + exitCode);
System.out.println(ZAnsi.yellow("\nMinecraft exited with code: " + exitCode));
}
private void safeDeleteDirectory(Path dir) {
@@ -214,7 +207,7 @@ public class MinecraftLib {
if (currentLoaderVer == null) return;
LauncherLogger.info("Cleaning old loader versions...");
System.out.println(ZAnsi.yellow("Cleaning old loader versions..."));
// Delete all old fabric-loader / forge
Path libraries = instance.getPath().resolve("libraries");
@@ -246,14 +239,14 @@ public class MinecraftLib {
.filter(p -> !isValidJar(p))
.forEach(p -> {
try {
LauncherLogger.warn("Removing corrupt JAR: " + instance.getPath().relativize(p));
System.out.println(ZAnsi.yellow(" Removing corrupt JAR: " + instance.getPath().relativize(p)));
Files.delete(p);
} catch (IOException e) {
LauncherLogger.error("Failed to delete: " + p.getFileName());
System.out.println(ZAnsi.red(" Failed to delete: " + p.getFileName()));
}
});
} catch (Exception e) {
LauncherLogger.warn("Error scanning for corrupt JARs: " + e.getMessage());
System.out.println(ZAnsi.yellow(" Error scanning for corrupt JARs: " + e.getMessage()));
}
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/PackDownloader.java
+35 -79
View File
@@ -177,51 +177,51 @@ public class PackDownloader {
if (needsMinecraftInstall) {
LauncherLogger.info("installOrUpdatePack: needs Minecraft install. loader=" + manifest.getLoaderType() + " loaderVer=" + manifest.getLoaderVersion());
reportProgress("Installing " + manifest.getMinecraftVersion() + " with " + manifest.getLoaderType() + "...", 10, "Installing pack files", 4, 5);
if ("fabric".equalsIgnoreCase(manifest.getLoaderType())) {
LauncherLogger.info("installOrUpdatePack: installing Fabric mc=" + manifest.getMinecraftVersion() + " loader=" + manifest.getLoaderVersion());
reportProgress("Installing Fabric " + manifest.getLoaderVersion() + "...", 15, "Installing pack files", 4, 5);
boolean success = lib.installFabric(manifest.getMinecraftVersion(), manifest.getLoaderVersion());
LauncherLogger.info("installOrUpdatePack: Fabric install result=" + success);
if (!success) {
LauncherLogger.error("[INSTALL] Failed to install Fabric");
System.err.println(ZAnsi.brightRed("Failed to install Fabric"));
LauncherLogger.error("installOrUpdatePack: Fabric install failed");
reportProgress("Failed to install Fabric", 0, "error", 0, 1);
return false;
}
} else if ("neoforge".equalsIgnoreCase(manifest.getLoaderType())) {
LauncherLogger.info("installOrUpdatePack: installing NeoForge mc=" + manifest.getMinecraftVersion() + " loader=" + manifest.getLoaderVersion());
reportProgress("Installing NeoForge " + manifest.getLoaderVersion() + "...", 15, "Installing pack files", 4, 5);
boolean success = lib.installNeoForge(manifest.getMinecraftVersion(), manifest.getLoaderVersion());
LauncherLogger.info("installOrUpdatePack: NeoForge install result=" + success);
if (!success) {
LauncherLogger.error("[INSTALL] Failed to install NeoForge");
System.err.println(ZAnsi.brightRed("Failed to install NeoForge"));
LauncherLogger.error("installOrUpdatePack: NeoForge install failed");
reportProgress("Failed to install NeoForge", 0, "error", 0, 1);
return false;
}
} else if ("forge".equalsIgnoreCase(manifest.getLoaderType())) {
LauncherLogger.info("installOrUpdatePack: installing Forge mc=" + manifest.getMinecraftVersion() + " loader=" + manifest.getLoaderVersion());
reportProgress("Installing Forge " + manifest.getLoaderVersion() + "...", 15, "Installing pack files", 4, 5);
boolean success = lib.installForge(manifest.getMinecraftVersion(), manifest.getLoaderVersion());
LauncherLogger.info("installOrUpdatePack: Forge install result=" + success);
if (!success) {
LauncherLogger.error("[INSTALL] Failed to install Forge");
System.err.println(ZAnsi.brightRed("Failed to install Forge"));
LauncherLogger.error("installOrUpdatePack: Forge install failed");
reportProgress("Failed to install Forge", 0, "error", 0, 1);
return false;
}
} else {
LauncherLogger.info("installOrUpdatePack: installing Vanilla Minecraft " + manifest.getMinecraftVersion());
reportProgress("Installing Vanilla Minecraft...", 15, "Installing pack files", 4, 5);
boolean success = lib.installMinecraft(manifest.getMinecraftVersion());
LauncherLogger.info("installOrUpdatePack: Vanilla install result=" + success);
if (!success) {
LauncherLogger.error("[INSTALL] Failed to install Vanilla Minecraft");
System.err.println(ZAnsi.brightRed("Failed to install Vanilla Minecraft"));
LauncherLogger.error("installOrUpdatePack: Vanilla install failed");
reportProgress("Failed to install Vanilla Minecraft", 0, "error", 0, 1);
return false;
}
}
LauncherLogger.info("installOrUpdatePack: Minecraft+loader install completed successfully");
} else {
LauncherLogger.info("Minecraft already installed, skipping...");
LauncherLogger.info("installOrUpdatePack: Minecraft already installed, skipping");
System.out.println(ZAnsi.green("Minecraft already installed, skipping..."));
}
reportProgress("Scanning local files...", 30, "Installing pack files", 4, 5);
@@ -234,7 +234,7 @@ public class PackDownloader {
// If pack has no files (vanilla/loader only), skip diff
if (manifest.files == null || manifest.files.isEmpty()) {
LauncherLogger.info("installOrUpdatePack: no files in manifest, skipping diff");
LauncherLogger.info("Pack contains no additional files");
System.out.println(ZAnsi.green("Pack contains no additional files"));
reportProgress("Installing...", 50, "Installing pack files", 4, 5);
saveUserFilesSnapshot(localFiles);
@@ -245,10 +245,10 @@ public class PackDownloader {
instance.setMinecraftVersion(manifest.getMinecraftVersion());
instance.setLoaderType(manifest.getLoaderType());
instance.setLoaderVersion(manifest.getLoaderVersion());
instance.setAssetIndex(resolveAssetIndex(manifest));
instance.setAssetIndex(manifest.getAssetIndex());
reportProgress("Pack installed successfully!", 100, "Installing pack files", 4, 5);
LauncherLogger.info("Pack installed successfully!");
System.out.println(ZAnsi.brightGreen("Pack installed successfully!"));
return true;
}
LauncherLogger.info("installOrUpdatePack: manifest has " + manifest.files.size() + " files, proceeding to diff");
@@ -295,9 +295,9 @@ public class PackDownloader {
instance.setMinecraftVersion(manifest.getMinecraftVersion());
instance.setLoaderType(manifest.getLoaderType());
instance.setLoaderVersion(manifest.getLoaderVersion());
instance.setAssetIndex(resolveAssetIndex(manifest));
instance.setAssetIndex(manifest.getAssetIndex());
LauncherLogger.info("Pack installed successfully!");
System.out.println(ZAnsi.brightGreen("Pack installed successfully!"));
LauncherLogger.info("installOrUpdatePack: SUCCESS");
} else {
LauncherLogger.error("installOrUpdatePack: FAILED - applyDiff returned false without exception");
@@ -327,17 +327,17 @@ public class PackDownloader {
}
public boolean updatePack(String packName, String preset) throws Exception {
LauncherLogger.info("Checking updates for " + instance.getName() + "...");
System.out.println(ZAnsi.cyan("Checking updates for " + instance.getName() + "..."));
PackManifest manifest = getPackManifest(packName);
int serverVersion = manifest.getVersion();
if (serverVersion <= instance.getServerVersion()) {
LauncherLogger.info("Pack is already up to date (v" + instance.getServerVersion() + ")");
System.out.println(ZAnsi.green("Pack is already up to date (v" + instance.getServerVersion() + ")"));
return true;
}
LauncherLogger.info("Update available: v" + instance.getServerVersion() + " -> v" + serverVersion);
System.out.println(ZAnsi.yellow("Update available: v" + instance.getServerVersion() + " → v" + serverVersion));
// Scan local files
Map<String, String> localFiles = scanLocalFiles();
@@ -346,7 +346,7 @@ public class PackDownloader {
Set<String> protectedFiles = getUserModifiedFiles(localFiles);
if (!protectedFiles.isEmpty()) {
LauncherLogger.info("[DEBUG] Found " + protectedFiles.size() + " user-modified files (will not overwrite)");
LauncherLogger.info("Found " + protectedFiles.size() + " user-modified files, they will not be overwritten");
System.out.println(ZAnsi.yellow("Found " + protectedFiles.size() + " user-modified files, they will not be overwritten"));
}
// Get diff
@@ -361,7 +361,7 @@ public class PackDownloader {
saveUserFilesSnapshot(updatedHashes);
instance.setServerVersion(serverVersion);
LauncherLogger.info("Pack updated to v" + serverVersion);
System.out.println(ZAnsi.brightGreen("Pack updated to v" + serverVersion));
}
return success;
@@ -514,30 +514,34 @@ public class PackDownloader {
private boolean applyDiff(DiffResponse diff, String packName, Set<String> protectedFiles, String preset) {
LauncherLogger.info("applyDiff: start. toDownload=" + diff.getToDownload().size() + " toDelete=" + diff.getToDelete().size() + " protected=" + protectedFiles.size());
LauncherLogger.info("Apply changes: Download " + diff.getToDownload().size() + " files, Delete " + diff.getToDelete().size() + " files"
+ (!protectedFiles.isEmpty() ? ", Protected " + protectedFiles.size() + " user-modified files (skipped)" : ""));
System.out.println(ZAnsi.cyan("\nApplying changes:"));
System.out.println(" Download: " + diff.getToDownload().size() + " files");
System.out.println(" Delete: " + diff.getToDelete().size() + " files");
if (!protectedFiles.isEmpty()) {
System.out.println(ZAnsi.yellow(" Protected: " + protectedFiles.size() + " user-modified files (skipped)"));
}
// Create directories if needed
try {
Files.createDirectories(instance.getPath());
} catch (IOException e) {
LauncherLogger.error("Error creating directories: " + e.getMessage());
System.err.println(ZAnsi.red("Error creating directories: " + e.getMessage()));
return false;
}
// Delete files (skip protected)
for (String filePath : diff.getToDelete()) {
if (protectedFiles.contains(filePath)) {
LauncherLogger.info("Skipped delete (user-modified): " + filePath);
System.out.println(ZAnsi.yellow(" Skipped delete (user-modified): " + filePath));
continue;
}
Path fullPath = instance.getPath().resolve(filePath);
try {
if (Files.deleteIfExists(fullPath)) {
LauncherLogger.info("Deleted: " + filePath);
System.out.println(ZAnsi.yellow(" Deleted: " + filePath));
}
} catch (IOException e) {
LauncherLogger.error("Error deleting " + filePath + ": " + e.getMessage());
System.err.println(ZAnsi.red(" Error deleting " + filePath + ": " + e.getMessage()));
}
}
@@ -556,7 +560,7 @@ public class PackDownloader {
if (protectedFiles.contains(path)) {
skipped++;
LauncherLogger.info("Skipped (user-modified): " + path);
System.out.println(ZAnsi.yellow(" Skipped (user-modified): " + path));
continue;
}
@@ -588,6 +592,7 @@ public class PackDownloader {
}
if (!hashMatch) {
LauncherLogger.warn("applyDiff: skipping file " + path + " due to hash mismatch (expected=" + file.getHash() + " got=" + actualHash + ")");
System.err.println(ZAnsi.yellow(" Skipped (hash mismatch): " + path));
skipped++;
continue;
}
@@ -632,7 +637,8 @@ public class PackDownloader {
} catch (Exception e) {
LauncherLogger.error("applyDiff: download FAILED for path=" + path + " error=" + e.getClass().getName() + ": " + e.getMessage());
LauncherLogger.error("Download error " + path + ": " + e.getMessage() + " - skipping file");
System.err.println("\n" + ZAnsi.red(" Download error " + path + ": " + e.getMessage()));
System.err.println(ZAnsi.yellow(" Skipping file " + path + " due to download error"));
skipped++;
continue;
}
@@ -642,7 +648,7 @@ public class PackDownloader {
ProgressBar.finish("Download");
}
if (skipped > 0) {
LauncherLogger.info("Skipped " + skipped + " user-modified files");
System.out.println(ZAnsi.cyan(" Skipped " + skipped + " user-modified files"));
}
return true;
@@ -760,56 +766,6 @@ public class PackDownloader {
public boolean isEmpty() { return files == null || files.isEmpty(); }
}
/**
* Resolve the correct asset index for the installed Minecraft version.
* The manifest/instance.json asset_index value may be wrong (e.g. Zern-OBT
* shipped "1.20.1" while the real index for MC 1.20.1 is "5"). The source of
* truth is the local Mojang version JSON downloaded during install
* (versions/&lt;mc&gt;/&lt;mc&gt;.json -> assetIndex.id). We only trust it when the
* corresponding index file actually exists on disk; otherwise fall back to
* the manifest value.
*/
private String resolveAssetIndex(PackManifest manifest) {
String manifestIndex = manifest.getAssetIndex();
if (manifest == null || manifest.getMinecraftVersion() == null) {
return manifestIndex;
}
try {
Path versionJson = instance.getPath().resolve("versions")
.resolve(manifest.getMinecraftVersion())
.resolve(manifest.getMinecraftVersion() + ".json");
if (Files.exists(versionJson)) {
JsonObject versionData = JsonParser.parseString(Files.readString(versionJson)).getAsJsonObject();
String realIndex = null;
if (versionData.has("assetIndex") && versionData.get("assetIndex").isJsonObject()
&& versionData.getAsJsonObject("assetIndex").has("id")) {
realIndex = versionData.getAsJsonObject("assetIndex").get("id").getAsString();
} else if (versionData.has("assets") && !versionData.get("assets").isJsonNull()) {
realIndex = versionData.get("assets").getAsString();
}
if (realIndex != null && !realIndex.isEmpty()) {
Path indexPath = instance.getPath().resolve("assets").resolve("indexes")
.resolve(realIndex + ".json");
if (Files.exists(indexPath)) {
if (!realIndex.equals(manifestIndex)) {
LauncherLogger.warn("resolveAssetIndex: manifest asset_index=" + manifestIndex
+ " but real index=" + realIndex + " exists on disk, using real index");
}
return realIndex;
} else {
LauncherLogger.warn("resolveAssetIndex: real index=" + realIndex
+ " from version JSON, but " + indexPath + " does not exist; falling back to manifest=" + manifestIndex);
}
}
} else {
LauncherLogger.warn("resolveAssetIndex: local version JSON not found: " + versionJson);
}
} catch (Exception e) {
LauncherLogger.warn("resolveAssetIndex: failed to resolve: " + e.getClass().getSimpleName() + " - " + e.getMessage());
}
return manifestIndex;
}
public static class DiffResponse {
private int version;
private List<FileInfo> to_download;
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/installer/FabricInstaller.java
+66 -102
View File
@@ -1,28 +1,32 @@
package me.sashegdev.zernmc.launcher.minecraft.installer;
import me.sashegdev.zernmc.launcher.minecraft.Instance;
import me.sashegdev.zernmc.launcher.utils.JavaResolver;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import me.sashegdev.zernmc.launcher.utils.ProgressBar;
import me.sashegdev.zernmc.launcher.utils.ZAnsi;
import me.sashegdev.zernmc.launcher.utils.ZHttpClient;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit;
import java.time.Duration;
public class FabricInstaller {
private final Instance instance;
private final HttpClient httpClient = HttpClient.newBuilder()
.connectTimeout(Duration.ofSeconds(15))
.build();
public FabricInstaller(Instance instance) {
this.instance = instance;
}
public boolean install(String minecraftVersion, String loaderVersion) throws Exception {
LauncherLogger.info("Installing Fabric " + loaderVersion + " for Minecraft " + minecraftVersion);
System.out.println(ZAnsi.cyan("Installing Fabric " + loaderVersion + " for Minecraft " + minecraftVersion));
Path instancePath = instance.getPath();
cleanOldFabricLoaders();
@@ -30,13 +34,11 @@ public class FabricInstaller {
VersionInstaller versionInstaller = new VersionInstaller(instancePath);
String assetIndex = versionInstaller.install(minecraftVersion);
LauncherLogger.info("Asset index obtained: " + assetIndex);
System.out.println(ZAnsi.green("Asset index obtained: " + assetIndex));
instance.setAssetIndex(assetIndex);
instance.setMinecraftVersion(minecraftVersion);
ProgressBar.showIndeterminate("Preparing Fabric installer");
String installerVersion = getLatestInstallerVersion();
String installerUrl = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/"
+ installerVersion + "/fabric-installer-" + installerVersion + ".jar";
@@ -44,20 +46,17 @@ public class FabricInstaller {
Path installerJar = instancePath.resolve("fabric-installer.jar");
if (!Files.exists(installerJar)) {
ProgressBar.showIndeterminate("Downloading Fabric Installer");
ProgressBar.show("Downloading Fabric Installer", 0, 100, "%");
downloadFileWithFallback(installerUrl, installerJar);
ProgressBar.finish("Fabric Installer downloaded");
}
preDownloadFabricLibraries(minecraftVersion, loaderVersion);
LauncherLogger.info("Running Fabric Installer...");
ProgressBar.showIndeterminate("Running Fabric Installer (may take a few minutes)");
System.out.println(ZAnsi.cyan("Running Fabric Installer..."));
String fabricVersionId = "fabric-loader-" + loaderVersion + "-" + minecraftVersion;
ProcessBuilder pb = new ProcessBuilder(
JavaResolver.getJavaExecutable(), "-jar", installerJar.toAbsolutePath().toString(),
"java", "-jar", installerJar.toAbsolutePath().toString(),
"client",
"-dir", instancePath.toAbsolutePath().toString(),
"-mcversion", minecraftVersion,
@@ -65,60 +64,21 @@ public class FabricInstaller {
"-noprofile"
);
pb.redirectErrorStream(true);
pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
pb.redirectError(ProcessBuilder.Redirect.INHERIT);
Process process = pb.start();
boolean hasErrors = false;
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
String line;
while ((line = reader.readLine()) != null) {
if (line.contains("Downloading") || line.contains("Extracting")
|| line.contains("Installing") || line.contains("Creating")
|| line.contains("SUCCESS") || line.contains("successfully")) {
ProgressBar.showIndeterminate("Fabric Installer: " + ProgressBar.cleanLine(line));
}
if (line.contains("Downloading") || line.contains("Extracting")) {
LauncherLogger.info(" -> " + line);
} else if (line.contains("SUCCESS") || line.contains("successfully")) {
LauncherLogger.info(" + " + line);
} else if (line.contains("WARNING") || line.contains("warning")) {
LauncherLogger.warn(" ! " + line);
} else if (line.contains("ERROR") || line.contains("error") || line.contains("failed") || line.contains("timed out")) {
LauncherLogger.error(" X " + line);
if (line.contains("timed out") || line.contains("failed to download")) {
hasErrors = true;
}
} else if (!line.isBlank()) {
LauncherLogger.info(" " + line);
}
}
}
int exitCode;
if (hasErrors) {
process.destroyForcibly();
exitCode = 1;
} else {
if (!process.waitFor(10, TimeUnit.MINUTES)) {
process.destroyForcibly();
LauncherLogger.error("Fabric Installer timed out after 10 minutes");
return false;
}
exitCode = process.exitValue();
}
int exitCode = process.waitFor();
if (exitCode != 0) {
LauncherLogger.error("Fabric Installer failed (code " + exitCode + ")");
System.out.println(ZAnsi.brightRed("Fabric Installer failed (code " + exitCode + ")"));
return false;
}
Path fabricVersionDir = instancePath.resolve("versions").resolve(fabricVersionId);
if (Files.exists(fabricVersionDir)) {
LauncherLogger.info("Fabric installed successfully!");
System.out.println(ZAnsi.brightGreen("Fabric installed successfully!"));
instance.setLoaderType("fabric");
instance.setLoaderVersion(loaderVersion);
@@ -126,11 +86,9 @@ public class FabricInstaller {
ensureAssetIndexInFabricVersion(fabricVersionDir, assetIndex);
ZHttpClient.repairMissingLibraries(instancePath);
return true;
} else {
LauncherLogger.error("Fabric Installer ran, but version not found.");
System.out.println(ZAnsi.brightRed("Fabric Installer ran, but version not found."));
return false;
}
}
@@ -139,47 +97,16 @@ public class FabricInstaller {
try {
ZHttpClient.downloadFile(url, target);
} catch (Exception e) {
LauncherLogger.warn("Failed to download Fabric Installer: " + e.getMessage());
System.out.println(ZAnsi.yellow("Failed to download Fabric Installer: " + e.getMessage()));
throw e;
}
}
/**
* Pre-downloads the Fabric loader jar and its dependency manifest through the smart proxy
* so the installer subprocess finds them already on disk and skips direct downloads.
* Non-fatal: if this fails the subprocess will still try to download itself.
*/
private void preDownloadFabricLibraries(String minecraftVersion, String loaderVersion) {
try {
Path libRoot = instance.getPath().resolve("libraries");
String loaderVersionPath = "net/fabricmc/fabric-loader/" + loaderVersion;
Path loaderJson = libRoot.resolve(loaderVersionPath).resolve("fabric-loader-" + loaderVersion + ".json");
if (!Files.exists(loaderJson)) {
Files.createDirectories(loaderJson.getParent());
ZHttpClient.downloadFileWithSmartProxy(
"https://maven.fabricmc.net/" + loaderVersionPath + "/fabric-loader-" + loaderVersion + ".json",
loaderJson);
}
Path loaderJar = libRoot.resolve(loaderVersionPath).resolve("fabric-loader-" + loaderVersion + ".jar");
if (!Files.exists(loaderJar)) {
ZHttpClient.downloadFileWithSmartProxy(
"https://maven.fabricmc.net/" + loaderVersionPath + "/fabric-loader-" + loaderVersion + ".jar",
loaderJar);
}
ZHttpClient.repairLibrariesFromJson(loaderJson, instance.getPath());
} catch (Exception e) {
LauncherLogger.warn("Pre-download of Fabric libraries incomplete: " + e.getMessage());
}
}
private void ensureAssetIndexInFabricVersion(Path fabricVersionDir, String assetIndex) throws IOException {
Path versionJson = fabricVersionDir.resolve(fabricVersionDir.getFileName() + ".json");
if (!Files.exists(versionJson)) {
LauncherLogger.warn("Version JSON file not found: " + versionJson);
System.out.println(ZAnsi.yellow("Version JSON file not found: " + versionJson));
return;
}
@@ -187,7 +114,7 @@ public class FabricInstaller {
// Check and fix asset index
if (!content.contains("\"assets\":\"" + assetIndex + "\"")) {
LauncherLogger.warn("Fixing asset index in version JSON file...");
System.out.println(ZAnsi.yellow("Fixing asset index in version JSON file..."));
// Replace assets with correct value
content = content.replaceAll("\"assets\":\\s*\"[^\"]*\"", "\"assets\": \"" + assetIndex + "\"");
@@ -198,9 +125,9 @@ public class FabricInstaller {
}
Files.writeString(versionJson, content);
LauncherLogger.info("Asset index fixed to: " + assetIndex);
System.out.println(ZAnsi.green("Asset index fixed to: " + assetIndex));
} else {
LauncherLogger.info("Asset index in version JSON is correct: " + assetIndex);
System.out.println(ZAnsi.green("Asset index in version JSON is correct: " + assetIndex));
}
}
@@ -208,7 +135,7 @@ public class FabricInstaller {
Path librariesDir = instance.getPath().resolve("libraries/net/fabricmc/fabric-loader");
if (!Files.exists(librariesDir)) return;
LauncherLogger.warn("Cleaning old Fabric Loader versions...");
System.out.println(ZAnsi.yellow("Cleaning old Fabric Loader versions..."));
try (var stream = Files.walk(librariesDir)) {
stream.filter(Files::isDirectory)
@@ -234,16 +161,53 @@ public class FabricInstaller {
int end = xml.indexOf("</latest>", start);
return xml.substring(start, end).trim();
} catch (Exception e) {
LauncherLogger.warn("Error getting Fabric Installer version: " + e.getMessage());
System.out.println(ZAnsi.yellow("Error getting Fabric Installer version: " + e.getMessage()));
throw new Exception("Failed to get Fabric Installer version", e);
}
}
// under refactor - keep
private String downloadString(String url) throws Exception {
return ZHttpClient.getWithSmartProxy(url);
Exception lastException = null;
for (int attempt = 1; attempt <= 3; attempt++) {
try {
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(url))
.timeout(Duration.ofSeconds(30 * attempt))
.header("User-Agent", "ZernMC-Launcher/1.0")
.GET()
.build();
HttpResponse<String> resp = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
if (resp.statusCode() == 200) {
return resp.body();
}
throw new IOException("HTTP " + resp.statusCode());
} catch (Exception e) {
lastException = e;
System.out.println(ZAnsi.yellow("Attempt " + attempt + " failed: " + e.getMessage()));
if (attempt < 3) {
Thread.sleep(1000 * attempt);
}
}
}
throw lastException;
}
private void downloadFile(String url, Path target) throws Exception {
ZHttpClient.downloadFileWithSmartProxy(url, target);
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(url))
.timeout(Duration.ofSeconds(60))
.GET()
.build();
HttpResponse<Path> response = httpClient.send(request,
HttpResponse.BodyHandlers.ofFile(target));
if (response.statusCode() != 200) {
throw new IOException("HTTP " + response.statusCode() + " when downloading " + url);
}
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/installer/ForgeInstaller.java
+128 -68
View File
@@ -1,35 +1,43 @@
package me.sashegdev.zernmc.launcher.minecraft.installer;
import me.sashegdev.zernmc.launcher.minecraft.Instance;
import me.sashegdev.zernmc.launcher.utils.JavaResolver;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import me.sashegdev.zernmc.launcher.utils.ProgressBar;
import me.sashegdev.zernmc.launcher.utils.ZHttpClient;
import me.sashegdev.zernmc.launcher.utils.ZAnsi;
import java.io.*;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.concurrent.TimeUnit;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ForgeInstaller {
private final Instance instance;
private final HttpClient httpClient = HttpClient.newBuilder()
.connectTimeout(java.time.Duration.ofSeconds(30))
.build();
public ForgeInstaller(Instance instance) {
this.instance = instance;
}
public boolean install(String mcVersion, String forgeVersion) throws Exception {
LauncherLogger.info("Installing Forge " + forgeVersion + " for Minecraft " + mcVersion);
System.out.println(ZAnsi.cyan("Installing Forge " + forgeVersion + " for Minecraft " + mcVersion));
// Step 1: Install vanilla and get real assetIndex
LauncherLogger.info("Installing base Minecraft version " + mcVersion + "...");
System.out.println(ZAnsi.cyan("Installing base Minecraft version " + mcVersion + "..."));
VersionInstaller vanillaInstaller = new VersionInstaller(instance.getPath());
String assetIndex = vanillaInstaller.install(mcVersion);
if (assetIndex == null || assetIndex.isEmpty()) {
LauncherLogger.error("Failed to install base Minecraft version");
System.out.println(ZAnsi.brightRed("Failed to install base Minecraft version"));
return false;
}
@@ -45,21 +53,12 @@ public class ForgeInstaller {
Path installerJar = instance.getPath().resolve("forge-installer.jar");
LauncherLogger.info("Downloading Forge Installer...");
System.out.println(ZAnsi.cyan("Downloading Forge Installer..."));
downloadFileWithProgress(installerUrl, installerJar);
// Step 4: Pre-download the libraries the installer subprocess would fetch from
// maven.minecraftforge.net directly. On blocked networks that subprocess cannot
// reach the maven host, so we seed every library (version.json + install_profile.json)
// through the launcher smart proxy first. The installer reuses files whose checksums
// validate ("File exists: Checksum validated"), so no direct downloads are needed.
LauncherLogger.info("Prefetching Forge libraries via smart proxy...");
int prefetched = ZHttpClient.prefetchInstallerLibraries(installerJar, instance.getPath());
LauncherLogger.info("Prefetched " + prefetched + " Forge libraries");
// Step 5: Run Forge Installer and show its output
LauncherLogger.info("Running Forge Installer...");
LauncherLogger.info("This may take a few minutes. Please wait...");
// Step 4: Run Forge Installer and show its output
System.out.println(ZAnsi.cyan("Running Forge Installer..."));
System.out.println(ZAnsi.yellow("This may take a few minutes. Please wait...\n"));
boolean success = runForgeInstaller(installerJar);
@@ -69,10 +68,10 @@ public class ForgeInstaller {
try {
downloadMissingLibraries(mcVersion, forgeVersion);
} catch (Exception e) {
LauncherLogger.warn("Warning: could not download some libraries: " + e.getMessage());
System.out.println(ZAnsi.yellow("Warning: could not download some libraries: " + e.getMessage()));
}
LauncherLogger.info("\nForge " + forgeVersion + " installed successfully!");
System.out.println(ZAnsi.brightGreen("\nForge " + forgeVersion + " installed successfully!"));
instance.setMinecraftVersion(mcVersion);
instance.setLoaderType("forge");
instance.setLoaderVersion(forgeVersion);
@@ -81,7 +80,7 @@ public class ForgeInstaller {
Files.deleteIfExists(installerJar);
return true;
} else {
LauncherLogger.error("\nError installing Forge!");
System.out.println(ZAnsi.brightRed("\nError installing Forge!"));
return false;
}
}
@@ -97,12 +96,52 @@ public class ForgeInstaller {
}
""";
Files.writeString(profilePath, minimalProfile, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
LauncherLogger.info("Created launcher_profiles.json");
System.out.println(ZAnsi.yellow("Created launcher_profiles.json"));
}
private void downloadFileWithProgress(String url, Path target) throws Exception {
ProgressBar.show("Downloading Forge Installer", 0, 100, "%");
ZHttpClient.downloadFileWithSmartProxy(url, target);
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(url))
.GET()
.build();
HttpResponse<InputStream> response = httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
if (response.statusCode() != 200) {
throw new IOException("HTTP " + response.statusCode());
}
long contentLength = response.headers().firstValueAsLong("Content-Length").orElse(-1);
try (InputStream in = response.body();
FileOutputStream out = new FileOutputStream(target.toFile())) {
byte[] buffer = new byte[8192];
int bytesRead;
long totalRead = 0;
int lastPercent = -1;
while ((bytesRead = in.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
totalRead += bytesRead;
if (contentLength > 0) {
int percent = (int) ((totalRead * 100) / contentLength);
if (percent != lastPercent) {
String downloaded = ProgressBar.formatBytes(totalRead);
String total = ProgressBar.formatBytes(contentLength);
ProgressBar.show("Forge Installer", percent, 100, "% (" + downloaded + "/" + total + ")");
lastPercent = percent;
}
} else {
// If size unknown, show animation
char[] spinner = {'|', '/', '-', '\\'};
int idx = (int) (totalRead / 1024) % 4;
System.out.print("\rDownloading Forge Installer: " + ProgressBar.formatBytes(totalRead) + " " + spinner[idx]);
}
}
}
ProgressBar.finish("Forge Installer (" + ProgressBar.formatBytes(Files.size(target)) + ")");
}
@@ -112,17 +151,10 @@ public class ForgeInstaller {
int attempt = 1;
while (attempt <= maxRetries) {
LauncherLogger.info("Attempt " + attempt + " of " + maxRetries);
// Re-seed libraries each attempt: the installer may have left partial files,
// and prefetch deletes any with a bad checksum before re-downloading via proxy.
int seeded = ZHttpClient.prefetchInstallerLibraries(installerJar, instance.getPath());
if (seeded > 0) {
LauncherLogger.info(" Prefetched " + seeded + " libraries for this attempt");
}
System.out.println(ZAnsi.cyan("Attempt " + attempt + " of " + maxRetries));
ProcessBuilder pb = new ProcessBuilder(
JavaResolver.getJavaExecutable(),
"java",
"-jar",
installerJar.toAbsolutePath().toString(),
"--installClient",
@@ -148,39 +180,23 @@ public class ForgeInstaller {
// Format Forge Installer output
if (line.contains("Downloading") || line.contains("Extracting")) {
LauncherLogger.info(" -> " + line);
System.out.println(ZAnsi.blue(" -> " + line));
} else if (line.contains("SUCCESS") || line.contains("successfully")) {
LauncherLogger.info(" + " + line);
System.out.println(ZAnsi.brightGreen(" + " + line));
} else if (line.contains("WARNING") || line.contains("warning")) {
LauncherLogger.warn(" ! " + line);
System.out.println(ZAnsi.yellow(" ! " + line));
} else if (line.contains("ERROR") || line.contains("error") || line.contains("failed") || line.contains("timed out")) {
LauncherLogger.error(" X " + line);
System.out.println(ZAnsi.brightRed(" X " + line));
if (line.contains("timed out") || line.contains("failed to download")) {
hasErrors = true;
}
} else if (!line.isBlank()) {
LauncherLogger.info(" " + line);
System.out.println(" " + line);
}
}
}
int exitCode;
if (hasErrors) {
process.destroyForcibly();
exitCode = 1;
} else {
if (!process.waitFor(10, TimeUnit.MINUTES)) {
process.destroyForcibly();
LauncherLogger.error("Forge Installer timed out after 10 minutes");
if (attempt < maxRetries) {
attempt++;
Thread.sleep(5000);
continue;
}
return false;
}
exitCode = process.exitValue();
}
int exitCode = process.waitFor();
// If successful or no download errors
if (exitCode == 0 && !hasErrors) {
@@ -189,20 +205,31 @@ public class ForgeInstaller {
// If error and not last attempt
if (attempt < maxRetries) {
LauncherLogger.warn("Install error. Retrying in 5 seconds...");
System.out.println(ZAnsi.yellow("Install error. Retrying in 5 seconds..."));
Thread.sleep(5000);
// Prefetch at the top of the next attempt already re-seeds any library that
// was left partial or corrupted (SHA-1 mismatch -> delete + re-download via proxy).
// Clean temp files before retry
Path librariesDir = instance.getPath().resolve("libraries");
if (Files.exists(librariesDir)) {
// Удаляем только частично скачанные библиотеки Forge
try (var stream = Files.walk(librariesDir)) {
stream.filter(p -> p.toString().contains("asm") && p.toString().endsWith(".jar"))
.forEach(p -> {
try { Files.deleteIfExists(p); }
catch (IOException e) { /* ignore */ }
});
}
}
} else {
LauncherLogger.error("Forge Installer exited with error code: " + exitCode);
System.out.println(ZAnsi.brightRed("Forge Installer exited with error code: " + exitCode));
// Show possible solution
if (output.toString().contains("timed out")) {
LauncherLogger.warn("\nPossible solutions:");
LauncherLogger.warn("1. Check your internet connection");
LauncherLogger.warn("2. Run the launcher as administrator");
LauncherLogger.warn("3. Temporarily disable antivirus/firewall");
LauncherLogger.warn("4. Try installing a different Forge version");
System.out.println(ZAnsi.yellow("\nPossible solutions:"));
System.out.println(ZAnsi.yellow("1. Check your internet connection"));
System.out.println(ZAnsi.yellow("2. Run the launcher as administrator"));
System.out.println(ZAnsi.yellow("3. Temporarily disable antivirus/firewall"));
System.out.println(ZAnsi.yellow("4. Try installing a different Forge version"));
}
}
@@ -213,7 +240,40 @@ public class ForgeInstaller {
}
private void downloadMissingLibraries(String mcVersion, String forgeVersion) throws Exception {
LauncherLogger.info("Checking and downloading missing libraries...");
ZHttpClient.repairMissingLibraries(instance.getPath());
System.out.println(ZAnsi.cyan("Checking and downloading missing libraries..."));
// List of problematic libraries and their alternate URLs
Path librariesDir = instance.getPath().resolve("libraries");
// Map from maven path to list of mirror URLs (tried in order)
Map<String, List<String>> alternativeUrls = new HashMap<>();
alternativeUrls.put("org/ow2/asm/asm/9.6/asm-9.6.jar", Arrays.asList(
"https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6/asm-9.6.jar",
"https://mirrors.huaweicloud.com/repository/maven/org/ow2/asm/asm/9.6/asm-9.6.jar"
));
for (Map.Entry<String, List<String>> entry : alternativeUrls.entrySet()) {
Path target = librariesDir.resolve(entry.getKey());
if (!Files.exists(target)) {
Files.createDirectories(target.getParent());
System.out.println(ZAnsi.yellow("Downloading: " + target.getFileName()));
boolean downloaded = false;
for (String mirrorUrl : entry.getValue()) {
for (int attempt = 1; attempt <= 3; attempt++) {
try {
downloadFileWithProgress(mirrorUrl, target);
downloaded = true;
break;
} catch (Exception e) {
if (attempt == 3 && mirrorUrl.equals(entry.getValue().get(entry.getValue().size() - 1))) throw e;
System.out.println(ZAnsi.yellow("Retry " + attempt + "/3..."));
try { Thread.sleep(2000); } catch (InterruptedException ignored) {}
}
}
if (downloaded) break;
}
}
}
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/installer/ModLoaderInstaller.java
-234
View File
@@ -1,234 +0,0 @@
package me.sashegdev.zernmc.launcher.minecraft.installer;
import me.sashegdev.zernmc.launcher.minecraft.Instance;
import me.sashegdev.zernmc.launcher.utils.JavaResolver;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import me.sashegdev.zernmc.launcher.utils.ProgressBar;
import me.sashegdev.zernmc.launcher.utils.ZHttpClient;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.*;
import java.util.concurrent.TimeUnit;
public class ModLoaderInstaller {
public enum LoaderType {
FORGE("forge", "net.minecraftforge", "forge", "https://maven.minecraftforge.net"),
NEOFORGE("neoforge", "net.neoforged", null, "https://maven.neoforged.net/releases");
final String loaderName;
final String mavenGroup;
final String fixedArtifact;
final String mavenBase;
LoaderType(String loaderName, String mavenGroup, String fixedArtifact, String mavenBase) {
this.loaderName = loaderName;
this.mavenGroup = mavenGroup;
this.fixedArtifact = fixedArtifact;
this.mavenBase = mavenBase;
}
public String artifact(String mcVersion) {
if (this == NEOFORGE && !"1.20.1".equals(mcVersion)) return "neoforge";
return "forge";
}
}
private final Instance instance;
public ModLoaderInstaller(Instance instance) {
this.instance = instance;
}
public boolean install(String mcVersion, String loaderVersion, LoaderType type) throws Exception {
LauncherLogger.info("Installing " + type.loaderName + " " + loaderVersion + " for Minecraft " + mcVersion);
LauncherLogger.info("Installing base Minecraft version " + mcVersion + "...");
VersionInstaller vanillaInstaller = new VersionInstaller(instance.getPath());
String assetIndex = vanillaInstaller.install(mcVersion);
if (assetIndex == null || assetIndex.isEmpty()) {
LauncherLogger.error("Failed to install base Minecraft version");
return false;
}
instance.setAssetIndex(assetIndex);
createLauncherProfile();
ProgressBar.showIndeterminate("Preparing " + type.loaderName + " installer");
String installerUrl = buildInstallerUrl(mcVersion, loaderVersion, type);
String jarName = type.loaderName + "-installer.jar";
Path installerJar = instance.getPath().resolve(jarName);
LauncherLogger.info("Downloading " + type.loaderName + " Installer...");
ProgressBar.showIndeterminate("Downloading " + type.loaderName + " Installer");
ZHttpClient.downloadFileWithSmartProxy(installerUrl, installerJar);
LauncherLogger.info("Running " + type.loaderName + " Installer...");
LauncherLogger.info("This may take a few minutes. Please wait...");
ProgressBar.showIndeterminate("Running " + type.loaderName + " Installer (may take a few minutes)");
boolean success = runInstaller(installerJar, type);
if (success) {
try {
downloadMissingLibraries(type);
} catch (Exception e) {
LauncherLogger.warn("Warning: could not download some libraries: " + e.getMessage());
}
LauncherLogger.info("\n" + type.loaderName + " " + loaderVersion + " installed successfully!");
instance.setMinecraftVersion(mcVersion);
instance.setLoaderType(type.loaderName);
instance.setLoaderVersion(loaderVersion);
Files.deleteIfExists(installerJar);
return true;
} else {
LauncherLogger.error("\nError installing " + type.loaderName + "!");
return false;
}
}
private String buildInstallerUrl(String mcVersion, String loaderVersion, LoaderType type) {
if (type == LoaderType.FORGE) {
return type.mavenBase + "/" + type.mavenGroup.replace('.', '/')
+ "/" + type.fixedArtifact + "/" + mcVersion + "-" + loaderVersion
+ "/" + type.fixedArtifact + "-" + mcVersion + "-" + loaderVersion + "-installer.jar";
}
String artifact = type.artifact(mcVersion);
return type.mavenBase + "/" + type.mavenGroup.replace('.', '/')
+ "/" + artifact + "/" + loaderVersion
+ "/" + artifact + "-" + loaderVersion + "-installer.jar";
}
private void createLauncherProfile() throws IOException {
Path profilePath = instance.getPath().resolve("launcher_profiles.json");
if (Files.exists(profilePath)) return;
String minimalProfile = """
{
"profiles": {},
"selectedProfile": "Default"
}
""";
Files.writeString(profilePath, minimalProfile, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
LauncherLogger.info("Created launcher_profiles.json");
}
private boolean runInstaller(Path installerJar, LoaderType type) throws IOException, InterruptedException {
int maxRetries = 3;
int attempt = 1;
while (attempt <= maxRetries) {
LauncherLogger.info("Attempt " + attempt + " of " + maxRetries);
ProcessBuilder pb = new ProcessBuilder(
JavaResolver.getJavaExecutable(),
"-jar",
installerJar.toAbsolutePath().toString(),
"--installClient",
instance.getPath().toAbsolutePath().toString()
);
pb.environment().put("JAVA_OPTS", "-Dhttp.connectionTimeout=60000 -Dhttp.socketTimeout=60000");
pb.directory(instance.getPath().toFile());
pb.redirectErrorStream(true);
Process process = pb.start();
StringBuilder output = new StringBuilder();
boolean hasErrors = false;
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
String line;
while ((line = reader.readLine()) != null) {
output.append(line).append("\n");
if (line.contains("Downloading") || line.contains("Extracting")
|| line.contains("Installing") || line.contains("Creating")
|| line.contains("SUCCESS") || line.contains("successfully")) {
ProgressBar.showIndeterminate(type.loaderName + " Installer: " + ProgressBar.cleanLine(line));
}
if (line.contains("Downloading") || line.contains("Extracting")) {
LauncherLogger.info(" -> " + line);
} else if (line.contains("SUCCESS") || line.contains("successfully")) {
LauncherLogger.info(" + " + line);
} else if (line.contains("WARNING") || line.contains("warning")) {
LauncherLogger.warn(" ! " + line);
} else if (line.contains("ERROR") || line.contains("error") || line.contains("failed") || line.contains("timed out")) {
LauncherLogger.error(" X " + line);
if (line.contains("timed out") || line.contains("failed to download")) {
hasErrors = true;
}
} else if (!line.isBlank()) {
LauncherLogger.info(" " + line);
}
}
}
int exitCode;
if (hasErrors) {
process.destroyForcibly();
exitCode = 1;
} else {
if (!process.waitFor(10, TimeUnit.MINUTES)) {
process.destroyForcibly();
LauncherLogger.error(type.loaderName + " Installer timed out after 10 minutes");
if (attempt < maxRetries) {
attempt++;
Thread.sleep(5000);
continue;
}
return false;
}
exitCode = process.exitValue();
}
if (exitCode == 0) {
return true;
}
if (attempt < maxRetries) {
LauncherLogger.warn("Install error. Retrying in 5 seconds...");
Thread.sleep(5000);
Path librariesDir = instance.getPath().resolve("libraries");
if (Files.exists(librariesDir)) {
try (var stream = Files.walk(librariesDir)) {
stream.filter(p -> p.toString().contains("asm") && p.toString().endsWith(".jar"))
.forEach(p -> {
try { Files.deleteIfExists(p); }
catch (IOException e) { /* ignore */ }
});
}
}
} else {
LauncherLogger.error(type.loaderName + " Installer exited with error code: " + exitCode);
if (output.toString().contains("timed out")) {
LauncherLogger.warn("\nPossible solutions:");
LauncherLogger.warn("1. Check your internet connection");
LauncherLogger.warn("2. Run the launcher as administrator");
LauncherLogger.warn("3. Temporarily disable antivirus/firewall");
LauncherLogger.warn("4. Try installing a different version");
}
}
attempt++;
}
return false;
}
private void downloadMissingLibraries(LoaderType type) throws Exception {
LauncherLogger.info("Checking and downloading missing libraries...");
ProgressBar.showIndeterminate("Downloading missing libraries");
ZHttpClient.repairMissingLibraries(instance.getPath());
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/installer/NeoForgeInstaller.java
+106 -42
View File
@@ -1,34 +1,40 @@
package me.sashegdev.zernmc.launcher.minecraft.installer;
import me.sashegdev.zernmc.launcher.minecraft.Instance;
import me.sashegdev.zernmc.launcher.utils.JavaResolver;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import me.sashegdev.zernmc.launcher.utils.ProgressBar;
import me.sashegdev.zernmc.launcher.utils.ZHttpClient;
import me.sashegdev.zernmc.launcher.utils.ZAnsi;
import java.io.*;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.concurrent.TimeUnit;
import java.util.HashMap;
import java.util.Map;
public class NeoForgeInstaller {
private final Instance instance;
private final HttpClient httpClient = HttpClient.newBuilder()
.connectTimeout(java.time.Duration.ofSeconds(30))
.build();
public NeoForgeInstaller(Instance instance) {
this.instance = instance;
}
public boolean install(String mcVersion, String neoForgeVersion) throws Exception {
LauncherLogger.info("Installing NeoForge " + neoForgeVersion + " for Minecraft " + mcVersion);
System.out.println(ZAnsi.cyan("Installing NeoForge " + neoForgeVersion + " for Minecraft " + mcVersion));
LauncherLogger.info("Installing base Minecraft version " + mcVersion + "...");
System.out.println(ZAnsi.cyan("Installing base Minecraft version " + mcVersion + "..."));
VersionInstaller vanillaInstaller = new VersionInstaller(instance.getPath());
String assetIndex = vanillaInstaller.install(mcVersion);
if (assetIndex == null || assetIndex.isEmpty()) {
LauncherLogger.error("Failed to install base Minecraft version");
System.out.println(ZAnsi.brightRed("Failed to install base Minecraft version"));
return false;
}
@@ -46,15 +52,11 @@ public class NeoForgeInstaller {
Path installerJar = instance.getPath().resolve("neoforge-installer.jar");
LauncherLogger.info("Downloading NeoForge Installer...");
System.out.println(ZAnsi.cyan("Downloading NeoForge Installer..."));
downloadFileWithProgress(installerUrl, installerJar);
LauncherLogger.info("Prefetching NeoForge libraries via smart proxy...");
int prefetched = ZHttpClient.prefetchInstallerLibraries(installerJar, instance.getPath());
LauncherLogger.info("Prefetched " + prefetched + " NeoForge libraries");
LauncherLogger.info("Running NeoForge Installer...");
LauncherLogger.info("This may take a few minutes. Please wait...");
System.out.println(ZAnsi.cyan("Running NeoForge Installer..."));
System.out.println(ZAnsi.yellow("This may take a few minutes. Please wait...\n"));
boolean success = runNeoForgeInstaller(installerJar);
@@ -62,10 +64,10 @@ public class NeoForgeInstaller {
try {
downloadMissingLibraries(mcVersion, neoForgeVersion, mavenGroup, mavenArtifact);
} catch (Exception e) {
LauncherLogger.warn("Warning: could not download some libraries: " + e.getMessage());
System.out.println(ZAnsi.yellow("Warning: could not download some libraries: " + e.getMessage()));
}
LauncherLogger.info("\nNeoForge " + neoForgeVersion + " installed successfully!");
System.out.println(ZAnsi.brightGreen("\nNeoForge " + neoForgeVersion + " installed successfully!"));
instance.setMinecraftVersion(mcVersion);
instance.setLoaderType("neoforge");
instance.setLoaderVersion(neoForgeVersion);
@@ -73,7 +75,7 @@ public class NeoForgeInstaller {
Files.deleteIfExists(installerJar);
return true;
} else {
LauncherLogger.error("\nError installing NeoForge!");
System.out.println(ZAnsi.brightRed("\nError installing NeoForge!"));
return false;
}
}
@@ -103,12 +105,51 @@ public class NeoForgeInstaller {
}
""";
Files.writeString(profilePath, minimalProfile, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
LauncherLogger.info("Created launcher_profiles.json");
System.out.println(ZAnsi.yellow("Created launcher_profiles.json"));
}
private void downloadFileWithProgress(String url, Path target) throws Exception {
ProgressBar.show("Downloading NeoForge Installer", 0, 100, "%");
ZHttpClient.downloadFileWithSmartProxy(url, target);
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(url))
.GET()
.build();
HttpResponse<InputStream> response = httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
if (response.statusCode() != 200) {
throw new IOException("HTTP " + response.statusCode());
}
long contentLength = response.headers().firstValueAsLong("Content-Length").orElse(-1);
try (InputStream in = response.body();
FileOutputStream out = new FileOutputStream(target.toFile())) {
byte[] buffer = new byte[8192];
int bytesRead;
long totalRead = 0;
int lastPercent = -1;
while ((bytesRead = in.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
totalRead += bytesRead;
if (contentLength > 0) {
int percent = (int) ((totalRead * 100) / contentLength);
if (percent != lastPercent) {
String downloaded = ProgressBar.formatBytes(totalRead);
String total = ProgressBar.formatBytes(contentLength);
ProgressBar.show("NeoForge Installer", percent, 100, "% (" + downloaded + "/" + total + ")");
lastPercent = percent;
}
} else {
char[] spinner = {'|', '/', '-', '\\'};
int idx = (int) (totalRead / 1024) % 4;
System.out.print("\rDownloading NeoForge Installer: " + ProgressBar.formatBytes(totalRead) + " " + spinner[idx]);
}
}
}
ProgressBar.finish("NeoForge Installer (" + ProgressBar.formatBytes(Files.size(target)) + ")");
}
@@ -117,10 +158,10 @@ public class NeoForgeInstaller {
int attempt = 1;
while (attempt <= maxRetries) {
LauncherLogger.info("Attempt " + attempt + " of " + maxRetries);
System.out.println(ZAnsi.cyan("Attempt " + attempt + " of " + maxRetries));
ProcessBuilder pb = new ProcessBuilder(
JavaResolver.getJavaExecutable(),
"java",
"-jar",
installerJar.toAbsolutePath().toString(),
"--installClient",
@@ -142,35 +183,30 @@ public class NeoForgeInstaller {
output.append(line).append("\n");
if (line.contains("Downloading") || line.contains("Extracting")) {
LauncherLogger.info(" -> " + line);
System.out.println(ZAnsi.blue(" -> " + line));
} else if (line.contains("SUCCESS") || line.contains("successfully")) {
LauncherLogger.info(" + " + line);
System.out.println(ZAnsi.brightGreen(" + " + line));
} else if (line.contains("WARNING") || line.contains("warning")) {
LauncherLogger.warn(" ! " + line);
System.out.println(ZAnsi.yellow(" ! " + line));
} else if (line.contains("ERROR") || line.contains("error") || line.contains("failed") || line.contains("timed out")) {
LauncherLogger.error(" X " + line);
System.out.println(ZAnsi.brightRed(" X " + line));
if (line.contains("timed out") || line.contains("failed to download")) {
hasErrors = true;
}
} else if (!line.isBlank()) {
LauncherLogger.info(" " + line);
System.out.println(" " + line);
}
}
}
if (!process.waitFor(10, TimeUnit.MINUTES)) {
process.destroyForcibly();
LauncherLogger.error("NeoForge Installer timed out after 10 minutes");
return false;
}
int exitCode = process.exitValue();
int exitCode = process.waitFor();
if (exitCode == 0 && !hasErrors) {
return true;
}
if (attempt < maxRetries) {
LauncherLogger.warn("Install error. Retrying in 5 seconds...");
System.out.println(ZAnsi.yellow("Install error. Retrying in 5 seconds..."));
Thread.sleep(5000);
Path librariesDir = instance.getPath().resolve("libraries");
@@ -184,14 +220,14 @@ public class NeoForgeInstaller {
}
}
} else {
LauncherLogger.error("NeoForge Installer exited with error code: " + exitCode);
System.out.println(ZAnsi.brightRed("NeoForge Installer exited with error code: " + exitCode));
if (output.toString().contains("timed out")) {
LauncherLogger.warn("\nPossible solutions:");
LauncherLogger.warn("1. Check your internet connection");
LauncherLogger.warn("2. Run the launcher as administrator");
LauncherLogger.warn("3. Temporarily disable antivirus/firewall");
LauncherLogger.warn("4. Try installing a different NeoForge version");
System.out.println(ZAnsi.yellow("\nPossible solutions:"));
System.out.println(ZAnsi.yellow("1. Check your internet connection"));
System.out.println(ZAnsi.yellow("2. Run the launcher as administrator"));
System.out.println(ZAnsi.yellow("3. Temporarily disable antivirus/firewall"));
System.out.println(ZAnsi.yellow("4. Try installing a different NeoForge version"));
}
}
@@ -202,7 +238,35 @@ public class NeoForgeInstaller {
}
private void downloadMissingLibraries(String mcVersion, String neoForgeVersion, String mavenGroup, String mavenArtifact) throws Exception {
LauncherLogger.info("Checking and downloading missing libraries...");
ZHttpClient.repairMissingLibraries(instance.getPath());
System.out.println(ZAnsi.cyan("Checking and downloading missing libraries..."));
Map<String, String> alternativeUrls = new HashMap<>();
alternativeUrls.put("org/ow2/asm/asm/9.6/asm-9.6.jar",
"https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6/asm-9.6.jar");
alternativeUrls.put("org/ow2/asm/asm-commons/9.6/asm-commons-9.6.jar",
"https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6/asm-commons-9.6.jar");
alternativeUrls.put("org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar",
"https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar");
Path librariesDir = instance.getPath().resolve("libraries");
for (Map.Entry<String, String> entry : alternativeUrls.entrySet()) {
Path target = librariesDir.resolve(entry.getKey());
if (!Files.exists(target)) {
Files.createDirectories(target.getParent());
System.out.println(ZAnsi.yellow("Downloading: " + target.getFileName()));
for (int attempt = 1; attempt <= 3; attempt++) {
try {
downloadFileWithProgress(entry.getValue(), target);
break;
} catch (Exception e) {
if (attempt == 3) throw e;
System.out.println(ZAnsi.yellow("Retry " + attempt + "/3..."));
Thread.sleep(2000);
}
}
}
}
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/installer/VersionInstaller.java
+93 -127
View File
@@ -1,43 +1,46 @@
package me.sashegdev.zernmc.launcher.minecraft.installer;
import me.sashegdev.zernmc.launcher.minecraft.model.MinecraftVersion;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import me.sashegdev.zernmc.launcher.utils.ProgressBar;
import me.sashegdev.zernmc.launcher.utils.ZAnsi;
import me.sashegdev.zernmc.launcher.utils.ZHttpClient;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.InputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
public class VersionInstaller {
private final Path minecraftDir;
private final HttpClient httpClient;
private final ExecutorService executor = Executors.newFixedThreadPool(32);
public VersionInstaller(Path minecraftDir) {
this.minecraftDir = minecraftDir;
this.httpClient = HttpClient.newBuilder()
.connectTimeout(Duration.ofSeconds(15))
.build();
}
public List<MinecraftVersion> getAvailableVersions() throws Exception {
// Prefers Zern server Mojang proxy (reachable + cached), falls back to direct piston-meta
JSONObject root = ZHttpClient.getMojangVersionManifest();
String jsonString = downloadString("https://piston-meta.mojang.com/mc/game/version_manifest_v2.json");
JSONObject root = new JSONObject(jsonString);
JSONArray versionsArray = root.getJSONArray("versions");
List<MinecraftVersion> versions = new ArrayList<>();
@@ -58,78 +61,35 @@ public class VersionInstaller {
}
public String install(String versionId) throws Exception {
LauncherLogger.info("Full install of Minecraft " + versionId + "...");
System.out.println(ZAnsi.cyan("Full install of Minecraft " + versionId + "..."));
ProgressBar.setStage("Version", 0, 5);
Path versionDir = minecraftDir.resolve("versions").resolve(versionId);
Files.createDirectories(versionDir);
boolean alreadyInstalled = Files.exists(versionDir.resolve(versionId + ".json"))
&& Files.exists(versionDir.resolve(versionId + ".jar"))
&& isValidJar(versionDir.resolve(versionId + ".jar"));
if (alreadyInstalled) {
LauncherLogger.info("Minecraft " + versionId + " already installed, skipping");
String existing = Files.readString(versionDir.resolve(versionId + ".json"));
JSONObject existingData = new JSONObject(existing);
return existingData.has("assetIndex")
? existingData.getJSONObject("assetIndex").getString("id")
: existingData.getString("assets");
}
// A stale/partial client.jar (e.g. aborted by the download timeout) must be
// removed, otherwise it would be skipped as "already installed" and stay corrupt.
try {
Files.deleteIfExists(versionDir.resolve(versionId + ".jar"));
} catch (IOException e) {
LauncherLogger.warn("Could not remove stale client.jar: " + e.getMessage());
}
String versionUrl = getVersionUrl(versionId);
if (versionUrl == null) throw new Exception("Version " + versionId + " not found");
ProgressBar.show("Fetching version info", 0, 1, "files");
String versionJson;
try {
// Prefers Zern server Mojang proxy, falls back to direct piston-meta
LauncherLogger.info("[VERSION] Fetching version json for " + versionId + " (server proxy, then direct piston-meta)");
versionJson = ZHttpClient.getMojangVersionJson(versionId).toString();
LauncherLogger.info("[VERSION] Version json fetched for " + versionId);
} catch (Exception e) {
LauncherLogger.error("[VERSION] Failed to fetch version info: " + e.getMessage());
throw e;
}
try {
Files.writeString(versionDir.resolve(versionId + ".json"), versionJson);
} catch (Exception e) {
LauncherLogger.error("[VERSION] Failed to write version info: " + e.getMessage());
throw e;
}
String versionJson = downloadString(versionUrl);
Files.writeString(versionDir.resolve(versionId + ".json"), versionJson);
ProgressBar.show("Version info", 1, 1, "files");
JSONObject versionData = new JSONObject(versionJson);
// client.jar
ProgressBar.show("Downloading client.jar", 0, 1, "files");
LauncherLogger.info("[VERSION] Downloading client.jar for " + versionId + "...");
Path clientJar = versionDir.resolve(versionId + ".jar");
if (!Files.exists(clientJar)) {
try {
ZHttpClient.downloadFileWithSmartProxy(
versionData.getJSONObject("downloads").getJSONObject("client").getString("url"),
clientJar);
LauncherLogger.info("[VERSION] client.jar downloaded for " + versionId);
} catch (Exception e) {
LauncherLogger.error("[VERSION] Failed to download client.jar: " + e.getMessage());
throw e;
}
} else {
LauncherLogger.info("[VERSION] client.jar already present for " + versionId);
}
downloadFile(versionData.getJSONObject("downloads").getJSONObject("client").getString("url"),
versionDir.resolve(versionId + ".jar"), "client.jar");
ProgressBar.show("Client.jar", 1, 1, "files");
// Libraries
ProgressBar.setStage("Libraries", 1, 5);
LauncherLogger.info("Downloading libraries...");
System.out.println(ZAnsi.cyan("Downloading libraries..."));
downloadLibraries(versionData.getJSONArray("libraries"));
// Natives
ProgressBar.setStage("Natives", 2, 5);
LauncherLogger.info("Extracting natives...");
System.out.println(ZAnsi.cyan("Extracting natives..."));
extractNatives(versionData.getJSONArray("libraries"));
String assetIndex;
@@ -139,15 +99,15 @@ public class VersionInstaller {
assetIndex = versionData.getString("assets");
}
LauncherLogger.info("Asset index: " + assetIndex);
System.out.println(ZAnsi.cyan("Asset index: " + assetIndex));
// Download assets using correct index
ProgressBar.setStage("Assets", 3, 5);
LauncherLogger.info("Downloading assets...");
System.out.println(ZAnsi.cyan("Downloading assets..."));
downloadAssets(versionData, assetIndex);
ProgressBar.setStage("Done", 4, 5);
LauncherLogger.info("\nMinecraft " + versionId + " fully installed!");
System.out.println(ZAnsi.brightGreen("\nMinecraft " + versionId + " fully installed!"));
return assetIndex;
}
@@ -187,7 +147,7 @@ public class VersionInstaller {
if (!Files.exists(libJar)) {
try {
Files.createDirectories(libJar.getParent());
ZHttpClient.downloadFileWithSmartProxy(url, libJar);
downloadFile(url, libJar, "");
} catch (Exception e) {
failed++;
continue;
@@ -220,7 +180,7 @@ public class VersionInstaller {
if (extracted > 0) {
ProgressBar.finish("Natives extracted (" + extracted + " ok, " + failed + " failed)");
} else {
LauncherLogger.warn("No natives to extract for " + classifier);
System.out.println(ZAnsi.yellow("No natives to extract for " + classifier));
}
}
@@ -238,16 +198,10 @@ public class VersionInstaller {
Path target = minecraftDir.resolve("libraries").resolve(path);
Files.createDirectories(target.getParent());
if (Files.exists(target)) {
count++;
ProgressBar.show("Libraries", count, total, "files");
continue;
}
try {
ZHttpClient.downloadFileWithSmartProxy(url, target);
downloadFile(url, target, "library");
} catch (Exception e) {
LauncherLogger.warn("[LIB] Failed to download " + path + ": " + e.getMessage());
// Skip problematic libraries
}
}
count++;
@@ -265,18 +219,14 @@ public class VersionInstaller {
Files.createDirectories(indexesDir);
Path indexPath = indexesDir.resolve(assetIndex + ".json");
if (!Files.exists(indexPath)) {
LauncherLogger.info("Downloading asset index (" + assetIndex + ")...");
ZHttpClient.downloadFileWithSmartProxy(indexUrl, indexPath);
} else {
LauncherLogger.info("Asset index already present (" + assetIndex + ")");
}
System.out.println(ZAnsi.cyan("Downloading asset index (" + assetIndex + ")..."));
downloadFile(indexUrl, indexPath, "asset index");
String jsonContent = Files.readString(indexPath);
JSONObject root = new JSONObject(jsonContent);
JSONObject objects = root.getJSONObject("objects");
LauncherLogger.info("Downloading " + objects.length() + " asset objects (index: " + assetIndex + ")...");
System.out.println(ZAnsi.cyan("Downloading " + objects.length() + " asset objects (index: " + assetIndex + ")..."));
int total = objects.length();
int[] success = {0};
@@ -296,32 +246,23 @@ public class VersionInstaller {
Files.createDirectories(target.getParent());
CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
try {
if (Files.exists(target) && Files.size(target) > 0) {
synchronized (this) {
success[0]++;
ProgressBar.show("Assets", success[0], total, "files");
}
return;
}
} catch (IOException ignored) {}
boolean downloaded = false;
for (int attempt = 1; attempt <= 3; attempt++) {
try {
ZHttpClient.downloadFileWithSmartProxy(url, target);
synchronized (this) {
success[0]++;
ProgressBar.show("Assets", success[0], total, "files");
}
downloaded = true;
break;
} catch (Exception e) {
if (attempt == 3) {
downloadFile(url, target, "");
synchronized (this) {
failed[0]++;
success[0]++;
ProgressBar.show("Assets", success[0], total, "files");
}
LauncherLogger.error("[VERSION] Failed to download asset " + hash);
} else {
downloaded = true;
break;
} catch (Exception e) {
if (attempt == 3) {
synchronized (this) {
failed[0]++;
}
System.err.println("Failed to download " + hash);
} else {
try { Thread.sleep(500 * attempt); } catch (InterruptedException ignored) {}
}
}
@@ -331,40 +272,65 @@ public class VersionInstaller {
futures.add(future);
}
try {
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
.get(10, TimeUnit.MINUTES);
} catch (TimeoutException e) {
futures.forEach(f -> f.cancel(true));
LauncherLogger.error("[VERSION] Asset download timed out after 10 minutes");
} catch (CancellationException e) {
// one of the futures was cancelled
} catch (CompletionException e) {
// one of the futures failed exceptionally
}
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
executor.shutdown();
ProgressBar.finish("Assets downloaded (" + success[0] + " ok, " + failed[0] + " skipped)");
if (failed[0] > 0) {
LauncherLogger.warn("Warning: " + failed[0] + " asset files could not be downloaded.");
LauncherLogger.warn("The game will launch, but some textures/sounds may be missing.");
}
}
private boolean isValidJar(Path path) {
try (java.util.zip.ZipFile zf = new java.util.zip.ZipFile(path.toFile())) {
return true;
} catch (Exception e) {
return false;
System.out.println(ZAnsi.yellow("Warning: " + failed[0] + " asset files could not be downloaded."));
System.out.println(ZAnsi.yellow("The game will launch, but some textures/sounds may be missing."));
}
}
public String getAssetIndexId(String versionId) throws Exception {
JSONObject versionData = ZHttpClient.getMojangVersionJson(versionId);
String versionUrl = getVersionUrl(versionId);
if (versionUrl == null) throw new Exception("Version not found");
String versionJson = downloadString(versionUrl);
JSONObject versionData = new JSONObject(versionJson);
if (versionData.has("assetIndex") && versionData.getJSONObject("assetIndex").has("id")) {
return versionData.getJSONObject("assetIndex").getString("id");
return versionData.getJSONObject("assetIndex").getString("id"); // "5" для 1.20.1
}
return versionData.getString("assets");
return versionData.getString("assets"); // fallback (very old versions)
}
}
private String getVersionUrl(String versionId) throws Exception {
for (MinecraftVersion v : getAvailableVersions()) {
if (v.getId().equals(versionId)) return v.getUrl();
}
return null;
}
private String downloadString(String url) throws Exception {
HttpRequest req = HttpRequest.newBuilder().uri(URI.create(url)).GET().build();
HttpResponse<String> resp = httpClient.send(req, HttpResponse.BodyHandlers.ofString());
if (resp.statusCode() != 200) throw new IOException("HTTP " + resp.statusCode());
return resp.body();
}
private void downloadFile(String url, Path target, String label) throws Exception {
if (!label.isEmpty()) {
ProgressBar.clearLine();
System.out.println(ZAnsi.cyan("Downloading " + label + "..."));
}
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(url))
.GET()
.build();
HttpResponse<Path> response = httpClient.send(request, HttpResponse.BodyHandlers.ofFile(target));
if (response.statusCode() != 200) {
if (label.isEmpty()) return; // for assets silently
throw new IOException("HTTP " + response.statusCode() + " while downloading " + label);
}
if (!label.isEmpty()) {
long size = Files.size(target);
ProgressBar.finish(label + " (" + ProgressBar.formatBytes(size) + ")");
}
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/launch/LaunchCommandBuilder.java
+83 -143
View File
@@ -2,7 +2,6 @@ package me.sashegdev.zernmc.launcher.minecraft.launch;
import me.sashegdev.zernmc.launcher.minecraft.Instance;
import me.sashegdev.zernmc.launcher.minecraft.model.LaunchOptions;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import me.sashegdev.zernmc.launcher.utils.ZAnsi;
import org.json.JSONObject;
@@ -37,7 +36,7 @@ public class LaunchCommandBuilder {
}
public List<String> build(LaunchOptions options) throws Exception {
LauncherLogger.info(ZAnsi.cyan("Generating launch command for " + instance.getName() + "..."));
System.out.println(ZAnsi.cyan("Generating launch command for " + instance.getName() + "..."));
List<String> command = new ArrayList<>();
@@ -58,49 +57,51 @@ public class LaunchCommandBuilder {
// with placeholder substitution. Do NOT manually add -p, -cp,
// --add-modules, --add-opens, or -DignoreList. The version.json
// defines all of these. This matches AstralRinth's approach.
LauncherLogger.info(ZAnsi.cyan(" Forge/NeoForge: using version.json args with placeholder substitution"));
System.out.println(ZAnsi.cyan(" Forge/NeoForge: using version.json args with placeholder substitution"));
// Ensure version jar exists at versions/<versionId>/<versionId>.jar
// so securejarhandler creates module "minecraft" (from Automatic-Module-Name)
// instead of "_1._20._1" (automatic module from filename 1.20.1.jar).
ensureVersionJarForForge();
// Parse version.json JVM args (child only) and game args (merged with parent).
// Forge/NeoForge defines its own -p, --add-modules, --add-opens.
// -Djava.library.path is NOT in child args, so it's added manually below.
List<String> allJvmArgs = manifest != null ? manifest.getJvmArguments() : new ArrayList<>();
List<String> allGameArgs = manifest != null ? manifest.getAllGameArguments() : new ArrayList<>();
// Build variable map for placeholder substitution (${library_directory},
// ${classpath_separator}, ${version_name}, ${natives_directory}, ...)
Map<String, String> vars = buildVariableMap(options);
// Real Forge/NeoForge version.json (1.17+ / 47.x) declares a fixed -p
// module path of bootstrap jars and references ${library_directory} /
// ${classpath_separator} / ${version_name} — but it does NOT reference
// ${classpath} and does NOT contain -cp. To let the JVM find
// cpw.mods.bootstraplauncher.BootstrapLauncher we must supply -cp
// ourselves (version jar + all libraries, exactly like the official
// launcher). If a version.json DOES reference ${classpath}, we substitute
// the same full classpath into it first.
String fullClasspath;
// Build classpath from manifest libraries + client jar
String classpath;
if (manifest != null) {
fullClasspath = buildClasspathFromManifest(manifest, true);
classpath = buildClasspathFromManifest(manifest, false);
} else {
fullClasspath = buildVanillaClasspath();
classpath = "";
}
boolean referencesClasspath = referencesClasspath(allJvmArgs) || referencesClasspath(allGameArgs);
if (referencesClasspath) {
vars.put("classpath", writeClasspathFile(fullClasspath));
LauncherLogger.info(ZAnsi.green(" ${classpath} referenced, substituted full classpath"));
// Add client jar to classpath (first position)
Path clientJar = findVersionJar();
if (clientJar != null && isValidJar(clientJar)) {
String sep = System.getProperty("os.name").toLowerCase().contains("win") ? ";" : ":";
classpath = clientJar.toAbsolutePath().toString() + (classpath.isEmpty() ? "" : sep + classpath);
System.out.println(ZAnsi.green(" Added client jar: " + clientJar.getFileName()));
} else {
LauncherLogger.info(ZAnsi.cyan(" ${classpath} not referenced by version.json, not substituting"));
System.out.println(ZAnsi.yellow(" Client jar not found, falling back to vanilla classpath"));
classpath = buildVanillaClasspath();
}
boolean hasCpInJson = containsCpArg(allJvmArgs);
boolean hasLibraryPathInJson = containsLibraryPathArg(allJvmArgs);
String cpFile = writeClasspathFile(classpath);
// DEBUG: print classpath entries to identify split-package sources
String sep = System.getProperty("os.name").toLowerCase().contains("win") ? ";" : ":";
System.out.println(ZAnsi.cyan(" === CLASSPATH ENTRIES (" + classpath.split(sep.replace("\\","\\\\")).length + " jars) ==="));
for (String entry : classpath.split(sep.replace("\\","\\\\"))) {
String fileName = entry.contains("/") ? entry.substring(entry.lastIndexOf('/') + 1) : entry.substring(entry.lastIndexOf('\\') + 1);
System.out.println(ZAnsi.cyan(" CP: " + fileName));
}
System.out.println(ZAnsi.cyan(" === END CLASSPATH ==="));
// Build variable map for placeholder substitution
Map<String, String> vars = buildVariableMap(options);
vars.put("classpath", cpFile);
// Parse ALL version.json JVM args (merged with parent) with placeholder
// substitution. This includes -Djava.library.path, -cp, --add-modules,
// --add-opens, etc. — everything the launcher needs.
List<String> allJvmArgs = manifest != null ? manifest.getAllJvmArguments() : new ArrayList<>();
if (!allJvmArgs.isEmpty()) {
for (String arg : allJvmArgs) {
String resolved = resolveVariable(arg, vars);
@@ -108,46 +109,31 @@ public class LaunchCommandBuilder {
command.add(resolved);
}
}
LauncherLogger.info(ZAnsi.green(" Using " + allJvmArgs.size() + " JVM args from version.json"));
System.out.println(ZAnsi.green(" Using " + allJvmArgs.size() + " JVM args from version.json"));
} else {
LauncherLogger.info(ZAnsi.yellow(" WARNING: No JVM args in version.json, using manual fallback"));
System.out.println(ZAnsi.yellow(" WARNING: No JVM args in version.json, using manual fallback"));
command.addAll(getJvmArguments(options));
}
// Forge/NeoForge child version.json usually doesn't include
// -Djava.library.path (47.3.0 doesn't) — add it unless already present.
if (!hasLibraryPathInJson) {
command.add("-Djava.library.path=" + nativesDir.toAbsolutePath());
command.add("-cp");
command.add(cpFile);
}
// Append memory/GC args (always after version.json args, like AstralRinth) — skip if systemBasedJvm adds its own GC (ZGC/G1)
boolean useSystemGc = me.sashegdev.zernmc.launcher.utils.Config.isSystemBasedJvm();
// Append memory/GC args (always after version.json args, like AstralRinth)
int ramMB = options.getMaxMemory() > 0 ? options.getMaxMemory() : 4096;
command.add("-Xmx" + ramMB + "M");
command.add("-Xms" + Math.max(512, ramMB / 2) + "M");
if (!useSystemGc) {
command.add("-XX:+UseG1GC");
command.add("-XX:+UnlockExperimentalVMOptions");
command.add("-XX:G1NewSizePercent=20");
command.add("-XX:G1ReservePercent=20");
command.add("-XX:MaxGCPauseMillis=50");
command.add("-XX:G1HeapRegionSize=32M");
}
command.add("-XX:+UseG1GC");
command.add("-XX:+UnlockExperimentalVMOptions");
command.add("-XX:G1NewSizePercent=20");
command.add("-XX:G1ReservePercent=20");
command.add("-XX:MaxGCPauseMillis=50");
command.add("-XX:G1HeapRegionSize=32M");
// Append custom user JVM args
if (options.getExtraJvmArgs() != null && !options.getExtraJvmArgs().isEmpty()) {
command.addAll(options.getExtraJvmArgs());
}
// Real Forge/NeoForge version.json has no -cp, so the JVM would not find the
// main class. Add -cp with version jar + all libraries (official-launcher
// behaviour); skip only if the version.json itself declares -cp.
if (!hasCpInJson) {
command.add("-cp");
command.add(writeClasspathFile(fullClasspath));
LauncherLogger.info(ZAnsi.green(" Added -cp classpath for main class lookup"));
}
// Main class from version.json
String mainClass = null;
if (manifest != null) {
@@ -155,15 +141,16 @@ public class LaunchCommandBuilder {
}
if (mainClass == null || mainClass.isEmpty()) {
mainClass = "cpw.mods.bootstraplauncher.BootstrapLauncher";
LauncherLogger.info(ZAnsi.yellow(" Using fallback main class: " + mainClass));
System.out.println(ZAnsi.yellow(" Using fallback main class: " + mainClass));
} else {
LauncherLogger.info(ZAnsi.green(" Main class from manifest: " + mainClass));
System.out.println(ZAnsi.green(" Main class from manifest: " + mainClass));
}
command.add(mainClass);
// Parse version.json game args (merged with parent) with placeholder
// substitution. Parent provides --username, --version, etc.;
// child provides --launchTarget, --fml.*.
// Parse ALL version.json game args (merged with parent) with placeholder
// substitution. This includes --launchTarget, --fml.forgeVersion,
// --fml.mcVersion, --version, --gameDir, --assetsDir, etc.
List<String> allGameArgs = manifest != null ? manifest.getAllGameArguments() : new ArrayList<>();
if (!allGameArgs.isEmpty()) {
for (String arg : allGameArgs) {
String resolved = resolveVariable(arg, vars);
@@ -171,9 +158,9 @@ public class LaunchCommandBuilder {
command.add(resolved);
}
}
LauncherLogger.info(ZAnsi.green(" Using " + allGameArgs.size() + " game args from version.json"));
System.out.println(ZAnsi.green(" Using " + allGameArgs.size() + " game args from version.json"));
} else {
LauncherLogger.info(ZAnsi.yellow(" WARNING: No game args in version.json, using manual fallback"));
System.out.println(ZAnsi.yellow(" WARNING: No game args in version.json, using manual fallback"));
command.addAll(getVanillaGameArguments(options));
command.addAll(getModloaderLaunchArgs());
}
@@ -187,24 +174,24 @@ public class LaunchCommandBuilder {
command.add("-Djava.library.path=" + nativesDir.toAbsolutePath());
if ("fabric".equals(loaderType)) {
LauncherLogger.info(ZAnsi.cyan(" Fabric: using vanilla classpath"));
System.out.println(ZAnsi.cyan(" Fabric: using vanilla classpath"));
command.add("-cp");
command.add(writeClasspathFile(buildVanillaClasspath()));
String mainClass = null;
if (manifest != null) {
mainClass = manifest.getMainClass();
LauncherLogger.info(ZAnsi.cyan(" Main class from manifest: " + mainClass));
System.out.println(ZAnsi.cyan(" Main class from manifest: " + mainClass));
}
if (mainClass == null || mainClass.isEmpty()) {
mainClass = getVanillaMainClass();
LauncherLogger.info(ZAnsi.yellow(" Using fallback main class: " + mainClass));
System.out.println(ZAnsi.yellow(" Using fallback main class: " + mainClass));
}
command.add(mainClass);
command.addAll(getVanillaGameArguments(options));
} else if (manifest != null) {
String classpath = buildClasspathFromManifest(manifest, true);
if (classpath.isEmpty()) {
LauncherLogger.info(ZAnsi.yellow(" manifest classpath empty, using vanilla classpath"));
System.out.println(ZAnsi.yellow(" manifest classpath empty, using vanilla classpath"));
command.add("-cp");
command.add(writeClasspathFile(buildVanillaClasspath()));
command.add(getVanillaMainClass());
@@ -233,20 +220,20 @@ public class LaunchCommandBuilder {
if (versionJson != null && Files.exists(versionJson)) {
String content = Files.readString(versionJson);
JSONObject json = new JSONObject(content);
LauncherLogger.info(ZAnsi.green("Found version.json: " + versionJson.getFileName()));
System.out.println(ZAnsi.green("Found version.json: " + versionJson.getFileName()));
VersionManifest manifest = new VersionManifest(json);
manifest.resolveParent(instance.getPath().resolve("versions"));
if (manifest.getInheritsFrom() != null) {
LauncherLogger.info(ZAnsi.cyan(" inheritsFrom: " + manifest.getInheritsFrom()));
System.out.println(ZAnsi.cyan(" inheritsFrom: " + manifest.getInheritsFrom()));
}
return manifest;
} else {
LauncherLogger.info(ZAnsi.yellow("version.json not found for " + instance.getName()));
LauncherLogger.info(ZAnsi.yellow(" loaderType=" + instance.getLoaderType() + " mcVersion=" + instance.getMinecraftVersion() + " loaderVersion=" + instance.getLoaderVersion()));
LauncherLogger.info(ZAnsi.yellow(" path=" + instance.getPath()));
System.out.println(ZAnsi.yellow("version.json not found for " + instance.getName()));
System.out.println(ZAnsi.yellow(" loaderType=" + instance.getLoaderType() + " mcVersion=" + instance.getMinecraftVersion() + " loaderVersion=" + instance.getLoaderVersion()));
System.out.println(ZAnsi.yellow(" path=" + instance.getPath()));
}
} catch (Exception e) {
LauncherLogger.info(ZAnsi.yellow("Failed to load version.json: " + e.getMessage()));
System.out.println(ZAnsi.yellow("Failed to load version.json: " + e.getMessage()));
}
return null;
}
@@ -500,32 +487,9 @@ public class LaunchCommandBuilder {
String assetIndex = instance.getAssetIndex();
if (assetIndex == null || assetIndex.isEmpty()) {
assetIndex = instance.getMinecraftVersion();
LauncherLogger.info(ZAnsi.yellow("Asset index not found, using version: " + assetIndex));
System.out.println(ZAnsi.yellow("Asset index not found, using version: " + assetIndex));
} else {
// Validate that the index file exists. A wrong/stale asset index
// (e.g. the Zern-OBT "1.20.1" bug, real index is "5") makes the game
// fail to load the base resource pack (grey panorama, no sounds).
Path indexPath = instance.getPath().resolve("assets").resolve("indexes").resolve(assetIndex + ".json");
if (!Files.exists(indexPath)) {
LauncherLogger.info(ZAnsi.yellow("Asset index file missing: " + assetIndex + ".json, searching for existing index..."));
try (java.util.stream.Stream<Path> stream = Files.list(instance.getPath().resolve("assets").resolve("indexes"))) {
java.util.List<Path> existing = stream
.filter(p -> p.getFileName().toString().endsWith(".json"))
.sorted()
.collect(java.util.stream.Collectors.toList());
if (!existing.isEmpty()) {
String found = existing.get(existing.size() - 1).getFileName().toString()
.replace(".json", "");
LauncherLogger.info(ZAnsi.green("Using existing asset index: " + found + " (was " + assetIndex + ")"));
assetIndex = found;
} else {
LauncherLogger.info(ZAnsi.yellow("No asset index files found in assets/indexes/"));
}
} catch (Exception e) {
LauncherLogger.info(ZAnsi.yellow("Failed to search asset indexes: " + e.getMessage()));
}
}
LauncherLogger.info(ZAnsi.green("Using asset index: " + assetIndex));
System.out.println(ZAnsi.green("Using asset index: " + assetIndex));
}
args.add(assetIndex);
args.add("--username");
@@ -548,7 +512,7 @@ public class LaunchCommandBuilder {
Path nativesDir = gameDir.resolve("natives");
Path librariesDir = gameDir.resolve("libraries");
vars.put("version_name", getVersionId());
vars.put("version_name", instance.getName());
vars.put("game_directory", gameDir.toString());
vars.put("assets_root", assetsDir.toString());
vars.put("assets_index_name", instance.getAssetIndex() != null ? instance.getAssetIndex() : instance.getMinecraftVersion());
@@ -588,35 +552,11 @@ public class LaunchCommandBuilder {
return result;
}
private boolean referencesClasspath(List<String> args) {
if (args == null) return false;
for (String arg : args) {
if (arg != null && arg.contains("${classpath}")) return true;
}
return false;
}
private boolean containsCpArg(List<String> args) {
if (args == null) return false;
for (String arg : args) {
if (arg != null && (arg.equals("-cp") || arg.equals("-classpath"))) return true;
}
return false;
}
private boolean containsLibraryPathArg(List<String> args) {
if (args == null) return false;
for (String arg : args) {
if (arg != null && arg.startsWith("-Djava.library.path=")) return true;
}
return false;
}
private String buildClasspathFromManifest(VersionManifest manifest, boolean includeVersionJar) throws Exception {
List<String> paths = new ArrayList<>();
Path librariesDir = instance.getPath().resolve("libraries");
LauncherLogger.info(ZAnsi.cyan(" buildClasspathFromManifest: " + manifest.getAllLibraries().size() + " libraries in manifest (including inherited)"));
System.out.println(ZAnsi.cyan(" buildClasspathFromManifest: " + manifest.getAllLibraries().size() + " libraries in manifest (including inherited)"));
String loaderType = instance.getLoaderType().toLowerCase();
boolean isForgeLike = "forge".equals(loaderType) || "neoforge".equals(loaderType);
@@ -632,7 +572,7 @@ public class LaunchCommandBuilder {
if (isValidJar(libPath)) {
paths.add(libPath.toAbsolutePath().toString());
} else {
LauncherLogger.info(ZAnsi.yellow(" Corrupt library, deleting: " + lib.name));
System.out.println(ZAnsi.yellow(" Corrupt library, deleting: " + lib.name));
Files.delete(libPath);
}
} else {
@@ -642,7 +582,7 @@ public class LaunchCommandBuilder {
if (isValidJar(fallbackPath)) {
paths.add(fallbackPath.toAbsolutePath().toString());
} else {
LauncherLogger.info(ZAnsi.yellow(" Corrupt library, deleting: " + lib.name));
System.out.println(ZAnsi.yellow(" Corrupt library, deleting: " + lib.name));
Files.delete(fallbackPath);
}
} else {
@@ -651,23 +591,23 @@ public class LaunchCommandBuilder {
Path found = scanForJar(librariesDir, artifactName);
if (found != null) {
if (isValidJar(found)) {
LauncherLogger.info(ZAnsi.green(" Found by scan: " + lib.name + " → " + librariesDir.relativize(found)));
System.out.println(ZAnsi.green(" Found by scan: " + lib.name + " → " + librariesDir.relativize(found)));
paths.add(found.toAbsolutePath().toString());
} else {
LauncherLogger.info(ZAnsi.yellow(" Corrupt library (scan), deleting: " + found.getFileName()));
System.out.println(ZAnsi.yellow(" Corrupt library (scan), deleting: " + found.getFileName()));
Files.delete(found);
}
} else {
LauncherLogger.info(ZAnsi.yellow(" Library not found (even after scan): " + lib.name));
System.out.println(ZAnsi.yellow(" Library not found (even after scan): " + lib.name));
}
}
}
}
LauncherLogger.info(ZAnsi.cyan(" buildClasspathFromManifest: " + paths.size() + " libraries in classpath"));
System.out.println(ZAnsi.cyan(" buildClasspathFromManifest: " + paths.size() + " libraries in classpath"));
if (isForgeLike) {
LauncherLogger.info(ZAnsi.cyan(" Version ID: " + getVersionId() + " (MC: " + instance.getMinecraftVersion() + ")"));
LauncherLogger.info(ZAnsi.cyan(" Paths dir: " + instance.getPath().resolve("versions")));
System.out.println(ZAnsi.cyan(" Version ID: " + getVersionId() + " (MC: " + instance.getMinecraftVersion() + ")"));
System.out.println(ZAnsi.cyan(" Paths dir: " + instance.getPath().resolve("versions")));
}
if (includeVersionJar) {
@@ -675,9 +615,9 @@ public class LaunchCommandBuilder {
if (versionJar != null) {
if (isValidJar(versionJar)) {
paths.add(0, versionJar.toAbsolutePath().toString());
LauncherLogger.info(ZAnsi.green(" Added version jar: " + versionJar.getFileName()));
System.out.println(ZAnsi.green(" Added version jar: " + versionJar.getFileName()));
} else {
LauncherLogger.info(ZAnsi.yellow(" Corrupt version jar, deleting: " + versionJar.getFileName()));
System.out.println(ZAnsi.yellow(" Corrupt version jar, deleting: " + versionJar.getFileName()));
Files.delete(versionJar);
}
}
@@ -789,7 +729,7 @@ public class LaunchCommandBuilder {
Path targetJar = targetDir.resolve(versionId + ".jar");
if (Files.exists(targetJar) && isValidJar(targetJar)) {
LauncherLogger.info(ZAnsi.green(" Version jar already exists: " + targetJar));
System.out.println(ZAnsi.green(" Version jar already exists: " + targetJar));
return;
}
@@ -799,11 +739,11 @@ public class LaunchCommandBuilder {
Path vanillaJar = versionsDir.resolve(mcVersion).resolve(mcVersion + ".jar");
if (Files.exists(vanillaJar) && isValidJar(vanillaJar)) {
Files.copy(vanillaJar, targetJar);
LauncherLogger.info(ZAnsi.green(" Copied vanilla jar for securejarhandler: " + vanillaJar.getFileName() + " → " + targetJar));
System.out.println(ZAnsi.green(" Copied vanilla jar for securejarhandler: " + vanillaJar.getFileName() + " → " + targetJar));
return;
}
LauncherLogger.info(ZAnsi.yellow(" No vanilla jar found at " + vanillaJar));
System.out.println(ZAnsi.yellow(" No vanilla jar found at " + vanillaJar));
}
/**
@@ -837,7 +777,7 @@ public class LaunchCommandBuilder {
.findFirst()
.orElse(null);
if (found != null) {
LauncherLogger.info(ZAnsi.green(" Found SRG client jar: " + found + " (module name: " + getModuleName(found) + ")"));
System.out.println(ZAnsi.green(" Found SRG client jar: " + found + " (module name: " + getModuleName(found) + ")"));
return found;
}
} catch (Exception e) { /* continue */ }
@@ -852,7 +792,7 @@ public class LaunchCommandBuilder {
.findFirst()
.orElse(null);
if (found != null) {
LauncherLogger.info(ZAnsi.green(" Found SRG client jar (fallback scan): " + found + " (module name: " + getModuleName(found) + ")"));
System.out.println(ZAnsi.green(" Found SRG client jar (fallback scan): " + found + " (module name: " + getModuleName(found) + ")"));
return found;
}
} catch (Exception e) { /* continue */ }
@@ -907,12 +847,12 @@ public class LaunchCommandBuilder {
for (String candidate : candidates) {
Path jarPath = librariesDir.resolve(candidate);
if (Files.exists(jarPath) && isValidJar(jarPath)) {
LauncherLogger.info(ZAnsi.green(" Found Forge jar: " + jarPath.getFileName()));
System.out.println(ZAnsi.green(" Found Forge jar: " + jarPath.getFileName()));
return jarPath;
}
}
LauncherLogger.info(ZAnsi.yellow(" No Forge client/universal jar found!"));
System.out.println(ZAnsi.yellow(" No Forge client/universal jar found!"));
return null;
}
@@ -1051,7 +991,7 @@ public class LaunchCommandBuilder {
Path tempFile = Files.createTempFile("zernmc-cp-", ".txt");
Files.writeString(tempFile, classpath);
tempFiles.add(tempFile);
LauncherLogger.info(ZAnsi.cyan(" Classpath too long (" + classpath.length() + " chars), using argfile: " + tempFile));
System.out.println(ZAnsi.cyan(" Classpath too long (" + classpath.length() + " chars), using argfile: " + tempFile));
return "@" + tempFile.toAbsolutePath();
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/minecraft/launch/VersionManifest.java
+1 -3
View File
@@ -1,7 +1,5 @@
package me.sashegdev.zernmc.launcher.minecraft.launch;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -77,7 +75,7 @@ public class VersionManifest {
this.parent = new VersionManifest(json);
this.parent.resolveParent(versionsDir);
} catch (Exception e) {
LauncherLogger.warn("Failed to load parent version " + inheritsFrom + ": " + e.getMessage());
System.out.println("Failed to load parent version " + inheritsFrom + ": " + e.getMessage());
}
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/ui/jfx/JFXBridge.java
-101
View File
@@ -1,101 +0,0 @@
package me.sashegdev.zernmc.launcher.ui.jfx;
/**
* Safe reflection bridge to JFXLauncher for use from non-JFX code (CLI, menus,
* installers).
*
* IMPORTANT: JFXLauncher extends javafx.application.Application. In CLI mode
* JavaFX is NOT on the module path, so loading JFXLauncher (or any class that
* references JavaFX) throws NoClassDefFoundError (an Error, not an Exception).
* Therefore the bridge must catch Throwable and never let JFX-launcher errors
* leak into CLI/game-launch code paths.
*
* Rule: any call into JFX UI state from non-JFX context MUST go through this
* bridge. Direct JFXLauncher.x() calls are only allowed inside JFXLauncher.java.
*/
public final class JFXBridge {
private JFXBridge() {}
private static final String JFX_CLASS = "me.sashegdev.zernmc.launcher.ui.jfx.JFXLauncher";
private static volatile java.lang.reflect.Method appendGameLogMethod;
private static volatile java.lang.reflect.Method appendLauncherLogFromLoggerMethod;
private static volatile java.lang.reflect.Method setInstallProgressMethod;
private static volatile java.lang.reflect.Method setInstallStageMethod;
private static java.lang.reflect.Method method(String name, Class<?>... params) {
java.lang.reflect.Method m = null;
try {
Class<?> clazz = Class.forName(JFX_CLASS);
m = clazz.getMethod(name, params);
} catch (Throwable t) {
// JavaFX not available (CLI mode) or JFXLauncher not initialized.
}
return m;
}
/** Forward a game log line to the JFX UI. Safe no-op in CLI mode. */
public static void appendGameLog(String msg) {
if (appendGameLogMethod == null) {
appendGameLogMethod = method("appendGameLog", String.class);
}
if (appendGameLogMethod == null) {
return;
}
try {
appendGameLogMethod.invoke(null, msg);
} catch (Throwable t) {
appendGameLogMethod = null;
}
}
/**
* Forward a launcher log line to the JFX UI without re-logging it through
* LauncherLogger. Called from LauncherLogger.write so all logged lines
* (including installer output) become visible in the UI. Safe no-op in CLI mode.
*/
public static void appendLauncherLogFromLogger(String msg) {
if (appendLauncherLogFromLoggerMethod == null) {
appendLauncherLogFromLoggerMethod = method("appendLauncherLogFromLogger", String.class);
}
if (appendLauncherLogFromLoggerMethod == null) {
return;
}
try {
appendLauncherLogFromLoggerMethod.invoke(null, msg);
} catch (Throwable t) {
appendLauncherLogFromLoggerMethod = null;
}
}
/** Forward install progress to the JFX UI. Safe no-op in CLI mode. */
public static void setInstallProgress(String label, int current, int total) {
if (setInstallProgressMethod == null) {
setInstallProgressMethod = method("setInstallProgress", String.class, int.class, int.class);
}
if (setInstallProgressMethod == null) {
return;
}
try {
setInstallProgressMethod.invoke(null, label, current, total);
} catch (Throwable t) {
setInstallProgressMethod = null;
}
}
/** Forward install stage to the JFX UI. Safe no-op in CLI mode. */
public static void setInstallStage(String stageName, int stageIndex, int stageCount) {
if (setInstallStageMethod == null) {
setInstallStageMethod = method("setInstallStage", String.class, int.class, int.class);
}
if (setInstallStageMethod == null) {
return;
}
try {
setInstallStageMethod.invoke(null, stageName, stageIndex, stageCount);
} catch (Throwable t) {
setInstallStageMethod = null;
}
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/ui/jfx/JFXLauncher.java
+85 -514
View File
@@ -18,7 +18,6 @@ import me.sashegdev.zernmc.launcher.minecraft.PackDownloader;
import me.sashegdev.zernmc.launcher.minecraft.ServerPack;
import me.sashegdev.zernmc.launcher.minecraft.launch.LaunchCommandBuilder;
import me.sashegdev.zernmc.launcher.utils.Config;
import me.sashegdev.zernmc.launcher.utils.DomainSelector;
import me.sashegdev.zernmc.launcher.utils.LauncherLogger;
import me.sashegdev.zernmc.launcher.utils.Version;
@@ -135,19 +134,6 @@ public class JFXLauncher extends Application {
try { consumer.onLog(msg); } catch (Exception ignored) {}
}
}
/**
* Adds a line to the UI log buffer without re-logging it through
* LauncherLogger (avoids recursion when called from LauncherLogger.write).
*/
public static void appendLauncherLogFromLogger(String msg) {
synchronized (launcherLogBuffer) {
launcherLogBuffer.append(msg).append("\n");
}
for (LogConsumer consumer : logConsumers) {
try { consumer.onLog(msg); } catch (Exception ignored) {}
}
}
public static void appendGameLog(String msg) {
synchronized (gameLogBuffer) {
@@ -200,83 +186,12 @@ public class JFXLauncher extends Application {
public static void main(String[] args) {
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
LauncherLogger.info("[JFX] Shutdown signal received...");
System.out.println("[JFX] Shutdown hook triggered");
LaunchService.killAllProcesses();
}));
launch(args);
}
private static final byte[] PNG_SIGNATURE = {(byte) 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A};
private static javafx.scene.image.Image loadWindowIcon() {
try {
byte[] ico = readAssetBytes("assets/ui/icons/zernmc.ico");
if (ico != null) {
byte[] png = extractIcoPngFrame(ico);
if (png != null) {
return new javafx.scene.image.Image(new java.io.ByteArrayInputStream(png));
}
}
byte[] png = readAssetBytes("assets/ui/icons/zernmc.png");
if (png != null) {
return new javafx.scene.image.Image(new java.io.ByteArrayInputStream(png));
}
} catch (Exception e) {
log("Window icon load error: " + e.getMessage());
}
return null;
}
private static byte[] readAssetBytes(String resourcePath) {
try (InputStream in = JFXLauncher.class.getResourceAsStream("/" + resourcePath)) {
if (in != null) {
return in.readAllBytes();
}
} catch (Exception ignored) {}
try {
Path file = Paths.get(resourcePath);
if (Files.exists(file)) {
return Files.readAllBytes(file);
}
} catch (Exception ignored) {}
return null;
}
private static byte[] extractIcoPngFrame(byte[] ico) {
if (ico == null || ico.length < 6 || ico[0] != 0 || ico[1] != 0) {
return null;
}
int count = (ico[4] & 0xFF) | ((ico[5] & 0xFF) << 8);
int bestSize = -1;
int bestOffset = -1;
int bestLength = -1;
for (int i = 0; i < count; i++) {
int off = 6 + i * 16;
if (off + 16 > ico.length) break;
int w = ico[off] & 0xFF;
int h = ico[off + 1] & 0xFF;
int size = (w == 0 ? 256 : w) * (h == 0 ? 256 : h);
int len = (ico[off + 8] & 0xFF) | ((ico[off + 9] & 0xFF) << 8)
| ((ico[off + 10] & 0xFF) << 16) | ((ico[off + 11] & 0xFF) << 24);
int imgOff = (ico[off + 12] & 0xFF) | ((ico[off + 13] & 0xFF) << 8)
| ((ico[off + 14] & 0xFF) << 16) | ((ico[off + 15] & 0xFF) << 24);
if (imgOff < 0 || len <= 0 || imgOff + len > ico.length) continue;
boolean isPng = true;
for (int b = 0; b < PNG_SIGNATURE.length; b++) {
if (ico[imgOff + b] != PNG_SIGNATURE[b]) { isPng = false; break; }
}
if (isPng && size > bestSize) {
bestSize = size;
bestOffset = imgOff;
bestLength = len;
}
}
if (bestOffset < 0 || bestLength <= 0) return null;
byte[] png = new byte[bestLength];
System.arraycopy(ico, bestOffset, png, 0, bestLength);
return png;
}
private static void extractAssets() {
try {
Path assetsDir = Paths.get("assets");
@@ -288,7 +203,7 @@ public class JFXLauncher extends Application {
try {
String existingVersion = Files.readString(versionFile).trim();
if (existingVersion.equals(currentVersion)) {
log("Assets up to date (v" + currentVersion + ")");
System.out.println("[JFX] Assets up to date (v" + currentVersion + ")");
return;
}
} catch (Exception ignored) {}
@@ -305,16 +220,16 @@ public class JFXLauncher extends Application {
String serverVersion = getServerVersion();
if (serverVersion != null && !serverVersion.isEmpty()) {
log("Loading assets via meta for version " + serverVersion);
System.out.println("[JFX] Loading assets via meta for version " + serverVersion);
if (downloadAssetsFromMeta(serverVersion)) {
log("Assets loaded via meta");
System.out.println("[JFX] Assets loaded via meta");
Files.writeString(versionFile, currentVersion);
return;
}
log("Meta unavailable, using fallback");
System.out.println("[JFX] Meta unavailable, using fallback");
}
log("Extracting assets from JAR...");
System.out.println("[JFX] Extracting assets from JAR...");
Files.createDirectories(assetsDir);
Path jarPath = Paths.get(JFXLauncher.class.getProtectionDomain().getCodeSource().getLocation().toURI());
if (Files.exists(jarPath) && jarPath.toString().endsWith(".jar")) {
@@ -335,11 +250,11 @@ public class JFXLauncher extends Application {
}
}
}
log("Assets extracted from JAR");
System.out.println("[JFX] Assets extracted from JAR");
Files.writeString(versionFile, currentVersion);
}
} catch (Exception e) {
log("Error extracting assets: " + e.getMessage());
System.out.println("[JFX] Error extracting assets: " + e.getMessage());
}
}
@@ -404,7 +319,7 @@ public class JFXLauncher extends Application {
return true;
}
} catch (Exception e) {
log("Error loading assets via meta: " + e.getMessage());
System.out.println("[JFX] Error loading via meta: " + e.getMessage());
return false;
}
}
@@ -433,21 +348,18 @@ public class JFXLauncher extends Application {
log("No saved session found, will show login screen");
}
log("Starting background network init...");
Thread netInitThread = new Thread(() -> {
new Thread(() -> {
try {
DomainSelector.selectBest();
ZHttpClient.checkAllServicesOnStartup();
log("Network init complete");
} catch (Exception e) {
log("Network init warning: " + e.getMessage());
}
}, "network-init");
netInitThread.setDaemon(true);
netInitThread.start();
}, "network-init").start();
startServer();
WebView webView = new WebView();
webView.setContextMenuEnabled(true);
webView.setContextMenuEnabled(false);
WebEngine engine = webView.getEngine();
engine.setJavaScriptEnabled(true);
@@ -464,9 +376,9 @@ public class JFXLauncher extends Application {
engine.setOnAlert(e -> {
String msg = e.getData();
if (msg.startsWith("[LOG] ")) {
log("[JS] " + msg.substring(6));
System.out.println("[JS] " + msg.substring(6));
} else if (msg.startsWith("[ERR] ")) {
log("[JS ERROR] " + msg.substring(6));
System.err.println("[JS] " + msg.substring(6));
} else {
log("[UI] Alert: " + msg);
}
@@ -508,9 +420,6 @@ public class JFXLauncher extends Application {
" req.open('POST', '/api/open-url', false);" +
" req.send(JSON.stringify({url: target.href}));" +
" }" +
"}, true);" +
"document.addEventListener('contextmenu', function(e) {" +
" e.preventDefault();" +
"}, true);"
);
}
@@ -519,11 +428,6 @@ public class JFXLauncher extends Application {
String url = "http://localhost:" + PORT + "/assets/ui/index.html";
engine.load(url);
javafx.scene.image.Image windowIcon = loadWindowIcon();
if (windowIcon != null) {
stage.getIcons().add(windowIcon);
}
stage.setTitle(APP_TITLE);
int winW = Config.getWindowWidth();
int winH = Config.getWindowHeight();
@@ -537,17 +441,11 @@ public class JFXLauncher extends Application {
log("Window displayed");
stage.setOnCloseRequest(e -> {
log("Shutdown signal received...");
shutdown();
log("Closing...");
LaunchService.killAllProcesses();
if (server != null) server.stop(0);
Platform.exit();
Thread watchdog = new Thread(() -> {
try {
Thread.sleep(2000);
} catch (InterruptedException ignored) {}
System.exit(0);
}, "force-exit");
watchdog.setDaemon(true);
watchdog.start();
System.exit(0);
});
} catch (Exception e) {
@@ -574,11 +472,8 @@ public class JFXLauncher extends Application {
server.createContext("/api/account", this::handleAccount);
server.createContext("/api/instances", this::handleInstances);
server.createContext("/api/launch", this::handleLaunch);
server.createContext("/api/offline/status", this::handleOfflineStatus);
server.createContext("/api/offline-launch", this::handleOfflineLaunch);
server.createContext("/api/install", this::handleInstall);
server.createContext("/api/install/progress", this::handleInstallProgress);
server.createContext("/api/network/status", this::handleNetworkStatus);
server.createContext("/api/logs", this::handleLogs);
server.createContext("/api/logs/stream", this::handleLogsStream);
server.createContext("/api/game-logs", this::handleGameLogs);
@@ -597,7 +492,6 @@ public class JFXLauncher extends Application {
server.createContext("/api/exit-parent", this::handleExitParent);
server.createContext("/api/system-info", this::handleSystemInfo);
server.createContext("/api/open-log-file", this::handleOpenLogFile);
server.createContext("/api/clipboard", this::handleClipboard);
server.createContext("/api/friends/list", this::handleFriendList);
server.createContext("/api/friends/add", this::handleFriendAdd);
server.createContext("/api/friends/remove", this::handleFriendRemove);
@@ -610,20 +504,10 @@ public class JFXLauncher extends Application {
server.createContext("/api/playtime/stats", this::handlePlaytimeStats);
server.createContext("/api/whitelist/mods", this::handleWhitelistMods);
server.createContext("/api/whitelist/mods/install", this::handleWhitelistInstallMod);
server.createContext("/api/mods/toggle", this::handleModsToggle);
server.createContext("/api/mods/delete", this::handleModsDelete);
server.createContext("/api/pack/open-folder", this::handlePackOpenFolder);
server.createContext("/api/pack/settings", this::handlePackSettings);
server.createContext("/api/pack/delete", this::handlePackDelete);
server.createContext("/api/filemanager", this::handleFileManager);
server.createContext("/api/admin", this::handleAdmin);
server.createContext("/assets/", this::handleStatic);
server.setExecutor(Executors.newCachedThreadPool(r -> {
Thread t = new Thread(r, "http-server-" + server.getAddress().getPort());
t.setDaemon(true);
return t;
}));
server.setExecutor(Executors.newCachedThreadPool());
server.start();
log("HTTP server on port " + PORT);
@@ -647,43 +531,21 @@ public class JFXLauncher extends Application {
private void handleOpenLogFile(HttpExchange exchange) {
try {
Path target = null;
if (gameLogFile != null && Files.exists(gameLogFile)) {
target = gameLogFile;
} else if (launcherLogFile != null && Files.exists(launcherLogFile)) {
target = launcherLogFile;
}
if (target != null) {
if (Desktop.isDesktopSupported()) {
Desktop.getDesktop().open(target.toFile());
sendJson(exchange, Map.of("success", true, "file", target.toString()));
Desktop.getDesktop().open(gameLogFile.toFile());
sendJson(exchange, Map.of("success", true));
} else {
sendJson(exchange, Map.of("success", false, "error", "Desktop not supported"));
}
} else {
sendJson(exchange, Map.of("success", false, "error", "No log file found"));
sendJson(exchange, Map.of("success", false, "error", "No game log file found"));
}
} catch (Exception e) {
sendJson(exchange, Map.of("success", false, "error", e.getMessage()));
}
}
private void handleClipboard(HttpExchange exchange) {
try {
Map<String, String> body = parseJson(exchange.getRequestBody());
String text = body != null ? body.get("text") : null;
if (text == null) {
sendJson(exchange, Map.of("success", false, "error", "Empty clipboard text"));
return;
}
java.awt.Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
new java.awt.datatransfer.StringSelection(text), null);
sendJson(exchange, Map.of("success", true));
} catch (Exception e) {
sendJson(exchange, Map.of("success", false, "error", e.getMessage()));
}
}
private void handleOpenUrl(HttpExchange exchange) {
try {
Map<String, String> body = parseJson(exchange.getRequestBody());
@@ -724,8 +586,9 @@ public class JFXLauncher extends Application {
sendJson(exchange, Map.of("success", false, "error", result.getError()));
}
} catch (Exception e) {
log("Login error: " + AuthManager.friendlyConnectionError(e));
sendJson(exchange, Map.of("success", false, "error", AuthManager.friendlyConnectionError(e)));
log("Login error: " + e.getMessage());
e.printStackTrace();
sendJson(exchange, Map.of("success", false, "error", e.getMessage()));
}
}
@@ -752,6 +615,7 @@ public class JFXLauncher extends Application {
try {
boolean loggedIn = AuthManager.isLoggedIn();
boolean authExists = AuthManager.authFileExists();
System.out.println("[AUTH] handleAutoLogin: isLoggedIn=" + loggedIn + " authFile=" + authExists);
log("handleAutoLogin: isLoggedIn=" + loggedIn + " authFile=" + authExists);
if (AuthManager.tryAutoLogin()) {
Map<String, Object> data = new HashMap<>();
@@ -760,12 +624,15 @@ public class JFXLauncher extends Application {
data.put("role", AuthManager.getRole());
data.put("roleName", AuthManager.getRoleName());
sendJson(exchange, Map.of("success", true, "data", data, "autoLogin", true));
System.out.println("[AUTH] Auto-login performed: " + AuthManager.getUsername());
log("Auto-login performed: " + AuthManager.getUsername());
} else {
System.out.println("[AUTH] handleAutoLogin: no valid session (authFile=" + authExists + ")");
log("handleAutoLogin: no valid session (authFile=" + authExists + ")");
sendJson(exchange, Map.of("success", false, "autoLogin", false));
}
} catch (Exception e) {
System.out.println("[AUTH] handleAutoLogin error: " + e.getMessage());
log("handleAutoLogin error: " + e.getMessage());
sendJson(exchange, Map.of("success", false, "error", e.getMessage()));
}
@@ -828,54 +695,6 @@ public class JFXLauncher extends Application {
}
}
private void handleOfflineStatus(HttpExchange exchange) {
try {
boolean offline = isOfflineMode();
sendJson(exchange, Map.of("success", true, "offline", offline));
} catch (Exception e) {
sendJson(exchange, Map.of("success", false, "error", e.getMessage()));
}
}
private void handleOfflineLaunch(HttpExchange exchange) {
try {
Map<String, String> body = parseJson(exchange.getRequestBody());
String name = body.get("name");
String nickname = body.get("nickname");
Instance instance = InstanceManager.getInstance(name);
if (instance == null) {
sendJson(exchange, Map.of("success", false, "error", "Pack not found"));
return;
}
var result = api.launch().launchOffline(name, nickname);
if (result.isSuccess()) {
Map<String, Object> data = new HashMap<>();
data.put("pid", result.getData().getPid());
data.put("status", result.getData().getStatus());
sendJson(exchange, Map.of("success", true, "data", data));
log("Offline launched: " + name + " pid=" + result.getData().getPid());
} else {
log("Offline launch failed: " + result.getError());
sendJson(exchange, Map.of("success", false, "error", result.getError()));
}
} catch (Exception e) {
log("handleOfflineLaunch error: " + e.getMessage());
sendJson(exchange, Map.of("success", false, "error", e.getMessage()));
}
}
private boolean isOfflineMode() {
if ("true".equalsIgnoreCase(System.getProperty("zernmc.offline", "false"))) {
return true;
}
if (ZHttpClient.isNetworkInitialized() && !ZHttpClient.isZernServerHealthy()) {
return true;
}
return false;
}
private void handleInstall(HttpExchange exchange) {
if (!installInProgress.compareAndSet(false, true)) {
sendJson(exchange, Map.of("success", false, "error", "Installation already in progress"));
@@ -922,12 +741,7 @@ public class JFXLauncher extends Application {
Thread installThread = new Thread(() -> {
try {
boolean success = false;
if (!ZHttpClient.isNetworkInitialized()) {
log("Network init not finished, running full service check (CLI-style)...");
ZHttpClient.checkAllServicesOnStartup();
}
if ("zernmc".equalsIgnoreCase(loader)) {
log("[DEBUG] Starting zernmc pack install for version=" + version);
setInstallProgressWithStage("Fetching pack info...", 10, 100, "Fetching pack info", 0, 5);
@@ -988,13 +802,12 @@ public class JFXLauncher extends Application {
setInstallProgressWithStage("Installation failed", 0, 100, "Failed", 0, 1);
log("Install error: " + name);
}
} catch (Throwable e) {
} catch (Exception e) {
log("Install error: " + e.getMessage());
setInstallInProgress(false);
setInstallProgressWithStage("Error: " + e.getMessage(), 0, 100, "Error", 0, 1);
}
});
installThread.setDaemon(true);
installThread.start();
} else {
sendJson(exchange, Map.of("success", false, "error", "Instance not found"));
@@ -1029,14 +842,6 @@ public class JFXLauncher extends Application {
}
}
private void handleNetworkStatus(HttpExchange exchange) {
try {
sendJson(exchange, Map.of("success", true, "data", ZHttpClient.getNetworkStatus()));
} catch (Exception e) {
sendJson(exchange, Map.of("success", false, "error", e.getMessage()));
}
}
private void handleLogs(HttpExchange exchange) {
sendJson(exchange, Map.of("success", true, "data", getLauncherLogs()));
}
@@ -1050,16 +855,17 @@ public class JFXLauncher extends Application {
exchange.sendResponseHeaders(200, 0);
final OutputStream os = exchange.getResponseBody();
// Bounded queue: producers (LauncherLogger on the install thread) must
// never block on a slow/stalled SSE client. If the UI can't keep up,
// lines are dropped here - they still reach the log file and buffer.
final java.util.concurrent.BlockingQueue<String> queue =
new java.util.concurrent.LinkedBlockingQueue<>(5000);
LogConsumer consumer = new LogConsumer() {
@Override
public void onLog(String line) {
queue.offer(line);
public synchronized void onLog(String line) {
try {
String data = "data: " + line.replace("\n", "").replace("\r", "") + "\n\n";
os.write(data.getBytes(StandardCharsets.UTF_8));
os.flush();
} catch (Exception e) {
removeLogConsumer(this);
}
}
};
consumerRef[0] = consumer;
@@ -1069,13 +875,9 @@ public class JFXLauncher extends Application {
Thread.currentThread().setName("sse-logs-stream");
while (!Thread.currentThread().isInterrupted()) {
try {
String line = queue.poll(10, java.util.concurrent.TimeUnit.SECONDS);
if (line != null) {
os.write(("data: " + line.replace("\n", "").replace("\r", "") + "\n\n").getBytes(StandardCharsets.UTF_8));
} else {
os.write(": heartbeat\n\n".getBytes(StandardCharsets.UTF_8));
}
os.write(": heartbeat\n\n".getBytes(StandardCharsets.UTF_8));
os.flush();
Thread.sleep(10000);
} catch (InterruptedException e) { break; } catch (Exception e) { break; }
}
} catch (Exception ignored) {} finally {
@@ -1097,14 +899,17 @@ public class JFXLauncher extends Application {
exchange.sendResponseHeaders(200, 0);
final OutputStream os = exchange.getResponseBody();
// Bounded queue: producers must never block on a slow/stalled SSE client.
final java.util.concurrent.BlockingQueue<String> queue =
new java.util.concurrent.LinkedBlockingQueue<>(5000);
LogConsumer consumer = new LogConsumer() {
@Override
public void onLog(String line) {
queue.offer(line);
public synchronized void onLog(String line) {
try {
String data = "data: " + line.replace("\n", "").replace("\r", "") + "\n\n";
os.write(data.getBytes(StandardCharsets.UTF_8));
os.flush();
} catch (Exception e) {
removeGameLogConsumer(this);
}
}
};
consumerRef[0] = consumer;
@@ -1114,13 +919,9 @@ public class JFXLauncher extends Application {
Thread.currentThread().setName("sse-game-logs-stream");
while (!Thread.currentThread().isInterrupted()) {
try {
String line = queue.poll(10, java.util.concurrent.TimeUnit.SECONDS);
if (line != null) {
os.write(("data: " + line.replace("\n", "").replace("\r", "") + "\n\n").getBytes(StandardCharsets.UTF_8));
} else {
os.write(": heartbeat\n\n".getBytes(StandardCharsets.UTF_8));
}
os.write(": heartbeat\n\n".getBytes(StandardCharsets.UTF_8));
os.flush();
Thread.sleep(10000);
} catch (InterruptedException e) { break; } catch (Exception e) { break; }
}
} catch (Exception ignored) {} finally {
@@ -1239,7 +1040,7 @@ public class JFXLauncher extends Application {
sendJson(exchange, Map.of("success", false, "error", result.getError()));
}
} catch (Exception e) {
sendJson(exchange, Map.of("success", false, "error", AuthManager.friendlyConnectionError(e)));
sendJson(exchange, Map.of("success", false, "error", e.getMessage()));
}
}
@@ -1259,55 +1060,14 @@ public class JFXLauncher extends Application {
Path dir = instance.getPath();
Map<String, Object> info = new HashMap<>();
List<Map<String, Object>> modsList = new ArrayList<>();
int modsCount = 0;
Path modsDir = dir.resolve("mods");
if (Files.exists(modsDir)) {
try (var files = Files.list(modsDir)) {
files.forEach(p -> {
String fn = p.getFileName().toString();
boolean isJar = fn.endsWith(".jar");
boolean isDisabled = fn.endsWith(".jar.disabled");
if (!isJar && !isDisabled) return;
String display = isDisabled ? fn.substring(0, fn.length()-9) : fn;
Map<String, Object> m = new HashMap<>();
m.put("fileName", fn);
// try parse mod metadata
String modId = null, modName = null, modVer = null;
try (var zf = new java.util.jar.JarFile(p.toFile())) {
var e1 = zf.getEntry("fabric.mod.json");
if (e1 != null) {
String json = new String(zf.getInputStream(e1).readAllBytes(), java.nio.charset.StandardCharsets.UTF_8);
var jo = new org.json.JSONObject(json);
modId = jo.optString("id", null);
modName = jo.optString("name", null);
modVer = jo.optString("version", null);
} else {
var e2 = zf.getEntry("META-INF/mods.toml");
if (e2 == null) e2 = zf.getEntry("META-INF/neoforge.mods.toml");
if (e2 == null) e2 = zf.getEntry("mods.toml");
if (e2 != null) {
String toml = new String(zf.getInputStream(e2).readAllBytes(), java.nio.charset.StandardCharsets.UTF_8);
var mid = java.util.regex.Pattern.compile("modId\\s*=\\s*\"([^\"]+)\"").matcher(toml);
if (mid.find()) modId = mid.group(1);
var dname = java.util.regex.Pattern.compile("displayName\\s*=\\s*\"([^\"]+)\"").matcher(toml);
if (dname.find()) modName = dname.group(1);
var ver = java.util.regex.Pattern.compile("version\\s*=\\s*\"([^\"]+)\"").matcher(toml);
if (ver.find()) modVer = ver.group(1);
}
}
} catch (Exception ignored) {}
m.put("displayName", modName != null ? modName : (modId != null ? modId : display));
m.put("modId", modId != null ? modId : display.replace(".jar",""));
m.put("version", modVer != null ? modVer : "?");
m.put("enabled", !isDisabled);
try { m.put("size", Files.size(p)); } catch (Exception e) { m.put("size", 0L); }
modsList.add(m);
});
} catch (Exception ignored) {}
modsList.sort((a,b) -> String.valueOf(a.get("displayName")).compareToIgnoreCase(String.valueOf(b.get("displayName"))));
modsCount = (int) files.filter(p -> p.toString().endsWith(".jar")).count();
}
}
info.put("modsCount", modsList.size());
info.put("mods", modsList);
info.put("modsCount", modsCount);
List<String> screenshots = new ArrayList<>();
Path screenshotsDir = dir.resolve("screenshots");
@@ -1377,12 +1137,6 @@ public class JFXLauncher extends Application {
if (body.containsKey("systemBasedJvm")) {
Config.setSystemBasedJvm(Boolean.parseBoolean(body.get("systemBasedJvm")));
}
if (body.containsKey("onboardedVersion")) {
Config.setOnboardedVersion(body.get("onboardedVersion"));
}
if (body.containsKey("completedOnboardBlocks")) {
Config.setCompletedOnboardBlocks(body.get("completedOnboardBlocks"));
}
Map<String, Object> res = new HashMap<>();
res.put("success", true);
res.put("maxMemory", Config.getMaxMemory());
@@ -1399,8 +1153,6 @@ public class JFXLauncher extends Application {
data.put("javaPath", Config.getJavaPath());
data.put("locale", Config.getLocale());
data.put("systemBasedJvm", Config.isSystemBasedJvm());
data.put("onboardedVersion", Config.getOnboardedVersion());
data.put("completedOnboardBlocks", Config.getCompletedOnboardBlocks());
data.put("cpuCores", Config.getSystemCpuCores());
data.put("totalRamMB", Config.getSystemTotalRamMB());
data.put("systemJvmFlags", Config.getSystemJvmFlags());
@@ -1428,41 +1180,26 @@ public class JFXLauncher extends Application {
private void handleShutdown(HttpExchange exchange) {
log("Shutdown request received...");
shutdown();
LaunchService.killAllProcesses();
if (server != null) server.stop(0);
Platform.exit();
System.exit(0);
}
private void handleExit(HttpExchange exchange) {
log("Exiting...");
shutdown();
LaunchService.killAllProcesses();
if (mainStage != null) mainStage.close();
Platform.exit();
System.exit(0);
}
private void handleExitParent(HttpExchange exchange) {
log("Terminating parent process...");
shutdown();
System.exit(240);
}
/**
* Releases launcher resources on shutdown: kills any running game
* processes and stops the embedded HTTP server.
*/
private void shutdown() {
LaunchService.killAllProcesses();
if (server != null) {
server.stop(0);
java.util.concurrent.ExecutorService exec =
(java.util.concurrent.ExecutorService) server.getExecutor();
if (exec != null) exec.shutdownNow();
}
}
@Override
public void stop() {
LauncherLogger.info("[JFX] Application stop() called, releasing resources...");
shutdown();
LauncherLogger.info("[JFX] Clean shutdown complete");
if (mainStage != null) mainStage.close();
Platform.exit();
System.exit(240);
}
private void handleStatic(HttpExchange exchange) {
@@ -1481,39 +1218,17 @@ public class JFXLauncher extends Application {
return;
}
byte[] content = null;
String source = null;
if (Files.exists(file) && !Files.isDirectory(file)) {
content = Files.readAllBytes(file);
source = "disk";
} else {
// Fallback to the UI bundled inside the launcher jar, so the
// UI never breaks when the on-disk assets are missing/stale.
try (InputStream in = getClass().getResourceAsStream("/" + relativePath)) {
if (in != null) {
content = in.readAllBytes();
source = "jar";
}
}
}
if (content == null) {
log("[UI] File not found: " + file + " (not bundled in jar either)");
if (!Files.exists(file) || Files.isDirectory(file)) {
log("[UI] File not found: " + file);
exchange.sendResponseHeaders(404, 0);
exchange.close();
return;
}
log("[UI] Loaded " + content.length + " bytes from " + source + ": " + path);
byte[] content = Files.readAllBytes(file);
log("[UI] Loaded " + content.length + " bytes: " + path);
String ct = getContentType(path);
if (ct.startsWith("text/")) {
String text = new String(content, java.nio.charset.StandardCharsets.UTF_8);
text = text.replace("__LAUNCHER_VERSION__", me.sashegdev.zernmc.launcher.utils.Version.getCurrentVersion());
content = text.getBytes(java.nio.charset.StandardCharsets.UTF_8);
}
exchange.getResponseHeaders().set("Content-Type", ct);
exchange.sendResponseHeaders(200, content.length);
exchange.getResponseBody().write(content);
@@ -1832,10 +1547,22 @@ public class JFXLauncher extends Application {
Files.createDirectories(modsDir);
Path targetFile = modsDir.resolve(modName);
// Download mod from server (through ZHttpClient so the read timeout is
// actually enforced — raw client.send() hangs forever on a stalled body)
// Download mod from server
String url = ZHttpClient.getBaseUrl() + "/whitelist/mods/" + modHash + "/" + modName;
ZHttpClient.downloadFileWithSmartProxy(url, targetFile);
java.net.http.HttpRequest request = java.net.http.HttpRequest.newBuilder()
.uri(java.net.URI.create(url))
.timeout(java.time.Duration.ofMinutes(5))
.header("Authorization", "Bearer " + AuthManager.getAccessToken())
.GET()
.build();
java.net.http.HttpResponse<Path> resp = java.net.http.HttpClient.newHttpClient()
.send(request, java.net.http.HttpResponse.BodyHandlers.ofFile(targetFile));
if (resp.statusCode() != 200) {
Files.deleteIfExists(targetFile);
sendJson(exchange, Map.of("success", false, "error", "HTTP " + resp.statusCode()));
return;
}
sendJson(exchange, Map.of("success", true, "message", modName + " installed"));
} catch (Exception e) {
@@ -1843,162 +1570,6 @@ public class JFXLauncher extends Application {
}
}
private void handleModsToggle(HttpExchange exchange) {
try {
Map<String,String> body = parseJson(exchange.getRequestBody());
String instName = body.get("instance");
String file = body.get("file");
String enStr = body.get("enable");
if (instName == null || file == null) { sendJson(exchange, Map.of("success", false, "error", "Missing params")); return; }
boolean enable = enStr == null || enStr.equals("true");
Instance inst = InstanceManager.getInstance(instName);
if (inst == null) { sendJson(exchange, Map.of("success", false, "error", "Pack not found")); return; }
if (inst.isServerPack()) { sendJson(exchange, Map.of("success", false, "error", "Cannot toggle mods in server pack (only whitelist)")); return; }
Path modsDir = inst.getPath().resolve("mods");
Path src = modsDir.resolve(file);
if (!Files.exists(src)) {
// Try alternative name (enable: caller may send base name without .disabled)
String alt = enable ? file + ".disabled" : file.replace(".disabled", "");
Path altSrc = modsDir.resolve(alt);
if (Files.exists(altSrc)) src = altSrc;
else if (enable && file.endsWith(".jar")) {
Path disabledSrc = modsDir.resolve(file + ".disabled");
if (Files.exists(disabledSrc)) src = disabledSrc;
else { sendJson(exchange, Map.of("success", false, "error", "File not found: " + file)); return; }
file = file + ".disabled";
} else { sendJson(exchange, Map.of("success", false, "error", "File not found: " + file)); return; }
}
Path dst;
if (enable) {
if (file.endsWith(".disabled")) dst = modsDir.resolve(file.substring(0, file.length()-9));
else if (src.getFileName().toString().endsWith(".disabled")) dst = modsDir.resolve(src.getFileName().toString().replace(".disabled", ""));
else { sendJson(exchange, Map.of("success", true)); return; }
} else {
if (file.endsWith(".jar")) dst = modsDir.resolve(file + ".disabled");
else if (src.getFileName().toString().endsWith(".jar")) dst = modsDir.resolve(src.getFileName().toString() + ".disabled");
else { sendJson(exchange, Map.of("success", true)); return; }
}
if (Files.exists(dst)) Files.delete(dst);
Files.move(src, dst, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
sendJson(exchange, Map.of("success", true));
} catch (Exception e) { sendJson(exchange, Map.of("success", false, "error", e.getMessage())); }
}
private void handleModsDelete(HttpExchange exchange) {
try {
Map<String,String> body = parseJson(exchange.getRequestBody());
String instName = body.get("instance");
String file = body.get("file");
if (instName == null || file == null) { sendJson(exchange, Map.of("success", false, "error", "Missing params")); return; }
Instance inst = InstanceManager.getInstance(instName);
if (inst == null) { sendJson(exchange, Map.of("success", false, "error", "Pack not found")); return; }
if (inst.isServerPack()) { sendJson(exchange, Map.of("success", false, "error", "Cannot delete mods in server pack")); return; }
Path target = inst.getPath().resolve("mods").resolve(file);
if (!Files.exists(target)) { sendJson(exchange, Map.of("success", false, "error", "File not found")); return; }
Files.delete(target);
sendJson(exchange, Map.of("success", true));
} catch (Exception e) { sendJson(exchange, Map.of("success", false, "error", e.getMessage())); }
}
private void handlePackOpenFolder(HttpExchange exchange) {
try {
Map<String,String> body = parseJson(exchange.getRequestBody());
String name = body.get("name");
if (name == null) {
Map<String,String> q = parseQuery(exchange.getRequestURI().getQuery());
name = q.get("name");
}
if (name == null || name.isBlank()) { sendJson(exchange, Map.of("success", false, "error", "Missing name")); return; }
Instance inst = InstanceManager.getInstance(name);
if (inst == null) { sendJson(exchange, Map.of("success", false, "error", "Pack not found")); return; }
Path dir = inst.getPath();
try {
if (Desktop.isDesktopSupported()) {
Desktop.getDesktop().open(dir.toFile());
} else {
String os = System.getProperty("os.name").toLowerCase();
String cmd = os.contains("win") ? "explorer" : os.contains("mac") ? "open" : "xdg-open";
new ProcessBuilder(cmd, dir.toString()).start();
}
sendJson(exchange, Map.of("success", true));
} catch (Exception e) {
// fallback xdg
try { new ProcessBuilder("xdg-open", dir.toString()).start(); sendJson(exchange, Map.of("success", true)); }
catch (Exception e2) { sendJson(exchange, Map.of("success", false, "error", e.getMessage())); }
}
} catch (Exception e) { sendJson(exchange, Map.of("success", false, "error", e.getMessage())); }
}
private void handlePackSettings(HttpExchange exchange) {
try {
Map<String,String> body = parseJson(exchange.getRequestBody());
String name = body.get("name");
String newName = body.get("newName");
String loader = body.get("loader");
String loaderVersion = body.get("loaderVersion");
if (name == null) { sendJson(exchange, Map.of("success", false, "error", "Missing name")); return; }
Instance inst = InstanceManager.getInstance(name);
if (inst == null) { sendJson(exchange, Map.of("success", false, "error", "Pack not found")); return; }
if (inst.isServerPack()) { sendJson(exchange, Map.of("success", false, "error", "Cannot edit server pack")); return; }
boolean renamed = false;
if (newName != null && !newName.isBlank() && !newName.equals(name)) {
if (newName.matches(".*[\\\\/:*?\"<>|].*") || newName.length() > 32) { sendJson(exchange, Map.of("success", false, "error", "Invalid name")); return; }
if (InstanceManager.getInstance(newName) != null) { sendJson(exchange, Map.of("success", false, "error", "Name already exists")); return; }
Path src = inst.getPath();
Path dst = src.getParent().resolve(newName);
Files.move(src, dst);
// need to update instance path internally - recreate
inst = InstanceManager.getInstance(newName);
renamed = true;
}
Instance target = renamed ? InstanceManager.getInstance(newName != null ? newName : name) : inst;
if (loader != null && !loader.isBlank()) {
target.setLoaderType(loader);
if (loaderVersion != null) target.setLoaderVersion(loaderVersion);
// if loader changed, reinstall loader libs
if (!"vanilla".equalsIgnoreCase(loader) && loaderVersion != null && !loaderVersion.isBlank()) {
// trigger install in background? For now just save meta; user will reinstall manually via manage
}
}
sendJson(exchange, Map.of("success", true, "renamed", renamed));
} catch (Exception e) { sendJson(exchange, Map.of("success", false, "error", e.getMessage())); }
}
private void handlePackDelete(HttpExchange exchange) {
try {
Map<String,String> body = parseJson(exchange.getRequestBody());
String name = body.get("name");
if (name == null) {
Map<String,String> q = parseQuery(exchange.getRequestURI().getQuery());
name = q.get("name");
}
if (name == null || name.isBlank()) { sendJson(exchange, Map.of("success", false, "error", "Missing name")); return; }
boolean ok = InstanceManager.deleteInstance(name);
sendJson(exchange, Map.of("success", ok, "error", ok ? "" : "Delete failed"));
} catch (Exception e) { sendJson(exchange, Map.of("success", false, "error", e.getMessage())); }
}
private void handleFileManager(HttpExchange exchange) {
try {
String os = System.getProperty("os.name").toLowerCase();
String fm;
if (os.contains("win")) fm = "Explorer";
else if (os.contains("mac")) fm = "Finder";
else {
String desktop = System.getenv("XDG_CURRENT_DESKTOP");
if (desktop == null) desktop = System.getenv("DESKTOP_SESSION");
if (desktop != null) {
String d = desktop.toLowerCase();
if (d.contains("gnome")) fm = "Nautilus";
else if (d.contains("kde")) fm = "Dolphin";
else if (d.contains("xfce")) fm = "Thunar";
else fm = "File Manager ("+desktop+")";
} else fm = "File Manager";
}
sendJson(exchange, Map.of("success", true, "data", Map.of("name", fm, "os", os)));
} catch (Exception e) { sendJson(exchange, Map.of("success", false, "error", e.getMessage())); }
}
// ====================== ADMIN ======================
private void handleAdmin(HttpExchange exchange) {
@@ -2087,7 +1658,7 @@ public class JFXLauncher extends Application {
}
}
private static void log(String msg) {
private void log(String msg) {
String timestamp = java.time.LocalTime.now().format(java.time.format.DateTimeFormatter.ofPattern("HH:mm:ss"));
String entry = "[" + timestamp + "] " + msg;
synchronized (launcherLogBuffer) {
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/utils/Config.java
+1 -17
View File
@@ -13,7 +13,7 @@ public class Config {
private static final Properties props = new Properties();
private static volatile int maxMemory = 4096;
private static volatile String serverUrl = "https://api.zern.cc";
private static volatile String serverUrl = "https://api.zernmc.ru";
private static volatile String lastUsername = "Player";
private static volatile int windowWidth = 1280;
private static volatile int windowHeight = 720;
@@ -22,8 +22,6 @@ public class Config {
private static volatile boolean ramManuallySet = false;
private static volatile String locale = "en";
private static volatile boolean systemBasedJvm = false;
private static volatile String onboardedVersion = "";
private static volatile String completedOnboardBlocks = "";
static {
load();
@@ -63,8 +61,6 @@ public class Config {
javaPath = props.getProperty("javaPath", "java");
locale = props.getProperty("locale", "en");
systemBasedJvm = Boolean.parseBoolean(props.getProperty("systemBasedJvm", "false"));
onboardedVersion = props.getProperty("onboardedVersion", "");
completedOnboardBlocks = props.getProperty("completedOnboardBlocks", "");
} catch (Exception e) {
System.err.println(ZAnsi.brightRed("Failed to load config: ") + e.getMessage());
@@ -83,8 +79,6 @@ public class Config {
props.setProperty("javaPath", javaPath);
props.setProperty("locale", locale);
props.setProperty("systemBasedJvm", String.valueOf(systemBasedJvm));
props.setProperty("onboardedVersion", onboardedVersion);
props.setProperty("completedOnboardBlocks", completedOnboardBlocks);
try (var os = Files.newOutputStream(CONFIG_FILE)) {
props.store(os, "ZernMC Launcher Configuration");
@@ -150,11 +144,6 @@ public class Config {
return serverUrl;
}
public static void setServerUrl(String url) {
serverUrl = url != null && !url.isBlank() ? url : serverUrl;
save();
}
public static String getLastUsername() {
return lastUsername;
}
@@ -272,9 +261,4 @@ public class Config {
long totalMB = Runtime.getRuntime().maxMemory() / (1024 * 1024);
return "Available RAM: " + totalMB + " MB | Recommended: " + maxMemory + " MB";
}
public static String getOnboardedVersion() { return onboardedVersion; }
public static void setOnboardedVersion(String v) { onboardedVersion = v != null ? v : ""; save(); }
public static String getCompletedOnboardBlocks() { return completedOnboardBlocks; }
public static void setCompletedOnboardBlocks(String s) { completedOnboardBlocks = s != null ? s : ""; save(); }
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/utils/DomainSelector.java
-133
View File
@@ -1,133 +0,0 @@
package me.sashegdev.zernmc.launcher.utils;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
/**
* Picks the fastest reachable ZernMC API domain at launcher startup.
* TSPU/SNI-обход: если основной api.zern.cc недоступен (заблокирован ТСПУ),
* пробиваем legacy-домены и гео-зеркала и переключаемся на первый живой/быстрый.
*/
public final class DomainSelector {
private static final HttpClient client = HttpClient.newBuilder()
.connectTimeout(Duration.ofSeconds(8))
.version(HttpClient.Version.HTTP_1_1)
.build();
private static final List<String> FALLBACK_CANDIDATES = List.of(
"https://api.zern.cc",
"https://api.zernmc.ru",
"https://api.zernmc.online",
"https://api.pl.zern.cc",
"https://api.swe.zern.cc"
);
private static final String MIRRORS_PATH = "/launcher/mirrors";
private static final String VERSION_PATH = "/launcher/version";
private DomainSelector() {
}
/**
* @return выбранный base URL или null, если ни один домен не ответил.
*/
public static String selectBest() {
List<String> candidates = new ArrayList<>();
String configured = Config.getServerUrl();
if (configured != null && !configured.isBlank() && !candidates.contains(configured)) {
candidates.add(configured);
}
for (String c : FALLBACK_CANDIDATES) {
if (!candidates.contains(c)) {
candidates.add(c);
}
}
candidates.addAll(fetchMirrors());
String best = null;
long bestMs = Long.MAX_VALUE;
for (String base : candidates) {
Probe r = probe(base);
if (r.ok && r.latencyMs >= 0 && r.latencyMs < bestMs) {
bestMs = r.latencyMs;
best = base;
}
}
if (best != null) {
// Make every candidate (incl. geo mirrors) available as a fallback proxy base.
for (String c : candidates) {
ZHttpClient.registerProxyBase(c);
}
}
if (best == null) {
// nothing reachable: keep whatever is configured
System.err.println(ZAnsi.brightRed("DomainSelector: no reachable API domain"));
return null;
}
if (!best.equals(configured)) {
ZHttpClient.setBaseUrl(best);
Config.setServerUrl(best);
System.out.println(ZAnsi.cyan("Selected API domain: " + best)
+ " (" + bestMs + " ms)");
}
return best;
}
private static List<String> fetchMirrors() {
List<String> mirrors = new ArrayList<>();
for (String candidate : FALLBACK_CANDIDATES) {
Probe p = probe(candidate);
if (!p.ok || p.body == null) {
continue;
}
try {
org.json.JSONObject json = new org.json.JSONObject(p.body);
var arr = json.optJSONArray("mirrors");
if (arr == null) {
continue;
}
for (int i = 0; i < arr.length(); i++) {
String url = arr.optJSONObject(i) != null
? arr.optJSONObject(i).optString("url", null) : null;
if (url != null && !url.isBlank() && !mirrors.contains(url)) {
mirrors.add(url);
}
}
break; // первый живой источник списка достаточен
} catch (Exception ignored) {
// continue to next candidate
}
}
return mirrors;
}
private static Probe probe(String baseUrl) {
long t0 = System.currentTimeMillis();
try {
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(baseUrl + MIRRORS_PATH))
.timeout(Duration.ofSeconds(8))
.GET()
.header("User-Agent", "ZernMC-Launcher/DomainSelector")
.build();
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
long ms = System.currentTimeMillis() - t0;
boolean ok = response.statusCode() == 200;
return new Probe(ok, ms, ok ? response.body() : null);
} catch (Exception e) {
return new Probe(false, System.currentTimeMillis() - t0, null);
}
}
private record Probe(boolean ok, long latencyMs, String body) {
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/utils/JavaResolver.java
-42
View File
@@ -1,42 +0,0 @@
package me.sashegdev.zernmc.launcher.utils;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
/**
* Resolves the java executable used to run the launcher itself, so child
* processes (Forge/NeoForge/Fabric installers) run on the bundled JRE
* instead of relying on a system java that may not exist or be too old.
*
* Order of preference:
* 1. The JVM currently running the launcher (bundled jre21 in lib/jre21).
* 2. A jre21 next to the working directory (dev layout).
* 3. System PATH lookup (last resort).
*/
public final class JavaResolver {
private JavaResolver() {}
public static String getJavaExecutable() {
String os = System.getProperty("os.name", "").toLowerCase();
String javaExe = os.contains("win") ? "java.exe" : "java";
Path fromHome = Paths.get(System.getProperty("java.home"), "bin", javaExe);
if (Files.exists(fromHome)) {
return fromHome.toAbsolutePath().toString();
}
Path bundled = Paths.get("").toAbsolutePath().resolve("lib").resolve("jre21").resolve("bin").resolve(javaExe);
if (Files.exists(bundled)) {
return bundled.toString();
}
Path devJre = Paths.get("").toAbsolutePath().resolve("jre21").resolve("bin").resolve(javaExe);
if (Files.exists(devJre)) {
return devJre.toString();
}
return javaExe;
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/utils/LauncherLogger.java
+18 -132
View File
@@ -1,7 +1,5 @@
package me.sashegdev.zernmc.launcher.utils;
import me.sashegdev.zernmc.launcher.ui.jfx.JFXBridge;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -11,11 +9,7 @@ import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
public class LauncherLogger {
@@ -23,29 +17,6 @@ public class LauncherLogger {
private static boolean initialized = false;
private static final ReentrantLock lock = new ReentrantLock();
private static final int STDOUT_QUEUE_CAPACITY = 2048;
private static final BlockingQueue<String> stdoutQueue = new LinkedBlockingQueue<>(STDOUT_QUEUE_CAPACITY);
private static final Thread stdoutWriterThread;
private static final Pattern ANSI_PATTERN = Pattern.compile("\u001B\\[[0-9;]*[A-Za-z]");
static {
stdoutWriterThread = new Thread(() -> {
while (true) {
try {
String line = stdoutQueue.take();
System.out.println(line);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
return;
} catch (Exception ignored) {
// stdout may be a closed or full pipe; never let it kill the writer
}
}
}, "launcher-log-stdout");
stdoutWriterThread.setDaemon(true);
stdoutWriterThread.start();
}
public static synchronized void init() {
if (initialized) return;
initialized = true;
@@ -53,10 +24,11 @@ public class LauncherLogger {
try {
Path logsDir = Paths.get("").toAbsolutePath().resolve("logs");
Files.createDirectories(logsDir);
rotateLogs(logsDir);
logFile = logsDir.resolve("latest.log");
logFile = logsDir.resolve("launcher.log");
Files.writeString(logFile, sessionHeader(), StandardOpenOption.CREATE);
Files.writeString(logFile,
"=== Launcher Log " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + " ===\n",
StandardOpenOption.CREATE, StandardOpenOption.APPEND);
System.out.println("[LauncherLogger] initialized, log: " + logFile.toAbsolutePath());
} catch (Exception e) {
@@ -65,62 +37,6 @@ public class LauncherLogger {
}
}
private static String sessionHeader() {
String ts = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
String os = System.getProperty("os.name") + " " + System.getProperty("os.version")
+ " " + System.getProperty("os.arch");
String java = System.getProperty("java.version") + " (" + System.getProperty("java.vendor") + ")";
String mem = (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " MB";
return "== ZernMC Launcher =======================================================\n"
+ "== Started: " + ts + "\n"
+ "== OS: " + os + "\n"
+ "== Java: " + java + "\n"
+ "== Max memory: " + mem + "\n"
+ "====================================================================\n";
}
/**
* Minecraft-style rotation: compress the previous latest.log into a dated
* .log.gz archive (unlimited history), then remove the legacy launcher.log.
*/
private static void rotateLogs(Path logsDir) {
// Legacy one-instance log from older builds: delete it, it is replaced by latest.log.
try {
Files.deleteIfExists(logsDir.resolve("launcher.log"));
} catch (Exception ignored) {
}
Path latest = logsDir.resolve("latest.log");
try {
if (Files.exists(latest) && Files.size(latest) > 0) {
String ts = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss"));
int n = 1;
Path archive;
do {
archive = logsDir.resolve(ts + (n == 1 ? "" : "-" + n) + ".log.gz");
n++;
} while (Files.exists(archive));
gzip(logsDir, archive, latest);
Files.deleteIfExists(latest);
}
} catch (Exception e) {
System.err.println("[LauncherLogger] rotate error: " + e.getMessage());
}
}
private static void gzip(Path logsDir, Path archive, Path source) {
try (var in = Files.newInputStream(source);
var gz = new java.util.zip.GZIPOutputStream(Files.newOutputStream(archive))) {
byte[] buf = new byte[65536];
int n;
while ((n = in.read(buf)) > 0) {
gz.write(buf, 0, n);
}
} catch (Exception e) {
System.err.println("[LauncherLogger] gzip error: " + e.getMessage());
}
}
public static Path getLogFile() {
return logFile;
}
@@ -149,61 +65,31 @@ public class LauncherLogger {
String ts = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
String line = "[" + ts + "] [" + level + "] " + msg;
// stdout goes through a dedicated writer thread with a bounded queue so a
// full/hung stdout pipe (e.g. javaw piped to the parent exe) can never
// block application threads.
offerStdout(line);
// File and UI log never get ANSI escape codes; the console keeps them.
String plainLine = ANSI_PATTERN.matcher(line).replaceAll("");
// Forward to the JFX UI log so installer/progress output is visible
// in the GUI. The bridge is a safe no-op when JavaFX is unavailable.
JFXBridge.appendLauncherLogFromLogger(plainLine);
System.out.println(line);
if (t != null) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
pw.flush();
offerStdout(sw.toString());
System.err.print(sw.toString());
}
if (logFile != null) {
// Never block indefinitely on the file write; give up after a short wait
// so a stuck writer cannot deadlock every logging thread.
boolean acquired = false;
lock.lock();
try {
acquired = lock.tryLock(200, TimeUnit.MILLISECONDS);
} catch (InterruptedException ignored) {
Thread.currentThread().interrupt();
}
if (acquired) {
try {
Files.writeString(logFile, plainLine + "\n", StandardOpenOption.APPEND);
if (t != null) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
pw.flush();
Files.writeString(logFile, sw.toString(), StandardOpenOption.APPEND);
}
} catch (IOException e) {
System.err.println("[LauncherLogger] write error: " + e.getMessage());
} finally {
lock.unlock();
Files.writeString(logFile, line + "\n", StandardOpenOption.APPEND);
if (t != null) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
pw.flush();
Files.writeString(logFile, sw.toString(), StandardOpenOption.APPEND);
}
} catch (IOException e) {
System.err.println("[LauncherLogger] write error: " + e.getMessage());
} finally {
lock.unlock();
}
}
}
private static void offerStdout(String line) {
try {
if (!stdoutQueue.offer(line, 10, TimeUnit.MILLISECONDS)) {
// Queue full; drop rather than block the caller.
}
} catch (InterruptedException ignored) {
Thread.currentThread().interrupt();
}
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/utils/ProgressBar.java
+68 -79
View File
@@ -1,118 +1,107 @@
package me.sashegdev.zernmc.launcher.utils;
import me.sashegdev.zernmc.launcher.ui.jfx.JFXBridge;
import java.text.DecimalFormat;
/**
* Progress reporting for installs/downloads.
*
* IMPORTANT: never writes directly to System.out/System.err. In JFX mode the
* launcher runs under javaw.exe whose stdout pipe is drained by the parent exe;
* once that pipe fills (or the exe stops reading), a synchronous
* System.out.write/flush blocks the calling (install/UI) thread forever.
* All console/progress output must go through LauncherLogger, which is
* non-blocking by design (bounded stdout queue + tryLock file write + SSE queue).
*/
public class ProgressBar {
private static final int BAR_LENGTH = 40;
private static final DecimalFormat DF = new DecimalFormat("#.##");
private static String currentLabel = "";
private static long currentTotal = 0;
private static final long DOWNLOAD_LOG_INTERVAL_MS = 500;
private static volatile long lastDownloadLogMs = 0;
private static volatile long lastIndeterminateLogMs = 0;
public static void show(String label, long current, long total, String unit) {
currentLabel = label;
currentTotal = total;
JFXBridge.setInstallProgress(label, (int) current, (int) total);
try {
Class<?> jfxClass = Class.forName("me.sashegdev.zernmc.launcher.ui.jfx.JFXLauncher");
java.lang.reflect.Method setProgress = jfxClass.getMethod("setInstallProgress", String.class, int.class, int.class);
setProgress.invoke(null, label, (int) current, (int) total);
} catch (Exception ignored) {}
if (total <= 0) {
LauncherLogger.info(label + " ...");
System.out.print("\r" + ZAnsi.cyan(label) + " ...");
return;
}
int percent = (int) ((double) current / total * 100);
LauncherLogger.info(label + " " + percent + "% (" + current + "/" + total + " " + unit + ")");
double progress = (double) current / total;
int filled = (int) (progress * BAR_LENGTH);
String bar = "█".repeat(filled) + "░".repeat(BAR_LENGTH - filled);
int percent = (int) (progress * 100);
String text = String.format("%s [%s] %3d%% (%d/%d %s)",
ZAnsi.cyan(label), bar, percent, current, total, unit);
System.out.print("\r" + text);
System.out.flush();
}
public static void showDownload(String label, long downloaded, long totalBytes) {
currentLabel = label;
currentTotal = totalBytes;
JFXBridge.setInstallProgress(label + " " + formatBytes(downloaded) + "/" + formatBytes(totalBytes), (int) downloaded, (int) totalBytes);
// Throttle console/file logging: called once per chunk during downloads.
long now = System.currentTimeMillis();
if (now - lastDownloadLogMs >= DOWNLOAD_LOG_INTERVAL_MS) {
lastDownloadLogMs = now;
LauncherLogger.info(label + " " + formatBytes(downloaded)
+ (totalBytes > 0 ? "/" + formatBytes(totalBytes) : ""));
try {
Class<?> jfxClass = Class.forName("me.sashegdev.zernmc.launcher.ui.jfx.JFXLauncher");
java.lang.reflect.Method setProgress = jfxClass.getMethod("setInstallProgress", String.class, int.class, int.class);
setProgress.invoke(null, label + " " + formatBytes(downloaded) + "/" + formatBytes(totalBytes), (int) downloaded, (int) totalBytes);
} catch (Exception ignored) {}
if (totalBytes <= 0) {
System.out.print("\r" + ZAnsi.cyan(label) + " ...");
return;
}
double progress = (double) downloaded / totalBytes;
int filled = (int) (progress * BAR_LENGTH);
String bar = "█".repeat(filled) + "░".repeat(BAR_LENGTH - filled);
String percent = DF.format(progress * 100);
String text = String.format("%s [%s] %6s%% %s / %s",
ZAnsi.cyan(label),
bar,
percent,
formatBytes(downloaded),
formatBytes(totalBytes));
System.out.print("\r" + text);
System.out.flush();
}
public static void showAnimated(String label, long current, long total, String unit) {
currentLabel = label;
currentTotal = total;
JFXBridge.setInstallProgress(label, (int) current, (int) (total > 0 ? total : 100));
long now = System.currentTimeMillis();
if (now - lastDownloadLogMs >= DOWNLOAD_LOG_INTERVAL_MS) {
lastDownloadLogMs = now;
LauncherLogger.info(label + ": " + formatBytes(current)
+ (total > 0 ? "/" + formatBytes(total) + " " + unit : ""));
try {
Class<?> jfxClass = Class.forName("me.sashegdev.zernmc.launcher.ui.jfx.JFXLauncher");
java.lang.reflect.Method setProgress = jfxClass.getMethod("setInstallProgress", String.class, int.class, int.class);
setProgress.invoke(null, label, (int) current, (int) (total > 0 ? total : 100));
} catch (Exception ignored) {}
if (total <= 0) {
char[] spinner = {'|', '/', '-', '\\'};
int idx = (int) (current / 1024) % 4;
System.out.print("\r" + label + " [" + spinner[idx] + "] " + formatBytes(current));
} else {
show(label, (int) ((current * 100) / total), 100, unit);
}
}
public static void finish(String message) {
LauncherLogger.info(message + " done");
}
/**
* Shows a stage without a known total (e.g. running the Forge/NeoForge/Fabric
* installer subprocess). Always updates the UI label so the user sees what the
* launcher is doing right now; console/file logging is throttled to avoid spam.
*/
public static void showIndeterminate(String label) {
currentLabel = label;
currentTotal = 0;
JFXBridge.setInstallProgress(label, 0, 0);
long now = System.currentTimeMillis();
if (now - lastIndeterminateLogMs >= DOWNLOAD_LOG_INTERVAL_MS) {
lastIndeterminateLogMs = now;
LauncherLogger.info(label + " ...");
}
}
/**
* Strips ANSI codes, indentation and [category] prefixes from a child-process
* output line so it can be used as a short, human-readable progress label.
*/
public static String cleanLine(String line) {
if (line == null) return "";
String s = line.replaceAll("\\u001B\\[[;\\d]*m", "").trim();
int bracket = s.indexOf("] ");
if (s.startsWith("[") && bracket > 0) {
s = s.substring(bracket + 2).trim();
}
if (s.length() > 60) {
s = s.substring(0, 57) + "...";
}
return s;
System.out.println("\r" + ZAnsi.brightGreen(message + " done ✓"));
System.out.flush();
}
public static void setStage(String stageName, int stageIndex, int stageCount) {
JFXBridge.setInstallStage(stageName, stageIndex, stageCount);
try {
Class<?> jfxClass = Class.forName("me.sashegdev.zernmc.launcher.ui.jfx.JFXLauncher");
java.lang.reflect.Method setStage = jfxClass.getMethod("setInstallStage", String.class, int.class, int.class);
setStage.invoke(null, stageName, stageIndex, stageCount);
} catch (Exception ignored) {}
}
public static void clearLine() {
// No-op: console progress now goes through LauncherLogger.
System.out.print("\r" + " ".repeat(110) + "\r");
System.out.flush();
}
public static String formatBytes(long bytes) {
@@ -120,4 +109,4 @@ public class ProgressBar {
if (bytes < 1024 * 1024) return DF.format(bytes / 1024.0) + " KB";
return DF.format(bytes / (1024.0 * 1024)) + " MB";
}
}
}
launcher/launcher/src/main/java/sashegdev/zernmc/launcher/utils/ZHttpClient.java
+65 -590
View File
@@ -11,110 +11,37 @@ import java.net.URLEncoder;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.net.http.HttpTimeoutException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream;
public class ZHttpClient {
/**
* Dedicated daemon executor for the shared HttpClient. sendAsync() work runs
* here (never the common ForkJoinPool, so a stalled download cannot starve
* JFX's pools), and daemon threads never keep the launcher JVM alive.
*/
private static final ExecutorService CLIENT_EXECUTOR = Executors.newCachedThreadPool(r -> {
Thread t = new Thread(r, "zern-http-client");
t.setDaemon(true);
return t;
});
private static final HttpClient client = HttpClient.newBuilder()
.connectTimeout(Duration.ofSeconds(15))
.version(HttpClient.Version.HTTP_1_1)
.executor(CLIENT_EXECUTOR)
.build();
private static String BASE_URL = "https://api.zern.cc";
/**
* Alternate proxy endpoints (geo mirrors) used when BASE_URL's proxy fails with
* a connection error (e.g. CDN "Connection reset" from the current region).
* Stay in sync with LAUNCHER_MIRRORS in server/main.py.
*/
private static final List<String> GEO_PROXY_BASES = List.of(
"https://api.zernmc.ru",
"https://api.zernmc.online",
"https://api.pl.zern.cc",
"https://api.swe.zern.cc"
);
/**
* Extra proxy bases discovered at runtime (e.g. mirrors fetched from
* /launcher/mirrors by DomainSelector). Kept in insertion order, deduplicated.
*/
private static final List<String> extraProxyBases = new ArrayList<>();
private static String BASE_URL = "https://api.zernmc.ru";
private static final AtomicBoolean useProxyMode = new AtomicBoolean(false);
private static final AtomicBoolean proxyTested = new AtomicBoolean(false);
private static final AtomicBoolean healthThreadStarted = new AtomicBoolean(false);
public static void setBaseUrl(String url) {
BASE_URL = url;
}
/**
* Registers an additional proxy base URL (mirror/geo domain) that the smart
* proxy fallback may rotate through. No-op if already present.
*/
public static void registerProxyBase(String url) {
if (url == null || url.isBlank()) return;
String normalized = url.endsWith("/") ? url.substring(0, url.length() - 1) : url;
synchronized (extraProxyBases) {
if (!extraProxyBases.contains(normalized)) {
extraProxyBases.add(normalized);
}
}
}
/**
* Ordered, deduplicated list of proxy endpoints to attempt: the primary
* BASE_URL first, then geo mirrors and any runtime-discovered mirrors.
*/
private static List<String> getProxyBases() {
List<String> bases = new ArrayList<>();
bases.add(BASE_URL);
for (String geo : GEO_PROXY_BASES) {
if (!bases.contains(geo)) bases.add(geo);
}
synchronized (extraProxyBases) {
for (String m : extraProxyBases) {
if (!bases.contains(m)) bases.add(m);
}
}
return bases;
}
public static String getBaseUrl() {
return BASE_URL;
}
public enum ServiceType {
ZERN_SERVER("https://api.zern.cc", true),
ZERN_SERVER("https://api.zernmc.ru", true),
FABRIC_META("https://meta.fabricmc.net", false),
FABRIC_MAVEN("https://maven.fabricmc.net", false),
MOJANG_META("https://piston-meta.mojang.com", false),
@@ -141,7 +68,7 @@ public class ZHttpClient {
private static final Map<ServiceType, Long> serviceLastCheckTime = new ConcurrentHashMap<>();
private static final Map<ServiceType, Boolean> serviceHealthy = new ConcurrentHashMap<>();
private static final int MAX_FAILS_BEFORE_PROXY = 1;
private static final int MAX_FAILS_BEFORE_PROXY = 2;
private static final long HEALTH_CHECK_INTERVAL_MS = 60000;
private static final long CHECK_TIMEOUT_MS = 7000;
@@ -198,51 +125,21 @@ public class ZHttpClient {
serviceFailCount.put(service, MAX_FAILS_BEFORE_PROXY);
}
}
LauncherLogger.info("[NET] " + service.name() + ": "
+ (isHealthy ? "OK" : "unavailable") +
(serviceProxyMode.get(service) ? " (proxy mode)" : " (direct)"));
}
if (!serviceHealthy.get(ServiceType.ZERN_SERVER)) {
if (verbose) {
System.out.println(ZAnsi.brightRed("Critical error: Zern server is unreachable!"));
}
LauncherLogger.warn("[NET] Critical: Zern server unreachable");
} else {
String ip = getClientPublicIp();
LauncherLogger.info("[NET] Client public IP: " + (ip != null ? ip : "unknown"));
}
proxyTested.set(true);
startHealthCheckThread();
if (verbose) {
startHealthCheckThread();
printStats();
}
}
/**
* Asks the Zern server what public IP it sees for this client (used to
* attribute user logs when login/registration fails). Returns null on failure.
*/
public static String getClientPublicIp() {
try {
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(BASE_URL + "/launcher/ip"))
.timeout(Duration.ofMillis(15000))
.GET()
.header("User-Agent", "ZernMC-Launcher/IPCheck")
.build();
HttpResponse<String> response = sendBounded(request, HttpResponse.BodyHandlers.ofString(), 15);
if (response.statusCode() == 200) {
JSONObject json = new JSONObject(response.body());
return json.optString("ip", null);
}
} catch (Exception e) {
return null;
}
return null;
}
public static void forceCheckMojangServices() {
System.out.println(ZAnsi.cyan("Forcing Mojang services check..."));
@@ -263,9 +160,6 @@ public class ZHttpClient {
}
private static boolean checkServiceHealth(ServiceType service) {
if (service == ServiceType.ZERN_SERVER) {
return checkDirectConnection(BASE_URL);
}
return checkDirectConnection(service.getBaseUrl());
}
@@ -286,7 +180,7 @@ public class ZHttpClient {
.header("User-Agent", "ZernMC-Launcher/HealthCheck")
.build();
HttpResponse<String> response = sendBounded(request, HttpResponse.BodyHandlers.ofString(), 10);
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
int code = response.statusCode();
return code == 200 || code == 404;
} catch (Exception e) {
@@ -295,8 +189,6 @@ public class ZHttpClient {
}
private static void startHealthCheckThread() {
if (!healthThreadStarted.compareAndSet(false, true)) return;
Thread healthThread = new Thread(() -> {
while (true) {
try {
@@ -321,7 +213,7 @@ public class ZHttpClient {
if (isHealthy && serviceProxyMode.get(service)) {
serviceProxyMode.put(service, false);
serviceFailCount.put(service, 0);
LauncherLogger.info("[NET] " + service.name() + " restored, switched to direct connection");
System.out.println(ZAnsi.green("[NET] " + service.name() + " restored, switched to direct connection"));
} else if (!isHealthy && !serviceProxyMode.get(service)) {
int fails = serviceFailCount.getOrDefault(service, 0) + 1;
serviceFailCount.put(service, fails);
@@ -329,7 +221,7 @@ public class ZHttpClient {
if (fails >= MAX_FAILS_BEFORE_PROXY) {
serviceProxyMode.put(service, true);
LauncherLogger.warn("[NET] " + service.name() + " unavailable, proxy mode enabled");
System.out.println(ZAnsi.yellow("[NET] " + service.name() + " unavailable, proxy mode enabled"));
}
}
}
@@ -341,13 +233,10 @@ public class ZHttpClient {
if (url.contains("piston-meta.mojang.com") || url.contains("launchermeta.mojang.com"))
return ServiceType.MOJANG_META;
if (url.contains("resources.download.minecraft.net")) return ServiceType.MOJANG_RESOURCES;
if (url.contains("maven.minecraftforge.net") || url.contains("files.minecraftforge.net")) return ServiceType.FORGE_MAVEN;
if (url.contains("maven.minecraftforge.net")) return ServiceType.FORGE_MAVEN;
if (url.contains("maven.neoforged.net")) return ServiceType.NEOFORGE_MAVEN;
if (url.contains("google.com")) return ServiceType.GOOGLE;
if (url.contains("cloudflare.com")) return ServiceType.CLOUDFLARE;
if (url.contains("libraries.minecraft.net")) return ServiceType.MOJANG_RESOURCES;
if (url.contains("piston-data.mojang.com")) return ServiceType.MOJANG_META;
if (url.contains("repo1.maven.org") || url.contains("repo.maven.apache.org")) return ServiceType.MOJANG_RESOURCES;
return null;
}
@@ -357,9 +246,7 @@ public class ZHttpClient {
ServiceType service = detectService(url);
if (service == null || service.isAlwaysDirect()) return false;
if (serviceProxyMode.getOrDefault(service, false)) return true;
return serviceFailCount.getOrDefault(service, 0) >= MAX_FAILS_BEFORE_PROXY;
return serviceProxyMode.getOrDefault(service, false);
}
private static boolean isConnectionError(Throwable e) {
@@ -369,24 +256,10 @@ public class ZHttpClient {
return cause instanceof java.net.ConnectException ||
cause instanceof java.net.UnknownHostException ||
cause instanceof java.nio.channels.ClosedChannelException ||
cause instanceof java.net.SocketException ||
msg.contains("connection") ||
msg.contains("timeout") ||
msg.contains("refused") ||
msg.contains("received within") ||
msg.contains("closed") ||
msg.contains("reset") ||
msg.contains("abort");
}
/**
* Whether an error should be retried. Includes connection errors and transient
* server-side failures (5xx / 429) from the Zern proxy or upstream services.
*/
private static boolean isRetryableError(Throwable e) {
if (isConnectionError(e)) return true;
String msg = e.getMessage() != null ? e.getMessage().toLowerCase() : "";
return msg.contains("http 5") || msg.contains("http 429");
msg.contains("closed");
}
private static void markServiceAsBlocked(String url) {
@@ -399,45 +272,7 @@ public class ZHttpClient {
if (fails >= MAX_FAILS_BEFORE_PROXY && !serviceProxyMode.get(service)) {
serviceProxyMode.put(service, true);
LauncherLogger.warn("[NET] " + service.name() + " blocked, switching to proxy");
}
}
/**
* HTTP send with a hard, actually-enforced timeout.
*
* NB: HttpRequest.timeout() alone is NOT reliable for streaming body handlers
* (BodyHandlers.ofFile/ofString): the JDK cancels the request timer as soon as
* response headers arrive, so a download that stalls mid-body blocks
* client.send() forever (no exception, no retry, no proxy fallback — the
* exact "install hangs at 0%" bug). Therefore we drive the exchange through
* sendAsync() + future.get(timeout) and abort it with cancel() on timeout.
*
* The client runs on a dedicated daemon executor (see CLIENT_EXECUTOR), so
* this does not reintroduce the v1.0.14.2 JFX hang (ForkJoinPool starvation /
* non-daemon executor keeping the JVM alive) that forced the old sync-send
* implementation.
*/
private static <T> HttpResponse<T> sendBounded(HttpRequest request, HttpResponse.BodyHandler<T> handler, long timeoutSeconds) throws IOException, InterruptedException {
HttpRequest timed = HttpRequest.newBuilder(request, (name, value) -> true)
.timeout(Duration.ofSeconds(timeoutSeconds))
.build();
CompletableFuture<HttpResponse<T>> future = client.sendAsync(timed, handler);
try {
return future.get(timeoutSeconds, TimeUnit.SECONDS);
} catch (TimeoutException e) {
future.cancel(true);
throw new HttpTimeoutException("Response not received within " + timeoutSeconds + "s: " + timed.uri());
} catch (ExecutionException e) {
Throwable cause = e.getCause();
if (cause instanceof IOException) throw (IOException) cause;
if (cause instanceof InterruptedException) throw (InterruptedException) cause;
if (cause instanceof RuntimeException) throw (RuntimeException) cause;
throw new IOException("HTTP request failed: " + timed.uri(), cause);
} catch (InterruptedException e) {
future.cancel(true);
Thread.currentThread().interrupt();
throw e;
System.out.println(ZAnsi.yellow("[NET] " + service.name() + " blocked, switching to proxy"));
}
}
@@ -451,68 +286,50 @@ public class ZHttpClient {
.GET()
.build();
HttpResponse<String> response = sendBounded(request, HttpResponse.BodyHandlers.ofString(), 30);
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
if (response.statusCode() == 200) {
directSuccessCount++;
return response.body();
}
if (response.statusCode() >= 400) {
throw new IOException("HTTP " + response.statusCode());
}
} catch (Exception e) {
if (e instanceof IOException && isConnectionError(e)) {
if (isConnectionError(e)) {
directFailCount++;
markServiceAsBlocked(url);
} else if (!(e instanceof IOException)) {
throw e;
}
// any direct failure: the same resource is retried via the proxy below
}
}
List<String> proxyBases = getProxyBases();
int maxRetries = 3;
for (int attempt = 1; attempt <= maxRetries; attempt++) {
// Rotate through every proxy base so one region's Connection Reset does not
// burn all retries on the same endpoint.
String proxyBase = proxyBases.get((attempt - 1) % proxyBases.size());
try {
String encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8);
String proxyUrl = proxyBase + "/proxy/download?url=" + encodedUrl;
try {
String encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8);
String proxyUrl = BASE_URL + "/proxy/download?url=" + encodedUrl;
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(proxyUrl))
.timeout(Duration.ofSeconds(40))
.header("User-Agent", "ZernMC-Launcher/1.0")
.GET()
.build();
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(proxyUrl))
.timeout(Duration.ofSeconds(40))
.header("User-Agent", "ZernMC-Launcher/1.0")
.GET()
.build();
HttpResponse<String> response = sendBounded(request, HttpResponse.BodyHandlers.ofString(), 45);
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
if (response.statusCode() != 200) {
throw new IOException("Proxy HTTP " + response.statusCode());
}
proxySuccessCount++;
return response.body();
} catch (Exception e) {
if (attempt == maxRetries || !isRetryableError(e)) {
throw new IOException("Failed to fetch data directly or via proxy (" + proxyBase + "): " + e.getMessage(), e);
}
LauncherLogger.warn("[NET] Proxy fetch attempt " + attempt + "/" + maxRetries
+ " via " + proxyBase + " failed (" + e.getMessage() + "), next proxy base");
try { Thread.sleep(1000 * attempt); } catch (InterruptedException ie) { break; }
if (response.statusCode() != 200) {
throw new IOException("Proxy HTTP " + response.statusCode());
}
}
throw new IOException("Failed to fetch data: " + url);
proxySuccessCount++;
return response.body();
} catch (Exception e) {
throw new IOException("Failed to fetch data directly or via proxy: " + e.getMessage(), e);
}
}
public static void downloadFileWithSmartProxy(String url, Path target) throws Exception {
Path tmp = target.resolveSibling(target.getFileName() + ".part");
try {
Files.deleteIfExists(tmp);
} catch (IOException ignored) {}
if (!shouldUseProxyForUrl(url)) {
try {
HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
@@ -530,108 +347,37 @@ public class ZHttpClient {
HttpRequest request = requestBuilder.build();
HttpResponse<Path> response = sendBounded(request, HttpResponse.BodyHandlers.ofFile(tmp), 45);
HttpResponse<Path> response = client.send(request, HttpResponse.BodyHandlers.ofFile(target));
if (response.statusCode() == 200) {
moveIntoPlace(tmp, target);
directSuccessCount++;
return;
}
// non-200 response: fall through to proxy below
} catch (Exception e) {
if (isConnectionError(e)) {
directFailCount++;
markServiceAsBlocked(url);
} else {
throw e;
}
// any direct failure: the same resource is retried via the proxy below
}
}
List<String> proxyBases = getProxyBases();
int maxRetries = 3;
for (int attempt = 1; attempt <= maxRetries; attempt++) {
// Rotate through every proxy base so one region's Connection Reset does not
// burn all retries on the same endpoint.
String proxyBase = proxyBases.get((attempt - 1) % proxyBases.size());
try {
String encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8);
String proxyUrl = proxyBase + "/proxy/download?url=" + encodedUrl;
try {
Files.deleteIfExists(tmp);
} catch (IOException ignored) {}
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(proxyUrl))
.timeout(Duration.ofMinutes(5))
.header("User-Agent", "ZernMC-Launcher/1.0")
.GET()
.build();
HttpResponse<Path> response = sendBounded(request, HttpResponse.BodyHandlers.ofFile(tmp), 300);
if (response.statusCode() != 200) {
throw new IOException("Proxy download failed: HTTP " + response.statusCode());
}
moveIntoPlace(tmp, target);
proxySuccessCount++;
return;
} catch (Exception e) {
try {
Files.deleteIfExists(tmp);
} catch (IOException ignored) {}
if (attempt == maxRetries || !isRetryableError(e)) {
throw new IOException("Proxy download failed (" + proxyBase + "): " + e.getMessage(), e);
}
LauncherLogger.warn("[NET] Proxy download attempt " + attempt + "/" + maxRetries
+ " via " + proxyBase + " failed (" + e.getMessage() + "), next proxy base");
try { Thread.sleep(1000 * attempt); } catch (InterruptedException ie) { break; }
}
}
}
/**
* Atomically replaces the destination with the fully-downloaded temp file.
* Prevents a Connection Reset mid-transfer from leaving a corrupt partial
* file at the final path that later "file exists" checks would treat as installed.
*/
private static void moveIntoPlace(Path tmp, Path target) throws IOException {
Files.createDirectories(target.getParent());
try {
Files.move(tmp, target, java.nio.file.StandardCopyOption.REPLACE_EXISTING,
java.nio.file.StandardCopyOption.ATOMIC_MOVE);
} catch (java.nio.file.AtomicMoveNotSupportedException e) {
Files.move(tmp, target, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
}
}
/**
* Retries a request against the Zern server. The server proxies are slow on cold cache
* and may return transient 502/5xx when upstreams are flaky, so a single failure should
* not immediately force a direct fallback.
*/
public static String getRetry(String endpoint, int maxAttempts) throws IOException, InterruptedException {
IOException last = null;
for (int attempt = 1; attempt <= maxAttempts; attempt++) {
try {
return get(endpoint);
} catch (IOException e) {
last = e;
if (!isRetryableError(e)) throw e;
if (attempt < maxAttempts) {
LauncherLogger.warn("[NET] Server request retry " + attempt + "/" + maxAttempts + " for " + endpoint + " (" + e.getMessage() + ")");
try { Thread.sleep(500L * attempt); } catch (InterruptedException ie) {
Thread.currentThread().interrupt();
throw ie;
}
}
}
}
throw last;
String encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8);
String proxyUrl = BASE_URL + "/proxy/download?url=" + encodedUrl;
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(proxyUrl))
.timeout(Duration.ofMinutes(5))
.header("User-Agent", "ZernMC-Launcher/1.0")
.GET()
.build();
HttpResponse<Path> response = client.send(request, HttpResponse.BodyHandlers.ofFile(target));
if (response.statusCode() != 200) {
throw new IOException("Proxy download failed: HTTP " + response.statusCode());
}
proxySuccessCount++;
}
public static String get(String endpoint) throws IOException, InterruptedException {
@@ -648,7 +394,7 @@ public class ZHttpClient {
}
HttpRequest request = requestBuilder.build();
HttpResponse<String> response = sendBounded(request, HttpResponse.BodyHandlers.ofString(), 20);
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
if (response.statusCode() != 200) {
throw new IOException("HTTP " + response.statusCode());
@@ -666,59 +412,22 @@ public class ZHttpClient {
}
public static JSONObject getMojangVersionManifest() throws IOException, InterruptedException {
try {
return getMojangVersionManifestViaServer();
} catch (Exception e) {
LauncherLogger.warn("[NET] Server manifest proxy failed (" + e.getMessage() + "), trying direct piston-meta...");
return new JSONObject(getWithSmartProxy("https://piston-meta.mojang.com/mc/game/version_manifest_v2.json"));
}
}
/**
* Fetch the Mojang version manifest through the Zern server proxy.
* The launcher's own API is reliably reachable, and the manifest is cached server-side.
*/
public static JSONObject getMojangVersionManifestViaServer() throws IOException, InterruptedException {
return new JSONObject(getRetry("/proxy/mojang/version_manifest", 3));
}
/**
* Fetch a single Mojang version JSON through the Zern server proxy.
* Avoids direct connections to piston-meta.mojang.com entirely.
*/
public static JSONObject getMojangVersionViaServer(String versionId) throws IOException, InterruptedException {
return new JSONObject(getRetry("/proxy/mojang/version/" + URLEncoder.encode(versionId, StandardCharsets.UTF_8), 3));
String url = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json";
String response = getWithSmartProxy(url);
return new JSONObject(response);
}
public static JSONObject getMojangVersionJson(String versionId) throws IOException, InterruptedException {
long deadline = System.currentTimeMillis() + 90_000;
LauncherLogger.info("[NET] Fetching version info for " + versionId + " via server proxy...");
try {
JSONObject result = getMojangVersionViaServer(versionId);
LauncherLogger.info("[NET] Version info for " + versionId + " fetched via proxy (" + (System.currentTimeMillis() - (deadline - 90_000)) + "ms)");
return result;
} catch (Exception e) {
if (System.currentTimeMillis() >= deadline) {
throw new IOException("Version " + versionId + " fetch timed out after 90s: " + e.getMessage(), e);
}
LauncherLogger.warn("[NET] Server version proxy failed (" + e.getMessage() + "), trying direct piston-meta...");
JSONObject manifest = getMojangVersionManifest();
JSONArray versions = manifest.getJSONArray("versions");
JSONObject manifest = getMojangVersionManifest();
JSONArray versions = manifest.getJSONArray("versions");
for (int i = 0; i < versions.length(); i++) {
JSONObject v = versions.getJSONObject(i);
if (v.getString("id").equals(versionId)) {
if (System.currentTimeMillis() >= deadline) {
throw new IOException("Version " + versionId + " fetch timed out after 90s");
}
LauncherLogger.info("[NET] Fetching version info for " + versionId + " directly...");
JSONObject result = new JSONObject(getWithSmartProxy(v.getString("url")));
LauncherLogger.info("[NET] Version info for " + versionId + " fetched directly");
return result;
}
for (int i = 0; i < versions.length(); i++) {
JSONObject v = versions.getJSONObject(i);
if (v.getString("id").equals(versionId)) {
return new JSONObject(getWithSmartProxy(v.getString("url")));
}
throw new IOException("Version " + versionId + " not found");
}
throw new IOException("Version " + versionId + " not found");
}
public static String getForgeVersionsXml() throws IOException, InterruptedException {
@@ -739,209 +448,6 @@ public class ZHttpClient {
return getWithSmartProxy(url);
}
/**
* Scans every installed version JSON in the instance and downloads any library file
* that is missing. Used after loader installers run (their subprocess downloads can
* time out on restricted networks), so remaining libraries are pulled through the smart proxy.
*/
public static void repairMissingLibraries(Path minecraftDir) {
Path versionsDir = minecraftDir.resolve("versions");
if (!Files.isDirectory(versionsDir)) return;
try (Stream<Path> stream = Files.list(versionsDir)) {
stream.filter(Files::isDirectory).forEach(versionDir -> {
Path versionJson = versionDir.resolve(versionDir.getFileName() + ".json");
if (Files.exists(versionJson)) {
try {
repairLibrariesFromJson(versionJson, minecraftDir);
} catch (Exception e) {
LauncherLogger.warn("[LIB] Repair skipped for " + versionDir.getFileName() + ": " + e.getMessage());
}
}
});
} catch (IOException e) {
LauncherLogger.warn("[LIB] Repair scan failed: " + e.getMessage());
}
}
/**
* Downloads every missing library listed in a version/loadermod JSON into minecraftDir/libraries.
* Supports both the Minecraft format (downloads.artifact.path/url) and the maven-coordinates
* format (name + base url) used by Fabric loadermod JSONs.
*/
public static void repairLibrariesFromJson(Path jsonPath, Path minecraftDir) throws Exception {
JSONObject root = new JSONObject(Files.readString(jsonPath));
if (!root.has("libraries")) return;
JSONArray libraries = root.getJSONArray("libraries");
int repaired = 0;
for (int i = 0; i < libraries.length(); i++) {
JSONObject lib = libraries.getJSONObject(i);
try {
if (lib.has("downloads") && lib.getJSONObject("downloads").has("artifact")) {
JSONObject art = lib.getJSONObject("downloads").getJSONObject("artifact");
String url = art.getString("url");
String path = art.getString("path");
Path target = minecraftDir.resolve("libraries").resolve(path);
if (!Files.exists(target)) {
Files.createDirectories(target.getParent());
downloadFileWithSmartProxy(url, target);
repaired++;
}
} else if (lib.has("name") && lib.has("url")) {
Path target = resolveCoordinatesTarget(lib);
if (target != null && !Files.exists(target)) {
Files.createDirectories(target.getParent());
downloadCoordinatesArtifact(lib, target);
repaired++;
}
}
} catch (Exception e) {
String libName = lib.optString("name", lib.optString("path", "?"));
LauncherLogger.warn("[LIB] Repair failed for " + libName + ": " + e.getMessage());
}
}
if (repaired > 0) {
LauncherLogger.info("[LIB] Repaired " + repaired + " missing libraries");
}
}
/**
* Pre-downloads every library referenced by a loader installer jar (Forge/NeoForge).
* The installer later runs as a separate JVM subprocess that downloads libraries
* directly from the loader's maven repository, bypassing this launcher's smart proxy.
* On blocked networks (e.g. maven.minecraftforge.net unreachable) that subprocess
* fails with "Connection reset". Because the installer reuses any library already
* present with a matching checksum ("File exists: Checksum validated"), pre-seeding
* those files through the proxy lets the install complete without direct downloads.
*
* @return number of new library files downloaded
*/
public static int prefetchInstallerLibraries(Path installerJar, Path minecraftDir) {
int prefetched = 0;
try (java.util.zip.ZipFile zip = new java.util.zip.ZipFile(installerJar.toFile())) {
for (String jsonName : List.of("version.json", "install_profile.json")) {
java.util.zip.ZipEntry entry = zip.getEntry(jsonName);
if (entry == null) continue;
String content = new String(zip.getInputStream(entry).readAllBytes(), StandardCharsets.UTF_8);
JSONObject root = new JSONObject(content);
JSONArray libs = root.optJSONArray("libraries");
if (libs == null) continue;
for (int i = 0; i < libs.length(); i++) {
JSONObject lib = libs.optJSONObject(i);
if (lib == null) continue;
JSONObject downloads = lib.optJSONObject("downloads");
if (downloads == null) continue;
JSONObject artifact = downloads.optJSONObject("artifact");
if (artifact == null) continue;
String url = artifact.optString("url", null);
String path = artifact.optString("path", null);
String sha1 = artifact.optString("sha1", null);
if (url == null || path == null) continue;
Path target = minecraftDir.resolve("libraries").resolve(path);
try {
if (Files.exists(target)) {
if (sha1 == null || sha1.isEmpty() || sha1Matches(target, sha1)) {
continue;
}
Files.delete(target);
}
Files.createDirectories(target.getParent());
downloadFileWithSmartProxy(url, target);
if (sha1 != null && !sha1.isEmpty() && !sha1Matches(target, sha1)) {
Files.delete(target);
LauncherLogger.warn("[LIB] Checksum mismatch after prefetch: " + path);
continue;
}
prefetched++;
LauncherLogger.info("[LIB] Prefetched " + path);
} catch (Exception e) {
LauncherLogger.warn("[LIB] Prefetch failed for " + path + ": " + e.getMessage());
}
}
}
} catch (Exception e) {
LauncherLogger.warn("[LIB] Installer prefetch scan failed: " + e.getMessage());
}
return prefetched;
}
private static boolean sha1Matches(Path file, String expectedSha1) throws Exception {
java.security.MessageDigest digest = java.security.MessageDigest.getInstance("SHA-1");
try (java.io.InputStream in = Files.newInputStream(file)) {
byte[] buffer = new byte[8192];
int read;
while ((read = in.read(buffer)) != -1) {
digest.update(buffer, 0, read);
}
}
StringBuilder sb = new StringBuilder();
for (byte b : digest.digest()) {
sb.append(String.format("%02x", b));
}
return sb.toString().equalsIgnoreCase(expectedSha1);
}
private static String resolveCoordinatesUrl(JSONObject lib) {
String name = lib.getString("name");
String base = lib.getString("url");
String[] parts = name.split(":");
String group = parts[0];
String artifact = parts[1];
String version = parts[2];
String classifier = parts.length > 3 ? parts[3] : null;
String basePath = group.replace('.', '/') + "/" + artifact + "/" + version + "/";
String fileName = artifact + "-" + version + (classifier != null ? "-" + classifier : "") + ".jar";
return base.endsWith("/") ? base + basePath + fileName : base + "/" + basePath + fileName;
}
private static String resolveCoordinatesUrlV2(JSONObject lib) {
String name = lib.getString("name");
String base = lib.getString("url");
String[] parts = name.split(":");
String group = parts[0];
String artifact = parts[1];
String version = parts[2];
String classifier = parts.length > 3 ? parts[3] : null;
String basePath = group.replace('.', '/') + "/" + artifact + "/" + version + "/";
String fileName = artifact + "-" + version + "-v2" + (classifier != null ? "-" + classifier : "") + ".jar";
return base.endsWith("/") ? base + basePath + fileName : base + "/" + basePath + fileName;
}
private static void downloadCoordinatesArtifact(JSONObject lib, Path target) throws Exception {
IOException last = null;
for (String candidateUrl : List.of(resolveCoordinatesUrl(lib), resolveCoordinatesUrlV2(lib))) {
try {
downloadFileWithSmartProxy(candidateUrl, target);
return;
} catch (IOException e) {
last = e;
Files.deleteIfExists(target);
}
}
throw last != null ? last : new IOException("Could not resolve coordinates artifact: " + lib.optString("name", "?"));
}
private static Path resolveCoordinatesTarget(JSONObject lib) {
String name = lib.getString("name");
String[] parts = name.split(":");
if (parts.length < 3) return null;
String group = parts[0];
String artifact = parts[1];
String version = parts[2];
String classifier = parts.length > 3 ? parts[3] : null;
String basePath = group.replace('.', '/') + "/" + artifact + "/" + version + "/";
String fileName = artifact + "-" + version + (classifier != null ? "-" + classifier : "") + ".jar";
return Path.of(basePath, fileName);
}
private static List<String> parseFabricVersionsFromJson(String json) {
JSONArray array = new JSONArray(json);
List<String> versions = new ArrayList<>();
@@ -978,37 +484,6 @@ public class ZHttpClient {
return useProxyMode.get();
}
public static boolean isNetworkInitialized() {
return proxyTested.get();
}
public static boolean isZernServerHealthy() {
return serviceHealthy.getOrDefault(ServiceType.ZERN_SERVER, false);
}
public static Map<String, Object> getNetworkStatus() {
Map<String, Object> status = new HashMap<>();
status.put("initialized", proxyTested.get());
status.put("globalProxy", useProxyMode.get());
status.put("directSuccess", directSuccessCount);
status.put("directFail", directFailCount);
status.put("proxySuccess", proxySuccessCount);
List<Map<String, Object>> services = new ArrayList<>();
for (ServiceType type : ServiceType.values()) {
if (type.isAlwaysDirect()) continue;
Map<String, Object> s = new HashMap<>();
s.put("name", type.name());
s.put("baseUrl", type.getBaseUrl());
s.put("healthy", serviceHealthy.getOrDefault(type, false));
s.put("proxy", serviceProxyMode.getOrDefault(type, false));
s.put("fails", serviceFailCount.getOrDefault(type, 0));
services.add(s);
}
status.put("services", services);
return status;
}
public static void printStats() {
System.out.println(ZAnsi.cyan("\n=== Network Stats ==="));
System.out.println(ZAnsi.white("Global proxy: ") + (useProxyMode.get() ? "ON" : "OFF"));
launcher/launcher/src/resources/ui/icons/zernmc.ico
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 103 KiB

launcher/launcher/src/resources/ui/icons/zernmc.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

launcher/launcher/src/resources/ui/index.html
+24 -116
View File
@@ -12,10 +12,10 @@
<div id="app">
<!-- Login Screen -->
<div id="login-screen" class="screen">
<div class="login-container" id="login-container">
<div class="login-header">
<div class="login-container">
<div class="login-brand">
<div class="brand-icon">
<svg width="40" height="40" viewBox="0 0 56 56" fill="none">
<svg width="56" height="56" viewBox="0 0 56 56" fill="none">
<rect width="56" height="56" rx="14" fill="url(#brandGrad)"/>
<path d="M18 28 L28 18 L38 28 L28 38 Z" fill="white" opacity="0.9"/>
<defs>
@@ -26,70 +26,29 @@
</defs>
</svg>
</div>
<h1 class="login-title" id="login-title" data-i18n="login.title">Sign In</h1>
<p class="login-subtitle" id="login-subtitle" data-i18n="login.subtitle">Welcome back to ZernMC</p>
<span id="version" class="hidden">__LAUNCHER_VERSION__</span>
<h1 class="brand-title">ZernMC</h1>
<p class="brand-sub">Launcher <span id="version" data-i18n="version">1.0.9</span></p>
</div>
<form id="login-form" class="login-form">
<div class="field">
<input type="text" id="username" placeholder="Username" data-i18n-placeholder="login.username" autocomplete="username" required>
<label for="username" data-i18n="login.username">Username</label>
<input type="text" id="username" autocomplete="username" required>
</div>
<div class="field">
<input type="password" id="password" placeholder="Password" data-i18n-placeholder="login.password" autocomplete="current-password" required>
<label for="password" data-i18n="login.password">Password</label>
<input type="password" id="password" autocomplete="current-password" required>
<span class="field-hint hidden" id="password-hint" data-i18n="login.passTooShort"></span>
</div>
<div class="field hidden" id="confirm-field">
<label for="confirm-password" data-i18n="login.confirm">Confirm Password</label>
<input type="password" id="confirm-password" autocomplete="new-password">
</div>
<p id="login-error" class="error-msg hidden"></p>
<button type="submit" class="btn-primary" id="login-btn">
<span class="btn-label" id="login-btn-label" data-i18n="login.title">Sign In</span>
<span class="btn-label" data-i18n="login.title">Sign In</span>
<div class="spinner hidden"></div>
</button>
<div class="login-footer" id="login-footer">
<span id="footer-hint" data-i18n="login.hint">Need an account?</span>
<span class="login-footer-action" id="footer-action" data-i18n="login.register">Register</span>
</div>
<p class="login-hint" data-i18n="login.hint">New account will be created automatically on first login</p>
</form>
</div>
</div>
<!-- Offline Screen -->
<div id="offline-screen" class="screen hidden">
<div class="offline-container">
<div class="offline-badge">
<svg width="44" height="44" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 1l22 22"/><path d="M16.72 11.06A10.94 10.94 0 0 1 19 12.55"/><path d="M5 12.55a10.94 10.94 0 0 1 5.17-2.39"/><path d="M10.71 5.05A16 16 0 0 1 22.58 9"/><path d="M1.42 9a15.91 15.91 0 0 1 4.7-2.88"/><path d="M8.53 16.11a6 6 0 0 1 6.95 0"/><line x1="12" y1="20" x2="12.01" y2="20"/></svg>
</div>
<h2 class="offline-title" data-i18n="offline.title">Offline Mode</h2>
<p class="offline-subtitle" data-i18n="offline.subtitle">The Zern server is unreachable. You can still launch locally installed packs without an account.</p>
<form id="offline-form" class="login-form">
<div class="field">
<label for="offline-nickname" data-i18n="offline.nickname">Nickname</label>
<input type="text" id="offline-nickname" maxlength="16" autocomplete="off">
</div>
<div class="field">
<label for="offline-instance" data-i18n="offline.instance">Pack</label>
<select id="offline-instance"></select>
</div>
<p id="offline-error" class="error-msg hidden"></p>
<button type="submit" class="btn-primary" id="offline-launch-btn">
<span class="btn-label" data-i18n="offline.launch">Launch Offline</span>
<div class="spinner hidden"></div>
</button>
</form>
<div class="offline-footer">
<button type="button" class="btn-ghost" id="offline-retry-btn" data-i18n="offline.retry">Try again online</button>
<button type="button" class="btn-ghost" id="offline-exit-btn" data-i18n="offline.exit">Exit</button>
</div>
</div>
</div>
<!-- Loading Overlay -->
<div id="loading-overlay" class="overlay hidden">
<div class="loader-ring"></div>
@@ -114,7 +73,7 @@
</svg>
<div class="sidebar-brand-text">
<span class="sidebar-brand-name">ZernMC</span>
<span class="sidebar-brand-ver">v<span id="header-version">__LAUNCHER_VERSION__</span></span>
<span class="sidebar-brand-ver">v<span id="header-version">1.0.9</span></span>
</div>
</div>
@@ -141,30 +100,24 @@
</div>
</nav>
<div class="sidebar-section section-collapsible" id="server-packs-section">
<div class="section-header" id="server-packs-header" title="Toggle">
<span class="section-title-wrap">
<svg class="section-chevron" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"/></svg>
<span class="section-title" data-i18n="sidebar.serverPacks">Server Packs</span>
</span>
<div class="sidebar-section">
<div class="section-header">
<span class="section-title" data-i18n="sidebar.serverPacks">Server Packs</span>
<button class="btn-icon" id="add-server-pack-btn" title="Install server pack">
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
</button>
</div>
<div class="pack-list-collapse"><div id="server-packs-list" class="pack-list"></div></div>
<div id="server-packs-list" class="pack-list"></div>
</div>
<div class="sidebar-section section-collapsible" id="local-packs-section">
<div class="section-header" id="local-packs-header" title="Toggle">
<span class="section-title-wrap">
<svg class="section-chevron" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"/></svg>
<span class="section-title" data-i18n="sidebar.localPacks">Local Packs</span>
</span>
<div class="sidebar-section" id="local-packs-section">
<div class="section-header">
<span class="section-title" data-i18n="sidebar.localPacks">Local Packs</span>
<button class="btn-icon" id="add-pack-btn" title="Add pack">
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
</button>
</div>
<div class="pack-list-collapse"><div id="local-packs-list" class="pack-list"></div></div>
<div id="local-packs-list" class="pack-list"></div>
</div>
</div>
@@ -245,16 +198,6 @@
<div class="whitelist-loading" data-i18n="whitelist.loading">Loading...</div>
</div>
</div>
<div id="local-mods-section" class="mods-section hidden">
<div class="section-header">
<span data-i18n="mods.title">Mods</span>
<span id="mods-count" class="mods-count"></span>
<input type="text" id="mods-search" class="mods-search" placeholder="Search mods..." data-i18n-placeholder="mods.search" oninput="app.filterLocalMods()">
</div>
<div id="local-mods-list" class="mods-list">
<div class="mods-loading" data-i18n="mods.loading">Loading...</div>
</div>
</div>
</div>
</div>
@@ -487,15 +430,6 @@
<span class="setting-badge" id="server-status">Checking...</span>
</div>
</div>
<div class="setting-card" id="network-card">
<div class="setting-info">
<h4 data-i18n="settings.network.title">Network</h4>
<p data-i18n="settings.network.desc">Per-service connection mode (direct / via proxy)</p>
</div>
<div class="setting-network-list" id="network-list">
<span class="setting-badge" data-i18n="settings.network.loading">Checking...</span>
</div>
</div>
<div class="setting-card">
<div class="setting-info">
<h4 data-i18n="settings.language.title">Language</h4>
@@ -529,15 +463,6 @@
<button class="btn-primary btn-sm" id="show-log-viewer-btn" onclick="app.openLogViewer()"><span data-i18n="settings.logViewer.open">Open Log</span></button>
</div>
</div>
<div class="setting-card" id="onboard-settings-card">
<div class="setting-info">
<h4 data-i18n="onboard.showAgain">Show tutorial again</h4>
<p data-i18n="onboard.infoDesc">You can replay the tutorial in Settings.</p>
</div>
<div class="setting-control">
<button class="btn-primary btn-sm" id="replay-onboard-btn" onclick="app.replayOnboarding()"><span data-i18n="onboard.showAgain">Show tutorial again</span></button>
</div>
</div>
</div>
</div>
</main>
@@ -569,7 +494,7 @@
<h3 data-i18n="logViewer.title">Game Log</h3>
<div class="log-viewer-actions">
<button class="btn-secondary btn-sm" id="copy-log-btn" onclick="app.copyLogs()"><span data-i18n="logViewer.copy">Copy</span></button>
<button class="btn-secondary btn-sm" onclick="app.openLogFile()"><span data-i18n="logViewer.openFile">Open File</span></button>
<button class="btn-secondary btn-sm" onclick="app.req('/open-log-file', {method:'POST'})"><span data-i18n="logViewer.openFile">Open File</span></button>
<button class="modal-close" id="close-log-viewer-btn" onclick="app.closeLogViewer()">&times;</button>
</div>
</div>
@@ -589,7 +514,7 @@
<div class="modal-body">
<div class="modal-tabs">
<button class="modal-tab active" data-tab="zernmc"><span data-i18n="install.tab.serverPack">Server Pack</span></button>
<button class="modal-tab" data-tab="custom" id="custom-tab-btn"><span data-i18n="install.tab.custom">Custom</span></button>
<button class="modal-tab" data-tab="custom" id="custom-tab-btn"><span data-i18n="install.tab.custom">Custom</span> <span class="tag-wip">WIP</span></button>
</div>
<div id="tab-zernmc" class="modal-tab-content active">
@@ -609,28 +534,11 @@
</div>
<div id="tab-custom" class="modal-tab-content">
<div class="field">
<label data-i18n="install.custom.name">Pack Name</label>
<input type="text" id="custom-instance-name" placeholder="MyPack" maxlength="32">
<div class="disabled-tab">
<svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" opacity="0.3"><circle cx="12" cy="12" r="10"/><line x1="12" y1="8" x2="12" y2="12"/><line x1="12" y1="16" x2="12.01" y2="16"/></svg>
<h3 data-i18n="install.custom.unavailable">Not available yet</h3>
<p data-i18n="install.custom.desc">Custom pack installation is disabled in this version. Use Server Pack tab to install packs from the server.</p>
</div>
<div class="field">
<label data-i18n="install.custom.mcVersion">Minecraft Version</label>
<select id="mc-version-select"><option>Loading...</option></select>
</div>
<div class="field">
<label data-i18n="install.custom.loader">Loader</label>
<select id="loader-select">
<option value="vanilla">Vanilla</option>
<option value="fabric">Fabric</option>
<option value="forge">Forge</option>
<option value="neoforge">NeoForge</option>
</select>
</div>
<div class="field hidden" id="loader-ver-field">
<label data-i18n="install.custom.loaderVersion">Loader Version</label>
<select id="loader-ver-select"><option data-i18n="select.selectMCFirst">Select MC version first</option></select>
</div>
<button id="install-custom-btn" class="btn-primary"><span data-i18n="install.downloadBtn">Download & Install</span></button>
</div>
<div id="install-progress" class="install-progress hidden">
launcher/launcher/src/resources/ui/launcher.js
+41 -1081
View File
File diff suppressed because it is too large Load Diff
launcher/launcher/src/resources/ui/style.css
+51 -197
View File
@@ -29,11 +29,6 @@
*, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
html, body { -webkit-user-select: none; user-select: none; }
.pack-entry, .pack-entry *, .ctx-menu, .ctx-menu * { -webkit-user-select: none; user-select: none; }
input, textarea, [contenteditable], .log-viewer-content, .news-modal-body, .pack-description-text { -webkit-user-select: text; user-select: text; }
.pack-entry { -webkit-touch-callout: default; }
html { font-size: 14px; }
body {
@@ -47,11 +42,8 @@ body {
#bg-canvas {
position: fixed; inset: 0; width: 100%; height: 100%;
z-index: 0; opacity: 0.14; pointer-events: none;
z-index: 0; opacity: 0.08; pointer-events: none;
}
#login-screen.exiting { pointer-events: none; }
.login-container.exit { will-change: transform, opacity, filter; }
#bg-canvas.bg-exit { will-change: transform; }
#app { position: relative; z-index: 1; height: 100vh; display: flex; }
@@ -67,94 +59,85 @@ body {
/* ========== LOGIN ========== */
.login-container {
position: relative; z-index: 1;
background: var(--bg-elevated);
border-radius: var(--radius-md);
padding: 32px 32px 24px;
border: 1px solid var(--border);
border-radius: var(--radius-lg);
padding: 48px 40px 40px;
width: 100%;
max-width: 360px;
box-shadow: 0 8px 40px rgba(0,0,0,0.5);
transition: transform 0.35s ease, opacity 0.35s ease;
max-width: 380px;
box-shadow: var(--shadow);
animation: floatIn 0.5s ease forwards;
}
.login-header { text-align: center; margin-bottom: 28px; overflow: hidden; }
.brand-icon { margin-bottom: 12px; }
.login-title {
font-size: 22px; font-weight: 700;
color: var(--text); transition: transform 0.3s ease, opacity 0.3s ease;
}
.login-subtitle {
color: var(--text-muted); font-size: 13px; margin-top: 4px;
transition: transform 0.3s ease, opacity 0.3s ease;
@keyframes floatIn {
from { opacity: 0; transform: translateY(20px); }
to { opacity: 1; transform: translateY(0); }
}
.login-form { display: flex; flex-direction: column; gap: 16px; }
.login-brand { text-align: center; margin-bottom: 36px; }
.brand-icon { margin-bottom: 16px; }
.brand-title {
font-size: 28px; font-weight: 800;
color: var(--text);
}
.brand-sub { color: var(--text-muted); font-size: 13px; margin-top: 4px; }
.field { display: flex; flex-direction: column; gap: 6px; }
.login-form { display: flex; flex-direction: column; gap: 20px; }
.field { position: relative; }
.field label {
font-size: 11px; font-weight: 700;
text-transform: uppercase; letter-spacing: 0.5px;
color: var(--text-secondary);
position: absolute; top: 50%; left: 14px; transform: translateY(-50%);
font-size: 13px; color: var(--text-muted);
transition: var(--transition); pointer-events: none;
background: var(--bg-elevated); padding: 0 4px;
}
.field input:focus + label,
.field input:not(:placeholder-shown) + label,
.field textarea:focus + label,
.field textarea:not(:placeholder-shown) + label {
top: 0; font-size: 11px; color: var(--accent);
}
.field input {
width: 100%; padding: 10px 12px; font-size: 15px;
background: var(--bg-surface); border: 1px solid var(--border);
border-radius: 4px; color: var(--text);
font-family: var(--font); transition: border-color 150ms ease, box-shadow 150ms ease;
width: 100%; padding: 14px 14px; font-size: 14px;
background: var(--bg-surface); border: 1px solid var(--border-light);
border-radius: var(--radius-sm); color: var(--text);
font-family: var(--font); transition: var(--transition);
outline: none;
}
.field input:focus {
border-color: var(--accent);
box-shadow: 0 0 0 2px var(--accent-glow);
box-shadow: 0 0 0 3px var(--accent-glow);
}
.field input.invalid {
border-color: var(--error);
box-shadow: 0 0 0 2px rgba(248,113,113,0.15);
}
.field .field-hint {
font-size: 12px; color: var(--error); line-height: 1.4;
}
.field .field-hint.hidden { display: none; }
.field select {
width: 100%; padding: 10px 12px; font-size: 15px;
background: var(--bg-surface); border: 1px solid var(--border);
border-radius: 4px; color: var(--text);
width: 100%; padding: 12px 14px; font-size: 14px;
background: var(--bg-surface); border: 1px solid var(--border-light);
border-radius: var(--radius-sm); color: var(--text);
font-family: var(--font); cursor: pointer; outline: none;
}
.field select:focus { border-color: var(--accent); }
#confirm-field {
transition: opacity 0.3s ease, max-height 0.3s ease, margin 0.3s ease;
overflow: hidden; max-height: 60px; opacity: 1; margin: 0;
}
#confirm-field.hidden { max-height: 0; opacity: 0; margin: 0; display: block !important; padding: 0; overflow: hidden; pointer-events: none; }
.btn-primary {
width: 100%; padding: 14px; border: none; border-radius: 4px;
background: var(--accent); color: #fff;
font-size: 14px; font-weight: 600; cursor: pointer;
font-family: var(--font); transition: background 150ms ease, box-shadow 150ms ease;
width: 100%; padding: 14px; border: none; border-radius: var(--radius-sm);
background: linear-gradient(135deg, var(--accent), #ff6b6b);
color: #fff; font-size: 15px; font-weight: 600; cursor: pointer;
font-family: var(--font); transition: var(--transition);
display: flex; align-items: center; justify-content: center; gap: 8px;
min-height: 44px; position: relative;
min-height: 48px; position: relative;
}
.btn-primary:hover { background: #d63850; }
.btn-primary:active { background: #c22f46; transform: scale(0.98); }
.btn-primary:disabled { opacity: 0.5; cursor: not-allowed; transform: none; box-shadow: none; }
.btn-primary:hover { transform: translateY(-1px); box-shadow: var(--shadow-glow); }
.btn-primary:active { transform: translateY(0); }
.btn-primary:disabled { opacity: 0.6; cursor: not-allowed; transform: none; box-shadow: none; }
.error-msg {
color: var(--error); font-size: 13px; text-align: center;
padding: 10px; background: rgba(248,113,113,0.1);
border-radius: 4px; animation: shake 0.4s ease;
border-radius: var(--radius-sm); animation: shake 0.4s ease;
}
@keyframes shake {
0%,100%{transform:translateX(0)}20%{transform:translateX(-4px)}40%{transform:translateX(4px)}60%{transform:translateX(-3px)}80%{transform:translateX(3px)}
}
.login-footer {
display: flex; justify-content: center; gap: 4px;
font-size: 12px; color: var(--text-muted); margin-top: 4px;
}
.login-footer-action { color: var(--accent); cursor: pointer; }
.login-footer-action:hover { text-decoration: underline; }
.login-hint { text-align: center; font-size: 12px; color: var(--text-muted); margin-top: 4px; }
.spinner {
position: absolute; width: 20px; height: 20px;
@@ -227,38 +210,12 @@ body {
display: flex; align-items: center; justify-content: space-between;
margin-bottom: 8px; padding: 0 4px;
}
.section-collapsible .section-header { cursor: pointer; user-select: none; }
.section-collapsible .section-header:hover .section-title { color: var(--text-secondary); }
.section-title-wrap {
display: flex; align-items: center; gap: 6px; min-width: 0;
}
.section-title { font-size: 10px; font-weight: 600; text-transform: uppercase; letter-spacing: 1px; color: var(--text-muted); transition: var(--transition); }
.section-chevron { flex-shrink: 0; color: var(--text-muted); transition: transform .2s var(--ease, ease); }
.section-collapsible { display: flex; flex-direction: column; min-height: 0; }
.section-collapsible:not(.collapsed) { flex: 1 1 auto; }
.section-collapsible:not(.collapsed) .section-chevron { transform: rotate(0deg); }
.section-collapsible.collapsed .section-chevron { transform: rotate(-90deg); }
.section-collapsible.collapsed .section-header { margin-bottom: 0; }
.section-collapsible.collapsed .section-title { color: var(--text-muted); }
.pack-list-collapse {
display: grid;
grid-template-rows: 0fr;
transition: grid-template-rows .3s var(--ease, ease);
min-height: 0;
overflow: hidden;
}
.section-collapsible:not(.collapsed) .pack-list-collapse {
grid-template-rows: 1fr;
flex: 1;
}
.pack-list-collapse > .pack-list {
overflow-y: auto;
min-height: 0;
}
.section-title { font-size: 10px; font-weight: 600; text-transform: uppercase; letter-spacing: 1px; color: var(--text-muted); }
.pack-list {
display: flex; flex-direction: column; gap: 3px;
overflow-y: auto; max-height: calc((100vh - 460px) / 2);
min-height: 40px;
}
.pack-list:empty::after {
content: 'No packs'; display: block; padding: 12px 8px;
@@ -336,9 +293,6 @@ body {
.view { display: none; flex-direction: column; height: 100%; overflow-y: auto; }
.view.active { display: flex; }
#view-packs { overflow: hidden; }
#view-packs .pack-detail { flex: 1; overflow-y: auto; min-height: 0; }
#view-packs .play-bar { position: sticky; bottom: 0; z-index: 5; flex-shrink: 0; margin-top: 12px; }
.view-header {
display: flex; align-items: flex-start; justify-content: space-between;
@@ -572,18 +526,6 @@ body {
background: var(--bg-surface); color: var(--text-secondary); border: 1px solid var(--border-light);
}
.setting-pass { display: flex; align-items: center; gap: 8px; }
.setting-network-list {
display: flex; flex-direction: column; gap: 6px; min-width: 260px; flex-shrink: 0;
}
.network-row {
display: flex; align-items: center; justify-content: space-between; gap: 12px;
font-size: 12px; padding: 4px 10px; border-radius: 4px;
background: var(--bg-surface); border: 1px solid var(--border-light);
}
.network-name {
font-family: var(--mono); color: var(--text-secondary); text-transform: uppercase;
}
.network-state { font-weight: 600; }
.pass-input {
width: 160px; padding: 6px 12px; border-radius: var(--radius-sm);
background: var(--bg-inset); border: 1px solid var(--border-light);
@@ -687,15 +629,6 @@ body {
background: linear-gradient(90deg, var(--accent), #ff6b6b);
border-radius: 3px; transition: width 0.3s ease;
}
.progress-fill.indeterminate {
width: 30%;
transition: none;
animation: indeterminate 1.3s ease-in-out infinite;
}
@keyframes indeterminate {
0% { margin-left: -30%; }
100% { margin-left: 100%; }
}
.progress-label { font-size: 13px; color: var(--text-secondary); margin-top: 8px; text-align: center; }
.progress-stage { font-size: 11px; color: var(--text-muted); margin-top: 4px; text-align: center; }
@@ -954,82 +887,3 @@ body {
.pack-entry.disabled .pack-entry-name::after { content: ' (' attr(data-disabled-text) ')'; color: var(--error); font-size: 11px; }
.admin-pack-disabled { color: var(--error) !important; font-weight: 600; }
.admin-pack-enabled { color: var(--success) !important; font-weight: 600; }
/* ========== OFFLINE MODE ========== */
.offline-container {
position: relative; z-index: 1;
background: var(--bg-elevated);
border-radius: var(--radius-md);
padding: 32px 32px 24px;
width: 100%;
max-width: 380px;
box-shadow: 0 8px 40px rgba(0,0,0,0.5);
text-align: center;
}
.offline-badge {
width: 64px; height: 64px;
margin: 0 auto 14px;
display: flex; align-items: center; justify-content: center;
background: rgba(233,69,96,0.12);
border: 1px solid rgba(233,69,96,0.3);
border-radius: 14px;
color: var(--accent);
}
.offline-title { font-size: 22px; font-weight: 700; color: var(--text); }
.offline-subtitle {
color: var(--text-muted); font-size: 13px; margin: 8px 0 20px; line-height: 1.5;
}
.offline-container .login-form { text-align: left; }
.offline-footer {
display: flex; gap: 8px; justify-content: center; margin-top: 18px;
}
.btn-ghost {
padding: 9px 14px; font-size: 13px;
background: transparent; color: var(--text-secondary);
border: 1px solid var(--border); border-radius: 4px;
cursor: pointer; font-family: var(--font);
transition: border-color 150ms ease, color 150ms ease;
}
.btn-ghost:hover { border-color: var(--accent); color: var(--accent); }
/* ========== LOCAL MODS ========== */
.mods-section { margin-top: 16px; padding-top: 12px; border-top: 1px solid var(--border); }
.mods-section .section-header { display:flex; align-items:center; gap:10px; flex-wrap:wrap; font-size:11px; font-weight:600; text-transform:uppercase; color:var(--text-muted); padding:4px; margin-bottom:8px; letter-spacing:0.5px; }
.mods-count { font-size:11px; color:var(--text-secondary); margin-left:auto; }
.mods-search { margin-left:auto; min-width:160px; padding:6px 10px; border-radius:var(--radius-sm); background:var(--bg-surface); border:1px solid var(--border-light); color:var(--text); font-size:12px; outline:none; }
.mods-search:focus { border-color:var(--accent); }
.mods-list { display:flex; flex-direction:column; gap:4px; }
.mods-loading { text-align:center; padding:20px; color:var(--text-muted); font-size:12px; }
.mod-item { display:flex; align-items:center; gap:10px; padding:8px 10px; border-radius:var(--radius-sm); background:var(--bg-card); border:1px solid var(--border); transition:var(--transition); }
.mod-item:hover { background:var(--bg-card-hover); }
.mod-item.mod-disabled { opacity:0.6; }
.mod-icon { width:32px; height:32px; border-radius:6px; display:flex; align-items:center; justify-content:center; background:var(--bg-inset); color:var(--text-muted); flex-shrink:0; }
.mod-info { flex:1; min-width:0; }
.mod-name { font-size:13px; font-weight:500; color:var(--text); white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
.mod-meta { font-size:11px; color:var(--text-muted); white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
.mod-badge { font-size:10px; font-weight:700; padding:2px 6px; border-radius:4px; flex-shrink:0; }
.mod-badge-enabled { background:rgba(74,222,128,0.15); color:var(--success); }
.mod-badge-disabled { background:rgba(248,113,113,0.12); color:var(--error); }
/* ========== CONTEXT MENU (PKM) ========== */
.ctx-menu { position:fixed; z-index:300; min-width:200px; background:var(--bg-elevated); border:1px solid var(--border); border-radius:var(--radius-sm); box-shadow:0 12px 32px rgba(0,0,0,0.5); padding:4px; display:flex; flex-direction:column; gap:2px; animation:ctxIn 0.12s ease; }
@keyframes ctxIn { from { opacity:0; transform:translateY(4px) scale(0.98); } to { opacity:1; transform:none; } }
.ctx-item { display:flex; align-items:center; gap:10px; padding:8px 12px; border-radius:4px; font-size:13px; color:var(--text-secondary); cursor:pointer; transition:var(--transition); border:none; background:transparent; font-family:var(--font); text-align:left; width:100%; }
.ctx-item:hover { background:var(--bg-card); color:var(--text); }
.ctx-item.danger { color:var(--error); }
.ctx-item.danger:hover { background:rgba(248,113,113,0.08); }
.ctx-sep { height:1px; background:var(--border); margin:2px 0; }
.ctx-backdrop { position:fixed; inset:0; z-index:299; }
/* ========== ONBOARDING SPOTLIGHT ========== */
.onboard-overlay { position:fixed; inset:0; z-index:400; background:rgba(7,7,10,0.72); backdrop-filter:blur(2px); animation:fadeIn 0.2s ease; }
.onboard-card { position:fixed; left:50%; top:50%; transform:translate(-50%,-50%); z-index:405; max-width:420px; width:90%; background:var(--bg-elevated); border:1px solid var(--border); border-radius:var(--radius-lg); padding:24px; box-shadow:0 20px 60px rgba(0,0,0,0.6); animation:floatIn 0.25s ease; }
.onboard-card h3 { font-size:18px; font-weight:700; margin-bottom:8px; }
.onboard-card p { font-size:13px; color:var(--text-secondary); line-height:1.6; margin-bottom:16px; }
.onboard-progress { font-size:11px; color:var(--text-muted); letter-spacing:0.5px; text-transform:uppercase; margin-bottom:12px; }
.onboard-actions { display:flex; gap:8px; justify-content:flex-end; }
.onboard-spot { position:fixed; z-index:401; border:2px solid var(--accent); border-radius:var(--radius-sm); box-shadow:0 0 0 9999px rgba(7,7,10,0.55), 0 0 24px var(--accent-glow); pointer-events:auto; cursor:pointer; transition:all 0.35s ease; }
.onboard-spot-label { position:fixed; z-index:402; background:var(--accent); color:#fff; font-size:12px; font-weight:600; padding:6px 10px; border-radius:999px; pointer-events:auto; cursor:pointer; transform:translate(-50%, -100%); margin-top:-8px; white-space:nowrap; }
/* ========== PACK SETTINGS MODAL ========== */
.pack-settings-form { display:flex; flex-direction:column; gap:16px; }
launcher/launcher/src/test/java/me/sashegdev/zernmc/launcher/integration/ForgeInstallIntegrationTest.java
-252
View File
@@ -1,252 +0,0 @@
package me.sashegdev.zernmc.launcher.integration;
import me.sashegdev.zernmc.launcher.minecraft.Instance;
import me.sashegdev.zernmc.launcher.minecraft.installer.ModLoaderInstaller;
import me.sashegdev.zernmc.launcher.minecraft.installer.VersionInstaller;
import me.sashegdev.zernmc.launcher.minecraft.launch.LaunchCommandBuilder;
import me.sashegdev.zernmc.launcher.minecraft.model.LaunchOptions;
import org.junit.jupiter.api.*;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.net.URL;
import java.net.HttpURLConnection;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
@Tag("integration")
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class ForgeInstallIntegrationTest {
private static final String MC_VERSION = "1.20.1";
private static final String FORGE_VERSION = "47.4.22";
private static Path instanceDir;
private static Instance instance;
private static boolean installSuccess = false;
@BeforeAll
static void setup() throws Exception {
// Check network
assumeTrue(networkReachable("https://maven.minecraftforge.net"),
"Forge maven not reachable, skipping");
assumeTrue(networkReachable("https://piston-meta.mojang.com"),
"Mojang meta not reachable, skipping");
instanceDir = Files.createTempDirectory("zernmc-forge-test-");
instance = new Instance("forge-test", instanceDir);
instance.setMinecraftVersion(MC_VERSION);
instance.setLoaderType("forge");
instance.setLoaderVersion(FORGE_VERSION);
instance.setAssetIndex(MC_VERSION);
}
@AfterAll
static void cleanup() throws Exception {
if (instanceDir != null) {
try (var stream = Files.walk(instanceDir)) {
stream.sorted((a, b) -> b.compareTo(a))
.forEach(p -> {
try { Files.deleteIfExists(p); } catch (Exception ignored) {}
});
}
}
}
@Test
@Order(1)
@DisplayName("Install Minecraft vanilla 1.20.1")
void installMinecraft() throws Exception {
System.out.println("\n=== Installing Minecraft " + MC_VERSION + " ===");
VersionInstaller versionInstaller = new VersionInstaller(instanceDir);
String assetIndex = versionInstaller.install(MC_VERSION);
assertNotNull(assetIndex, "assetIndex must not be null after install");
instance.setAssetIndex(assetIndex);
// Verify version.json exists
Path versionJson = instanceDir.resolve("versions/" + MC_VERSION + "/" + MC_VERSION + ".json");
assertTrue(Files.exists(versionJson), "version.json must exist after vanilla install");
// Verify client jar exists
Path clientJar = instanceDir.resolve("versions/" + MC_VERSION + "/" + MC_VERSION + ".jar");
assertTrue(Files.exists(clientJar), "client jar must exist after vanilla install");
// Verify libraries exist
Path libsDir = instanceDir.resolve("libraries");
assertTrue(Files.exists(libsDir) && Files.list(libsDir).findAny().isPresent(),
"At least one library must exist after vanilla install");
System.out.println("=== Minecraft install OK ===\n");
}
@Test
@Order(2)
@DisplayName("Install Forge 1.20.1-47.4.22")
void installForge() throws Exception {
System.out.println("\n=== Installing Forge " + MC_VERSION + "-" + FORGE_VERSION + " ===");
ModLoaderInstaller installer = new ModLoaderInstaller(instance);
boolean success = installer.install(MC_VERSION, FORGE_VERSION, ModLoaderInstaller.LoaderType.FORGE);
assertTrue(success, "Forge installation must succeed");
installSuccess = true;
// Verify Forge version.json exists
String forgeVersionId = MC_VERSION + "-forge-" + FORGE_VERSION;
Path forgeJson = instanceDir.resolve("versions/" + forgeVersionId + "/" + forgeVersionId + ".json");
assertTrue(Files.exists(forgeJson), "Forge version.json must exist at " + forgeJson);
System.out.println(" Forge version.json size: " + Files.size(forgeJson) + " bytes\n");
}
@Test
@Order(3)
@DisplayName("Build launch command and verify structure")
void buildAndVerifyCommand() throws Exception {
assumeTrue(installSuccess, "Skipping: Forge install did not succeed");
System.out.println("\n=== Building launch command ===");
LaunchOptions options = new LaunchOptions();
options.setUsername("TestPlayer");
options.setUuid("00000000-0000-0000-0000-000000000000");
options.setAccessToken("test-token");
options.setMaxMemory(4096);
options.setWidth(854);
options.setHeight(480);
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
// === JVM args checks ===
// Real Forge version.json (1.20.1-47.x) has no -cp, so the launcher adds it
assertTrue(command.contains("-cp"),
"Launcher must add -cp for Forge (version.json has none)");
int cpIdx = command.indexOf("-cp");
assertTrue(cpIdx + 1 < command.size(), "-cp must have a value");
String classpath = command.get(cpIdx + 1);
assertNotNull(classpath, "-cp value must not be null");
assertFalse(classpath.contains("${classpath}"), "-cp must not contain unresolved ${classpath} placeholder");
// Find -Djava.library.path (added manually, not from forge child)
String libPath = null;
for (String arg : command) {
if (arg != null && arg.startsWith("-Djava.library.path=")) {
libPath = arg;
break;
}
}
assertNotNull(libPath, "Must have -Djava.library.path");
assertTrue(libPath.contains("natives"), "-Djava.library.path must point to natives dir");
// Must have -p (module path) from forge child
int pIdx = command.indexOf("-p");
assertTrue(pIdx >= 0, "Must have -p");
String modulePath = command.get(pIdx + 1);
assertNotNull(modulePath, "-p must have a value");
assertTrue(modulePath.contains("bootstraplauncher"), "-p must include bootstraplauncher");
// Must have --add-modules + ALL-MODULE-PATH as two args (forge format)
int amIdx = command.indexOf("--add-modules");
assertTrue(amIdx >= 0, "Must have --add-modules");
assertEquals("ALL-MODULE-PATH", command.get(amIdx + 1),
"--add-modules must be followed by ALL-MODULE-PATH");
// Must have --add-opens (at least one) from forge child
boolean hasAddOpens = command.stream().anyMatch(a -> a != null && a.startsWith("--add-opens"));
assertTrue(hasAddOpens, "Must have at least one --add-opens");
// Main class
assertTrue(command.contains("cpw.mods.bootstraplauncher.BootstrapLauncher"),
"Main class must be BootstrapLauncher");
// Game args: parent (--username) + child (--launchTarget)
assertTrue(command.contains("--username"), "Game args must include --username from parent");
assertTrue(command.contains("--launchTarget"), "Game args must include --launchTarget from child");
// Memory/GC args
assertTrue(command.contains("-Xmx4096M"), "Must have -Xmx");
assertTrue(command.contains("-XX:+UseG1GC"), "Must have GC flags");
System.out.println("=== Command structure OK (" + command.size() + " args) ===\n");
}
@Test
@Order(4)
@DisplayName("Module path is valid (headless smoke test)")
void modulePathSmokeTest() throws Exception {
assumeTrue(installSuccess, "Skipping: Forge install did not succeed");
System.out.println("\n=== Module path smoke test ===");
LaunchOptions options = new LaunchOptions();
options.setUsername("TestPlayer");
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
// Extract key args
String libPath = null;
String modulePath = null;
for (int i = 0; i < command.size(); i++) {
String arg = command.get(i);
if (arg != null) {
if (arg.startsWith("-Djava.library.path=")) libPath = arg;
}
}
int pIdx = command.indexOf("-p");
if (pIdx >= 0) modulePath = command.get(pIdx + 1);
// Find --add-modules + ALL-MODULE-PATH as two args
int amIdx = command.indexOf("--add-modules");
String addModules = null;
if (amIdx >= 0 && amIdx + 1 < command.size()) {
addModules = command.get(amIdx + 1);
}
assertNotNull(libPath, "-Djava.library.path must exist");
assertNotNull(modulePath, "-p must exist");
assertNotNull(addModules, "--add-modules must exist");
assertEquals("ALL-MODULE-PATH", addModules, "--add-modules must be ALL-MODULE-PATH");
// Run: java -Djava.library.path=<path> -p <mp> --add-modules ALL-MODULE-PATH -version
ProcessBuilder pb = new ProcessBuilder(
"java",
libPath,
"-p", modulePath,
"--add-modules", addModules,
"-version"
);
pb.redirectErrorStream(true);
long start = System.currentTimeMillis();
Process proc = pb.start();
String output = new String(proc.getInputStream().readAllBytes());
int exit = proc.waitFor();
long elapsed = System.currentTimeMillis() - start;
System.out.println(" JVM accepted module path in " + elapsed + "ms");
System.out.println(" Output: " + output.trim().replace('\n', ' '));
assertEquals(0, exit,
"JVM must accept module path without errors.\nExit: " + exit + "\nOutput: " + output);
System.out.println("=== Module path smoke test OK ===\n");
}
// ================================================================
// Helper
// ================================================================
private static boolean networkReachable(String urlStr) {
try {
URL url = new URL(urlStr);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setConnectTimeout(5000);
conn.setRequestMethod("GET");
int code = conn.getResponseCode();
conn.disconnect();
return true;
} catch (Exception e) {
System.out.println(" Network check failed for " + urlStr + ": " + e.getMessage());
return false;
}
}
}
launcher/launcher/src/test/java/me/sashegdev/zernmc/launcher/minecraft/launch/LaunchCommandBuilderTest.java
-563
View File
@@ -1,563 +0,0 @@
package me.sashegdev.zernmc.launcher.minecraft.launch;
import me.sashegdev.zernmc.launcher.minecraft.Instance;
import me.sashegdev.zernmc.launcher.minecraft.model.LaunchOptions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import static org.junit.jupiter.api.Assertions.*;
class LaunchCommandBuilderTest {
@TempDir
Path tempDir;
// ================================================================
// Helpers
// ================================================================
private Path createJar(Path path) throws Exception {
Files.createDirectories(path.getParent());
try (ZipOutputStream zos = new ZipOutputStream(Files.newOutputStream(path))) {
zos.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
zos.write("Manifest-Version: 1.0\n".getBytes());
zos.closeEntry();
}
return path;
}
private Path createJarWithModule(Path path, String moduleName) throws Exception {
Files.createDirectories(path.getParent());
try (ZipOutputStream zos = new ZipOutputStream(Files.newOutputStream(path))) {
zos.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
zos.write(("Manifest-Version: 1.0\nAutomatic-Module-Name: " + moduleName + "\n").getBytes());
zos.closeEntry();
}
return path;
}
private void writeVersionJson(Path path, String content) throws Exception {
Files.createDirectories(path.getParent());
Files.writeString(path, content);
}
// ================================================================
// Fixture setup
// ================================================================
private Instance createForgeFixture(Path dir) throws Exception {
String mcVer = "1.20.1";
String forgeVer = "47.3.0";
String versionId = mcVer + "-forge-" + forgeVer;
// Vanilla parent
String vanillaJson = """
{
"id": "1.20.1",
"mainClass": "net.minecraft.client.main.Main",
"arguments": {
"jvm": ["-Djava.library.path=${natives_directory}", "-cp", "${classpath}"],
"game": ["--username", "${auth_player_name}", "--version", "${version_name}", "--gameDir", "${game_directory}", "--assetsDir", "${assets_root}", "--assetIndex", "${assets_index_name}", "--uuid", "${auth_uuid}", "--accessToken", "${auth_access_token}", "--userType", "${user_type}", "--versionType", "${version_type}"]
},
"assetIndex": {"id": "1.20.1"},
"libraries": [{"name": "net.minecraft:client:1.20.1", "downloads": {"artifact": {"path": "net/minecraft/client/1.20.1/client-1.20.1.jar"}}}]
}
""";
writeVersionJson(dir.resolve("versions/1.20.1/1.20.1.json"), vanillaJson);
createJarWithModule(dir.resolve("versions/1.20.1/1.20.1.jar"), "minecraft");
createJar(dir.resolve("libraries/net/minecraft/client/1.20.1/client-1.20.1.jar"));
// Forge child — real 1.20.1-47.3.0 format: -p is a fixed bootstrap list,
// NO ${classpath} and NO -cp (the launcher must add -cp itself).
String forgeJson = """
{
"id": "1.20.1-forge-47.3.0",
"inheritsFrom": "1.20.1",
"mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher",
"arguments": {
"jvm": ["-Djava.net.preferIPv6Addresses=system",
"-DignoreList=bootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge-,${version_name}.jar",
"-DmergeModules=jna-5.10.0.jar,jna-platform-5.10.0.jar",
"-DlibraryDirectory=${library_directory}",
"-p", "${library_directory}/cpw/mods/bootstraplauncher/1.1.2/bootstraplauncher-1.1.2.jar${classpath_separator}${library_directory}/cpw/mods/securejarhandler/2.1.10/securejarhandler-2.1.10.jar",
"--add-modules", "ALL-MODULE-PATH",
"--add-opens", "java.base/java.util.jar=cpw.mods.securejarhandler",
"--add-opens", "java.base/java.lang.invoke=cpw.mods.securejarhandler"],
"game": ["--launchTarget", "forgeclient", "--fml.forgeVersion", "47.3.0",
"--fml.mcVersion", "1.20.1", "--fml.forgeGroup", "net.minecraftforge",
"--fml.mcpVersion", "20230612.114412"]
},
"libraries": [
{"name": "cpw.mods:bootstraplauncher:1.1.2", "downloads": {"artifact": {"path": "cpw/mods/bootstraplauncher/1.1.2/bootstraplauncher-1.1.2.jar"}}},
{"name": "cpw.mods:securejarhandler:2.1.10", "downloads": {"artifact": {"path": "cpw/mods/securejarhandler/2.1.10/securejarhandler-2.1.10.jar"}}},
{"name": "net.minecraftforge:forge:1.20.1-47.3.0", "downloads": {"artifact": {"path": "net/minecraftforge/forge/1.20.1-47.3.0/forge-1.20.1-47.3.0.jar"}}}
]
}
""";
writeVersionJson(dir.resolve("versions/" + versionId + "/" + versionId + ".json"), forgeJson);
createJar(dir.resolve("libraries/cpw/mods/bootstraplauncher/1.1.2/bootstraplauncher-1.1.2.jar"));
createJar(dir.resolve("libraries/cpw/mods/securejarhandler/2.1.10/securejarhandler-2.1.10.jar"));
createJar(dir.resolve("libraries/net/minecraftforge/forge/1.20.1-47.3.0/forge-1.20.1-47.3.0.jar"));
Files.createDirectories(dir.resolve("natives"));
Instance instance = new Instance("test-forge", dir);
instance.setMinecraftVersion(mcVer);
instance.setLoaderType("forge");
instance.setLoaderVersion(forgeVer);
instance.setAssetIndex(mcVer);
return instance;
}
private Instance createNeoForgeFixture(Path dir) throws Exception {
String mcVer = "1.20.1";
String neoVer = "47.1.106";
String versionId = mcVer + "-neoforge-" + neoVer;
String vanillaJson = """
{
"id": "1.20.1",
"mainClass": "net.minecraft.client.main.Main",
"arguments": {
"jvm": ["-Djava.library.path=${natives_directory}", "-cp", "${classpath}"],
"game": ["--username", "${auth_player_name}", "--version", "${version_name}"]
},
"assetIndex": {"id": "1.20.1"},
"libraries": [{"name": "net.minecraft:client:1.20.1", "downloads": {"artifact": {"path": "net/minecraft/client/1.20.1/client-1.20.1.jar"}}}]
}
""";
writeVersionJson(dir.resolve("versions/1.20.1/1.20.1.json"), vanillaJson);
createJarWithModule(dir.resolve("versions/1.20.1/1.20.1.jar"), "minecraft");
createJar(dir.resolve("libraries/net/minecraft/client/1.20.1/client-1.20.1.jar"));
String neoJson = """
{
"id": "1.20.1-neoforge-47.1.106",
"inheritsFrom": "1.20.1",
"mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher",
"arguments": {
"jvm": ["-p", "${classpath}", "--add-modules=ALL-MODULE-PATH", "--add-opens=java.base/java.util.jar=ALL-UNNAMED"],
"game": ["--launchTarget", "neoforgeclient", "--fml.neoForgeVersion", "47.1.106", "--fml.mcVersion", "1.20.1"]
},
"libraries": [{"name": "net.neoforged:neoforge:1.20.1-47.1.106", "downloads": {"artifact": {"path": "net/neoforged/neoforge/1.20.1-47.1.106/neoforge-1.20.1-47.1.106.jar"}}}]
}
""";
writeVersionJson(dir.resolve("versions/" + versionId + "/" + versionId + ".json"), neoJson);
createJar(dir.resolve("libraries/net/neoforged/neoforge/1.20.1-47.1.106/neoforge-1.20.1-47.1.106.jar"));
Files.createDirectories(dir.resolve("natives"));
Instance instance = new Instance("test-neoforge", dir);
instance.setMinecraftVersion(mcVer);
instance.setLoaderType("neoforge");
instance.setLoaderVersion(neoVer);
instance.setAssetIndex(mcVer);
instance.setFabricVersionId(versionId);
return instance;
}
private Instance createFabricFixture(Path dir) throws Exception {
String mcVer = "1.20.1";
String loaderVer = "0.16.10";
String versionId = "fabric-loader-" + loaderVer + "-" + mcVer;
String vanillaJson = """
{
"id": "1.20.1",
"mainClass": "net.minecraft.client.main.Main",
"arguments": {
"game": ["--username", "${auth_player_name}", "--version", "${version_name}"]
},
"assetIndex": {"id": "1.20.1"},
"libraries": [{"name": "net.minecraft:client:1.20.1", "downloads": {"artifact": {"path": "net/minecraft/client/1.20.1/client-1.20.1.jar"}}}]
}
""";
writeVersionJson(dir.resolve("versions/1.20.1/1.20.1.json"), vanillaJson);
createJar(dir.resolve("versions/1.20.1/1.20.1.jar"));
String fabricJson = """
{
"id": "fabric-loader-0.16.10-1.20.1",
"inheritsFrom": "1.20.1",
"mainClass": "net.fabricmc.loader.impl.launch.knot.KnotClient",
"arguments": {
"game": ["--username", "${auth_player_name}"]
},
"libraries": [{"name": "net.fabricmc:fabric-loader:0.16.10", "downloads": {"artifact": {"path": "net/fabricmc/fabric-loader/0.16.10/fabric-loader-0.16.10.jar"}}}]
}
""";
writeVersionJson(dir.resolve("versions/" + versionId + "/" + versionId + ".json"), fabricJson);
createJar(dir.resolve("libraries/net/minecraft/client/1.20.1/client-1.20.1.jar"));
createJar(dir.resolve("libraries/net/fabricmc/fabric-loader/0.16.10/fabric-loader-0.16.10.jar"));
Files.createDirectories(dir.resolve("natives"));
Instance instance = new Instance("test-fabric", dir);
instance.setMinecraftVersion(mcVer);
instance.setLoaderType("fabric");
instance.setLoaderVersion(loaderVer);
instance.setAssetIndex(mcVer);
instance.setFabricVersionId(versionId);
return instance;
}
private Instance createVanillaFixture(Path dir) throws Exception {
Files.createDirectories(dir.resolve("natives"));
// No version.json — forces vanilla fallback
Instance instance = new Instance("test-vanilla", dir);
instance.setMinecraftVersion("1.21");
instance.setLoaderType("vanilla");
instance.setAssetIndex("1.21");
return instance;
}
// ================================================================
// Forge tests
// ================================================================
@Test
void forge_noParentJvmArgs() throws Exception {
Instance instance = createForgeFixture(tempDir);
LaunchOptions options = new LaunchOptions();
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
// Real Forge version.json has no -cp (and no ${classpath}), so the launcher MUST add
// -cp with version jar + all libraries for the JVM to find BootstrapLauncher.
int cpIdx = command.indexOf("-cp");
assertTrue(cpIdx >= 0, "Launcher must add -cp for Forge (version.json has none)");
assertTrue(cpIdx + 1 < command.size(), "-cp must have a value");
String classpath = command.get(cpIdx + 1);
assertNotNull(classpath, "-cp value must not be null");
// -Djava.library.path must be added manually (not in child args)
String expectedLibPath = "-Djava.library.path=" + tempDir.resolve("natives").toAbsolutePath();
assertTrue(command.contains(expectedLibPath), "Forge must have -Djava.library.path");
// Child's -p (module path) must be the fixed bootstrap list passed through unchanged
int pIndex = command.indexOf("-p");
assertTrue(pIndex >= 0, "Forge must have -p");
assertTrue(pIndex + 1 < command.size(), "-p must have a value");
String modulePath = command.get(pIndex + 1);
assertNotNull(modulePath, "-p value must not be null");
assertTrue(modulePath.contains("bootstraplauncher-1.1.2.jar"), "-p must contain bootstrap jar");
assertTrue(modulePath.contains("securejarhandler-2.1.10.jar"), "-p must contain bootstrap jar");
// ${classpath} must NOT be substituted / referenced in the real-json JVM args
assertFalse(classpath.contains("${classpath}"), "-cp must not contain unresolved ${classpath} placeholder");
// Child's --add-modules must be present (two-arg format)
int amIdx = command.indexOf("--add-modules");
assertTrue(amIdx >= 0, "Forge must have --add-modules");
assertTrue(amIdx + 1 < command.size(), "--add-modules must have a value");
assertEquals("ALL-MODULE-PATH", command.get(amIdx + 1), "--add-modules must be ALL-MODULE-PATH");
// Memory/GC args
assertTrue(command.contains("-Xmx4096M"), "Forge must have memory args");
assertTrue(command.contains("-XX:+UseG1GC"), "Forge must have GC args");
// Main class
assertTrue(command.contains("cpw.mods.bootstraplauncher.BootstrapLauncher"), "Forge main class must be BootstrapLauncher");
// Game args: parent + child
int launchTargetIdx = command.indexOf("--launchTarget");
assertTrue(launchTargetIdx >= 0, "Game args must include child's --launchTarget");
assertEquals("forgeclient", command.get(launchTargetIdx + 1), "Launch target must be forgeclient");
int usernameIdx = command.indexOf("--username");
assertTrue(usernameIdx >= 0, "Game args must include parent's --username");
}
@Test
void forge_classpathContainsBothVanillaAndForgeLibraries() throws Exception {
Instance instance = createForgeFixture(tempDir);
LaunchOptions options = new LaunchOptions();
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
// Find -cp's classpath value (launcher-added; version.json has no -cp)
int cpIdx = command.indexOf("-cp");
assertTrue(cpIdx >= 0, "Launcher must add -cp for Forge");
String cpValue = command.get(cpIdx + 1);
// Version jar from ensureVersionJarForForge
assertTrue(cpValue.contains("1.20.1-forge-47.3.0.jar") || cpValue.contains("1.20.1.jar"),
"Classpath must include version jar");
// Forge library
assertTrue(cpValue.contains("forge-1.20.1-47.3.0.jar"),
"Classpath must include Forge library");
// Vanilla library
assertTrue(cpValue.contains("client-1.20.1.jar"),
"Classpath must include vanilla client library");
}
@Test
void forge_noClasspathRef_buildsLegacyClassPath() throws Exception {
// Regression guard for the 1.0.14.x regression: the launcher must NOT inject the
// self-invented `-DlegacyClassPath` flag. Modern Forge/NeoForge derive the MC-BOOTSTRAP
// module layer from the module path / modlauncher classpath (the version.json `-p
// ${classpath}` placeholder, resolved by the launcher), NOT from `-DlegacyClassPath`
// (a 1.12-era mechanism that, when duplicated here, causes split-package / duplicate-
// entry failures and prevents the game from starting). This matches the 1.0.13
// behaviour and AstralRinth's real Forge launch, where the classpath is supplied
// through `${classpath}` substitution only.
String mcVer = "1.20.1";
String forgeVer = "47.3.0";
String versionId = mcVer + "-forge-" + forgeVer;
String vanillaJson = """
{
"id": "1.20.1",
"mainClass": "net.minecraft.client.main.Main",
"arguments": {"game": ["--username", "${auth_player_name}"]},
"assetIndex": {"id": "1.20.1"},
"libraries": [
{"name": "net.minecraft:client:1.20.1", "downloads": {"artifact": {"path": "net/minecraft/client/1.20.1/client-1.20.1.jar"}}},
{"name": "com.google.guava:guava:31.1-jre", "downloads": {"artifact": {"path": "com/google/guava/guava/31.1-jre/guava-31.1-jre.jar"}}}
]
}
""";
writeVersionJson(tempDir.resolve("versions/1.20.1/1.20.1.json"), vanillaJson);
createJar(tempDir.resolve("versions/1.20.1/1.20.1.jar"));
createJar(tempDir.resolve("libraries/net/minecraft/client/1.20.1/client-1.20.1.jar"));
createJar(tempDir.resolve("libraries/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar"));
// Realistic Forge child: references ${classpath} (serves as module path + classpath,
// exactly like AstralRinth / 1.0.13), plus the standard Forge bootstrap args.
String forgeJson = """
{
"id": "1.20.1-forge-47.3.0",
"inheritsFrom": "1.20.1",
"mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher",
"arguments": {
"jvm": ["-DlibraryDirectory=${library_directory}",
"-DignoreList=bootstraplauncher,forge-,${version_name}.jar",
"-p", "${classpath}",
"--add-modules", "ALL-MODULE-PATH"],
"game": ["--launchTarget", "forgeclient", "--fml.forgeVersion", "47.3.0",
"--fml.mcVersion", "1.20.1", "--fml.forgeGroup", "net.minecraftforge"]
},
"libraries": [
{"name": "cpw.mods:modlauncher:10.0.9", "downloads": {"artifact": {"path": "cpw/mods/modlauncher/10.0.9/modlauncher-10.0.9.jar"}}},
{"name": "net.minecraftforge:fmlloader:1.20.1-47.3.0", "downloads": {"artifact": {"path": "net/minecraftforge/fmlloader/1.20.1-47.3.0/fmlloader-1.20.1-47.3.0.jar"}}}
]
}
""";
writeVersionJson(tempDir.resolve("versions/" + versionId + "/" + versionId + ".json"), forgeJson);
Files.createDirectories(tempDir.resolve("natives"));
createJar(tempDir.resolve("libraries/cpw/mods/modlauncher/10.0.9/modlauncher-10.0.9.jar"));
createJar(tempDir.resolve("libraries/net/minecraftforge/fmlloader/1.20.1-47.3.0/fmlloader-1.20.1-47.3.0.jar"));
Instance instance = new Instance("test-forge-realjson", tempDir);
instance.setMinecraftVersion(mcVer);
instance.setLoaderType("forge");
instance.setLoaderVersion(forgeVer);
instance.setAssetIndex(mcVer);
LaunchOptions options = new LaunchOptions();
List<String> command = new LaunchCommandBuilder(instance).build(options);
// No self-invented -DlegacyClassPath must ever be emitted for Forge.
assertFalse(command.stream().anyMatch(a -> a != null && a.startsWith("-DlegacyClassPath=")),
"Forge must NOT have a -DlegacyClassPath (1.0.13/AstralRinth rely on ${classpath})");
// ${classpath} must have been substituted into the -p module path, carrying all libs.
int pIdx = command.indexOf("-p");
assertTrue(pIdx >= 0, "Forge must have -p");
assertTrue(pIdx + 1 < command.size(), "-p must have a value");
String modulePath = command.get(pIdx + 1);
assertNotNull(modulePath, "-p value must not be null");
assertTrue(modulePath.contains("modlauncher-10.0.9.jar"),
"-p (resolved classpath) must contain modlauncher, got: " + modulePath);
assertTrue(modulePath.contains("fmlloader-1.20.1-47.3.0.jar"),
"-p (resolved classpath) must contain forge libraries, got: " + modulePath);
// version_name resolves to the version id (not the instance name) in -DignoreList.
String ignoreList = null;
for (String arg : command) {
if (arg != null && arg.startsWith("-DignoreList=")) ignoreList = arg;
}
assertNotNull(ignoreList, "Must have -DignoreList");
assertTrue(ignoreList.contains("1.20.1-forge-47.3.0.jar"),
"-DignoreList must use version id, got: " + ignoreList);
// --add-modules ALL-MODULE-PATH as two args (forge format)
int amIdx = command.indexOf("--add-modules");
assertTrue(amIdx >= 0, "Must have --add-modules");
assertEquals("ALL-MODULE-PATH", command.get(amIdx + 1));
// Main class + game args
assertTrue(command.contains("cpw.mods.bootstraplauncher.BootstrapLauncher"));
assertTrue(command.contains("--launchTarget"));
}
@Test
void forge_versionNameIsVersionIdNotInstanceName() throws Exception {
Instance instance = createForgeFixture(tempDir);
LaunchOptions options = new LaunchOptions();
List<String> command = new LaunchCommandBuilder(instance).build(options);
String ignoreList = null;
for (String arg : command) {
if (arg != null && arg.startsWith("-DignoreList=")) ignoreList = arg;
}
if (ignoreList != null) {
assertTrue(ignoreList.contains("1.20.1-forge-47.3.0.jar"),
"-DignoreList must use version id, got: " + ignoreList);
}
}
// ================================================================
// NeoForge tests
// ================================================================
@Test
void neoforge_noParentJvmArgs() throws Exception {
Instance instance = createNeoForgeFixture(tempDir);
LaunchOptions options = new LaunchOptions();
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
// NeoForge child jvm args reference ${classpath} (substituted into -p); version.json
// declares no -cp, so the launcher adds -cp with version jar + all libraries.
assertTrue(command.contains("-cp"), "NeoForge must have -cp (added by launcher)");
String expectedLibPath = "-Djava.library.path=" + tempDir.resolve("natives").toAbsolutePath();
assertTrue(command.contains(expectedLibPath), "NeoForge must have -Djava.library.path");
assertTrue(command.contains("-p"), "NeoForge must have -p");
assertTrue(command.contains("--add-modules=ALL-MODULE-PATH"), "NeoForge must have --add-modules=ALL-MODULE-PATH");
assertTrue(command.contains("cpw.mods.bootstraplauncher.BootstrapLauncher"), "NeoForge main class must be BootstrapLauncher");
// Game args: parent + child
int launchTargetIdx = command.indexOf("--launchTarget");
assertTrue(launchTargetIdx >= 0, "Game args must include child's --launchTarget");
assertEquals("neoforgeclient", command.get(launchTargetIdx + 1), "Launch target must be neoforgeclient");
assertTrue(command.contains("--username"), "Game args must include parent's --username");
}
// ================================================================
// Fabric tests
// ================================================================
@Test
void fabric_followsVanillaArgPattern() throws Exception {
Instance instance = createFabricFixture(tempDir);
LaunchOptions options = new LaunchOptions();
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
// Fabric uses -cp (vanilla pattern), not -p
assertTrue(command.contains("-cp"), "Fabric must have -cp");
assertFalse(command.contains("-p"), "Fabric must not have -p");
// -Djava.library.path present
String expectedLibPath = "-Djava.library.path=" + tempDir.resolve("natives").toAbsolutePath();
assertTrue(command.contains(expectedLibPath), "Fabric must have -Djava.library.path");
// Main class is KnotClient
assertTrue(command.contains("net.fabricmc.loader.impl.launch.knot.KnotClient"),
"Fabric main class must be KnotClient");
// Game args from version.json (merged with parent)
assertTrue(command.contains("--username"), "Fabric must have game args");
}
// ================================================================
// Vanilla tests
// ================================================================
@Test
void vanilla_usesVanillaArgs() throws Exception {
Instance instance = createVanillaFixture(tempDir);
LaunchOptions options = new LaunchOptions();
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
// Vanilla uses -cp
assertTrue(command.contains("-cp"), "Vanilla must have -cp");
assertFalse(command.contains("-p"), "Vanilla must not have -p");
// -Djava.library.path present
String expectedLibPath = "-Djava.library.path=" + tempDir.resolve("natives").toAbsolutePath();
assertTrue(command.contains(expectedLibPath), "Vanilla must have -Djava.library.path");
// Memory/GC args
assertTrue(command.contains("-Xmx4096M"), "Vanilla must have memory args");
assertTrue(command.contains("-XX:+UseG1GC"), "Vanilla must have GC args");
// Main class
assertTrue(command.contains("net.minecraft.client.main.Main"),
"Vanilla main class must be net.minecraft.client.main.Main");
// Game args
assertTrue(command.contains("--username"), "Vanilla must have --username");
}
// ================================================================
// Headless smoke tests — run Java with constructed args to verify
// module path validity. No display needed, uses -version.
// ================================================================
@Test
void forge_modulePathIsValid_smoke() throws Exception {
Instance instance = createForgeFixture(tempDir);
LaunchOptions options = new LaunchOptions();
LaunchCommandBuilder builder = new LaunchCommandBuilder(instance);
List<String> command = builder.build(options);
// Extract -p (module path) and its value
int pIdx = command.indexOf("-p");
assertTrue(pIdx >= 0, "Forge must have -p");
String modulePath = command.get(pIdx + 1);
// Extract --add-modules, -Djava.library.path
String libPath = null;
for (String arg : command) {
if (arg.startsWith("-Djava.library.path=")) {
libPath = arg;
}
}
String addModules = null;
for (int i = 0; i < command.size(); i++) {
if ("--add-modules".equals(command.get(i)) && i + 1 < command.size()) {
addModules = command.get(i + 1);
}
}
assertNotNull(addModules, "Must have --add-modules");
assertEquals("ALL-MODULE-PATH", addModules, "--add-modules must be ALL-MODULE-PATH");
// Build minimal Java command that validates the module path
// java -Djava.library.path=<path> -p <classpath> --add-modules ALL-MODULE-PATH -version
ProcessBuilder pb = new ProcessBuilder(
"java",
libPath,
"-p", modulePath,
"--add-modules", addModules,
"-version"
);
pb.redirectErrorStream(true);
Process process = pb.start();
String output = new String(process.getInputStream().readAllBytes());
int exitCode = process.waitFor();
assertTrue(exitCode == 0,
"Java should accept module path without errors. Exit code: " + exitCode
+ "\nOutput: " + output);
}
}
launcher/pom.xml
+155 -184
View File
@@ -1,185 +1,156 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.sashegdev</groupId>
<artifactId>ZernMCLauncher</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
<name>ZernMC Launcher Parent</name>
<description>ZernMC Launcher - Multi-module project</description>
<modules>
<module>bootstrap</module>
<module>diag</module>
<module>launcher</module>
</modules>
<properties>
<revision>1.1.1</revision>
<hotfix>5</hotfix>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.organization.name>ZernMC</project.organization.name>
<project.inceptionYear>2026</project.inceptionYear>
<project.description>ZernMC Launcher - Multi-module project</project.description>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20231013</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>2.4.1</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
<version>3.24.1</version>
</dependency>
<dependency>
<groupId>me.tongfei</groupId>
<artifactId>progressbar</artifactId>
<version>0.9.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
</dependency>
<!-- JavaFX for Windows -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>23.0.1</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>23.0.1</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>23.0.1</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>23.0.1</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>3.6.5</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-media</artifactId>
<version>23.0.1</version>
<classifier>win</classifier>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals><goal>flatten</goal></goals>
</execution>
<execution>
<id>flatten-clean</id>
<phase>clean</phase>
<goals><goal>clean</goal></goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.3</version>
</plugin>
<!-- Shade Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<outputFile>../../server/builds/ZernMCLauncher.jar</outputFile>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${mainClass}</mainClass>
<manifestEntries>
<Implementation-Version>${project.version}.${hotfix}</Implementation-Version>
<Implementation-Title>ZernMC Launcher</Implementation-Title>
<Implementation-Vendor>SashegDev</Implementation-Vendor>
<Implementation-Description>Samopisnui Minecraft-launcher. by SashegDev</Implementation-Description>
<Implementation-URL>https://github.com/SashegDev/launcher</Implementation-URL>
</manifestEntries>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>global</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<launcher.title>ZernMC Launcher</launcher.title>
<server.url>http://87.120.187.36:1582</server.url>
</properties>
</profile>
</profiles>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.sashegdev</groupId>
<artifactId>ZernMCLauncher</artifactId>
<version>1.0.10</version>
<packaging>pom</packaging>
<name>ZernMC Launcher Parent</name>
<description>ZernMC Launcher - Multi-module project</description>
<modules>
<module>bootstrap</module>
<module>launcher</module>
</modules>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.organization.name>ZernMC</project.organization.name>
<project.inceptionYear>2026</project.inceptionYear>
<project.description>ZernMC Launcher - Multi-module project</project.description>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20231013</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>2.4.1</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
<version>3.24.1</version>
</dependency>
<dependency>
<groupId>me.tongfei</groupId>
<artifactId>progressbar</artifactId>
<version>0.9.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
</dependency>
<!-- JavaFX for Windows -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>23</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>23</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>23</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>23</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-media</artifactId>
<version>23</version>
<classifier>win</classifier>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.3</version>
</plugin>
<!-- Shade Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<outputFile>../../server/builds/ZernMCLauncher.jar</outputFile>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${mainClass}</mainClass>
<manifestEntries>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Title>ZernMC Launcher</Implementation-Title>
<Implementation-Vendor>SashegDev</Implementation-Vendor>
<Implementation-Description>Samopisnui Minecraft-launcher. by SashegDev</Implementation-Description>
<Implementation-URL>https://github.com/SashegDev/launcher</Implementation-URL>
</manifestEntries>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>global</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<launcher.title>ZernMC Launcher</launcher.title>
<server.url>http://87.120.187.36:1582</server.url>
</properties>
</profile>
</profiles>
</project>
server/auth.py
+2 -11
View File
@@ -295,7 +295,7 @@ class LoginRequest(BaseModel):
def validate_username(cls, v):
if not re.match(r'^[a-zA-Z0-9_]+$', v):
raise ValueError('Имя пользователя может содержать только буквы, цифры и подчеркивания')
return v
return v.lower()
class RegisterRequest(BaseModel):
username: str = Field(..., min_length=3, max_length=32)
@@ -305,7 +305,7 @@ class RegisterRequest(BaseModel):
def validate_username(cls, v):
if not re.match(r'^[a-zA-Z0-9_]+$', v):
raise ValueError('Имя пользователя может содержать только буквы, цифры и подчеркивания')
return v
return v.lower()
class TokenResponse(BaseModel):
access_token: str
@@ -383,7 +383,6 @@ async def register(body: RegisterRequest, request: Request):
allowed, wait = check_rate_limit(ip)
if not allowed:
logger.warning("register rate limited", username=body.username, client_ip=ip)
raise HTTPException(429, f"Слишком много попыток. Подождите {wait} секунд")
with get_db() as conn:
@@ -393,7 +392,6 @@ async def register(body: RegisterRequest, request: Request):
).fetchone()
if existing:
logger.warning("register failed: username taken", username=body.username, client_ip=ip)
raise HTTPException(409, "Пользователь с таким именем уже существует")
uuid = generate_uuid()
@@ -407,7 +405,6 @@ async def register(body: RegisterRequest, request: Request):
)
user_id = cursor.lastrowid
logger.info("register ok", username=body.username, user_id=user_id, client_ip=ip)
# Создаем сессию
session_token = secrets.token_urlsafe(32)
@@ -459,7 +456,6 @@ async def login(body: LoginRequest, request: Request):
allowed, wait = check_rate_limit(ip)
if not allowed:
logger.warning("login rate limited", username=body.username, client_ip=ip)
raise HTTPException(429, f"Слишком много попыток. Подождите {wait} секунд")
with get_db() as conn:
@@ -469,20 +465,15 @@ async def login(body: LoginRequest, request: Request):
).fetchone()
if not user or not verify_password(body.password, user["password_hash"]):
logger.warning("login failed: bad credentials", username=body.username, client_ip=ip)
record_login_attempt(ip, False)
raise HTTPException(401, "Неверное имя пользователя или пароль")
if not user["is_active"]:
logger.warning("login failed: account deactivated", username=body.username, client_ip=ip)
raise HTTPException(403, "Аккаунт деактивирован")
if user["banned_until"] and user["banned_until"] > time.time():
logger.warning("login failed: account banned", username=body.username, client_ip=ip)
raise HTTPException(403, "Аккаунт забанен")
logger.info("login ok", username=user["username"], user_id=user["id"], client_ip=ip)
record_login_attempt(ip, True)
now = time.time()
server/main.py
+59 -397
View File
@@ -4,7 +4,7 @@ import os
from contextlib import asynccontextmanager
from datetime import datetime
from pathlib import Path
from urllib.parse import urlparse, quote
from urllib.parse import urlparse
from typing import Optional
import httpx
@@ -12,8 +12,7 @@ import json
import structlog
from cachetools import TTLCache
from fastapi import Depends, FastAPI, HTTPException, Request, Response
from fastapi.responses import FileResponse, HTMLResponse, JSONResponse, StreamingResponse
from fastapi.staticfiles import StaticFiles
from fastapi.responses import FileResponse, JSONResponse, StreamingResponse
from uvicorn.protocols.http.httptools_impl import HttpToolsProtocol
# Disable httpx debug logging
@@ -34,7 +33,6 @@ from playtime import router as playtime_router, init_playtime_db
import asyncio
import hashlib
import uuid
import aiofiles
import mimetypes
@@ -43,26 +41,14 @@ logger = structlog.get_logger(__name__)
# Cache for manifests - expires after 5 minutes
manifest_cache = TTLCache(maxsize=100, ttl=300)
BUILDS_DIR = Path(__file__).parent / "builds"
BUILDS_DIR = Path("builds")
VERSIONS_DIR = BUILDS_DIR / "versions"
WHITELIST_DIR = Path(__file__).parent / "whitelist"
# Website (landing) static files
SITE_DIR = Path(__file__).parent / "site"
# SkinRestorer skins (shared with TG bot)
SKINS_DIR = Path("/root/python/site/skins")
# Minecraft server status (same host the TG bot pings)
MC_STATUS_HOST = os.environ.get("MC_STATUS_HOST", "mc.zernmc.ru")
# Mirror configuration
LAUNCHER_MIRRORS = {
"main": "https://api.zern.cc", # primary
"mirror-1": "https://api.zernmc.ru", # legacy
"mirror-2": "https://api.zernmc.online", # legacy
"geo-pl": "https://api.pl.zern.cc",
"geo-swe": "https://api.swe.zern.cc",
"main": "https://api.zernmc.ru",
"mirror-1": "https://api.zernmc.online",
}
# Server role: "main" or "mirror"
@@ -81,12 +67,6 @@ MANUAL_BLOCKED_IPS = set(os.environ.get("BLOCKED_IPS", "").split(",")) - {""} #
# Cache file for blocklist (load once)
BLOCKLIST_CACHE_FILE = Path("data/blocklist_cache.txt")
# Crash reports directory
CRASH_REPORTS_DIR = Path("data/crash_reports")
# Network diagnostics reports directory
DIAG_REPORTS_DIR = Path("data/diag_reports")
@asynccontextmanager
async def lifespan(app: FastAPI):
@@ -163,7 +143,6 @@ async def lifespan(app: FastAPI):
BUILDS_DIR.mkdir(exist_ok=True)
PACKS_DIR.mkdir(exist_ok=True)
DATA_DIR.mkdir(exist_ok=True)
CRASH_REPORTS_DIR.mkdir(exist_ok=True)
init_db()
init_friends_db()
@@ -243,24 +222,6 @@ async def lifespan(app: FastAPI):
asyncio.create_task(periodic_sync())
# Background task: auto-detect new ZIP archives in builds/ and register them
async def watch_new_zips():
watch_interval = int(os.environ.get("ZIP_WATCH_INTERVAL", "15"))
while True:
await asyncio.sleep(watch_interval)
try:
before = set(f.name for f in VERSIONS_DIR.iterdir()) if VERSIONS_DIR.exists() else set()
extract_new_format_versions()
after = set(f.name for f in VERSIONS_DIR.iterdir()) if VERSIONS_DIR.exists() else set()
new_versions = after - before
if new_versions:
logger.info(f"New launcher versions detected: {', '.join(sorted(new_versions))}")
generate_launcher_builds_meta()
except Exception as e:
logger.warning(f"ZIP watch error: {e}")
asyncio.create_task(watch_new_zips())
yield
# Cleanup proxy client
@@ -848,7 +809,7 @@ class CacheControlMiddleware:
path = scope.get("path", "")
# Skip caching for dynamic endpoints
skip_cache = any(p in path for p in ["/api/", "/auth/", "/login", "/launch", "/install", "/skin/"])
skip_cache = any(p in path for p in ["/api/", "/auth/", "/login", "/launch", "/install"])
if skip_cache:
await self.app(scope, receive, send)
return
@@ -963,17 +924,6 @@ app.include_router(admin_router)
app.include_router(friends_router)
app.include_router(playtime_router)
# Static assets for the landing site
for sub in ("css", "js", "img"):
mount_dir = SITE_DIR / sub
mount_dir.mkdir(parents=True, exist_ok=True)
app.mount(f"/{sub}", StaticFiles(directory=mount_dir), name=f"site-{sub}")
# Server highlights media (screenshots / clips for the landing carousel)
HIGHLIGHTS_DIR = SITE_DIR / "highlights"
HIGHLIGHTS_DIR.mkdir(parents=True, exist_ok=True)
app.mount("/highlights", StaticFiles(directory=HIGHLIGHTS_DIR), name="site-highlights")
# Monkey patch to catch invalid HTTP requests
original_data_received = HttpToolsProtocol.data_received
@@ -1011,10 +961,8 @@ HttpToolsProtocol.data_received = patched_data_received
@app.get("/")
async def root():
"""Root endpoint - serves the launcher landing site"""
index_path = SITE_DIR / "index.html"
if index_path.exists():
return HTMLResponse(index_path.read_text(encoding="utf-8"))
"""Root endpoint"""
logger.info("Root endpoint accessed")
return {
"status": "ok",
"message": "ZernMC Launcher Server is running",
@@ -1023,83 +971,6 @@ async def root():
}
@app.get("/skin/{filename}")
@app.head("/skin/{filename}")
async def get_skin(filename: str, request: Request):
"""Serve SkinRestorer skins (compatibility with TG bot direct links)"""
if not filename or ".." in filename or "/" in filename or "\\" in filename:
raise HTTPException(status_code=404, detail="Скин не найден")
filepath = SKINS_DIR / filename
if not filepath.is_file():
raise HTTPException(status_code=404, detail="Скин не найден")
try:
content = filepath.read_bytes()
size = len(content)
headers = {
"Content-Length": str(size),
"Content-Type": "image/png",
"Cache-Control": "no-cache, no-store, must-revalidate",
"Pragma": "no-cache",
"Expires": "0",
"Access-Control-Allow-Origin": "*",
"Content-Encoding": "identity",
}
if request.method == "HEAD":
return Response(status_code=200, headers=headers)
return Response(
content=content,
media_type="image/png",
headers=headers
)
except Exception as e:
logger.error("Skin read error", error=str(e))
raise HTTPException(status_code=500, detail="Ошибка чтения скина")
@app.get("/api/status")
async def api_server_status():
"""Live Minecraft server status via mcstatus ping (same host as TG bot)"""
try:
from mcstatus import JavaServer
server = JavaServer.lookup(f"{MC_STATUS_HOST}")
status = await server.async_status()
players_list = []
try:
query = await server.async_query()
if query.players.names:
players_list = query.players.names
elif query.players.online > 0 and query.players.sample:
players_list = [p.name for p in query.players.sample]
except Exception:
if status.players.sample:
players_list = [p.name for p in status.players.sample]
version = getattr(status.version, "name", None) or "unknown"
motd = status.description
return {
"online": True,
"players_online": status.players.online,
"players_max": status.players.max,
"players_list": ", ".join(players_list) if players_list else "никого нет",
"players": players_list,
"motd": motd,
"version": version if isinstance(version, str) else str(version),
"updated": datetime.now().strftime("%H:%M:%S")
}
except asyncio.TimeoutError:
return {"online": False, "error": "Таймаут подключения к серверу", "updated": datetime.now().strftime("%H:%M:%S")}
except Exception as e:
return {"online": False, "error": f"{type(e).__name__}: {e}", "updated": datetime.now().strftime("%H:%M:%S")}
@app.get("/health")
async def health():
"""Health check endpoint"""
@@ -1234,9 +1105,9 @@ async def get_pack_diff(
for path, entry in server_files.items():
client_hash = body.get(path)
if client_hash is None or client_hash != entry.hash:
url = f"/pack/{pack_name}/file/{quote(path, safe='/')}"
url = f"/pack/{pack_name}/file/{path}"
if preset:
url += f"?preset={quote(preset, safe='')}"
url += f"?preset={preset}"
to_download.append({
"path": path,
"url": url,
@@ -1310,32 +1181,6 @@ async def get_pack_manifest(pack_name: str, request: Request, current_user: dict
)
@app.get("/pack/{pack_name}/zip")
async def download_pack_zip(pack_name: str, request: Request, current_user: dict = Depends(get_current_user)):
"""Download whole pack as zip for manual installation (requires pass)"""
if not has_permission(current_user["role"], Permissions.DOWNLOAD_PACK):
raise HTTPException(403, "Requires active pass")
if is_pack_disabled(pack_name):
raise HTTPException(403, "Pack is disabled")
pack_path = PACKS_DIR / pack_name
if not pack_path.exists() or not pack_path.is_dir():
raise HTTPException(404, "Pack not found")
import tempfile, zipfile
tmp = Path(tempfile.gettempdir()) / f"{pack_name}.zip"
# re-use if fresh (<5 min)
if tmp.exists() and (datetime.utcnow().timestamp() - tmp.stat().st_mtime) < 300:
return await send_file_async(tmp, request, content_type="application/zip", cache=False)
# create zip
def _zip():
with zipfile.ZipFile(tmp, 'w', zipfile.ZIP_DEFLATED) as zf:
for f in pack_path.rglob("*"):
if f.is_file():
zf.write(f, f.relative_to(pack_path))
loop = asyncio.get_running_loop()
await loop.run_in_executor(None, _zip)
return await send_file_async(tmp, request, content_type="application/zip", cache=False)
@app.get("/pack/{pack_name}/file/{file_path:path}")
async def get_pack_file(pack_name: str, file_path: str, request: Request, current_user: dict = Depends(get_current_user), preset: Optional[str] = None):
"""Get a file from a pack. If preset is specified, try preset dir first, fall back to base."""
@@ -1393,17 +1238,15 @@ async def get_pack_file(pack_name: str, file_path: str, request: Request, curren
# ====================== ЭНДПОИНТЫ ДЛЯ ЛАУНЧЕРА ======================
def get_current_launcher_version() -> str:
"""Get current launcher version — prefers build.version (includes hotfix), falls back to extracted versions"""
version_file = BUILDS_DIR / "build.version"
if version_file.exists():
v = version_file.read_text().strip()
if v:
return v
"""Get current launcher version from meta system (new format) or build.version (legacy)"""
versions = get_launcher_versions()
if versions:
return versions[0]["meta"]["version"]
# Fallback to build.version for legacy
version_file = BUILDS_DIR / "build.version"
if version_file.exists():
return version_file.read_text().strip()
return "1.0.0"
@@ -1464,13 +1307,8 @@ def generate_launcher_builds_meta():
rel_path = str(file_path.relative_to(BUILDS_DIR))
# Only include runtime files needed for launcher updates
# Skip: JRE, old ZIPs, extracted versions, docs, root JARs.
# lib/javafx/*-win.jar IS included so existing clients get the
# JavaFX update (e.g. 23 -> 23.0.1 WebKit WebSocket fix) via the
# incremental updater, not only through a full ZIP reinstall.
if rel_path.startswith(("jre21/", "lib-javafx/", "versions/", "libs/", "logs/")):
continue
if rel_path.startswith("lib/") and not rel_path.startswith("lib/javafx/"):
# Skip: JRE, JavaFX, old ZIPs, extracted versions, docs, root JARs
if rel_path.startswith(("jre21/", "lib/", "lib-javafx/", "versions/", "libs/")):
continue
if rel_path.endswith(".zip") or rel_path in ("README.txt", "build.version"):
continue
@@ -1479,17 +1317,6 @@ def generate_launcher_builds_meta():
# Skip root-level JARs — only bin/*.jar is needed at runtime
if rel_path in ("zernmclauncher.jar", "zernmc-bootstrap.jar"):
continue
# CLI exe is not shipped to users
if rel_path == "zernmc-cli.exe":
continue
# zernmc.exe embeds the launcher version, so its hash changes on
# every build even when the bootstrap code is unchanged. Exclude it
# from the incremental update: a new exe is only delivered via a
# full ZIP reinstall. Without this the bootstrap would re-download
# and re-stage its own exe on every launcher version bump, and the
# detached .cmd helper fails with "file not found".
if rel_path == "zernmc.exe":
continue
stat = file_path.stat()
# Calculate hash
@@ -1525,39 +1352,6 @@ def generate_launcher_builds_meta():
logger.warning(f"Failed to save meta.json: {e}")
def generate_version_meta(version_path: Path, version: str) -> dict:
"""Generate and cache meta.json for an extracted version directory."""
files = []
for file_path in version_path.rglob("*"):
if file_path.is_file() and file_path.name != "meta.json":
rel_path = str(file_path.relative_to(version_path))
if rel_path in ("zernmc.exe", "zernmc-cli.exe"):
continue
stat = file_path.stat()
file_hash = calculate_file_hash(file_path)
files.append({
"path": rel_path,
"size": stat.st_size,
"hash": f"sha256:{file_hash}"
})
meta = {
"version": version,
"type": "new",
"release_date": datetime.utcnow().isoformat(),
"files": files
}
try:
meta_path = version_path / "meta.json"
with open(meta_path, 'w', encoding='utf-8') as f:
json.dump(meta, f, indent=2)
except Exception as e:
logger.warning(f"Failed to save launcher meta for {version}: {e}")
return meta
def scan_launcher_version(version: str) -> Optional[dict]:
"""Scan a launcher version directory and return meta"""
# First check if meta exists in builds/ directly (for new format)
@@ -1588,7 +1382,33 @@ def scan_launcher_version(version: str) -> Optional[dict]:
pass
# Generate meta
return generate_version_meta(version_path, version)
files = []
for file_path in version_path.rglob("*"):
if file_path.is_file() and file_path.name != "meta.json":
rel_path = str(file_path.relative_to(version_path))
stat = file_path.stat()
file_hash = calculate_file_hash(file_path)
files.append({
"path": rel_path,
"size": stat.st_size,
"hash": f"sha256:{file_hash}"
})
meta = {
"version": version,
"type": "new",
"release_date": datetime.utcnow().isoformat(),
"files": files
}
# Save meta
try:
with open(meta_path, 'w', encoding='utf-8') as f:
json.dump(meta, f, indent=2)
except Exception as e:
logger.warning(f"Failed to save launcher meta for {version}: {e}")
return meta
def parse_version_key(v: str) -> tuple:
@@ -1630,18 +1450,13 @@ def extract_new_format_versions():
# Find all ZernMC-win-*.zip files
new_format_zips = list(BUILDS_DIR.glob("ZernMC-win-*.zip"))
total = len(new_format_zips)
extracted = 0
skipped = 0
failed = 0
for zip_file in new_format_zips:
version = zip_file.stem.replace("ZernMC-win-", "")
extract_dir = VERSIONS_DIR / version
# Skip if already extracted and meta exists
if extract_dir.exists() and (extract_dir / "meta.json").exists():
skipped += 1
logger.debug(f"Version {version} already extracted")
continue
logger.info(f"Extracting {zip_file.name} to versions/{version}/...")
@@ -1652,19 +1467,9 @@ def extract_new_format_versions():
# Extract all files
zf.extractall(extract_dir)
# Generate meta.json cache for the extracted version. Without this the
# "already extracted" check above always fails: scan_launcher_version()
# short-circuits on BUILDS_DIR/meta.json for the latest version and never
# writes versions/<v>/meta.json, so every scan would re-extract the zip.
generate_version_meta(extract_dir, version)
extracted += 1
logger.info(f"Extracted {zip_file.name} successfully")
except Exception as e:
failed += 1
logger.error(f"Failed to extract {zip_file.name}: {e}")
logger.info(f"Version scan complete: {total} total, {extracted} extracted, {skipped} skipped (already present), {failed} failed")
# ====================== END ЛАУНЧЕР МЕТА СИСТЕМА ======================
@@ -1745,14 +1550,6 @@ def get_legacy_zips() -> list:
return zips
@app.get("/launcher/ip")
async def get_launcher_client_ip(request: Request):
"""Return the public IP that the server sees for this client."""
from middleware import get_client_ip
client_ip = get_client_ip(request)
return {"ip": client_ip}
@app.get("/launcher/version")
async def get_launcher_version():
"""Return launcher version information"""
@@ -1765,12 +1562,12 @@ async def get_launcher_version():
"updated_at": datetime.utcnow().isoformat()
}
jar_path = BUILDS_DIR / "zernmclauncher.jar"
jar_path = BUILDS_DIR / "ZernMCLauncher.jar"
if jar_path.exists():
response["download_jar"] = "/launcher/download/jar"
response["jar_size"] = jar_path.stat().st_size
exe_path = BUILDS_DIR / "zernmc.exe"
exe_path = BUILDS_DIR / "ZernMCLauncher.exe"
if exe_path.exists():
response["download_exe"] = "/launcher/download/exe"
response["exe_size"] = exe_path.stat().st_size
@@ -1809,7 +1606,7 @@ async def download_launcher_jar(request: Request = None):
@app.get("/launcher/download/exe")
async def download_launcher_exe(request: Request = None):
"""Download launcher EXE file (Windows)"""
file_path = BUILDS_DIR / "zernmc.exe"
file_path = BUILDS_DIR / "ZernMCLauncher.exe"
if not file_path.exists():
raise HTTPException(404, "EXE file not found")
@@ -1824,64 +1621,6 @@ async def download_launcher_exe(request: Request = None):
)
@app.get("/launcher/download/jre")
async def download_jre(request: Request):
"""Download JRE zip for online installer (47M, Range supported)"""
candidates = [
BUILDS_DIR / ".." / "OpenJDK21U-jre_x64_windows_hotspot_21.0.6_7.zip", # /root/launcher/OpenJDK...
Path(__file__).parent.parent / "OpenJDK21U-jre_x64_windows_hotspot_21.0.6_7.zip",
Path("/root/launcher/OpenJDK21U-jre_x64_windows_hotspot_21.0.6_7.zip"),
BUILDS_DIR / "jre.zip",
]
for p in candidates:
pp = p.resolve()
if pp.exists() and pp.is_file():
return await send_file_async(pp, request, content_type="application/zip", cache=True)
raise HTTPException(404, "JRE zip not found on server")
def _find_latest_setup(pattern: str) -> Path | None:
"""Find latest Go setup exe by pattern (Online/Offline)"""
cands = list(BUILDS_DIR.glob(pattern))
if not cands:
return None
# sort by version key from filename
def ver_key(p: Path):
# ZernMC-Online-Setup-1.1.1.2.exe -> 1.1.1.2
name = p.stem
ver = name.split("-")[-1]
try:
return tuple(int(x) for x in ver.split("."))
except:
return (0,)
cands.sort(key=ver_key, reverse=True)
return cands[0]
@app.get("/launcher/download/online")
async def download_online_setup(request: Request):
"""Download online Go installer (5.8M, STANDALONE EXE without bundled JRE)"""
p = _find_latest_setup("ZernMC-Online-Setup-*.exe")
if p and p.exists():
resp = await send_file_async(p, request, content_type="application/vnd.microsoft.portable-executable", cache=True)
resp.headers["Content-Disposition"] = f'attachment; filename="{p.name}"'
return resp
raise HTTPException(404, "Online installer not found")
@app.get("/launcher/download/offline-setup")
async def download_offline_setup(request: Request):
"""Download offline Go installer (STANDALONE EXE with embedded build, ~100M)"""
p = _find_latest_setup("ZernMC-Offline-Setup-*.exe")
if p and p.exists():
resp = await send_file_async(p, request, content_type="application/vnd.microsoft.portable-executable", cache=True)
resp.headers["Content-Disposition"] = f'attachment; filename="{p.name}"'
return resp
# fallback: try legacy offline zip embed name without -Setup
p2 = _find_latest_setup("ZernMC-Offline-*.exe")
if p2 and p2.exists():
resp = await send_file_async(p2, request, content_type="application/vnd.microsoft.portable-executable", cache=True)
resp.headers["Content-Disposition"] = f'attachment; filename="{p2.name}"'
return resp
raise HTTPException(404, "Offline installer not found")
@app.get("/launcher/download/zip/{filename}")
async def download_launcher_zip(filename: str, request: Request = None):
"""Download specific launcher ZIP archive"""
@@ -2155,63 +1894,6 @@ async def get_launcher_full_info():
return info
@app.post("/launcher/crash-report")
async def receive_crash_report(request: Request):
"""Receive and store launcher crash reports"""
try:
body = await request.json()
except Exception:
raise HTTPException(status_code=400, detail="Invalid JSON")
ip = request.client.host if request.client else "unknown"
body["source_ip"] = ip
body["received_at"] = datetime.utcnow().isoformat()
report_id = datetime.utcnow().strftime("%Y%m%d_%H%M%S") + "_" + uuid.uuid4().hex[:8]
report_path = CRASH_REPORTS_DIR / f"{report_id}.json"
try:
CRASH_REPORTS_DIR.mkdir(parents=True, exist_ok=True)
async with aiofiles.open(report_path, "w", encoding="utf-8") as f:
await f.write(json.dumps(body, indent=2, ensure_ascii=False))
logger.info(f"Crash report saved: {report_path.name} from {ip}")
except Exception as e:
logger.error(f"Failed to save crash report: {e}")
raise HTTPException(status_code=500, detail="Failed to save report")
return {"status": "ok", "id": report_id}
@app.post("/diag/upload")
async def receive_diag_report(request: Request):
"""Receive and store network diagnostics reports from the diag utility"""
try:
body = await request.body()
except Exception:
raise HTTPException(status_code=400, detail="Failed to read body")
if not body:
raise HTTPException(status_code=400, detail="Empty body")
ip = request.client.host if request.client else "unknown"
name = request.query_params.get("name", "").strip()
if not name or "/" in name or "\\" in name or ".." in name:
name = f"diag_{datetime.utcnow().strftime('%Y%m%d_%H%M%S')}_{ip}.log"
report_path = DIAG_REPORTS_DIR / name
try:
DIAG_REPORTS_DIR.mkdir(parents=True, exist_ok=True)
async with aiofiles.open(report_path, "w", encoding="utf-8") as f:
await f.write(body.decode("utf-8", errors="replace"))
logger.info(f"Diag report saved: {report_path.name} from {ip}")
except Exception as e:
logger.error(f"Failed to save diag report: {e}")
raise HTTPException(status_code=500, detail="Failed to save report")
return {"status": "ok", "name": report_path.name}
# ====================== НОВОСТИ ======================
NEWS_DIR = Path(__file__).parent / "news"
@@ -2224,9 +1906,8 @@ async def list_news():
return {"news": []}
news_list = []
files = [f for f in NEWS_DIR.iterdir() if f.is_file() and f.suffix == ".txt"]
files.sort(key=lambda f: f.stat().st_mtime, reverse=True)
for f in files:
for f in sorted(NEWS_DIR.iterdir()):
if f.is_file() and f.suffix == ".txt":
try:
content = f.read_text(encoding="utf-8").strip().split("\n")
if len(content) >= 4:
@@ -2244,6 +1925,7 @@ async def list_news():
except Exception as e:
logger.warning(f"Failed to read news file {f.name}: {e}")
news_list.reverse()
return {"news": news_list}
@@ -2442,34 +2124,19 @@ async def proxy_mojang_version(version_id: str, request: Request):
# Сначала получаем манифест, чтобы найти URL версии
manifest_url = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json"
# Cache the final version JSON, not just the version URL. piston-meta is
# slow/unreliable from some regions, so full serialization of the version
# JSON (plus a warm-up) keeps installs from stalling on install time.
cache_key = f"version_json_{version_id}"
cached = proxy_cache.get(cache_key)
if cached is not None:
logger.info(f"Proxy served from cache: Mojang version {version_id}")
return JSONResponse(content=cached)
version_url = proxy_cache.get(f"version_url_{version_id}")
cache_key = f"version_url_{version_id}"
version_url = proxy_cache.get(cache_key)
if not version_url:
try:
# Reuse the manifest already cached by /proxy/mojang/version_manifest
manifest = proxy_cache.get(manifest_url)
if manifest is None:
response = await proxy_client.get(manifest_url)
response.raise_for_status()
manifest = response.json()
proxy_cache[manifest_url] = manifest
logger.info("Proxy success: Mojang manifest")
else:
logger.info("Proxy served manifest from cache")
response = await proxy_client.get(manifest_url)
response.raise_for_status()
manifest = response.json()
for version in manifest.get("versions", []):
if version.get("id") == version_id:
version_url = version.get("url")
proxy_cache[f"version_url_{version_id}"] = version_url
proxy_cache[cache_key] = version_url
break
if not version_url:
@@ -2484,7 +2151,6 @@ async def proxy_mojang_version(version_id: str, request: Request):
response.raise_for_status()
data = response.json()
proxy_cache[cache_key] = data
logger.info(f"Proxy success: Mojang version {version_id}")
return JSONResponse(content=data)
@@ -2612,15 +2278,11 @@ async def proxy_download(request: Request):
"maven.fabricmc.net",
"meta.fabricmc.net",
"piston-meta.mojang.com",
"piston-data.mojang.com",
"launchermeta.mojang.com",
"resources.download.minecraft.net",
"libraries.minecraft.net",
"maven.minecraftforge.net",
"files.minecraftforge.net",
"maven.neoforged.net",
"repo1.maven.org",
"repo.maven.apache.org",
"api.zernmc.ru",
"api.zernmc.online"
]
@@ -2640,7 +2302,7 @@ async def proxy_download(request: Request):
try:
# Используем streaming response для больших файлов
response = await proxy_client.get(url, timeout=300.0)
response = await proxy_client.get(url)
response.raise_for_status()
# Определяем content-type из ответа или по расширению
server/middleware.py
-3
View File
@@ -159,9 +159,6 @@ class LoggingMiddleware(BaseHTTPMiddleware):
# Skip rate limiting for pack file downloads (direct high-speed serving)
if path.startswith("/pack/") and "/file/" in path:
is_file_download = True
elif path.startswith(("/skin/", "/css/", "/js/", "/img/", "/highlights/")):
# SkinRestorer skins + landing site assets must not be rate-limited
is_file_download = True
else:
is_file_download = False
server/news/news6.txt
-10
View File
@@ -1,10 +0,0 @@
Pack Download Stability Fix
Update
v1.0.13.1
[{"bold":1,"text":"Fixed pack downloads getting stuck on Minecraft/Forge installation","click_action":"none"}]
- All Minecraft downloads now use smart proxy system (like the rest of the launcher)
- Added read timeouts to prevent hanging on slow/unstable connections
- Asset download no longer blocks forever if Mojang CDN stalls
- Forge installer process now has a 10-minute timeout
- Progress bar now updates during Minecraft installation phase
[{"clickable":1,"text":"Download v1.0.13.1","click_action":"open_url","url":"https://zernmc.ru/download"}]
server/site/css/style.css
-1325
View File
File diff suppressed because it is too large Load Diff
server/site/highlights/1.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 353 KiB

server/site/highlights/10.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 60 KiB

server/site/highlights/11.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 99 KiB

server/site/highlights/12.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

server/site/highlights/13.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 132 KiB

server/site/highlights/14.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 184 KiB

server/site/highlights/15.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 61 KiB

server/site/highlights/2.mp4
BIN
View File
Binary file not shown.
server/site/highlights/3.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 57 KiB

server/site/highlights/4.mp4
BIN
View File
Binary file not shown.
server/site/highlights/5.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 121 KiB

server/site/highlights/6.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 98 KiB

server/site/highlights/7.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 68 KiB

server/site/highlights/8.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 113 KiB

server/site/highlights/9.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 107 KiB

server/site/img/zernmc.svg
-10
View File
@@ -1,10 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
<defs>
<linearGradient id="g" x1="0" y1="0" x2="1" y2="1">
<stop offset="0%" stop-color="#e94560"/>
<stop offset="100%" stop-color="#ff6b6b"/>
</linearGradient>
</defs>
<rect width="256" height="256" rx="64" fill="url(#g)"/>
<path d="M82 128 L128 82 L174 128 L128 174 Z" fill="white" opacity="0.9"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 423 B

server/site/index.html
-582
View File
@@ -1,582 +0,0 @@
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Zern — Awaken from the cold</title>
<meta name="description" content="Zern — a custom Minecraft launcher. Forge, NeoForge, Fabric. Download and play on ZernMC.">
<link rel="icon" type="image/svg+xml" href="/img/zernmc.svg">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Onest:wght@300;400;500;600;700;800;900&display=swap" rel="stylesheet">
<link rel="stylesheet" href="/css/style.css">
</head>
<body>
<nav class="nav" id="nav">
<div class="nav-inner">
<a class="nav-brand" href="#top">
<img src="/img/zernmc.svg" alt="Zern" width="34" height="34">
<span>Zern</span>
</a>
<ul class="nav-links">
<li><a href="#server" data-i18n="nav.server">Сервер</a></li>
<li><a href="#highlights" data-i18n="nav.highlights">Хайлайты</a></li>
<li><a href="#theme" data-i18n="nav.season">Сезон</a></li>
<li><a href="#features" data-i18n="nav.features">Возможности</a></li>
<li><a href="#showcase" data-i18n="nav.showcase">Лаунчер</a></li>
<li><a href="#download" data-i18n="nav.download">Скачать</a></li>
<li><a href="#news" data-i18n="nav.news">Новости</a></li>
</ul>
<div class="nav-right">
<button class="lang-toggle" id="langToggle" type="button" aria-label="Switch language">
<span class="lang-toggle-label" id="langToggleLabel">EN</span>
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/></svg>
</button>
<button class="btn btn-ghost" id="auth-btn" style="padding:8px 14px;font-size:13px" data-i18n="nav.login">Войти</button>
<div id="user-menu" class="hidden" style="display:flex;align-items:center;gap:8px">
<span id="user-name" style="font-weight:600;font-size:13px;color:var(--text)"></span>
<button class="btn btn-ghost" id="cabinet-btn" style="padding:8px 14px;font-size:13px" data-i18n="nav.cabinet">Кабинет</button>
<button class="btn btn-ghost" id="logout-btn" style="padding:8px 14px;font-size:13px" data-i18n="nav.logout">Выйти</button>
</div>
<a class="nav-cta" href="#download" data-i18n="nav.play">Играть сейчас</a>
</div>
</div>
</nav>
<header class="hero" id="top">
<div class="hero-grid" aria-hidden="true"></div>
<div class="hero-glow" aria-hidden="true"></div>
<div class="hero-diamond hero-diamond--1" aria-hidden="true"></div>
<div class="hero-diamond hero-diamond--2" aria-hidden="true"></div>
<div class="hero-diamond hero-diamond--3" aria-hidden="true"></div>
<div class="hero-inner" data-parallax="0.15">
<p class="hero-kicker" data-i18n="hero.kicker">КАСТОМНЫЙ MINECRAFT ЛАУНЧЕР</p>
<h1 class="hero-title" data-i18n-html="hero.title">Очнись от<br><span class="hero-title-accent">холода.</span></h1>
<p class="hero-sub" data-i18n="hero.sub">Zern оживляет твои любимые модпаки. Один лаунчер, любой загрузчик, без лишних хлопот — создан для сервера ZernMC и не только.</p>
<div class="hero-actions">
<a class="btn btn-primary" href="#download">
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12 3v12"/><path d="m7 10 5 5 5-5"/><path d="M4 21h16"/></svg>
<span data-i18n="hero.download">Скачать лаунчер</span>
</a>
<a class="btn btn-ghost" href="#features" data-i18n="hero.explore">Обзор</a>
</div>
<p class="hero-meta">v<span id="hero-version">—</span> · <span id="hero-size">—</span> · Windows</p>
</div>
<div class="scroll-hint" data-parallax="0.3">
<span data-i18n="hero.scroll">Листай вниз</span>
<div class="scroll-hint-line"><i></i></div>
</div>
</header>
<main>
<section class="section server" id="server">
<div class="section-head">
<span class="section-index">01 / 07</span>
<h2 class="section-title" data-i18n-html="server.title">Сервер <span class="accent">жив.</span></h2>
<p class="section-sub" data-i18n="server.sub">ZernMC — это кастомный Minecraft-сервер со своим лором, самописными плагинами и живым комьюнити. Вот что происходит прямо сейчас.</p>
</div>
<div class="server-stats">
<div class="server-card">
<div class="server-card-label" data-i18n="server.status">Статус</div>
<div class="server-card-value" id="srv-status"><span class="status-dot status-dot--loading"></span> <span data-i18n="server.checking">Проверяем…</span></div>
<div class="server-card-sub" id="srv-version">1.20.1 / ОБТ</div>
</div>
<div class="server-card">
<div class="server-card-label" data-i18n="server.players">Игроков онлайн</div>
<div class="server-card-value" id="srv-players">— / —</div>
<div class="server-card-sub">mc.zernmc.ru</div>
</div>
<div class="server-card">
<div class="server-card-label" data-i18n="server.mode">Режим</div>
<div class="server-card-value">Survival <span class="server-season">· <span data-i18n="server.season">Сезон Prologue</span></span></div>
<div class="server-card-sub">1.21.1 NeoForge · Create: Aeronautics</div>
</div>
</div>
</section>
<section class="section highlights" id="highlights">
<div class="section-head">
<span class="section-index">02 / 07</span>
<h2 class="section-title" data-i18n-html="highlights.title">Хайлайты <span class="accent">сервера.</span></h2>
<p class="section-sub" data-i18n="highlights.sub">Моменты, запечатлённые на сервере ZernMC — войны, постройки и хаос.</p>
</div>
<div class="carousel">
<div class="carousel-track" id="carousel"></div>
<button class="carousel-btn carousel-btn--prev" id="carouselPrev" data-i18n-aria="carousel.prev">‹</button>
<button class="carousel-btn carousel-btn--next" id="carouselNext" data-i18n-aria="carousel.next">›</button>
<div class="carousel-dots" id="carouselDots"></div>
</div>
</section>
<section class="section features" id="features">
<div class="section-head">
<span class="section-index">03 / 07</span>
<h2 class="section-title" data-i18n-html="features.title">Всё, что <span class="accent">тебе нужно.</span></h2>
<p class="section-sub" data-i18n="features.sub">Лаунчер, который делает всю тяжёлую работу, чтобы ты просто играл.</p>
</div>
<div class="features-grid">
<article class="feature-card">
<span class="feature-num">01</span>
<div class="feature-icon" aria-hidden="true">
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M13 2 3 14h9l-1 8 10-12h-9l1-8z"/></svg>
</div>
<h3 data-i18n="features.forge.title">Forge, NeoForge, Fabric</h3>
<p data-i18n="features.forge.sub">Все основные модлоадеры подхватываются автоматически. Библиотеки предзагружаются и проверяются, так что установка работает — даже на медленном интернете.</p>
</article>
<article class="feature-card">
<span class="feature-num">02</span>
<div class="feature-icon" aria-hidden="true">
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8"/><path d="M12 17v4"/></svg>
</div>
<h3 data-i18n="features.ui.title">Тёмный, быстрый нативный UI</h3>
<p data-i18n="features.ui.sub">Лёгкий интерфейс на JavaFX с чистым тёмным оформлением. Быстро запускается, мгновенно реагирует и не мешает.</p>
</article>
<article class="feature-card">
<span class="feature-num">03</span>
<div class="feature-icon" aria-hidden="true">
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M5 18H3a2 2 0 0 1-2-2V7a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-2"/><path d="M9 22v-4"/><path d="M15 22v-4"/></svg>
</div>
<h3 data-i18n="features.proxy.title">Умные зеркала и прокси</h3>
<p data-i18n="features.proxy.sub">Загрузки идут через быстрые зеркала с автоматическим фолбэком. Заблокировали или зарезали скорость? Прокси подхватит — ты больше не зависнешь на 80%.</p>
</article>
<article class="feature-card">
<span class="feature-num">04</span>
<div class="feature-icon" aria-hidden="true">
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M12 2a10 10 0 0 0-9 14l2 5 5-2A10 10 0 1 0 12 2z"/><path d="M8.5 12h.01"/><path d="M12 12h.01"/><path d="M15.5 12h.01"/></svg>
</div>
<h3 data-i18n="features.news.title">Новости и статус сервера</h3>
<p data-i18n="features.news.sub">Чейнджлоги, ивенты и обновления приходят прямо в лаунчер. Ты всегда знаешь, что нового, ещё до нажатия «Играть».</p>
</article>
<article class="feature-card">
<span class="feature-num">05</span>
<div class="feature-icon" aria-hidden="true">
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M22 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/></svg>
</div>
<h3 data-i18n="features.pack.title">Установка сборки в один клик</h3>
<p data-i18n="features.pack.sub">Выбери сборку и жми «Установить». Манифесты версий, ванильные ассеты и библиотеки подтягиваются и проверяются автоматически. Просто.</p>
</article>
</div>
</section>
<section class="section showcase" id="showcase">
<div class="section-head section-head--center">
<span class="section-index">04 / 07</span>
<h2 class="section-title" data-i18n-html="showcase.title">Показываем <span class="accent">лаунчер</span></h2>
<p class="section-sub" data-i18n="showcase.sub">Никаких статичных скриншотов — живой тур по интерфейсу. Нужно просто наблюдать: лаунчер сам открывает свои экраны.</p>
</div>
<div class="launcher-preview" id="launcherPreview" role="img" aria-label="ZernMC Launcher preview, auto-rotating screens" data-i18n-aria="preview.aria">
<div class="launcher-window">
<div class="launcher-titlebar">
<div class="win-dots" aria-hidden="true"><span></span><span></span><span></span></div>
<span class="launcher-titlebar-name">
<svg class="win-icon" viewBox="0 0 56 56" fill="none" aria-hidden="true"><rect width="56" height="56" rx="14" fill="#e94560"/><path d="M18 28 L28 18 L38 28 L28 38 Z" fill="#fff" opacity="0.9"/></svg>
ZernMC Launcher <span id="preview-version">—</span>
</span>
</div>
<div class="launcher-preview-body" id="launcherPreviewBody">
<div class="preview-scene scene-login is-active" data-key="login">
<div class="scene-login-inner">
<div class="pv-brand">
<svg width="40" height="40" viewBox="0 0 56 56" fill="none" aria-hidden="true"><rect width="56" height="56" rx="14" fill="#e94560"/><path d="M18 28 L28 18 L38 28 L28 38 Z" fill="#fff" opacity="0.9"/></svg>
</div>
<h3 class="pv-title" data-i18n="preview.signIn">Вход</h3>
<div class="pv-field"><label data-i18n="preview.username">Логин</label><div class="pv-input"></div></div>
<div class="pv-field"><label data-i18n="preview.password">Пароль</label><div class="pv-input"></div></div>
<div class="pv-btn" data-i18n="preview.signIn">Вход</div>
</div>
</div>
<div class="preview-scene scene-packs" data-key="packs">
<div class="pv-sidebar">
<div class="pv-sb-brand">
<svg width="24" height="24" viewBox="0 0 56 56" fill="none" aria-hidden="true"><rect width="56" height="56" rx="14" fill="#e94560"/><path d="M18 28 L28 18 L38 28 L28 38 Z" fill="#fff" opacity="0.9"/></svg>
<span>ZernMC<em>v<span class="pv-sb-ver">2.3.1</span></em></span>
</div>
<div class="pv-sb-nav">
<span class="pv-nav-item is-active" title="Packs">
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/><polyline points="3.27 6.96 12 12.01 20.73 6.96"/><line x1="12" y1="22.08" x2="12" y2="12"/></svg>
<span data-i18n="preview.nav.packs">Сборки</span>
</span>
<span class="pv-nav-item" title="News">
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M4 22h16a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H8a2 2 0 0 0-2 2v16a2 2 0 0 1-2 2Zm0 0a2 2 0 0 1-2-2v-9h4"/><path d="M18 14h-8"/><path d="M15 18h-5"/><path d="M10 6h8v4h-8V6Z"/></svg>
<span data-i18n="preview.nav.news">Новости</span>
</span>
<span class="pv-nav-item" title="Friends">
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/></svg>
<span data-i18n="preview.nav.friends">Друзья</span>
</span>
</div>
<div class="pv-sb-section">
<span class="pv-sb-section-title" data-i18n="preview.serverPacks">Серверные сборки</span>
<div class="pv-pack-item">
<span class="pv-pack-name">Zern-OBT</span>
<span class="pv-pack-meta">1.20.1 · forge</span>
</div>
<div class="pv-pack-item is-active">
<span class="pv-pack-name">Zern-Prologue</span>
<span class="pv-pack-meta">1.21.1 · neoforge</span>
</div>
</div>
<div class="pv-sb-section">
<span class="pv-sb-section-title" data-i18n="preview.localPacks">Локальные сборки</span>
<div class="pv-pack-item">
<span class="pv-pack-name">Vanilla</span>
<span class="pv-pack-meta">1.20.1</span>
</div>
</div>
<div class="pv-sb-user">
<span class="pv-avatar">Z</span>
<span class="pv-user-meta"><em>zernplayer</em><i class="pv-badge">FREE</i></span>
<svg class="pv-sb-action" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="3"/><path d="M12 1v2M12 21v2M4.22 4.22l1.42 1.42M18.36 18.36l1.42 1.42M1 12h2M21 12h2M4.22 19.78l1.42-1.42M18.36 5.64l1.42-1.42"/></svg>
<svg class="pv-sb-action" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"/><polyline points="16 17 21 12 16 7"/><line x1="21" y1="12" x2="9" y2="12"/></svg>
</div>
</div>
<div class="pv-main">
<div class="pv-main-head">
<div>
<h3>Zern-Prologue</h3>
<div class="pv-tags"><span class="pv-tag pv-tag-mc">1.21.1</span><span class="pv-tag">neoforge</span></div>
</div>
<div class="pv-stats">
<span><b>47.4</b><i data-i18n="preview.stat.loader">Загрузчик</i></span>
<span><b>130</b><i data-i18n="preview.stat.files">Файлы</i></span>
<span><b>1.8 ГБ</b><i data-i18n="preview.stat.size">Размер</i></span>
</div>
</div>
<div class="pv-gallery" aria-hidden="true">
<span class="pv-gallery-item pv-gallery-item--1"></span>
<span class="pv-gallery-item pv-gallery-item--2"></span>
<span class="pv-gallery-item pv-gallery-item--3"></span>
</div>
<div class="pv-playbar">
<span>Zern-Prologue · <em data-i18n="preview.ready">Готов к запуску</em></span>
<span class="pv-play">
<svg width="14" height="14" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><polygon points="5 3 19 12 5 21 5 3"/></svg>
<i data-i18n="preview.play">Играть</i>
</span>
</div>
</div>
</div>
<div class="preview-scene scene-news" data-key="news">
<div class="pv-panel">
<h3 class="pv-view-title" data-i18n="preview.nav.news">Новости</h3>
<div class="pv-news-item">
<span class="pv-news-tag pv-tag-update" data-i18n="preview.news.update">Обновление</span>
<b data-i18n="preview.news1.title">Сезон Prologue запущен</b>
<p data-i18n="preview.news1.body">Небо принадлежит дирижаблям. Добро пожаловать в Prologue — 1.21.1 NeoForge, Create: Aeronautics.</p>
</div>
<div class="pv-news-item">
<span class="pv-news-tag pv-tag-event" data-i18n="preview.news.event">Событие</span>
<b data-i18n="preview.news2.title">Война в Заре</b>
<p data-i18n="preview.news2.body">«Феникс» атакует, «Ласточка» защищает. Жители выбирают сторону — или бунт.</p>
</div>
</div>
</div>
<div class="preview-scene scene-settings" data-key="settings">
<div class="pv-panel">
<h3 class="pv-view-title" data-i18n="preview.nav.settings">Настройки</h3>
<div class="pv-setting-row">
<div class="pv-setting-label" data-i18n="preview.settings.ram">Выделено ОЗУ</div>
<div class="pv-setting-control">
<div class="pv-range" aria-hidden="true"><span class="pv-range-fill"></span><span class="pv-range-knob"></span></div>
<span class="pv-range-value">4 ГБ</span>
</div>
</div>
<div class="pv-setting-row">
<div class="pv-setting-label" data-i18n="preview.settings.resolution">Разрешение</div>
<div class="pv-setting-control"><span class="pv-chip">1280</span><span class="pv-times">×</span><span class="pv-chip">720</span></div>
</div>
<div class="pv-setting-row">
<div class="pv-setting-label" data-i18n="preview.settings.language">Язык</div>
<div class="pv-setting-control"><span class="pv-chip pv-chip--wide">Русский</span></div>
</div>
<div class="pv-setting-row">
<div class="pv-setting-label" data-i18n="preview.settings.server">Сервер</div>
<div class="pv-setting-control"><span class="pv-badge pv-badge-online"><i></i><span data-i18n="preview.online">Онлайн</span></span></div>
</div>
</div>
</div>
<div class="preview-scene scene-install" data-key="install">
<div class="scene-install-inner">
<div class="pv-brand">
<svg width="40" height="40" viewBox="0 0 56 56" fill="none" aria-hidden="true"><rect width="56" height="56" rx="14" fill="#e94560"/><path d="M18 28 L28 18 L38 28 L28 38 Z" fill="#fff" opacity="0.9"/></svg>
</div>
<h3 class="pv-title" data-i18n="preview.install.title">Установка сборки…</h3>
<div class="pv-progress" aria-hidden="true"><span class="pv-progress-fill"></span></div>
<p class="pv-stage" data-i18n="preview.install.stage">Загрузка модов 130/130 · 1.8 ГБ</p>
</div>
</div>
</div>
</div>
<div class="preview-dots" id="previewDots" aria-hidden="true"></div>
<p class="preview-caption" id="previewCaption" data-i18n="preview.login">Вход</p>
</div>
</section>
<section class="section theme" id="theme">
<div class="section-head section-head--center">
<span class="section-index">05 / 07</span>
<h2 class="section-title" data-i18n-html="theme.title">Что внутри <span class="accent">сезона.</span></h2>
<p class="section-sub" data-i18n="theme.sub">Prologue — модовый сезон на базе Create: Aeronautics, война и выживание. ОБТ — полигон, где всё это обкатывается.</p>
</div>
<div class="theme-grid">
<article class="theme-card">
<span class="theme-tag" data-i18n="theme.zarya.tag">ОБТ · 1.20.1 Forge</span>
<h3 data-i18n="theme.zarya.title">Война в Заре</h3>
<p data-i18n="theme.zarya.sub">Двухдневный ивент в городе Заря: группировка «Феникс» атакует, «Ласточка» обороняется, а жители выбирают сторону — или поднимают бунт. Военные правила.</p>
</article>
<article class="theme-card">
<span class="theme-tag" data-i18n="theme.obt.tag">ОБТ · тестовая стадия</span>
<h3 data-i18n="theme.obt.title">Открытый бета-сервер</h3>
<p data-i18n="theme.obt.sub">Бета — это ивентовый сервер: городские бои, сценарий атомного реактора и правила, которые лягут в основу настоящего сезона.</p>
</article>
<article class="theme-card">
<span class="theme-tag" data-i18n="theme.air.tag">Сезон · 1.21.1 NeoForge</span>
<h3 data-i18n="theme.air.title">Корабли в небе</h3>
<p data-i18n="theme.air.sub">Create: Aeronautics даёт дирижабли, субмарины и летающие механизмы. Поезда, дизели, большие пушки и атомный реактор — осваивай.</p>
</article>
<article class="theme-card">
<span class="theme-tag" data-i18n="theme.year.tag">Сезон · Prologue</span>
<h3 data-i18n="theme.year.title">Марафон на год</h3>
<p data-i18n="theme.year.sub">Сезон — это марафон, а не спринт. Начни эту главу с первого дня и строй её вместе с комьюнити.</p>
</article>
<article class="theme-card">
<span class="theme-tag" data-i18n="theme.lore.tag">Сервер</span>
<h3 data-i18n="theme.lore.title">Свой лор и плагины</h3>
<p data-i18n="theme.lore.sub">Самописные плагины, ивенты под историю сервера и системы, которые из коробки работают с лаунчером.</p>
</article>
<article class="theme-card">
<span class="theme-tag" data-i18n="theme.community.tag">Комьюнити</span>
<h3 data-i18n="theme.community.title">Голос и друзья</h3>
<p data-i18n="theme.community.sub">Simple Voice Chat в игре, система друзей в лаунчере и Telegram-комьюнити, которое реально рулит — решения принимаются голосованием игроков.</p>
</article>
</div>
</section>
<section class="section download" id="download">
<div class="download-inner">
<div class="section-head section-head--center">
<span class="section-index">06 / 07</span>
<h2 class="section-title" data-i18n-html="download.title">Скачать <span class="accent">Zern.</span></h2>
<p class="section-sub" data-i18n="download.sub">Скачай лаунчер для Windows и заходи на сервер ZernMC.</p>
</div>
<div class="download-card">
<div class="download-card-top">
<img src="/img/zernmc.svg" alt="" width="64" height="64">
<div>
<h3 class="download-name">Zern Launcher <span id="download-version">—</span></h3>
<p class="download-desc">Windows · <span id="download-size">—</span></p>
</div>
</div>
<div style="display:grid;grid-template-columns:1fr 1fr;gap:12px">
<a class="btn btn-primary btn-block" id="download-online-btn" href="/launcher/download/online" download>
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2"><path d="M12 3v12"/><path d="m7 10 5 5 5-5"/><path d="M4 21h16"/></svg>
<span>Online Setup (5.8М)</span>
</a>
<a class="btn btn-ghost btn-block" id="download-offline-btn" href="/launcher/download/offline-setup">
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
<span>Offline ZIP (98М)</span>
</a>
</div>
<p style="font-size:12px;color:var(--text-secondary);margin-top:10px;text-align:center">Online — выбери папку (по умолчанию C:\ZernMC) + ярлык ZernMC Launcher на рабочем столе · Offline — выбери куда распаковать · Данные в %USERPROFILE%\.zernmc</p>
<a class="btn btn-primary btn-block" id="download-btn" href="/launcher/download/latest" style="display:none">
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2"><path d="M12 3v12"/><path d="m7 10 5 5 5-5"/><path d="M4 21h16"/></svg>
<span data-i18n="download.latest">Скачать актуальную версию</span>
</a>
<div class="download-mirrors" id="mirrors">
<span class="mirrors-label" data-i18n="download.mirrors">Зеркала</span>
</div>
<!-- Git widget (launcher repo) -->
<div class="github-widget" id="github-widget" style="margin-top:20px;background:var(--bg-card);border:1px solid var(--border);border-radius:16px;padding:20px;display:flex;flex-direction:column;gap:12px">
<a href="https://git.swe.zernmc.ru/sasheg/launcher" target="_blank" rel="noopener" style="display:flex;align-items:center;gap:10px;font-weight:700;font-size:15px;color:var(--text);text-decoration:none">
<svg width="22" height="22" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><path d="M12 2C6.48 2 2 6.58 2 12.26c0 4.51 2.87 8.33 6.84 9.68.5.09.68-.22.68-.48v-1.7c-2.78.62-3.37-1.21-3.37-1.21-.45-1.18-1.1-1.5-1.1-1.5-.9-.63.07-.62.07-.62 1 .07 1.53 1.06 1.53 1.06.9 1.58 2.36 1.12 2.94.86.09-.67.35-1.12.63-1.38-2.22-.26-4.56-1.14-4.56-5.07 0-1.12.39-2.03 1.03-2.75-.1-.26-.45-1.3.1-2.7 0 0 .84-.27 2.75 1.05a9.2 9.2 0 0 1 5 0c1.9-1.32 2.74-1.05 2.74-1.05.55 1.4.2 2.44.1 2.7.64.72 1.03 1.63 1.03 2.75 0 3.94-2.34 4.81-4.57 5.07.36.32.68.94.68 1.9v2.82c0 .26.18.58.69.48A10.02 10.02 0 0 0 22 12.26C22 6.58 17.52 2 12 2z"/></svg>
sasheg/launcher
<span style="margin-left:auto;font-size:12px;color:var(--text-secondary);font-weight:500">git.swe.zernmc.ru</span>
</a>
<div style="display:flex;gap:16px;flex-wrap:wrap;font-size:13px;color:var(--text-secondary)" id="github-stats">
<span style="display:flex;align-items:center;gap:6px"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> ветка <strong id="gh-branch" style="color:var(--text)">main</strong></span>
<span style="display:flex;align-items:center;gap:6px"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> <span id="gh-version">v1.1.1.2</span></span>
<span style="display:flex;align-items:center;gap:6px"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="8.5" cy="7" r="4"/><path d="M20 8v6"/><path d="M23 11v2"/><path d="M17 11v2"/></svg> <span id="gh-commit">19a1633</span></span>
</div>
<div style="display:flex;gap:8px;flex-wrap:wrap">
<a href="https://git.swe.zernmc.ru/sasheg/launcher" target="_blank" rel="noopener" class="btn btn-ghost" style="flex:1;justify-content:center"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37 0 0 0-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44 0 0 0 20 4.77 5.07 5.07 0 0 0 19.91 1S18.73.65 16 2.48a13.38 13.38 0 0 0-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07 0 0 0 5 4.77a5.44 5.44 0 0 0-1.5 3.78c0 5.42 3.3 6.61 6.44 7A3.37 3.37 0 0 0 9 18.13V22"/></svg> Открыть в Gitea</a>
</div>
<!-- Languages bar like GitHub -->
<div style="margin-top:4px">
<div style="display:flex;height:8px;border-radius:4px;overflow:hidden;background:var(--border);gap:1px" id="lang-bar" title="Java 49.4% · Python 25.4% · JavaScript 12.7% · CSS 7.3% · HTML 3.5% · Go 1.7%">
<div style="flex:49.4;background:#b07219" title="Java 49.4%"></div>
<div style="flex:25.4;background:#3572A5" title="Python 25.4%"></div>
<div style="flex:12.7;background:#f1e05a" title="JavaScript 12.7%"></div>
<div style="flex:7.3;background:#563d7c" title="CSS 7.3%"></div>
<div style="flex:3.5;background:#e34c26" title="HTML 3.5%"></div>
<div style="flex:1.7;background:#00ADD8" title="Go 1.7%"></div>
</div>
<div style="display:flex;flex-wrap:wrap;gap:12px;margin-top:8px;font-size:12px;color:var(--text-secondary)" id="lang-legend">
<span style="display:flex;align-items:center;gap:6px"><i style="width:10px;height:10px;border-radius:50%;background:#b07219;display:inline-block"></i> Java 49.4%</span>
<span style="display:flex;align-items:center;gap:6px"><i style="width:10px;height:10px;border-radius:50%;background:#3572A5;display:inline-block"></i> Python 25.4%</span>
<span style="display:flex;align-items:center;gap:6px"><i style="width:10px;height:10px;border-radius:50%;background:#f1e05a;display:inline-block"></i> JavaScript 12.7%</span>
<span style="display:flex;align-items:center;gap:6px"><i style="width:10px;height:10px;border-radius:50%;background:#563d7c;display:inline-block"></i> CSS 7.3%</span>
<span style="display:flex;align-items:center;gap:6px"><i style="width:10px;height:10px;border-radius:50%;background:#e34c26;display:inline-block"></i> HTML 3.5%</span>
<span style="display:flex;align-items:center;gap:6px"><i style="width:10px;height:10px;border-radius:50%;background:#00ADD8;display:inline-block"></i> Go 1.7%</span>
</div>
<p style="font-size:11px;color:var(--text-muted);margin-top:6px">32 120 строк · Java 15 858 · Python 8 172 · JS 4 083 · CSS 2 345 · HTML 1 110 · Go 552</p>
</div>
<code style="font-size:12px;background:var(--bg-surface);border:1px solid var(--border);border-radius:8px;padding:8px 10px;color:var(--text-secondary);overflow:auto">git clone ssh://git@git.swe.zernmc.ru:2222/sasheg/launcher.git</code>
</div>
<!-- Manual Zern Prologue pack -->
<div class="manual-pack-card" style="margin-top:20px;background:var(--bg-card);border:1px solid var(--border);border-radius:16px;padding:20px;display:flex;flex-direction:column;gap:12px">
<div style="display:flex;align-items:center;gap:12px">
<div style="width:48px;height:48px;border-radius:12px;background:rgba(233,69,96,0.12);display:flex;align-items:center;justify-content:center;color:var(--accent);flex-shrink:0">
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/><polyline points="3.27 6.96 12 12.01 20.73 6.96"/><line x1="12" y1="22.08" x2="12" y2="12"/></svg>
</div>
<div>
<h4 style="font-size:15px;font-weight:700">Zern Prologue — ручная установка</h4>
<p style="font-size:12px;color:var(--text-secondary);margin-top:2px">1.21.1 NeoForge <strong style="color:var(--text)">21.1.228</strong> · Create: Aeronautics · без лаунчера</p>
</div>
<span style="margin-left:auto;font-size:11px;color:var(--accent);background:rgba(233,69,96,0.12);padding:4px 8px;border-radius:999px;white-space:nowrap">v4 · 1.8 ГБ</span>
</div>
<p style="font-size:13px;color:var(--text-secondary);line-height:1.5">Скачай архив модпака и распакуй вручную. Подходит если лаунчер не качает или хочешь поставить на Prism / MultiMC / ATLauncher.</p>
<div style="background:rgba(251,191,36,0.08);border:1px solid rgba(251,191,36,0.2);border-radius:8px;padding:8px 10px;font-size:12px;color:#fbbf24;display:flex;gap:8px;align-items:center"><span style="font-size:14px">⚠️</span> <span><strong>Важно:</strong> используй только <strong>NeoForge 21.1.228</strong> для 1.21.1 — на новейшей (21.5+) сборка крашится, мир не загрузится.</span></div>
<div style="background:var(--bg-surface);border:1px solid var(--border);border-radius:8px;padding:10px 12px;font-family:var(--mono);font-size:12px;color:var(--text-secondary)">
%USERPROFILE%\.zernmc\instances\ZernPrologue
<span style="color:var(--text-muted)"> · ~/.zernmc/instances/ZernPrologue на Linux</span>
</div>
<div style="display:flex;gap:8px;flex-wrap:wrap">
<a href="/pack/ZernPrologue/zip" class="btn btn-primary" style="flex:1;justify-content:center;min-width:180px">
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
Скачать Prologue.zip
</a>
<button class="btn btn-ghost" onclick="navigator.clipboard.writeText('%USERPROFILE%\\.zernmc\\instances');var t=document.createElement('div');t.textContent='Скопировано';t.style.cssText='position:fixed;bottom:20px;left:50%;transform:translateX(-50%);background:var(--bg-elevated);border:1px solid var(--border);padding:8px 16px;border-radius:8px;font-size:13px;z-index:9999';document.body.appendChild(t);setTimeout(()=>t.remove(),1500)" style="flex:0 0 auto">Копировать путь</button>
</div>
<details style="font-size:12px;color:var(--text-secondary)"><summary style="cursor:pointer;color:var(--text)">Инструкция</summary>
<ol style="margin:8px 0 0 18px;display:flex;flex-direction:column;gap:4px">
<li>Нажми «Скачать Prologue.zip» (требует проходку — войди в лаунчере хотя бы раз, иначе 403).</li>
<li>Распаковать в папку выше (создай если нет). Если там уже есть Prologue — замени.</li>
<li>Для Prism/MultiMC: Импорт → «Import from zip» или «Add instance → Import from folder» укажи распакованную папку, Java 21.</li>
<li>Запусти через ZernMC лаунчер или свой — вход на <strong>mc.zernmc.ru</strong></li>
</ol>
</details>
</div>
</div>
<p class="download-note" data-i18n="download.note">Без платных подписок и рекламы. Просто лаунчер. Системные требования: Windows 10+, 4 ГБ ОЗУ.</p>
</div>
</section>
<section class="section news" id="news">
<div class="section-head">
<span class="section-index">07 / 07</span>
<h2 class="section-title" data-i18n-html="news.title">Что <span class="accent">нового.</span></h2>
<p class="section-sub" data-i18n="news.sub">Последние чейнджлоги и обновления команды Zern.</p>
</div>
<div class="news-grid" id="news-grid">
<div class="news-skeleton"></div>
<div class="news-skeleton"></div>
<div class="news-skeleton"></div>
</div>
</section>
</main>
<footer class="footer">
<div class="footer-inner">
<div class="footer-brand">
<img src="/img/zernmc.svg" alt="Zern" width="28" height="28">
<span>ZernMC</span>
</div>
<p class="footer-note">© <span id="year">2026</span> ZernMC. <span data-i18n="footer.note">Не аффилирован с Mojang или Microsoft. Minecraft — торговая марка Mojang AB.</span></p>
</div>
</footer>
<!-- Auth modal (launcher style) -->
<div id="auth-modal" class="modal-backdrop hidden" style="z-index:200">
<div class="modal" style="max-width:380px">
<div class="modal-head">
<h3 id="auth-title" data-i18n="auth.title">Вход</h3>
<button class="modal-close" id="auth-close">&times;</button>
</div>
<div class="modal-body" style="display:flex;flex-direction:column;gap:14px">
<div style="display:flex;gap:8px;margin-bottom:4px">
<button class="btn btn-ghost" id="auth-tab-login" style="flex:1;background:var(--accent);color:#fff" data-i18n="auth.login">Вход</button>
<button class="btn btn-ghost" id="auth-tab-register" style="flex:1" data-i18n="auth.register">Регистрация</button>
</div>
<div class="field">
<label for="auth-username" data-i18n="auth.username">Логин</label>
<input type="text" id="auth-username" placeholder="a-z, 0-9, _" autocomplete="username" style="width:100%;padding:10px 12px;background:var(--bg-surface);border:1px solid var(--border);border-radius:4px;color:var(--text);outline:none">
</div>
<div class="field">
<label for="auth-password" data-i18n="auth.password">Пароль</label>
<input type="password" id="auth-password" placeholder="••••••••" autocomplete="current-password" style="width:100%;padding:10px 12px;background:var(--bg-surface);border:1px solid var(--border);border-radius:4px;color:var(--text);outline:none">
</div>
<div class="field hidden" id="auth-confirm-field">
<label for="auth-confirm" data-i18n="auth.confirm">Повтор пароля</label>
<input type="password" id="auth-confirm" style="width:100%;padding:10px 12px;background:var(--bg-surface);border:1px solid var(--border);border-radius:4px;color:var(--text);outline:none">
</div>
<p id="auth-error" class="hidden" style="color:#f87171;font-size:13px;background:rgba(248,113,113,0.1);padding:10px;border-radius:4px;text-align:center"></p>
<button class="btn btn-primary" id="auth-submit" style="width:100%">Войти</button>
<p style="font-size:12px;color:var(--text-muted);text-align:center">Нажимая, вы соглашаетесь с правилами ZernMC</p>
</div>
</div>
</div>
<!-- Cabinet (personal area) -->
<section class="section hidden" id="cabinet">
<div class="section-head">
<span class="section-index">08 / 08</span>
<h2 class="section-title" data-i18n-html="cabinet.title">Личный <span class="accent">кабинет.</span></h2>
<p class="section-sub" data-i18n="cabinet.sub">Ваш профиль и доступные сборки для скачивания (требует проходку).</p>
</div>
<div style="display:flex;gap:8px;margin-bottom:16px;flex-wrap:wrap">
<button class="btn btn-primary" id="cab-tab-profile" data-i18n="cabinet.profile">Профиль</button>
<button class="btn btn-ghost" id="cab-tab-packs" data-i18n="cabinet.packs">Сборки</button>
</div>
<div id="cabinet-profile" style="background:var(--bg-card);border:1px solid var(--border);border-radius:16px;padding:20px;display:flex;flex-direction:column;gap:12px">
<div style="display:flex;align-items:center;gap:12px">
<div style="width:48px;height:48px;border-radius:12px;background:linear-gradient(135deg, #e94560, #ff6b6b);display:flex;align-items:center;justify-content:center;font-weight:700;color:#fff" id="cab-avatar">Z</div>
<div>
<div style="font-weight:700" id="cab-username">—</div>
<div style="font-size:12px;color:var(--text-secondary)"><span id="cab-role">—</span> · <span id="cab-pass">—</span></div>
</div>
</div>
<div style="display:flex;gap:8px;flex-wrap:wrap">
<div class="setting-card" style="flex:1;min-width:180px;padding:12px"><div class="setting-info"><h4>UUID</h4><p id="cab-uuid" style="font-family:var(--mono);font-size:11px">—</p></div></div>
<div class="setting-card" style="flex:1;min-width:180px;padding:12px"><div class="setting-info"><h4 data-i18n="cabinet.pass">Проходка</h4><p id="cab-pass2">—</p></div></div>
</div>
</div>
<div id="cabinet-packs" class="hidden" style="background:var(--bg-card);border:1px solid var(--border);border-radius:16px;padding:20px;display:flex;flex-direction:column;gap:12px">
<div style="display:flex;align-items:center;justify-content:space-between;gap:12px;flex-wrap:wrap">
<h3 style="font-size:15px;font-weight:700" data-i18n="cabinet.available">Доступные сборки</h3>
<span id="cab-packs-count" style="font-size:12px;color:var(--text-muted)">—</span>
</div>
<div id="cab-packs-list" style="display:flex;flex-direction:column;gap:8px"><p style="color:var(--text-muted);font-size:13px">Загрузка...</p></div>
<p id="cab-packs-error" class="hidden" style="color:#f87171;font-size:13px"></p>
<p style="font-size:12px;color:var(--text-muted)">Скачивание требует активной проходки. Кнопка скачает zip для ручной установки в <code>%USERPROFILE%\.zernmc\instances</code></p>
</div>
</section>
<script src="/js/main.js"></script>
</body>
</html>
server/site/js/main.js
-1051
View File
File diff suppressed because it is too large Load Diff
todo.txt
-13
View File
@@ -1,13 +0,0 @@
TODO / ideas backlog
====================
1.1.1.2 hotfix DONE — WebKit "Reload" + onboarding persist
- Поправлено JFXLauncher.java:512 — document.addEventListener('contextmenu', e=> e.preventDefault(), true) глобально (Reload больше не появляется)
- Onboarding fix: localStorage volatile в WebView → теперь persist в Config (~/.zernmc/launcher.properties onboardedVersion/completedOnboardBlocks) через /api/settings GET/POST, JS sync localStorage<->Config. Прохождение без "Не показывать" теперь не всплывает снова. Версия 1.1.1.2
Java Agent + IPC (low priority, overkill now)
- Заменить прямой ProcessBuilder.start() на прокси-класс (-javaagent или -cp прокси)
- Прокси класс: подключается к localhost RPC, ждёт "launch", потом reflection вызывает реальный main
- Даёт: двустороннюю связь лаунчер-игра, контроль жизненного цикла, crash-репорты из процесса игры,
передачу настроек/токенов на лету, патчинг классов через Instrumentation API
- Для ZernMC сейчас оверхед — но запомнить на будущее