Merge branch '1.21-Unified' into 1.21.7-Fix

Author: Aizistral

build.gradle

@@ -1,7 +1,7 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-	id 'fabric-loom' version '1.10.2'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 	id "com.matthewprenger.cursegradle" version "1.+"
@@ -159,7 +159,7 @@ curseforge {
 
 		addGameVersion "1.21.8"
 		addGameVersion project.minecraft_version
-		addGameVersion "1.21.6"
+		addGameVersion "1.21.9"
 		addGameVersion 'Fabric'
 		addGameVersion 'Java 21'
 
@@ -191,7 +191,7 @@ modrinth {
     versionType = "${version_type}"
 	changelog = rootProject.file("docs/CHANGELOG.md").text
     uploadFile = remapJar
-    gameVersions = [ "1.21.8", project.minecraft_version, "1.21.6" ]
+    gameVersions = [ project.minecraft_version, "1.21.9" ]
 	loaders = ['fabric']
 
 	dependencies {

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 
 # Toolchain Properties
-minecraft_version=1.21.7
-yarn_mappings=1.21.7+build.1
-fabric_loader_version=0.16.14
-forge_version=1.21.7-57.0.0
-neoforge_version=21.7.0-beta
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.1
+fabric_loader_version=0.17.2
+forge_version=1.21.10-60.0.0
+neoforge_version=21.10.1-beta
 
 # Mod Properties
-mod_version=1.21.8-v2.15.0
+mod_version=1.21.9-v2.15.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.128.1+1.21.7
-mod_menu_version=15.0.0-beta.2
-cloth_config_version=19.0.146
+fabric_version=0.135.0+1.21.10
+mod_menu_version=16.0.0-rc.1
+cloth_config_version=20.0.148
 
 # Dependencies in mods.toml
-dep_forge=[57,)
-dep_neoforge=[21.7.0,)
-dep_minecraft=[1.21.7,)
+dep_forge=[59,)
+dep_neoforge=[21.9.0-beta,)
+dep_minecraft=[1.21.9,)
 
 # Publishing
 curse_id=634062

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java

@@ -6,9 +6,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent;
-import net.neoforged.neoforge.event.server.ServerStartedEvent;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
@@ -26,12 +24,12 @@ public NoChatReports() {
 
 	@Override
 	public boolean isOnClient() {
-		return FMLEnvironment.dist == Dist.CLIENT;
+		return FMLEnvironment.getDist() == Dist.CLIENT;
 	}
 
 	@Override
 	public boolean isOnDedicatedServer() {
-		return FMLEnvironment.dist == Dist.DEDICATED_SERVER;
+		return FMLEnvironment.getDist() == Dist.DEDICATED_SERVER;
 	}
 
 	@Override

src/main/java/com/aizistral/nochatreports/common/NCRClient.java

@@ -88,7 +88,7 @@ public static void resendLastChatMessage() {
 		var chatScr = mc.screen instanceof ChatScreen chat ? chat : null;
 
 		if (chatScr == null) {
-			chatScr = new ChatScreen("");
+			chatScr = new ChatScreen("", false);
 			chatScr.init(mc, mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight());
 		}
 

src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java

@@ -157,10 +157,6 @@ protected static Screen getConfigScreen(Screen parent) {
 					.setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetY = newValue)
 					.build());
 
-			// Warning for showEncryptionButton
-			client.addEntry(entryBuilder.startTextDescription(Component.translatable("gui.NoChatReports.showEncryptionButtonWarning"))
-					.build());
-
 			// Set an option for showServerSafety
 			client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NCRConfig.getClient().showServerSafety)
 					.setDefaultValue(true)

src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java

@@ -61,7 +61,7 @@ public void render(GuiGraphics graphics, int i, int j, float f) {
 		super.render(graphics, i, j, f);
 		this.renderTitle(graphics);
 		int k = this.width / 2 - this.message.getWidth() / 2;
-		this.message.renderLeftAligned(graphics, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFFFF);
+		this.message.render(graphics, MultiLineLabel.Align.LEFT, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), true, 0xFFFFFFFF);
 	}
 
 	private void renderTitle(GuiGraphics graphics) {

src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java

@@ -1,5 +1,6 @@
 package com.aizistral.nochatreports.common.gui;
 
+import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -11,7 +12,7 @@ private TooltipHelper() {
 	}
 
 	public static MutableComponent getCtrl() {
-		if (Minecraft.ON_OSX)
+		if (Util.getPlatform() == Util.OS.OSX)
 			return Component.translatable("key.nochatreports.cmd");
 		else
 			return Component.translatable("key.nochatreports.ctrl");

src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java

@@ -72,7 +72,7 @@ private void onHandleSystemMessage(Component message, boolean overlay, CallbackI
 
 				if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.PROMPT)) {
 					Screen returnScreen = Minecraft.getInstance().screen instanceof ChatScreen chat ? chat
-							: new ChatScreen("");
+							: new ChatScreen("", false);
 					Screen unsafeScreen = new UnsafeServerScreen(returnScreen);
 					Minecraft.getInstance().setScreen(unsafeScreen);
 

src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java

@@ -1,6 +1,10 @@
 package com.aizistral.nochatreports.common.mixins.client;
 
+import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
+import net.minecraft.client.gui.layouts.LinearLayout;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -12,7 +16,6 @@
 import com.aizistral.nochatreports.common.gui.GUIShenanigans;
 import com.aizistral.nochatreports.common.gui.SwitchableSprites;
 
-import net.minecraft.client.gui.components.ImageButton;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
 import net.minecraft.locale.Language;
@@ -27,6 +30,8 @@
 
 @Mixin(JoinMultiplayerScreen.class)
 public abstract class MixinJoinMultiplayerScreen extends Screen {
+	@Shadow @Final
+	private HeaderAndFooterLayout layout;
 	private static final ResourceLocation RELOAD_TEXTURE = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/config_reload_button.png"),
 			TOGGLE_TEXTURE = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/ncr_toggle_button.png");
 	private static final Component RELOAD_TOOLTIP = Component.translatable("gui.nochatreports.reload_config_tooltip");
@@ -38,18 +43,22 @@ protected MixinJoinMultiplayerScreen() {
 
 	@Inject(method = "init", at = @At("HEAD"))
 	private void onInit(CallbackInfo info) {
+		LinearLayout ncrButtons = this.layout.addToFooter(LinearLayout.vertical().spacing(4), layoutSettings -> {
+			layoutSettings.paddingLeft(336);
+		});
+
 		if (NCRConfig.getClient().showReloadButton()) {
-			var button = new AdvancedImageButton(this.width/2 + 158, this.height - 54, 20, 20,
+			var button = new AdvancedImageButton(0, 0, 20, 20,
 					SwitchableSprites.of(GUIShenanigans.getSprites("config_reload_button")),
 					btn -> NCRConfig.load(), CommonComponents.EMPTY, this);
 			button.setTooltip(new AdvancedTooltip(RELOAD_TOOLTIP).setMaxWidth(250));
 			button.active = true;
 			button.visible = true;
-			this.addRenderableWidget(button);
+			ncrButtons.addChild(button);
 		}
 
 		if (NCRConfig.getClient().showNCRButton()) {
-			var button = new AdvancedImageButton(this.width/2 + 158, this.height - 30, 20, 20,
+			var button = new AdvancedImageButton(0, 0, 20, 20,
 					SwitchableSprites.of(
 							GUIShenanigans.getSprites("ncr_active_button"),
 							GUIShenanigans.getSprites("ncr_inactive_button")
@@ -71,7 +80,7 @@ private void onInit(CallbackInfo info) {
 							.enableMod() ? "on" : "off")))).setMaxWidth(250));
 			button.active = true;
 			button.visible = true;
-			this.addRenderableWidget(button);
+			ncrButtons.addChild(button);
 		}
 	}