From d3c7264f8fb80e92b24b700379e6cd90c143750a Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 30 Sep 2026 12:39:38 +0200 Subject: Apply Extra Polishâ„¢ to 26.3 port --- .../26.3.158/cloth-config-26.3.158.jar | Bin 1135630 -> 0 bytes .../26.3.158/cloth-config-26.3.158.pom | 9 ------- .../26.3.159/cloth-config-26.3.159.jar | Bin 0 -> 1119239 bytes .../26.3.159/cloth-config-26.3.159.pom | 9 +++++++ gradle.properties | 18 +++++++------ .../MixinMinecraftServicesUserApiService.java | 29 +++++++++++++++++++++ .../common/mixins/client/MixinPlayerEntry.java | 4 +-- .../client/MixinYggdrasilUserApiService.java | 29 --------------------- .../mixins/common/nochatreports.mixins.json | 2 +- 9 files changed, 51 insertions(+), 49 deletions(-) delete mode 100644 forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.jar delete mode 100644 forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.pom create mode 100644 forge/deps/generic/cloth-config/26.3.159/cloth-config-26.3.159.jar create mode 100644 forge/deps/generic/cloth-config/26.3.159/cloth-config-26.3.159.pom create mode 100644 src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraftServicesUserApiService.java delete mode 100644 src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java 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 deleted file mode 100644 index 73bad92..0000000 Binary files a/forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.jar and /dev/null 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 deleted file mode 100644 index d2bf7bd..0000000 --- a/forge/deps/generic/cloth-config/26.3.158/cloth-config-26.3.158.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - generic - cloth-config - 26.3.158 - - diff --git a/forge/deps/generic/cloth-config/26.3.159/cloth-config-26.3.159.jar b/forge/deps/generic/cloth-config/26.3.159/cloth-config-26.3.159.jar new file mode 100644 index 0000000..2ac3304 Binary files /dev/null and b/forge/deps/generic/cloth-config/26.3.159/cloth-config-26.3.159.jar differ diff --git a/forge/deps/generic/cloth-config/26.3.159/cloth-config-26.3.159.pom b/forge/deps/generic/cloth-config/26.3.159/cloth-config-26.3.159.pom new file mode 100644 index 0000000..01f58c9 --- /dev/null +++ b/forge/deps/generic/cloth-config/26.3.159/cloth-config-26.3.159.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + generic + cloth-config + 26.3.159 + + diff --git a/gradle.properties b/gradle.properties index da0969a..3c03552 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,9 +5,11 @@ org.gradle.daemon=false # Toolchain Properties minecraft_version=26.3 fabric_loader_version=0.19.5 -loom_version=1.17-SNAPSHOT -forge_version=66.0.2 -neoforge_version=26.3.0.1-beta +loom_version=1.17.21 +forge_version=66.0.8 +neoforge_version=26.3.0.36-beta +# Apply NeoForge access transformers to anonymous class members. +neogradle.subsystems.tools.jst=net.neoforged.jst:jst-cli-bundle:2.0.11 # Mod Properties mod_version=26.3-v2.21.0 @@ -23,13 +25,13 @@ mod_icon=assets/nochatreports/textures/misc/ncr_logo.png mod_license=WTFPL # Dependencies -fabric_version=0.160.5+26.3 -mod_menu_version=21.0.0-beta.1 -cloth_config_version=26.3.158 +fabric_version=0.161.0+26.3 +mod_menu_version=21.0.0 +cloth_config_version=26.3.159 # Dependencies in mods.toml -dep_forge=[66,) -dep_neoforge=[26.3.0.1-beta,) +dep_forge=[66.0.8,) +dep_neoforge=[26.3.0.36-beta,) dep_minecraft=[26.3,) # Publishing diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraftServicesUserApiService.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraftServicesUserApiService.java new file mode 100644 index 0000000..fec3c4d --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraftServicesUserApiService.java @@ -0,0 +1,29 @@ +package com.aizistral.nochatreports.common.mixins.client; + +import java.util.concurrent.Executor; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +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.services.MinecraftServicesUserApiService; + +@Mixin(value = MinecraftServicesUserApiService.class, remap = false) +public class MixinMinecraftServicesUserApiService { + + /** + * @reason Privacy. + * @author Aizistral + */ + + @Inject(method = "newTelemetrySession", at = @At("HEAD"), cancellable = true) + private void onCreateTelemetrySession(Executor executor, CallbackInfoReturnable info) { + if (NCRConfig.getClient().disableTelemetry()) { + info.setReturnValue(TelemetrySession.DISABLED); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java index f40b9ae..a1e3889 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java @@ -23,7 +23,7 @@ import net.minecraft.client.gui.components.WidgetSprites; import net.minecraft.client.gui.screens.social.PlayerEntry; import net.minecraft.client.gui.screens.social.SocialInteractionsScreen; import net.minecraft.network.chat.Component; -import net.minecraft.resources.Identifier; +import net.minecraft.world.entity.player.PlayerSkin; @Mixin(PlayerEntry.class) public class MixinPlayerEntry { @@ -38,7 +38,7 @@ public class MixinPlayerEntry { */ @Inject(method = "", at = @At("RETURN")) - private void onConstructed(Minecraft minecraft, SocialInteractionsScreen screen, UUID uuid, String name, Supplier skinGetter, boolean reportable, CallbackInfo info) { + private void onConstructed(Minecraft minecraft, SocialInteractionsScreen screen, UUID uuid, String name, Supplier skinGetter, boolean reportable, CallbackInfo info) { if (NCRConfig.getClient().alwaysHideReportButton()) { this.reportButton = new InvisibleButton(); this.reportButton.active = this.reportButton.visible = false; 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 deleted file mode 100644 index 99a6bf7..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.aizistral.nochatreports.common.mixins.client; - -import java.util.concurrent.Executor; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -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.services.MinecraftServicesUserApiService; - -@Mixin(value = MinecraftServicesUserApiService.class, remap = false) -public class MixinYggdrasilUserApiService { - - /** - * @reason Privacy. - * @author Aizistral - */ - - @Inject(method = "newTelemetrySession", at = @At("HEAD"), cancellable = true) - private void onCreateTelemetrySession(Executor executor, CallbackInfoReturnable info) { - if (NCRConfig.getClient().disableTelemetry()) { - info.setReturnValue(TelemetrySession.DISABLED); - } - } - -} diff --git a/src/main/resources/mixins/common/nochatreports.mixins.json b/src/main/resources/mixins/common/nochatreports.mixins.json index f906f1d..1c3488f 100644 --- a/src/main/resources/mixins/common/nochatreports.mixins.json +++ b/src/main/resources/mixins/common/nochatreports.mixins.json @@ -14,7 +14,7 @@ "client.MixinOptions", "client.MixinChatListener", "client.MixinChatOptionsScreen", - "client.MixinYggdrasilUserApiService", + "client.MixinMinecraftServicesUserApiService", "client.MixinPlayerEntry", "client.MixinChatScreen", "client.MixinConnectScreen", -- cgit v1.2.3