summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAizistral2023-01-25 20:29:02 +0100
committerAizistral2023-01-25 20:29:02 +0100
commit71b58e8e52397f061db0dea27b2b0549a6206cd4 (patch)
tree4ae494e9d352913936058e684e35de104bf1a28f /src
parent9b7e70a7e42a372c1c631190b95d40a14372cca3 (diff)
Fix server pinger reflection issues
Fixes #347
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java32
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/platform/extensions/ServerPingerExtension.java14
-rw-r--r--src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java (renamed from src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java33
-rw-r--r--src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json3
5 files changed, 59 insertions, 25 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 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/client/MixinMinecraft.java
index aa573c2..c32033a 100644
--- a/src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java
+++ b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.fabric.mixins;
+package com.aizistral.nochatreports.fabric.mixins.client;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
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;
+ }
+
+}
+
diff --git a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json
index 3406294..ed7497e 100644
--- a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json
+++ b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json
@@ -7,7 +7,8 @@
"mixins": [
],
"client": [
- "MixinMinecraft"
+ "client.MixinMinecraft",
+ "client.MixinServerStatusPinger$1"
],
"server": [
],