summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/aizistral
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/aizistral')
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java41
1 files changed, 30 insertions, 11 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java
index 81c14e0..bb19ae7 100644
--- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java
+++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java
@@ -1,8 +1,12 @@
package com.aizistral.nochatreports.common.mixins.client;
-import java.lang.reflect.Field;
+import java.net.InetSocketAddress;
+import net.minecraft.client.multiplayer.ServerStatusPinger;
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
+import net.minecraft.network.Connection;
import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -12,28 +16,43 @@ import com.aizistral.nochatreports.common.config.NCRConfig;
import com.aizistral.nochatreports.common.core.ServerDataExtension;
import com.aizistral.nochatreports.common.platform.extensions.ServerPingerExtension;
-import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
import net.minecraft.network.protocol.status.ServerStatus;
+
+/**
+ * This one ensures "preventsChatReports" property is transferred from {@link ServerStatus} to
+ * {@link ServerData} when handling status response.
+ * @author fxmorin (original implementation)
+ * @author Aizistral (current version)
+ * @author pietro-lopes (fixed https://github.com/Aizistral-Studios/No-Chat-Reports/issues/481)
+ */
+
@Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1")
public abstract class MixinServerStatusPinger$1 implements ServerPingerExtension {
- /**
- * @reason Ensure "preventsChatReports" property is transferred from {@link ServerStatus} to
- * {@link ServerData} when handling status response.
- * @author fxmorin (original implementation)
- * @author Aizistral (current version)
- */
+ @Unique
+ private ServerDataExtension nochatreports$serverData;
+
+ @Inject(method = "<init>", at = @At("RETURN"))
+ private void captureServerData(ServerStatusPinger serverStatusPinger, Connection connection, ServerData serverData, Runnable runnable, Runnable runnable2, InetSocketAddress inetSocketAddress, ServerAddress serverAddress, CallbackInfo ci){
+ this.nochatreports$serverData = (ServerDataExtension) serverData;
+ }
@Inject(method = "handleStatusResponse(Lnet/minecraft/network/protocol/status/ClientboundStatusResponsePacket;)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/status/ServerStatus;"
- + "description()Lnet/minecraft/network/chat/Component;",
- ordinal = 0, shift = At.Shift.BEFORE))
+ + "description()Lnet/minecraft/network/chat/Component;"))
private void getNoChatReports(ClientboundStatusResponsePacket packet, CallbackInfo info) {
boolean preventsReports = ((ServerDataExtension) (Object) packet.status()).preventsChatReports();
- ((ServerDataExtension) this.getServerData()).setPreventsChatReports(preventsReports);
+
+ if (this.nochatreports$serverData == null) {
+ NCRCore.LOGGER.error("Failed to capture ServerData instance in MixinServerStatusPinger$1!");
+ NCRCore.LOGGER.catching(new IllegalStateException());
+ return;
+ }
+
+ this.nochatreports$serverData.setPreventsChatReports(preventsReports);
if (NCRConfig.getCommon().enableDebugLog()) {
NCRCore.LOGGER.info("Received status response packet from server, preventsChatReports: {}",