summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java18
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java2
5 files changed, 20 insertions, 11 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 7cd88e3..60cc909 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -69,8 +69,8 @@ public class NoChatReportsClient implements ClientModInitializer {
screenOverride = false;
return;
} else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) {
- if (ServerSafetyState.getLastConnectedServer() != null) {
- if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastConnectedServer()) && !NoReportsConfig.whitelistAllServers()) {
+ if (ServerSafetyState.getLastServerAddress() != null) {
+ if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastServerAddress()) && !NoReportsConfig.whitelistAllServers()) {
client.setScreen(new UnsafeServerScreen());
} else {
if (ServerSafetyState.getReconnectCount() <= 0) {
@@ -115,7 +115,7 @@ public class NoChatReportsClient implements ClientModInitializer {
public static void reconnectLastServer() {
ServerSafetyState.setReconnectCount(ServerSafetyState.getReconnectCount() + 1);
ConnectScreen.startConnecting(new JoinMultiplayerScreen(new TitleScreen()), Minecraft.getInstance(),
- ServerSafetyState.getLastConnectedServer(), null);
+ ServerSafetyState.getLastServerAddress(), ServerSafetyState.getLastServerData());
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index 9bff76b..3971ff5 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -9,6 +9,7 @@ import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
+import net.minecraft.util.Tuple;
/**
* All this global state is questionable, but we have to...
@@ -18,7 +19,8 @@ import net.minecraft.client.multiplayer.resolver.ServerAddress;
@Environment(EnvType.CLIENT)
public class ServerSafetyState {
private static ServerSafetyLevel current = ServerSafetyLevel.UNKNOWN;
- private static ServerAddress lastConnectedServer = null;
+ private static ServerAddress lastServerAddress = null;
+ private static ServerData lastServerData = null;
private static boolean allowUnsafeServer = false, sessionRequestedKey = false;
private static int reconnectCount = 0;
@@ -51,12 +53,18 @@ public class ServerSafetyState {
}
@Nullable
- public static ServerAddress getLastConnectedServer() {
- return lastConnectedServer;
+ public static ServerAddress getLastServerAddress() {
+ return lastServerAddress;
}
- public static void setLastConnectedServer(@Nullable ServerAddress address) {
- lastConnectedServer = address;
+ @Nullable
+ public static ServerData getLastServerData() {
+ return lastServerData;
+ }
+
+ public static void setLastConnectedServer(@Nullable ServerAddress address, @Nullable ServerData data) {
+ lastServerAddress = address;
+ lastServerData = data;
}
public static int getReconnectCount() {
diff --git a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
index bf52fcd..b3e41d0 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
@@ -48,7 +48,7 @@ public class UnsafeServerScreen extends WarningScreen {
@Override
protected void initButtons(int i) {
this.addRenderableWidget(new Button(this.width / 2 - 155, 100 + i, 150, 20, CommonComponents.GUI_PROCEED, button -> {
- ServerAddress address = ServerSafetyState.getLastConnectedServer();
+ ServerAddress address = ServerSafetyState.getLastServerAddress();
if (address != null) {
if (this.stopShowing.selected()) {
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
index fc15928..5e8e1ac 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
@@ -30,12 +30,13 @@ public class MixinConnectScreen {
private static void onStartConnecting(Screen screen, Minecraft minecraft, ServerAddress serverAddress,
@Nullable ServerData serverData, CallbackInfo info) {
ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); // just to be 100% sure
- ServerSafetyState.setLastConnectedServer(serverAddress);
+ ServerSafetyState.setLastConnectedServer(serverAddress, serverData);
if (NoReportsConfig.isDebugLogEnabled()) {
NoChatReports.LOGGER.info("Connecting to: {}, will expose public key: {}",
serverAddress.getHost() + ":" + serverAddress.getPort(),
ServerSafetyState.allowsUnsafeServer());
+ NoChatReports.LOGGER.info("Server Data IP: {}", serverData != null ? serverData.ip : "null");
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java
index 9d8a3a5..01a5b1f 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java
@@ -22,7 +22,7 @@ public class MixinRealmsConnect {
@Inject(method = "connect", at = @At("HEAD"))
private void onConnect(RealmsServer realmsServer, ServerAddress serverAddress, CallbackInfo info) {
- ServerSafetyState.setLastConnectedServer(serverAddress);
+ ServerSafetyState.setLastConnectedServer(serverAddress, null);
ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
ServerSafetyState.setAllowsUnsafeServer(true);
}