Refactor!: Single version, removed kotlin modloader

Author: emyfops

build.gradle.kts

@@ -10,7 +10,7 @@ val yarnMappings = property("yarn_mappings").toString()
 val libs = file("libs")
 
 plugins {
-    kotlin("jvm") version "1.9.22"
+    kotlin("jvm") version "1.9.23"
     id("org.jetbrains.dokka") version "1.9.20"
     id("architectury-plugin") version "3.4-SNAPSHOT"
     id("dev.architectury.loom") version "1.5-SNAPSHOT" apply false
@@ -26,14 +26,8 @@ subprojects {
     apply(plugin = "org.jetbrains.dokka")
 
     dependencies {
-        if (path == ":quilt") {
-            "minecraft"("com.mojang:minecraft:1.20.2")
-            "mappings"("net.fabricmc:yarn:1.20.2+build.3:v2")
-        }
-        else {
-            "minecraft"("com.mojang:minecraft:$minecraftVersion")
-            "mappings"("net.fabricmc:yarn:$yarnMappings:v2")
-        }
+        "minecraft"("com.mojang:minecraft:$minecraftVersion")
+        "mappings"("net.fabricmc:yarn:$yarnMappings:v2")
     }
 
     if (path == ":common") return@subprojects

common/build.gradle.kts

@@ -1,17 +1,17 @@
 val fabricLoaderVersion = property("fabric_loader_version").toString()
-val fabricKotlinVersion = property("fabric_kotlin_version").toString()
 val mixinExtrasVersion = property("mixinextras_version").toString()
+val kotlinVersion = property("kotlin_version").toString()
+val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
 val architecturyVersion = property("architectury_version").toString()
 
-architectury { common("fabric", "forge", "neoforge", "quilt") }
+architectury { common("fabric", "forge", "neoforge") }
 
 loom {
     silentMojangMappingsLicense()
     accessWidenerPath.set(File("src/main/resources/lambda.accesswidener"))
 }
 
 repositories {
-    maven("https://impactdevelopment.github.io/maven/")
     maven("https://maven.fabricmc.net/")
 }
 
@@ -25,8 +25,9 @@ dependencies {
 
     // Add dependencies on the required Kotlin modules.
     implementation("org.reflections:reflections:0.10.2")
-    modImplementation("net.fabricmc:fabric-language-kotlin:$fabricKotlinVersion")
-    modImplementation("baritone-api:baritone-api:1.10.2")
+
+    // Add Kotlin
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
 }
 
 // Avoid nested jars

fabric/build.gradle.kts

@@ -1,6 +1,7 @@
 val fabricLoaderVersion = property("fabric_loader_version").toString()
 val fabricApiVersion = property("fabric_api_version").toString()
-val fabricKotlinVersion = property("fabric_kotlin_version").toString()
+val kotlinVersion = property("kotlin_version").toString()
+val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
 val architecturyVersion = property("architectury_version").toString()
 
 architectury {
@@ -15,10 +16,6 @@ loom {
     enableTransitiveAccessWideners.set(true)
 }
 
-repositories {
-    maven("https://impactdevelopment.github.io/maven/")
-}
-
 val common: Configuration by configurations.creating {
     configurations.compileClasspath.get().extendsFrom(this)
     configurations.runtimeClasspath.get().extendsFrom(this)
@@ -27,6 +24,7 @@ val common: Configuration by configurations.creating {
 
 val includeLib: Configuration by configurations.creating
 val includeMod: Configuration by configurations.creating
+val shadowInclude: Configuration by configurations.creating
 
 fun DependencyHandlerScope.setupConfigurations() {
     includeLib.dependencies.forEach {
@@ -37,26 +35,29 @@ fun DependencyHandlerScope.setupConfigurations() {
     includeMod.dependencies.forEach {
         modImplementation(it)
     }
+
+    shadowInclude.dependencies.forEach {
+        implementation(it)
+        shadowCommon(it)
+    }
 }
 
 dependencies {
     // Fabric API (Do not touch)
     modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
-    modApi("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion")
 
     // Remove the following line if you don't want to depend on the API
     modApi("dev.architectury:architectury-fabric:$architecturyVersion")
 
-    // Kotlin for Fabric
-    modImplementation("net.fabricmc:fabric-language-kotlin:$fabricKotlinVersion")
-
     // Add dependencies on the required Kotlin modules.
     includeLib("org.reflections:reflections:0.10.2")
     includeLib("org.javassist:javassist:3.27.0-GA")
-    includeLib("nether-pathfinder:nether-pathfinder:1.4.1")
 
     // Add mods to the mod jar
-    includeMod("baritone-api:baritone-unoptimized-fabric:1.10.2")
+    // includeMod(...)
+
+    // Add Kotlin
+    shadowInclude("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
 
     // Common (Do not touch)
     common(project(":common", configuration = "namedElements")) { isTransitive = false }
@@ -75,7 +76,7 @@ tasks {
             expand(getProperties())
             expand(mutableMapOf(
                 "group" to project.group,
-                "version" to project.version
+                "version" to project.version,
             ))
         }
     }

fabric/src/main/kotlin/com/lambda/fabric/LambdaFabric.kt

@@ -6,7 +6,7 @@ import com.lambda.Lambda.LOG
 import com.lambda.Lambda.MOD_NAME
 import com.lambda.Lambda.VERSION
 
-object LambdaFabric : ClientModInitializer {
+class LambdaFabric : ClientModInitializer {
     override fun onInitializeClient() {
         Lambda.initialize()
         LOG.info("$MOD_NAME Fabric $VERSION initialized.")

fabric/src/main/resources/fabric.mod.json

@@ -17,7 +17,6 @@
   "entrypoints": {
     "client": [
       {
-        "adapter": "kotlin",
         "value": "com.lambda.fabric.LambdaFabric"
       }
     ]
@@ -26,11 +25,10 @@
     "lambda.mixins.common.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.24",
-    "fabric-api": ">=0.83.0+1.20",
-    "architectury": ">=9.0.6",
-    "minecraft": ">=1.20.0",
-    "java": ">=17",
-    "fabric-language-kotlin": ">=${fabric_kotlin_version}"
+    "fabricloader": ">=0.15.1",
+    "fabric-api": ">=0.91.3+1.20.4",
+    "architectury": ">=11.0.8",
+    "minecraft": "1.20.4",
+    "java": ">=17"
   }
 }

forge/build.gradle.kts

@@ -1,5 +1,6 @@
 val forgeVersion = property("forge_version").toString()
-val kotlinForgeVersion = property("kotlin_forge_version").toString()
+val kotlinVersion = property("kotlin_version").toString()
+val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
 val architecturyVersion = property("architectury_version").toString()
 val mixinExtrasVersion = property("mixinextras_version").toString()
 
@@ -33,9 +34,7 @@ loom {
 }
 
 repositories {
-    maven("https://thedarkcolour.github.io/KotlinForForge/")
     maven("https://cursemaven.com")
-    maven("https://impactdevelopment.github.io/maven/")
 }
 
 val common: Configuration by configurations.creating {
@@ -46,6 +45,7 @@ val common: Configuration by configurations.creating {
 
 val includeLib: Configuration by configurations.creating
 val includeMod: Configuration by configurations.creating
+val shadowInclude: Configuration by configurations.creating
 
 fun DependencyHandlerScope.setupConfigurations() {
     includeLib.dependencies.forEach {
@@ -59,6 +59,11 @@ fun DependencyHandlerScope.setupConfigurations() {
         implementation(it)
         forgeRuntimeLibrary(it)
     }
+
+    shadowInclude.dependencies.forEach {
+        implementation(it)
+        shadowCommon(it)
+    }
 }
 
 dependencies {
@@ -70,33 +75,38 @@ dependencies {
 
     // Add dependencies on the required Kotlin modules.
     includeLib("org.reflections:reflections:0.10.2")
-    includeLib("org.javassist:javassist:3.27.0-GA")
-    includeLib("nether-pathfinder:nether-pathfinder:1.4.1")
+    includeLib("org.javassist:javassist:3.30.0-GA")
 
     // Add mods to the mod jar
-    includeMod("thedarkcolour:kotlinforforge:$kotlinForgeVersion")
-    includeMod("baritone:baritone-unoptimized-forge:1.10.2")
+    // includeMod(...)
 
-    // Common (Do not touch)
-    common(project(":common", configuration = "namedElements")) { isTransitive = false }
-    shadowCommon(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false }
+    // Add Kotlin
+    shadowInclude("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
+    shadowInclude("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
 
-    // Others
+    // MixinExtras
     implementation("io.github.llamalad7:mixinextras-forge:$mixinExtrasVersion")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:$mixinExtrasVersion")!!)
-    compileOnly(kotlin("stdlib")) // Hack https://github.com/thedarkcolour/KotlinForForge/issues/93
+
+    // Common (Do not touch)
+    common(project(":common", configuration = "namedElements")) { isTransitive = false }
+    shadowCommon(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false }
 
     // Finish the configuration
     setupConfigurations()
 }
 
 tasks {
     processResources {
+        inputs.property("group", project.group)
         inputs.property("version", project.version)
 
         filesMatching("META-INF/mods.toml") {
             expand(getProperties())
-            expand(mutableMapOf("version" to project.version))
+            expand(mutableMapOf(
+                "group" to project.group,
+                "version" to project.version,
+            ))
         }
     }
 }

forge/src/main/kotlin/com/lambda/forge/LambdaForge.kt

@@ -1,13 +1,14 @@
 package com.lambda.forge
 
-import net.minecraftforge.fml.common.Mod
 import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.Lambda.MOD_NAME
 import com.lambda.Lambda.VERSION
+import net.minecraftforge.fml.common.Mod
+
 
 @Mod(Lambda.MOD_ID)
-object LambdaForge {
+class LambdaForge {
     init {
         Lambda.initialize()
         LOG.info("$MOD_NAME Forge $VERSION initialized.")

forge/src/main/resources/META-INF/mods.toml

@@ -1,41 +1,34 @@
-modLoader = "kotlinforforge"
-loaderVersion = "[4,)"
+modLoader = "javafml"
+loaderVersion = "[48,)"
 license = "GNU General Public License v3.0"
+issueTrackerURL = "https://github.com/lambda-client/lambda/issues
 
 [[mods]]
-modId = "lambda"
-version = "${version}"
-displayName = "Lambda"
-authors = "${authors}"
-description = '''
-'''
-logoFile = "assets/lambda/lambda.png"
-displayTest = "IGNORE_ALL_VERSION"
+    modId = "lambda"
+    version = "${mod_version}"
+    displayName = "Lambda"
+    authors = "${authors}"
+    description = "${mod_description}"
+    logoFile = "assets/lambda/lambda.png"
+    displayTest = "IGNORE_ALL_VERSION"
 
 [[dependencies.lambda]]
-modId = "forge"
-mandatory = true
-versionRange = "[44,)"
-ordering = "NONE"
-side = "CLIENT"
+    modId = "forge"
+    mandatory = true
+    versionRange = "[49,)"
+    ordering = "NONE"
+    side = "CLIENT"
 
 [[dependencies.lambda]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.19.3,1.21)"
-ordering = "NONE"
-side = "CLIENT"
+    modId = "minecraft"
+    mandatory = true
+    versionRange = "[1.20.4,)"
+    ordering = "NONE"
+    side = "CLIENT"
 
 [[dependencies.lambda]]
-modId = "kotlinforforge"
-mandatory = true
-versionRange = "[4,)"
-ordering = "AFTER"
-side = "CLIENT"
-
-[[dependencies.lambda]]
-modId = "architectury"
-mandatory = true
-versionRange = "[7.1.86,)"
-ordering = "AFTER"
-side = "CLIENT"
+    modId = "architectury"
+    mandatory = true
+    versionRange = "[11.0.7,)"
+    ordering = "NONE"
+    side = "CLIENT"

gradle.properties

@@ -8,6 +8,7 @@ authors=Constructor
 # General
 minecraft_version=1.20.4
 mixinextras_version=0.3.5
+kotlin_version=1.9.23
 kotlinx_coroutines_version=1.8.0
 
 # Architectury https://docs.architectury.dev/start
@@ -18,19 +19,16 @@ architectury_version=11.1.13
 fabric_loader_version=0.15.7
 yarn_mappings=1.20.4+build.3
 fabric_api_version=0.96.4+1.20.4
-fabric_kotlin_version=1.10.18+kotlin.1.9.22
 
 # Forge https://files.minecraftforge.net/
 forge_version=1.20.4-49.0.31
-kotlin_forge_version=4.10.0
 
 # NeoForge https://neoforged.net
 neo_version=20.4.196
 
 # Quilt https://quiltmc.org/
 quilt_version=0.24.0
 quilted_fabric_version=8.0.0-alpha.4+0.91.6-1.20.2
-kotlin_quilt_version=3.0.0+kt.1.9.22+flk.1.10.17
 
 # Kotlin https://kotlinlang.org/
 kotlin.code.style=official