Merge branch 'main' into kotlin

Author: kappa-maintainer

README.md

@@ -26,6 +26,8 @@ You can find dependencies block in `gradle/scripts/dependencies.gradle`.
 
 No more `rfg.deobf()` or `fg.deobf`. You **MUST** add mods by using `modImplementation` or `modRuntimeOnly`, or the game will crash when running.
 
+Use `modLibrary` for libs/mods that you don't want to remap.
+
 ### Non-Mod Dependencies
 Two new configuration types `contain` and `shadow` are available, check more details in `dependencies.gradle`.
 
@@ -44,10 +46,11 @@ You should change its location to fit your new package name.
 You can find its template under `src/main/java-templates`.
 
 ### Mixin
-1. Rename json config file to include your modid. You will need one json per phase (`PRE_INIT`, `DEFAULT`, `MOD`) 
-2. Add your mixin classes there.
-3. Use `IMixinConfigPlugin` to control if certain mixin should be enabled. You can call `Loader.isModLoaded()` for `MOD` phase mixins.
-4. Don't worry about refmap, Unimined will handle it automatically. You can still `disableRefmap()` manually though
+1. Rename json config file to use your modid. 
+2. Add **all** your mixin classes there.
+3. Use `IMixinConfigPlugin` to control if certain mixin should be enabled.
+4. mixin classes will be passed to the plugin only when target class is loading, so you don't need to call `Loader.isModLoaded()`
+5. Don't worry about refmap, Unimined will handle it automatically. You can still `disableRefmap()` manually though
 
 ### Access Transformer
 You **MUST** write AT file in MCP name. It will be remapped back to SRG name in artifact jar.

build.gradle.kts

@@ -1,8 +1,8 @@
 import org.jetbrains.gradle.ext.Gradle
 import org.jetbrains.gradle.ext.compiler
 import org.jetbrains.gradle.ext.runConfigurations
-import org.jetbrains.gradle.ext.taskTriggers
 import org.jetbrains.gradle.ext.settings
+import org.jetbrains.gradle.ext.taskTriggers
 
 plugins {
     java
@@ -11,7 +11,7 @@ plugins {
     kotlin("jvm") version "2.4.0"
     id("com.gradleup.shadow") version "9.5.1"
     id("org.jetbrains.gradle.plugin.idea-ext") version "1.4.1"
-    id("xyz.wagyourtail.unimined") version "1.4.35-kappa"
+    id("xyz.wagyourtail.unimined") version "1.4.36-kappa"
     id("net.kyori.blossom") version "2.2.0"
 }
 
@@ -180,9 +180,14 @@ sourceSets {
                 property("mod_name", mod_name)
                 property("mod_version", mod_version)
                 property("mod_description", mod_description)
-                property("mod_authors", mod_authors.takeIf { it.isNotBlank() }
-                    ?.split(",")?.filter { it.isNotBlank() }
-                    ?.joinToString("\", \"") { it.trim() } ?: "")
+                property(
+                    "mod_authors",
+                    mod_authors
+                        .takeIf { it.isNotBlank() }
+                        ?.split(",")
+                        ?.filter { it.isNotBlank() }
+                        ?.joinToString("\", \"") { it.trim() } ?: "",
+                )
                 property("mod_credits", mod_credits)
                 property("mod_url", mod_url)
                 property("mod_update_json", mod_update_json)
@@ -204,15 +209,21 @@ idea {
     project {
         settings {
             runConfigurations {
-                add(Gradle("1. Build").apply {
-                    setProperty("taskNames", listOf("build"))
-                })
-                add(Gradle("2. Run Client").apply {
-                    setProperty("taskNames", listOf("runClient"))
-                })
-                add(Gradle("3. Run Server").apply {
-                    setProperty("taskNames", listOf("runServer"))
-                })
+                add(
+                    Gradle("1. Build").apply {
+                        setProperty("taskNames", listOf("build"))
+                    },
+                )
+                add(
+                    Gradle("2. Run Client").apply {
+                        setProperty("taskNames", listOf("runClient"))
+                    },
+                )
+                add(
+                    Gradle("3. Run Server").apply {
+                        setProperty("taskNames", listOf("runServer"))
+                    },
+                )
             }
             compiler.javac {
                 afterEvaluate {
@@ -263,15 +274,6 @@ tasks.shadowJar {
     archiveClassifier = "shadow"
 }
 
-tasks.named(remapTaskName) {
-    doFirst {
-        logging.captureStandardOutput(LogLevel.INFO)
-    }
-    doLast {
-        logging.captureStandardOutput(LogLevel.QUIET)
-    }
-}
-
 java {
     sourceCompatibility = JavaVersion.VERSION_25
     targetCompatibility = JavaVersion.VERSION_25

buildSrc/src/main/kotlin/dependencies.gradle.kts

@@ -33,8 +33,8 @@ dependencies {
         compileOnly("com.cleanroommc:lwjglx:1.0.0")
     }
 
-    add("modImplementation", "io.github.chaosunity.forgelin:Forgelin-Continuous:2.4.0.0")
-    add("modImplementation", "mezz:jei:4.33.0:dev")
+    add("modLibrary", "io.github.chaosunity.forgelin:Forgelin-Continuous:2.4.0.0:dev")
+    add("modLibrary", "mezz:jei:4.33.0:dev")
 
     // Example - Dependency descriptor:
     // 'com.google.code.gson:gson:2.8.6' << group: com.google.code.gson, name:gson, version:2.8.6
@@ -57,6 +57,7 @@ dependencies {
     // shadow = bundle dependencies into shadow output artifact (relocation configurable in shadowJar task)
     // modImplementation = mod dependency available at both compile time and runtime
     // modCompileOnly = mod dependency available only at compile time
+    // modLibrary = won't be remap but will be forced injected into classpath later
 
     // Transitive dependencies:
     // (Dependencies that your dependency depends on)

src/main/kotlin/com/example/modid/ExampleMod.kt

@@ -10,19 +10,24 @@ import org.apache.logging.log4j.Logger
 
 @Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, version = Reference.VERSION)
 class ExampleMod {
-    
-    val LOGGER: Logger = LogManager.getLogger(Reference.MOD_NAME)
-    @SidedProxy(modId = Reference.MOD_ID, clientSide = "com.example.modid.proxy.ClientProxy", serverSide = "com.example.modid.proxy.CommonProxy")
+    val logger: Logger = LogManager.getLogger(Reference.MOD_NAME)
+
+    @SidedProxy(
+        modId = Reference.MOD_ID,
+        clientSide = "com.example.modid.proxy.ClientProxy",
+        serverSide = "com.example.modid.proxy.CommonProxy",
+    )
     var proxy: IProxy? = null
+
     /**
      * [
      * Take a look at how many FMLStateEvents you can listen to via the @Mod.EventHandler annotation here
-    ](https://cleanroommc.com/wiki/forge-mod-development/event#overview) *
+     ](https://cleanroommc.com/wiki/forge-mod-development/event#overview) *
      */
     @Mod.EventHandler
     fun preInit(event: FMLPreInitializationEvent?) {
-        LOGGER.info("Hello From {}!", Reference.MOD_NAME)
-        LOGGER.info("Proxy is {}", proxy)
-        LOGGER.info("Language: {}", Minecraft.getMinecraft().languageManager.currentLanguage)
+        logger.info("Hello From {}!", Reference.MOD_NAME)
+        logger.info("Proxy is {}", proxy)
+        logger.info("Language: {}", Minecraft.getMinecraft().languageManager.currentLanguage)
     }
-}
+}