From 2fa3699d0440034b23fd769e81c1965a31dd0fe8 Mon Sep 17 00:00:00 2001 From: Reagan Date: Wed, 24 Jun 2026 03:01:30 +1200 Subject: Update to 26.2 (#551) * Bump version numbers for 26.2 * Update Minecraft references to 26.2 * Remove JAVA_25 compatibility specified in Mixin configs for Forge Not sure why Forge broke it, but e.g. 50ap5ud5/BoatItemView@8b699cc6247d9ae80febdd638f102b0ed38b1873 does the same. * Remove Cloth Config from Forge Cloth Config on Forge is dead: shedaniel/cloth-config#322 and doesn't work, attempting to open the Config screen doesn't work and logs an Exception. Still keep it on NeoForge. * NeoForge: Add Cloth Config as optional dependency for modrinth/cf * (Neo)Forge: Remove local modmenu dependency Neither of these loaders use it anyway, Fabric uses a non-local version. * NeoForge: Switch back to online Cloth Config API artifact This uses the latest version makes runClient configuration work again. * build.gradle: cleanup repositories * Fix Forge build * Use NeoForge Cloth Config for Forge build * List tibequadorian and xbjfk as contributors * List Cloth Config Forge port in project relations --------- Co-authored-by: Aizistral --- forge/build.gradle | 51 ++++++++------------- .../14.0.126/cloth-config-api-14.0.126.jar | Bin 500301 -> 0 bytes .../14.0.126/cloth-config-api-14.0.126.pom | 9 ---- .../26.2.155/cloth-config-26.2.155.jar | Bin 0 -> 1066644 bytes .../26.2.155/cloth-config-26.2.155.pom | 9 ++++ .../generic/modmenu/5.0.2/modmenu-5.0.2-obf.jar | Bin 2140 -> 0 bytes forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jar | Bin 2109 -> 0 bytes forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom | 9 ---- forge/docs/META-INF/mods.toml | 2 +- forge/settings.gradle | 3 ++ .../nochatreports/forge/NoChatReports.java | 13 ------ .../mixins/forge/nochatreports-forge.mixins.json | 1 - 12 files changed, 33 insertions(+), 64 deletions(-) delete mode 100644 forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.jar delete mode 100644 forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.pom create mode 100644 forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar create mode 100644 forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom delete mode 100644 forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2-obf.jar delete mode 100644 forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jar delete mode 100644 forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom create mode 100644 forge/settings.gradle (limited to 'forge') diff --git a/forge/build.gradle b/forge/build.gradle index 2e60b18..8e68445 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,30 +1,9 @@ -buildscript { - repositories { - mavenCentral() - 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/' } - maven { - url = 'https://repo.spongepowered.org/repository/maven-public/' - content { includeGroup "org.spongepowered" } - } - maven { - name "Gradle Plugin Portal" - url 'https://plugins.gradle.org/m2/' - content { - includeGroup "com.modrinth" - } - } - } -} - plugins { id 'java' id 'idea' id 'eclipse' id 'maven-publish' - id 'net.minecraftforge.gradle' version '[7.0.17,8.0)' + id 'net.minecraftforge.gradle' version '[7.0.17,8)' id "com.modrinth.minotaur" version "2.+" id 'net.darkhax.curseforgegradle' version '1.+' } @@ -81,14 +60,17 @@ sourceSets.main.resources { // NO-OP } +sourceSets.main.java { + // NO-OP +} + repositories { 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 + maven fg.forgeMaven + maven fg.minecraftLibsMaven + mavenCentral() } dependencies { @@ -96,12 +78,10 @@ dependencies { // Minecraft & Forge 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" + implementation "generic:cloth-config:26.2.155" - // 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' } } + annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.1' } @@ -143,7 +123,9 @@ processResources { 'issue_tracker_url': issue_tracker_url, 'dep_forge': dep_forge, 'dep_minecraft': dep_minecraft, - 'contributor_0': contributor_0 + 'contributor_0': contributor_0, + 'contributor_1': contributor_1, + 'contributor_2': contributor_2 into 'META-INF' } @@ -172,6 +154,8 @@ task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { mainFile.addModLoader('Forge') mainFile.addJavaVersion('Java 25') mainFile.addGameVersion(project.minecraft_version) + + mainFile.addOptional('cloth-config-forge') } modrinth { @@ -183,6 +167,11 @@ modrinth { changelog = rootProject.file("docs/CHANGELOG.md").text uploadFile = jar gameVersions = [ project.minecraft_version ] + + dependencies { + // The scope can be `required`, `optional`, or `incompatible` + optional.project "cloth-config-forge" + } syncBodyFrom = rootProject.file("docs/README.md").text } diff --git a/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.jar b/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.jar deleted file mode 100644 index 3c81eb4..0000000 Binary files a/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.jar and /dev/null differ diff --git a/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.pom b/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.pom deleted file mode 100644 index c28f9d0..0000000 --- a/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - generic - cloth-config-api - 14.0.126 - - diff --git a/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar new file mode 100644 index 0000000..5d5d1de Binary files /dev/null and b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar differ diff --git a/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom new file mode 100644 index 0000000..42ad9a9 --- /dev/null +++ b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + generic + cloth-config + 26.2.155 + + diff --git a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2-obf.jar b/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2-obf.jar deleted file mode 100644 index 5d27531..0000000 Binary files a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2-obf.jar and /dev/null differ diff --git a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jar b/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jar deleted file mode 100644 index a7bf40b..0000000 Binary files a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jar and /dev/null differ diff --git a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom b/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom deleted file mode 100644 index c96a313..0000000 --- a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - generic - modmenu - 5.0.2 - - diff --git a/forge/docs/META-INF/mods.toml b/forge/docs/META-INF/mods.toml index e533f72..f340665 100644 --- a/forge/docs/META-INF/mods.toml +++ b/forge/docs/META-INF/mods.toml @@ -8,7 +8,7 @@ version="${mod_version}" displayName="${mod_name}" displayURL="${mod_url}" logoFile="${mod_icon}" -credits="${contributor_0}" +credits="${contributor_0}, ${contributor_1}, ${contributor_2}" authors="${mod_author}" description=''' ${mod_description} diff --git a/forge/settings.gradle b/forge/settings.gradle new file mode 100644 index 0000000..4ced2d9 --- /dev/null +++ b/forge/settings.gradle @@ -0,0 +1,3 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} diff --git a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java index 7ca0815..0c02ce8 100644 --- a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java +++ b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java @@ -1,18 +1,14 @@ package com.aizistral.nochatreports.forge; import java.nio.file.Path; -import java.util.function.Function; -import com.aizistral.nochatreports.common.NCRClient; import com.aizistral.nochatreports.common.NCRCore; import com.aizistral.nochatreports.common.platform.PlatformProvider; import com.aizistral.nochatreports.common.platform.events.ClientEvents; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.event.ClientPlayerNetworkEvent; import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -27,15 +23,6 @@ public class NoChatReports implements PlatformProvider { public NoChatReports(FMLJavaModLoadingContext context) { NCRCore.awaken(this); - Function configScreenFactory = NCRClient.getConfigScreen(); - if (isOnClient() && configScreenFactory != null) { - context.registerExtensionPoint( - ConfigScreenHandler.ConfigScreenFactory.class, - () -> new ConfigScreenHandler.ConfigScreenFactory( - (minecraft, parent) -> configScreenFactory.apply(parent) - ) - ); - } } @Override 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 7d16556..fb22f5d 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,6 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.forge.mixins", - "compatibilityLevel": "JAVA_25", "mixins": [], "client": [ "client.MixinClientConnection", -- cgit v1.2.3