Skip to content

switch from Jabel to JVMDowngrader #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
viciscat wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

switch from Jabel to JVMDowngrader #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12afcaa
switch from Jabel to JVMDowngrader
viciscat May 31, 2026
fc820eb
Remove comment on runClient/runServer tasks
viciscat May 31, 2026
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
42 changes: 23 additions & 19 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* It is advised that you do not edit anything in the build.gradle; unless you are sure of what you are doing
*/
import com.gtnewhorizons.retrofuturagradle.mcp.InjectTagsTask
import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask
import org.jetbrains.changelog.Changelog
import org.jetbrains.gradle.ext.Gradle

Expand All @@ -15,6 +17,7 @@ plugins {
id 'com.modrinth.minotaur' version '2.+' apply false
id 'org.jetbrains.changelog' version '2.5.0'
id 'com.gradleup.shadow' version '9.4.+'
id 'xyz.wagyourtail.jvmdowngrader' version '1.3.6' apply false
}

apply from: 'gradle/scripts/helpers.gradle'
Expand All @@ -32,6 +35,7 @@ assertSubProperties 'is_coremod', 'coremod_includes_mod', 'coremod_plugin_class_
assertSubProperties 'use_asset_mover', 'asset_mover_version'

setDefaultProperty 'use_modern_java_syntax', false, false
setDefaultProperty 'modern_java_version', true, '25'
setDefaultProperty 'generate_sources_jar', true, false
setDefaultProperty 'generate_javadocs_jar', true, false
setDefaultProperty 'mapping_channel', true, 'stable'
Expand All @@ -42,6 +46,10 @@ setDefaultProperty 'extra_jvm_args', false, ''
setDefaultProperty 'extra_tweak_classes', false, ''
setDefaultProperty 'change_minecraft_sources', false, false

if (propertyBool('use_modern_java_syntax')) {
apply(plugin: 'xyz.wagyourtail.jvmdowngrader')
}

version = propertyString('mod_version')
group = propertyString('root_package')

Expand All @@ -53,7 +61,7 @@ tasks.decompressDecompiledSources.enabled !propertyBool('change_minecraft_source

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(propertyBool('use_modern_java_syntax') ? 16 : 8))
languageVersion.set(JavaLanguageVersion.of(propertyBool('use_modern_java_syntax') ? propertyString("modern_java_version") : 8))
// Azul covers the most platforms for Java 8 toolchains, crucially including MacOS arm64
vendor.set(JvmVendorSpec.AZUL)
}
Expand Down Expand Up @@ -111,19 +119,8 @@ repositories {

dependencies {
if (propertyBool('use_modern_java_syntax')) {
annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
// Workaround for https://github.com/bsideup/jabel/issues/174
annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0'
compileOnly ('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') {
transitive = false
}
// Allow jdk.unsupported classes like sun.misc.Unsafe, workaround for JDK-8206937 and fixes crashes in tests
patchedMinecraft 'me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0'
// Include for tests
testAnnotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
testCompileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') {
transitive = false // We only care about the 1 annotation class
}
}
if (propertyBool('use_asset_mover')) {
implementation "com.cleanroommc:assetmover:${propertyString('asset_mover_version')}"
Expand Down Expand Up @@ -305,12 +302,7 @@ tasks.withType(JavaCompile).configureEach {
if (it.name in ['compileMcLauncherJava', 'compilePatchedMcJava']) {
return
}
sourceCompatibility = 17
options.release.set(8)
javaCompiler.set(javaToolchains.compilerFor {
languageVersion.set(JavaLanguageVersion.of(16))
vendor.set(JvmVendorSpec.AZUL)
})
sourceCompatibility = propertyString('modern_java_version')
}
}

Expand All @@ -321,7 +313,19 @@ tasks.register('cleanroomAfterSync') {

if (propertyBool('use_modern_java_syntax')) {
tasks.withType(Javadoc).configureEach {
sourceCompatibility = 17
sourceCompatibility = propertyString('modern_java_version')
}
// downgrade code for build
tasks.named('reobfJar', ReobfuscatedJar) {
inputJar.set((shadeDowngradedApi as Jar).archiveFile)
dependsOn(shadeDowngradedApi)
}
// downgrade code for runClient/runServer
for (runTask in ['runClient', 'runServer']) {
tasks.named(runTask, RunMinecraftTask) {
classpath = classpath - layout.files(jar) + layout.files(shadeDowngradedApi)
dependsOn(shadeDowngradedApi)
}
}
}

Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
org.gradle.jvmargs = -Xmx3G

# Source Options
# Use Modern Java(9+) Syntax (Courtesy of Jabel)
use_modern_java_syntax = false
# Use Modern Java(9+) Syntax and APIs (Courtesy of JVMDowngrader)
use_modern_java_syntax = true
modern_java_version = 25

# Compilation Options
generate_sources_jar = true
Expand Down