From ee101b29753526328eb99e0982d9d193d8f04de4 Mon Sep 17 00:00:00 2001 From: qikpl4 Date: Wed, 30 Sep 2026 06:32:56 -0400 Subject: Port to 26.3 (#562) * Update to 26.3 * Remove 26.2 cloth config * Fix mixin * Fix ServerboundChatPacket.signature nullable -> Optional * Update Forge to 66.0.2 --------- Co-authored-by: Jack Manning --- docs/CHANGELOG.md | 4 ++++ forge/build.gradle | 2 +- .../26.2.155/cloth-config-26.2.155.jar | Bin 1066644 -> 0 bytes .../26.2.155/cloth-config-26.2.155.pom | 9 --------- .../26.3.158/cloth-config-26.3.158.jar | Bin 0 -> 1135630 bytes .../26.3.158/cloth-config-26.3.158.pom | 9 +++++++++ .../main/resources/META-INF/accesstransformer.cfg | 5 +---- gradle.properties | 22 ++++++++++----------- gradle/wrapper/gradle-wrapper.properties | 2 +- neoforge/build.gradle | 2 +- .../main/resources/META-INF/accesstransformer.cfg | 5 +---- .../common/gui/RealmsWarningScreen.java | 16 ++++----------- .../client/MixinYggdrasilUserApiService.java | 4 ++-- .../mixins/common/MixinJsonByteBufCodec.java | 2 +- .../MixinServerCommonPacketListenerImpl.java | 9 +++------ .../mixins/server/MixinServerboundChatPacket.java | 6 ++++-- 16 files changed, 43 insertions(+), 54 deletions(-) delete mode 100644 forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar delete mode 100644 forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom create mode 100644 forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.jar create mode 100644 forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.pom diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1ae2c22..4af2490 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,3 +1,7 @@ +#### **\[Build 26.3-v2.21.0\]:** + +- Initial 26.3 port. + #### **\[Build 26.2-v2.20.2\]:** - Fixed server ping crash ([#556](https://github.com/Aizistral-Studios/No-Chat-Reports/issues/556)). diff --git a/forge/build.gradle b/forge/build.gradle index ad6d482..4c01cd0 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -79,7 +79,7 @@ dependencies { // Minecraft & Forge implementation minecraft.dependency("net.minecraftforge:forge:$minecraft_version-$forge_version") implementation "generic:fabric-annotations:v1.0.0" - implementation "generic:cloth-config:26.2.155" + implementation "generic:cloth-config:${cloth_config_version}" annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.1' } 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 deleted file mode 100644 index 5d5d1de..0000000 Binary files a/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar and /dev/null 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 deleted file mode 100644 index 42ad9a9..0000000 --- a/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - generic - cloth-config - 26.2.155 - - diff --git a/forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.jar b/forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.jar new file mode 100644 index 0000000..73bad92 Binary files /dev/null and b/forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.jar differ diff --git a/forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.pom b/forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.pom new file mode 100644 index 0000000..d2bf7bd --- /dev/null +++ b/forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + generic + cloth-config + 26.3.158 + + diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg index 4fd2634..c78c10f 100644 --- a/forge/src/main/resources/META-INF/accesstransformer.cfg +++ b/forge/src/main/resources/META-INF/accesstransformer.cfg @@ -10,17 +10,14 @@ 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 updateTooltip()V #public-f net.minecraft.client.gui.components.CycleButton updateTooltip()V -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 setKeyPair(Lnet/minecraft/world/entity/player/ProfileKeyPair;)V \ No newline at end of file +public net.minecraft.client.multiplayer.ClientPacketListener setKeyPair(Lnet/minecraft/world/entity/player/ProfileKeyPair;)V diff --git a/gradle.properties b/gradle.properties index c11ff23..da0969a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false # Toolchain Properties -minecraft_version=26.2 -fabric_loader_version=0.19.3 +minecraft_version=26.3 +fabric_loader_version=0.19.5 loom_version=1.17-SNAPSHOT -forge_version=65.0.0 -neoforge_version=26.2.0.6-beta +forge_version=66.0.2 +neoforge_version=26.3.0.1-beta # Mod Properties -mod_version=26.2-v2.20.2 +mod_version=26.3-v2.21.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.152.2+26.2 -mod_menu_version=20.0.0-beta.3 -cloth_config_version=26.2.155 +fabric_version=0.160.5+26.3 +mod_menu_version=21.0.0-beta.1 +cloth_config_version=26.3.158 # Dependencies in mods.toml -dep_forge=[65,) -dep_neoforge=[26.2.0.6-beta,) -dep_minecraft=[26.2,) +dep_forge=[66,) +dep_neoforge=[26.3.0.1-beta,) +dep_minecraft=[26.3,) # Publishing curse_id=634062 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1a70468..7e7d24f 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.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/neoforge/build.gradle b/neoforge/build.gradle index eeceb43..fd66729 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -5,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.38' + id 'net.neoforged.gradle.userdev' version '7.1.39' } println("Specifying project version/group/archivesBaseName...") diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg index 4fd2634..c78c10f 100644 --- a/neoforge/src/main/resources/META-INF/accesstransformer.cfg +++ b/neoforge/src/main/resources/META-INF/accesstransformer.cfg @@ -10,17 +10,14 @@ 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 updateTooltip()V #public-f net.minecraft.client.gui.components.CycleButton updateTooltip()V -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 setKeyPair(Lnet/minecraft/world/entity/player/ProfileKeyPair;)V \ No newline at end of file +public net.minecraft.client.multiplayer.ClientPacketListener setKeyPair(Lnet/minecraft/world/entity/player/ProfileKeyPair;)V 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 dd4c2a5..dc1b1bb 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java @@ -1,9 +1,10 @@ package com.aizistral.nochatreports.common.gui; +import java.net.URI; + import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.ChatFormatting; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.layouts.Layout; import net.minecraft.client.gui.layouts.LinearLayout; @@ -12,7 +13,6 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.multiplayer.WarningScreen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -import net.minecraft.util.Util; public class RealmsWarningScreen extends WarningScreen { private static final Component TITLE = Component.translatable("gui.nochatreports.realms_warning.header").withStyle(ChatFormatting.BOLD); @@ -20,7 +20,7 @@ public class RealmsWarningScreen extends WarningScreen { private static final Component CHECK = Component.translatable("gui.nochatreports.realms_warning.check"); private static final Component NARRATION = TITLE.copy().append("\n").append(CONTENT); private static final Component LEARN = Component.translatable("gui.nochatreports.realms_warning.learn_more"); - private static final String WIKI_LINK = "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/The-Realms-Question"; + private static final URI WIKI_LINK = URI.create("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/The-Realms-Question"); private static boolean sessionSeen = false; private final Screen previous; private final Screen realms; @@ -52,15 +52,7 @@ public class RealmsWarningScreen extends WarningScreen { protected Layout addFooterButtons() { LinearLayout linearLayout = LinearLayout.horizontal().spacing(8); linearLayout.addChild(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed).build()); - linearLayout.addChild(Button.builder(LEARN, button -> { - Minecraft.getInstance().gui.setScreen(new ConfirmLinkScreen(agree -> { - if (agree) { - Util.getPlatform().openUri(WIKI_LINK); - } - - Minecraft.getInstance().gui.setScreen(this); - }, WIKI_LINK, true)); - }).build()); + linearLayout.addChild(Button.builder(LEARN, ConfirmLinkScreen.confirmLink(this, WIKI_LINK, true)).build()); linearLayout.addChild(Button.builder(CommonComponents.GUI_BACK, this::onBack).build()); return linearLayout; } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java index 1c9ffd8..99a6bf7 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java @@ -9,9 +9,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.common.config.NCRConfig; import com.mojang.authlib.minecraft.TelemetrySession; -import com.mojang.authlib.yggdrasil.YggdrasilUserApiService; +import com.mojang.authlib.services.MinecraftServicesUserApiService; -@Mixin(value = YggdrasilUserApiService.class, remap = false) +@Mixin(value = MinecraftServicesUserApiService.class, remap = false) public class MixinYggdrasilUserApiService { /** diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java index 9dc2e28..32a0335 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java @@ -20,7 +20,7 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.Utf8String; import net.minecraft.network.codec.ByteBufCodecs; -@Mixin(targets = "net.minecraft.network.codec.ByteBufCodecs$34") +@Mixin(targets = "net.minecraft.network.codec.ByteBufCodecs$37") public class MixinJsonByteBufCodec { @Shadow @Final private static Gson GSON; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java index 5e6e205..f50a213 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java @@ -33,15 +33,13 @@ public abstract class MixinServerCommonPacketListenerImpl { if (self instanceof ServerGamePacketListenerImpl listener) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() - : chat.body().content()); + NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent().map(Component::getString).orElse(chat.body().content())); } if (NCRConfig.getCommon().convertToGameMessage()) { if (packet instanceof ClientboundPlayerChatPacket chat) { packet = new ClientboundSystemChatPacket(chat.chatType().decorate( - chat.unsignedContent() != null ? chat.unsignedContent() - : Component.literal(chat.body().content()) + chat.unsignedContent().orElseGet(() -> Component.literal(chat.body().content())) ), false); info.cancel(); @@ -63,8 +61,7 @@ public abstract class MixinServerCommonPacketListenerImpl { if (self instanceof ServerGamePacketListenerImpl listener) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() - : chat.body().content()); + NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent().map(Component::getString).orElse(chat.body().content())); } if (NCRConfig.getCommon().convertToGameMessage()) { diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java index bf25d92..1ebfb44 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java @@ -1,5 +1,7 @@ package com.aizistral.nochatreports.common.mixins.server; +import java.util.Optional; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -19,8 +21,8 @@ public class MixinServerboundChatPacket { */ @Inject(method = "signature", at = @At("RETURN"), cancellable = true) - private void onGetSignature(CallbackInfoReturnable info) { - info.setReturnValue(null); + private void onGetSignature(CallbackInfoReturnable> info) { + info.setReturnValue(Optional.empty()); } } -- cgit v1.2.3