Merge branch 'ms5' into 'beta'

Ms5 See merge request Griefed/ServerPackCreator!548
Griefed · Nov 7, 2023 · b43c8a5 · b43c8a5
2 parents 6ced067 + 1ee1f2e
commit b43c8a5
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 45 deletions.
diff --git a/.github/workflows/github-prerelease.yml b/.github/workflows/github-prerelease.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
 
@@ -107,7 +107,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
 
@@ -164,7 +164,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
 
@@ -225,7 +225,7 @@ jobs:
         id: java
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -254,7 +254,7 @@ jobs:
           jpackage `
             --app-version $Version[0] `
             --copyright "Copyright (C) 2023 Griefed" `
-            --description "Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks." `
+            --description "Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks." `
             --dest "serverpackcreator-app\build\dist" `
             --icon "serverpackcreator-app\jpackagerResources\app.ico" `
             --input "serverpackcreator-app\build\jars" `
@@ -320,7 +320,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
 
@@ -378,7 +378,7 @@ jobs:
         id: java
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -404,7 +404,7 @@ jobs:
           jpackage \
             --app-version "${VERSION[0]}" \
             --copyright "Copyright (C) 2023 Griefed" \
-            --description "Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks." \
+            --description "Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks." \
             --dest serverpackcreator-app/build/dist \
             --icon serverpackcreator-app/jpackagerResources/app.png \
             --input serverpackcreator-app/build/jars \
@@ -414,7 +414,7 @@ jobs:
             --main-jar serverpackcreator-app-${{ needs.preparations.outputs.version }}-plain.jar \
             --name ServerPackCreator \
             --resource-dir serverpackcreator-app/jpackagerResources \
-            --runtime-image "${{ steps.java.outputs.path }}" \
+            --runtime-image $JAVA_HOME \
             --temp serverpackcreator-app/build/tmp/jpackager \
             --type "app-image" \
             --vendor "griefed.de" \
@@ -476,6 +476,7 @@ jobs:
           if-no-files-found: warn # 'warn' or 'ignore' are also available, defaults to `warn`
 
   prerelease:
+    if: ${{ always() }}
     runs-on: ubuntu-latest
     needs: [preparations, jar, mac-01, windows-01, windows-02, ubuntu-01, ubuntu-02]
 

diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
 
@@ -105,7 +105,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
 
@@ -162,7 +162,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
 
@@ -223,7 +223,7 @@ jobs:
         id: java
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -251,7 +251,7 @@ jobs:
           jpackage `
             --app-version "${{ needs.preparations.outputs.version }}" `
             --copyright "Copyright (C) 2023 Griefed" `
-            --description "Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks." `
+            --description "Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks." `
             --dest "serverpackcreator-app\build\dist" `
             --icon "serverpackcreator-app\jpackagerResources\app.ico" `
             --input "serverpackcreator-app\build\jars" `
@@ -317,7 +317,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
 
@@ -375,7 +375,7 @@ jobs:
         id: java
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -400,7 +400,7 @@ jobs:
           jpackage \
             --app-version "${{ needs.preparations.outputs.version }}" \
             --copyright "Copyright (C) 2023 Griefed" \
-            --description "Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks." \
+            --description "Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks." \
             --dest serverpackcreator-app/build/dist \
             --icon serverpackcreator-app/jpackagerResources/app.png \
             --input serverpackcreator-app/build/jars \
@@ -410,7 +410,7 @@ jobs:
             --main-jar serverpackcreator-app-${{ needs.preparations.outputs.version }}-plain.jar \
             --name ServerPackCreator \
             --resource-dir serverpackcreator-app/jpackagerResources \
-            --runtime-image ${{ steps.java.outputs.path }} \
+            --runtime-image $JAVA_HOME \
             --temp serverpackcreator-app/build/tmp/jpackager \
             --type "app-image" \
             --vendor "griefed.de" \
@@ -472,6 +472,7 @@ jobs:
           if-no-files-found: warn # 'warn' or 'ignore' are also available, defaults to `warn`
 
   release:
+    if: ${{ always() }}
     runs-on: ubuntu-latest
     needs: [preparations, jar, mac-01, windows-01, windows-02, ubuntu-01, ubuntu-02]
 
@@ -557,7 +558,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
 
       - name: Grant execute permission for gradlew

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,8 +2,6 @@ name: Test
 
 on:
   push:
-    tags-ignore:
-      - '**'
   pull_request:
   workflow_dispatch:
 
@@ -21,7 +19,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -67,7 +65,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -113,7 +111,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -164,7 +162,7 @@ jobs:
         id: java
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -186,14 +184,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           ./gradlew -Pversion=${{ steps.branch-name.outputs.current_branch }} generateLicenseReport --info --full-stacktrace
-          ./gradlew :serverpackcreator-app:build :serverpackcreator-app:copyDependencies :serverpackcreator-app:copyJar :serverpackcreator-app:cleanTmpPackager --info --full-stacktrace
+          ./gradlew :serverpackcreator-app:build :serverpackcreator-app:copyDependencies :serverpackcreator-app:copyJar --info --full-stacktrace
 
       - name: Build Image
         run: |
           jpackage `
             --app-version "6.6.6" `
             --copyright "Copyright (C) 2023 Griefed" `
-            --description "Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks." `
+            --description "Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks." `
             --dest "serverpackcreator-app\build\dist" `
             --icon "serverpackcreator-app\jpackagerResources\app.ico" `
             --input "serverpackcreator-app\build\jars" `
@@ -210,6 +208,7 @@ jobs:
             --verbose
 
       - name: List
+        if: ${{ always() }}
         run: dir serverpackcreator-app\build\dist
 
       - name: Archive
@@ -246,7 +245,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -293,7 +292,7 @@ jobs:
         id: java
         uses: actions/[email protected]
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '17'
           check-latest: true
           cache: 'gradle'
@@ -311,14 +310,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           ./gradlew -Pversion=${{ steps.branch-name.outputs.current_branch }} generateLicenseReport --info --full-stacktrace
-          ./gradlew :serverpackcreator-app:build :serverpackcreator-app:copyDependencies :serverpackcreator-app:copyJar :serverpackcreator-app:cleanTmpPackager --info --full-stacktrace
+          ./gradlew :serverpackcreator-app:build :serverpackcreator-app:copyDependencies :serverpackcreator-app:copyJar --info --full-stacktrace
 
       - name: Build Image
         run: |
           jpackage \
             --app-version "6.6.6" \
             --copyright "Copyright (C) 2023 Griefed" \
-            --description "Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks." \
+            --description "Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks." \
             --dest serverpackcreator-app/build/dist \
             --icon serverpackcreator-app/jpackagerResources/app.png \
             --input serverpackcreator-app/build/jars \
@@ -328,13 +327,14 @@ jobs:
             --main-jar serverpackcreator-app-dev-plain.jar \
             --name ServerPackCreator \
             --resource-dir serverpackcreator-app/jpackagerResources \
-            --runtime-image ${{ steps.java.outputs.path }} \
+            --runtime-image $JAVA_HOME \
             --temp serverpackcreator-app/build/tmp/jpackager \
             --type "app-image" \
             --vendor "griefed.de" \
             --verbose
 
       - name: List
+        if: ${{ always() }}
         run: ls -ahl serverpackcreator-app/build/dist
 
       - name: Create AppImage

diff --git a/serverpackcreator-app/build.gradle.kts b/serverpackcreator-app/build.gradle.kts
@@ -61,7 +61,7 @@ tasks.jpackage {
     val ver: String = project.version.toString()
     dependsOn("build", "copyDependencies", "copyJar", "cleanTmpPackager")
     aboutUrl = "https://www.griefed.de/#/serverpackcreator"
-    appDescription = "Create server packs from Minecraft Forge, Fabric, Quilt, LegacyFabric and NeoForge modpacks."
+    appDescription = "Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks."
     appName = "ServerPackCreator"
     appVersion = if (ver == "dev") {
         val current = LocalDate.now().toString().split("-")

diff --git a/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop b/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop
@@ -1,10 +1,11 @@
 [Desktop Entry]
 Name=ServerPackCreator
-Comment=Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks.
-GenericName[en_US]=Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks.
-GenericName[en_GB]=Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks.
-Exec=/opt/serverpackcreator/bin/ServerPackCreator
-Icon=/opt/serverpackcreator/lib/ServerPackCreator.png
+Comment=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.
+GenericName=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.
+GenericName[en_US]=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.
+GenericName[en_GB]=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.
+Exec=ServerPackCreator
+Icon=ServerPackCreator
 Terminal=false
 Type=Application
 Categories=Utility;FileTools;Java;

diff --git a/serverpackcreator-app/jpackagerResources/launcher.desktop b/serverpackcreator-app/jpackagerResources/launcher.desktop
@@ -1,10 +1,11 @@
 [Desktop Entry]
 Name=ServerPackCreator
-Comment=Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks.
-GenericName[en_US]=Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks.
-GenericName[en_GB]=Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks.
-Exec=/opt/serverpackcreator/bin/ServerPackCreator
-Icon=/opt/serverpackcreator/lib/ServerPackCreator.png
+Comment=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.
+GenericName=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.
+GenericName[en_US]=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.
+GenericName[en_GB]=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.
+Exec=ServerPackCreator
+Icon=ServerPackCreator
 Terminal=false
 Type=Application
 Categories=Utility;FileTools;Java;

diff --git a/serverpackcreator-web-frontend/package.json b/serverpackcreator-web-frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "serverpackcreator",
   "version": "1.0.0",
-  "description": "Create server packs from Minecraft Forge or Fabric modpacks.",
+  "description": "Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.",
   "productName": "ServerPackCreator",
   "cordovaId": "org.cordova.quasar.app",
   "capacitorId": "",

diff --git a/serverpackcreator-web-frontend/quasar.conf.js b/serverpackcreator-web-frontend/quasar.conf.js
@@ -145,7 +145,7 @@ module.exports = function (ctx) {
       manifest: {
         name: 'ServerPackCreator',
         short_name: 'SPC',
-        description: 'Create server packs from Minecraft Forge or Fabric modpacks.',
+        description: 'Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or LegacyFabric modpacks.',
         display: 'standalone',
         orientation: 'landscape',
         background_color: '#ffffff',