summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatCommandSignedPacket.java19
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java16
2 files changed, 23 insertions, 12 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatCommandSignedPacket.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatCommandSignedPacket.java
index e115ddc..b00ca4e 100644
--- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatCommandSignedPacket.java
+++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatCommandSignedPacket.java
@@ -3,24 +3,29 @@ package com.aizistral.nochatreports.common.mixins.server;
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.CallbackInfo;
import net.minecraft.commands.arguments.ArgumentSignatures;
-import net.minecraft.network.chat.MessageSignature;
-import net.minecraft.network.protocol.game.ServerboundChatCommandPacket;
+import net.minecraft.network.protocol.game.ServerGamePacketListener;
import net.minecraft.network.protocol.game.ServerboundChatCommandSignedPacket;
@Mixin(ServerboundChatCommandSignedPacket.class)
public class MixinServerboundChatCommandSignedPacket {
/**
- * @reason Same as {@link MixinServerboundChatPacket#onGetSignature}.
+ * @reason Same as {@link MixinServerboundChatPacket#onHandle}.
* @author Aizistral
*/
- @Inject(method = "argumentSignatures", at = @At("RETURN"), cancellable = true)
- private void onGetSignatures(CallbackInfoReturnable<ArgumentSignatures> info) {
- info.setReturnValue(ArgumentSignatures.EMPTY);
+ @Inject(method = "handle(Lnet/minecraft/network/protocol/game/ServerGamePacketListener;)V", at = @At("HEAD"), cancellable = true)
+ private void onHandle(ServerGamePacketListener listener, CallbackInfo info) {
+ ServerboundChatCommandSignedPacket packet = (ServerboundChatCommandSignedPacket) (Object) this;
+
+ if (!packet.argumentSignatures().entries().isEmpty()) {
+ info.cancel();
+ listener.handleSignedChatCommand(new ServerboundChatCommandSignedPacket(packet.command(),
+ packet.timeStamp(), packet.salt(), ArgumentSignatures.EMPTY, packet.lastSeenMessages()));
+ }
}
}
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 1ebfb44..5dd6c6d 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
@@ -5,9 +5,9 @@ import java.util.Optional;
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.CallbackInfo;
-import net.minecraft.network.chat.MessageSignature;
+import net.minecraft.network.protocol.game.ServerGamePacketListener;
import net.minecraft.network.protocol.game.ServerboundChatPacket;
@Mixin(ServerboundChatPacket.class)
@@ -20,9 +20,15 @@ public class MixinServerboundChatPacket {
* @author Aizistral
*/
- @Inject(method = "signature", at = @At("RETURN"), cancellable = true)
- private void onGetSignature(CallbackInfoReturnable<Optional<MessageSignature>> info) {
- info.setReturnValue(Optional.empty());
+ @Inject(method = "handle(Lnet/minecraft/network/protocol/game/ServerGamePacketListener;)V", at = @At("HEAD"), cancellable = true)
+ private void onHandle(ServerGamePacketListener listener, CallbackInfo info) {
+ ServerboundChatPacket packet = (ServerboundChatPacket) (Object) this;
+
+ if (packet.signature().isPresent()) {
+ info.cancel();
+ listener.handleChat(new ServerboundChatPacket(packet.message(), packet.timeStamp(), packet.salt(),
+ Optional.empty(), packet.lastSeenMessages()));
+ }
}
}