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 | 32 ++++++--------------- .../platform/extensions/ServerPingerExtension.java | 14 +++++++++ .../fabric/mixins/MixinMinecraft.java | 20 ------------- .../fabric/mixins/client/MixinMinecraft.java | 20 +++++++++++++ .../mixins/client/MixinServerStatusPinger$1.java | 33 ++++++++++++++++++++++ 5 files changed, 76 insertions(+), 43 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/common/platform/extensions/ServerPingerExtension.java delete mode 100644 src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java create mode 100644 src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java create mode 100644 src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java (limited to 'src/main/java') 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 a6cfaa2..b74f175 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 @@ -10,25 +10,15 @@ 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 { - 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) { - throw new RuntimeException("Reflection failed in MixinServerStatusPinger$1", ex); - } - } +public abstract class MixinServerStatusPinger$1 implements ServerPingerExtension { /** * @reason Ensure "preventsChatReports" property is transferred from {@link ServerStatus} to @@ -39,16 +29,12 @@ public class MixinServerStatusPinger$1 { @Inject(method = "handleStatusResponse(Lnet/minecraft/network/protocol/status/ClientboundStatusResponsePacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/status/ServerStatus;getPlayers()Lnet/minecraft/network/protocol/status/ServerStatus$Players;", ordinal = 0, shift = At.Shift.BEFORE)) private void getNoChatReports(ClientboundStatusResponsePacket packet, CallbackInfo info) { - try { - boolean preventsReports = ((ServerDataExtension) packet.getStatus()).preventsChatReports(); - ((ServerDataExtension) SERVER_DATA_FIELD.get(this)).setPreventsChatReports(preventsReports); - - if (NCRConfig.getCommon().enableDebugLog()) { - NCRCore.LOGGER.info("Received status response packet from server, preventsChatReports: {}", - preventsReports); - } - } catch (IllegalArgumentException | IllegalAccessException ex) { - throw new RuntimeException("Failed to get ServerData field via reflection", ex); + boolean preventsReports = ((ServerDataExtension) packet.getStatus()).preventsChatReports(); + ((ServerDataExtension) this.getServerData()).setPreventsChatReports(preventsReports); + + if (NCRConfig.getCommon().enableDebugLog()) { + NCRCore.LOGGER.info("Received status response packet from server, preventsChatReports: {}", + preventsReports); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/extensions/ServerPingerExtension.java b/src/main/java/com/aizistral/nochatreports/common/platform/extensions/ServerPingerExtension.java new file mode 100644 index 0000000..061ec96 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/platform/extensions/ServerPingerExtension.java @@ -0,0 +1,14 @@ +package com.aizistral.nochatreports.common.platform.extensions; + +import com.aizistral.nochatreports.common.core.ServerDataExtension; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.multiplayer.ServerData; + +@Environment(EnvType.CLIENT) +public interface ServerPingerExtension { + + public ServerData getServerData(); + +} diff --git a/src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java deleted file mode 100644 index aa573c2..0000000 --- a/src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.aizistral.nochatreports.fabric.mixins; - -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 net.minecraft.client.Minecraft; - -@Mixin(Minecraft.class) -public class MixinMinecraft { - - @Inject(method = "run", at = @At("HEAD")) - private void onRun(CallbackInfo info) { - NCRCore.LOGGER.info("Game entered main loop!"); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java new file mode 100644 index 0000000..c32033a --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java @@ -0,0 +1,20 @@ +package com.aizistral.nochatreports.fabric.mixins.client; + +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 net.minecraft.client.Minecraft; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + + @Inject(method = "run", at = @At("HEAD")) + private void onRun(CallbackInfo info) { + NCRCore.LOGGER.info("Game entered main loop!"); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java new file mode 100644 index 0000000..735184b --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java @@ -0,0 +1,33 @@ +package com.aizistral.nochatreports.fabric.mixins.client; + +import java.lang.reflect.Field; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +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 { + @Shadow @Final + private ServerData val$data; + + @Override + public ServerData getServerData() { + return this.val$data; + } + +} + -- cgit v1.2.3