From 767a8c08a761a594330d408ae287a5116211c3e1 Mon Sep 17 00:00:00 2001 From: Griefed Date: Tue, 7 Nov 2023 22:40:02 +0100 Subject: [PATCH 1/7] test: Run workflow test on every push --- .github/workflows/test.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e7a5c5a3..ab697ec32 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,8 +2,6 @@ name: Test on: push: - tags-ignore: - - '**' pull_request: workflow_dispatch: @@ -186,7 +184,7 @@ 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: | @@ -311,7 +309,7 @@ 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: | @@ -328,7 +326,7 @@ jobs: --main-jar serverpackcreator-app-dev-plain.jar \ --name ServerPackCreator \ --resource-dir serverpackcreator-app/jpackagerResources \ - --runtime-image ${{ steps.java.outputs.path }} \ + --runtime-image "${{ steps.java.outputs.path }}" \ --temp serverpackcreator-app/build/tmp/jpackager \ --type "app-image" \ --vendor "griefed.de" \ From 5a6e126664274a5e759dae8d061371aa95c0981f Mon Sep 17 00:00:00 2001 From: Griefed Date: Tue, 7 Nov 2023 22:55:46 +0100 Subject: [PATCH 2/7] Print Java home during workflow run for debugging --- .github/workflows/github-prerelease.yml | 30 +++++++++++++++++++++++++ .github/workflows/test.yml | 30 +++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/.github/workflows/github-prerelease.yml b/.github/workflows/github-prerelease.yml index 66105da49..b458fc545 100644 --- a/.github/workflows/github-prerelease.yml +++ b/.github/workflows/github-prerelease.yml @@ -54,6 +54,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Build release env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -118,6 +123,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Build installer env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -175,6 +185,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Prepare wix-toolset run: echo "${env:path};${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -237,6 +252,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Prepare wix-toolset run: echo "${env:path};${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -331,6 +351,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Build installer env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -398,6 +423,11 @@ jobs: ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" generateLicenseReport --info --full-stacktrace ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" :serverpackcreator-app:build :serverpackcreator-app:copyDependencies :serverpackcreator-app:copyJar --info --full-stacktrace + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Build Image run: | IFS="-" read -ra VERSION <<<"${{ needs.preparations.outputs.version }}" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab697ec32..addce8c4d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,6 +31,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Build with Gradle run: | ./gradlew -Pversion=${{ steps.branch-name.outputs.current_branch }} generateLicenseReport --info --full-stacktrace @@ -77,6 +82,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Build installer env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -123,6 +133,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Prepare wix-toolset if: matrix.os == 'windows-latest' run: echo "${env:path};${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -174,6 +189,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Prepare wix-toolset if: matrix.os == 'windows-latest' run: echo "${env:path};${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -256,6 +276,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Build installer env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -303,6 +328,11 @@ jobs: with: gradle-version: wrapper + - name: Where are you, you little... + run: | + echo $JAVA_HOME + echo ${{ steps.java.outputs.path }} + - name: Prepare env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} From a24380d851ae2ee204ab46c691d3f5463fbdf970 Mon Sep 17 00:00:00 2001 From: Griefed Date: Tue, 7 Nov 2023 23:23:43 +0100 Subject: [PATCH 3/7] Try Zulu and $JAVA_HOME for ubuntu-02 --- .github/workflows/test.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index addce8c4d..88bffabb9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,7 @@ jobs: run: | echo $JAVA_HOME echo ${{ steps.java.outputs.path }} - + - name: Build with Gradle run: | ./gradlew -Pversion=${{ steps.branch-name.outputs.current_branch }} generateLicenseReport --info --full-stacktrace @@ -135,7 +135,7 @@ jobs: - name: Where are you, you little... run: | - echo $JAVA_HOME + echo %JAVA_HOME% echo ${{ steps.java.outputs.path }} - name: Prepare wix-toolset @@ -191,7 +191,7 @@ jobs: - name: Where are you, you little... run: | - echo $JAVA_HOME + echo %JAVA_HOME% echo ${{ steps.java.outputs.path }} - name: Prepare wix-toolset @@ -228,6 +228,7 @@ jobs: --verbose - name: List + if: ${{ always() }} run: dir serverpackcreator-app\build\dist - name: Archive @@ -316,7 +317,7 @@ jobs: id: java uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -356,13 +357,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 From 31d947b8bf60f48c245e79854850cb8a836974b7 Mon Sep 17 00:00:00 2001 From: Griefed Date: Tue, 7 Nov 2023 23:38:03 +0100 Subject: [PATCH 4/7] ci: Move back to Zulu. Always generate release, even when some assets fail. --- .github/workflows/github-prerelease.yml | 45 +++++-------------------- .github/workflows/github_release.yml | 17 +++++----- .github/workflows/test.yml | 40 +++------------------- 3 files changed, 22 insertions(+), 80 deletions(-) diff --git a/.github/workflows/github-prerelease.yml b/.github/workflows/github-prerelease.yml index b458fc545..e256e6f03 100644 --- a/.github/workflows/github-prerelease.yml +++ b/.github/workflows/github-prerelease.yml @@ -43,7 +43,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true @@ -54,11 +54,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Build release env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -112,7 +107,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true @@ -123,11 +118,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Build installer env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -174,7 +164,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true @@ -185,11 +175,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Prepare wix-toolset run: echo "${env:path};${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -240,7 +225,7 @@ jobs: id: java uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -252,11 +237,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Prepare wix-toolset run: echo "${env:path};${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -340,7 +320,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true @@ -351,11 +331,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Build installer env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -403,7 +378,7 @@ jobs: id: java uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -423,11 +398,6 @@ jobs: ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" generateLicenseReport --info --full-stacktrace ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" :serverpackcreator-app:build :serverpackcreator-app:copyDependencies :serverpackcreator-app:copyJar --info --full-stacktrace - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Build Image run: | IFS="-" read -ra VERSION <<<"${{ needs.preparations.outputs.version }}" @@ -444,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" \ @@ -506,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 index 836af23d8..5cc9a7202 100644 --- a/.github/workflows/github_release.yml +++ b/.github/workflows/github_release.yml @@ -41,7 +41,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true @@ -105,7 +105,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true @@ -162,7 +162,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true @@ -223,7 +223,7 @@ jobs: id: java uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -317,7 +317,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true @@ -375,7 +375,7 @@ jobs: id: java uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -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 index 88bffabb9..fbb63f99e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -31,11 +31,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Build with Gradle run: | ./gradlew -Pversion=${{ steps.branch-name.outputs.current_branch }} generateLicenseReport --info --full-stacktrace @@ -70,7 +65,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -82,11 +77,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Build installer env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -121,7 +111,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -133,11 +123,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo %JAVA_HOME% - echo ${{ steps.java.outputs.path }} - - name: Prepare wix-toolset if: matrix.os == 'windows-latest' run: echo "${env:path};${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -177,7 +162,7 @@ jobs: id: java uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -189,11 +174,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo %JAVA_HOME% - echo ${{ steps.java.outputs.path }} - - name: Prepare wix-toolset if: matrix.os == 'windows-latest' run: echo "${env:path};${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -265,7 +245,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3.13.0 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' check-latest: true cache: 'gradle' @@ -277,11 +257,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Build installer env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} @@ -329,11 +304,6 @@ jobs: with: gradle-version: wrapper - - name: Where are you, you little... - run: | - echo $JAVA_HOME - echo ${{ steps.java.outputs.path }} - - name: Prepare env: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} From faacae1ec448ac6cae4e1720a7133bc5deaa54cb Mon Sep 17 00:00:00 2001 From: Griefed Date: Tue, 7 Nov 2023 23:38:22 +0100 Subject: [PATCH 5/7] fix: Add non-localized key --- .../jpackagerResources/ServerPackCreator.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop b/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop index 360537334..0e13fc744 100644 --- a/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop +++ b/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=ServerPackCreator Comment=Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks. +GenericName=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 From adfcb7b8a3f9adfac294d90e05019ce30950401c Mon Sep 17 00:00:00 2001 From: Griefed Date: Tue, 7 Nov 2023 23:43:04 +0100 Subject: [PATCH 6/7] fix: Add another missing key. List supported loaders. --- .github/workflows/github-prerelease.yml | 4 ++-- .github/workflows/github_release.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- serverpackcreator-app/build.gradle.kts | 2 +- .../jpackagerResources/ServerPackCreator.desktop | 8 ++++---- serverpackcreator-app/jpackagerResources/launcher.desktop | 7 ++++--- serverpackcreator-web-frontend/package.json | 2 +- serverpackcreator-web-frontend/quasar.conf.js | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/github-prerelease.yml b/.github/workflows/github-prerelease.yml index e256e6f03..a69423464 100644 --- a/.github/workflows/github-prerelease.yml +++ b/.github/workflows/github-prerelease.yml @@ -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" ` @@ -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 \ diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml index 5cc9a7202..fe3b8efb8 100644 --- a/.github/workflows/github_release.yml +++ b/.github/workflows/github_release.yml @@ -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" ` @@ -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 \ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fbb63f99e..7ce326ca6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -191,7 +191,7 @@ jobs: 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" ` @@ -317,7 +317,7 @@ jobs: 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 \ diff --git a/serverpackcreator-app/build.gradle.kts b/serverpackcreator-app/build.gradle.kts index 9e973bba0..8751d8d5e 100644 --- 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 index 0e13fc744..1c2756941 100644 --- a/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop +++ b/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Name=ServerPackCreator -Comment=Create server packs from Minecraft Forge, Fabric, Quilt or LegacyFabric modpacks. -GenericName=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. +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=/opt/serverpackcreator/bin/ServerPackCreator Icon=/opt/serverpackcreator/lib/ServerPackCreator.png Terminal=false diff --git a/serverpackcreator-app/jpackagerResources/launcher.desktop b/serverpackcreator-app/jpackagerResources/launcher.desktop index 360537334..1c2756941 100644 --- a/serverpackcreator-app/jpackagerResources/launcher.desktop +++ b/serverpackcreator-app/jpackagerResources/launcher.desktop @@ -1,8 +1,9 @@ [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. +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=/opt/serverpackcreator/bin/ServerPackCreator Icon=/opt/serverpackcreator/lib/ServerPackCreator.png Terminal=false diff --git a/serverpackcreator-web-frontend/package.json b/serverpackcreator-web-frontend/package.json index c1a5ac819..f1dcbc4f9 100644 --- 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 index ae3348cc0..c6b13484b 100644 --- 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', From 1ee1f2eabbb8ff519779d907bd7d7cf458612590 Mon Sep 17 00:00:00 2001 From: Griefed Date: Tue, 7 Nov 2023 23:51:08 +0100 Subject: [PATCH 7/7] revert: Revert Exec and Icon to previous --- .../jpackagerResources/ServerPackCreator.desktop | 4 ++-- serverpackcreator-app/jpackagerResources/launcher.desktop | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop b/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop index 1c2756941..6debf57b9 100644 --- a/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop +++ b/serverpackcreator-app/jpackagerResources/ServerPackCreator.desktop @@ -4,8 +4,8 @@ Comment=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or Leg 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=/opt/serverpackcreator/bin/ServerPackCreator -Icon=/opt/serverpackcreator/lib/ServerPackCreator.png +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 index 1c2756941..6debf57b9 100644 --- a/serverpackcreator-app/jpackagerResources/launcher.desktop +++ b/serverpackcreator-app/jpackagerResources/launcher.desktop @@ -4,8 +4,8 @@ Comment=Create server packs from Minecraft Forge, NeoForge, Fabric, Quilt or Leg 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=/opt/serverpackcreator/bin/ServerPackCreator -Icon=/opt/serverpackcreator/lib/ServerPackCreator.png +Exec=ServerPackCreator +Icon=ServerPackCreator Terminal=false Type=Application Categories=Utility;FileTools;Java;