Merge branch 'main' into scala

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

@@ -5,7 +5,7 @@ plugins {
     id 'maven-publish'
     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'
 }
 
@@ -211,16 +211,6 @@ shadowJar {
     archiveClassifier = "shadow"
 }
 
-
-tasks.named(remapTaskName).configure {
-    doFirst {
-        logging.captureStandardOutput LogLevel.INFO
-    }
-    doLast {
-        logging.captureStandardOutput LogLevel.QUIET
-    }
-}
-
 compileTestJava {
     sourceCompatibility = targetCompatibility = JavaVersion.VERSION_25
 }

gradle/scripts/dependencies.gradle

@@ -25,8 +25,9 @@ dependencies {
     if (enable_lwjglx.toBoolean()) {
         compileOnly "com.cleanroommc:lwjglx:1.0.0"
     }
-
+    
     modRuntimeOnly "com.cleanroommc:scalar:1.0.0"
+    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
@@ -49,6 +50,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)