From 71b58e8e52397f061db0dea27b2b0549a6206cd4 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 25 Jan 2023 20:29:02 +0100 Subject: Fix server pinger reflection issues Fixes #347 --- .../mixins/client/MixinServerStatusPinger$1.java | 52 ++++++++++++++++++++++ .../mixins/forge/nochatreports-forge.mixins.json | 3 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinServerStatusPinger$1.java (limited to 'forge/src/main') diff --git a/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinServerStatusPinger$1.java b/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinServerStatusPinger$1.java new file mode 100644 index 0000000..7c19827 --- /dev/null +++ b/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinServerStatusPinger$1.java @@ -0,0 +1,52 @@ +package com.aizistral.nochatreports.forge.mixins.client; + +import java.lang.reflect.Field; + +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.CallbackInfo; + +import com.aizistral.nochatreports.common.NCRCore; +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; + +@Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1") +public class MixinServerStatusPinger$1 implements ServerPingerExtension { + private static final Field SERVER_DATA_FIELD; + + static { + // We use reflection here because Mixin's AP dies when trying to process @Shadow of this lol + try { + Class pinger = Class.forName("net.minecraft.client.multiplayer.ServerStatusPinger$1"); + + SERVER_DATA_FIELD = pinger.getDeclaredField("val$p_105460_"); + SERVER_DATA_FIELD.setAccessible(true); + } catch (Exception ex) { + Error error = new Error("Reflection failed in MixinServerStatusPinger$1!", ex); + + NCRCore.LOGGER.catching(error); + Minecraft.getInstance().execute(() -> { + throw error; + }); + + throw error; + } + } + + @Override + public ServerData getServerData() { + try { + return (ServerData) SERVER_DATA_FIELD.get(this); + } catch (Exception ex) { + throw new RuntimeException("Failed to get ServerData field via reflection", ex); + } + } + +} diff --git a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json index e91062c..02d57d6 100644 --- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json +++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json @@ -8,7 +8,8 @@ "client": [ "client.MixinClientConnection", "client.MixinClientHandshakePacketListenerImpl", - "client.MixinClientPacketListener" + "client.MixinClientPacketListener", + "client.MixinServerStatusPinger$1" ], "server": [], "injectors": { -- cgit v1.2.3