Fix: Forge dev and prod

Author: emyfops

common/build.gradle.kts

@@ -6,11 +6,12 @@ val kotlinXCoroutineVersion = property("kotlinx_coroutines_version").toString()
 architectury { common("fabric", "forge", "neoforge") }
 
 loom {
+    silentMojangMappingsLicense()
     accessWidenerPath.set(File("src/main/resources/lambda.accesswidener"))
 }
 
 repositories {
-    maven("https://maven.fabricmc.net/") { name = "Fabric" }
+    maven("https://maven.fabricmc.net/")
     maven("https://jitpack.io")
 
     mavenCentral()

forge/build.gradle.kts

@@ -1,5 +1,6 @@
 val forgeVersion = property("forge_version").toString()
 val kotlinForgeVersion = property("kotlin_forge_version").toString()
+val architecturyVersion = property("architectury_version").toString()
 val mixinExtrasVersion = property("mixinextras_version").toString()
 
 architectury {
@@ -36,6 +37,12 @@ repositories {
     maven("https://cursemaven.com")
 }
 
+val common: Configuration by configurations.creating {
+    configurations.compileClasspath.get().extendsFrom(this)
+    configurations.runtimeClasspath.get().extendsFrom(this)
+    configurations["developmentForge"].extendsFrom(this)
+}
+
 val includeLib: Configuration by configurations.creating
 val includeMod: Configuration by configurations.creating
 
@@ -49,28 +56,32 @@ fun DependencyHandlerScope.setupConfigurations() {
     // https://docs.architectury.dev/loom/using_libraries/
     includeMod.dependencies.forEach {
         implementation(it)
-        forgeRuntimeLibrary(it) // Avoid mods not being found in dev environment
+        forgeRuntimeLibrary(it)
     }
 }
 
 dependencies {
     // Forge API
     forge("net.minecraftforge:forge:$forgeVersion")
 
+    // Architectury API
+    modApi("dev.architectury:architectury-forge:$architecturyVersion")
+
     // Add dependencies on the required Kotlin modules.
     includeLib("org.reflections:reflections:0.10.2")
     includeLib("org.javassist:javassist:3.27.0-GA")
 
+    implementation("io.github.llamalad7:mixinextras-forge:$mixinExtrasVersion")
+    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:$mixinExtrasVersion")!!)
+
     // Add mods to the mod jar
     includeMod("thedarkcolour:kotlinforforge:$kotlinForgeVersion")
-    includeMod("io.github.llamalad7:mixinextras-forge:$mixinExtrasVersion")
-    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:$mixinExtrasVersion")!!)
 
     // Bugfixes
     compileOnly(kotlin("stdlib")) // Hack https://github.com/thedarkcolour/KotlinForForge/issues/93
 
     // Common (Do not touch)
-    implementation(project(":common", configuration = "namedElements")) { isTransitive = false } // We cannot common here because it is treated as a different mod and forge will panic
+    common(project(":common", configuration = "namedElements")) { isTransitive = false } // We cannot common here because it is treated as a different mod and forge will panic
     shadowCommon(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false }
 
     // Finish the configuration