diff options
| author | Reagan | 2026-06-24 03:01:30 +1200 |
|---|---|---|
| committer | GitHub | 2026-06-23 17:01:30 +0200 |
| commit | 2fa3699d0440034b23fd769e81c1965a31dd0fe8 (patch) | |
| tree | b826380dc0dcdbc855a20f8216bb9114a97fb1b6 | |
| parent | 6ae2536dfe3e89bb88a952a7e02dea0a2b4c6f7c (diff) | |
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 <admin@aizistral.com>
29 files changed, 93 insertions, 141 deletions
diff --git a/build.gradle b/build.gradle index 501ba6e..909c36c 100644 --- a/build.gradle +++ b/build.gradle @@ -69,7 +69,6 @@ loom { repositories { maven { url "https://maven.shedaniel.me/" } maven { url "https://maven.terraformersmc.com/releases/" } - maven { url 'https://jitpack.io' } maven { url file("deps") } } @@ -97,7 +96,11 @@ processResources { 'mod_icon': mod_icon, 'mod_description': mod_description, 'issue_tracker_url': issue_tracker_url, - 'contributor_0': contributor_0 + 'contributor_0': contributor_0, + 'contributor_1': contributor_1, + 'contributor_2': contributor_2, + 'fabric_loader_version': fabric_loader_version, + 'minecraft_version': minecraft_version } from("${rootProject.projectDir}/docs") { 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 Binary files differdeleted file mode 100644 index 3c81eb4..0000000 --- a/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.jar +++ /dev/null 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>generic</groupId> - <artifactId>cloth-config-api</artifactId> - <version>14.0.126</version> - <dependencies></dependencies> -</project> 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 Binary files differnew file mode 100644 index 0000000..5d5d1de --- /dev/null +++ b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar diff --git a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom index c96a313..42ad9a9 100644 --- a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom +++ b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <groupId>generic</groupId> - <artifactId>modmenu</artifactId> - <version>5.0.2</version> + <artifactId>cloth-config</artifactId> + <version>26.2.155</version> <dependencies></dependencies> </project> 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 Binary files differdeleted file mode 100644 index 5d27531..0000000 --- a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2-obf.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index a7bf40b..0000000 --- a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jar +++ /dev/null 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<Screen, Screen> 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", diff --git a/gradle.properties b/gradle.properties index 39c88de..7953d6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false # Toolchain Properties -minecraft_version=26.1 -fabric_loader_version=0.18.4 -loom_version=1.15-SNAPSHOT -forge_version=62.0.2 -neoforge_version=26.1.0.1-beta +minecraft_version=26.2 +fabric_loader_version=0.19.3 +loom_version=1.17-SNAPSHOT +forge_version=65.0.0 +neoforge_version=26.2.0.6-beta # Mod Properties -mod_version=26.1-v2.19.0 +mod_version=26.2-v2.20.0 maven_group=com.aizistral.nochatreports archives_base_name=NoChatReports-FABRIC mod_id=nochatreports @@ -23,14 +23,14 @@ mod_icon=assets/nochatreports/textures/misc/ncr_logo.png mod_license=WTFPL # Dependencies -fabric_version=0.144.3+26.1 -mod_menu_version=18.0.0-alpha.8 -cloth_config_version=26.1.154 +fabric_version=0.152.2+26.2 +mod_menu_version=20.0.0-beta.3 +cloth_config_version=26.2.155 # Dependencies in mods.toml -dep_forge=[62,) -dep_neoforge=[26.1.0.1-beta,) -dep_minecraft=[26.1,) +dep_forge=[65,) +dep_neoforge=[26.2.0.6-beta,) +dep_minecraft=[26.2,) # Publishing curse_id=634062 @@ -38,3 +38,5 @@ version_type=release #Contributors contributor_0=Madis0 (aka robotkoer) +contributor_1=tibequadorian +contributor_2=xbjfk diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c61a118..1a70468 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME 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<Screen, Screen> 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) ); } } diff --git a/settings.gradle b/settings.gradle index bda5832..c78a063 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,6 @@ pluginManagement { url = 'https://maven.fabricmc.net/' } maven { url = 'https://maven.neoforged.net/releases' } - maven { url = 'https://maven.maxhenkel.de/repository/public' } mavenCentral() gradlePluginPortal() } diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java index 0f9aff9..9df6ce0 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java @@ -2,7 +2,6 @@ package com.aizistral.nochatreports.common; import java.util.function.Function; -import com.aizistral.nochatreports.common.config.ClothConfigIntegration; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerDataExtension; import com.aizistral.nochatreports.common.core.ServerSafetyLevel; @@ -35,14 +34,6 @@ public class NCRClient { ClientEvents.PLAY_READY.register(NCRClient::onPlayReady); } - @Nullable - public static Function<Screen, Screen> getConfigScreen() { - if (ClothConfigIntegration.ACTIVE) return ClothConfigIntegration::getConfigScreen; - - NCRCore.LOGGER.warn("ClothConfig API not found, cannot provide config screen factory."); - return null; - } - private static void onDisconnect(Minecraft client) { if (!NCRConfig.getClient().enableMod()) return; @@ -62,7 +53,7 @@ public class NCRClient { if (!client.isLocalServer()) { if (ServerSafetyState.isOnRealms()) { // NO-OP - } else if (!handler.getConnection().isEncrypted()) { + } else if (!handler.onlineMode()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); } else if (client.getCurrentServer() instanceof ServerDataExtension ext && ext.preventsChatReports()) { @@ -98,7 +89,7 @@ public class NCRClient { public static void resendLastChatMessage() { var mc = Minecraft.getInstance(); - var chatScr = mc.screen instanceof ChatScreen chat ? chat : null; + var chatScr = mc.gui.screen() instanceof ChatScreen chat ? chat : null; if (chatScr == null) { chatScr = new ChatScreen("", false); diff --git a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java index af765db..302f6ae 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java @@ -69,7 +69,7 @@ public final class ClothConfigIntegration { protected static Screen getConfigScreen(Screen parent) { // Get the previous screen ConfigBuilder builder = ConfigBuilder.create() - .setParentScreen(Minecraft.getInstance().screen) + .setParentScreen(Minecraft.getInstance().gui.screen()) .setTitle(Component.translatable("configuration.NoChatReports.config")); // Set category diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java index 75d5d61..dd4c2a5 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java @@ -32,7 +32,7 @@ public class RealmsWarningScreen extends WarningScreen { } protected void onProceed(Button button) { - this.minecraft.setScreen(this.realms); + this.minecraft.gui.setScreen(this.realms); if (this.stopShowing.selected()) { NCRConfig.getClient().setSkipRealmsWarning(true); } @@ -41,7 +41,7 @@ public class RealmsWarningScreen extends WarningScreen { } protected void onBack(Button button) { - this.minecraft.setScreen(this.previous); + this.minecraft.gui.setScreen(this.previous); } public static boolean shouldShow() { @@ -53,12 +53,12 @@ public class RealmsWarningScreen extends WarningScreen { LinearLayout linearLayout = LinearLayout.horizontal().spacing(8); linearLayout.addChild(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed).build()); linearLayout.addChild(Button.builder(LEARN, button -> { - Minecraft.getInstance().setScreen(new ConfirmLinkScreen(agree -> { + Minecraft.getInstance().gui.setScreen(new ConfirmLinkScreen(agree -> { if (agree) { Util.getPlatform().openUri(WIKI_LINK); } - Minecraft.getInstance().setScreen(this); + Minecraft.getInstance().gui.setScreen(this); }, WIKI_LINK, true)); }).build()); linearLayout.addChild(Button.builder(CommonComponents.GUI_BACK, this::onBack).build()); diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java index dd1c199..fe5e3f1 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java @@ -41,13 +41,13 @@ public final class UnsafeServerScreen extends WarningScreen { LinearLayout linearLayout = LinearLayout.horizontal().spacing(8); linearLayout.addChild(Button.builder(Component.translatable("gui.nochatreports.signing_required.allow_signing"), button -> { ServerSafetyState.setAllowChatSigning(true); - this.minecraft.setScreen(this.previous); + this.minecraft.gui.setScreen(this.previous); }).build()); linearLayout.addChild(Button.builder(Component.translatable("gui.nochatreports.signing_required.cancel"), button -> { if (this.stopShowing.selected()) { hideThisSession = true; } - this.minecraft.setScreen(this.previous); + this.minecraft.gui.setScreen(this.previous); }).build()); return linearLayout; } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java index 0480908..bb84fc5 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java @@ -71,10 +71,10 @@ public class MixinChatListener { } if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.PROMPT)) { - Screen returnScreen = Minecraft.getInstance().screen instanceof ChatScreen chat ? chat + Screen returnScreen = Minecraft.getInstance().gui.screen() instanceof ChatScreen chat ? chat : new ChatScreen("", false); Screen unsafeScreen = new UnsafeServerScreen(returnScreen); - Minecraft.getInstance().setScreen(unsafeScreen); + Minecraft.getInstance().gui.setScreen(unsafeScreen); if (NCRConfig.getClient().hideSigningRequestMessage()) { info.cancel(); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index 9673848..5b2c846 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -67,7 +67,7 @@ public abstract class MixinChatScreen extends Screen { @Inject(method = "handleChatInput", at = @At("HEAD"), cancellable = true) private void onHandleChatInput(String string, boolean bl, CallbackInfo info) { if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ALWAYS) && !ServerSafetyState.allowChatSigning()) { - if (this.minecraft.getConnection().getConnection().isEncrypted()) { + if (this.minecraft.getConnection().onlineMode()) { if (!this.normalizeChatMessage(string).isEmpty()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); ServerSafetyState.scheduleSigningAction(NCRClient::resendLastChatMessage); @@ -141,7 +141,7 @@ public abstract class MixinChatScreen extends Screen { String signing = "gui.nochatreports.signing_status."; - if (!this.minecraft.getConnection().getConnection().isEncrypted()) { + if (!this.minecraft.getConnection().onlineMode()) { signing += "disabled_offline"; } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) { signing += "allowed_realms"; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java index cdc1aef..0895521 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java @@ -46,9 +46,9 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { int xOffset = NCRConfig.getClient().getVerifiedIconOffsetX(), yOffset = NCRConfig.getClient().getVerifiedIconOffsetY(); - GlStateManager._enableBlend(); + GlStateManager._enableBlend(0); graphics.blitSprite(RenderPipelines.GUI_TEXTURED, VERIFIED_ICON, this.getContentRight() - 35 + xOffset, this.getContentY() - 1 + yOffset, 14, 14); - GlStateManager._disableBlend(); + GlStateManager._disableBlend(0); int t = mouseX - this.getContentX(); int u = mouseY - this.getContentY(); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java index b005f5b..113076d 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java @@ -20,10 +20,10 @@ public class MixinTitleScreen extends Screen { throw new IllegalStateException("Can't touch this"); } - @Inject(method = { "lambda$createNormalMenuOptions$2" }, at = @At("HEAD"), cancellable = true) + @Inject(method = { "lambda$createNormalMenuOptions$4" }, at = @At("HEAD"), cancellable = true) private void onRealmsButtonClicked(Button button, CallbackInfo info) { if (RealmsWarningScreen.shouldShow()) { - this.minecraft.setScreen(new RealmsWarningScreen(new TitleScreen(), new RealmsMainScreen(this))); + this.minecraft.gui.setScreen(new RealmsWarningScreen(new TitleScreen(), new RealmsMainScreen(this))); info.cancel(); } } diff --git a/src/main/java/com/aizistral/nochatreports/fabric/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/fabric/config/ModMenuIntegration.java index 86c1ea6..d719ac7 100644 --- a/src/main/java/com/aizistral/nochatreports/fabric/config/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/fabric/config/ModMenuIntegration.java @@ -1,11 +1,7 @@ package com.aizistral.nochatreports.fabric.config; -import java.util.function.Function; - -import net.minecraft.client.gui.screens.Screen; - -import com.aizistral.nochatreports.common.NCRClient; - +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.config.ClothConfigIntegration; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; @@ -20,8 +16,8 @@ public final class ModMenuIntegration implements ModMenuApi { @Override public ConfigScreenFactory<?> getModConfigScreenFactory() { - Function<Screen, Screen> configScreenFactory = NCRClient.getConfigScreen(); - if (configScreenFactory != null) return configScreenFactory::apply; + if (ClothConfigIntegration.ACTIVE) return ClothConfigIntegration::getConfigScreen; + NCRCore.LOGGER.warn("ClothConfig API not found, cannot provide config screen factory."); return ModMenuApi.super.getModConfigScreenFactory(); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0e54d36..cf11719 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,7 +9,9 @@ "${mod_author}" ], "contributors": [ - "${contributor_0}" + "${contributor_0}", + "${contributor_1}", + "${contributor_2}" ], "contact": { "homepage": "${mod_url}", @@ -38,9 +40,9 @@ ], "depends": { - "fabricloader": ">=0.18.4", + "fabricloader": ">=${fabric_loader_version}", "fabric-api": "*", - "minecraft": [ ">=26.1" ], + "minecraft": [ ">=${minecraft_version}" ], "java": ">=25" }, "suggests": {}, diff --git a/src/main/resources/mixins/common/nochatreports.mixins.json b/src/main/resources/mixins/common/nochatreports.mixins.json index 0261dd3..0dd20df 100644 --- a/src/main/resources/mixins/common/nochatreports.mixins.json +++ b/src/main/resources/mixins/common/nochatreports.mixins.json @@ -2,7 +2,6 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.common.mixins", - "compatibilityLevel": "JAVA_25", "mixins": [ "common.MixinJsonByteBufCodec", "server.MixinServerboundChatPacket", |
