Added the kotlin modloader back

Author: emyfops

common/build.gradle.kts

@@ -20,9 +20,6 @@ dependencies {
     // Do NOT use other classes from fabric loader
     modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
 
-    // Remove the following line if you don't want to depend on the API
-    modApi("dev.architectury:architectury:$architecturyVersion")
-
     // Add dependencies on the required Kotlin modules.
     implementation("org.reflections:reflections:0.10.2")
 

common/src/main/kotlin/com/lambda/Lambda.kt

@@ -5,13 +5,11 @@ import com.google.gson.GsonBuilder
 import com.lambda.config.serializer.BlockPosSerializer
 import com.lambda.config.serializer.BlockSerializer
 import com.lambda.config.serializer.ColorSerializer
-import dev.architectury.platform.Platform
 import net.minecraft.block.Block
 import net.minecraft.client.MinecraftClient
 import net.minecraft.util.math.BlockPos
-import org.apache.logging.log4j.Level
 import org.apache.logging.log4j.LogManager
-import org.apache.logging.log4j.core.Logger
+import org.apache.logging.log4j.Logger
 import java.awt.Color
 
 
@@ -20,8 +18,7 @@ object Lambda {
     const val MOD_ID = "lambda"
     const val SYMBOL = "λ"
     val VERSION: String = LoaderInfo.getVersion()
-    val LOG = (LogManager.getLogger(SYMBOL) as Logger)
-        .apply { level = if (Platform.isDevelopmentEnvironment()) Level.DEBUG else Level.INFO }
+    val LOG: Logger = LogManager.getLogger(SYMBOL)
     val mc: MinecraftClient by lazy { MinecraftClient.getInstance() }
 
     val gson: Gson = GsonBuilder()

common/src/main/kotlin/com/lambda/util/FolderRegister.kt

@@ -1,9 +1,9 @@
 package com.lambda.util
 
+import com.lambda.Lambda.mc
 import com.lambda.util.FolderRegister.config
 import com.lambda.util.FolderRegister.lambda
 import com.lambda.util.FolderRegister.minecraft
-import dev.architectury.platform.Platform
 import java.io.File
 
 /**
@@ -14,7 +14,7 @@ import java.io.File
  * @property config The directory for storing configuration files, located within the Lambda directory.
  */
 object FolderRegister {
-    val minecraft: File = Platform.getGameFolder().toFile()
+    val minecraft: File = mc.runDirectory
     val lambda: File = File(minecraft, "lambda")
     val config: File = File(lambda, "config")
 }

fabric/build.gradle.kts

@@ -1,8 +1,7 @@
 val fabricLoaderVersion = property("fabric_loader_version").toString()
 val fabricApiVersion = property("fabric_api_version").toString()
-val kotlinVersion = property("kotlin_version").toString()
-val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
 val architecturyVersion = property("architectury_version").toString()
+val kotlinFabricVersion = property("kotlin_fabric_version").toString()
 
 architectury {
     platformSetupLoomIde()
@@ -24,7 +23,6 @@ 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 {
@@ -34,30 +32,20 @@ fun DependencyHandlerScope.setupConfigurations() {
 
     includeMod.dependencies.forEach {
         modImplementation(it)
-    }
-
-    shadowInclude.dependencies.forEach {
-        implementation(it)
-        shadowCommon(it)
+        include(it)
     }
 }
 
 dependencies {
     // Fabric API (Do not touch)
     modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
 
-    // Remove the following line if you don't want to depend on the API
-    modApi("dev.architectury:architectury-fabric:$architecturyVersion")
-
     // Add dependencies on the required Kotlin modules.
     includeLib("org.reflections:reflections:0.10.2")
     includeLib("org.javassist:javassist:3.28.0-GA")
 
     // Add mods to the mod jar
-    // includeMod(...)
-
-    // Add Kotlin
-    shadowInclude("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+    includeMod("net.fabricmc:fabric-language-kotlin:$kotlinFabricVersion")
 
     // Common (Do not touch)
     common(project(":common", configuration = "namedElements")) { isTransitive = false }

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

@@ -17,6 +17,7 @@
   "entrypoints": {
     "client": [
       {
+        "adapter": "kotlin",
         "value": "com.lambda.fabric.LambdaFabric"
       }
     ]
@@ -27,8 +28,8 @@
   "depends": {
     "fabricloader": ">=0.15.1",
     "fabric-api": ">=0.91.3+1.20.4",
-    "architectury": ">=11.0.8",
     "minecraft": "1.20.4",
+    "fabric-language-kotlin": ">=${kotlin_fabric_version}",
     "java": ">=17"
   }
 }

forge/build.gradle.kts

@@ -1,7 +1,7 @@
 val forgeVersion = property("forge_version").toString()
-val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
 val architecturyVersion = property("architectury_version").toString()
 val mixinExtrasVersion = property("mixinextras_version").toString()
+val kotlinForgeVersion = property("kotlin_forge_version").toString()
 
 architectury {
     platformSetupLoomIde()
@@ -34,6 +34,7 @@ loom {
 
 repositories {
     maven("https://cursemaven.com")
+    maven("https://thedarkcolour.github.io/KotlinForForge/")
 }
 
 val common: Configuration by configurations.creating {
@@ -48,46 +49,34 @@ val shadowInclude: Configuration by configurations.creating
 
 fun DependencyHandlerScope.setupConfigurations() {
     includeLib.dependencies.forEach {
-        implementation(it)
+        forgeRuntimeLibrary(it)
         include(it)
     }
 
-    // Please look at this before yelling at me
-    // https://docs.architectury.dev/loom/using_libraries/
     includeMod.dependencies.forEach {
-        implementation(it)
         forgeRuntimeLibrary(it)
         include(it)
     }
-
-    shadowInclude.dependencies.forEach {
-        implementation(it)
-        forgeRuntimeLibrary(it)
-        shadowCommon(it)
-    }
 }
 
 dependencies {
     // Forge API
     forge("net.minecraftforge:forge:$forgeVersion")
 
-    // Remove the following line if you don't want to depend on the 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.28.0-GA")
 
     // Add mods to the mod jar
-    // includeMod(...)
-
-    // Add Kotlin
-    shadowInclude("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+    includeMod("thedarkcolour:kotlinforforge:$kotlinForgeVersion")
 
     // MixinExtras
     implementation("io.github.llamalad7:mixinextras-forge:$mixinExtrasVersion")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:$mixinExtrasVersion")!!)
 
+    // Fix KFF
+    compileOnly(kotlin("stdlib"))
+
     // Common (Do not touch)
     common(project(":common", configuration = "namedElements")) { isTransitive = false }
     shadowCommon(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false }

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

@@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.Mod
 
 
 @Mod(Lambda.MOD_ID)
-class LambdaForge {
+object LambdaForge {
     init {
         Lambda.initialize()
         LOG.info("$MOD_NAME Forge $VERSION initialized.")

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

@@ -1,5 +1,5 @@
-modLoader = "javafml"
-loaderVersion = "[48,)"
+modLoader = "kotlinforforge"
+loaderVersion = "[4.10,)"
 license = "GNU General Public License v3.0"
 issueTrackerURL = "https://github.com/lambda-client/lambda/issues"
 
@@ -27,8 +27,8 @@ issueTrackerURL = "https://github.com/lambda-client/lambda/issues"
     side = "CLIENT"
 
 [[dependencies.lambda]]
-    modId = "architectury"
+    modId = "kotlinforforge"
     mandatory = true
-    versionRange = "[11.0.7,)"
-    ordering = "AFTER"
+    versionRange = "[4.10,)"
+    ordering = "NONE"
     side = "CLIENT"

gradle.properties

@@ -19,9 +19,11 @@ 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
+kotlin_fabric_version=1.10.19+kotlin.1.9.23
 
 # 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

neoforge/build.gradle.kts

@@ -1,7 +1,6 @@
 val neoVersion = property("neo_version").toString()
-val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
 val architecturyVersion = property("architectury_version").toString()
-val mixinExtrasVersion = property("mixinextras_version").toString()
+val kotlinForgeVersion = property("kotlin_forge_version").toString()
 
 architectury {
     platformSetupLoomIde()
@@ -16,6 +15,7 @@ loom {
 
 repositories {
     maven("https://maven.neoforged.net/releases/")
+    maven("https://thedarkcolour.github.io/KotlinForForge/")
 }
 
 val common: Configuration by configurations.creating {
@@ -26,7 +26,6 @@ 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 {
@@ -36,36 +35,21 @@ fun DependencyHandlerScope.setupConfigurations() {
     }
 
     includeMod.dependencies.forEach {
-        modImplementation(it)
-        forgeRuntimeLibrary(it)
-        include(it)
-    }
-
-    shadowInclude.dependencies.forEach {
         implementation(it)
-        forgeRuntimeLibrary(it)
-        shadowCommon(it)
+        include(it)
     }
 }
 
 dependencies {
     // NeoForge API
     neoForge("net.neoforged:neoforge:$neoVersion")
 
-    // Remove the following line if you don't want to depend on the API
-    modApi("dev.architectury:architectury-neoforge:$architecturyVersion")
-
     // Add dependencies on the required Kotlin modules.
     includeLib("org.reflections:reflections:0.10.2")
     includeLib("org.javassist:javassist:3.28.0-GA")
 
     // Add mods to the mod jar
-    // includeMod(...)
-
-    // Add Kotlin
-    shadowInclude("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") {
-        exclude("org.jetbrains", "annotations")
-    }
+    includeMod("thedarkcolour:kotlinforforge-neoforge:$kotlinForgeVersion")
 
     // Common (Do not touch)
     common(project(":common", configuration = "namedElements")) { isTransitive = false }
@@ -89,11 +73,6 @@ tasks {
         }
     }
 
-    shadowJar {
-        relocate("kotlin", "com.lambda.kotlin")
-        relocate("kotlinx", "com.lambda.kotlinx")
-    }
-
     remapJar {
         atAccessWideners.add("lambda.accesswidener")
     }