Skip to content

Commit

Permalink
include asm 5.2 to fix mixinextras support
Browse files Browse the repository at this point in the history
  • Loading branch information
Wyvest committed Dec 29, 2024
1 parent eef77fa commit 6e90b5b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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>()
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" }
Expand Down
8 changes: 8 additions & 0 deletions versions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6e90b5b

Please sign in to comment.