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 --- neoforge/build.gradle | 36 ++++++++-------------- neoforge/docs/META-INF/neoforge.mods.toml | 2 +- .../nochatreports/neoforge/NoChatReports.java | 13 ++++---- 3 files changed, 21 insertions(+), 30 deletions(-) (limited to 'neoforge') diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 6455e9b..8c8f4b9 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,18 +1,3 @@ -buildscript { - repositories { - mavenCentral() - maven { url file("deps") } - maven { url 'https://plugins.gradle.org/m2/' } - maven { - name "Gradle Plugin Portal" - url 'https://plugins.gradle.org/m2/' - content { - includeGroup "com.modrinth" - } - } - } -} - plugins { id 'java-library' id 'eclipse' @@ -20,7 +5,7 @@ plugins { id 'maven-publish' id "com.modrinth.minotaur" version "2.+" id 'net.darkhax.curseforgegradle' version '1.+' - id 'net.neoforged.gradle.userdev' version '7.1.21' + id 'net.neoforged.gradle.userdev' version '7.1.38' } println("Specifying project version/group/archivesBaseName...") @@ -81,9 +66,6 @@ configurations { 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 } @@ -92,9 +74,8 @@ dependencies { // Minecraft & Forge implementation "net.neoforged:neoforge:${neoforge_version}" - implementation "generic:modmenu:5.0.2" implementation "generic:fabric-annotations:v1.0.0" - implementation "generic:cloth-config-api:14.0.126" + implementation "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}" } @@ -135,7 +116,9 @@ processResources { 'issue_tracker_url': issue_tracker_url, 'dep_neoforge': dep_neoforge, 'dep_minecraft': dep_minecraft, - 'contributor_0': contributor_0 + 'contributor_0': contributor_0, + 'contributor_1': contributor_1, + 'contributor_2': contributor_2 into 'META-INF' } @@ -164,6 +147,8 @@ task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { mainFile.addModLoader('NeoForge') mainFile.addJavaVersion('Java 25') mainFile.addGameVersion(project.minecraft_version) + + mainFile.addOptional('cloth-config') } modrinth { @@ -175,7 +160,12 @@ 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" + } + syncBodyFrom = rootProject.file("docs/README.md").text } diff --git a/neoforge/docs/META-INF/neoforge.mods.toml b/neoforge/docs/META-INF/neoforge.mods.toml index ed0d16d..bb658c2 100644 --- a/neoforge/docs/META-INF/neoforge.mods.toml +++ b/neoforge/docs/META-INF/neoforge.mods.toml @@ -15,7 +15,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/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java index 680a74d..5f5bbf0 100644 --- a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java +++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java @@ -1,11 +1,10 @@ package com.aizistral.nochatreports.neoforge; -import com.aizistral.nochatreports.common.NCRClient; import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.config.ClothConfigIntegration; 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.neoforged.api.distmarker.Dist; import net.neoforged.fml.ModLoadingContext; @@ -18,18 +17,20 @@ import net.neoforged.fml.loading.FMLPaths; import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import java.nio.file.Path; -import java.util.function.Function; @Mod("nochatreports") public class NoChatReports implements PlatformProvider { public NoChatReports() { NCRCore.awaken(this); - Function configScreenFactory = NCRClient.getConfigScreen(); - if (isOnClient() && configScreenFactory != null) { + if (isOnClient()) { + if (!ClothConfigIntegration.ACTIVE) { + NCRCore.LOGGER.warn("ClothConfig API not found, cannot provide config screen factory."); + return; + } ModLoadingContext.get().registerExtensionPoint( IConfigScreenFactory.class, - () -> (minecraft, parent) -> configScreenFactory.apply(parent) + () -> (minecraft, parent) -> ClothConfigIntegration.getConfigScreen(parent) ); } } -- cgit v1.2.3