Try to fix Forge support

Author: BluSpring

build.gradle.kts

@@ -14,7 +14,7 @@ architectury.common(stonecutter.tree.branches.mapNotNull {
 
 dependencies {
     modCompileOnly("net.fabricmc:fabric-loader:${mod.dep("fabric_loader")}")
-    modCompileOnly("net.fabricmc:fabric-language-kotlin:${mod.dep("fabric_kotlin")}")
+    modCompileOnly("net.fabricmc:fabric-language-kotlin:${mod.dep("fabric_kotlin")}+kotlin.${mod.dep("kotlin")}")
 
     implementation("de.maxhenkel.voicechat:voicechat-api:${mod.dep("voicechat_api")}")
     compileOnly("su.plo.voice.api:server:${mod.dep("plasmo_api")}")

fabric/build.gradle.kts

@@ -42,7 +42,7 @@ repositories {
 dependencies {
     modImplementation("net.fabricmc:fabric-loader:${common.mod.dep("fabric_loader")}")
     modImplementation("net.fabricmc.fabric-api:fabric-api:${common.mod.dep("fabric_api")}")
-    modImplementation("net.fabricmc:fabric-language-kotlin:${common.mod.dep("fabric_kotlin")}")
+    modImplementation("net.fabricmc:fabric-language-kotlin:${common.mod.dep("fabric_kotlin")}+kotlin.${mod.dep("kotlin")}")
 
     modImplementation("com.terraformersmc:modmenu:${common.mod.dep("modmenu")}")
 
@@ -57,7 +57,6 @@ dependencies {
     shadowBundle(project(common.path, "transformProductionFabric")) { isTransitive = false }
 
     modImplementation("xyz.bluspring.modernnetworking:modernnetworking-fabric:${common.mod.dep("modernnetworking")}+${common.mod.dep("modernnetworking_mc")}")!!
-    modImplementation("net.fabricmc:fabric-language-kotlin:${common.mod.dep("fabric_kotlin")}")
 
     modOptional("maven.modrinth:plasmo-voice", "fabric-${mod.commonDep("plasmo_mc", common.mod, minecraftVersion)}-${mod.commonDep("plasmo", common.mod)}", common.mod.prop("proximity_chat") == "plasmo")
     modOptional("maven.modrinth:simple-voice-chat", "fabric-$minecraftVersion-${mod.commonDep("voicechat", common.mod)}", common.mod.prop("proximity_chat") == "svc")

forge/build.gradle.kts

@@ -45,7 +45,7 @@ dependencies {
     commonBundle(project(common.path, "namedElements")) { isTransitive = false }
     shadowBundle(project(common.path, "transformProductionForge")) { isTransitive = false }
 
-    modImplementation("dev.nyon:KotlinLangForge:${common.mod.dep("kotlinlangforge")}-${common.mod.dep("kotlinlangforge_loader")}+forge")
+    modImplementation("dev.nyon:KotlinLangForge:${common.mod.dep("kotlinlangforge")}-k${mod.dep("kotlin")}-${common.mod.dep("kotlinlangforge_loader")}+forge")
     modImplementation("xyz.bluspring.modernnetworking:modernnetworking-forge:${common.mod.dep("modernnetworking")}+${common.mod.dep("modernnetworking_mc")}")!!
 
     modOptional("maven.modrinth:plasmo-voice", "forge-${mod.commonDep("plasmo_mc", common.mod, minecraftVersion)}-${mod.commonDep("plasmo", common.mod)}", common.mod.prop("proximity_chat") == "plasmo")

gradle.properties

@@ -58,7 +58,7 @@ deps.jnr = 2.2.17
 deps.talk_balloons = 1.4.0
 
 # https://modrinth.com/mod/modernnetworking
-deps.modernnetworking = 1.2.4
+deps.modernnetworking = 1.2.5
 deps.modernnetworking_mc = [VERSIONED]
 
 # https://modrinth.com/mod/cloth-config
@@ -73,7 +73,7 @@ deps.fabric_loader = 0.17.3
 deps.fabric_api = [VERSIONED]
 
 # https://modrinth.com/mod/fabric-language-kotlin
-deps.fabric_kotlin = 1.13.7+kotlin.2.2.21
+deps.fabric_kotlin = 1.13.7
 
 # https://modrinth.com/mod/modmenu
 deps.modmenu = [VERSIONED]
@@ -87,7 +87,7 @@ deps.fabric_permissions = [VERSIONED]
 mod.mc_dep_forgelike = [VERSIONED]
 
 # https://modrinth.com/mod/kotlin-lang-forge
-deps.kotlinlangforge = 2.10.6-k2.2.21
+deps.kotlinlangforge = 2.10.6
 deps.kotlinlangforge_loader = [VERSIONED]
 
 

neoforge/build.gradle.kts

@@ -45,7 +45,7 @@ dependencies {
     commonBundle(project(common.path, "namedElements")) { isTransitive = false }
     shadowBundle(project(common.path, "transformProductionNeoForge")) { isTransitive = false }
 
-    modImplementation("dev.nyon:KotlinLangForge:${common.mod.dep("kotlinlangforge")}-${common.mod.dep("kotlinlangforge_loader")}+neoforge")
+    modImplementation("dev.nyon:KotlinLangForge:${common.mod.dep("kotlinlangforge")}-k${mod.dep("kotlin")}-${common.mod.dep("kotlinlangforge_loader")}+neoforge")
     modImplementation("xyz.bluspring.modernnetworking:modernnetworking-neoforge:${common.mod.dep("modernnetworking")}+${common.mod.dep("modernnetworking_mc")}")!!
 
     modOptional("maven.modrinth:plasmo-voice", "neoforge-${mod.commonDep("plasmo_mc", common.mod, minecraftVersion)}-${mod.commonDep("plasmo", common.mod)}", common.mod.prop("proximity_chat") == "plasmo")