summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java25
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java2
-rw-r--r--src/main/resources/fabric.mod.json3
-rw-r--r--src/main/resources/nochatreports.accesswidener3
-rw-r--r--src/main/resources/nochatreports.mixins.json3
5 files changed, 33 insertions, 3 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java
new file mode 100644
index 0000000..a8adf92
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java
@@ -0,0 +1,25 @@
+package com.aizistral.nochatreports.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.gui.UnsafeServerScreen;
+
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+
+@Mixin(ClientPacketListener.class)
+public class MixinClientPacketListener {
+
+ @Inject(method = "<init>", at = @At("RETURN"))
+ private void onConstructed(CallbackInfo info) {
+ var self = (ClientPacketListener) (Object) this;
+ if (self.callbackScreen instanceof UnsafeServerScreen) {
+ self.callbackScreen = new JoinMultiplayerScreen(new TitleScreen());
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java
index a850aed..751c762 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java
@@ -22,7 +22,7 @@ public class MixinConnectScreen {
@Inject(method = "startConnecting", at = @At("HEAD"))
private static void onStartConnecting(Screen screen, Minecraft minecraft, ServerAddress serverAddress,
@Nullable ServerData serverData, CallbackInfo info) {
- ServerSafetyState.reset(); // just to be 100% sure
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); // just to be 100% sure
ServerSafetyState.setLastConnectedServer(serverAddress);
if (serverAddress != null)
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 8ef116b..6a9b56a 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -35,5 +35,6 @@
"minecraft": "=1.19.1-beta.2",
"java": ">=17"
},
- "suggests": {}
+ "suggests": {},
+ "accessWidener" : "nochatreports.accesswidener"
}
diff --git a/src/main/resources/nochatreports.accesswidener b/src/main/resources/nochatreports.accesswidener
new file mode 100644
index 0000000..b75583a
--- /dev/null
+++ b/src/main/resources/nochatreports.accesswidener
@@ -0,0 +1,3 @@
+accessWidener v1 named
+mutable field net/minecraft/client/multiplayer/ClientPacketListener callbackScreen Lnet/minecraft/client/gui/screens/Screen;
+accessible field net/minecraft/client/multiplayer/ClientPacketListener callbackScreen Lnet/minecraft/client/gui/screens/Screen; \ No newline at end of file
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index d3218e4..d141f88 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -20,7 +20,8 @@
"MixinPlayerEntry",
"MixinChatScreen",
"AccessorDisconnectedScreen",
- "MixinConnectScreen"
+ "MixinConnectScreen",
+ "MixinClientPacketListener"
],
"server": [
"MixinDedicatedServer"