Merge branch 'release/5.7.0'

Author: gravit0

.github/workflows/push.yml

@@ -33,19 +33,10 @@ jobs:
 
       - name: Create artifacts
         run: |
-          mkdir -p artifacts/modules
-          cd LaunchServer/build/libs
-          mv proguard proguard-libraries
-          zip -r -9 ../../../artifacts/libraries.zip * -x "LaunchServer.jar" -x "LaunchServer-clean.jar"
-          cp LaunchServer.jar ../../../artifacts/LaunchServer.jar
-          cd ../../..
-          cp ServerWrapper/build/libs/ServerWrapper.jar artifacts/ServerWrapper.jar
-          cp ServerWrapper/build/libs/ServerWrapper-inline.jar artifacts/ServerWrapperInline.jar
-          cp LauncherAuthlib/build/libs/LauncherAuthlib.jar artifacts/LauncherAuthlib.jar || true
-          cp modules/*_module/build/libs/*.jar artifacts/modules || true
-          cp modules/*_lmodule/build/libs/*.jar artifacts/modules || true
-          cp javaargs.txt artifacts/javaargs.txt || true
-          cp java24args.txt artifacts/java24args.txt || true
+          mkdir -p artifacts
+          cp components/launchserver/build/distributions/launchserver*.zip artifacts/LaunchServerBuild.zip
+          cp components/serverwrapper/build/libs/serverwrapper*-all.jar artifacts/ServerWrapper.jar
+          cp components/serverwrapper/build/libs/serverwrapper*-inline.jar artifacts/ServerWrapperInline.jar
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -61,11 +52,6 @@ jobs:
         if: startsWith(github.event.ref, 'refs/tags')
         run: |
           cd artifacts
-          zip -r -9 Release.zip *
-          zip -j -9 LaunchServerModules.zip ../modules/*_module/build/libs/*.jar
-          zip -j -9 LauncherModules.zip ../modules/*_lmodule/build/libs/*.jar
-          cd ../LaunchServer/build/libs
-          zip -r -9 ../../../artifacts/LauncherBase.zip * -x "LaunchServer-clean.jar"
 
       - name: Create release
         id: create_release

Dockerfile

@@ -1,12 +1,11 @@
-FROM ubuntu:latest
-RUN apt-get update && apt-get install -y osslsigncode openjdk-11-jdk unzip jq screen
-ADD https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_linux-x64_bin-jmods.zip .
-RUN unzip openjfx-11.0.2_linux-x64_bin-jmods.zip && mv javafx-jmods-11.0.2/* /usr/lib/jvm/java-11-openjdk-amd64/jmods/ && rmdir javafx-jmods-11.0.2 && rm openjfx-11.0.2_linux-x64_bin-jmods.zip
-RUN mkdir ./libraries ./launcher-libraries ./launcher-libraries-compile ./compat ./compat/modules
-COPY ./LaunchServer/build/libs/LaunchServer.jar .
-COPY ./LaunchServer/build/libs/libraries ./libraries
-COPY ./LaunchServer/build/libs/launcher-libraries ./launcher-libraries
-COPY ./LaunchServer/build/libs/launcher-libraries-compile ./launcher-libraries-compile
-COPY ./compat/authlib/authlib-clean.jar ./LauncherAuthlib/build/libs/* ./ServerWrapper/build/libs/ServerWrapper.jar ./compat/
-COPY ./modules/*_module/build/libs/* ./modules/*_lmodule/build/libs/* ./compat/modules/
-CMD screen -DmS launchserver java -javaagent:LaunchServer.jar -jar LaunchServer.jar
+FROM azul/zulu-openjdk-debian:24-latest AS build
+WORKDIR /app
+COPY . /app
+RUN chmod +x && ./gradlew build --no-daemon
+FROM azul/zulu-openjdk-debian:24-latest AS prod
+WORKDIR /app/data
+ENV APP_HOME=/app
+ENV LISTEN_PORT=9274
+EXPOSE 9274
+COPY --from=build /app/components/launchserver/build/install/launchserver/* /app
+ENTRYPOINT ["/app/bin/launchserver"]