From b79cd15ce15c96be575b09a243c44e9b14f0a5e4 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 28 Mar 2026 01:03:34 +0100 Subject: Update to 26.1 (#545) * Start porting to 26.1 Update to Gradle 9 * Delete AdvancedImageButton, AdvancedTooltip, AdvancedWidgetTooltipHolder * MixinJoinMultiplayerScreen: Replace AdvancedImageButton * MixinPlayerEntry: Replace AdvancedImageButton * MixinChatScreen: Replace AdvancedImageButton * Fix class tweaker * Update github workflows * Delete SwitchableSprites * Update ModMenu version to 18.0.0-alpha.8 * Update Mixin Java compatibility levels to Java 25 --------- Co-authored-by: Aizistral --- forge/build.gradle | 93 ++++++++-------------- .../main/resources/META-INF/accesstransformer.cfg | 46 +++++------ .../mixins/forge/nochatreports-forge.mixins.json | 2 +- 3 files changed, 56 insertions(+), 85 deletions(-) (limited to 'forge') diff --git a/forge/build.gradle b/forge/build.gradle index afa5688..1b7e7ab 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { mavenCentral() - maven { url "file:///${project.projectDir}/deps/" } + maven { url file("deps") } maven { url = 'https://maven.minecraftforge.net' } maven { url = 'https://dist.creeper.host/Sponge/maven' } maven { url 'https://plugins.gradle.org/m2/' } @@ -12,34 +12,22 @@ buildscript { maven { name "Gradle Plugin Portal" url 'https://plugins.gradle.org/m2/' - content { - includeGroup "gradle.plugin.com.matthewprenger" + content { includeGroup "com.modrinth" } } } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0.36,6.2)' - classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' - classpath 'org.spongepowered:mixingradle:0.7.+' - } } plugins { + id 'java' + id 'idea' + id 'eclipse' + id 'maven-publish' + id 'net.minecraftforge.gradle' version '[7.0.17,8.0)' id "com.modrinth.minotaur" version "2.+" } -println("Applying plugins...") - -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'org.spongepowered.mixin' -apply plugin: 'eclipse' -apply plugin: 'idea' -apply plugin: 'maven-publish' -apply plugin: 'com.matthewprenger.cursegradle' - -apply from: '../common.gradle' - println("Specifying project version/group/archivesBaseName...") version = "${mod_version}" group = "${maven_group}" @@ -49,7 +37,7 @@ base { } println("Specifying Java compatibility...") -java.toolchain.languageVersion = JavaLanguageVersion.of(21) +java.toolchain.languageVersion = JavaLanguageVersion.of(25) println("Java Installation Data:") println(" - Java Version: " + System.getProperty('java.version')) @@ -59,47 +47,30 @@ println(" - OS Archetype: " + System.getProperty('os.arch')) compileJava.options.encoding = "UTF-8" -mixin { - println("Specifying refmaps for Mixin...") - add sourceSets.main, "nochatreports.refmap.json" - config "mixins/common/nochatreports.mixins.json" - config "mixins/forge/nochatreports-forge.mixins.json" - defaultObfuscationEnv "searge" -} - minecraft { - println("Specifying MCP mappings...") mappings channel: 'official', version: minecraft_version - - println("Specifying Access Transformer configuration...") - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - reobf = false - copyIdeResources = true - - runs { - configureEach { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' + + accessTransformers = files('src/main/resources/META-INF/accesstransformer.cfg') + + runs { + configureEach { + workingDir.convention layout.projectDirectory.dir('run') + systemProperty 'forge.logging.markers', 'REGISTRIES' + systemProperty 'forge.logging.console.level', 'debug' + args "--mixin.config=mixins/common/nochatreports.mixins.json" + args "--mixin.config=mixins/forge/nochatreports-forge.mixins.json" } - - client { - properties 'org.gradle.jvmargs': '-Xms4G -Xmx4G' - properties 'fml.earlyprogresswindow': 'false' - properties 'mixin.env.disableRefMap': 'true' - - property 'forge.enabledGameTestNamespaces', mod_id - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' + register('client') { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + systemProperty 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + systemProperty 'forge.logging.console.level', 'debug' } - server { - properties 'mixin.env.disableRefMap': 'true' - property 'forge.enabledGameTestNamespaces', mod_id - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' + register('server') { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + systemProperty 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + systemProperty 'forge.logging.console.level', 'debug' args '--nogui' } } @@ -110,23 +81,23 @@ sourceSets.main.resources { } repositories { - println("Specifying repositories...") - maven { url "file:///${project.projectDir}/deps/" } // local + println("Specifying repositories...") + maven { url file("deps") } // local maven { url = "https://maven.theillusivec4.top/" } // curios maven { url = "https://maven.blamejared.com/" } // patchouli maven { url = "https://repo.spongepowered.org/maven" } // mixin maven { url "https://maven.shedaniel.me/" } // cloth config + minecraft.mavenizer(it) // minecraft } dependencies { println("Processing dependencies...") // Minecraft & Forge - minecraft "net.minecraftforge:forge:${forge_version}" + implementation minecraft.dependency("net.minecraftforge:forge:$minecraft_version-$forge_version") implementation "generic:modmenu:5.0.2" implementation "generic:fabric-annotations:v1.0.0" implementation "generic:cloth-config-api:14.0.126" - annotationProcessor "org.spongepowered:mixin:0.8.5:processor" // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transtive dependencies request 6.0+ implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } } @@ -198,7 +169,7 @@ curseforge { changelog = rootProject.file('docs/CHANGELOG.md') addGameVersion project.minecraft_version - addGameVersion "Java 21" + addGameVersion "Java 25" addGameVersion "Forge" //addArtifact(sourcesJar) @@ -247,7 +218,7 @@ publishing { } repositories { maven { - url "file:///${project.projectDir}/mcmodsrepo" + url file("mcmodsrepo") } } } diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg index c923a04..4fd2634 100644 --- a/forge/src/main/resources/META-INF/accesstransformer.cfg +++ b/forge/src/main/resources/META-INF/accesstransformer.cfg @@ -1,26 +1,26 @@ -public net.minecraft.client.gui.screens.options.OptionsSubScreen f_337426_ #list -public-f net.minecraft.network.chat.MutableComponent f_237194_ #contents -public-f net.minecraft.network.chat.contents.TranslatableContents f_237498_ #args -public-f net.minecraft.network.chat.MutableComponent f_237194_ #contents -public net.minecraft.client.gui.screens.multiplayer.WarningScreen f_210915_ #message -public net.minecraft.client.multiplayer.ClientPacketListener f_240902_ #signedMessageEncoder -public net.minecraft.client.multiplayer.ClientPacketListener f_252517_ #chatSession -public net.minecraft.client.gui.components.Tooltip f_257026_ #MAX_WIDTH -public net.minecraft.client.gui.components.Tooltip f_256850_ #message -public net.minecraft.client.gui.components.Tooltip f_257004_ #narration -public net.minecraft.client.gui.components.Tooltip f_256766_ #cachedTooltip -public net.minecraft.client.gui.screens.Screen f_96541_ #minecraft -public net.minecraft.client.gui.screens.Screen f_96542_ #itemRenderer -public net.minecraft.client.gui.screens.Screen f_96547_ #font -public-f net.minecraft.client.gui.components.AbstractWidget f_256816_ #tooltip -#public net.minecraft.client.gui.components.AbstractWidget f_256936_ #tooltipMsDelay -public net.minecraft.client.gui.screens.options.OptionsScreen f_337656_ #TELEMETRY +public net.minecraft.client.gui.screens.options.OptionsSubScreen list +public-f net.minecraft.network.chat.MutableComponent contents +public-f net.minecraft.network.chat.contents.TranslatableContents args +public-f net.minecraft.network.chat.MutableComponent contents +public net.minecraft.client.gui.screens.multiplayer.WarningScreen message +public net.minecraft.client.multiplayer.ClientPacketListener signedMessageEncoder +public net.minecraft.client.multiplayer.ClientPacketListener chatSession +public net.minecraft.client.gui.components.Tooltip MAX_WIDTH +public net.minecraft.client.gui.components.Tooltip message +public net.minecraft.client.gui.components.Tooltip narration +public net.minecraft.client.gui.components.Tooltip cachedTooltip +public net.minecraft.client.gui.screens.Screen minecraft +public net.minecraft.client.gui.screens.Screen itemRenderer +public net.minecraft.client.gui.screens.Screen font +public-f net.minecraft.client.gui.components.AbstractWidget tooltip +#public net.minecraft.client.gui.components.AbstractWidget tooltipMsDelay +public net.minecraft.client.gui.screens.options.OptionsScreen TELEMETRY -public net.minecraft.client.gui.components.Tooltip (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V # -#public-f net.minecraft.client.gui.components.AbstractWidget m_257936_()V #updateTooltip -#public-f net.minecraft.client.gui.components.CycleButton m_257795_()V #updateTooltip +public net.minecraft.client.gui.components.Tooltip (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V +#public-f net.minecraft.client.gui.components.AbstractWidget updateTooltip()V +#public-f net.minecraft.client.gui.components.CycleButton updateTooltip()V -public-f net.minecraft.client.gui.components.AbstractWidget m_88315_(Lnet/minecraft/client/gui/GuiGraphics;IIF)V #render -public net.minecraft.client.gui.components.WidgetTooltipHolder m_323619_(Lnet/minecraft/client/gui/navigation/ScreenRectangle;ZZ)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; #createTooltipPositioner +public-f net.minecraft.client.gui.components.AbstractWidget render(Lnet/minecraft/client/gui/GuiGraphics;IIF)V +public net.minecraft.client.gui.components.WidgetTooltipHolder createTooltipPositioner(Lnet/minecraft/client/gui/navigation/ScreenRectangle;ZZ)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; -public net.minecraft.client.multiplayer.ClientPacketListener m_260951_(Lnet/minecraft/world/entity/player/ProfileKeyPair;)V #setKeyPair \ No newline at end of file +public net.minecraft.client.multiplayer.ClientPacketListener setKeyPair(Lnet/minecraft/world/entity/player/ProfileKeyPair;)V \ No newline at end of file diff --git a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json index 6c5e73e..7d16556 100644 --- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json +++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.forge.mixins", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "mixins": [], "client": [ "client.MixinClientConnection", -- cgit v1.2.3