Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 454d3389b6 | |||
| 012d1635dc | |||
| 70c4815032 | |||
| a46ef3e834 | |||
| cba8259e59 | |||
| 08417efe2f | |||
| 991252130d | |||
| 6fa97b7fda | |||
| 83abc600f3 | |||
| 300ce4b60b | |||
| 82391e10ea | |||
| 1934199ba8 | |||
| 526a24a16a | |||
| 96baeeea68 | |||
| 28995adce8 | |||
| c9ed825686 | |||
| 3f2cb6662a | |||
| 11513fbf13 |
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
- Графического интерфейса (GUI) — только TUI
|
- Графического интерфейса (GUI) — только TUI
|
||||||
- Нормальных настроек (пока доступна только настройка Java и выделенной оперативной памяти)
|
- Нормальных настроек (пока доступна только настройка Java и выделенной оперативной памяти)
|
||||||
- Поддержки **Forge** (в разработке)
|
- Поддержки **Forge** (в разработке) (технически уже есть вместе с NeoForge (science PR№4))
|
||||||
- Поддержки Quilt, LabyMod, NeoForge и других лоадеров
|
- Поддержки Quilt, LabyMod, NeoForge и других лоадеров
|
||||||
- Раздела новостей об обновлениях Minecraft и лаунчера
|
- Раздела новостей об обновлениях Minecraft и лаунчера
|
||||||
- Выбора готовых пресетов оптимизации JVM
|
- Выбора готовых пресетов оптимизации JVM
|
||||||
|
|||||||
@@ -3,9 +3,13 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>me.sashegdev</groupId>
|
<groupId>me.sashegdev</groupId>
|
||||||
<artifactId>ZernMCLauncher</artifactId>
|
<artifactId>ZernMCLauncher</artifactId>
|
||||||
<version>1.0.7</version>
|
<version>1.0.8</version>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<version>3.2.3</version>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
<version>3.5.0</version>
|
<version>3.5.0</version>
|
||||||
@@ -24,11 +28,54 @@
|
|||||||
<Implementation-Version>${project.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
<Implementation-Title>ZernMC Launcher</Implementation-Title>
|
<Implementation-Title>ZernMC Launcher</Implementation-Title>
|
||||||
<Implementation-Vendor>SashegDev</Implementation-Vendor>
|
<Implementation-Vendor>SashegDev</Implementation-Vendor>
|
||||||
<Implementation-Description>Полностью самописный Minecraft-лаунчер. Написанный SashegDev(в основном)</Implementation-Description>
|
<Implementation-Description>Samopisnui Minecraft-launcher. by SashegDev</Implementation-Description>
|
||||||
<Implementation-URL>https://github.com/SashegDev/launcher</Implementation-URL>
|
<Implementation-URL>https://github.com/SashegDev/launcher</Implementation-URL>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
</transformer>
|
</transformer>
|
||||||
</transformers>
|
</transformers>
|
||||||
|
<filters>
|
||||||
|
<filter>
|
||||||
|
<artifact>*:*</artifact>
|
||||||
|
<excludes>
|
||||||
|
<exclude>META-INF/*.SF</exclude>
|
||||||
|
<exclude>META-INF/*.DSA</exclude>
|
||||||
|
<exclude>META-INF/*.RSA</exclude>
|
||||||
|
</excludes>
|
||||||
|
</filter>
|
||||||
|
<filter>
|
||||||
|
<artifact>org.openjfx:*</artifact>
|
||||||
|
<excludes>
|
||||||
|
<exclude>**/*</exclude>
|
||||||
|
</excludes>
|
||||||
|
</filter>
|
||||||
|
</filters>
|
||||||
|
<dependencySet>
|
||||||
|
<outputDirectory>/</outputDirectory>
|
||||||
|
<useProjectArtifact>false</useProjectArtifact>
|
||||||
|
<unpack>true</unpack>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
<excludes>
|
||||||
|
<exclude>org.openjfx:*</exclude>
|
||||||
|
</excludes>
|
||||||
|
</dependencySet>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
<version>3.6.0</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>copy-javafx</id>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>copy-dependencies</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<outputDirectory>${project.build.directory}/lib-javafx</outputDirectory>
|
||||||
|
<includeScope>runtime</includeScope>
|
||||||
|
<includeGroupIds>org.openjfx</includeGroupIds>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
@@ -45,28 +92,36 @@
|
|||||||
<goal>launch4j</goal>
|
<goal>launch4j</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<outfile>../server/builds/ZernMCLauncher.exe</outfile>
|
<outfile>../server/builds/ZernMCLauncher-${project.version}.exe</outfile>
|
||||||
<jar>../server/builds/ZernMCLauncher.jar</jar>
|
<jar>../server/builds/ZernMCLauncher.jar</jar>
|
||||||
<headerType>console</headerType>
|
<headerType>gui</headerType>
|
||||||
<dontWrapJar>false</dontWrapJar>
|
<dontWrapJar>false</dontWrapJar>
|
||||||
<jre>
|
<jre>
|
||||||
<path>jre21</path>
|
<path>jre21</path>
|
||||||
<minVersion>21</minVersion>
|
<minVersion>21</minVersion>
|
||||||
|
<opts>
|
||||||
|
<opt>--module-path=lib-javafx</opt>
|
||||||
|
<opt>--add-modules=javafx.controls,javafx.web</opt>
|
||||||
|
<opt>--add-reads=javafx.graphics=ALL-UNNAMED</opt>
|
||||||
|
</opts>
|
||||||
</jre>
|
</jre>
|
||||||
<versionInfo>
|
<versionInfo>
|
||||||
<fileVersion>${project.version}.0</fileVersion>
|
<fileVersion>${project.version}.0</fileVersion>
|
||||||
<txtFileVersion>${project.version}</txtFileVersion>
|
<txtFileVersion>${project.version}</txtFileVersion>
|
||||||
<fileDescription>ZernMC Launcher — A Little Minecraft Launcher</fileDescription>
|
<fileDescription>ZernMC Launcher — just a Minecraft launcher</fileDescription>
|
||||||
<productVersion>${project.version}.0</productVersion>
|
<productVersion>${project.version}.0</productVersion>
|
||||||
<txtProductVersion>${project.version}</txtProductVersion>
|
<txtProductVersion>${project.version}</txtProductVersion>
|
||||||
<productName>ZernMC Launcher</productName>
|
<productName>ZernMC Launcher</productName>
|
||||||
<companyName>ZernMC(SashegDev)</companyName>
|
<companyName>ZernMC(SashegDev)</companyName>
|
||||||
<internalName>ZernMCLauncher</internalName>
|
<internalName>ZernMCLauncher</internalName>
|
||||||
<originalFilename>ZernMCLauncher.exe</originalFilename>
|
<originalFilename>ZernMCLauncher-${project.version}.exe</originalFilename>
|
||||||
</versionInfo>
|
</versionInfo>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<skip>${skip.launch4j}</skip>
|
||||||
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
@@ -83,6 +138,9 @@
|
|||||||
<copy>
|
<copy>
|
||||||
<fileset />
|
<fileset />
|
||||||
</copy>
|
</copy>
|
||||||
|
<copy>
|
||||||
|
<fileset />
|
||||||
|
</copy>
|
||||||
<zip />
|
<zip />
|
||||||
</target>
|
</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
@@ -108,11 +166,55 @@
|
|||||||
<server.url>http://87.120.187.36:1582</server.url>
|
<server.url>http://87.120.187.36:1582</server.url>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>win</id>
|
||||||
|
<properties>
|
||||||
|
<os.suffix>win</os.suffix>
|
||||||
|
<javafx.classifier>win</javafx.classifier>
|
||||||
|
<skip.launch4j>false</skip.launch4j>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>linux</id>
|
||||||
|
<properties>
|
||||||
|
<os.suffix>linux</os.suffix>
|
||||||
|
<javafx.classifier>linux</javafx.classifier>
|
||||||
|
<skip.launch4j>true</skip.launch4j>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter</artifactId>
|
||||||
|
<version>5.10.1</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>junit-jupiter-api</artifactId>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>junit-jupiter-params</artifactId>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>junit-jupiter-engine</artifactId>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.target>21</maven.compiler.target>
|
<project.description>ZernMC Launcher - just a minimalistic launcher by SashegDev</project.description>
|
||||||
<mainClass>me.sashegdev.zernmc.launcher.Main</mainClass>
|
<mainClass>me.sashegdev.zernmc.launcher.Main</mainClass>
|
||||||
<maven.compiler.source>21</maven.compiler.source>
|
<maven.compiler.source>21</maven.compiler.source>
|
||||||
|
<project.organization.name>ZernMC</project.organization.name>
|
||||||
|
<javafx.classifier>win</javafx.classifier>
|
||||||
|
<skip.launch4j>false</skip.launch4j>
|
||||||
|
<maven.compiler.target>21</maven.compiler.target>
|
||||||
|
<os.suffix>win</os.suffix>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<project.inceptionYear>2026</project.inceptionYear>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
Binary file not shown.
+141
-6
@@ -17,6 +17,9 @@
|
|||||||
<project.inceptionYear>2026</project.inceptionYear>
|
<project.inceptionYear>2026</project.inceptionYear>
|
||||||
<project.description>ZernMC Launcher - just a minimalistic launcher by SashegDev</project.description>
|
<project.description>ZernMC Launcher - just a minimalistic launcher by SashegDev</project.description>
|
||||||
<mainClass>me.sashegdev.zernmc.launcher.Main</mainClass>
|
<mainClass>me.sashegdev.zernmc.launcher.Main</mainClass>
|
||||||
|
<javafx.classifier>win</javafx.classifier>
|
||||||
|
<os.suffix>win</os.suffix>
|
||||||
|
<skip.launch4j>false</skip.launch4j>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@@ -60,6 +63,42 @@
|
|||||||
<artifactId>commons-io</artifactId>
|
<artifactId>commons-io</artifactId>
|
||||||
<version>2.15.1</version>
|
<version>2.15.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.javalin</groupId>
|
||||||
|
<artifactId>javalin</artifactId>
|
||||||
|
<version>6.1.3</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.slf4j</groupId>
|
||||||
|
<artifactId>slf4j-simple</artifactId>
|
||||||
|
<version>2.0.11</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.openjfx</groupId>
|
||||||
|
<artifactId>javafx-controls</artifactId>
|
||||||
|
<version>21.0.2</version>
|
||||||
|
<classifier>win</classifier>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.openjfx</groupId>
|
||||||
|
<artifactId>javafx-web</artifactId>
|
||||||
|
<version>21.0.2</version>
|
||||||
|
<classifier>win</classifier>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.openjfx</groupId>
|
||||||
|
<artifactId>javafx-controls</artifactId>
|
||||||
|
<version>21.0.2</version>
|
||||||
|
<classifier>linux</classifier>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.openjfx</groupId>
|
||||||
|
<artifactId>javafx-web</artifactId>
|
||||||
|
<version>21.0.2</version>
|
||||||
|
<classifier>linux</classifier>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.junit.jupiter</groupId>
|
<groupId>org.junit.jupiter</groupId>
|
||||||
<artifactId>junit-jupiter</artifactId>
|
<artifactId>junit-jupiter</artifactId>
|
||||||
@@ -101,16 +140,66 @@
|
|||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
</transformer>
|
</transformer>
|
||||||
</transformers>
|
</transformers>
|
||||||
|
<filters>
|
||||||
|
<filter>
|
||||||
|
<artifact>*:*</artifact>
|
||||||
|
<excludes>
|
||||||
|
<exclude>META-INF/*.SF</exclude>
|
||||||
|
<exclude>META-INF/*.DSA</exclude>
|
||||||
|
<exclude>META-INF/*.RSA</exclude>
|
||||||
|
</excludes>
|
||||||
|
</filter>
|
||||||
|
<!-- Исключаем JavaFX из shade полностью (он будет в lib-javafx) -->
|
||||||
|
<filter>
|
||||||
|
<artifact>org.openjfx:*</artifact>
|
||||||
|
<excludes>
|
||||||
|
<exclude>**/*</exclude>
|
||||||
|
</excludes>
|
||||||
|
</filter>
|
||||||
|
</filters>
|
||||||
|
<dependencySet>
|
||||||
|
<outputDirectory>/</outputDirectory>
|
||||||
|
<useProjectArtifact>false</useProjectArtifact>
|
||||||
|
<unpack>true</unpack>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
<excludes>
|
||||||
|
<exclude>org.openjfx:*</exclude>
|
||||||
|
</excludes>
|
||||||
|
</dependencySet>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<!-- Launch4j для создания .exe -->
|
<!-- Copy JavaFX dependencies -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
<version>3.6.0</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>copy-javafx</id>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>copy-dependencies</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<outputDirectory>${project.build.directory}/lib-javafx</outputDirectory>
|
||||||
|
<includeScope>runtime</includeScope>
|
||||||
|
<includeGroupIds>org.openjfx</includeGroupIds>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<!-- Launch4j для создания .exe (только для Windows) -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.akathist.maven.plugins.launch4j</groupId>
|
<groupId>com.akathist.maven.plugins.launch4j</groupId>
|
||||||
<artifactId>launch4j-maven-plugin</artifactId>
|
<artifactId>launch4j-maven-plugin</artifactId>
|
||||||
<version>2.5.0</version>
|
<version>2.5.0</version>
|
||||||
|
<configuration>
|
||||||
|
<skip>${skip.launch4j}</skip>
|
||||||
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>l4j</id>
|
<id>l4j</id>
|
||||||
@@ -121,11 +210,16 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<outfile>../server/builds/ZernMCLauncher-${project.version}.exe</outfile>
|
<outfile>../server/builds/ZernMCLauncher-${project.version}.exe</outfile>
|
||||||
<jar>../server/builds/ZernMCLauncher.jar</jar>
|
<jar>../server/builds/ZernMCLauncher.jar</jar>
|
||||||
<headerType>console</headerType>
|
<headerType>gui</headerType>
|
||||||
<dontWrapJar>false</dontWrapJar>
|
<dontWrapJar>false</dontWrapJar>
|
||||||
<jre>
|
<jre>
|
||||||
<path>jre21</path>
|
<path>jre21</path>
|
||||||
<minVersion>21</minVersion>
|
<minVersion>21</minVersion>
|
||||||
|
<opts>
|
||||||
|
<opt>--module-path=lib-javafx</opt>
|
||||||
|
<opt>--add-modules=javafx.controls,javafx.web</opt>
|
||||||
|
<opt>--add-reads=javafx.graphics=ALL-UNNAMED</opt>
|
||||||
|
</opts>
|
||||||
</jre>
|
</jre>
|
||||||
<versionInfo>
|
<versionInfo>
|
||||||
<fileVersion>${project.version}.0</fileVersion>
|
<fileVersion>${project.version}.0</fileVersion>
|
||||||
@@ -161,11 +255,22 @@
|
|||||||
<fileset dir="${user.home}/launcher/jre/jre21"/>
|
<fileset dir="${user.home}/launcher/jre/jre21"/>
|
||||||
</copy>
|
</copy>
|
||||||
|
|
||||||
<!-- Создаём zip только с .exe и jre21 (без .jar и build.version) -->
|
<!-- Копируем JavaFX JAR в builds -->
|
||||||
<zip destfile="../server/builds/ZernMCLauncher-${project.version}.zip"
|
<copy todir="../server/builds/lib-javafx" overwrite="true">
|
||||||
|
<fileset dir="${project.build.directory}/lib-javafx"/>
|
||||||
|
</copy>
|
||||||
|
|
||||||
|
<!-- Копируем shell script для Linux -->
|
||||||
|
<copy file="${project.basedir}/src/main/resources/launcher.sh"
|
||||||
|
todir="../server/builds"
|
||||||
|
overwrite="true"/>
|
||||||
|
<chmod file="../server/builds/launcher.sh" perm="+x"/>
|
||||||
|
|
||||||
|
<!-- Создаём zip с .exe, jre21, lib-javafx и launcher.sh (без .jar и build.version) -->
|
||||||
|
<zip destfile="../server/builds/ZernMCLauncher-${project.version}-${os.suffix}.zip"
|
||||||
basedir="../server/builds"
|
basedir="../server/builds"
|
||||||
includes="ZernMCLauncher.exe,jre21/**"
|
includes="ZernMCLauncher.exe,ZernMCLauncher.jar,jre21/**,lib-javafx/**,launcher.sh"
|
||||||
excludes="*.jar,build.version"/>
|
excludes="build.version"/>
|
||||||
</target>
|
</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
@@ -197,5 +302,35 @@
|
|||||||
<server.url>http://87.120.187.36:1582</server.url>
|
<server.url>http://87.120.187.36:1582</server.url>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
|
<!-- ==================== WINDOWS BUILD ==================== -->
|
||||||
|
<profile>
|
||||||
|
<id>win</id>
|
||||||
|
<activation>
|
||||||
|
<os>
|
||||||
|
<family>windows</family>
|
||||||
|
</os>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<javafx.classifier>win</javafx.classifier>
|
||||||
|
<os.suffix>win</os.suffix>
|
||||||
|
<skip.launch4j>false</skip.launch4j>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<!-- ==================== LINUX BUILD ==================== -->
|
||||||
|
<profile>
|
||||||
|
<id>linux</id>
|
||||||
|
<activation>
|
||||||
|
<os>
|
||||||
|
<family>unix</family>
|
||||||
|
</os>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<javafx.classifier>linux</javafx.classifier>
|
||||||
|
<os.suffix>linux</os.suffix>
|
||||||
|
<skip.launch4j>true</skip.launch4j>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
@@ -5,6 +5,10 @@ import me.sashegdev.zernmc.launcher.auth.AuthManager;
|
|||||||
import me.sashegdev.zernmc.launcher.menu.*;
|
import me.sashegdev.zernmc.launcher.menu.*;
|
||||||
import me.sashegdev.zernmc.launcher.ui.ArrowMenu;
|
import me.sashegdev.zernmc.launcher.ui.ArrowMenu;
|
||||||
import me.sashegdev.zernmc.launcher.utils.*;
|
import me.sashegdev.zernmc.launcher.utils.*;
|
||||||
|
import me.sashegdev.zernmc.launcher.web.UIWindow;
|
||||||
|
import me.sashegdev.zernmc.launcher.web.WebServer;
|
||||||
|
|
||||||
|
import java.awt.GraphicsEnvironment;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.http.HttpClient;
|
import java.net.http.HttpClient;
|
||||||
import java.net.http.HttpRequest;
|
import java.net.http.HttpRequest;
|
||||||
@@ -12,6 +16,7 @@ import java.net.http.HttpResponse;
|
|||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.StandardCopyOption;
|
import java.nio.file.StandardCopyOption;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class Main {
|
public class Main {
|
||||||
@@ -19,7 +24,73 @@ public class Main {
|
|||||||
private static final String CURRENT_VERSION = Version.getCurrentVersion();
|
private static final String CURRENT_VERSION = Version.getCurrentVersion();
|
||||||
private static final LauncherAPI api = new LauncherAPI();
|
private static final LauncherAPI api = new LauncherAPI();
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws Exception {
|
||||||
|
boolean cliMode = Arrays.asList(args).contains("--cli") || Arrays.asList(args).contains("-c");
|
||||||
|
|
||||||
|
if (cliMode) {
|
||||||
|
runTUI(args);
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
startWebUI(args);
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.err.println(ZAnsi.red("UI не запустился: " + e.getMessage()));
|
||||||
|
e.printStackTrace();
|
||||||
|
System.out.println(ZAnsi.yellow("Переключаюсь на режим TUI..."));
|
||||||
|
runTUI(args);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void startWebUI(String[] args) throws Exception {
|
||||||
|
System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true");
|
||||||
|
System.setProperty("file.encoding", "UTF-8");
|
||||||
|
|
||||||
|
int startPort = 8080;
|
||||||
|
for (int i = 0; i < args.length - 1; i++) {
|
||||||
|
if (args[i].equals("--port") || args[i].equals("-p")) {
|
||||||
|
startPort = Integer.parseInt(args[i + 1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
System.out.println(ZAnsi.brightGreen("Запуск Web UI..."));
|
||||||
|
System.out.println(ZAnsi.cyan("Поиск свободного порта..."));
|
||||||
|
|
||||||
|
int port = WebServer.findFreePort(startPort);
|
||||||
|
|
||||||
|
// Запускаем WebServer в отдельном потоке
|
||||||
|
Thread serverThread = new Thread(() -> {
|
||||||
|
try {
|
||||||
|
WebServer.start(port);
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.err.println("WebServer error: " + e.getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
serverThread.setDaemon(true);
|
||||||
|
serverThread.start();
|
||||||
|
|
||||||
|
// Даем серверу время запуститься
|
||||||
|
Thread.sleep(1000);
|
||||||
|
|
||||||
|
// Проверяем headless перед запуском JavaFX (только для не-Windows систем)
|
||||||
|
if (!System.getProperty("os.name").toLowerCase().contains("win")) {
|
||||||
|
boolean isHeadless = java.awt.GraphicsEnvironment.isHeadless();
|
||||||
|
String display = System.getenv("DISPLAY");
|
||||||
|
if (isHeadless && (display == null || display.isEmpty())) {
|
||||||
|
System.out.println(ZAnsi.yellow("Дисплей недоступен, переключаюсь на TUI..."));
|
||||||
|
WebServer.stop();
|
||||||
|
runTUI(args);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Проверка обновлений лаунчера
|
||||||
|
checkAndAutoUpdateLauncher();
|
||||||
|
|
||||||
|
// Запускаем JavaFX окно
|
||||||
|
UIWindow.start(port);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void runTUI(String[] args) throws IOException {
|
||||||
System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true");
|
System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true");
|
||||||
System.setProperty("file.encoding", "UTF-8");
|
System.setProperty("file.encoding", "UTF-8");
|
||||||
System.setProperty("sun.err.encoding", "UTF-8");
|
System.setProperty("sun.err.encoding", "UTF-8");
|
||||||
@@ -27,7 +98,7 @@ public class Main {
|
|||||||
|
|
||||||
ZAnsi.install();
|
ZAnsi.install();
|
||||||
System.out.print("\033[H\033[2J");
|
System.out.print("\033[H\033[2J");
|
||||||
System.out.println(ZAnsi.brightGreen("Добро пожаловать в ZernMC Launcher " + CURRENT_VERSION));
|
System.out.println(ZAnsi.brightGreen("Добро пожаловать в ZernMC Launcher " + CURRENT_VERSION) + ZAnsi.cyan(" [CLI mode]"));
|
||||||
|
|
||||||
// Проверка всех сервисов при старте
|
// Проверка всех сервисов при старте
|
||||||
ZHttpClient.checkAllServicesOnStartup();
|
ZHttpClient.checkAllServicesOnStartup();
|
||||||
@@ -115,12 +186,20 @@ public class Main {
|
|||||||
try {
|
try {
|
||||||
String javaPath = System.getProperty("java.home") + "/bin/java";
|
String javaPath = System.getProperty("java.home") + "/bin/java";
|
||||||
String jarPath = getCurrentJarPath().toAbsolutePath().toString();
|
String jarPath = getCurrentJarPath().toAbsolutePath().toString();
|
||||||
|
String launcherDir = jarPath.substring(0, jarPath.lastIndexOf(java.io.File.separator));
|
||||||
|
String javafxPath = launcherDir + java.io.File.separator + "lib-javafx";
|
||||||
|
|
||||||
System.out.println(ZAnsi.brightGreen("Перезапуск лаунчера с новой версией..."));
|
System.out.println(ZAnsi.brightGreen("Перезапуск лаунчера с новой версией..."));
|
||||||
|
|
||||||
new ProcessBuilder(javaPath, "-jar", jarPath)
|
ProcessBuilder pb = new ProcessBuilder(
|
||||||
.inheritIO()
|
javaPath,
|
||||||
.start();
|
"--module-path=" + javafxPath,
|
||||||
|
"--add-modules=javafx.controls,javafx.web",
|
||||||
|
"--add-reads=javafx.graphics=ALL-UNNAMED",
|
||||||
|
"-jar", jarPath
|
||||||
|
);
|
||||||
|
pb.inheritIO();
|
||||||
|
pb.start();
|
||||||
|
|
||||||
System.exit(0);
|
System.exit(0);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package me.sashegdev.zernmc.launcher.api;
|
|||||||
|
|
||||||
import me.sashegdev.zernmc.launcher.api.auth.AuthService;
|
import me.sashegdev.zernmc.launcher.api.auth.AuthService;
|
||||||
import me.sashegdev.zernmc.launcher.api.instance.InstanceService;
|
import me.sashegdev.zernmc.launcher.api.instance.InstanceService;
|
||||||
|
import me.sashegdev.zernmc.launcher.api.install.InstallService;
|
||||||
import me.sashegdev.zernmc.launcher.api.launch.LaunchService;
|
import me.sashegdev.zernmc.launcher.api.launch.LaunchService;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -15,11 +16,13 @@ public class LauncherAPI {
|
|||||||
private final AuthService authService;
|
private final AuthService authService;
|
||||||
private final InstanceService instanceService;
|
private final InstanceService instanceService;
|
||||||
private final LaunchService launchService;
|
private final LaunchService launchService;
|
||||||
|
private final InstallService installService;
|
||||||
|
|
||||||
public LauncherAPI() {
|
public LauncherAPI() {
|
||||||
this.authService = new AuthService();
|
this.authService = new AuthService();
|
||||||
this.instanceService = new InstanceService();
|
this.instanceService = new InstanceService();
|
||||||
this.launchService = new LaunchService();
|
this.launchService = new LaunchService();
|
||||||
|
this.installService = new InstallService();
|
||||||
}
|
}
|
||||||
|
|
||||||
public AuthService auth() {
|
public AuthService auth() {
|
||||||
@@ -34,6 +37,10 @@ public class LauncherAPI {
|
|||||||
return launchService;
|
return launchService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public InstallService install() {
|
||||||
|
return installService;
|
||||||
|
}
|
||||||
|
|
||||||
// ====================== Удобные методы ======================
|
// ====================== Удобные методы ======================
|
||||||
|
|
||||||
public boolean isLoggedIn() {
|
public boolean isLoggedIn() {
|
||||||
|
|||||||
@@ -0,0 +1,226 @@
|
|||||||
|
package me.sashegdev.zernmc.launcher.api.install;
|
||||||
|
|
||||||
|
import me.sashegdev.zernmc.launcher.api.ApiResponse;
|
||||||
|
import me.sashegdev.zernmc.launcher.minecraft.Instance;
|
||||||
|
import me.sashegdev.zernmc.launcher.minecraft.InstanceManager;
|
||||||
|
import me.sashegdev.zernmc.launcher.minecraft.PackDownloader;
|
||||||
|
import me.sashegdev.zernmc.launcher.minecraft.ServerPack;
|
||||||
|
import me.sashegdev.zernmc.launcher.utils.ZHttpClient;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
public class InstallService {
|
||||||
|
|
||||||
|
private PackDownloader.ProgressCallback progressCallback;
|
||||||
|
|
||||||
|
public void setProgressCallback(PackDownloader.ProgressCallback callback) {
|
||||||
|
this.progressCallback = callback;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ApiResponse<InstallResult> installZernMCPack(String packName, String instanceName) {
|
||||||
|
try {
|
||||||
|
boolean created = InstanceManager.createInstanceFolder(instanceName);
|
||||||
|
if (!created) {
|
||||||
|
return ApiResponse.error("Сборка с таким именем уже существует: " + instanceName);
|
||||||
|
}
|
||||||
|
|
||||||
|
Instance instance = InstanceManager.getInstance(instanceName);
|
||||||
|
if (instance == null) {
|
||||||
|
return ApiResponse.error("Не удалось создать директорию сборки");
|
||||||
|
}
|
||||||
|
|
||||||
|
PackDownloader downloader = new PackDownloader(instance);
|
||||||
|
if (progressCallback != null) {
|
||||||
|
downloader.setProgressCallback(progressCallback);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Получаем список доступных сборок
|
||||||
|
List<ServerPack> availablePacks = downloader.getAvailablePacks();
|
||||||
|
|
||||||
|
// Находим нужную сборку
|
||||||
|
ServerPack selectedPack = availablePacks.stream()
|
||||||
|
.filter(p -> p.getName().equals(packName))
|
||||||
|
.findFirst()
|
||||||
|
.orElse(null);
|
||||||
|
|
||||||
|
if (selectedPack == null) {
|
||||||
|
return ApiResponse.error("Сборка не найдена: " + packName);
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean success = downloader.installOrUpdatePack(packName, selectedPack);
|
||||||
|
|
||||||
|
if (success) {
|
||||||
|
return ApiResponse.success(new InstallResult(
|
||||||
|
instanceName,
|
||||||
|
selectedPack.getMinecraftVersion(),
|
||||||
|
selectedPack.getLoaderType(),
|
||||||
|
selectedPack.getVersion()
|
||||||
|
));
|
||||||
|
} else {
|
||||||
|
return ApiResponse.error("Не удалось установить сборку");
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ApiResponse.error("Ошибка установки: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ApiResponse<UpdateCheckResult> checkForUpdates(String instanceName) {
|
||||||
|
try {
|
||||||
|
Instance instance = InstanceManager.getInstance(instanceName);
|
||||||
|
if (instance == null || !instance.isServerPack()) {
|
||||||
|
return ApiResponse.success(new UpdateCheckResult(false, false, 0, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
PackDownloader downloader = new PackDownloader(instance);
|
||||||
|
int serverVersion = downloader.checkForUpdates(instance.getServerPackName());
|
||||||
|
boolean hasUpdate = serverVersion > 0;
|
||||||
|
|
||||||
|
return ApiResponse.success(new UpdateCheckResult(
|
||||||
|
hasUpdate,
|
||||||
|
true,
|
||||||
|
instance.getServerVersion(),
|
||||||
|
serverVersion
|
||||||
|
));
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ApiResponse.error("Ошибка проверки обновлений: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ApiResponse<HashCheckResult> verifyHashes(String instanceName) {
|
||||||
|
try {
|
||||||
|
Instance instance = InstanceManager.getInstance(instanceName);
|
||||||
|
if (instance == null) {
|
||||||
|
return ApiResponse.error("Сборка не найдена: " + instanceName);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!instance.isServerPack() || instance.getServerPackName() == null) {
|
||||||
|
return ApiResponse.success(new HashCheckResult(false, List.of()));
|
||||||
|
}
|
||||||
|
|
||||||
|
PackDownloader downloader = new PackDownloader(instance);
|
||||||
|
Map<String, String> localFiles = downloader.scanLocalFiles();
|
||||||
|
|
||||||
|
// Отправляем хеши на сервер через diff
|
||||||
|
var diff = downloader.getDiff(instance.getServerPackName(), localFiles);
|
||||||
|
|
||||||
|
List<String> mismatched = new ArrayList<>();
|
||||||
|
for (var f : diff.getToDownload()) {
|
||||||
|
mismatched.add(f.getPath());
|
||||||
|
}
|
||||||
|
mismatched.addAll(diff.getToUpdate());
|
||||||
|
mismatched.addAll(diff.getToDelete());
|
||||||
|
|
||||||
|
boolean hasMismatches = !mismatched.isEmpty();
|
||||||
|
|
||||||
|
return ApiResponse.success(new HashCheckResult(hasMismatches, mismatched));
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ApiResponse.error("Ошибка проверки хешей: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ApiResponse<PlayTimeInfo> getPlayTime(String instanceName) {
|
||||||
|
try {
|
||||||
|
Instance instance = InstanceManager.getInstance(instanceName);
|
||||||
|
if (instance == null) {
|
||||||
|
return ApiResponse.error("Сборка не найдена: " + instanceName);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (instance.isServerPack()) {
|
||||||
|
// TODO: Для ZernMC получаем время с сервера
|
||||||
|
// String response = ZHttpClient.get("/users/me/playtime?pack=" + instance.getServerPackName());
|
||||||
|
// Пока возвращаем 0 - в будущем интегрировать с сервером
|
||||||
|
return ApiResponse.success(new PlayTimeInfo(0, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Для локальных сборок возвращаем 0
|
||||||
|
return ApiResponse.success(new PlayTimeInfo(0, false));
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ApiResponse.error("Ошибка получения времени: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private int extractPlayTime(String json) {
|
||||||
|
try {
|
||||||
|
// Простой парсинг JSON
|
||||||
|
String minutes = json.replaceAll(".*\"minutes\"\\s*:\\s*(\\d+).*", "$1");
|
||||||
|
return Integer.parseInt(minutes);
|
||||||
|
} catch (Exception e) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class InstallResult {
|
||||||
|
private String name;
|
||||||
|
private String mcVersion;
|
||||||
|
private String loaderType;
|
||||||
|
private int serverVersion;
|
||||||
|
|
||||||
|
public InstallResult(String name, String mcVersion, String loaderType, int serverVersion) {
|
||||||
|
this.name = name;
|
||||||
|
this.mcVersion = mcVersion;
|
||||||
|
this.loaderType = loaderType;
|
||||||
|
this.serverVersion = serverVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() { return name; }
|
||||||
|
public String getMcVersion() { return mcVersion; }
|
||||||
|
public String getLoaderType() { return loaderType; }
|
||||||
|
public int getServerVersion() { return serverVersion; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class UpdateCheckResult {
|
||||||
|
private boolean hasUpdate;
|
||||||
|
private boolean isServerPack;
|
||||||
|
private int currentVersion;
|
||||||
|
private int latestVersion;
|
||||||
|
|
||||||
|
public UpdateCheckResult(boolean hasUpdate, boolean isServerPack, int currentVersion, int latestVersion) {
|
||||||
|
this.hasUpdate = hasUpdate;
|
||||||
|
this.isServerPack = isServerPack;
|
||||||
|
this.currentVersion = currentVersion;
|
||||||
|
this.latestVersion = latestVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isHasUpdate() { return hasUpdate; }
|
||||||
|
public boolean isServerPack() { return isServerPack; }
|
||||||
|
public int getCurrentVersion() { return currentVersion; }
|
||||||
|
public int getLatestVersion() { return latestVersion; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class HashCheckResult {
|
||||||
|
private boolean hasMismatches;
|
||||||
|
private List<String> mismatchedFiles;
|
||||||
|
|
||||||
|
public HashCheckResult(boolean hasMismatches, List<String> mismatchedFiles) {
|
||||||
|
this.hasMismatches = hasMismatches;
|
||||||
|
this.mismatchedFiles = mismatchedFiles;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasMismatches() { return hasMismatches; }
|
||||||
|
public List<String> getMismatchedFiles() { return mismatchedFiles; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class PlayTimeInfo {
|
||||||
|
private int totalMinutes;
|
||||||
|
private boolean fromServer;
|
||||||
|
|
||||||
|
public PlayTimeInfo(int totalMinutes, boolean fromServer) {
|
||||||
|
this.totalMinutes = totalMinutes;
|
||||||
|
this.fromServer = fromServer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getTotalMinutes() { return totalMinutes; }
|
||||||
|
public boolean isFromServer() { return fromServer; }
|
||||||
|
|
||||||
|
public String getFormattedTime() {
|
||||||
|
int hours = totalMinutes / 60;
|
||||||
|
int minutes = totalMinutes % 60;
|
||||||
|
if (hours > 0) {
|
||||||
|
return hours + "ч " + minutes + "м";
|
||||||
|
}
|
||||||
|
return minutes + "м";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+11
-3
@@ -68,12 +68,14 @@ public class InstanceService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private InstanceInfo toInstanceInfo(Instance instance) {
|
private InstanceInfo toInstanceInfo(Instance instance) {
|
||||||
return new InstanceInfo(
|
return new InstanceInfo(
|
||||||
instance.getName(),
|
instance.getName(),
|
||||||
instance.getPath().toString(),
|
instance.getPath().toString(),
|
||||||
instance.getMinecraftVersion(),
|
instance.getMinecraftVersion(),
|
||||||
instance.getLoaderType()
|
instance.getLoaderType(),
|
||||||
|
instance.isServerPack(),
|
||||||
|
instance.getServerPackName()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,17 +84,23 @@ public class InstanceService {
|
|||||||
private String path;
|
private String path;
|
||||||
private String version;
|
private String version;
|
||||||
private String loaderType;
|
private String loaderType;
|
||||||
|
private boolean isServerPack;
|
||||||
|
private String serverPackName;
|
||||||
|
|
||||||
public InstanceInfo(String name, String path, String version, String loaderType) {
|
public InstanceInfo(String name, String path, String version, String loaderType, boolean isServerPack, String serverPackName) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.path = path;
|
this.path = path;
|
||||||
this.version = version;
|
this.version = version;
|
||||||
this.loaderType = loaderType;
|
this.loaderType = loaderType;
|
||||||
|
this.isServerPack = isServerPack;
|
||||||
|
this.serverPackName = serverPackName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName() { return name; }
|
public String getName() { return name; }
|
||||||
public String getPath() { return path; }
|
public String getPath() { return path; }
|
||||||
public String getVersion() { return version; }
|
public String getVersion() { return version; }
|
||||||
public String getLoaderType() { return loaderType; }
|
public String getLoaderType() { return loaderType; }
|
||||||
|
public boolean isServerPack() { return isServerPack; }
|
||||||
|
public String getServerPackName() { return serverPackName; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,11 +25,17 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
public class LaunchMenu {
|
public class LaunchMenu {
|
||||||
|
|
||||||
|
public static class ExitToMainMenuException extends Exception {}
|
||||||
|
|
||||||
public void show() throws Exception {
|
public void show() throws Exception {
|
||||||
if (Config.isZernMCBuild()) {
|
try {
|
||||||
showZernMCOnly();
|
if (Config.isZernMCBuild()) {
|
||||||
} else {
|
showZernMCOnly();
|
||||||
showGlobal();
|
} else {
|
||||||
|
showGlobal();
|
||||||
|
}
|
||||||
|
} catch (ExitToMainMenuException e) {
|
||||||
|
// Возвращаемся в главное меню - ничего не делаем, просто выходим
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -282,6 +288,15 @@ public class LaunchMenu {
|
|||||||
// ====================== manageInstance — полностью восстановлен ======================
|
// ====================== manageInstance — полностью восстановлен ======================
|
||||||
private void manageInstance(Instance instance) throws Exception {
|
private void manageInstance(Instance instance) throws Exception {
|
||||||
while (true) {
|
while (true) {
|
||||||
|
// Проверяем, существует ли сборка (на случай если она была удалена вручную)
|
||||||
|
Instance currentInstance = InstanceManager.getInstance(instance.getName());
|
||||||
|
if (currentInstance == null) {
|
||||||
|
System.out.println(ZAnsi.yellow("Сборка была удалена или не существует."));
|
||||||
|
ConsoleUtils.pause();
|
||||||
|
throw new ExitToMainMenuException(); // Выходим в главное меню
|
||||||
|
}
|
||||||
|
instance = currentInstance; // Обновляем ссылку на актуальный объект
|
||||||
|
|
||||||
ConsoleUtils.clearScreen();
|
ConsoleUtils.clearScreen();
|
||||||
System.out.println(ZAnsi.header("Управление сборкой: " + instance.getName()));
|
System.out.println(ZAnsi.header("Управление сборкой: " + instance.getName()));
|
||||||
System.out.println(ZAnsi.white("Версия: " + instance.getMinecraftVersion()));
|
System.out.println(ZAnsi.white("Версия: " + instance.getMinecraftVersion()));
|
||||||
@@ -320,9 +335,13 @@ public class LaunchMenu {
|
|||||||
changeLoaderVersion(instance);
|
changeLoaderVersion(instance);
|
||||||
} else {
|
} else {
|
||||||
deleteInstance(instance);
|
deleteInstance(instance);
|
||||||
|
throw new ExitToMainMenuException(); // Выходим в главное меню
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case 3 -> deleteInstance(instance);
|
case 3 -> {
|
||||||
|
deleteInstance(instance);
|
||||||
|
throw new ExitToMainMenuException(); // Выходим в главное меню после удаления
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -332,7 +351,8 @@ public class LaunchMenu {
|
|||||||
System.out.println(ZAnsi.cyan("Проверка обновлений для " + instance.getName()));
|
System.out.println(ZAnsi.cyan("Проверка обновлений для " + instance.getName()));
|
||||||
|
|
||||||
PackDownloader downloader = new PackDownloader(instance);
|
PackDownloader downloader = new PackDownloader(instance);
|
||||||
boolean hasUpdate = downloader.checkForUpdates(instance.getServerPackName());
|
int serverVersion = downloader.checkForUpdates(instance.getServerPackName());
|
||||||
|
boolean hasUpdate = serverVersion > 0;
|
||||||
|
|
||||||
if (!hasUpdate) {
|
if (!hasUpdate) {
|
||||||
System.out.println(ZAnsi.green("Сборка актуальна (v" + instance.getServerVersion() + ")"));
|
System.out.println(ZAnsi.green("Сборка актуальна (v" + instance.getServerVersion() + ")"));
|
||||||
@@ -423,14 +443,15 @@ public class LaunchMenu {
|
|||||||
boolean deleted = InstanceManager.deleteInstance(instance.getName());
|
boolean deleted = InstanceManager.deleteInstance(instance.getName());
|
||||||
if (deleted) {
|
if (deleted) {
|
||||||
System.out.println(ZAnsi.brightGreen("Сборка '" + instance.getName() + "' успешно удалена."));
|
System.out.println(ZAnsi.brightGreen("Сборка '" + instance.getName() + "' успешно удалена."));
|
||||||
|
// НЕ делаем pause(), сразу возвращаемся в manageInstance для выхода в меню сборок
|
||||||
} else {
|
} else {
|
||||||
System.out.println(ZAnsi.brightRed("Не удалось удалить сборку."));
|
System.out.println(ZAnsi.brightRed("Не удалось удалить сборку."));
|
||||||
|
ConsoleUtils.pause();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
System.out.println(ZAnsi.yellow("Удаление отменено."));
|
System.out.println(ZAnsi.yellow("Удаление отменено."));
|
||||||
|
ConsoleUtils.pause();
|
||||||
}
|
}
|
||||||
|
|
||||||
ConsoleUtils.pause();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void launchExistingInstance(Instance instance) {
|
private void launchExistingInstance(Instance instance) {
|
||||||
@@ -625,9 +646,8 @@ public class LaunchMenu {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isNeoForgeSupported(String version) {
|
private boolean isNeoForgeSupported(String version) {
|
||||||
return version.matches("^1\\.20\\.[1-9].*") ||
|
// ВРЕМЕННО ОТКЛЮЧЕНО: в разработке
|
||||||
version.matches("^1\\.21.*") ||
|
return false;
|
||||||
version.matches("^\\d{2}\\..*");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String askFabricLoaderVersion() throws Exception {
|
private String askFabricLoaderVersion() throws Exception {
|
||||||
|
|||||||
@@ -66,7 +66,8 @@ public class UpdateMenu {
|
|||||||
PackDownloader downloader = new PackDownloader(instance);
|
PackDownloader downloader = new PackDownloader(instance);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
boolean hasUpdate = downloader.checkForUpdates(instance.getServerPackName());
|
int serverVersion = downloader.checkForUpdates(instance.getServerPackName());
|
||||||
|
boolean hasUpdate = serverVersion > 0;
|
||||||
if (hasUpdate) {
|
if (hasUpdate) {
|
||||||
System.out.println(ZAnsi.yellow(instance.getName() + " - Есть обновление!"));
|
System.out.println(ZAnsi.yellow(instance.getName() + " - Есть обновление!"));
|
||||||
updatableInstances.add(instance);
|
updatableInstances.add(instance);
|
||||||
|
|||||||
@@ -29,12 +29,55 @@ public class PackDownloader {
|
|||||||
private final Instance instance;
|
private final Instance instance;
|
||||||
private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||||
private final HttpClient httpClient = HttpClient.newHttpClient();
|
private final HttpClient httpClient = HttpClient.newHttpClient();
|
||||||
//private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
|
private ProgressCallback progressCallback;
|
||||||
|
|
||||||
|
public interface ProgressCallback {
|
||||||
|
void onProgress(ProgressInfo info);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ProgressInfo {
|
||||||
|
private String phase;
|
||||||
|
private int totalFiles;
|
||||||
|
private int downloadedFiles;
|
||||||
|
private String currentFile;
|
||||||
|
private long fileSize;
|
||||||
|
private long downloadedBytes;
|
||||||
|
private int filePercent;
|
||||||
|
private int totalPercent;
|
||||||
|
private String eta;
|
||||||
|
|
||||||
|
public ProgressInfo(String phase, int totalFiles, int downloadedFiles, String currentFile,
|
||||||
|
long fileSize, long downloadedBytes, int filePercent, int totalPercent, String eta) {
|
||||||
|
this.phase = phase;
|
||||||
|
this.totalFiles = totalFiles;
|
||||||
|
this.downloadedFiles = downloadedFiles;
|
||||||
|
this.currentFile = currentFile;
|
||||||
|
this.fileSize = fileSize;
|
||||||
|
this.downloadedBytes = downloadedBytes;
|
||||||
|
this.filePercent = filePercent;
|
||||||
|
this.totalPercent = totalPercent;
|
||||||
|
this.eta = eta;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPhase() { return phase; }
|
||||||
|
public int getTotalFiles() { return totalFiles; }
|
||||||
|
public int getDownloadedFiles() { return downloadedFiles; }
|
||||||
|
public String getCurrentFile() { return currentFile; }
|
||||||
|
public long getFileSize() { return fileSize; }
|
||||||
|
public long getDownloadedBytes() { return downloadedBytes; }
|
||||||
|
public int getFilePercent() { return filePercent; }
|
||||||
|
public int getTotalPercent() { return totalPercent; }
|
||||||
|
public String getEta() { return eta; }
|
||||||
|
}
|
||||||
|
|
||||||
public PackDownloader(Instance instance) {
|
public PackDownloader(Instance instance) {
|
||||||
this.instance = instance;
|
this.instance = instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setProgressCallback(ProgressCallback callback) {
|
||||||
|
this.progressCallback = callback;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Получить список доступных паков с сервера
|
* Получить список доступных паков с сервера
|
||||||
*/
|
*/
|
||||||
@@ -225,15 +268,16 @@ public class PackDownloader {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Проверить наличие обновлений для серверной сборки
|
* Проверить наличие обновлений для серверной сборки
|
||||||
|
* @return версия на сервере, или 0 если нет обновлений
|
||||||
*/
|
*/
|
||||||
public boolean checkForUpdates(String packName) throws Exception {
|
public int checkForUpdates(String packName) throws Exception {
|
||||||
if (!instance.isServerPack()) return false;
|
if (!instance.isServerPack()) return 0;
|
||||||
|
|
||||||
PackManifest manifest = getPackManifest(packName);
|
PackManifest manifest = getPackManifest(packName);
|
||||||
int serverVersion = manifest.getVersion();
|
int serverVersion = manifest.getVersion();
|
||||||
int localVersion = instance.getServerVersion();
|
int localVersion = instance.getServerVersion();
|
||||||
|
|
||||||
return serverVersion > localVersion;
|
return serverVersion > localVersion ? serverVersion : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -272,7 +316,7 @@ public class PackDownloader {
|
|||||||
/**
|
/**
|
||||||
* Сканирование локальных файлов и вычисление хешей
|
* Сканирование локальных файлов и вычисление хешей
|
||||||
*/
|
*/
|
||||||
private Map<String, String> scanLocalFiles() throws IOException {
|
public Map<String, String> scanLocalFiles() throws IOException {
|
||||||
Map<String, String> files = new HashMap<>();
|
Map<String, String> files = new HashMap<>();
|
||||||
Path instancePath = instance.getPath();
|
Path instancePath = instance.getPath();
|
||||||
|
|
||||||
@@ -312,9 +356,9 @@ public class PackDownloader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Отправить diff запрос на сервер
|
* Отправить diff запрос на сервер (получить список файлов для обновления)
|
||||||
*/
|
*/
|
||||||
private DiffResponse getDiff(String packName, Map<String, String> localFiles) throws Exception {
|
public DiffResponse getDiff(String packName, Map<String, String> localFiles) throws Exception {
|
||||||
String json = gson.toJson(localFiles);
|
String json = gson.toJson(localFiles);
|
||||||
|
|
||||||
// Получаем токен авторизации
|
// Получаем токен авторизации
|
||||||
@@ -398,7 +442,10 @@ public class PackDownloader {
|
|||||||
System.out.println(" Загрузить: " + diff.getToDownload().size() + " файлов");
|
System.out.println(" Загрузить: " + diff.getToDownload().size() + " файлов");
|
||||||
System.out.println(" Удалить: " + diff.getToDelete().size() + " файлов");
|
System.out.println(" Удалить: " + diff.getToDelete().size() + " файлов");
|
||||||
|
|
||||||
// Создаем директории если нужно
|
if (progressCallback != null) {
|
||||||
|
progressCallback.onProgress(new ProgressInfo("starting", diff.getToDownload().size(), 0, "", 0, 0, 0, 0, ""));
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Files.createDirectories(instance.getPath());
|
Files.createDirectories(instance.getPath());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
@@ -406,7 +453,6 @@ public class PackDownloader {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Удаляем файлы
|
|
||||||
for (String filePath : diff.getToDelete()) {
|
for (String filePath : diff.getToDelete()) {
|
||||||
Path fullPath = instance.getPath().resolve(filePath);
|
Path fullPath = instance.getPath().resolve(filePath);
|
||||||
try {
|
try {
|
||||||
@@ -418,7 +464,6 @@ public class PackDownloader {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Скачиваем файлы
|
|
||||||
AtomicInteger downloaded = new AtomicInteger(0);
|
AtomicInteger downloaded = new AtomicInteger(0);
|
||||||
int total = diff.getToDownload().size();
|
int total = diff.getToDownload().size();
|
||||||
|
|
||||||
@@ -427,13 +472,10 @@ public class PackDownloader {
|
|||||||
Path fullPath = instance.getPath().resolve(path);
|
Path fullPath = instance.getPath().resolve(path);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Создаем директории
|
|
||||||
Files.createDirectories(fullPath.getParent());
|
Files.createDirectories(fullPath.getParent());
|
||||||
|
|
||||||
// Скачиваем файл
|
downloadFile(file, fullPath, progressCallback, downloaded.get(), total);
|
||||||
downloadFile(file, fullPath);
|
|
||||||
|
|
||||||
// Проверяем хеш
|
|
||||||
String actualHash = calculateHash(fullPath);
|
String actualHash = calculateHash(fullPath);
|
||||||
if (!actualHash.equals(file.getHash())) {
|
if (!actualHash.equals(file.getHash())) {
|
||||||
throw new IOException("Хеш не совпадает! Ожидался: " + file.getHash() +
|
throw new IOException("Хеш не совпадает! Ожидался: " + file.getHash() +
|
||||||
@@ -445,6 +487,11 @@ public class PackDownloader {
|
|||||||
ProgressBar.show("Скачивание", downloaded.get(), total, "файлов");
|
ProgressBar.show("Скачивание", downloaded.get(), total, "файлов");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (progressCallback != null) {
|
||||||
|
progressCallback.onProgress(new ProgressInfo("downloading", total, downloaded.get(), path,
|
||||||
|
file.getSize(), file.getSize(), 100, (downloaded.get() * 100) / total, ""));
|
||||||
|
}
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.err.println("\n" + ZAnsi.red(" Ошибка скачивания " + path + ": " + e.getMessage()));
|
System.err.println("\n" + ZAnsi.red(" Ошибка скачивания " + path + ": " + e.getMessage()));
|
||||||
return false;
|
return false;
|
||||||
@@ -455,13 +502,21 @@ public class PackDownloader {
|
|||||||
ProgressBar.finish("Скачивание");
|
ProgressBar.finish("Скачивание");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (progressCallback != null) {
|
||||||
|
progressCallback.onProgress(new ProgressInfo("complete", total, total, "", 0, 0, 100, 100, ""));
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Скачать один файл с сервера
|
* Скачать один файл с сервера
|
||||||
*/
|
*/
|
||||||
private void downloadFile(FileInfo file, Path destination) throws Exception {
|
private void downloadFile(FileInfo file, Path destination) throws Exception {
|
||||||
|
downloadFile(file, destination, null, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void downloadFile(FileInfo file, Path destination, ProgressCallback callback, int downloadedFiles, int totalFiles) throws Exception {
|
||||||
String url = ZHttpClient.getBaseUrl() + file.getUrl();
|
String url = ZHttpClient.getBaseUrl() + file.getUrl();
|
||||||
|
|
||||||
HttpRequest request = HttpRequest.newBuilder()
|
HttpRequest request = HttpRequest.newBuilder()
|
||||||
@@ -476,7 +531,6 @@ public class PackDownloader {
|
|||||||
throw new IOException("HTTP " + response.statusCode());
|
throw new IOException("HTTP " + response.statusCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Скачиваем с прогрессом
|
|
||||||
try (InputStream in = response.body();
|
try (InputStream in = response.body();
|
||||||
FileOutputStream out = new FileOutputStream(destination.toFile())) {
|
FileOutputStream out = new FileOutputStream(destination.toFile())) {
|
||||||
|
|
||||||
@@ -484,18 +538,28 @@ public class PackDownloader {
|
|||||||
int bytesRead;
|
int bytesRead;
|
||||||
long totalRead = 0;
|
long totalRead = 0;
|
||||||
long fileSize = file.getSize();
|
long fileSize = file.getSize();
|
||||||
|
long lastCallbackTime = 0;
|
||||||
|
|
||||||
while ((bytesRead = in.read(buffer)) != -1) {
|
while ((bytesRead = in.read(buffer)) != -1) {
|
||||||
out.write(buffer, 0, bytesRead);
|
out.write(buffer, 0, bytesRead);
|
||||||
totalRead += bytesRead;
|
totalRead += bytesRead;
|
||||||
|
|
||||||
if (fileSize > 0 && totalRead % 8192 == 0) {
|
if (fileSize > 0) {
|
||||||
ProgressBar.showDownload(" " + file.getPath(), totalRead, fileSize);
|
ProgressBar.showDownload(" " + file.getPath(), totalRead, fileSize);
|
||||||
|
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
if (callback != null && now - lastCallbackTime > 200) {
|
||||||
|
int filePercent = (int) ((totalRead * 100) / fileSize);
|
||||||
|
int totalPercent = totalFiles > 0 ? ((downloadedFiles * 100 + filePercent) / totalFiles) : 0;
|
||||||
|
callback.onProgress(new ProgressInfo("downloading", totalFiles, downloadedFiles, file.getPath(),
|
||||||
|
fileSize, totalRead, filePercent, totalPercent, ""));
|
||||||
|
lastCallbackTime = now;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
ProgressBar.clearLine();
|
ProgressBar.clearLine();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+113
-127
@@ -39,45 +39,41 @@ public class NeoForgeInstaller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
instance.setAssetIndex(assetIndex);
|
instance.setAssetIndex(assetIndex);
|
||||||
createLauncherProfile();
|
|
||||||
|
|
||||||
String mavenGroup = getMavenGroup(mcVersion);
|
String mavenGroup = getMavenGroup(mcVersion);
|
||||||
String mavenArtifact = getMavenArtifact(mcVersion);
|
String mavenArtifact = getMavenArtifact(mcVersion);
|
||||||
|
|
||||||
String installerUrl = "https://maven.neoforged.net/releases/"
|
// Формируем путь к версии
|
||||||
|
String versionName = mcVersion + "-" + neoForgeVersion;
|
||||||
|
Path versionDir = instance.getPath().resolve("versions").resolve(versionName);
|
||||||
|
Files.createDirectories(versionDir);
|
||||||
|
|
||||||
|
// Скачиваем universal.jar (это основной JAR NeoForge)
|
||||||
|
String baseMavenUrl = "https://maven.neoforged.net/releases/"
|
||||||
+ mavenGroup.replace('.', '/') + "/"
|
+ mavenGroup.replace('.', '/') + "/"
|
||||||
+ mavenArtifact + "/"
|
+ mavenArtifact + "/"
|
||||||
+ neoForgeVersion
|
+ neoForgeVersion + "/";
|
||||||
+ "/" + mavenArtifact + "-" + neoForgeVersion + "-installer.jar";
|
|
||||||
|
|
||||||
Path installerJar = instance.getPath().resolve("neoforge-installer.jar");
|
String universalJarUrl = baseMavenUrl + mavenArtifact + "-" + neoForgeVersion + "-universal.jar";
|
||||||
|
Path neoForgeJar = versionDir.resolve(versionName + ".jar");
|
||||||
|
|
||||||
System.out.println(ZAnsi.cyan("Скачивание NeoForge Installer..."));
|
System.out.println(ZAnsi.cyan("Скачивание NeoForge universal.jar..."));
|
||||||
downloadFileWithProgress(installerUrl, installerJar);
|
downloadFileDirect(universalJarUrl, neoForgeJar);
|
||||||
|
|
||||||
System.out.println(ZAnsi.cyan("Запуск NeoForge Installer..."));
|
// Создаем version.json вручную
|
||||||
System.out.println(ZAnsi.yellow("Это может занять несколько минут. Пожалуйста, подождите...\n"));
|
System.out.println(ZAnsi.cyan("Создание version.json..."));
|
||||||
|
createVersionJson(versionDir.resolve(versionName + ".json"), mcVersion, neoForgeVersion, mavenArtifact);
|
||||||
|
|
||||||
boolean success = runNeoForgeInstaller(installerJar);
|
// Скачиваем необходимые библиотеки
|
||||||
|
System.out.println(ZAnsi.cyan("Скачивание библиотек NeoForge..."));
|
||||||
|
downloadNeoForgeLibraries(mcVersion, neoForgeVersion, mavenGroup, mavenArtifact);
|
||||||
|
|
||||||
if (success) {
|
System.out.println(ZAnsi.brightGreen("\nNeoForge " + neoForgeVersion + " успешно установлен!"));
|
||||||
try {
|
instance.setMinecraftVersion(mcVersion);
|
||||||
downloadMissingLibraries(mcVersion, neoForgeVersion, mavenGroup, mavenArtifact);
|
instance.setLoaderType("neoforge");
|
||||||
} catch (Exception e) {
|
instance.setLoaderVersion(neoForgeVersion);
|
||||||
System.out.println(ZAnsi.yellow("Предупреждение: не удалось докачать некоторые библиотеки: " + e.getMessage()));
|
|
||||||
}
|
|
||||||
|
|
||||||
System.out.println(ZAnsi.brightGreen("\nNeoForge " + neoForgeVersion + " успешно установлен!"));
|
return true;
|
||||||
instance.setMinecraftVersion(mcVersion);
|
|
||||||
instance.setLoaderType("neoforge");
|
|
||||||
instance.setLoaderVersion(neoForgeVersion);
|
|
||||||
|
|
||||||
Files.deleteIfExists(installerJar);
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
System.out.println(ZAnsi.brightRed("\nОшибка при установке NeoForge!"));
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getMavenGroup(String mcVersion) {
|
private String getMavenGroup(String mcVersion) {
|
||||||
@@ -153,119 +149,109 @@ public class NeoForgeInstaller {
|
|||||||
ProgressBar.finish("NeoForge Installer (" + ProgressBar.formatBytes(Files.size(target)) + ")");
|
ProgressBar.finish("NeoForge Installer (" + ProgressBar.formatBytes(Files.size(target)) + ")");
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean runNeoForgeInstaller(Path installerJar) throws IOException, InterruptedException {
|
private void downloadFileDirect(String url, Path target) throws Exception {
|
||||||
int maxRetries = 3;
|
HttpRequest request = HttpRequest.newBuilder()
|
||||||
int attempt = 1;
|
.uri(URI.create(url))
|
||||||
|
.GET()
|
||||||
|
.build();
|
||||||
|
|
||||||
while (attempt <= maxRetries) {
|
HttpResponse<Path> response = httpClient.send(request, HttpResponse.BodyHandlers.ofFile(target));
|
||||||
System.out.println(ZAnsi.cyan("Попытка " + attempt + " из " + maxRetries));
|
|
||||||
|
|
||||||
ProcessBuilder pb = new ProcessBuilder(
|
if (response.statusCode() != 200) {
|
||||||
"java",
|
throw new IOException("HTTP " + response.statusCode() + " for " + url);
|
||||||
"-jar",
|
|
||||||
installerJar.toAbsolutePath().toString(),
|
|
||||||
"--installClient"
|
|
||||||
);
|
|
||||||
|
|
||||||
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")) {
|
|
||||||
System.out.println(ZAnsi.blue(" -> " + line));
|
|
||||||
} else if (line.contains("SUCCESS") || line.contains("successfully")) {
|
|
||||||
System.out.println(ZAnsi.brightGreen(" + " + line));
|
|
||||||
} else if (line.contains("WARNING") || line.contains("warning")) {
|
|
||||||
System.out.println(ZAnsi.yellow(" ! " + line));
|
|
||||||
} else if (line.contains("ERROR") || line.contains("error") || line.contains("failed") || line.contains("timed out")) {
|
|
||||||
System.out.println(ZAnsi.brightRed(" X " + line));
|
|
||||||
if (line.contains("timed out") || line.contains("failed to download")) {
|
|
||||||
hasErrors = true;
|
|
||||||
}
|
|
||||||
} else if (!line.isBlank()) {
|
|
||||||
System.out.println(" " + line);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int exitCode = process.waitFor();
|
|
||||||
|
|
||||||
if (exitCode == 0 && !hasErrors) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (attempt < maxRetries) {
|
|
||||||
System.out.println(ZAnsi.yellow("Ошибка при установке. Повторная попытка через 5 секунд..."));
|
|
||||||
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 {
|
|
||||||
System.out.println(ZAnsi.brightRed("NeoForge Installer завершился с кодом ошибки: " + exitCode));
|
|
||||||
|
|
||||||
if (output.toString().contains("timed out")) {
|
|
||||||
System.out.println(ZAnsi.yellow("\nВозможные решения:"));
|
|
||||||
System.out.println(ZAnsi.yellow("1. Проверьте интернет-соединение"));
|
|
||||||
System.out.println(ZAnsi.yellow("2. Запустите лаунчер от имени администратора"));
|
|
||||||
System.out.println(ZAnsi.yellow("3. Временно отключите антивирус/брандмауэр"));
|
|
||||||
System.out.println(ZAnsi.yellow("4. Попробуйте установить другую версию NeoForge"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
attempt++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
System.out.println(ZAnsi.green(" " + target.getFileName() + " завершено ✓"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void downloadMissingLibraries(String mcVersion, String neoForgeVersion, String mavenGroup, String mavenArtifact) throws Exception {
|
private void createVersionJson(Path jsonFile, String mcVersion, String neoForgeVersion, String mavenArtifact) throws IOException {
|
||||||
System.out.println(ZAnsi.cyan("Проверка и докачка отсутствующих библиотек..."));
|
// Создаем минимальный version.json для NeoForge
|
||||||
|
String versionName = mcVersion + "-" + neoForgeVersion;
|
||||||
|
String json = """
|
||||||
|
{
|
||||||
|
"id": "%s",
|
||||||
|
"type": "release",
|
||||||
|
"mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher",
|
||||||
|
"inheritsFrom": "%s",
|
||||||
|
"arguments": {
|
||||||
|
"--tweakClass": "cpw.mods.fml.relauncher.CoreModManager"
|
||||||
|
},
|
||||||
|
"libraries": [
|
||||||
|
{"name": "net.neoforged:neoforge:%s"},
|
||||||
|
{"name": "cpw.mods:bootstraplauncher:1.1.2"},
|
||||||
|
{"name": "net.minecraftforge:unsafe:0.2.0"},
|
||||||
|
{"name": "net.minecraftforge:srgutils:0.4.4"},
|
||||||
|
{"name": "net.minecraftforge:modlauncher:10.2.1"},
|
||||||
|
{"name": "net.minecraftforge:coremods:5.0.1"},
|
||||||
|
{"name": "net.minecraftforge:accesstransformers:8.8"},
|
||||||
|
{"name": "net.minecraftforge:eventbus:6.0.5"},
|
||||||
|
{"name": "net.minecraftforge:forgemin:0.1.1"},
|
||||||
|
{"name": "net.minecraftforge:scanner:1.2.2"},
|
||||||
|
{"name": "com.google.code.gson:gson:2.10.1"},
|
||||||
|
{"name": "com.google.guava:guava:32.1.3-jre"},
|
||||||
|
{"name": "org.apache.commons:commons-lang3:3.13.0"},
|
||||||
|
{"name": "org.jline:jline-reader:3.12.1"},
|
||||||
|
{"name": "org.jline:jline-terminal:3.12.1"}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
""".formatted(versionName, mcVersion, neoForgeVersion);
|
||||||
|
|
||||||
Map<String, String> alternativeUrls = new HashMap<>();
|
Files.writeString(jsonFile, json);
|
||||||
alternativeUrls.put("org/ow2/asm/asm/9.6/asm-9.6.jar",
|
System.out.println(ZAnsi.green(" version.json создан ✓"));
|
||||||
"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");
|
private void downloadNeoForgeLibraries(String mcVersion, String neoForgeVersion, String mavenGroup, String mavenArtifact) throws Exception {
|
||||||
alternativeUrls.put("org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar",
|
System.out.println(ZAnsi.cyan("Скачивание библиотек NeoForge..."));
|
||||||
"https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar");
|
|
||||||
|
String baseMavenUrl = "https://maven.neoforged.net/releases/"
|
||||||
|
+ mavenGroup.replace('.', '/') + "/";
|
||||||
|
|
||||||
Path librariesDir = instance.getPath().resolve("libraries");
|
Path librariesDir = instance.getPath().resolve("libraries");
|
||||||
|
|
||||||
for (Map.Entry<String, String> entry : alternativeUrls.entrySet()) {
|
// Список основных библиотек NeoForge
|
||||||
Path target = librariesDir.resolve(entry.getKey());
|
String[][] libs = {
|
||||||
if (!Files.exists(target)) {
|
{mavenGroup, mavenArtifact, neoForgeVersion},
|
||||||
Files.createDirectories(target.getParent());
|
{"cpw.mods", "bootstraplauncher", "1.1.2"},
|
||||||
System.out.println(ZAnsi.yellow("Докачка: " + target.getFileName()));
|
{"net.minecraftforge", "unsafe", "0.2.0"},
|
||||||
|
{"net.minecraftforge", "srgutils", "0.4.4"},
|
||||||
|
{"net.minecraftforge", "modlauncher", "10.2.1"},
|
||||||
|
{"net.minecraftforge", "coremods", "5.0.1"},
|
||||||
|
{"net.minecraftforge", "accesstransformers", "8.8"},
|
||||||
|
{"net.minecraftforge", "eventbus", "6.0.5"},
|
||||||
|
{"net.minecraftforge", "forgemin", "0.1.1"},
|
||||||
|
{"net.minecraftforge", "scanner", "1.2.2"}
|
||||||
|
};
|
||||||
|
|
||||||
for (int attempt = 1; attempt <= 3; attempt++) {
|
for (String[] lib : libs) {
|
||||||
try {
|
String group = lib[0].replace('.', '/');
|
||||||
downloadFileWithProgress(entry.getValue(), target);
|
String artifact = lib[1];
|
||||||
break;
|
String version = lib[2];
|
||||||
} catch (Exception e) {
|
|
||||||
if (attempt == 3) throw e;
|
String jarName = artifact + "-" + version + ".jar";
|
||||||
System.out.println(ZAnsi.yellow("Повторная попытка " + attempt + "/3..."));
|
String mavenPath = group + "/" + artifact + "/" + version + "/" + jarName;
|
||||||
Thread.sleep(2000);
|
Path target = librariesDir.resolve(mavenPath);
|
||||||
}
|
|
||||||
|
if (Files.exists(target)) {
|
||||||
|
System.out.println(ZAnsi.green(" " + jarName + " уже есть ✓"));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
Files.createDirectories(target.getParent());
|
||||||
|
|
||||||
|
String url = baseMavenUrl + mavenPath;
|
||||||
|
try {
|
||||||
|
downloadFileDirect(url, target);
|
||||||
|
} catch (Exception e) {
|
||||||
|
// Пробуем Maven Central как fallback
|
||||||
|
try {
|
||||||
|
String centralUrl = "https://repo1.maven.org/maven2/" + mavenPath;
|
||||||
|
downloadFileDirect(centralUrl, target);
|
||||||
|
} catch (Exception e2) {
|
||||||
|
System.out.println(ZAnsi.yellow(" Предупреждение: не удалось скачать " + jarName));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
System.out.println(ZAnsi.green("Библиотеки NeoForge обработаны ✓"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package me.sashegdev.zernmc.launcher.web;
|
||||||
|
|
||||||
|
import java.awt.GraphicsEnvironment;
|
||||||
|
import javafx.application.Application;
|
||||||
|
import javafx.concurrent.Worker;
|
||||||
|
import javafx.geometry.Rectangle2D;
|
||||||
|
import javafx.scene.Scene;
|
||||||
|
import javafx.scene.web.WebEngine;
|
||||||
|
import javafx.scene.web.WebView;
|
||||||
|
import javafx.stage.Screen;
|
||||||
|
import javafx.stage.Stage;
|
||||||
|
import javafx.stage.StageStyle;
|
||||||
|
|
||||||
|
public class UIWindow extends Application {
|
||||||
|
|
||||||
|
private static String url;
|
||||||
|
private static int port;
|
||||||
|
|
||||||
|
public static void start(int port) {
|
||||||
|
UIWindow.port = port;
|
||||||
|
UIWindow.url = "http://localhost:" + port;
|
||||||
|
Application.launch(UIWindow.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void start(Stage stage) {
|
||||||
|
stage.setTitle("ZernMC Launcher");
|
||||||
|
stage.initStyle(StageStyle.UNDECORATED);
|
||||||
|
|
||||||
|
WebView webView = new WebView();
|
||||||
|
WebEngine webEngine = webView.getEngine();
|
||||||
|
|
||||||
|
webEngine.load(url);
|
||||||
|
|
||||||
|
webEngine.getLoadWorker().stateProperty().addListener((obs, oldState, newState) -> {
|
||||||
|
if (newState == Worker.State.FAILED) {
|
||||||
|
System.err.println("Failed to load: " + url);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Scene scene = new Scene(webView);
|
||||||
|
stage.setScene(scene);
|
||||||
|
|
||||||
|
Rectangle2D screenBounds = Screen.getPrimary().getVisualBounds();
|
||||||
|
double screenWidth = screenBounds.getWidth();
|
||||||
|
double screenHeight = screenBounds.getHeight();
|
||||||
|
|
||||||
|
double windowWidth = Math.min(1200, screenWidth * 0.8);
|
||||||
|
double windowHeight = Math.min(800, screenHeight * 0.85);
|
||||||
|
|
||||||
|
stage.setWidth(windowWidth);
|
||||||
|
stage.setHeight(windowHeight);
|
||||||
|
stage.setX((screenWidth - windowWidth) / 2);
|
||||||
|
stage.setY((screenHeight - windowHeight) / 2);
|
||||||
|
|
||||||
|
stage.show();
|
||||||
|
|
||||||
|
stage.setOnCloseRequest(event -> {
|
||||||
|
WebServer.stop();
|
||||||
|
System.exit(0);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,463 @@
|
|||||||
|
package me.sashegdev.zernmc.launcher.web;
|
||||||
|
|
||||||
|
import io.javalin.Javalin;
|
||||||
|
import io.javalin.http.staticfiles.Location;
|
||||||
|
import me.sashegdev.zernmc.launcher.api.ApiResponse;
|
||||||
|
import me.sashegdev.zernmc.launcher.api.LauncherAPI;
|
||||||
|
import me.sashegdev.zernmc.launcher.api.instance.InstanceService;
|
||||||
|
import me.sashegdev.zernmc.launcher.api.install.InstallService;
|
||||||
|
import me.sashegdev.zernmc.launcher.auth.AuthManager;
|
||||||
|
import me.sashegdev.zernmc.launcher.utils.ZAnsi;
|
||||||
|
import me.sashegdev.zernmc.launcher.utils.ZHttpClient;
|
||||||
|
|
||||||
|
import java.awt.Desktop;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.http.HttpClient;
|
||||||
|
import java.net.http.HttpRequest;
|
||||||
|
import java.net.http.HttpResponse;
|
||||||
|
import java.net.ServerSocket;
|
||||||
|
import java.net.URI;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.StandardCopyOption;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
public class WebServer {
|
||||||
|
|
||||||
|
private static final LauncherAPI api = new LauncherAPI();
|
||||||
|
private static Javalin app;
|
||||||
|
private static int currentPort;
|
||||||
|
private static volatile boolean running = false;
|
||||||
|
|
||||||
|
public static int findFreePort(int startPort) throws IOException {
|
||||||
|
for (int port = startPort; port < startPort + 100; port++) {
|
||||||
|
if (isPortAvailable(port)) {
|
||||||
|
return port;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new IOException("Не удалось найти свободный порт в диапазоне " + startPort + "-" + (startPort + 99));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isPortAvailable(int port) {
|
||||||
|
try (ServerSocket socket = new ServerSocket(port)) {
|
||||||
|
return true;
|
||||||
|
} catch (IOException e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void start(int port) throws Exception {
|
||||||
|
currentPort = port;
|
||||||
|
running = true;
|
||||||
|
|
||||||
|
// Отключаем логирование Javalin в консоль
|
||||||
|
System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "error");
|
||||||
|
|
||||||
|
app = Javalin.create(config -> {
|
||||||
|
config.staticFiles.add("/webapp", Location.CLASSPATH);
|
||||||
|
config.staticFiles.add("/assets", Location.CLASSPATH);
|
||||||
|
}).start(port);
|
||||||
|
|
||||||
|
// API эндпоинты
|
||||||
|
setupApiRoutes();
|
||||||
|
|
||||||
|
System.out.println(ZAnsi.brightGreen("✓ Web UI готов на http://localhost:" + port));
|
||||||
|
|
||||||
|
// Блокируем главный поток (сервер работает)
|
||||||
|
while (running) {
|
||||||
|
Thread.sleep(1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void setupApiRoutes() {
|
||||||
|
// Auth
|
||||||
|
app.get("/api/auth/status", ctx -> {
|
||||||
|
if (AuthManager.loadSavedSession()) {
|
||||||
|
ctx.json(Map.of(
|
||||||
|
"success", true,
|
||||||
|
"loggedIn", true,
|
||||||
|
"username", AuthManager.getUsername()
|
||||||
|
));
|
||||||
|
} else {
|
||||||
|
ctx.json(Map.of(
|
||||||
|
"success", true,
|
||||||
|
"loggedIn", false
|
||||||
|
));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.post("/api/auth/login", ctx -> {
|
||||||
|
Map<String, String> body = ctx.bodyAsClass(Map.class);
|
||||||
|
String username = body.get("username");
|
||||||
|
String password = body.get("password");
|
||||||
|
|
||||||
|
if (username == null || password == null) {
|
||||||
|
ctx.status(400).json(Map.of("success", false, "error", "Missing username or password"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var result = api.login(username, password);
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
ctx.json(Map.of("success", true, "username", username));
|
||||||
|
} else {
|
||||||
|
ctx.status(401).json(Map.of("success", false, "error", result.getError()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.post("/api/auth/logout", ctx -> {
|
||||||
|
AuthManager.logout();
|
||||||
|
ctx.json(Map.of("success", true));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Instances - локальные
|
||||||
|
app.get("/api/instances", ctx -> {
|
||||||
|
var result = api.getAllInstances();
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
ctx.json(Map.of("success", true, "data", result.getData()));
|
||||||
|
} else {
|
||||||
|
ctx.status(500).json(Map.of("success", false, "error", result.getError()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Instance детали
|
||||||
|
app.get("/api/instances/{name}", ctx -> {
|
||||||
|
String name = ctx.pathParam("name");
|
||||||
|
var result = api.instances().getInstance(name);
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
ctx.json(Map.of("success", true, "data", result.getData()));
|
||||||
|
} else {
|
||||||
|
ctx.status(404).json(Map.of("success", false, "error", result.getError()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Launch
|
||||||
|
app.post("/api/instances/{name}/launch", ctx -> {
|
||||||
|
String name = ctx.pathParam("name");
|
||||||
|
var result = api.launch(name);
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
ctx.json(Map.of("success", true, "message", "Launch started"));
|
||||||
|
} else {
|
||||||
|
ctx.status(500).json(Map.of("success", false, "error", result.getError()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Delete
|
||||||
|
app.post("/api/instances/{name}/delete", ctx -> {
|
||||||
|
String name = ctx.pathParam("name");
|
||||||
|
var result = api.instances().deleteInstance(name);
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
ctx.json(Map.of("success", true, "message", "Instance deleted"));
|
||||||
|
} else {
|
||||||
|
ctx.status(500).json(Map.of("success", false, "error", result.getError()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ZernMC серверные сборки
|
||||||
|
app.get("/api/instances/zernmc", ctx -> {
|
||||||
|
// TODO: получить реальные сборки с сервера
|
||||||
|
List<Map<String, Object>> packs = List.of(
|
||||||
|
Map.of("name", "ZernMC SkyBlock", "version", 1, "loader", "Fabric", "loaderVersion", "0.15.9", "filesCount", 150),
|
||||||
|
Map.of("name", "ZernMC RPG", "version", 3, "loader", "Fabric", "loaderVersion", "0.15.9", "filesCount", 200)
|
||||||
|
);
|
||||||
|
ctx.json(Map.of("success", true, "data", packs));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Установка ZernMC сборки
|
||||||
|
app.post("/api/instances/zernmc/install", ctx -> {
|
||||||
|
Map<String, String> body = ctx.bodyAsClass(Map.class);
|
||||||
|
String packName = body.get("packName");
|
||||||
|
String instanceName = body.get("instanceName");
|
||||||
|
|
||||||
|
if (packName == null || instanceName == null) {
|
||||||
|
ctx.status(400).json(Map.of("success", false, "error", "Missing packName or instanceName"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var result = api.install().installZernMCPack(packName, instanceName);
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
ctx.json(Map.of(
|
||||||
|
"success", true,
|
||||||
|
"data", Map.of(
|
||||||
|
"name", result.getData().getName(),
|
||||||
|
"mcVersion", result.getData().getMcVersion(),
|
||||||
|
"loaderType", result.getData().getLoaderType(),
|
||||||
|
"serverVersion", result.getData().getServerVersion()
|
||||||
|
)
|
||||||
|
));
|
||||||
|
} else {
|
||||||
|
ctx.status(500).json(Map.of("success", false, "error", result.getError()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// SSE прогресс установки
|
||||||
|
app.get("/api/instances/{name}/install/stream", ctx -> {
|
||||||
|
ctx.header("Content-Type", "text/event-stream");
|
||||||
|
ctx.header("Cache-Control", "no-cache");
|
||||||
|
ctx.header("Connection", "keep-alive");
|
||||||
|
|
||||||
|
String instanceName = ctx.pathParam("name");
|
||||||
|
var instanceInfo = api.instances().getInstance(instanceName);
|
||||||
|
|
||||||
|
if (!instanceInfo.isSuccess() || instanceInfo.getData() == null) {
|
||||||
|
ctx.result("data: {\"phase\":\"error\",\"message\":\"Instance not found\"}\n\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var os = ctx.outputStream();
|
||||||
|
InstallService service = new InstallService();
|
||||||
|
service.setProgressCallback(info -> {
|
||||||
|
try {
|
||||||
|
String json = String.format(
|
||||||
|
"{\"phase\":\"%s\",\"totalFiles\":%d,\"downloadedFiles\":%d,\"currentFile\":\"%s\",\"fileSize\":%d,\"downloadedBytes\":%d,\"filePercent\":%d,\"totalPercent\":%d,\"eta\":\"%s\"}",
|
||||||
|
info.getPhase(), info.getTotalFiles(), info.getDownloadedFiles(),
|
||||||
|
info.getCurrentFile() != null ? info.getCurrentFile().replace("\"", "\\\"") : "",
|
||||||
|
info.getFileSize(), info.getDownloadedBytes(),
|
||||||
|
info.getFilePercent(), info.getTotalPercent(),
|
||||||
|
info.getEta() != null ? info.getEta() : ""
|
||||||
|
);
|
||||||
|
os.write(("data: " + json + "\n\n").getBytes());
|
||||||
|
os.flush();
|
||||||
|
} catch (Exception e) {}
|
||||||
|
});
|
||||||
|
|
||||||
|
var result = service.installZernMCPack(instanceInfo.getData().getServerPackName(), instanceName);
|
||||||
|
try {
|
||||||
|
if (!result.isSuccess()) {
|
||||||
|
os.write(("data: {\"phase\":\"error\",\"message\":\"" + result.getError().replace("\"", "\\\"") + "\"}\n\n").getBytes());
|
||||||
|
} else {
|
||||||
|
os.write("data: {\"phase\":\"complete\"}\n\n".getBytes());
|
||||||
|
}
|
||||||
|
os.flush();
|
||||||
|
} catch (Exception e) {}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Проверка обновлений
|
||||||
|
app.get("/api/instances/{name}/updates", ctx -> {
|
||||||
|
String name = ctx.pathParam("name");
|
||||||
|
var result = api.install().checkForUpdates(name);
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
ctx.json(Map.of(
|
||||||
|
"success", true,
|
||||||
|
"data", Map.of(
|
||||||
|
"hasUpdate", result.getData().isHasUpdate(),
|
||||||
|
"isServerPack", result.getData().isServerPack(),
|
||||||
|
"currentVersion", result.getData().getCurrentVersion(),
|
||||||
|
"latestVersion", result.getData().getLatestVersion()
|
||||||
|
)
|
||||||
|
));
|
||||||
|
} else {
|
||||||
|
ctx.status(500).json(Map.of("success", false, "error", result.getError()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Проверка хешей
|
||||||
|
app.get("/api/instances/{name}/verify", ctx -> {
|
||||||
|
String name = ctx.pathParam("name");
|
||||||
|
var result = api.install().verifyHashes(name);
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
ctx.json(Map.of(
|
||||||
|
"success", true,
|
||||||
|
"data", Map.of(
|
||||||
|
"hasMismatches", result.getData().hasMismatches(),
|
||||||
|
"mismatchedFiles", result.getData().getMismatchedFiles()
|
||||||
|
)
|
||||||
|
));
|
||||||
|
} else {
|
||||||
|
ctx.status(500).json(Map.of("success", false, "error", result.getError()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Получение времени игры
|
||||||
|
app.get("/api/instances/{name}/playtime", ctx -> {
|
||||||
|
String name = ctx.pathParam("name");
|
||||||
|
var result = api.install().getPlayTime(name);
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
ctx.json(Map.of(
|
||||||
|
"success", true,
|
||||||
|
"data", Map.of(
|
||||||
|
"totalMinutes", result.getData().getTotalMinutes(),
|
||||||
|
"fromServer", result.getData().isFromServer(),
|
||||||
|
"formatted", result.getData().getFormattedTime()
|
||||||
|
)
|
||||||
|
));
|
||||||
|
} else {
|
||||||
|
ctx.status(500).json(Map.of("success", false, "error", result.getError()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Minecraft версии
|
||||||
|
app.get("/api/versions", ctx -> {
|
||||||
|
List<String> versions = List.of(
|
||||||
|
"1.21.4", "1.21.3", "1.21.2", "1.21.1", "1.21",
|
||||||
|
"1.20.4", "1.20.3", "1.20.2", "1.20.1", "1.20",
|
||||||
|
"1.19.4", "1.19.3", "1.19.2", "1.19.1", "1.19",
|
||||||
|
"1.18.2", "1.18.1", "1.18",
|
||||||
|
"1.17.1", "1.17"
|
||||||
|
);
|
||||||
|
ctx.json(Map.of("success", true, "data",
|
||||||
|
versions.stream().map(v -> Map.of("id", v)).toList()
|
||||||
|
));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Версии лоадеров для конкретной версии Minecraft
|
||||||
|
app.get("/api/versions/{version}/loaders/{loader}", ctx -> {
|
||||||
|
String version = ctx.pathParam("version");
|
||||||
|
String loader = ctx.pathParam("loader");
|
||||||
|
|
||||||
|
List<Map<String, String>> loaderVersions = switch (loader.toLowerCase()) {
|
||||||
|
case "fabric" -> List.of(
|
||||||
|
Map.of("version", "0.16.9"),
|
||||||
|
Map.of("version", "0.16.8"),
|
||||||
|
Map.of("version", "0.16.7"),
|
||||||
|
Map.of("version", "0.16.6"),
|
||||||
|
Map.of("version", "0.16.5"),
|
||||||
|
Map.of("version", "0.15.11"),
|
||||||
|
Map.of("version", "0.15.10"),
|
||||||
|
Map.of("version", "0.15.9")
|
||||||
|
);
|
||||||
|
case "forge" -> List.of(
|
||||||
|
Map.of("version", "1.21-51.0.0"),
|
||||||
|
Map.of("version", "1.20.4-49.0.0"),
|
||||||
|
Map.of("version", "1.20.1-47.1.0"),
|
||||||
|
Map.of("version", "1.19.2-43.2.0"),
|
||||||
|
Map.of("version", "1.18.2-40.2.0")
|
||||||
|
);
|
||||||
|
case "neoforge" -> List.of(
|
||||||
|
Map.of("version", "21.0.0-beta"),
|
||||||
|
Map.of("version", "1.21-21.0.0"),
|
||||||
|
Map.of("version", "1.20.4-21.0.0"),
|
||||||
|
Map.of("version", "1.20.1-21.0.0")
|
||||||
|
);
|
||||||
|
default -> List.of();
|
||||||
|
};
|
||||||
|
|
||||||
|
ctx.json(Map.of("success", true, "data", loaderVersions));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Установка ванильной сборки
|
||||||
|
app.post("/api/instances/vanilla/install", ctx -> {
|
||||||
|
Map<String, String> body = ctx.bodyAsClass(Map.class);
|
||||||
|
String mcVersion = body.get("mcVersion");
|
||||||
|
String loader = body.get("loader");
|
||||||
|
String loaderVersion = body.get("loaderVersion");
|
||||||
|
String instanceName = body.get("instanceName");
|
||||||
|
|
||||||
|
if (mcVersion == null || instanceName == null) {
|
||||||
|
ctx.status(400).json(Map.of("success", false, "error", "Missing required parameters"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: реализовать установку ванильной сборки
|
||||||
|
String desc = loader != null ? mcVersion + " + " + loader + " " + loaderVersion : mcVersion + " Vanilla";
|
||||||
|
ctx.json(Map.of("success", true, "message", "Vanilla installation started: " + desc));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Health check
|
||||||
|
app.get("/api/health", ctx -> {
|
||||||
|
ctx.json(Map.of("success", true, "status", "ok"));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void openBrowser(String url) {
|
||||||
|
try {
|
||||||
|
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
|
||||||
|
Desktop.getDesktop().browse(new URI(url));
|
||||||
|
System.out.println(ZAnsi.cyan("Браузер открыт: " + url));
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.out.println(ZAnsi.yellow("Не удалось открыть браузер автоматически. Откройте вручную: " + url));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void stop() {
|
||||||
|
running = false;
|
||||||
|
if (app != null) {
|
||||||
|
app.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== LAUNCHER AUTO-UPDATE ====================
|
||||||
|
public static void checkLauncherUpdate() {
|
||||||
|
try {
|
||||||
|
String json = ZHttpClient.getLauncherVersionInfo();
|
||||||
|
String serverVersion = extractVersion(json);
|
||||||
|
String currentVersion = me.sashegdev.zernmc.launcher.utils.Version.getCurrentVersion();
|
||||||
|
|
||||||
|
if (me.sashegdev.zernmc.launcher.utils.Version.isNewer(currentVersion, serverVersion)) {
|
||||||
|
System.out.println(ZAnsi.brightYellow("\nДоступна новая версия лаунчера! (" + serverVersion + ")"));
|
||||||
|
System.out.println(ZAnsi.cyan("Начинается автоматическое обновление...\n"));
|
||||||
|
performLauncherUpdate(serverVersion);
|
||||||
|
restartLauncher();
|
||||||
|
} else {
|
||||||
|
System.out.println(ZAnsi.brightGreen("Лаунчер актуален."));
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.out.println(ZAnsi.yellow("Не удалось проверить обновления лаунчера."));
|
||||||
|
System.out.println(ZAnsi.white("Ошибка: ") + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void performLauncherUpdate(String newVersion) throws Exception {
|
||||||
|
String downloadUrl = ZHttpClient.getBaseUrl() + "/launcher/download?type=jar";
|
||||||
|
Path currentJar = getCurrentJarPath();
|
||||||
|
Path tempJar = currentJar.getParent().resolve("zernmc-launcher-new.jar");
|
||||||
|
|
||||||
|
System.out.println(ZAnsi.cyan("Скачивание версии " + newVersion + "..."));
|
||||||
|
|
||||||
|
HttpClient client = HttpClient.newBuilder().build();
|
||||||
|
HttpRequest request = HttpRequest.newBuilder()
|
||||||
|
.uri(java.net.URI.create(downloadUrl))
|
||||||
|
.GET()
|
||||||
|
.build();
|
||||||
|
|
||||||
|
HttpResponse<Path> response = client.send(request, HttpResponse.BodyHandlers.ofFile(tempJar));
|
||||||
|
|
||||||
|
if (response.statusCode() != 200) {
|
||||||
|
throw new IOException("Сервер вернул код: " + response.statusCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
long size = Files.size(tempJar);
|
||||||
|
System.out.println(ZAnsi.brightGreen("Скачано успешно (" + (size / 1024) + " KB)"));
|
||||||
|
|
||||||
|
Files.move(tempJar, currentJar, StandardCopyOption.REPLACE_EXISTING);
|
||||||
|
System.out.println(ZAnsi.brightGreen("Обновление успешно установлено!"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void restartLauncher() {
|
||||||
|
try {
|
||||||
|
String javaPath = System.getProperty("java.home") + "/bin/java";
|
||||||
|
String jarPath = getCurrentJarPath().toAbsolutePath().toString();
|
||||||
|
|
||||||
|
System.out.println(ZAnsi.brightGreen("Перезапуск лаунчера с новой версией..."));
|
||||||
|
|
||||||
|
new ProcessBuilder(javaPath, "-jar", jarPath)
|
||||||
|
.inheritIO()
|
||||||
|
.start();
|
||||||
|
|
||||||
|
System.exit(0);
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.err.println(ZAnsi.brightRed("Не удалось перезапустить лаунчер."));
|
||||||
|
System.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String extractVersion(String json) {
|
||||||
|
try {
|
||||||
|
return json.replaceAll(".*\"version\"\\s*:\\s*\"([^\"]+)\".*", "$1");
|
||||||
|
} catch (Exception e) {
|
||||||
|
return "unknown";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Path getCurrentJarPath() {
|
||||||
|
try {
|
||||||
|
return Path.of(me.sashegdev.zernmc.launcher.Main.class.getProtectionDomain()
|
||||||
|
.getCodeSource()
|
||||||
|
.getLocation()
|
||||||
|
.toURI());
|
||||||
|
} catch (Exception e) {
|
||||||
|
return Path.of("zernmc-launcher.jar");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
JAVA_HOME="$SCRIPT_DIR/jre21"
|
||||||
|
JAVA="$JAVA_HOME/bin/java"
|
||||||
|
|
||||||
|
JAVAFX_PATH="$SCRIPT_DIR/lib-javafx"
|
||||||
|
|
||||||
|
exec "$JAVA" \
|
||||||
|
--module-path="$JAVAFX_PATH" \
|
||||||
|
--add-modules=javafx.controls,javafx.web \
|
||||||
|
--add-reads=javafx.graphics=ALL-UNNAMED \
|
||||||
|
-jar "$SCRIPT_DIR/ZernMCLauncher.jar" "$@"
|
||||||
@@ -0,0 +1,825 @@
|
|||||||
|
:root {
|
||||||
|
--bg-primary: #0a0a0f;
|
||||||
|
--bg-secondary: #12121a;
|
||||||
|
--bg-card: #1a1a24;
|
||||||
|
--bg-card-hover: #222230;
|
||||||
|
--bg-sidebar: #0d0d12;
|
||||||
|
--accent-primary: #e94560;
|
||||||
|
--accent-secondary: #ff6b6b;
|
||||||
|
--accent-glow: rgba(233, 69, 96, 0.3);
|
||||||
|
--text-primary: #ffffff;
|
||||||
|
--text-secondary: #a0a0b0;
|
||||||
|
--text-muted: #606070;
|
||||||
|
--border-color: #2a2a3a;
|
||||||
|
--success: #4ade80;
|
||||||
|
--error: #f87171;
|
||||||
|
--warning: #fbbf24;
|
||||||
|
--shadow-card: 0 4px 20px rgba(0, 0, 0, 0.4);
|
||||||
|
--shadow-glow: 0 0 30px var(--accent-glow);
|
||||||
|
--radius-sm: 8px;
|
||||||
|
--radius-md: 12px;
|
||||||
|
--radius-lg: 16px;
|
||||||
|
--transition-fast: 150ms ease;
|
||||||
|
--transition-normal: 300ms ease;
|
||||||
|
--transition-slow: 500ms ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
* {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
|
||||||
|
background: var(--bg-primary);
|
||||||
|
color: var(--text-primary);
|
||||||
|
min-height: 100vh;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
#grid-canvas {
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
z-index: 0;
|
||||||
|
opacity: 0.12;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
.screen {
|
||||||
|
min-height: 100vh;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 20px;
|
||||||
|
animation: fadeIn var(--transition-slow) forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hidden {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==================== LOGIN SCREEN ==================== */
|
||||||
|
.login-container {
|
||||||
|
background: var(--bg-card);
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
padding: 48px;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 400px;
|
||||||
|
box-shadow: var(--shadow-card);
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
animation: slideUp var(--transition-slow) forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo-section {
|
||||||
|
text-align: center;
|
||||||
|
margin-bottom: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo-placeholder {
|
||||||
|
display: inline-block;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
animation: pulse 2s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes pulse {
|
||||||
|
0%, 100% { transform: scale(1); }
|
||||||
|
50% { transform: scale(1.05); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.app-title {
|
||||||
|
font-size: 28px;
|
||||||
|
font-weight: 700;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
background: linear-gradient(135deg, var(--text-primary), var(--accent-primary));
|
||||||
|
-webkit-background-clip: text;
|
||||||
|
-webkit-text-fill-color: transparent;
|
||||||
|
background-clip: text;
|
||||||
|
}
|
||||||
|
|
||||||
|
.app-version {
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-form {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-group input {
|
||||||
|
width: 100%;
|
||||||
|
padding: 14px 16px;
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-size: 16px;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-group input:focus {
|
||||||
|
outline: none;
|
||||||
|
border-color: var(--accent-primary);
|
||||||
|
box-shadow: 0 0 0 3px var(--accent-glow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-group input::placeholder {
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary {
|
||||||
|
width: 100%;
|
||||||
|
padding: 14px 24px;
|
||||||
|
background: linear-gradient(135deg, var(--accent-primary), var(--accent-secondary));
|
||||||
|
border: none;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
color: white;
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary:hover {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
box-shadow: var(--shadow-glow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary:active {
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary:disabled {
|
||||||
|
opacity: 0.7;
|
||||||
|
cursor: not-allowed;
|
||||||
|
transform: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-loader {
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
border: 2px solid rgba(255, 255, 255, 0.3);
|
||||||
|
border-top-color: white;
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: spin 0.8s linear infinite;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
to { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-message {
|
||||||
|
color: var(--error);
|
||||||
|
text-align: center;
|
||||||
|
font-size: 14px;
|
||||||
|
padding: 12px;
|
||||||
|
background: rgba(248, 113, 113, 0.1);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
animation: shake 0.5s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes shake {
|
||||||
|
0%, 100% { transform: translateX(0); }
|
||||||
|
25% { transform: translateX(-5px); }
|
||||||
|
75% { transform: translateX(5px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==================== MAIN LAYOUT ==================== */
|
||||||
|
.main-layout {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 280px 1fr 200px;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 1600px;
|
||||||
|
height: calc(100vh - 40px);
|
||||||
|
gap: 0;
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
overflow: hidden;
|
||||||
|
animation: fadeIn var(--transition-slow) forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Sidebar */
|
||||||
|
.sidebar {
|
||||||
|
background: var(--bg-sidebar);
|
||||||
|
border-right: 1px solid var(--border-color);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
padding-bottom: 20px;
|
||||||
|
border-bottom: 1px solid var(--border-color);
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo-small svg {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-title {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-version {
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-content {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-label {
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 600;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 1px;
|
||||||
|
color: var(--text-muted);
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.current-instance-section {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.current-instance {
|
||||||
|
background: var(--bg-card);
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
padding: 16px;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.current-instance:hover {
|
||||||
|
border-color: var(--accent-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.instance-card-mini {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.instance-name {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.instance-version {
|
||||||
|
font-size: 13px;
|
||||||
|
color: var(--accent-primary);
|
||||||
|
background: rgba(233, 69, 96, 0.15);
|
||||||
|
padding: 4px 8px;
|
||||||
|
border-radius: 4px;
|
||||||
|
display: inline-block;
|
||||||
|
width: fit-content;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-download {
|
||||||
|
width: 100%;
|
||||||
|
padding: 16px;
|
||||||
|
background: var(--bg-card);
|
||||||
|
border: 1px dashed var(--border-color);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 10px;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-download:hover {
|
||||||
|
background: var(--bg-card-hover);
|
||||||
|
border-color: var(--accent-primary);
|
||||||
|
color: var(--accent-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-footer {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding-top: 16px;
|
||||||
|
border-top: 1px solid var(--border-color);
|
||||||
|
margin-top: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.username-display {
|
||||||
|
font-size: 13px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-logout {
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
background: var(--bg-card);
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
color: var(--text-secondary);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-logout:hover {
|
||||||
|
background: rgba(248, 113, 113, 0.1);
|
||||||
|
border-color: var(--error);
|
||||||
|
color: var(--error);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Main Content - Logs */
|
||||||
|
.main-content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding: 20px;
|
||||||
|
background: var(--bg-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.logs-section {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
background: var(--bg-card);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logs-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
padding: 16px 20px;
|
||||||
|
border-bottom: 1px solid var(--border-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.logs-header h2 {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-clear-logs {
|
||||||
|
padding: 6px 12px;
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-size: 12px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-clear-logs:hover {
|
||||||
|
background: var(--bg-card-hover);
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.logs-container {
|
||||||
|
flex: 1;
|
||||||
|
padding: 16px 20px;
|
||||||
|
overflow-y: auto;
|
||||||
|
font-family: 'JetBrains Mono', 'Consolas', monospace;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.log-entry {
|
||||||
|
padding: 4px 0;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
animation: fadeIn var(--transition-fast) forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.log-entry.info {
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.log-entry.success {
|
||||||
|
color: var(--success);
|
||||||
|
}
|
||||||
|
|
||||||
|
.log-entry.warning {
|
||||||
|
color: var(--warning);
|
||||||
|
}
|
||||||
|
|
||||||
|
.log-entry.error {
|
||||||
|
color: var(--error);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Right Panel - Play Button */
|
||||||
|
.right-panel {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-end;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 30px;
|
||||||
|
border-left: 1px solid var(--border-color);
|
||||||
|
background: var(--bg-sidebar);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-play {
|
||||||
|
width: 100%;
|
||||||
|
padding: 20px 30px;
|
||||||
|
background: linear-gradient(135deg, var(--accent-primary), var(--accent-secondary));
|
||||||
|
border: none;
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
color: white;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 700;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 12px;
|
||||||
|
transition: var(--transition-normal);
|
||||||
|
box-shadow: 0 4px 20px var(--accent-glow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-play:hover {
|
||||||
|
transform: translateY(-4px) scale(1.02);
|
||||||
|
box-shadow: 0 8px 40px var(--accent-glow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-play:active {
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-play:disabled {
|
||||||
|
opacity: 0.5;
|
||||||
|
cursor: not-allowed;
|
||||||
|
transform: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-update {
|
||||||
|
width: 100%;
|
||||||
|
padding: 20px 30px;
|
||||||
|
background: linear-gradient(135deg, var(--warning), #f59e0b);
|
||||||
|
border: none;
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
color: #1a1a24;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 700;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 12px;
|
||||||
|
transition: var(--transition-normal);
|
||||||
|
box-shadow: 0 4px 20px rgba(251, 191, 36, 0.4);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-update:hover {
|
||||||
|
transform: translateY(-4px) scale(1.02);
|
||||||
|
box-shadow: 0 8px 40px rgba(251, 191, 36, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-update:active {
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-update:disabled {
|
||||||
|
opacity: 0.5;
|
||||||
|
cursor: not-allowed;
|
||||||
|
transform: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==================== MODAL ==================== */
|
||||||
|
.modal {
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background: rgba(10, 10, 15, 0.9);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
z-index: 1000;
|
||||||
|
animation: fadeIn var(--transition-fast) forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-content {
|
||||||
|
background: var(--bg-card);
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
width: 90%;
|
||||||
|
max-width: 500px;
|
||||||
|
max-height: 80vh;
|
||||||
|
overflow-y: auto;
|
||||||
|
animation: slideUp var(--transition-normal) forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
padding: 20px 24px;
|
||||||
|
border-bottom: 1px solid var(--border-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-header h2 {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-close {
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-size: 24px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-close:hover {
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-tabs {
|
||||||
|
display: flex;
|
||||||
|
padding: 16px 24px;
|
||||||
|
gap: 8px;
|
||||||
|
border-bottom: 1px solid var(--border-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab-btn {
|
||||||
|
flex: 1;
|
||||||
|
padding: 12px;
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 14px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab-btn.active {
|
||||||
|
background: var(--accent-primary);
|
||||||
|
border-color: var(--accent-primary);
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab-btn:hover:not(.active) {
|
||||||
|
background: var(--bg-card-hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab-content {
|
||||||
|
padding: 24px;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab-content.active {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group label {
|
||||||
|
display: block;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.select-input, .text-input {
|
||||||
|
width: 100%;
|
||||||
|
padding: 12px 14px;
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-size: 14px;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.select-input:focus, .text-input:focus {
|
||||||
|
outline: none;
|
||||||
|
border-color: var(--accent-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.select-input option {
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-install {
|
||||||
|
width: 100%;
|
||||||
|
padding: 14px;
|
||||||
|
background: linear-gradient(135deg, var(--accent-primary), var(--accent-secondary));
|
||||||
|
border: none;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
color: white;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 600;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: var(--transition-fast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-install:hover {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
box-shadow: var(--shadow-glow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.download-progress {
|
||||||
|
padding: 24px;
|
||||||
|
border-top: 1px solid var(--border-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-bar {
|
||||||
|
height: 8px;
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border-radius: 4px;
|
||||||
|
overflow: hidden;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-fill {
|
||||||
|
height: 100%;
|
||||||
|
background: linear-gradient(90deg, var(--accent-primary), var(--accent-secondary));
|
||||||
|
border-radius: 4px;
|
||||||
|
width: 0%;
|
||||||
|
transition: width var(--transition-normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-text {
|
||||||
|
text-align: center;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-label {
|
||||||
|
margin-bottom: 8px;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-file {
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--text-muted);
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-fill.animated {
|
||||||
|
background: linear-gradient(90deg, var(--accent-primary), var(--accent-secondary), var(--accent-primary));
|
||||||
|
background-size: 200% 100%;
|
||||||
|
animation: progressShimmer 1.5s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes progressShimmer {
|
||||||
|
0% { background-position: 200% 0; }
|
||||||
|
100% { background-position: -200% 0; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==================== LOADING ==================== */
|
||||||
|
.loading-overlay {
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background: rgba(10, 10, 15, 0.9);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
z-index: 1000;
|
||||||
|
animation: fadeIn var(--transition-fast) forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loader {
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
|
border: 3px solid var(--border-color);
|
||||||
|
border-top-color: var(--accent-primary);
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: spin 1s linear infinite;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==================== ANIMATIONS ==================== */
|
||||||
|
@keyframes fadeIn {
|
||||||
|
from { opacity: 0; }
|
||||||
|
to { opacity: 1; }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes slideUp {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(30px);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes cardFadeIn {
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==================== RESPONSIVE ==================== */
|
||||||
|
@media (max-width: 1024px) {
|
||||||
|
.main-layout {
|
||||||
|
grid-template-columns: 240px 1fr 160px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.main-layout {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
grid-template-rows: auto 1fr auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar {
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 12px 16px;
|
||||||
|
border-right: none;
|
||||||
|
border-bottom: 1px solid var(--border-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-header {
|
||||||
|
padding-bottom: 0;
|
||||||
|
border-bottom: none;
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-content {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-footer {
|
||||||
|
margin-top: 0;
|
||||||
|
padding-top: 0;
|
||||||
|
border-top: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.right-panel {
|
||||||
|
padding: 16px;
|
||||||
|
border-left: none;
|
||||||
|
border-top: 1px solid var(--border-color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==================== SCROLLBAR ==================== */
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-track {
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-thumb {
|
||||||
|
background: var(--border-color);
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-thumb:hover {
|
||||||
|
background: var(--text-muted);
|
||||||
|
}
|
||||||
@@ -0,0 +1,204 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="ru">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>ZernMC Launcher</title>
|
||||||
|
<link rel="stylesheet" href="/css/styles.css">
|
||||||
|
<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=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<canvas id="grid-canvas"></canvas>
|
||||||
|
|
||||||
|
<div id="app">
|
||||||
|
<!-- Login Screen -->
|
||||||
|
<div id="login-screen" class="screen hidden">
|
||||||
|
<div class="login-container">
|
||||||
|
<div class="logo-section">
|
||||||
|
<div class="logo-placeholder">
|
||||||
|
<svg width="80" height="80" viewBox="0 0 80 80" fill="none">
|
||||||
|
<rect width="80" height="80" rx="20" fill="#e94560"/>
|
||||||
|
<path d="M25 40 L40 25 L55 40 L40 55 Z" fill="white"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<h1 class="app-title">ZernMC Launcher</h1>
|
||||||
|
<p class="app-version">v<span id="version">1.0.8</span></p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form id="login-form" class="login-form">
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="text" id="username" name="username" placeholder="Имя пользователя" required autocomplete="username">
|
||||||
|
</div>
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="password" id="password" name="password" placeholder="Пароль" required autocomplete="current-password">
|
||||||
|
</div>
|
||||||
|
<button type="submit" class="btn-primary">
|
||||||
|
<span class="btn-text">Войти</span>
|
||||||
|
<div class="btn-loader hidden"></div>
|
||||||
|
</button>
|
||||||
|
<p id="login-error" class="error-message hidden"></p>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Main Screen -->
|
||||||
|
<div id="main-screen" class="screen hidden">
|
||||||
|
<div class="main-layout">
|
||||||
|
<!-- Left Sidebar -->
|
||||||
|
<aside class="sidebar">
|
||||||
|
<div class="sidebar-header">
|
||||||
|
<div class="logo-small">
|
||||||
|
<svg width="40" height="40" viewBox="0 0 40 40" fill="none">
|
||||||
|
<rect width="40" height="40" rx="10" fill="#e94560"/>
|
||||||
|
<path d="M12 20 L20 12 L28 20 L20 28 Z" fill="white"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<div class="header-info">
|
||||||
|
<h1 class="header-title">ZernMC</h1>
|
||||||
|
<span class="header-version">v<span id="header-version">1.0.8</span></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="sidebar-content">
|
||||||
|
<!-- Current Instance -->
|
||||||
|
<div class="current-instance-section">
|
||||||
|
<h3 class="section-label">Текущая сборка</h3>
|
||||||
|
<div id="current-instance" class="current-instance">
|
||||||
|
<div class="instance-card-mini">
|
||||||
|
<span class="instance-name">Загрузка...</span>
|
||||||
|
<span class="instance-version">-</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Download Button -->
|
||||||
|
<button id="download-btn" class="btn-download">
|
||||||
|
<svg width="20" height="20" 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>
|
||||||
|
Скачать сборку
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="sidebar-footer">
|
||||||
|
<span class="username-display" id="username-display"></span>
|
||||||
|
<button class="btn-logout" id="logout-btn" title="Выйти">
|
||||||
|
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<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>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
|
||||||
|
<!-- Main Content -->
|
||||||
|
<main class="main-content">
|
||||||
|
<div class="logs-section">
|
||||||
|
<div class="logs-header">
|
||||||
|
<h2>Логи</h2>
|
||||||
|
<button class="btn-clear-logs" id="clear-logs">Очистить</button>
|
||||||
|
</div>
|
||||||
|
<div id="logs-container" class="logs-container">
|
||||||
|
<div class="log-entry info">Ожидание запуска...</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<!-- Right Panel - Play Button -->
|
||||||
|
<div class="right-panel">
|
||||||
|
<button id="play-btn" class="btn-play">
|
||||||
|
<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
|
||||||
|
<polygon points="5 3 19 12 5 21 5 3"/>
|
||||||
|
</svg>
|
||||||
|
ИГРАТЬ
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Download Modal -->
|
||||||
|
<div id="download-modal" class="modal hidden">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<h2>Скачать сборку</h2>
|
||||||
|
<button class="modal-close" id="close-download-modal">×</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-tabs">
|
||||||
|
<button class="tab-btn active" data-tab="zernmc">ZernMC сборки</button>
|
||||||
|
<button class="tab-btn" data-tab="vanilla">Чистый Minecraft</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- ZernMC Tab -->
|
||||||
|
<div id="tab-zernmc" class="tab-content active">
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Выберите сборку</label>
|
||||||
|
<select id="zernmc-pack-select" class="select-input">
|
||||||
|
<option value="">Загрузка...</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Название сборки (системное)</label>
|
||||||
|
<input type="text" id="zernmc-instance-name" class="text-input" placeholder="my-zernmc-pack">
|
||||||
|
</div>
|
||||||
|
<button id="install-zernmc-btn" class="btn-install">
|
||||||
|
Скачать и установить
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Vanilla Tab -->
|
||||||
|
<div id="tab-vanilla" class="tab-content">
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Версия Minecraft</label>
|
||||||
|
<select id="mc-version-select" class="select-input">
|
||||||
|
<option value="">Выберите версию</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Лоадер</label>
|
||||||
|
<select id="loader-select" class="select-input">
|
||||||
|
<option value="vanilla">Vanilla (без лоадера)</option>
|
||||||
|
<option value="fabric">Fabric</option>
|
||||||
|
<option value="forge">Forge</option>
|
||||||
|
<option value="neoforge">NeoForge</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div id="loader-version-group" class="form-group hidden">
|
||||||
|
<label>Версия лоадера</label>
|
||||||
|
<select id="loader-version-select" class="select-input">
|
||||||
|
<option value="">Загрузка...</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Название сборки</label>
|
||||||
|
<input type="text" id="vanilla-instance-name" class="text-input" placeholder="my-minecraft">
|
||||||
|
</div>
|
||||||
|
<button id="install-vanilla-btn" class="btn-install">
|
||||||
|
Скачать и установить
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="download-progress" class="download-progress hidden">
|
||||||
|
<div class="progress-bar">
|
||||||
|
<div class="progress-fill" id="progress-fill"></div>
|
||||||
|
</div>
|
||||||
|
<p class="progress-text" id="progress-text">Загрузка...</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Loading Overlay -->
|
||||||
|
<div id="loading-overlay" class="loading-overlay hidden">
|
||||||
|
<div class="loader"></div>
|
||||||
|
<p>Загрузка...</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script src="/js/app.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,638 @@
|
|||||||
|
const API_BASE = '/api';
|
||||||
|
|
||||||
|
class App {
|
||||||
|
constructor() {
|
||||||
|
this.state = 'INIT';
|
||||||
|
this.username = null;
|
||||||
|
this.currentInstance = null;
|
||||||
|
this.instances = [];
|
||||||
|
this.zernmcPacks = [];
|
||||||
|
this.mcVersions = [];
|
||||||
|
this.hasUpdate = false;
|
||||||
|
this.hasMismatches = false;
|
||||||
|
this.isServerPack = false;
|
||||||
|
this.init();
|
||||||
|
}
|
||||||
|
|
||||||
|
async init() {
|
||||||
|
this.bindEvents();
|
||||||
|
this.initGridAnimation();
|
||||||
|
await this.checkAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
bindEvents() {
|
||||||
|
// Login form
|
||||||
|
document.getElementById('login-form').addEventListener('submit', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
this.handleLogin();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Logout button
|
||||||
|
document.getElementById('logout-btn').addEventListener('click', () => {
|
||||||
|
this.handleLogout();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Download button
|
||||||
|
document.getElementById('download-btn').addEventListener('click', () => {
|
||||||
|
this.showDownloadModal();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Close modal
|
||||||
|
document.getElementById('close-download-modal').addEventListener('click', () => {
|
||||||
|
this.hideDownloadModal();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Modal tabs
|
||||||
|
document.querySelectorAll('.tab-btn').forEach(btn => {
|
||||||
|
btn.addEventListener('click', (e) => {
|
||||||
|
this.switchTab(e.target.dataset.tab);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Play button
|
||||||
|
document.getElementById('play-btn').addEventListener('click', () => {
|
||||||
|
this.launchInstance();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Clear logs
|
||||||
|
document.getElementById('clear-logs').addEventListener('click', () => {
|
||||||
|
this.clearLogs();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Loader selection
|
||||||
|
document.getElementById('loader-select').addEventListener('change', (e) => {
|
||||||
|
this.onLoaderChange(e.target.value);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Install buttons
|
||||||
|
document.getElementById('install-zernmc-btn').addEventListener('click', () => {
|
||||||
|
this.installZernMCPack();
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getElementById('install-vanilla-btn').addEventListener('click', () => {
|
||||||
|
this.installVanilla();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== GRID ANIMATION ====================
|
||||||
|
initGridAnimation() {
|
||||||
|
const canvas = document.getElementById('grid-canvas');
|
||||||
|
const ctx = canvas.getContext('2d');
|
||||||
|
let mouseX = 0, mouseY = 0;
|
||||||
|
let offsetX = 0, offsetY = 0;
|
||||||
|
|
||||||
|
const resize = () => {
|
||||||
|
canvas.width = window.innerWidth;
|
||||||
|
canvas.height = window.innerHeight;
|
||||||
|
this.drawGrid(ctx, canvas.width, canvas.height, offsetX, offsetY);
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener('resize', resize);
|
||||||
|
|
||||||
|
window.addEventListener('mousemove', (e) => {
|
||||||
|
mouseX = (e.clientX / window.innerWidth - 0.5) * 2;
|
||||||
|
mouseY = (e.clientY / window.innerHeight - 0.5) * 2;
|
||||||
|
});
|
||||||
|
|
||||||
|
const animate = () => {
|
||||||
|
offsetX += (mouseX * 0.5 - offsetX) * 0.05;
|
||||||
|
offsetY += (mouseY * 0.5 - offsetY) * 0.05;
|
||||||
|
|
||||||
|
ctx.clearRect(0, 0, canvas.width, canvas.height);
|
||||||
|
this.drawGrid(ctx, canvas.width, canvas.height, offsetX, offsetY);
|
||||||
|
requestAnimationFrame(animate);
|
||||||
|
};
|
||||||
|
|
||||||
|
resize();
|
||||||
|
animate();
|
||||||
|
}
|
||||||
|
|
||||||
|
drawGrid(ctx, width, height, offsetX, offsetY) {
|
||||||
|
const gridSize = 50;
|
||||||
|
const dotSize = 1;
|
||||||
|
|
||||||
|
ctx.fillStyle = '#e94560';
|
||||||
|
|
||||||
|
for (let x = 0; x <= width; x += gridSize) {
|
||||||
|
for (let y = 0; y <= height; y += gridSize) {
|
||||||
|
const px = x + offsetX * 10;
|
||||||
|
const py = y + offsetY * 10;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.arc(px, py, dotSize, 0, Math.PI * 2);
|
||||||
|
ctx.fill();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== API ====================
|
||||||
|
async request(endpoint, options = {}) {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE}${endpoint}`, {
|
||||||
|
...options,
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
...options.headers
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return await response.json();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('API Error:', error);
|
||||||
|
return { success: false, error: error.message };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== AUTH ====================
|
||||||
|
async checkAuth() {
|
||||||
|
this.showLoading(true);
|
||||||
|
const result = await this.request('/auth/status');
|
||||||
|
|
||||||
|
if (result.loggedIn) {
|
||||||
|
this.username = result.username;
|
||||||
|
this.showMainScreen();
|
||||||
|
await this.loadCurrentInstance();
|
||||||
|
} else {
|
||||||
|
this.showLoginScreen();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.showLoading(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
async handleLogin() {
|
||||||
|
const username = document.getElementById('username').value;
|
||||||
|
const password = document.getElementById('password').value;
|
||||||
|
const errorEl = document.getElementById('login-error');
|
||||||
|
const btn = document.querySelector('#login-form button[type="submit"]');
|
||||||
|
const btnText = btn.querySelector('.btn-text');
|
||||||
|
const btnLoader = btn.querySelector('.btn-loader');
|
||||||
|
|
||||||
|
if (!username || !password) {
|
||||||
|
this.showError('Введите имя пользователя и пароль');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
btn.disabled = true;
|
||||||
|
btnText.classList.add('hidden');
|
||||||
|
btnLoader.classList.remove('hidden');
|
||||||
|
errorEl.classList.add('hidden');
|
||||||
|
|
||||||
|
const result = await this.request('/auth/login', {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify({ username, password })
|
||||||
|
});
|
||||||
|
|
||||||
|
btn.disabled = false;
|
||||||
|
btnText.classList.remove('hidden');
|
||||||
|
btnLoader.classList.add('hidden');
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
this.username = result.username;
|
||||||
|
this.showMainScreen();
|
||||||
|
await this.loadCurrentInstance();
|
||||||
|
} else {
|
||||||
|
this.showError(result.error || 'Ошибка входа');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async handleLogout() {
|
||||||
|
await this.request('/auth/logout', { method: 'POST' });
|
||||||
|
this.username = null;
|
||||||
|
this.currentInstance = null;
|
||||||
|
this.showLoginScreen();
|
||||||
|
}
|
||||||
|
|
||||||
|
showError(message) {
|
||||||
|
const errorEl = document.getElementById('login-error');
|
||||||
|
errorEl.textContent = message;
|
||||||
|
errorEl.classList.remove('hidden');
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== INSTANCES ====================
|
||||||
|
async loadCurrentInstance() {
|
||||||
|
const result = await this.request('/instances');
|
||||||
|
|
||||||
|
if (result.success && result.data && result.data.length > 0) {
|
||||||
|
this.currentInstance = result.data[0];
|
||||||
|
this.renderCurrentInstance(this.currentInstance);
|
||||||
|
|
||||||
|
this.isServerPack = this.currentInstance.isServerPack || false;
|
||||||
|
|
||||||
|
if (this.isServerPack) {
|
||||||
|
this.addLog('Проверка целостности файлов...', 'info');
|
||||||
|
|
||||||
|
const verifyResult = await this.request(`/instances/${this.currentInstance.name}/verify`);
|
||||||
|
if (verifyResult.success && verifyResult.data) {
|
||||||
|
this.hasMismatches = verifyResult.data.hasMismatches;
|
||||||
|
if (this.hasMismatches) {
|
||||||
|
this.addLog('Обнаружены изменённые файлы!', 'warning');
|
||||||
|
} else {
|
||||||
|
this.addLog('Файлы целы', 'success');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const updateResult = await this.request(`/instances/${this.currentInstance.name}/updates`);
|
||||||
|
if (updateResult.success && updateResult.data) {
|
||||||
|
this.hasUpdate = updateResult.data.hasUpdate;
|
||||||
|
if (this.hasUpdate) {
|
||||||
|
this.addLog('Доступно обновление: v' + updateResult.data.currentVersion + ' → v' + updateResult.data.latestVersion, 'warning');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.updatePlayButton();
|
||||||
|
this.addLog('Сборка загружена: ' + this.currentInstance.name, 'success');
|
||||||
|
} else {
|
||||||
|
this.renderNoInstance();
|
||||||
|
this.enablePlayButton(false);
|
||||||
|
this.addLog('Установите сборку для игры', 'warning');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
updatePlayButton() {
|
||||||
|
const btn = document.getElementById('play-btn');
|
||||||
|
if (!this.currentInstance) {
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.className = 'btn-play';
|
||||||
|
btn.innerHTML = '<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor"><polygon points="5 3 19 12 5 21 5 3"/></svg>ИГРАТЬ';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.hasUpdate || this.hasMismatches) {
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.className = 'btn-update';
|
||||||
|
btn.innerHTML = '<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor"><path d="M17.65 6.35A7.958 7.958 0 0012 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08A5.99 5.99 0 0112 18c-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/></svg>ОБНОВИТЬ';
|
||||||
|
} else {
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.className = 'btn-play';
|
||||||
|
btn.innerHTML = '<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor"><polygon points="5 3 19 12 5 21 5 3"/></svg>ИГРАТЬ';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
renderCurrentInstance(instance) {
|
||||||
|
const container = document.getElementById('current-instance');
|
||||||
|
container.innerHTML = `
|
||||||
|
<div class="instance-card-mini">
|
||||||
|
<span class="instance-name">${this.escapeHtml(instance.name)}</span>
|
||||||
|
<span class="instance-version">${this.escapeHtml(instance.version || 'Vanilla')}</span>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
renderNoInstance() {
|
||||||
|
const container = document.getElementById('current-instance');
|
||||||
|
container.innerHTML = `
|
||||||
|
<div class="instance-card-mini">
|
||||||
|
<span class="instance-name" style="color: var(--text-muted)">Нет сборки</span>
|
||||||
|
<span class="instance-version" style="background: var(--bg-secondary)">Нажмите скачать</span>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
enablePlayButton(enabled) {
|
||||||
|
const btn = document.getElementById('play-btn');
|
||||||
|
btn.disabled = !enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
async launchInstance() {
|
||||||
|
if (!this.currentInstance) return;
|
||||||
|
|
||||||
|
if (this.hasUpdate || this.hasMismatches) {
|
||||||
|
await this.updateInstance();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.addLog('Проверка целостности файлов...', 'info');
|
||||||
|
this.enablePlayButton(false);
|
||||||
|
|
||||||
|
const result = await this.request(`/instances/${this.currentInstance.name}/launch`, {
|
||||||
|
method: 'POST'
|
||||||
|
});
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
this.addLog('Сборка запущена!', 'success');
|
||||||
|
} else {
|
||||||
|
this.addLog('Ошибка: ' + result.error, 'error');
|
||||||
|
this.enablePlayButton(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateInstance() {
|
||||||
|
if (!this.currentInstance || !this.isServerPack) return;
|
||||||
|
|
||||||
|
const packName = this.currentInstance.serverPackName;
|
||||||
|
if (!packName) {
|
||||||
|
this.addLog('Ошибка: неизвестная сборка', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.addLog('Обновление сборки...', 'info');
|
||||||
|
this.enablePlayButton(false);
|
||||||
|
|
||||||
|
const progressContainer = this.showAnimatedProgress('Обновление сборки...');
|
||||||
|
|
||||||
|
let eventSource = null;
|
||||||
|
let progressData = { totalFiles: 0, downloadedFiles: 0 };
|
||||||
|
|
||||||
|
try {
|
||||||
|
eventSource = new EventSource(`/api/instances/${this.currentInstance.name}/install/stream`);
|
||||||
|
eventSource.onmessage = (e) => {
|
||||||
|
try {
|
||||||
|
const data = JSON.parse(e.data);
|
||||||
|
if (data.phase === 'starting') {
|
||||||
|
progressData.totalFiles = data.totalFiles || 0;
|
||||||
|
this.updateAnimatedProgress(progressContainer, `Загрузка: 0/${progressData.totalFiles} файлов`, 5);
|
||||||
|
} else if (data.phase === 'downloading') {
|
||||||
|
progressData.downloadedFiles = data.downloadedFiles || 0;
|
||||||
|
const total = data.totalFiles || progressData.totalFiles || 1;
|
||||||
|
const percent = Math.round((progressData.downloadedFiles / total) * 100);
|
||||||
|
const fileName = data.currentFile ? data.currentFile.split('/').pop() : '';
|
||||||
|
const filePercent = data.filePercent || 0;
|
||||||
|
this.updateAnimatedProgress(progressContainer,
|
||||||
|
`Файл ${progressData.downloadedFiles}/${total} (${percent}%)`,
|
||||||
|
percent,
|
||||||
|
fileName,
|
||||||
|
filePercent
|
||||||
|
);
|
||||||
|
} else if (data.phase === 'complete') {
|
||||||
|
this.updateAnimatedProgress(progressContainer, 'Готово!', 100);
|
||||||
|
} else if (data.phase === 'error') {
|
||||||
|
this.addLog('Ошибка: ' + (data.message || 'неизвестная ошибка'), 'error');
|
||||||
|
}
|
||||||
|
} catch (err) {}
|
||||||
|
};
|
||||||
|
} catch (e) {
|
||||||
|
console.log('SSE not available, using fallback progress');
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await this.request('/instances/zernmc/install', {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify({
|
||||||
|
packName: packName,
|
||||||
|
instanceName: this.currentInstance.name
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
if (eventSource) {
|
||||||
|
eventSource.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.hideProgress();
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
this.addLog('Сборка обновлена!', 'success');
|
||||||
|
|
||||||
|
this.addLog('Проверка после обновления...', 'info');
|
||||||
|
const verifyResult = await this.request(`/instances/${this.currentInstance.name}/verify`);
|
||||||
|
if (verifyResult.success && verifyResult.data) {
|
||||||
|
this.hasMismatches = verifyResult.data.hasMismatches;
|
||||||
|
}
|
||||||
|
|
||||||
|
const updateResult = await this.request(`/instances/${this.currentInstance.name}/updates`);
|
||||||
|
if (updateResult.success && updateResult.data) {
|
||||||
|
this.hasUpdate = updateResult.data.hasUpdate;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.updatePlayButton();
|
||||||
|
|
||||||
|
if (!this.hasUpdate && !this.hasMismatches) {
|
||||||
|
this.addLog('Готово к игре!', 'success');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.addLog('Ошибка обновления: ' + result.error, 'error');
|
||||||
|
this.updatePlayButton();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
showAnimatedProgress(text) {
|
||||||
|
const progress = document.getElementById('download-progress');
|
||||||
|
const progressText = document.getElementById('progress-text');
|
||||||
|
const progressFill = document.getElementById('progress-fill');
|
||||||
|
|
||||||
|
progress.classList.remove('hidden');
|
||||||
|
progressText.innerHTML = `<div class="progress-label">${text}</div>
|
||||||
|
<div class="progress-file"></div>`;
|
||||||
|
progressFill.style.width = '5%';
|
||||||
|
progressFill.classList.add('animated');
|
||||||
|
|
||||||
|
return { container: progress, text: progressText, fill: progressFill };
|
||||||
|
}
|
||||||
|
|
||||||
|
updateAnimatedProgress(progressContainer, text, percent, fileName = '', filePercent = 0) {
|
||||||
|
const { text: progressText, fill: progressFill } = progressContainer;
|
||||||
|
if (fileName) {
|
||||||
|
progressText.innerHTML = `<div class="progress-label">${text}</div>
|
||||||
|
<div class="progress-file">${fileName} (${filePercent}%)</div>`;
|
||||||
|
} else {
|
||||||
|
progressText.innerHTML = `<div class="progress-label">${text}</div>`;
|
||||||
|
}
|
||||||
|
progressFill.style.width = percent + '%';
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== DOWNLOAD MODAL ====================
|
||||||
|
async showDownloadModal() {
|
||||||
|
document.getElementById('download-modal').classList.remove('hidden');
|
||||||
|
await this.loadZernMCPacks();
|
||||||
|
await this.loadMCVersions();
|
||||||
|
}
|
||||||
|
|
||||||
|
hideDownloadModal() {
|
||||||
|
document.getElementById('download-modal').classList.add('hidden');
|
||||||
|
this.hideProgress();
|
||||||
|
}
|
||||||
|
|
||||||
|
switchTab(tab) {
|
||||||
|
document.querySelectorAll('.tab-btn').forEach(btn => {
|
||||||
|
btn.classList.toggle('active', btn.dataset.tab === tab);
|
||||||
|
});
|
||||||
|
document.querySelectorAll('.tab-content').forEach(content => {
|
||||||
|
content.classList.toggle('active', content.id === 'tab-' + tab);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async loadZernMCPacks() {
|
||||||
|
const select = document.getElementById('zernmc-pack-select');
|
||||||
|
select.innerHTML = '<option value="">Загрузка...</option>';
|
||||||
|
|
||||||
|
const result = await this.request('/instances/zernmc');
|
||||||
|
|
||||||
|
if (result.success && result.data && result.data.length > 0) {
|
||||||
|
this.zernmcPacks = result.data;
|
||||||
|
select.innerHTML = result.data.map(pack =>
|
||||||
|
`<option value="${this.escapeHtml(pack.name)}">${this.escapeHtml(pack.name)} (v${pack.version})</option>`
|
||||||
|
).join('');
|
||||||
|
} else {
|
||||||
|
select.innerHTML = '<option value="">Нет доступных сборок</option>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async loadMCVersions() {
|
||||||
|
const select = document.getElementById('mc-version-select');
|
||||||
|
select.innerHTML = '<option value="">Загрузка...</option>';
|
||||||
|
|
||||||
|
const result = await this.request('/versions');
|
||||||
|
|
||||||
|
if (result.success && result.data) {
|
||||||
|
this.mcVersions = result.data;
|
||||||
|
select.innerHTML = '<option value="">Выберите версию</option>' +
|
||||||
|
result.data.map(v => `<option value="${v.id}">${v.id}</option>`).join('');
|
||||||
|
} else {
|
||||||
|
select.innerHTML = '<option value="">Не удалось загрузить</option>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async onLoaderChange(loader) {
|
||||||
|
const loaderVersionGroup = document.getElementById('loader-version-group');
|
||||||
|
const loaderVersionSelect = document.getElementById('loader-version-select');
|
||||||
|
|
||||||
|
if (loader === 'vanilla') {
|
||||||
|
loaderVersionGroup.classList.add('hidden');
|
||||||
|
} else {
|
||||||
|
loaderVersionGroup.classList.remove('hidden');
|
||||||
|
loaderVersionSelect.innerHTML = '<option value="">Загрузка...</option>';
|
||||||
|
|
||||||
|
const result = await this.request(`/versions/${document.getElementById('mc-version-select').value}/loaders/${loader}`);
|
||||||
|
|
||||||
|
if (result.success && result.data) {
|
||||||
|
loaderVersionSelect.innerHTML = result.data.map(v =>
|
||||||
|
`<option value="${v.version}">${v.version}</option>`
|
||||||
|
).join('');
|
||||||
|
} else {
|
||||||
|
loaderVersionSelect.innerHTML = '<option value="">Нет версий</option>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async installZernMCPack() {
|
||||||
|
const packName = document.getElementById('zernmc-pack-select').value;
|
||||||
|
const instanceName = document.getElementById('zernmc-instance-name').value;
|
||||||
|
|
||||||
|
if (!packName) {
|
||||||
|
alert('Выберите сборку');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!instanceName) {
|
||||||
|
alert('Введите название сборки');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.showProgress('Установка ZernMC сборки...');
|
||||||
|
this.addLog('Начало установки: ' + packName, 'info');
|
||||||
|
|
||||||
|
const result = await this.request('/instances/zernmc/install', {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify({ packName, instanceName })
|
||||||
|
});
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
this.hideDownloadModal();
|
||||||
|
await this.loadCurrentInstance();
|
||||||
|
this.addLog('Сборка установлена!', 'success');
|
||||||
|
} else {
|
||||||
|
this.addLog('Ошибка установки: ' + result.error, 'error');
|
||||||
|
this.hideProgress();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async installVanilla() {
|
||||||
|
const mcVersion = document.getElementById('mc-version-select').value;
|
||||||
|
const loader = document.getElementById('loader-select').value;
|
||||||
|
const loaderVersion = document.getElementById('loader-version-select').value;
|
||||||
|
const instanceName = document.getElementById('vanilla-instance-name').value;
|
||||||
|
|
||||||
|
if (!mcVersion) {
|
||||||
|
alert('Выберите версию Minecraft');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!instanceName) {
|
||||||
|
alert('Введите название сборки');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loader !== 'vanilla' && !loaderVersion) {
|
||||||
|
alert('Выберите версию лоадера');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.showProgress('Установка сборки...');
|
||||||
|
this.addLog(`Начало установки: Minecraft ${mcVersion} ${loader !== 'vanilla' ? loader + ' ' + loaderVersion : ''}`, 'info');
|
||||||
|
|
||||||
|
const result = await this.request('/instances/vanilla/install', {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify({
|
||||||
|
mcVersion,
|
||||||
|
loader: loader === 'vanilla' ? null : loader,
|
||||||
|
loaderVersion: loader === 'vanilla' ? null : loaderVersion,
|
||||||
|
instanceName
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
this.hideDownloadModal();
|
||||||
|
await this.loadCurrentInstance();
|
||||||
|
this.addLog('Сборка установлена!', 'success');
|
||||||
|
} else {
|
||||||
|
this.addLog('Ошибка установки: ' + result.error, 'error');
|
||||||
|
this.hideProgress();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
showProgress(text) {
|
||||||
|
const progress = document.getElementById('download-progress');
|
||||||
|
const progressText = document.getElementById('progress-text');
|
||||||
|
const progressFill = document.getElementById('progress-fill');
|
||||||
|
|
||||||
|
progress.classList.remove('hidden');
|
||||||
|
progressText.textContent = text;
|
||||||
|
progressFill.style.width = '50%';
|
||||||
|
}
|
||||||
|
|
||||||
|
hideProgress() {
|
||||||
|
document.getElementById('download-progress').classList.add('hidden');
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== LOGS ====================
|
||||||
|
addLog(message, type = 'info') {
|
||||||
|
const container = document.getElementById('logs-container');
|
||||||
|
const entry = document.createElement('div');
|
||||||
|
entry.className = `log-entry ${type}`;
|
||||||
|
entry.textContent = `[${new Date().toLocaleTimeString()}] ${message}`;
|
||||||
|
container.appendChild(entry);
|
||||||
|
container.scrollTop = container.scrollHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
clearLogs() {
|
||||||
|
const container = document.getElementById('logs-container');
|
||||||
|
container.innerHTML = '<div class="log-entry info">Логи очищены</div>';
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== UI HELPERS ====================
|
||||||
|
showLoginScreen() {
|
||||||
|
document.getElementById('login-screen').classList.remove('hidden');
|
||||||
|
document.getElementById('main-screen').classList.add('hidden');
|
||||||
|
}
|
||||||
|
|
||||||
|
showMainScreen() {
|
||||||
|
document.getElementById('login-screen').classList.add('hidden');
|
||||||
|
document.getElementById('main-screen').classList.remove('hidden');
|
||||||
|
document.getElementById('username-display').textContent = this.username || '';
|
||||||
|
}
|
||||||
|
|
||||||
|
showLoading(show) {
|
||||||
|
const overlay = document.getElementById('loading-overlay');
|
||||||
|
if (show) {
|
||||||
|
overlay.classList.remove('hidden');
|
||||||
|
} else {
|
||||||
|
overlay.classList.add('hidden');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
escapeHtml(text) {
|
||||||
|
if (!text) return '';
|
||||||
|
const div = document.createElement('div');
|
||||||
|
div.textContent = text;
|
||||||
|
return div.innerHTML;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const app = new App();
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package me.sashegdev.zernmc.launcher.api;
|
||||||
|
|
||||||
|
import me.sashegdev.zernmc.launcher.api.instance.InstanceService;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
class InstanceServiceTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void instanceService_instantiates() {
|
||||||
|
InstanceService service = new InstanceService();
|
||||||
|
assertNotNull(service, "InstanceService должен создаваться");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getAllInstances_returnsResponse() {
|
||||||
|
InstanceService service = new InstanceService();
|
||||||
|
ApiResponse<?> response = service.getAllInstances();
|
||||||
|
|
||||||
|
assertNotNull(response, "Ответ не должен быть null");
|
||||||
|
assertTrue(response.isSuccess() || !response.isSuccess(), "Должен быть валидный ответ");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getAllInstances_returnsList() {
|
||||||
|
InstanceService service = new InstanceService();
|
||||||
|
ApiResponse<?> response = service.getAllInstances();
|
||||||
|
|
||||||
|
assertNotNull(response.getData(), "Data не должен быть null");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void isInstanceExists_returnsBoolean() {
|
||||||
|
InstanceService service = new InstanceService();
|
||||||
|
ApiResponse<Boolean> response = service.isInstanceExists("nonexistent");
|
||||||
|
|
||||||
|
assertNotNull(response, "Ответ не должен быть null");
|
||||||
|
assertTrue(response.isSuccess(), "Проверка должна быть успешной");
|
||||||
|
assertNotNull(response.getData(), "Data должен быть boolean");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void isInstanceExists_nonexistentReturnsFalse() {
|
||||||
|
InstanceService service = new InstanceService();
|
||||||
|
ApiResponse<Boolean> response = service.isInstanceExists("definitely_nonexistent_12345");
|
||||||
|
|
||||||
|
assertTrue(response.isSuccess());
|
||||||
|
assertFalse(response.getData(), "Несуществующая сборка должна вернуть false");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void deleteInstance_invalidName_returnsError() {
|
||||||
|
InstanceService service = new InstanceService();
|
||||||
|
ApiResponse<Boolean> response = service.deleteInstance("nonexistent");
|
||||||
|
|
||||||
|
assertNotNull(response, "Ответ не должен быть null");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getInstance_nonexistent_returnsError() {
|
||||||
|
InstanceService service = new InstanceService();
|
||||||
|
ApiResponse<?> response = service.getInstance("definitely_nonexistent_12345");
|
||||||
|
|
||||||
|
assertNotNull(response, "Ответ не должен быть null");
|
||||||
|
assertFalse(response.isSuccess(), "Несуществующая сборка должна вернуть ошибку");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package me.sashegdev.zernmc.launcher.web;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
import java.awt.GraphicsEnvironment;
|
||||||
|
|
||||||
|
class HeadlessDetectionTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void headlessDetection_works() {
|
||||||
|
boolean isHeadless = GraphicsEnvironment.isHeadless();
|
||||||
|
assertNotNull(isHeadless, "isHeadless() должен возвращать boolean");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void headlessDetection_consistentResult() {
|
||||||
|
boolean isHeadless1 = GraphicsEnvironment.isHeadless();
|
||||||
|
boolean isHeadless2 = GraphicsEnvironment.isHeadless();
|
||||||
|
assertEquals(isHeadless1, isHeadless2, "Результат должен быть консистентным");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void javaFxCheck_works() {
|
||||||
|
try {
|
||||||
|
boolean isHeadless = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()
|
||||||
|
.getDefaultScreenDevice() != null;
|
||||||
|
assertFalse(isHeadless, "На Linux без дисплея должно быть headless");
|
||||||
|
} catch (Exception e) {
|
||||||
|
assertTrue(true, "Ожидаемая ошибка на headless");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package me.sashegdev.zernmc.launcher.web;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.ServerSocket;
|
||||||
|
|
||||||
|
class WebServerTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void findFreePort_returnsValidPort() throws IOException {
|
||||||
|
int port = WebServer.findFreePort(8080);
|
||||||
|
assertTrue(port >= 8080, "Порт должен быть >= 8080");
|
||||||
|
assertTrue(port < 8180, "Порт должен быть < 8180");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void findFreePort_findsDifferentPorts() throws IOException {
|
||||||
|
int port1 = WebServer.findFreePort(9000);
|
||||||
|
int port2 = WebServer.findFreePort(9100);
|
||||||
|
|
||||||
|
assertNotEquals(port1, port2, "Должены быть разные порты");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void findFreePort_respectsStartPort() throws IOException {
|
||||||
|
int port = WebServer.findFreePort(9500);
|
||||||
|
assertTrue(port >= 9500, "Порт должен быть >= указанного startPort");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void portRangeTest() throws IOException {
|
||||||
|
int port = WebServer.findFreePort(8080);
|
||||||
|
assertTrue(port >= 8080 && port < 8180, "Порт в допустимом диапазоне 8080-8179");
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user