summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/aizistral
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/aizistral')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java31
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/JSONConfig.java37
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java30
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfig.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java29
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java67
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java57
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java41
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java11
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java20
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/SigningMode.java94
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java (renamed from src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java)54
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java48
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java31
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java28
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java97
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java13
19 files changed, 438 insertions, 264 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 3b85d03..8fdc00f 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -4,6 +4,8 @@ import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerDataExtension;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.core.SigningMode;
+
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@@ -11,7 +13,9 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.ChatScreen;
import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.client.multiplayer.ProfileKeyPairManager;
import net.minecraft.network.chat.Component;
/**
@@ -21,6 +25,7 @@ import net.minecraft.network.chat.Component;
@Environment(EnvType.CLIENT)
public final class NoChatReportsClient implements ClientModInitializer {
+ private static boolean signingKeysPresent = false;
@Override
public void onInitializeClient() {
@@ -50,11 +55,13 @@ public final class NoChatReportsClient implements ClientModInitializer {
if (ServerSafetyState.isOnRealms()) {
// NO-OP
+ } else if (!handler.getConnection().isEncrypted()) {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE);
} else if (client.getCurrentServer() instanceof ServerDataExtension ext &&
ext.preventsChatReports()) {
ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE);
- } else if (ServerSafetyState.getLastServer() != null &&
- NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServer())) {
+ } else if (NCRConfig.getServerPreferences().hasMode(ServerSafetyState.getLastServer(),
+ SigningMode.ALWAYS)) {
ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
ServerSafetyState.setAllowChatSigning(true);
} else {
@@ -74,4 +81,24 @@ public final class NoChatReportsClient implements ClientModInitializer {
});
}
+ public static boolean areSigningKeysPresent() {
+ return signingKeysPresent;
+ }
+
+ public static void setSigningKeysPresent(boolean present) {
+ signingKeysPresent = present;
+ }
+
+ public static void resendLastChatMessage() {
+ var mc = Minecraft.getInstance();
+ var chatScr = mc.screen instanceof ChatScreen chat ? chat : null;
+
+ if (chatScr == null) {
+ chatScr = new ChatScreen("");
+ chatScr.init(mc, mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight());
+ }
+
+ chatScr.handleChatInput(NCRConfig.getEncryption().getLastMessage(), false);
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
index 3c937b7..edc8bec 100644
--- a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
@@ -15,22 +15,13 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonSyntaxException;
+import net.fabricmc.api.EnvType;
import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
public abstract class JSONConfig {
protected static final Path CONFIG_DIR = FabricLoader.getInstance().getConfigDir();
- protected static final Gson GSON = new GsonBuilder().setPrettyPrinting()
- .setExclusionStrategies(new ExclusionStrategy() {
- @Override
- public boolean shouldSkipField(FieldAttributes field) {
- return field.getDeclaringClass() == JSONConfig.class;
- }
-
- @Override
- public boolean shouldSkipClass(Class<?> theClass) {
- return false;
- }
- }).create();
+ protected static final Gson GSON = createGson();
protected final String fileName;
protected final Path filePath;
@@ -93,4 +84,26 @@ public abstract class JSONConfig {
}
}
+ private static Gson createGson() {
+ GsonBuilder builder = new GsonBuilder();
+ builder.setPrettyPrinting();
+ builder.setExclusionStrategies(new ExclusionStrategy() {
+ @Override
+ public boolean shouldSkipField(FieldAttributes field) {
+ return field.getDeclaringClass() == JSONConfig.class;
+ }
+
+ @Override
+ public boolean shouldSkipClass(Class<?> theClass) {
+ return false;
+ }
+ });
+
+ if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+ builder.registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE);
+ }
+
+ return builder.create();
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
index 61aa605..6ab9f60 100644
--- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
@@ -222,36 +222,6 @@ public final class ModMenuIntegration implements ModMenuApi {
.setSaveConsumer(newValue -> NCRConfig.getCommon().addQueryData = newValue)
.build());
- // Set an option for skipSigningWarning
- whitelist.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.skipSigningWarning"), NCRConfig.getClient().skipSigningWarning)
- .setDefaultValue(false)
- .setTooltip(this.makeTooltip("option.NoChatReports.skipSigningWarning.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().skipSigningWarning = newValue)
- .build());
-
- // Set an option for whitelistAllServers
- whitelist.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NCRConfig.getClient().whitelistAllServers)
- .setDefaultValue(false)
- .setTooltip(this.makeTooltip("option.NoChatReports.whitelistAllServers.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().whitelistAllServers = newValue)
- .build());
-
- // Instructions for adding servers
- whitelist.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.whitelistedServers.instructions"))
- .build());
-
- // Add or remove whitelisted servers
- whitelist.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NCRConfig.getServerWhitelist().whitelistedServers)
- .setExpanded(true)
- .setInsertInFront(true)
- .setDefaultValue(NCRServerWhitelist.DEFAULT_WHITELISTED_SERVERS)
- .setTooltip(this.makeTooltip("option.NoChatReports.whitelistedServers.tooltip"))
- .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip"))
- .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getServerWhitelist().whitelistedServers = newValue)
- .setCreateNewInstance(baseListEntry -> new StringListListEntry.StringListCell(Language.getInstance().getOrDefault(("option.NoChatReports.whitelistedServers.serverAddress")), baseListEntry))
- .build());
-
// Save config
builder.setSavingRunnable(NCRConfig::save);
return builder.build();
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
index 4d24da4..7f203bc 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
@@ -13,7 +13,7 @@ import java.util.function.Supplier;
public final class NCRConfig {
private static NCRConfigCommon common = null;
private static NCRConfigClient client = null;
- private static NCRServerWhitelist whitelist = null;
+ private static NCRServerPreferences serverPreferences = null;
private static NCRConfigEncryption encryption = null;
private NCRConfig() {
@@ -30,8 +30,8 @@ public final class NCRConfig {
}
@Environment(EnvType.CLIENT)
- public static NCRServerWhitelist getServerWhitelist() {
- return checkLoaded(() -> whitelist);
+ public static NCRServerPreferences getServerPreferences() {
+ return checkLoaded(() -> serverPreferences);
}
@Environment(EnvType.CLIENT)
@@ -52,7 +52,7 @@ public final class NCRConfig {
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME);
- whitelist = JSONConfig.loadConfig(NCRServerWhitelist.class, NCRServerWhitelist::new, NCRServerWhitelist.FILE_NAME);
+ serverPreferences = JSONConfig.loadConfig(NCRServerPreferences.class, NCRServerPreferences::new, NCRServerPreferences.FILE_NAME);
encryption = JSONConfig.loadConfig(NCRConfigEncryption.class, NCRConfigEncryption::new, NCRConfigEncryption.FILE_NAME);
}
@@ -64,7 +64,7 @@ public final class NCRConfig {
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
checkLoaded(() -> client).saveFile();
- checkLoaded(() -> whitelist).saveFile();
+ checkLoaded(() -> serverPreferences).saveFile();
checkLoaded(() -> encryption).saveFile();
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
index b1e2fe8..e79bc5a 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
@@ -1,20 +1,21 @@
package com.aizistral.nochatreports.config;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
+import com.aizistral.nochatreports.core.SigningMode;
import com.aizistral.nochatreports.mixins.client.MixinChatListener;
import com.aizistral.nochatreports.mixins.client.MixinToastComponent;
public final class NCRConfigClient extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Client.json";
- protected boolean enableMod = true, showNCRButton = true, showReloadButton = true, verifiedIconEnabled = true,
- showServerSafety = true, hideInsecureMessageIndicators = true, hideModifiedMessageIndicators = true,
- hideSystemMessageIndicators = true, hideWarningToast = true, hideSigningRequestMessage = false,
- alwaysHideReportButton = false, skipRealmsWarning = false, skipSigningWarning = false,
- whitelistAllServers = false, disableTelemetry = true, demandOnServer = false;
+ protected SigningMode defaultSigningMode = SigningMode.PROMPT;
+ protected boolean enableMod = true, showNCRButton = true, showReloadButton = true,
+ verifiedIconEnabled = true, showServerSafety = true, hideInsecureMessageIndicators = true,
+ hideModifiedMessageIndicators = true, hideSystemMessageIndicators = true,
+ hideWarningToast = true, hideSigningRequestMessage = false, alwaysHideReportButton = false,
+ skipRealmsWarning = false, disableTelemetry = true, demandOnServer = false;
protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0;
-
protected NCRConfigClient() {
super(FILE_NAME);
}
@@ -134,18 +135,6 @@ public final class NCRConfigClient extends JSONConfig {
}
/**
- * @return True if the full-screen warning should be skipped for servers that require chat signing,
- * letting users simply join the server. Because of that, servers will no longer be added to the
- * whitelist.<br><br>
- *
- * This is false by default.
- */
-
- public boolean whitelistAllServers() {
- return this.whitelistAllServers;
- }
-
- /**
* @return True if "Safe Server" icon should be displayed in multiplayer menu for servers that
* declare themselves as preventing chat reports.<br><br>
*
@@ -206,6 +195,8 @@ public final class NCRConfigClient extends JSONConfig {
return this.hideSigningRequestMessage;
}
- public boolean skipSigningWarning() { return this.skipSigningWarning; }
+ public SigningMode defaultSigningMode() {
+ return this.defaultSigningMode;
+ }
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java
new file mode 100644
index 0000000..a3eafd3
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java
@@ -0,0 +1,67 @@
+package com.aizistral.nochatreports.config;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.aizistral.nochatreports.NoChatReportsClient;
+import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.core.SigningMode;
+import com.aizistral.nochatreports.gui.UnsafeServerScreen;
+
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
+
+public class NCRServerPreferences extends JSONConfig {
+ protected static final String FILE_NAME = "NoChatReports/NCR-ServerPreferences.json";
+ protected HashMap<ServerAddress, SigningMode> signingModes = new HashMap<>();
+
+ protected NCRServerPreferences() {
+ super(FILE_NAME);
+ }
+
+ @Override
+ public NCRServerPreferences getDefault() {
+ return new NCRServerPreferences();
+ }
+
+ public SigningMode getModeRaw(@Nullable ServerAddress address) {
+ return this.signingModes.get(address);
+ }
+
+ public SigningMode getModeUnresolved(@Nullable ServerAddress address) {
+ if (!NoChatReportsClient.areSigningKeysPresent())
+ return SigningMode.NEVER_FORCED;
+ else if (address == null)
+ return SigningMode.DEFAULT;
+
+ SigningMode mode = this.getModeRaw(address);
+ return mode != null ? mode : SigningMode.DEFAULT;
+ }
+
+ public SigningMode getMode(@Nullable ServerAddress address) {
+ return this.getModeUnresolved(address).resolve();
+ }
+
+ public boolean hasMode(@Nullable ServerAddress address, SigningMode mode) {
+ return this.getMode(address) == mode;
+ }
+
+ public boolean hasModeCurrent(SigningMode mode) {
+ return this.hasMode(ServerSafetyState.getLastServer(), mode);
+ }
+
+ public void setMode(@Nullable ServerAddress address, @Nullable SigningMode mode) {
+ if (address == null)
+ return;
+
+ if (mode == null || mode == SigningMode.DEFAULT) {
+ this.signingModes.remove(address);
+ } else {
+ this.signingModes.put(address, mode);
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java b/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java
deleted file mode 100644
index a8cc1c2..0000000
--- a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.aizistral.nochatreports.config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.aizistral.nochatreports.gui.UnsafeServerScreen;
-
-import net.minecraft.client.multiplayer.resolver.ServerAddress;
-
-public class NCRServerWhitelist extends JSONConfig {
- protected static final String FILE_NAME = "NoChatReports/NCR-ServerWhitelist.json";
- protected static final List<String> DEFAULT_WHITELISTED_SERVERS = new ArrayList<>();
- protected List<String> whitelistedServers = DEFAULT_WHITELISTED_SERVERS;
-
- protected NCRServerWhitelist() {
- super(FILE_NAME);
- }
-
- @Override
- public NCRServerWhitelist getDefault() {
- return new NCRServerWhitelist();
- }
-
- /**
- * @return Current list of whitelisted unsafe servers. Used on client to remember which servers
- * user disabled unsafety warnings for.<br><br>
- *
- * This is empty by default.
- *
- * @see UnsafeServerScreen
- */
-
- public List<String> getList() {
- return this.whitelistedServers;
- }
-
- /**
- * @param address Address of the server to be check.
- * @return Whether this server is in the whitelist of unsafe servers, as returned by
- * {@link #getList()}.
- * @see UnsafeServerScreen
- */
-
- public boolean isWhitelisted(ServerAddress address) {
- return NCRConfig.getClient().whitelistAllServers() || (address != null &&
- this.getList().contains(address.getHost() + ":" + address.getPort()));
- }
-
- public boolean add(ServerAddress address) {
- return this.getList().add(address.getHost() + ":" + address.getPort());
- }
-
- public boolean remove(ServerAddress address) {
- return this.getList().remove(address.getHost() + ":" + address.getPort());
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java b/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java
new file mode 100644
index 0000000..9a90b6e
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java
@@ -0,0 +1,41 @@
+package com.aizistral.nochatreports.config;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.InstanceCreator;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
+
+@Environment(EnvType.CLIENT)
+public class ServerAddressAdapter extends TypeAdapter<ServerAddress> {
+ public static final ServerAddressAdapter INSTANCE = new ServerAddressAdapter();
+
+ private ServerAddressAdapter() {
+ // NO-OP
+ }
+
+ @Override
+ public ServerAddress read(JsonReader reader) throws IOException {
+ String string = reader.nextString();
+ String address[] = string.split(":");
+
+ if (address.length != 2)
+ throw new IOException("Incorrect server address format: " + string);
+
+ return new ServerAddress(address[0], Integer.valueOf(address[1]));
+ }
+
+ @Override
+ public void write(JsonWriter writer, ServerAddress address) throws IOException {
+ writer.value(address.getHost() + ":" + address.getPort());
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
index 0808f4f..302a1a3 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
@@ -37,14 +37,6 @@ public enum ServerSafetyLevel {
INSECURE,
/**
- * Servers that don't require signatures but the user gave them anyway by whitelisting.
- * The state is only displayed after the player toggles the whitelist for a server, because
- * it is not possible to determine whether a server requires signatures if they are already given.
- */
-
- INSECURE_WHITELISTED,
-
- /**
* For Realms specifically, as these are a whole new level of unsafe.
*/
@@ -62,9 +54,8 @@ public enum ServerSafetyLevel {
UNDEFINED;
- @Environment(EnvType.CLIENT)
public MutableComponent getTooltip() {
- return Component.translatable("gui.nochatreports.status_" + this.name().toLowerCase());
+ return Component.translatable("gui.nochatreports.safety_status." + this.name().toLowerCase());
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index 047c820..b55e059 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.minecraft.network.chat.LocalChatSession;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import org.jetbrains.annotations.Nullable;
@@ -38,21 +39,22 @@ public final class ServerSafetyState {
return ALLOW_CHAT_SIGNING.get();
}
- public static void setAllowChatSigning(boolean allow) {
+ public static CompletableFuture<Void> setAllowChatSigning(boolean allow) {
if (ALLOW_CHAT_SIGNING.compareAndSet(!allow, allow)) {
if (Minecraft.getInstance().player != null) {
var connection = Minecraft.getInstance().player.connection;
- if (allow && connection.chatSession == null) {
- Minecraft.getInstance().getProfileKeyPairManager().prepareKeyPair()
- .thenAcceptAsync(optional -> optional.ifPresent(profileKeyPair -> {
- connection.setKeyPair(profileKeyPair);
- SIGNING_ACTIONS.forEach(Runnable::run);
- SIGNING_ACTIONS.clear();
- }), Minecraft.getInstance());
- }
+ if (allow && connection.chatSession == null)
+ return Minecraft.getInstance().getProfileKeyPairManager().prepareKeyPair()
+ .thenAcceptAsync(optional -> optional.ifPresent(profileKeyPair -> {
+ connection.setKeyPair(profileKeyPair);
+ SIGNING_ACTIONS.forEach(Runnable::run);
+ SIGNING_ACTIONS.clear();
+ }), Minecraft.getInstance());
}
}
+
+ return CompletableFuture.completedFuture(null);
}
public static void toggleChatSigning() {
diff --git a/src/main/java/com/aizistral/nochatreports/core/SigningMode.java b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java
new file mode 100644
index 0000000..3d7aa3d
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java
@@ -0,0 +1,94 @@
+package com.aizistral.nochatreports.core;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.aizistral.nochatreports.config.NCRConfig;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+
+/**
+ * Signing modes control how NCR behaves with respect to chat signing.
+ * These can be enabled globally or per-server.
+ *
+ * @author Aizistral
+ */
+
+public enum SigningMode {
+
+ /**
+ * Special value that indicates signing behavior should be controlled by overarching
+ * configuration.
+ */
+ DEFAULT,
+
+ /**
+ * Never sign any messages, ignore server demands.
+ */
+ NEVER,
+
+ /**
+ * Always sign messages, regardless of whether the server asked to.
+ */
+ ALWAYS,
+
+ /**
+ * Don't sign by default, if server refuses to accept unsigned message - show GUI
+ * prompt which allows the user to enable signing or ignore server warnings for one
+ * session.
+ */
+ PROMPT,
+
+ /**
+ * Don't sign by default, if server refuses to accept unsigned message - immediately
+ * enable signing for one session and re-send that message.
+ */
+ ON_DEMAND,
+
+ /**
+ * Same as {@link SigningMode#NEVER}, but additionally indicates that signing cannot be
+ * turned on at all for some reason (i.e. missing keys or offline account).
+ */
+ NEVER_FORCED;
+
+ public MutableComponent getName() {
+ String key = "gui.nochatreports.signing_mode." + this.name().toLowerCase();
+
+ if (this != DEFAULT)
+ return Component.translatable(key);
+ else
+ return Component.translatable(key, NCRConfig.getClient().defaultSigningMode().getName());
+ }
+
+ public MutableComponent getTooltip() {
+ return Component.translatable("gui.nochatreports.signing_mode." + this.name().toLowerCase() +
+ ".tooltip");
+ }
+
+ public SigningMode next() {
+ SigningMode result = null;
+
+ if (this.ordinal() == values().length - 1) {
+ result = values()[0];
+ } else {
+ result = values()[this.ordinal() + 1];
+ }
+
+ return result == NEVER_FORCED ? result.next() : result;
+ }
+
+ public SigningMode resolve() {
+ return switch(this) {
+ case DEFAULT -> NCRConfig.getClient().defaultSigningMode();
+ case NEVER_FORCED -> NEVER;
+ default -> this;
+ };
+ }
+
+ public static SigningMode nullable(@Nullable SigningMode mode) {
+ return mode == null ? DEFAULT : mode;
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java
index 8cdafdd..898b1f5 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java
@@ -1,6 +1,9 @@
package com.aizistral.nochatreports.gui;
+import org.jetbrains.annotations.Nullable;
+
import com.mojang.blaze3d.vertex.PoseStack;
+
import net.minecraft.Util;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.Button;
@@ -11,22 +14,24 @@ import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
-public abstract class ExtendedWarningScreen extends Screen {
+public abstract class AdaptiveWarningScreen extends Screen {
private final Component title;
private final Component content;
- private final Component check;
private final Component narration;
- private final String wiki_link;
+ @Nullable
protected final Screen previous;
- protected MultiLineLabel message = MultiLineLabel.EMPTY;
+ @Nullable
+ private final Component check;
+ @Nullable
protected Checkbox stopShowing = null;
+ protected MultiLineLabel message = MultiLineLabel.EMPTY;
- public ExtendedWarningScreen(Component title, Component content, Component check, String wikiLink, Screen previous) {
+ public AdaptiveWarningScreen(Component title, Component content, @Nullable Component check,
+ @Nullable Screen previous) {
super(title);
this.title = title;
this.content = content;
this.check = check;
- this.wiki_link = wikiLink;
this.narration = this.title.copy().append("\n").append(this.content);
this.previous = previous;
}
@@ -40,37 +45,16 @@ public abstract class ExtendedWarningScreen extends Screen {
if (this.check != null) {
int checkY = this.hugeGUI() ? 27 : 76;
int j = this.font.width(this.check);
- this.stopShowing = new Checkbox(this.width / 2 - j / 2 - 8, checkY + i, j + 24, 20, this.check, false);
- this.addRenderableWidget(this.stopShowing);
- }
- this.initButtons(i);
- }
- private void initButtons(int i) {
- int offset = 28;
- int buttonY = this.hugeGUI() ? 55 : 100;
-
- this.addRenderableWidget(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed)
- .pos(this.width / 2 - 260 + offset, buttonY + i).size(150, 20).build());
-
- this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.encryption_warning.learn_more"), button -> {
- Minecraft.getInstance().setScreen(new ConfirmLinkScreen(agree -> {
- if (agree) {
- Util.getPlatform().openUri(this.wiki_link);
- }
-
- Minecraft.getInstance().setScreen(this);
- }, this.wiki_link, true));
- }).pos(this.width / 2 - 100 + offset, buttonY + i).size(150, 20).build());
-
-
- this.addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, this::onBack)
- .pos(this.width / 2 + 60 + offset, buttonY + i).size(150, 20).build());
+ if (this.check != null) {
+ this.stopShowing = new Checkbox(this.width / 2 - j / 2 - 8, checkY + i, j + 24, 20, this.check, false);
+ this.addRenderableWidget(this.stopShowing);
+ }
+ }
+ this.initButtons(i + (this.hugeGUI() ? 55 : 100));
}
- protected abstract void onProceed(Button button);
-
- protected abstract void onBack(Button button);
+ protected abstract void initButtons(int y);
@Override
public void render(PoseStack poseStack, int i, int j, float f) {
@@ -96,4 +80,4 @@ public abstract class ExtendedWarningScreen extends Screen {
return this.minecraft.font.lineHeight * 2;
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java
index 89a8418..0882a0a 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java
@@ -9,7 +9,7 @@ import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
@Environment(EnvType.CLIENT)
-public class EncryptionWarningScreen extends ExtendedWarningScreen {
+public class EncryptionWarningScreen extends TriageWarningScreen {
private static final Component TITLE = Component.translatable("gui.nochatreports.encryption_warning.header").withStyle(ChatFormatting.BOLD);
private static final Component CONTENT = Component.translatable("gui.nochatreports.encryption_warning.contents");
private static final Component CHECK = Component.translatable("gui.nochatreports.encryption_warning.check");
diff --git a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java
index e44b7f1..3fb2b79 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java
@@ -6,7 +6,7 @@ import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
-public class RealmsWarningScreen extends ExtendedWarningScreen {
+public class RealmsWarningScreen extends TriageWarningScreen {
private static final Component TITLE = Component.translatable("gui.nochatreports.realms_warning.header").withStyle(ChatFormatting.BOLD);
private static final Component CONTENT = Component.translatable("gui.nochatreports.realms_warning.contents");
private static final Component CHECK = Component.translatable("gui.nochatreports.realms_warning.check");
diff --git a/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java
new file mode 100644
index 0000000..56817c6
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java
@@ -0,0 +1,48 @@
+package com.aizistral.nochatreports.gui;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.Checkbox;
+import net.minecraft.client.gui.components.MultiLineLabel;
+import net.minecraft.client.gui.screens.ConfirmLinkScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+
+public abstract class TriageWarningScreen extends AdaptiveWarningScreen {
+ private final String wikiLink;
+
+ public TriageWarningScreen(Component title, Component content, Component check, String wikiLink, Screen previous) {
+ super(title, content, check, previous);
+ this.wikiLink = wikiLink;
+ }
+
+ @Override
+ protected void initButtons(int y) {
+ int offset = 28;
+
+ this.addRenderableWidget(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed)
+ .pos(this.width / 2 - 260 + offset, y).size(150, 20).build());
+
+ this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.encryption_warning.learn_more"), button -> {
+ Minecraft.getInstance().setScreen(new ConfirmLinkScreen(agree -> {
+ if (agree) {
+ Util.getPlatform().openUri(this.wikiLink);
+ }
+
+ Minecraft.getInstance().setScreen(this);
+ }, this.wikiLink, true));
+ }).pos(this.width / 2 - 100 + offset, y).size(150, 20).build());
+
+
+ this.addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, this::onBack)
+ .pos(this.width / 2 + 60 + offset, y).size(150, 20).build());
+ }
+
+ protected abstract void onProceed(Button button);
+
+ protected abstract void onBack(Button button);
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
index c0bb983..36820a8 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
@@ -16,6 +16,7 @@ import net.minecraft.client.gui.screens.ConfirmLinkScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.TitleScreen;
import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.client.gui.screens.multiplayer.SafetyScreen;
import net.minecraft.client.gui.screens.multiplayer.WarningScreen;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
@@ -23,18 +24,15 @@ import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
@Environment(EnvType.CLIENT)
-public final class UnsafeServerScreen extends WarningScreen {
+public final class UnsafeServerScreen extends AdaptiveWarningScreen {
private static final Component TITLE = Component.translatable("gui.nochatreports.signing_required.header").withStyle(ChatFormatting.BOLD);
private static final Component CONTENT = Component.translatable("gui.nochatreports.signing_required.contents");
private static final Component CHECK = Component.translatable("gui.nochatreports.signing_required.check");
private static final Component NARRATION = TITLE.copy().append("\n").append(CONTENT);
private static boolean hideThisSession = false;
- private final Screen previous;
-
public UnsafeServerScreen(Screen previous) {
- super(TITLE, CONTENT, CHECK, NARRATION);
- this.previous = previous;
+ super(TITLE, CONTENT, CHECK, previous);
}
@Override
@@ -43,35 +41,16 @@ public final class UnsafeServerScreen extends WarningScreen {
button -> {
ServerSafetyState.setAllowChatSigning(true);
this.minecraft.setScreen(this.previous);
- }).pos(this.width / 2 - 260 + 28, 100 + i).size(150, 20)
+ }).bounds(this.width / 2 - 155, i, 150, 20)
.build());
- ServerAddress address = ServerSafetyState.getLastServer();
- var whitelist = Button.builder(Component.translatable("gui.nochatreports.signing_required.whitelist_server"),
- button -> {
- if (address != null) {
- NCRConfig.getServerWhitelist().add(address);
- NCRConfig.getServerWhitelist().saveFile();
- }
-
- ServerSafetyState.setAllowChatSigning(true);
- this.minecraft.setScreen(this.previous);
- }).pos(this.width / 2 - 100 + 28, 100 + i).size(150, 20)
- .build();
-
- if (address == null) {
- whitelist.active = false;
- }
-
- this.addRenderableWidget(whitelist);
-
this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.signing_required.cancel"),
button -> {
if (this.stopShowing.selected()) {
hideThisSession = true;
}
this.minecraft.setScreen(this.previous);
- }).pos(this.width / 2 + 60 + 28, 100 + i).size(150, 20).build());
+ }).bounds(this.width / 2 - 155 + 160, i, 150, 20).build());
}
private void resendLastMessage() {
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
index 21a53e9..30ac570 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
@@ -1,10 +1,12 @@
package com.aizistral.nochatreports.mixins.client;
import com.aizistral.nochatreports.NoChatReports;
+import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.EncryptionUtil;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.core.SigningMode;
import com.aizistral.nochatreports.gui.UnsafeServerScreen;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.ChatScreen;
@@ -38,7 +40,7 @@ public class MixinChatListener {
private void onHandleSystemMessage(Component message, boolean overlay, CallbackInfo info) {
if (message instanceof MutableComponent mutable && message.getContents() instanceof TranslatableContents translatable) {
if (translatable.getKey().equals("chat.disabled.missingProfileKey")) {
- mutable.contents = new TranslatableContents("chat.nochatreports.disabled.signingRequested");
+ mutable.contents = new TranslatableContents("chat.nochatreports.disabled.signing_requested");
if (!ServerSafetyState.isOnRealms()) {
ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
@@ -47,18 +49,8 @@ public class MixinChatListener {
if (UnsafeServerScreen.hideThisSession() || ServerSafetyState.allowChatSigning())
return;
- if (NCRConfig.getClient().skipSigningWarning()) {
- ServerSafetyState.scheduleSigningAction(() -> {
- var mc = Minecraft.getInstance();
- var chatScr = mc.screen instanceof ChatScreen chat ? chat : null;
-
- if (chatScr == null) {
- chatScr = new ChatScreen("");
- chatScr.init(mc, mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight());
- }
- chatScr.handleChatInput(NCRConfig.getEncryption().getLastMessage(), false);
- });
-
+ if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ON_DEMAND)) {
+ ServerSafetyState.scheduleSigningAction(NoChatReportsClient::resendLastChatMessage);
ServerSafetyState.setAllowChatSigning(true);
if (NCRConfig.getClient().hideSigningRequestMessage()) {
@@ -68,11 +60,13 @@ public class MixinChatListener {
return;
}
- Minecraft.getInstance().setScreen(new UnsafeServerScreen(Minecraft.getInstance().screen
- instanceof ChatScreen chat ? chat : new ChatScreen("")));
+ if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.PROMPT)) {
+ Minecraft.getInstance().setScreen(new UnsafeServerScreen(Minecraft.getInstance().screen
+ instanceof ChatScreen chat ? chat : new ChatScreen("")));
- if (NCRConfig.getClient().hideSigningRequestMessage()) {
- info.cancel();
+ if (NCRConfig.getClient().hideSigningRequestMessage()) {
+ info.cancel();
+ }
}
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
index 53b7149..3fb0864 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
@@ -1,14 +1,18 @@
package com.aizistral.nochatreports.mixins.client;
+import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.core.SigningMode;
import com.aizistral.nochatreports.gui.AdvancedImageButton;
import com.aizistral.nochatreports.gui.AdvancedTooltip;
import com.aizistral.nochatreports.gui.EncryptionButton;
import com.aizistral.nochatreports.gui.EncryptionWarningScreen;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.*;
+
+import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.ImageButton;
import net.minecraft.client.gui.screens.ChatScreen;
@@ -24,12 +28,14 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FormattedCharSequence;
import org.joml.Matrix4f;
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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -48,6 +54,20 @@ public abstract class MixinChatScreen extends Screen {
throw new IllegalStateException("Can't touch this");
}
+ @Inject(method = "handleChatInput", at = @At("HEAD"), cancellable = true)
+ public void handleChatInput(String string, boolean bl, CallbackInfoReturnable<Boolean> info) {
+ if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ALWAYS) && !ServerSafetyState.allowChatSigning()) {
+ if (this.minecraft.getConnection().getConnection().isEncrypted()) {
+ if (!this.normalizeChatMessage(string).isEmpty()) {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
+ ServerSafetyState.scheduleSigningAction(NoChatReportsClient::resendLastChatMessage);
+ ServerSafetyState.setAllowChatSigning(true);
+ info.setReturnValue(true);
+ }
+ }
+ }
+ }
+
@Inject(method = "normalizeChatMessage", at = @At("RETURN"), cancellable = true)
public void onBeforeMessage(String original, CallbackInfoReturnable<String> info) {
String message = info.getReturnValue();
@@ -73,59 +93,53 @@ public abstract class MixinChatScreen extends Screen {
if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) {
this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(),
0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> {
- if (NCRConfig.getClient().whitelistAllServers())
+ if (!NoChatReportsClient.areSigningKeysPresent())
return;
var address = ServerSafetyState.getLastServer();
+
if (address != null) {
- var whitelist = NCRConfig.getServerWhitelist();
-
- if (!whitelist.isWhitelisted(address)) {
- whitelist.add(address);
- whitelist.saveFile();
-
- if (ServerSafetyState.getCurrent() != ServerSafetyLevel.SECURE) {
- ServerSafetyState.setAllowChatSigning(true);
- if(ServerSafetyState.getCurrent() != ServerSafetyLevel.INSECURE){
- ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE_WHITELISTED);
- }
- }
- } else {
- whitelist.remove(address);
- whitelist.saveFile();
- }
+ var preferences = NCRConfig.getServerPreferences();
+ preferences.setMode(address, preferences.getModeUnresolved(address).next());
+ preferences.saveFile();
}
}, Component.empty(), this);
this.safetyStatusButton.setTooltip(new AdvancedTooltip(() -> {
MutableComponent tooltip = this.getSafetyLevel().getTooltip();
ServerAddress address = ServerSafetyState.getLastServer();
- String signing = "gui.nochatreports.status_signing_denied";
-
- if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) {
- signing = "gui.nochatreports.status_signing_allowed_realms";
- } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE) {
- signing = "gui.nochatreports.status_signing_denied_secure";
- } else if (NCRConfig.getServerWhitelist().isWhitelisted(address)) {
- signing = "gui.nochatreports.status_signing_allowed_whitelisted";
- } else if (ServerSafetyState.allowChatSigning()) {
- signing = "gui.nochatreports.status_signing_allowed";
- }
+ SigningMode mode = NCRConfig.getServerPreferences().getModeUnresolved(address);
+ String signing = "gui.nochatreports.signing_status.";
- tooltip.append("\n\n").append(Component.translatable(signing));
-
- if (address != null) {
- String status = "gui.nochatreports.status_whitelist_no";
+ if (ServerSafetyState.allowChatSigning()) {
+ tooltip = Component.translatable("gui.nochatreports.safety_status.insecure_signing");
+ }
- if (NCRConfig.getClient().whitelistAllServers()) {
- status = "gui.nochatreports.status_whitelist_all";
- } else if (NCRConfig.getServerWhitelist().isWhitelisted(address)) {
- status = "gui.nochatreports.status_whitelist_yes";
+ if (!this.minecraft.getConnection().getConnection().isEncrypted()) {
+ signing += "disabled_offline";
+ } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) {
+ signing += "allowed_realms";
+ } else if (mode.resolve() == SigningMode.ALWAYS) {
+ if (ServerSafetyState.allowChatSigning()) {
+ signing += "allowed";
+ } else {
+ signing += "disabled_allowance_pending";
}
-
- tooltip.append("\n\n").append(Component.translatable(
- "gui.nochatreports.status_whitelist_mode", Component.translatable(status)));
+ } else if (ServerSafetyState.allowChatSigning()) {
+ signing += "allowed_session";
+ } else {
+ signing += "disabled";
}
+ tooltip.append("\n\n");
+ tooltip.append(Component.translatable(signing));
+ tooltip.append("\n\n");
+ tooltip.append(Component.translatable("gui.nochatreports.safety_status_button.controls"));
+ tooltip.append("\n\n");
+ tooltip.append(Component.translatable("gui.nochatreports.signing_mode",
+ mode.getName().withStyle(ChatFormatting.BOLD, ChatFormatting.AQUA)));
+ tooltip.append("\n");
+ tooltip.append((mode == SigningMode.DEFAULT ? mode.resolve() : mode).getTooltip());
+
return tooltip;
}).setMaxWidth(250).setRenderWithoutGap(true));
@@ -185,11 +199,14 @@ public abstract class MixinChatScreen extends Screen {
return switch (level) {
case SECURE -> 21;
case UNINTRUSIVE -> 42;
- case INSECURE, INSECURE_WHITELISTED -> 0;
+ case INSECURE -> 0;
case REALMS -> 63;
case UNKNOWN -> 84;
case UNDEFINED -> 105;
};
}
+ @Shadow
+ public abstract String normalizeChatMessage(String string);
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
index dd41e5d..c6dc485 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
@@ -1,19 +1,32 @@
package com.aizistral.nochatreports.mixins.client;
+import org.spongepowered.asm.mixin.Final;
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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
import com.mojang.authlib.minecraft.TelemetrySession;
import net.minecraft.client.Minecraft;
+import net.minecraft.client.main.GameConfig;
import net.minecraft.client.multiplayer.ProfileKeyPairManager;
@Mixin(Minecraft.class)
public class MixinMinecraft {
+ @Shadow @Final
+ private ProfileKeyPairManager profileKeyPairManager;
+
+ @Inject(method = "<init>(Lnet/minecraft/client/main/GameConfig;)V", at = @At("RETURN"))
+ private void onConstructed(GameConfig config, CallbackInfo info) {
+ NoChatReportsClient.setSigningKeysPresent(this.profileKeyPairManager.prepareKeyPair()
+ .join().isPresent());
+ }
@Inject(method = "getProfileKeyPairManager", at = @At("HEAD"), cancellable = true)
private void onGetProfileKeyPairManager(CallbackInfoReturnable<ProfileKeyPairManager> info) {