Launcher overhaul: FlatLaf UI, managed runtimes, per-instance settings, and package installer

.gitattributes

@@ -0,0 +1 @@
+gradle/*.sh text eol=lf

.gitignore

@@ -117,6 +117,9 @@ pom.xml.next
 release.properties
 
 
+### Flatpak ###
+.flatpak-builder/
+
 ### Gradle ###
 .gradle
 build/
@@ -155,4 +158,5 @@ $RECYCLE.BIN/
 /libraries
 /versions
 /accounts.dat
-/config.json
+/config.json
+/run

README.md

@@ -1,8 +1,6 @@
 SKCraft Launcher
 ================
 
-![Now with 1.13+ support!](readme/now_with_support.png)
-
 [![Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/offbeatwitch/donate)
 
 *If you rely on this software, please consider [donating](https://liberapay.com/offbeatwitch/donate) to help keep it maintained!*
@@ -14,6 +12,7 @@ Need to make it easy for people to install and play your modpack? The SKCraft La
 :heavy_check_mark: You don't want to depend on anyone else  
 :heavy_check_mark: There's several modpacks you want to provide as a set  
 :heavy_check_mark: You want to provide 'hidden' modpacks that are only accessible by a secret code
+:heavy_check_mark: You want Windows / Linux / macOS installers for distributing the launcher itself
 
 It may not be for you if:
 
@@ -27,7 +26,9 @@ Creating modpacks with this launcher is super easy: :one: only drag & drop of co
 
 The launcher has all standard features that you'd expect like :one: resume of incomplete downloads, :two: incremental updates, and :three: file deduplication (saves disk space when you have files duplicated between updates or modpacks).
 
-LiteLoader, Forge, Fabric, and custom .jar mods are supported. You can put resource packs in, or really even random mod files that don't go in the configs or mods folder.
+LiteLoader, Forge, Fabric, NeoForge, and custom .jar mods are supported. You can put resource packs in, or really even random mod files that don't go in the configs or mods folder.
+
+Light and dark modes are supported. News is shown in an embedded browser and can be set per instance. Players can sign in with Microsoft or use offline profiles. You can build native installers for Windows, Linux, and macOS — see [launcher-bootstrap/installer/README.md](launcher-bootstrap/installer/README.md).
 
 You do need some sort of website, but it does **not** need anything complicated like PHP.
 
@@ -39,7 +40,29 @@ Best of all, our launcher is Minecraft's oldest surviving modpack launcher platf
 
 You'll probably need a few hours to get everything working. Fortunately, we have a [detailed wiki](https://github.com/SKCraft/Launcher/wiki) with screenshots for every step, intended for someone with minimal technical experience.
 
-For your evaluation, there are sample files provided that you will be able to upload to your site to see if it even works for you.
+For your evaluation, there are [sample files](sample-files/) provided that you will be able to upload to your site to see if it even works for you.
+
+## Building
+
+Build with a Java 17 JDK. The Gradle wrapper should also be run by Java 17:
+
+```
+gradlew.bat build
+```
+
+For native installer packaging:
+
+- Windows: `gradlew.bat :launcher-bootstrap:packageWindows -Pversion=...` (builds `Setup.exe` with NSIS)
+- Linux: `./gradlew :launcher-bootstrap:packageLinux -Pversion=...` (AppImage + Flatpak + DEB)
+- Linux from Windows: `build.bat --linux` (WSL hybrid; AppImage + Flatpak + DEB)
+- Linux from Windows + WSL: `gradlew.bat :launcher-bootstrap:packageLinuxWsl -Pversion=... -PwslDistro=Ubuntu`
+- macOS: `./gradlew :launcher-bootstrap:packageMac -Pversion=...` (builds `.dmg` and `.pkg`)
+
+All of those start from the same staged runtime image:
+
+```
+gradlew.bat :launcher-bootstrap:assembleAppImage
+```
 
 ## Pretty Pictures
 
@@ -62,24 +85,28 @@ LiteLoader and Forge installers, or Fabric Loader, go into the *loaders* folder.
 
 ### More Pictures
 
-There's a dark version of the launcher (personally not the creator's cup of tea) that you can use:
+The launcher comes in light and dark modes:
+
+![Light Mode](readme/launcher-light.png)
 
-![Skinned](readme/launcher_skinned.png)
+![Dark Mode](readme/launcher-dark.png)
 
 Users can select optional mods/features:
 
 ![Optional Features](readme/features.png)
 
-The launcher can update itself and you can use it in portable mode too.
+Accounts support Microsoft sign-in and offline profiles:
 
-### The Light Theme
+![Accounts](readme/accounts.png)
 
-![Main Launcher](readme/launcher.png)
+You can set Java, memory, and JVM arguments per instance:
 
 ![Options](readme/options.png)
 
 ![Console](readme/log.png)
 
+The launcher can update itself and you can use it in portable mode too.
+
 ## Contributing
 
 Pull requests can be submitted on GitHub, but we will accept them at our discretion. Please note that your code must follow Oracle's Java Code Conventions.

build.bat

@@ -1,3 +1,85 @@
-@echo off
-call gradlew clean build
-pause
+@echo off
+setlocal EnableExtensions EnableDelayedExpansion
+
+set "BUILD_INSTALLER=1"
+set "BUILD_WINDOWS=1"
+set "BUILD_LINUX=1"
+set "RESOLVE_ARGS="
+set "ROOT=%~dp0"
+
+:parse
+if "%~1"=="" goto parsed
+set "A=%~1"
+if /i "!A:~0,2!"=="--" set "A=!A:~2!"
+if /i "!A!"=="no-installer" set "BUILD_INSTALLER=0"
+if /i "!A!"=="windows" (set "BUILD_WINDOWS=1" & set "BUILD_LINUX=0")
+if /i "!A!"=="linux" (set "BUILD_WINDOWS=0" & set "BUILD_LINUX=1")
+shift
+goto parse
+:parsed
+
+if "%BUILD_WINDOWS%%BUILD_LINUX%"=="00" (
+    echo ERROR: Nothing to package.
+    goto :fail
+)
+
+if "%BUILD_LINUX%"=="1" if "%BUILD_INSTALLER%"=="1" (
+    where wsl >nul 2>&1
+    if errorlevel 1 (
+        echo ERROR: Linux packaging requires WSL.
+        goto :fail
+    )
+    wsl -- echo WSL_OK >nul 2>&1
+    if errorlevel 1 (
+        echo ERROR: Linux packaging requires a working WSL distro.
+        goto :fail
+    )
+)
+if "%BUILD_LINUX%"=="1" if "%BUILD_INSTALLER%"=="1" (
+    set "WSL_MISSING="
+    for %%T in (java curl file fakeroot flatpak flatpak-builder) do (
+        wsl -- bash -lc "type %%T" >nul 2>&1
+        if errorlevel 1 set "WSL_MISSING=!WSL_MISSING! %%T"
+    )
+    if defined WSL_MISSING (
+        set "INSTALL_WSL_DEPS="
+        set /p "INSTALL_WSL_DEPS=Missing WSL packaging tools:!WSL_MISSING!. Install now? [y/N] "
+        if /i not "!INSTALL_WSL_DEPS!"=="y" (
+            echo Linux packaging skipped because dependency installation was declined.
+            set "SKIP_LINUX_PACKAGE=1"
+        ) else (
+            echo Installing WSL packaging dependencies...
+            wsl -u root -- apt-get update
+            if errorlevel 1 goto :fail
+            wsl -u root -- apt-get install -y openjdk-17-jdk curl file fakeroot flatpak flatpak-builder
+            if errorlevel 1 goto :fail
+        )
+    )
+    if "!SKIP_LINUX_PACKAGE!"=="1" (
+        set "BUILD_LINUX=0"
+    )
+)
+
+if "%BUILD_INSTALLER%"=="0" (
+    set "RESOLVE_ARGS=--no-installer"
+) else if "%BUILD_WINDOWS%"=="0" (
+    set "RESOLVE_ARGS=--no-nsis"
+)
+call "%ROOT%gradle\resolve-build-env.bat" %RESOLVE_ARGS%
+if errorlevel 1 goto :fail
+echo Using JAVA_HOME=%JAVA_HOME%
+
+set "TASKS="
+if "%BUILD_INSTALLER%"=="1" (
+    if "%BUILD_WINDOWS%"=="1" set "TASKS=:launcher-bootstrap:packageWindows"
+    if "%BUILD_LINUX%"=="1" (
+        if defined TASKS (set "TASKS=!TASKS! :launcher-bootstrap:packageLinuxWsl") else set "TASKS=:launcher-bootstrap:packageLinuxWsl"
+    )
+    echo Packaging tasks: !TASKS!
+)
+
+call "%ROOT%gradlew" clean build %TASKS%
+exit /b %ERRORLEVEL%
+
+:fail
+exit /b 1

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-    id 'io.freefair.lombok' version '5.3.0'
+    id "com.gradleup.shadow" version "8.3.6"
+    id 'io.freefair.lombok' version '8.13.1'
 }
 
 println """
@@ -19,7 +19,7 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(8))
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
 
@@ -28,7 +28,6 @@ subprojects {
     }
 
     if (JavaVersion.current().isJava8Compatible()) {
-        // Java 8 turns on doclint which we fail
         tasks.withType(Javadoc) {
             options.addStringOption('Xdoclint:none', '-quiet')
         }
@@ -38,38 +37,10 @@ subprojects {
         workingDir = new File(rootDir, "run/")
         workingDir.mkdirs()
     }
-
-    // Work around gradle shadow bug
-    // see https://github.com/johnrengelman/shadow/issues/713
-    afterEvaluate {
-        startScripts {
-            dependsOn(shadowJar)
-        }
-
-        distTar {
-            dependsOn(shadowJar)
-        }
-
-        distZip {
-            dependsOn(shadowJar)
-        }
-
-        startShadowScripts {
-            dependsOn(jar)
-        }
-
-        shadowDistTar {
-            dependsOn(jar)
-        }
-
-        shadowDistZip {
-            dependsOn(jar)
-        }
-    }
 }
 
-task clean {
-    subprojects {
-        rootProject.clean.dependsOn tasks.matching { it.name == "clean" }
-    }
+tasks.register('package') {
+    group = 'distribution'
+    description = 'Build native launcher installer for the current platform.'
+    dependsOn ':launcher-bootstrap:package'
 }

build.sh

@@ -1,3 +1,74 @@
 #!/bin/sh
+BUILD_INSTALLER=1
+if [ "$1" = "--no-installer" ] || [ "$1" = "no-installer" ]; then
+    BUILD_INSTALLER=0
+    echo "Skipping native installer packaging."
+fi
+
+install_apt_packages() {
+    if ! command -v apt-get >/dev/null 2>&1; then
+        echo "Automatic dependency setup supports apt-based distributions only."
+        return 1
+    fi
+    if [ "$(id -u)" -eq 0 ]; then
+        apt-get update && apt-get install -y "$@"
+    else
+        sudo apt-get update && sudo apt-get install -y "$@"
+    fi
+}
+
+# Java required every build. Linux packaging deps (apt) only on Linux hosts.
+MISSING_TOOLS=
+BUILD_JAVA_MISSING=0
+APT_PACKAGES="openjdk-17-jdk"
+case "$(uname -s 2>/dev/null || echo unknown)" in
+    Linux*) IS_LINUX=1 ;;
+    *) IS_LINUX=0 ;;
+esac
+if ! command -v java >/dev/null 2>&1; then
+    MISSING_TOOLS=" java"
+    BUILD_JAVA_MISSING=1
+fi
+if [ "$BUILD_INSTALLER" = "1" ] && [ "$IS_LINUX" = "1" ]; then
+    APT_PACKAGES="$APT_PACKAGES curl file fakeroot flatpak flatpak-builder"
+    for tool in jpackage curl file fakeroot flatpak flatpak-builder; do
+        if ! command -v "$tool" >/dev/null 2>&1; then
+            MISSING_TOOLS="$MISSING_TOOLS $tool"
+        fi
+    done
+fi
+
+if [ -n "$MISSING_TOOLS" ]; then
+    if [ "$IS_LINUX" = "1" ]; then
+        printf 'Missing build/package tools:%s. Install now? [y/N] ' "$MISSING_TOOLS"
+        read -r INSTALL_DEPS
+        if [ "$INSTALL_DEPS" = "y" ] || [ "$INSTALL_DEPS" = "Y" ]; then
+            install_apt_packages $APT_PACKAGES || exit $?
+        elif [ "$BUILD_JAVA_MISSING" = "1" ]; then
+            echo "Cannot run Gradle build without Java."
+            exit 1
+        else
+            BUILD_INSTALLER=0
+            echo "Skipping native installer packaging because dependency installation was declined."
+        fi
+    elif [ "$BUILD_JAVA_MISSING" = "1" ]; then
+        echo "Cannot run Gradle build without Java. Install a JDK 17+ and retry."
+        exit 1
+    fi
+fi
+
 ./gradlew clean build
-read -p "Press any key to continue..."
+EXIT_CODE=$?
+if [ $EXIT_CODE -ne 0 ]; then
+    read -p "Press any key to continue..."
+    exit $EXIT_CODE
+fi
+
+if [ "$BUILD_INSTALLER" = "1" ]; then
+    echo "Packaging native installer..."
+    ./gradlew package
+    EXIT_CODE=$?
+fi
+
+read -p "Press any key to continue..."
+exit $EXIT_CODE

creator-tools/build.gradle

@@ -1,13 +1,13 @@
 plugins {
     id 'application'
-    id "com.github.johnrengelman.shadow"
+    id 'com.gradleup.shadow'
     id 'io.freefair.lombok'
 }
 
 version = "2.1.0-SNAPSHOT"
 
 application {
-    mainClassName = "com.skcraft.launcher.creator.Creator"
+    mainClass = "com.skcraft.launcher.creator.Creator"
 }
 
 dependencies {
@@ -16,18 +16,10 @@ dependencies {
     implementation 'com.jidesoft:jide-oss:3.6.18'
 }
 
+
 processResources {
+    def projectVersion = project.version.toString()
     filesMatching('**/*.properties') {
-        filter {
-            it.replace('${project.version}', project.version)
-        }
+        filter { it.replace('${project.version}', projectVersion) }
     }
 }
-
-shadowJar {
-    archiveClassifier.set("")
-}
-
-build {
-    dependsOn(shadowJar)
-}