summaryrefslogtreecommitdiffstats
path: root/src/main/java/com
diff options
context:
space:
mode:
authorAizistral2022-11-04 11:00:37 +0100
committerAizistral2022-11-04 11:00:37 +0100
commitbad639e9dad8d7c6d8aafcff6de7e13aa31c556e (patch)
tree671fb7233b39786580ade1374959a6b10c2dafe9 /src/main/java/com
parent4d0bb72dc36f7b0a6a11de215e97642ea7a40bd3 (diff)
No updating mod toggle mid-session
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java12
2 files changed, 13 insertions, 5 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
index 91e983c..b2c7d3f 100644
--- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
@@ -175,10 +175,8 @@ public final class ModMenuIntegration implements ModMenuApi {
technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod)
.setDefaultValue(true)
.setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip"))
- .setSaveConsumer(newValue -> {
- NCRConfig.getClient().enableMod = newValue;
- ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN);
- })
+ .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() ->
+ NCRConfig.getClient().enableMod = newValue))
.build());
// Warning for showEncryptionButton
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index f9ab691..0e879b4 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -1,5 +1,7 @@
package com.aizistral.nochatreports.core;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -26,9 +28,10 @@ import net.minecraft.network.chat.SignedMessageChain.Encoder;
@Environment(EnvType.CLIENT)
public final class ServerSafetyState {
+ private static final List<Runnable> resetActions = new ArrayList<>();
+ private static final AtomicBoolean allowChatSigning = new AtomicBoolean(false);
private volatile static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED;
private volatile static ServerAddress lastServer = null;
- private static AtomicBoolean allowChatSigning = new AtomicBoolean(false);
public static void updateCurrent(ServerSafetyLevel level) {
current = level;
@@ -79,11 +82,18 @@ public final class ServerSafetyState {
lastServer = address;
}
+ public static void scheduleResetAction(Runnable action) {
+ resetActions.add(action);
+ }
+
public static void reset() {
lastServer = null;
current = ServerSafetyLevel.UNDEFINED;
allowChatSigning.set(false);
UnsafeServerScreen.setHideThisSession(false);
+
+ resetActions.forEach(Runnable::run);
+ resetActions.clear();
}
}