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

Слияние ui -> main #1

Merged
sasheg merged 145 commits from ui into main 2026-08-20 13:54:02 +00:00
Conversation 0 Commits 145 Files Changed 142
+25 -18
5 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ce61b111e9 - Show all commits
launcher/launcher/pom.xml
+14 -17
View File
@@ -156,6 +156,7 @@
<configuration>
<outfile>../../server/builds/zernmc.exe</outfile>
<jar>../../server/builds/zernmc-bootstrap.jar</jar>
<icon>${project.basedir}/src/main/icons/zernmc.ico</icon>
<headerType>gui</headerType>
<dontWrapJar>false</dontWrapJar>
<mainClass>me.sashegdev.zernmc.launcher.Bootstrap</mainClass>
@@ -304,12 +305,6 @@
<copy file="../../server/builds/zernmclauncher.jar"
tofile="../../server/builds/bin/zernmclauncher.jar" overwrite="true"/>
<!-- Копируем CLI-экзешники в bin (для отладки/диагностики) -->
<copy file="../../server/builds/zernmc-cli.exe"
tofile="../../server/builds/bin/zernmc-cli.exe" overwrite="true"/>
<copy file="../../server/builds/zernmc-cli-jfx.exe"
tofile="../../server/builds/bin/zernmc-cli-jfx.exe" overwrite="true"/>
<!-- Копируем UI в assets -->
<mkdir dir="../../server/builds/assets"/>
<copy todir="../../server/builds/assets/ui" overwrite="true">
@@ -349,12 +344,12 @@
<arg value="-ts"/>
<arg value="http://timestamp.digicert.com"/>
<arg value="-in"/>
<arg value="../../server/builds/bin/zernmc-cli.exe"/>
<arg value="../../server/builds/zernmc-cli.exe"/>
<arg value="-out"/>
<arg value="../../server/builds/bin/zernmc-cli.signed.exe"/>
<arg value="../../server/builds/zernmc-cli.signed.exe"/>
</exec>
<move file="../../server/builds/bin/zernmc-cli.signed.exe"
tofile="../../server/builds/bin/zernmc-cli.exe" overwrite="true"/>
<move file="../../server/builds/zernmc-cli.signed.exe"
tofile="../../server/builds/zernmc-cli.exe" overwrite="true"/>
<exec executable="osslsigncode" failonerror="true">
<arg value="sign"/>
@@ -367,28 +362,30 @@
<arg value="-ts"/>
<arg value="http://timestamp.digicert.com"/>
<arg value="-in"/>
<arg value="../../server/builds/bin/zernmc-cli-jfx.exe"/>
<arg value="../../server/builds/zernmc-cli-jfx.exe"/>
<arg value="-out"/>
<arg value="../../server/builds/bin/zernmc-cli-jfx.signed.exe"/>
<arg value="../../server/builds/zernmc-cli-jfx.signed.exe"/>
</exec>
<move file="../../server/builds/bin/zernmc-cli-jfx.signed.exe"
tofile="../../server/builds/bin/zernmc-cli-jfx.exe" overwrite="true"/>
<move file="../../server/builds/zernmc-cli-jfx.signed.exe"
tofile="../../server/builds/zernmc-cli-jfx.exe" overwrite="true"/>
<!-- Создаём README -->
<echo file="../../server/builds/README.txt">
ZernMC Launcher
Files:
- zernmc.exe - Main launcher with GUI
- zernmc.exe - Main launcher with GUI (default)
- zernmc-cli.exe - CLI version (console, architecture-independent)
- zernmc-cli-jfx.exe - CLI + JFX UI (console visible + JavaFX frontend)
How to use:
Just run zernmc.exe
Just run zernmc.exe (or zernmc-cli.exe / zernmc-cli-jfx.exe for CLI)
</echo>
<!-- Создаём один архив со всем -->
<zip destfile="../../server/builds/ZernMC-win-${revision}.${hotfix}.zip"
basedir="../../server/builds"
includes="zernmc.exe,bin/**,assets/**,lib/**,README.txt"
includes="zernmc.exe,zernmc-cli.exe,zernmc-cli-jfx.exe,bin/**,assets/**,lib/**,README.txt"
excludes="build.version,*.jar"/>
</target>
</configuration>
launcher/launcher/src/main/icons/zernmc.ico
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 KiB

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

After

Width:  |  Height:  |  Size: 423 B

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

After

Width:  |  Height:  |  Size: 5.5 KiB

launcher/pom.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<properties>
<revision>1.0.16</revision>
<hotfix>15</hotfix>
<hotfix>16</hotfix>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>