From bb70394f558b1910a885e9a035a6f4b0ee2e7195 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 18 Nov 2026 23:54:00 +0100 Subject: Harden chat session, key pair accessor and server data mixins --- .../common/mixins/client/AccessorClientPacketListener.java | 5 ----- .../nochatreports/common/mixins/client/MixinServerData.java | 7 +++---- .../mixins/server/MixinServerboundChatSessionUpdatePacket.java | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java index 9ac1282..ee1c145 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java @@ -3,10 +3,8 @@ package com.aizistral.nochatreports.common.mixins.client; import com.mojang.brigadier.CommandDispatcher; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.multiplayer.ClientSuggestionProvider; -import net.minecraft.world.entity.player.ProfileKeyPair; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(ClientPacketListener.class) public interface AccessorClientPacketListener { @@ -16,7 +14,4 @@ public interface AccessorClientPacketListener { @Accessor("suggestionsProvider") public ClientSuggestionProvider getClientSuggestionProvider(); - - @Invoker("setKeyPair") - public void invokeSetKeyPair(ProfileKeyPair profileKeyPair); } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java index f4ec56b..06d59d4 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java @@ -4,7 +4,6 @@ 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 org.spongepowered.asm.mixin.injection.callback.LocalCapture; import com.aizistral.nochatreports.common.core.ServerDataExtension; @@ -38,9 +37,9 @@ public class MixinServerData implements ServerDataExtension { info.getReturnValue().putBoolean("preventsChatReports", this.preventsChatReports); } - @Inject(method = "read", locals = LocalCapture.CAPTURE_FAILSOFT, at = @At("RETURN")) - private static void onRead(CompoundTag tag, CallbackInfoReturnable info, ServerData data) { - ((ServerDataExtension)data).setPreventsChatReports(tag.getBooleanOr("preventsChatReports", false)); + @Inject(method = "read", at = @At("RETURN")) + private static void onRead(CompoundTag tag, CallbackInfoReturnable info) { + ((ServerDataExtension)info.getReturnValue()).setPreventsChatReports(tag.getBooleanOr("preventsChatReports", false)); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java index 5dbceb2..f8629e5 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java @@ -20,7 +20,7 @@ public class MixinServerboundChatSessionUpdatePacket { * @author Aizistral */ - @Inject(method = "handle", at = @At("HEAD"), cancellable = true) + @Inject(method = "handle(Lnet/minecraft/network/protocol/game/ServerGamePacketListener;)V", at = @At("HEAD"), cancellable = true) private void onHandle(ServerGamePacketListener listener, CallbackInfo info) { var impl = (ServerGamePacketListenerImpl) listener; -- cgit v1.2.3