From d5c5df1b64b0f87be4b033663e024b033d89c353 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Wed, 25 Jun 2025 20:54:00 +0100 Subject: [PATCH] Bump ASM and EventBus Improves support for Java 25 and better stability of the compile-time EventBus checks, respectively. Co-Authored-By: LexManos --- buildSrc/build.gradle | 4 ++-- build_forge.gradle | 2 +- mdk/build.gradle | 4 +--- settings.gradle | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 65add87b85..6206c624e5 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -4,8 +4,8 @@ repositories { } dependencies { - implementation 'org.ow2.asm:asm:9.7' - implementation 'org.ow2.asm:asm-tree:9.7' + implementation 'org.ow2.asm:asm:9.8' + implementation 'org.ow2.asm:asm-tree:9.8' implementation 'net.minecraftforge:srgutils:0.5.10' implementation 'commons-io:commons-io:2.13.0' implementation 'com.google.code.gson:gson:2.10.1' diff --git a/build_forge.gradle b/build_forge.gradle index f1aaf7a3cc..21bb4daed2 100644 --- a/build_forge.gradle +++ b/build_forge.gradle @@ -148,7 +148,7 @@ dependencies { runtimeOnly(libs.bootstrap) runtimeOnly(libs.bootstrap.dev) - //annotationProcessor(libs.eventbus.validator) + annotationProcessor(libs.eventbus.validator) } tasks.named('extractRangeMap').configure { diff --git a/mdk/build.gradle b/mdk/build.gradle index 844426001c..2d334e6007 100644 --- a/mdk/build.gradle +++ b/mdk/build.gradle @@ -145,9 +145,7 @@ dependencies { // Forge 1.21.6+ uses EventBus 7, which shifts most of its runtime validation to compile-time via an annotation processor // to improve performance in production environments. This line is required to enable said compile-time validation // in your development environment, helping you catch issues early. - // This relies on more obscure Java compiler APIs that may surface bugs. Update your JDK, report bugs to the OpenJDK - // project and/or comment out this line if you encounter issues. - annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.9' + annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.10' // Example mod dependency with JEI // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime diff --git a/settings.gradle b/settings.gradle index ac7dc52d31..c7fdab8081 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,8 +32,8 @@ dependencyResolutionManagement { library('accesstransformers', 'net.minecraftforge:accesstransformers:8.2.2') library('coremods', 'net.minecraftforge:coremods:5.2.6') library('nashorn', 'org.openjdk.nashorn:nashorn-core:15.4') // Needed by coremods, because the JRE no longer ships JS - library('eventbus', 'net.minecraftforge:eventbus:7.0-beta.9') - library('eventbus-validator', 'net.minecraftforge:eventbus-validator:7.0-beta.9') + library('eventbus', 'net.minecraftforge:eventbus:7.0-beta.10') + library('eventbus-validator', 'net.minecraftforge:eventbus-validator:7.0-beta.10') library('mergetool-api', 'net.minecraftforge:mergetool-api:1.0') library('mixin', 'org.spongepowered:mixin:0.8.7') @@ -53,7 +53,7 @@ dependencyResolutionManagement { library('bootstrap-shim', 'net.minecraftforge', 'bootstrap-shim').versionRef('bootstrap') // ASM it's used for so many of our hacks - version('asm', '9.7.1') + version('asm', '9.8') library('asm', 'org.ow2.asm', 'asm' ).versionRef('asm') library('asm-tree', 'org.ow2.asm', 'asm-tree' ).versionRef('asm') library('asm-util', 'org.ow2.asm', 'asm-util' ).versionRef('asm')