summaryrefslogtreecommitdiffstats
path: root/forge
diff options
context:
space:
mode:
authorpietro-lopes2024-10-28 17:07:30 -0300
committerGitHub2024-10-28 21:07:30 +0100
commit58ec1322a7b5908a4f33e66baeab3f609c22a074 (patch)
treef656d0c07d92891124341855dfaa6e435985d3b6 /forge
parent0400e5f1fc9a9999106f67c69a1a1f797a9ba8a9 (diff)
Fixes #481 (#487)
* Fixes #481 * Update some javadocs * Just in case, you never know --------- Co-authored-by: Aizistral <admin@aizistral.com>
Diffstat (limited to 'forge')
-rw-r--r--forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinServerStatusPinger$1.java52
-rw-r--r--forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json3
2 files changed, 1 insertions, 54 deletions
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
deleted file mode 100644
index 7c19827..0000000
--- a/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinServerStatusPinger$1.java
+++ /dev/null
@@ -1,52 +0,0 @@
-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 fc7bc59..9fde6e0 100644
--- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json
+++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json
@@ -7,8 +7,7 @@
"client": [
"client.MixinClientConnection",
"client.MixinClientHandshakePacketListenerImpl",
- "client.MixinClientPacketListener",
- "client.MixinServerStatusPinger$1"
+ "client.MixinClientPacketListener"
],
"server": [],
"injectors": {