Fix server-only jars

4 files changed, 12 insertions, 4 deletions

diff --git a/.github/workflows/curseforge.yml b/.github/workflows/curseforge.yml
index 691b9bc46..cd1e832f5 100644
--- a/.github/workflows/curseforge.yml
+++ b/.github/workflows/curseforge.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           java-version: 17
       - name: Upload to CurseForge
-        run: ./gradlew build publish curseforge --stacktrace
+        run: ./gradlew build publish forge:curseforge fabric:curseforge jei-internals-workaround:curseforge --stacktrace
         env:
           danielshe_curse_api_key: ${{ secrets.CF_API_KEY }}
           BRANCH_NAME: ${{ github.ref }}
diff --git a/build.gradle b/build.gradle
index 42239efd0..2b1481aa0 100755
--- a/build.gradle
+++ b/build.gradle
@@ -133,7 +133,8 @@ task releaseOnCf {
     releaseChangelog = changes.toString()
     if (subprojects.any { it.name == "forge" }) {
         dependsOn project("forge").tasks.getByName("curseforge")
-    } else if (subprojects.any { it.name == "fabric" }) {
+    }
+    if (subprojects.any { it.name == "fabric" }) {
         dependsOn project("fabric").tasks.getByName("curseforge")
     }
 }
diff --git a/forge/build.gradle b/forge/build.gradle
index 4ba6977bd..5e68c0dcc 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -16,7 +16,7 @@ configurations {
 }
 
 processResources {
-    filesMatching(["META-INF/mods.toml", "META-INF/mods-server-only.toml"]) {
+    filesMatching("META-INF/mods.toml") {
         expand "version": project.version
     }
     inputs.property "version", project.version
@@ -41,6 +41,13 @@ sourceSets {
     }
 }
 
+processServerComponentResources {
+    filesMatching("META-INF/mods.toml") {
+        expand "version": project.version
+    }
+    inputs.property "version", project.version
+}
+
 loom {
     launches {
         all {
diff --git a/forge/src/serverComponent/resources/META-INF/mods.toml b/forge/src/serverComponent/resources/META-INF/mods.toml
index b57c876f6..6cbbd7cf7 100644
--- a/forge/src/serverComponent/resources/META-INF/mods.toml
+++ b/forge/src/serverComponent/resources/META-INF/mods.toml
@@ -21,7 +21,7 @@ ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.roughlyenoughitems_servercomponent]]
-modId = "cloth-config"
+modId = "cloth_config"
 mandatory = true
 versionRange = "[6.0,)"
 ordering = "NONE"