From 2a27d25d9bce6a9d91c97a1d1fd5b66689f3ebab Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Mon, 17 Jun 2024 17:22:06 +0200
Subject: [PATCH] also upload bungee/spigot/velocity

---
 bootstrap/bungeecord/build.gradle.kts              |  5 +++++
 bootstrap/mod/build.gradle.kts                     |  3 ---
 bootstrap/mod/fabric/build.gradle.kts              |  1 +
 bootstrap/mod/neoforge/build.gradle.kts            |  1 +
 bootstrap/spigot/build.gradle.kts                  |  5 +++++
 bootstrap/velocity/build.gradle.kts                |  5 +++++
 .../kotlin/geyser.modded-conventions.gradle.kts    |  5 -----
 .../kotlin/geyser.modrinth-uploading.gradle.kts    |  2 +-
 build.gradle.kts                                   | 14 ++++++++++++++
 9 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/bootstrap/bungeecord/build.gradle.kts b/bootstrap/bungeecord/build.gradle.kts
index e93c096a1..910e50723 100644
--- a/bootstrap/bungeecord/build.gradle.kts
+++ b/bootstrap/bungeecord/build.gradle.kts
@@ -34,3 +34,8 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
         exclude(dependency("io.netty:netty-resolver-dns:.*"))
     }
 }
+
+modrinth {
+    uploadFile.set(tasks.getByPath("shadowJar"))
+    loaders.add("bungeecord")
+}
diff --git a/bootstrap/mod/build.gradle.kts b/bootstrap/mod/build.gradle.kts
index dd0bb5635..32224d00b 100644
--- a/bootstrap/mod/build.gradle.kts
+++ b/bootstrap/mod/build.gradle.kts
@@ -11,9 +11,6 @@ afterEvaluate {
     tasks.named("remapModrinthJar").configure {
         enabled = false
     }
-    tasks.named("modrinth").configure {
-        enabled = false
-    }
 }
 
 dependencies {
diff --git a/bootstrap/mod/fabric/build.gradle.kts b/bootstrap/mod/fabric/build.gradle.kts
index cd513c1e4..25bd0af9d 100644
--- a/bootstrap/mod/fabric/build.gradle.kts
+++ b/bootstrap/mod/fabric/build.gradle.kts
@@ -63,6 +63,7 @@ tasks {
 
 modrinth {
     loaders.add("fabric")
+    uploadFile.set(tasks.getByPath("remapModrinthJar"))
     dependencies {
         required.project("fabric-api")
     }
diff --git a/bootstrap/mod/neoforge/build.gradle.kts b/bootstrap/mod/neoforge/build.gradle.kts
index 92ffae7e5..e0e7c2dfa 100644
--- a/bootstrap/mod/neoforge/build.gradle.kts
+++ b/bootstrap/mod/neoforge/build.gradle.kts
@@ -55,4 +55,5 @@ tasks {
 
 modrinth {
     loaders.add("neoforge")
+    uploadFile.set(tasks.getByPath("remapModrinthJar"))
 }
\ No newline at end of file
diff --git a/bootstrap/spigot/build.gradle.kts b/bootstrap/spigot/build.gradle.kts
index 7ccb50484..fcb85f100 100644
--- a/bootstrap/spigot/build.gradle.kts
+++ b/bootstrap/spigot/build.gradle.kts
@@ -76,3 +76,8 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
         exclude(dependency("com.mojang:.*"))
     }
 }
+
+modrinth {
+    uploadFile.set(tasks.getByPath("shadowJar"))
+    loaders.addAll("spigot", "paper")
+}
diff --git a/bootstrap/velocity/build.gradle.kts b/bootstrap/velocity/build.gradle.kts
index da826803c..4daad9784 100644
--- a/bootstrap/velocity/build.gradle.kts
+++ b/bootstrap/velocity/build.gradle.kts
@@ -69,4 +69,9 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
         exclude(dependency("net.kyori:adventure-text-serializer-legacy:.*"))
         exclude(dependency("net.kyori:adventure-nbt:.*"))
     }
+}
+
+modrinth {
+    uploadFile.set(tasks.getByPath("shadowJar"))
+    loaders.addAll("velocity")
 }
\ No newline at end of file
diff --git a/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts b/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
index b59a8d881..7952bcf14 100644
--- a/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
@@ -6,7 +6,6 @@ import org.gradle.kotlin.dsl.maven
 
 plugins {
     id("geyser.publish-conventions")
-    id("geyser.modrinth-uploading")
     id("architectury-plugin")
     id("dev.architectury.loom")
 }
@@ -109,10 +108,6 @@ afterEvaluate {
     }
 }
 
-modrinth {
-    uploadFile.set(tasks.getByPath("remapModrinthJar"))
-}
-
 dependencies {
     minecraft(libs.minecraft)
     mappings(loom.officialMojangMappings())
diff --git a/build-logic/src/main/kotlin/geyser.modrinth-uploading.gradle.kts b/build-logic/src/main/kotlin/geyser.modrinth-uploading.gradle.kts
index 98e69349d..a4a8cd7d6 100644
--- a/build-logic/src/main/kotlin/geyser.modrinth-uploading.gradle.kts
+++ b/build-logic/src/main/kotlin/geyser.modrinth-uploading.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 tasks.modrinth.get().dependsOn(tasks.modrinthSyncBody)
 
 modrinth {
-    token.set(System.getenv("MODRINTH_TOKEN")) // Even though this is the default value, apparently this prevents GitHub Actions caching the token?
+    token.set(System.getenv("MODRINTH_TOKEN") ?: "") // Even though this is the default value, apparently this prevents GitHub Actions caching the token?
     projectId.set("geyser")
     versionNumber.set(project.version as String + "-" + System.getenv("BUILD_NUMBER"))
     versionType.set("beta")
diff --git a/build.gradle.kts b/build.gradle.kts
index dfdff2187..83d8aa053 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,6 +26,14 @@ val moddedPlatforms = setOf(
     projects.mod
 ).map { it.dependencyProject }
 
+val modrinthPlatforms = setOf(
+    projects.bungeecord,
+    projects.fabric,
+    projects.neoforge,
+    projects.spigot,
+    projects.velocity
+).map { it.dependencyProject }
+
 subprojects {
     apply {
         plugin("java-library")
@@ -38,4 +46,10 @@ subprojects {
         in moddedPlatforms -> plugins.apply("geyser.modded-conventions")
         else -> plugins.apply("geyser.base-conventions")
     }
+
+    // Not combined with platform-conventions as that
+    // also contains viaproxy and standalone; both of which we cant publish to modrinth
+    if (modrinthPlatforms.contains(this)) {
+        plugins.apply("geyser.modrinth-uploading")
+    }
 }
\ No newline at end of file