From 9f4ffccfe7c4cbe8f676c368b120aa8a9d185d20 Mon Sep 17 00:00:00 2001
From: MrHua269 <mrhua269@gmail.com>
Date: Fri, 2 May 2025 17:21:46 +0800
Subject: [PATCH] Fix npe while running tasks without private mvn repo
 variables

---
 .github/workflows/build_1.21.4.yml | 11 ++++++-----
 build.gradle.kts                   | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_1.21.4.yml b/.github/workflows/build_1.21.4.yml
index d00e00d..2243898 100644
--- a/.github/workflows/build_1.21.4.yml
+++ b/.github/workflows/build_1.21.4.yml
@@ -26,6 +26,11 @@ jobs:
         run: chmod +x gradlew
       - name: Configure Git User Details
         run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"
+      - name: Set up Environment Variables
+        run: |
+             export PRIVATE_MAVEN_REPO_LINK=${{ secrets.PRIVATE_MAVEN_REPO_LINK }}
+             export PRIVATE_MAVEN_REPO_PASSWORD=${{ secrets.PRIVATE_MAVEN_REPO_PASSWORD }
+             export PRIVATE_MAVEN_REPO_USERNAME=${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }}
       - name: Apply Patches
         run: ./gradlew applyAllPatches
       - name: CreateJar
@@ -33,11 +38,7 @@ jobs:
       - name: Publish to repo
         if: github.event_name != 'pull_request'
         continue-on-error: true
-        run: |
-          export PRIVATE_MAVEN_REPO_LINK=${{ secrets.PRIVATE_MAVEN_REPO_LINK }}
-          export PRIVATE_MAVEN_REPO_PASSWORD=${{ secrets.PRIVATE_MAVEN_REPO_PASSWORD }}
-          export PRIVATE_MAVEN_REPO_USERNAME=${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }}
-          ./gradlew publish -PpublishDevBundle=true
+        run: ./gradlew publish -PpublishDevBundle=true
       - name: Upload Artifact
         uses: "actions/upload-artifact@v4"
         with:
diff --git a/build.gradle.kts b/build.gradle.kts
index 7663f6d..648c367 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -81,11 +81,17 @@ subprojects {
 
     extensions.configure<PublishingExtension> {
         repositories {
-            maven(System.getenv("PRIVATE_MAVEN_REPO_LINK")) {
-                name = "LuminolMC-Private"
-                credentials {
-                    username = System.getenv("PRIVATE_MAVEN_REPO_USERNAME")
-                    password = System.getenv("PRIVATE_MAVEN_REPO_PASSWORD")
+            val privateMvnRepoLink = System.getenv("PRIVATE_MAVEN_REPO_LINK")
+            val privateMvnRepoUsername = System.getenv("PRIVATE_MAVEN_REPO_USERNAME")
+            val privateMvnRepoPassword = System.getenv("PRIVATE_MAVEN_REPO_PASSWORD")
+
+            if (privateMvnRepoLink != null && privateMvnRepoUsername != null && privateMvnRepoPassword != null) {
+                maven(privateMvnRepoLink) {
+                    name = "LuminolMC-Private"
+                    credentials {
+                        username = privateMvnRepoUsername
+                        password = privateMvnRepoPassword
+                    }
                 }
             }
         }