From 6d06e360464b0924d319ea6fa64cb0b12fd60be3 Mon Sep 17 00:00:00 2001 From: Madis Date: Sat, 3 Sep 2022 14:00:16 +0300 Subject: BungeeCord/Waterfall exception --- .../java/com/aizistral/nochatreports/NoChatReportsClient.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index e068559..423efa0 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -41,6 +41,12 @@ public final class NoChatReportsClient implements ClientModInitializer { "multiplayer.disconnect.invalid_public_key_signature", "multiplayer.disconnect.invalid_public_key" ); + + private static final List STRING_DISCONNECT_REASONS = ImmutableList.of( + "A secure profile is required to join this server.", + "Secure profile expired.", + "Secure profile invalid." + ); private static boolean screenOverride = false; @Override @@ -58,14 +64,15 @@ public final class NoChatReportsClient implements ClientModInitializer { return; screenOverride = true; - if (dsc.getReason().getContents() instanceof TranslatableContents contents) { + var disconnectReason = dsc.getReason(); + if (disconnectReason != null) { if (ServerSafetyState.allowsUnsafeServer()) { screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()), CommonComponents.CONNECT_FAILED, dsc.getReason()); client.setScreen(screen); screenOverride = false; return; - } else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) { + } else if ((STRING_DISCONNECT_REASONS.contains((disconnectReason.getString())) || KEY_DISCONNECT_REASONS.contains(((TranslatableContents)disconnectReason.getContents()).getKey()))) { if (ServerSafetyState.getLastServerAddress() != null) { if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress()) && !NCRConfig.getClient().whitelistAllServers()) { client.setScreen(new UnsafeServerScreen()); -- cgit v1.2.3 From fa3f2f1fa7bb7cae3170340d4d52238bedb753d6 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 14 Sep 2022 19:11:48 +0200 Subject: Don't assume contents are always translatable --- .../java/com/aizistral/nochatreports/NoChatReportsClient.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 423efa0..225cbd9 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -41,12 +41,11 @@ public final class NoChatReportsClient implements ClientModInitializer { "multiplayer.disconnect.invalid_public_key_signature", "multiplayer.disconnect.invalid_public_key" ); - private static final List STRING_DISCONNECT_REASONS = ImmutableList.of( "A secure profile is required to join this server.", "Secure profile expired.", "Secure profile invalid." - ); + ); private static boolean screenOverride = false; @Override @@ -65,6 +64,7 @@ public final class NoChatReportsClient implements ClientModInitializer { screenOverride = true; var disconnectReason = dsc.getReason(); + if (disconnectReason != null) { if (ServerSafetyState.allowsUnsafeServer()) { screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()), @@ -72,7 +72,9 @@ public final class NoChatReportsClient implements ClientModInitializer { client.setScreen(screen); screenOverride = false; return; - } else if ((STRING_DISCONNECT_REASONS.contains((disconnectReason.getString())) || KEY_DISCONNECT_REASONS.contains(((TranslatableContents)disconnectReason.getContents()).getKey()))) { + } else if (STRING_DISCONNECT_REASONS.contains(disconnectReason.getString()) + || (disconnectReason.getContents() instanceof TranslatableContents translatable && + KEY_DISCONNECT_REASONS.contains((translatable).getKey()))) { if (ServerSafetyState.getLastServerAddress() != null) { if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress()) && !NCRConfig.getClient().whitelistAllServers()) { client.setScreen(new UnsafeServerScreen()); -- cgit v1.2.3 From a30842db3b6a0c8ff61636023d0942831bef0efa Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 14 Sep 2022 19:14:14 +0200 Subject: Update NoChatReportsClient.java --- src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 225cbd9..df16a66 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -74,7 +74,7 @@ public final class NoChatReportsClient implements ClientModInitializer { return; } else if (STRING_DISCONNECT_REASONS.contains(disconnectReason.getString()) || (disconnectReason.getContents() instanceof TranslatableContents translatable && - KEY_DISCONNECT_REASONS.contains((translatable).getKey()))) { + KEY_DISCONNECT_REASONS.contains(translatable.getKey()))) { if (ServerSafetyState.getLastServerAddress() != null) { if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress()) && !NCRConfig.getClient().whitelistAllServers()) { client.setScreen(new UnsafeServerScreen()); -- cgit v1.2.3 From 83becfd7679e0220736a9b2b4481dd3b0d4be89d Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 14 Sep 2022 19:19:52 +0200 Subject: Additional failsafe against screen loops --- src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index df16a66..1b1412e 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -46,6 +46,7 @@ public final class NoChatReportsClient implements ClientModInitializer { "Secure profile expired.", "Secure profile invalid." ); + private static final Component CONNECT_FAILED_NCR = Component.translatable("connect.failed"); private static boolean screenOverride = false; @Override @@ -61,6 +62,8 @@ public final class NoChatReportsClient implements ClientModInitializer { if (screen instanceof AccessorDisconnectedScreen dsc) { if (screenOverride) return; + if (screen.getTitle() == CONNECT_FAILED_NCR) + return; screenOverride = true; var disconnectReason = dsc.getReason(); @@ -68,7 +71,7 @@ public final class NoChatReportsClient implements ClientModInitializer { if (disconnectReason != null) { if (ServerSafetyState.allowsUnsafeServer()) { screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()), - CommonComponents.CONNECT_FAILED, dsc.getReason()); + CONNECT_FAILED_NCR, dsc.getReason()); client.setScreen(screen); screenOverride = false; return; -- cgit v1.2.3 From 64c96958d24741d85cc2625019d25022ef5661b3 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 14 Sep 2022 19:23:16 +0200 Subject: Fix reconnect count not resetting correctly at times --- src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 1b1412e..b534f10 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -84,9 +84,13 @@ public final class NoChatReportsClient implements ClientModInitializer { } else { if (ServerSafetyState.getReconnectCount() <= 0) { ServerSafetyState.setAllowsUnsafeServer(true); + screenOverride = false; reconnectLastServer(); + return; } else { ServerSafetyState.setReconnectCount(0); + screenOverride = false; + return; } } } -- cgit v1.2.3