From 6e90b5bc999fd007892983d8947df746aa09ebf7 Mon Sep 17 00:00:00 2001
From: ev chang <wyvestbusiness@gmail.com>
Date: Mon, 30 Dec 2024 03:36:04 +0900
Subject: [PATCH] include asm 5.2 to fix mixinextras support

---
 .../main/kotlin/org/polyfrost/gradle/addDependencies.kt   | 1 +
 gradle.properties                                         | 2 +-
 gradle/libs.versions.toml                                 | 2 ++
 versions/build.gradle.kts                                 | 8 ++++++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt b/buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt
index b48767706..c6d06b173 100644
--- a/buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt
+++ b/buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt
@@ -46,6 +46,7 @@ fun Project.provideIncludedDependencies(version: Triple<Int, Int, Int>?, loader:
     if (version == null // legacy dep module
         || (version.first == 1 && version.second <= 12 && loader == "forge")) {
         deps.add(libs.findLibrary("mixin").get().get()) // PolyMixin
+        deps.add(libs.findLibrary("asm").get().get())
     }
     deps.add(libs.findLibrary("mixin-extras").get().get())
     val actualDeps = mutableListOf<OCDependency>()
diff --git a/gradle.properties b/gradle.properties
index 0298c1d86..a6898d7a8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ name=OneConfig
 mod_id=oneconfig
 version_major=1
 version_minor=0
-version_patch=0-alpha.47
+version_patch=0-alpha.48
 
 polyfrost.defaults.loom=3
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 000375bc6..057cc61a8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,6 +26,7 @@ lwjgl = "3.3.3" # All downloaded by the isolated-lwjgl3-loader
 # Legacy only
 mixin = "0.8.4+build.2"
 mixin-extras = "0.4.1"
+asm = "5.2"
 
 # Gradle
 kotlinx-abi = "0.14.0"
@@ -46,6 +47,7 @@ junit-bom = { module = "org.junit:junit-bom", version.ref = "junit-bom" }
 
 mixin = { module = "org.polyfrost:polymixin", version.ref = "mixin" }
 mixin-extras = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixin-extras" }
+asm = { module = "org.ow2.asm:asm-debug-all", version.ref = "asm" }
 
 isolated-lwjgl3-loader = { module = "org.polyfrost:isolated-lwjgl3-loader", version.ref = "isolated-lwjgl3-loader" }
 polyio = { module = "org.polyfrost:polyio", version.ref = "polyio" }
diff --git a/versions/build.gradle.kts b/versions/build.gradle.kts
index 396635f85..75655f8da 100644
--- a/versions/build.gradle.kts
+++ b/versions/build.gradle.kts
@@ -47,6 +47,14 @@ repositories {
 
 val shadow by configurations.creating
 
+if (platform.isLegacyForge) { // Quick substitution for relaunch in dev env, so that mixinextras works properly (yay!)
+    configurations.all {
+        resolutionStrategy {
+            force(libs.asm.get())
+        }
+    }
+}
+
 dependencies {
     compileOnly("gg.essential:vigilance-1.8.9-forge:295") {
         isTransitive = false