summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java1
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientConnection.java32
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientHandshakePacketListenerImpl.java22
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientPacketListener.java22
-rw-r--r--src/main/resources/nochatreports.mixins.json3
7 files changed, 83 insertions, 3 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 84f52ed..a326a04 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -76,10 +76,8 @@ public class NoChatReportsClient {
}
}
- @SubscribeEvent
@OnlyIn(Dist.CLIENT)
- public static void onDisconnect(ClientPlayerNetworkEvent.LoggingOut event) {
- Minecraft client = Minecraft.getInstance();
+ public static void onDisconnect(Minecraft client) {
client.execute(ServerSafetyState::reset);
}
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index f7a0658..a04c943 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -5,6 +5,8 @@ import java.util.Map;
import javax.annotation.Nullable;
+import com.aizistral.nochatreports.NoChatReports;
+
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
import net.minecraftforge.api.distmarker.Dist;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
index dfb94ad..dc93cd0 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
@@ -6,6 +6,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import com.aizistral.nochatreports.NoChatReports;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientConnection.java b/src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientConnection.java
new file mode 100644
index 0000000..c09eec8
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientConnection.java
@@ -0,0 +1,32 @@
+package com.aizistral.nochatreports.mixins.forge.client;
+
+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.NoChatReportsClient;
+
+import io.netty.channel.ChannelHandlerContext;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.Connection;
+import net.minecraft.network.PacketListener;
+
+@Mixin(Connection.class)
+public class MixinClientConnection {
+ @Shadow
+ private PacketListener packetListener;
+
+ @Inject(method = "channelInactive", at = @At("HEAD"))
+ private void handleDisconnect(ChannelHandlerContext context, CallbackInfo info) {
+ // not the case for client/server query
+ if (this.packetListener instanceof ClientHandshakePacketListenerImpl
+ || this.packetListener instanceof ClientPacketListener) {
+ NoChatReportsClient.onDisconnect(Minecraft.getInstance());
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientHandshakePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientHandshakePacketListenerImpl.java
new file mode 100644
index 0000000..1cdc3ef
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientHandshakePacketListenerImpl.java
@@ -0,0 +1,22 @@
+package com.aizistral.nochatreports.mixins.forge.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.NoChatReportsClient;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
+import net.minecraft.network.chat.Component;
+
+@Mixin(ClientHandshakePacketListenerImpl.class)
+public class MixinClientHandshakePacketListenerImpl {
+
+ @Inject(method = "onDisconnect", at = @At("HEAD"))
+ private void invokeLoginDisconnectEvent(Component reason, CallbackInfo info) {
+ NoChatReportsClient.onDisconnect(Minecraft.getInstance());
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientPacketListener.java
new file mode 100644
index 0000000..7803c85
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/forge/client/MixinClientPacketListener.java
@@ -0,0 +1,22 @@
+package com.aizistral.nochatreports.mixins.forge.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.NoChatReportsClient;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.chat.Component;
+
+@Mixin(value = ClientPacketListener.class)
+public class MixinClientPacketListener {
+
+ @Inject(method = "onDisconnect", at = @At("HEAD"))
+ private void handleDisconnection(Component reason, CallbackInfo info) {
+ NoChatReportsClient.onDisconnect(Minecraft.getInstance());
+ }
+
+}
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index 6f3e42a..01815e9 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -13,6 +13,9 @@
"server.MixinPlayerList"
],
"client": [
+ "forge.client.MixinClientHandshakePacketListenerImpl",
+ "forge.client.MixinClientPacketListener",
+ "forge.client.MixinClientConnection",
"client.MixinLocalPlayer",
"client.MixinOptions",
"client.MixinChatListener",