Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/>

# Weave Loader, A Universal Minecraft Mod Loader
## Weave Loader 0.2.7 fix (named it 0.2.9 because 0.2.8 already exists)

Weave Loader is a tool designed to simplify the process of modding Minecraft. It allows
developers to easily create mods by providing a simple and intuitive API for interacting with Minecraft's codebase,
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ kotlin.code.style = official
# Project properties
projectName = Weave-Loader
projectGroup = net.weavemc
projectVersion = 0.2.8
projectVersion = 0.2.9
14 changes: 14 additions & 0 deletions src/main/kotlin/net/weavemc/loader/WeaveLoader.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import net.weavemc.loader.bootstrap.URLClassLoaderAccessor
import net.weavemc.loader.mixins.WeaveMixinService
import net.weavemc.loader.mixins.WeaveMixinTransformer
import org.spongepowered.asm.launch.MixinBootstrap
import org.spongepowered.asm.mixin.MixinEnvironment
import org.spongepowered.asm.mixin.Mixins
import org.spongepowered.asm.service.MixinService
import java.lang.instrument.Instrumentation
Expand Down Expand Up @@ -38,9 +39,11 @@ public object WeaveLoader {
@OptIn(ExperimentalSerializationApi::class)
public fun init(inst: Instrumentation) {
println("[Weave] Initializing Weave")
println("[Weave] 0.2.7 legacy-weave fixed for modern lunar - hi from @jiminnn")

MixinBootstrap.init()
check(MixinService.getService() is WeaveMixinService) { "Active mixin service is NOT WeaveMixinService" }
ensureDefaultMixinPhase()

inst.addTransformer(WeaveMixinTransformer)
inst.addTransformer(HookManager)
Expand Down Expand Up @@ -105,6 +108,17 @@ public object WeaveLoader {
createDirectories(Paths.get(System.getProperty("user.home"), ".weave", "mods")
.apply { if (exists() && !isDirectory()) Files.delete(this) })


private fun ensureDefaultMixinPhase() {
// Legacy loader is initialized late in Lunar. Ensure mixin's active phase matches the environment
// our transformer supplies to avoid "Current environment must match the supplied environment".
MixinEnvironment.init(MixinEnvironment.Phase.DEFAULT)
runCatching {
MixinEnvironment::class.java.getDeclaredMethod("gotoPhase", MixinEnvironment.Phase::class.java)
.also { it.isAccessible = true }
.invoke(null, MixinEnvironment.Phase.DEFAULT)
}
}
private inline fun <reified T> instantiate(className: String): T =
Class.forName(className)
.getConstructor()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ internal object WeaveMixinTransformer: SafeTransformer {
*/
override fun transform(loader: ClassLoader, className: String, originalClass: ByteArray): ByteArray? {
return WeaveMixinService.transformer.transformClass(
MixinEnvironment.getDefaultEnvironment(),
MixinEnvironment.getCurrentEnvironment(),
className.replace('/', '.'),
originalClass
)
Expand Down