From 2da9f2178402043694370b674cddcd8b80852fa6 Mon Sep 17 00:00:00 2001
From: hypherionmc <hypherionmc@gmail.com>
Date: Tue, 9 Jul 2024 22:58:12 +0200
Subject: [PATCH] [DEV] Update modpublisher and fix nightbloom configs for
 jenkins

---
 .gitattributes                                     | 2 +-
 1.18.2/.jenkins/Jenkinsfile.snapshot               | 1 +
 1.18.2/build.gradle                                | 2 +-
 1.19.2/.jenkins/Jenkinsfile.snapshot               | 1 +
 1.19.2/build.gradle                                | 2 +-
 1.19.3/.jenkins/Jenkinsfile.snapshot               | 1 +
 1.19.3/build.gradle                                | 2 +-
 1.20.2/.jenkins/Jenkinsfile.snapshot               | 1 +
 1.20.2/build.gradle                                | 2 +-
 1.20.4/.jenkins/Jenkinsfile.snapshot               | 1 +
 1.20.4/build.gradle                                | 2 +-
 1.20/.jenkins/Jenkinsfile.snapshot                 | 1 +
 1.20/build.gradle                                  | 2 +-
 1.21/.jenkins/Jenkinsfile.snapshot                 | 1 +
 1.21/build.gradle                                  | 2 +-
 commit.sha                                         | 2 +-
 patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch | 4 +++-
 patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch | 4 +++-
 patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch | 4 +++-
 patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch | 4 +++-
 patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch | 4 +++-
 patches/1.20/.jenkins/Jenkinsfile.snapshot.patch   | 4 +++-
 patches/1.21/.jenkins/Jenkinsfile.snapshot.patch   | 4 +++-
 23 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 20fc528..603528e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,7 +2,7 @@
 *.bat text eol=crlf
 *.patch text eol=lf
 *.java text eol=lf
-*.gradle text eol=crlf
+*.gradle text eol=lf
 *.png binary
 *.gif binary
 *.exe binary
diff --git a/1.18.2/.jenkins/Jenkinsfile.snapshot b/1.18.2/.jenkins/Jenkinsfile.snapshot
index 16cc9ff..deb951d 100644
--- a/1.18.2/.jenkins/Jenkinsfile.snapshot
+++ b/1.18.2/.jenkins/Jenkinsfile.snapshot
@@ -63,6 +63,7 @@ pipeline {
                     modLoaders: "${modLoaders}",
                     minecraftVersions: "${supportedMc}",
                     type: "snapshot",
+                    dependsOn: "",
                     failWebhook: env.SSS_WEBHOOK,
                     publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 
diff --git a/1.18.2/build.gradle b/1.18.2/build.gradle
index 4ad6efb..3fb1410 100644
--- a/1.18.2/build.gradle
+++ b/1.18.2/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id "xyz.wagyourtail.unimined" version "1.2.4" apply false
-    id "com.hypherionmc.modutils.modpublisher" version "2.1.5"
+    id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
     id "com.hypherionmc.modutils.orion" version "1.0.+"
     id 'maven-publish'
 }
diff --git a/1.19.2/.jenkins/Jenkinsfile.snapshot b/1.19.2/.jenkins/Jenkinsfile.snapshot
index 1f77a4c..b607fc4 100644
--- a/1.19.2/.jenkins/Jenkinsfile.snapshot
+++ b/1.19.2/.jenkins/Jenkinsfile.snapshot
@@ -63,6 +63,7 @@ pipeline {
                     modLoaders: "${modLoaders}",
                     minecraftVersions: "${supportedMc}",
                     type: "snapshot",
+                    dependsOn: "",
                     failWebhook: env.SSS_WEBHOOK,
                     publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 
diff --git a/1.19.2/build.gradle b/1.19.2/build.gradle
index fb871c4..f099442 100644
--- a/1.19.2/build.gradle
+++ b/1.19.2/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id "xyz.wagyourtail.unimined" version "1.2.4" apply false
-    id "com.hypherionmc.modutils.modpublisher" version "2.1.5"
+    id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
     id "com.hypherionmc.modutils.orion" version "1.0.+"
     id 'maven-publish'
 }
diff --git a/1.19.3/.jenkins/Jenkinsfile.snapshot b/1.19.3/.jenkins/Jenkinsfile.snapshot
index 6f14da1..00ddd21 100644
--- a/1.19.3/.jenkins/Jenkinsfile.snapshot
+++ b/1.19.3/.jenkins/Jenkinsfile.snapshot
@@ -63,6 +63,7 @@ pipeline {
                     modLoaders: "${modLoaders}",
                     minecraftVersions: "${supportedMc}",
                     type: "snapshot",
+                    dependsOn: "",
                     failWebhook: env.SSS_WEBHOOK,
                     publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 
diff --git a/1.19.3/build.gradle b/1.19.3/build.gradle
index fb871c4..f099442 100644
--- a/1.19.3/build.gradle
+++ b/1.19.3/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id "xyz.wagyourtail.unimined" version "1.2.4" apply false
-    id "com.hypherionmc.modutils.modpublisher" version "2.1.5"
+    id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
     id "com.hypherionmc.modutils.orion" version "1.0.+"
     id 'maven-publish'
 }
diff --git a/1.20.2/.jenkins/Jenkinsfile.snapshot b/1.20.2/.jenkins/Jenkinsfile.snapshot
index 9d55c95..e0ecf75 100644
--- a/1.20.2/.jenkins/Jenkinsfile.snapshot
+++ b/1.20.2/.jenkins/Jenkinsfile.snapshot
@@ -63,6 +63,7 @@ pipeline {
                     modLoaders: "${modLoaders}",
                     minecraftVersions: "${supportedMc}",
                     type: "snapshot",
+                    dependsOn: "",
                     failWebhook: env.SSS_WEBHOOK,
                     publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 
diff --git a/1.20.2/build.gradle b/1.20.2/build.gradle
index fb871c4..f099442 100644
--- a/1.20.2/build.gradle
+++ b/1.20.2/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id "xyz.wagyourtail.unimined" version "1.2.4" apply false
-    id "com.hypherionmc.modutils.modpublisher" version "2.1.5"
+    id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
     id "com.hypherionmc.modutils.orion" version "1.0.+"
     id 'maven-publish'
 }
diff --git a/1.20.4/.jenkins/Jenkinsfile.snapshot b/1.20.4/.jenkins/Jenkinsfile.snapshot
index 5e80a68..0e31ba1 100644
--- a/1.20.4/.jenkins/Jenkinsfile.snapshot
+++ b/1.20.4/.jenkins/Jenkinsfile.snapshot
@@ -63,6 +63,7 @@ pipeline {
                     modLoaders: "${modLoaders}",
                     minecraftVersions: "${supportedMc}",
                     type: "snapshot",
+                    dependsOn: "",
                     failWebhook: env.SSS_WEBHOOK,
                     publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 
diff --git a/1.20.4/build.gradle b/1.20.4/build.gradle
index a895967..e7f9017 100644
--- a/1.20.4/build.gradle
+++ b/1.20.4/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id "xyz.wagyourtail.unimined" version "1.2.4" apply false
-    id "com.hypherionmc.modutils.modpublisher" version "2.1.5"
+    id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
     id "com.hypherionmc.modutils.orion" version "1.0.+"
     id 'maven-publish'
 }
diff --git a/1.20/.jenkins/Jenkinsfile.snapshot b/1.20/.jenkins/Jenkinsfile.snapshot
index 444a8f4..738594b 100644
--- a/1.20/.jenkins/Jenkinsfile.snapshot
+++ b/1.20/.jenkins/Jenkinsfile.snapshot
@@ -63,6 +63,7 @@ pipeline {
                     modLoaders: "${modLoaders}",
                     minecraftVersions: "${supportedMc}",
                     type: "snapshot",
+                    dependsOn: "",
                     failWebhook: env.SSS_WEBHOOK,
                     publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 
diff --git a/1.20/build.gradle b/1.20/build.gradle
index 4df0992..5d2a5e0 100644
--- a/1.20/build.gradle
+++ b/1.20/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id "xyz.wagyourtail.unimined" version "1.2.4" apply false
-    id "com.hypherionmc.modutils.modpublisher" version "2.1.5"
+    id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
     id "com.hypherionmc.modutils.orion" version "1.0.+"
     id 'maven-publish'
 }
diff --git a/1.21/.jenkins/Jenkinsfile.snapshot b/1.21/.jenkins/Jenkinsfile.snapshot
index 314985e..43b1dab 100644
--- a/1.21/.jenkins/Jenkinsfile.snapshot
+++ b/1.21/.jenkins/Jenkinsfile.snapshot
@@ -63,6 +63,7 @@ pipeline {
                     modLoaders: "${modLoaders}",
                     minecraftVersions: "${supportedMc}",
                     type: "snapshot",
+                    dependsOn: "",
                     failWebhook: env.SSS_WEBHOOK,
                     publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 
diff --git a/1.21/build.gradle b/1.21/build.gradle
index ebd4ace..c4a979f 100644
--- a/1.21/build.gradle
+++ b/1.21/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id "xyz.wagyourtail.unimined" version "1.2.4" apply false
-    id "com.hypherionmc.modutils.modpublisher" version "2.1.5"
+    id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
     id "com.hypherionmc.modutils.orion" version "1.0.+"
     id 'maven-publish'
 }
diff --git a/commit.sha b/commit.sha
index 00c18cf..d930b13 100644
--- a/commit.sha
+++ b/commit.sha
@@ -1 +1 @@
-d21bf13b4afa32351f0666b852a93e49564908a0
\ No newline at end of file
+431400947954357e9afe1a9e3fbddc9c67d05fca
\ No newline at end of file
diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
index c2f0420..0a87493 100644
--- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -40,7 +40,7 @@
                  }
              }
          }
-@@ -48,20 +52,22 @@
+@@ -48,21 +52,23 @@
  
      post {
          always {
@@ -54,6 +54,7 @@
 -                modLoaders: "${modLoaders}",
 -                minecraftVersions: "${supportedMc}",
 -                type: "snapshot",
+-                dependsOn: "",
 -                failWebhook: env.SSS_WEBHOOK,
 -                publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 -
@@ -69,6 +70,7 @@
 +                    modLoaders: "${modLoaders}",
 +                    minecraftVersions: "${supportedMc}",
 +                    type: "snapshot",
++                    dependsOn: "",
 +                    failWebhook: env.SSS_WEBHOOK,
 +                    publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 +
diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
index c3d3e02..43a8aa4 100644
--- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -40,7 +40,7 @@
                  }
              }
          }
-@@ -48,20 +52,22 @@
+@@ -48,21 +52,23 @@
  
      post {
          always {
@@ -54,6 +54,7 @@
 -                modLoaders: "${modLoaders}",
 -                minecraftVersions: "${supportedMc}",
 -                type: "snapshot",
+-                dependsOn: "",
 -                failWebhook: env.SSS_WEBHOOK,
 -                publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 -
@@ -69,6 +70,7 @@
 +                    modLoaders: "${modLoaders}",
 +                    minecraftVersions: "${supportedMc}",
 +                    type: "snapshot",
++                    dependsOn: "",
 +                    failWebhook: env.SSS_WEBHOOK,
 +                    publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 +
diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
index f2713a7..72841ab 100644
--- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
@@ -40,7 +40,7 @@
                  }
              }
          }
-@@ -48,20 +52,22 @@
+@@ -48,21 +52,23 @@
  
      post {
          always {
@@ -54,6 +54,7 @@
 -                modLoaders: "${modLoaders}",
 -                minecraftVersions: "${supportedMc}",
 -                type: "snapshot",
+-                dependsOn: "",
 -                failWebhook: env.SSS_WEBHOOK,
 -                publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 -
@@ -69,6 +70,7 @@
 +                    modLoaders: "${modLoaders}",
 +                    minecraftVersions: "${supportedMc}",
 +                    type: "snapshot",
++                    dependsOn: "",
 +                    failWebhook: env.SSS_WEBHOOK,
 +                    publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 +
diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
index 6c7b958..4f29309 100644
--- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -40,7 +40,7 @@
                  }
              }
          }
-@@ -48,20 +52,22 @@
+@@ -48,21 +52,23 @@
  
      post {
          always {
@@ -54,6 +54,7 @@
 -                modLoaders: "${modLoaders}",
 -                minecraftVersions: "${supportedMc}",
 -                type: "snapshot",
+-                dependsOn: "",
 -                failWebhook: env.SSS_WEBHOOK,
 -                publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 -
@@ -69,6 +70,7 @@
 +                    modLoaders: "${modLoaders}",
 +                    minecraftVersions: "${supportedMc}",
 +                    type: "snapshot",
++                    dependsOn: "",
 +                    failWebhook: env.SSS_WEBHOOK,
 +                    publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 +
diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
index da22ea3..2256e1d 100644
--- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
@@ -40,7 +40,7 @@
                  }
              }
          }
-@@ -48,20 +52,22 @@
+@@ -48,21 +52,23 @@
  
      post {
          always {
@@ -54,6 +54,7 @@
 -                modLoaders: "${modLoaders}",
 -                minecraftVersions: "${supportedMc}",
 -                type: "snapshot",
+-                dependsOn: "",
 -                failWebhook: env.SSS_WEBHOOK,
 -                publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 -
@@ -69,6 +70,7 @@
 +                    modLoaders: "${modLoaders}",
 +                    minecraftVersions: "${supportedMc}",
 +                    type: "snapshot",
++                    dependsOn: "",
 +                    failWebhook: env.SSS_WEBHOOK,
 +                    publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 +
diff --git a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
index e570f9e..003cf75 100644
--- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
@@ -40,7 +40,7 @@
                  }
              }
          }
-@@ -48,20 +52,22 @@
+@@ -48,21 +52,23 @@
  
      post {
          always {
@@ -54,6 +54,7 @@
 -                modLoaders: "${modLoaders}",
 -                minecraftVersions: "${supportedMc}",
 -                type: "snapshot",
+-                dependsOn: "",
 -                failWebhook: env.SSS_WEBHOOK,
 -                publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 -
@@ -69,6 +70,7 @@
 +                    modLoaders: "${modLoaders}",
 +                    minecraftVersions: "${supportedMc}",
 +                    type: "snapshot",
++                    dependsOn: "",
 +                    failWebhook: env.SSS_WEBHOOK,
 +                    publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 +
diff --git a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
index 7113928..356eee3 100644
--- a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
@@ -33,7 +33,7 @@
                  }
              }
          }
-@@ -48,20 +52,22 @@
+@@ -48,21 +52,23 @@
  
      post {
          always {
@@ -47,6 +47,7 @@
 -                modLoaders: "${modLoaders}",
 -                minecraftVersions: "${supportedMc}",
 -                type: "snapshot",
+-                dependsOn: "",
 -                failWebhook: env.SSS_WEBHOOK,
 -                publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 -
@@ -62,6 +63,7 @@
 +                    modLoaders: "${modLoaders}",
 +                    minecraftVersions: "${supportedMc}",
 +                    type: "snapshot",
++                    dependsOn: "",
 +                    failWebhook: env.SSS_WEBHOOK,
 +                    publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 +