Merge branch 'develop' into 'main'

Develop See merge request Griefed/ServerPackCreator!604
Griefed · Aug 30, 2024 · 124b035 · 124b035
2 parents 0b318ed + c92e0c0
commit 124b035
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/devbuild.yml b/.github/workflows/devbuild.yml
@@ -70,6 +70,11 @@ jobs:
           title: "Development Build"
           files: |
             continuous/*
+            
+      - name: Delete drafts
+        uses: hugo19941994/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get source archives
         run: |

diff --git a/...eator-api/src/main/kotlin/de/griefed/serverpackcreator/api/config/ConfigurationHandler.kt b/...eator-api/src/main/kotlin/de/griefed/serverpackcreator/api/config/ConfigurationHandler.kt
@@ -1243,9 +1243,13 @@ class ConfigurationHandler(
             log.error("Error acquiring icon.", ex)
         }
         packConfig.name = packConfig.modpackJson!!.get("launcher").get("name").asText()
-        packConfig.projectID = packConfig.modpackJson!!.get("curseForgeProject").get("id").asText()
-        packConfig.versionID = packConfig.modpackJson!!.get("curseForgeFile").get("id").asText()
-        packConfig.source = ModpackSource.CURSEFORGE
+        try {
+            packConfig.projectID = packConfig.modpackJson!!.get("launcher").get("curseForgeProject").get("id").asText()
+            packConfig.versionID = packConfig.modpackJson!!.get("curseForgeFile").get("id").asText()
+            packConfig.source = ModpackSource.CURSEFORGE
+        } catch (ex: Exception) {
+            log.error("Error acquiring modpack-source details. Please report this to ServerPackCreator in GitHub.", ex)
+        }
     }
 
     @Throws(NullPointerException::class)