summaryrefslogtreecommitdiffstats
path: root/src/main/java/com
diff options
context:
space:
mode:
authorAizistral2023-01-02 00:52:27 +0100
committerAizistral2023-01-02 00:52:27 +0100
commitb3c30502160135a9f3f7482724c786301bfcf64c (patch)
tree06927a25e927b4fc63c7c33cc0053ba4882a4688 /src/main/java/com
parentbeb81e53d321dc26063b3ebae0245d8012d8afba (diff)
Restore parity with Fabric branch
Target version 1.19.3-v1.19.0, commit: https://github.com/Aizistral-Studios/No-Chat-Reports/commit/6d61f99a1547eab58e88dcea7e3901511f0929d2
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReports.java62
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java142
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/JSONConfig.java43
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfig.java24
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java94
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java9
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java14
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java72
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java49
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java35
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java7
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java23
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java118
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/SigningMode.java105
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java15
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java24
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java16
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java24
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/Encryption.java1
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java14
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java83
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java40
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java177
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java82
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java11
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java86
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java20
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java97
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/FontHelper.java1
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java23
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java11
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java48
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java76
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java25
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java22
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java97
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java55
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java237
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java39
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java33
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java33
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java31
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java13
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java105
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java57
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java48
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java25
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java40
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java89
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java30
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java33
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java11
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java33
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java25
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java19
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java36
66 files changed, 1342 insertions, 1494 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
index 1d5f054..46d9a2e 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
@@ -29,75 +29,15 @@ import net.minecraftforge.network.event.EventNetworkChannel;
import net.minecraftforge.network.simple.SimpleChannel;
import net.minecraftforge.server.ServerLifecycleHooks;
-@Mod(NoChatReports.MODID)
+@Mod("nochatreports")
public class NoChatReports {
- public static final String MODID = "nochatreports";
public static final Logger LOGGER = LogManager.getLogger();
- private static final String PTC_VERSION = "1";
- private static final Predicate<String> ANY = obj -> true;
- private static SimpleChannel channel;
- private static boolean detectedOnClient = false, detectedOnServer = false;
public NoChatReports() {
LOGGER.info("KONNICHIWA ZA WARUDO!");
LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName());
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC);
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC);
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff);
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onLoadComplete);
-
- MinecraftForge.EVENT_BUS.register(this);
NCRConfig.load();
}
- private void onLoadComplete(FMLLoadCompleteEvent event) {
- // NO-OP
- }
-
- private void setup(FMLCommonSetupEvent event) {
- channel = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(MODID, "main"))
- .networkProtocolVersion(() -> PTC_VERSION)
- .clientAcceptedVersions(version -> {
- if (!NCRConfig.getClient().enableMod())
- return true;
-
- detectedOnServer = !isAbsentOrVanilla(version);
- return NCRConfig.getClient().demandOnServer() ? PTC_VERSION.equals(version) : true;
- })
- .serverAcceptedVersions(version -> {
- if (ServerLifecycleHooks.getCurrentServer().isSingleplayer())
- return true;
-
- detectedOnClient = !isAbsentOrVanilla(version);
- return NCRConfig.getCommon().demandOnClient() ? PTC_VERSION.equals(version) : true;
- })
- .simpleChannel();
- }
-
- private void doClientStuff(FMLClientSetupEvent event) {
- // NO-OP
- }
-
- private void enqueueIMC(InterModEnqueueEvent event) {
- // NO-OP
- }
-
- private void processIMC(InterModProcessEvent event) {
- // NO-OP
- }
-
- private static boolean isAbsentOrVanilla(String protocol) {
- return NetworkRegistry.ABSENT.equals(protocol) || NetworkRegistry.ACCEPTVANILLA.equals(protocol);
- }
-
- public static boolean isDetectedOnClient() {
- return detectedOnClient;
- }
-
- public static boolean isDetectedOnServer() {
- return detectedOnServer;
- }
-
}
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 27cdb64..40da754 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -6,18 +6,19 @@ 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.gui.AwaitConnectionScreen;
+import com.aizistral.nochatreports.core.SigningMode;
import com.aizistral.nochatreports.gui.UnsafeServerScreen;
-import com.aizistral.nochatreports.mixins.client.AccessorDisconnectedScreen;
import com.google.common.collect.ImmutableList;
import net.minecraft.Util;
import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.ChatScreen;
import net.minecraft.client.gui.screens.ConnectScreen;
import net.minecraft.client.gui.screens.DisconnectedScreen;
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.multiplayer.ClientPacketListener;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.contents.TranslatableContents;
@@ -30,91 +31,14 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
-@EventBusSubscriber(modid = NoChatReports.MODID, bus = Bus.FORGE)
+@EventBusSubscriber(modid = "nochatreports", bus = Bus.FORGE)
public class NoChatReportsClient {
- private static final List<String> KEY_DISCONNECT_REASONS = ImmutableList.of(
- "multiplayer.disconnect.missing_public_key",
- "multiplayer.disconnect.invalid_public_key_signature",
- "multiplayer.disconnect.invalid_public_key"
- );
- private static final List<String> STRING_DISCONNECT_REASONS = ImmutableList.of(
- "A secure profile is required to join this server.",
- "Secure profile expired.",
- "Secure profile invalid."
- );
- private static final Component CONNECT_FAILED_NCR = Component.translatable("connect.failed");
- private static boolean screenOverride = false;
+ private static boolean signingKeysPresent = false;
private NoChatReportsClient() {
throw new IllegalStateException("Can't touch this");
}
- @SubscribeEvent
- @OnlyIn(Dist.CLIENT)
- public static void onScreenInit(ScreenEvent.Init.Post event) {
- Minecraft client = Minecraft.getInstance();
- Screen screen = event.getScreen();
-
- if (!NCRConfig.getClient().enableMod())
- return;
-
- if (screen instanceof AccessorDisconnectedScreen dsc) {
- if (screenOverride || ServerSafetyState.isOnServer() || screen.getTitle() == CONNECT_FAILED_NCR)
- return;
-
- screenOverride = true;
- var disconnectReason = dsc.getReason();
-
- if (disconnectReason != null) {
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Disconnected with reason {}, reconnect count: {}",
- Component.Serializer.toStableJson(disconnectReason), ServerSafetyState.getReconnectCount());
- }
-
- if (ServerSafetyState.allowsUnsafeServer()) {
- screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()),
- CONNECT_FAILED_NCR, dsc.getReason());
- client.setScreen(screen);
- screenOverride = false;
- return;
- } 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())) {
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Server {} evaluated as unsafe and is not whitelisted, displaying warning screen.",
- ServerSafetyState.getLastServerAddress().getHost() + ":" + ServerSafetyState.getLastServerAddress().getPort());
- }
-
- client.setScreen(new UnsafeServerScreen());
- } else {
- NCRConfig.getClient().updateSigningCheck(ServerSafetyState.getLastServerAddress());
-
- if (ServerSafetyState.getReconnectCount() <= 0) {
- ServerSafetyState.setAllowsUnsafeServer(true);
- client.setScreen(new AwaitConnectionScreen(new JoinMultiplayerScreen(new TitleScreen())));
- screenOverride = false;
- return;
- } else {
- ServerSafetyState.setReconnectCount(0);
- screenOverride = false;
- return;
- }
- }
- }
- }
- }
- screenOverride = false;
- } else if (screen instanceof JoinMultiplayerScreen) {
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Initialized JoinMultiplayerScreen screen, resetting safety state!");
- }
-
- ServerSafetyState.reset();
- }
- }
-
@OnlyIn(Dist.CLIENT)
public static void onDisconnect(Minecraft client) {
if (!NCRConfig.getClient().enableMod())
@@ -125,51 +49,65 @@ public class NoChatReportsClient {
}
ServerSafetyState.reset();
- ServerSafetyState.setDisconnectMillis(Util.getMillis());
}
@SubscribeEvent
@OnlyIn(Dist.CLIENT)
public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) {
Minecraft client = Minecraft.getInstance();
+ ClientPacketListener handler = client.getConnection();
if (!NCRConfig.getClient().enableMod())
return;
client.execute(() -> {
- ServerSafetyState.setReconnectCount(0);
- ServerSafetyState.setOnServer(true);
-
if (!client.isLocalServer()) {
- boolean canSend = NoChatReports.isDetectedOnServer();
-
- if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) {
+ if (ServerSafetyState.isOnRealms()) {
// NO-OP
- } else if (canSend) {
+ } 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.forceSignedMessages()) {
+ } else if (NCRConfig.getServerPreferences().hasMode(ServerSafetyState.getLastServer(),
+ SigningMode.ALWAYS)) {
ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
+ ServerSafetyState.setAllowChatSigning(true);
} else {
- if (ServerSafetyState.getLastServerData() instanceof ServerDataExtension ext
- && ext.preventsChatReports()) {
- ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE);
- } else {
- ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE);
- }
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN);
}
+ } else {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.SINGLEPLAYER);
}
if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}, reconnect count reset.", ServerSafetyState.getCurrent());
+ NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent());
+ }
+
+ if (NCRConfig.getClient().demandOnServer() && !ServerSafetyState.getCurrent().isSecure()) {
+ handler.getConnection().disconnect(Component.translatable("disconnect.nochatreports.client"));
}
});
}
- @OnlyIn(Dist.CLIENT)
- public static void reconnectLastServer() {
- ServerSafetyState.setReconnectCount(ServerSafetyState.getReconnectCount() + 1);
- ConnectScreen.startConnecting(new JoinMultiplayerScreen(new TitleScreen()), Minecraft.getInstance(),
- ServerSafetyState.getLastServerAddress(), ServerSafetyState.getLastServerData());
+ 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 e92a067..2556966 100644
--- a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
@@ -13,23 +13,16 @@ import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.loading.FMLEnvironment;
import net.minecraftforge.fml.loading.FMLPaths;
public abstract class JSONConfig {
protected static final Path CONFIG_DIR = FMLPaths.CONFIGDIR.get();
- 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;
@@ -69,8 +62,10 @@ public abstract class JSONConfig {
try (BufferedReader reader = Files.newBufferedReader(file)) {
return Optional.of(GSON.fromJson(reader, configClass));
- } catch (IOException ex) {
+ } catch (Exception ex) {
NoChatReports.LOGGER.fatal("Could not read config file: {}", file);
+ NoChatReports.LOGGER.fatal("This likely indicates the file is corrupted. "
+ + "You can try deleting it to fix this problem. Full stacktrace below:");
ex.printStackTrace();
return null;
}
@@ -90,4 +85,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 (FMLEnvironment.dist == Dist.CLIENT) {
+ builder.registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE);
+ }
+
+ return builder.create();
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
index e87421d..f9df833 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
@@ -1,24 +1,20 @@
package com.aizistral.nochatreports.config;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Objects;
-import java.util.function.Supplier;
-
-import javax.annotation.Nullable;
-
import com.aizistral.nochatreports.NoChatReports;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.loading.FMLEnvironment;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+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() {
@@ -35,8 +31,8 @@ public final class NCRConfig {
}
@OnlyIn(Dist.CLIENT)
- public static NCRServerWhitelist getServerWhitelist() {
- return checkLoaded(() -> whitelist);
+ public static NCRServerPreferences getServerPreferences() {
+ return checkLoaded(() -> serverPreferences);
}
@OnlyIn(Dist.CLIENT)
@@ -57,7 +53,7 @@ public final class NCRConfig {
if (FMLEnvironment.dist == Dist.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);
}
@@ -69,7 +65,7 @@ public final class NCRConfig {
if (FMLEnvironment.dist == Dist.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 9c4414c..6054f7e 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
@@ -1,34 +1,21 @@
package com.aizistral.nochatreports.config;
-import java.security.InvalidKeyException;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
import com.aizistral.nochatreports.core.ServerSafetyLevel;
-import com.aizistral.nochatreports.encryption.AESCFB8Encryptor;
-import com.aizistral.nochatreports.encryption.Encryptor;
-import com.aizistral.nochatreports.gui.UnsafeServerScreen;
-
-import net.minecraft.Util;
-import net.minecraft.client.multiplayer.resolver.ServerAddress;
-import net.minecraft.util.StringUtil;
+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 demandOnServer = false, showServerSafety = true, hideRedChatIndicators = true,
- hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true,
- alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true,
- whitelistAllServers = false, verifiedIconEnabled = true, showNCRButton = true,
- enableMod = true, skipRealmsWarning = false;
- protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0, reconnectAwaitSeconds = 4,
- postDisconnectAwaitSeconds = 10, signingCheckDelaySeconds = 43200;
-
- protected Map<String, Long> serverSigningChecks = new HashMap<>();
+ 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, removeTelemetryButton = true,
+ demandOnServer = false;
+ protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0;
protected NCRConfigClient() {
super(FILE_NAME);
@@ -76,8 +63,8 @@ public final class NCRConfigClient extends JSONConfig {
* @see MixinChatListener#onEvaluateTrustLevel
*/
- public boolean hideRedChatIndicators() {
- return this.hideRedChatIndicators;
+ public boolean hideInsecureMessageIndicators() {
+ return this.hideInsecureMessageIndicators;
}
/**
@@ -88,8 +75,8 @@ public final class NCRConfigClient extends JSONConfig {
* @see MixinChatListener#onEvaluateTrustLevel
*/
- public boolean hideYellowChatIndicators() {
- return this.hideYellowChatIndicators;
+ public boolean hideModifiedMessageIndicators() {
+ return this.hideModifiedMessageIndicators;
}
/**
@@ -100,8 +87,8 @@ public final class NCRConfigClient extends JSONConfig {
* @see com.aizistral.nochatreports.mixins.client.MixinGuiMessageTag#onSystem
*/
- public boolean hideGrayChatIndicators() {
- return this.hideGrayChatIndicators;
+ public boolean hideSystemMessageIndicators() {
+ return this.hideSystemMessageIndicators;
}
/**
@@ -149,18 +136,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,24 +181,6 @@ public final class NCRConfigClient extends JSONConfig {
}
/**
- * @return How many seconds No Chat Reports should wait before attemting automatic reconnects.
- * @see <a href="https://github.com/Aizistral-Studios/No-Chat-Reports/issues/190">Issue #190</a>
- */
-
- public int getReconnectAwaitSeconds() {
- return this.reconnectAwaitSeconds;
- }
-
- /**
- * @return Same as <code>reconnectAwaitSeconds</code>, but countdown starts when user disconnects
- * from server. If this delay is greater than <code>reconnectAwaitSeconds</code> then it will apply.
- */
-
- public int getPostDisconnectAwaitSeconds() {
- return this.postDisconnectAwaitSeconds;
- }
-
- /**
* @return Whether warning on entering Realms screen should not be displayed.
*/
@@ -235,19 +192,16 @@ public final class NCRConfigClient extends JSONConfig {
this.skipRealmsWarning = skipRealmsWarning;
}
- public boolean doSigningCheck(ServerAddress serverAddress) {
- String server = serverAddress.getHost() + ":" + serverAddress.getPort();
+ public boolean hideSigningRequestMessage() {
+ return this.hideSigningRequestMessage;
+ }
- if (!this.serverSigningChecks.containsKey(server))
- return true;
- else
- return Instant.now().getEpochSecond() - this.serverSigningChecks.get(server) >= this.signingCheckDelaySeconds;
+ public SigningMode defaultSigningMode() {
+ return this.defaultSigningMode;
}
- public void updateSigningCheck(ServerAddress serverAddress) {
- String server = serverAddress.getHost() + ":" + serverAddress.getPort();
- this.serverSigningChecks.put(server, Instant.now().getEpochSecond());
- this.saveFile();
+ public boolean removeTelemetryButton() {
+ return this.removeTelemetryButton;
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
index 7aa0322..38df30e 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
@@ -1,17 +1,12 @@
package com.aizistral.nochatreports.config;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.common.base.Preconditions;
-
public final class NCRConfigCommon extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Common.json";
protected String demandOnClientMessage = "You do not have No Chat Reports, and this server is"
+ " configured to require it on client!";
- protected boolean demandOnClient = true, enableDebugLog = false, convertToGameMessage = false,
- addQueryData = true;
+ protected boolean demandOnClient = false, convertToGameMessage = true,
+ addQueryData = true, enableDebugLog = false;
protected NCRConfigCommon() {
super(FILE_NAME);
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java
index 9cf7671..525abff 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java
@@ -1,19 +1,11 @@
package com.aizistral.nochatreports.config;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import com.aizistral.nochatreports.encryption.AESCFB8Encryptor;
import com.aizistral.nochatreports.encryption.Encryption;
import com.aizistral.nochatreports.encryption.Encryptor;
-import com.aizistral.nochatreports.gui.UnsafeServerScreen;
-import net.minecraft.client.multiplayer.resolver.ServerAddress;
-import net.minecraft.network.chat.Component;
-import net.minecraft.util.StringUtil;
+import java.security.InvalidKeyException;
+import java.util.List;
+import java.util.Optional;
public class NCRConfigEncryption extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Encryption.json";
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..d94be20
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java
@@ -0,0 +1,72 @@
+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.ServerSafetyLevel;
+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 (ServerSafetyState.isInSingleplayer())
+ return SigningMode.NEVER;
+ else if (ServerSafetyState.isOnRealms())
+ return SigningMode.ALWAYS;
+ 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 5d36cf5..0000000
--- a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java
+++ /dev/null
@@ -1,49 +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() ||
- this.getList().contains(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..0815135
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java
@@ -0,0 +1,35 @@
+package com.aizistral.nochatreports.config;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.api.distmarker.Dist;
+
+import java.io.IOException;
+
+@OnlyIn(Dist.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();
+
+ if (!ServerAddress.isValidAddress(string))
+ throw new IOException("Incorrect server address format: " + string);
+
+ return ServerAddress.parseString(string);
+ }
+
+ @Override
+ public void write(JsonWriter writer, ServerAddress address) throws IOException {
+ writer.value(address.toString());
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java
index f0bcf4d..39e9a11 100644
--- a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java
+++ b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java
@@ -1,18 +1,15 @@
package com.aizistral.nochatreports.core;
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.encryption.Encryptor;
-
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.ComponentContents;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.contents.LiteralContents;
import net.minecraft.network.chat.contents.TranslatableContents;
+import java.util.Optional;
+
public class EncryptionUtil {
public static Optional<Component> tryDecrypt(Component component) {
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java b/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java
index 4841830..a92ea52 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java
@@ -1,5 +1,8 @@
package com.aizistral.nochatreports.core;
+import com.aizistral.nochatreports.mixins.client.MixinServerData;
+import com.aizistral.nochatreports.mixins.common.MixinServerStatus;
+
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.network.protocol.status.ServerStatus;
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
index 9af7e04..26a2802 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
@@ -1,10 +1,7 @@
package com.aizistral.nochatreports.core;
-import com.aizistral.nochatreports.config.NCRConfig;
-
import net.minecraft.network.chat.Component;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraft.network.chat.MutableComponent;
/**
* Represents the level of "safety" of the given server, in the eyes of the client.
@@ -20,6 +17,12 @@ public enum ServerSafetyLevel {
*/
SECURE,
+ /**
+ * For singleplayer specifically. Pretty much identical to {@link #SECURE} since client needs
+ * NCR installed on it to display any safety level to begin with.
+ */
+ SINGLEPLAYER,
+
/**
* For servers that do not make any effort to remove signatures from chat messages themselves,
@@ -55,12 +58,12 @@ public enum ServerSafetyLevel {
UNDEFINED;
- @OnlyIn(Dist.CLIENT)
- public Component getTooltip() {
- if (NCRConfig.getClient().whitelistAllServers() && this.equals(ServerSafetyLevel.INSECURE))
- return Component.translatable("gui.nochatreports.status_insecure_whitelist_all_servers");
- else
- return Component.translatable("gui.nochatreports.status_" + this.name().toLowerCase());
+ public MutableComponent getTooltip() {
+ return Component.translatable("gui.nochatreports.safety_status." + this.name().toLowerCase());
+ }
+
+ public boolean isSecure() {
+ return this == SECURE || this == SINGLEPLAYER;
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index 99e5f4a..1237cd0 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -1,19 +1,19 @@
package com.aizistral.nochatreports.core;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.annotation.Nullable;
-
-import com.aizistral.nochatreports.NoChatReports;
-import com.aizistral.nochatreports.config.NCRConfig;
-
-import net.minecraft.client.multiplayer.ServerData;
+import com.aizistral.nochatreports.gui.UnsafeServerScreen;
+import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
+import net.minecraft.network.chat.LocalChatSession;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.jetbrains.annotations.Nullable;
+
/**
* All this global state is questionable, but we have to...
* @author Aizistral
@@ -21,13 +21,11 @@ import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public final class ServerSafetyState {
- private static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED;
- private static ServerAddress lastServerAddress = null;
- private static ServerData lastServerData = null;
- private static AtomicBoolean allowUnsafeServer = new AtomicBoolean(false),
- sessionRequestedKey = new AtomicBoolean(false), isOnServer = new AtomicBoolean(false);
- private static AtomicInteger reconnectCount = new AtomicInteger(0);
- private static AtomicLong disconnectMillis = new AtomicLong(0);
+ private static final List<Runnable> RESET_ACTIONS = new ArrayList<>();
+ private static final List<Runnable> SIGNING_ACTIONS = new ArrayList<>();
+ private static final AtomicBoolean ALLOW_CHAT_SIGNING = new AtomicBoolean(false);
+ private volatile static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED;
+ private volatile static ServerAddress lastServer = null;
public static void updateCurrent(ServerSafetyLevel level) {
current = level;
@@ -37,79 +35,71 @@ public final class ServerSafetyState {
return current;
}
- public static boolean allowsUnsafeServer() {
- return current != ServerSafetyLevel.SECURE ? allowUnsafeServer.get() : false;
+ public static boolean allowChatSigning() {
+ return ALLOW_CHAT_SIGNING.get();
}
- public static void setAllowsUnsafeServer(boolean allows) {
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Set allowUnsafeServer to: " + allows + ", value set in stacktrace:");
- NoChatReports.LOGGER.catching(new RuntimeException().fillInStackTrace());
+ 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)
+ return Minecraft.getInstance().getProfileKeyPairManager().prepareKeyPair()
+ .thenAcceptAsync(optional -> optional.ifPresent(profileKeyPair -> {
+ connection.setKeyPair(profileKeyPair);
+ SIGNING_ACTIONS.forEach(Runnable::run);
+ SIGNING_ACTIONS.clear();
+ }), Minecraft.getInstance());
+ }
}
- allowUnsafeServer.set(allows);
+ return CompletableFuture.completedFuture(null);
}
- public static void setSessionRequestedKey(boolean requested) {
- sessionRequestedKey.set(requested);
+ public static void toggleChatSigning() {
+ setAllowChatSigning(!ALLOW_CHAT_SIGNING.get());
}
- public static boolean sessionRequestedKey() {
- return current != ServerSafetyLevel.SECURE ? sessionRequestedKey.get() : false;
+ public static boolean isOnRealms() {
+ return current == ServerSafetyLevel.REALMS;
}
- public static boolean forceSignedMessages() {
- return allowsUnsafeServer() && sessionRequestedKey();
+ public static boolean isInSingleplayer() {
+ return current == ServerSafetyLevel.SINGLEPLAYER;
}
- @Nullable
- public static ServerAddress getLastServerAddress() {
- return lastServerAddress;
+ public static boolean isDetermined() {
+ return current != ServerSafetyLevel.UNINTRUSIVE && current != ServerSafetyLevel.UNDEFINED
+ && current != ServerSafetyLevel.UNKNOWN;
}
@Nullable
- public static ServerData getLastServerData() {
- return lastServerData;
+ public static ServerAddress getLastServer() {
+ return lastServer;
}
- public static void setLastConnectedServer(@Nullable ServerAddress address, @Nullable ServerData data) {
- lastServerAddress = address;
- lastServerData = data;
+ public static void setLastServer(@Nullable ServerAddress address) {
+ lastServer = address;
}
- public static int getReconnectCount() {
- return reconnectCount.get();
+ public static void scheduleResetAction(Runnable action) {
+ RESET_ACTIONS.add(action);
}
- public static void setReconnectCount(int count) {
- reconnectCount.set(count);
- }
-
- public static long getDisconnectMillis() {
- return disconnectMillis.get();
- }
-
- public static void setDisconnectMillis(long millis) {
- disconnectMillis.set(millis);
- }
-
- public static boolean isOnServer() {
- return isOnServer.get();
- }
-
- public static void setOnServer(boolean on) {
- isOnServer.set(on);
+ public static void scheduleSigningAction(Runnable action) {
+ SIGNING_ACTIONS.add(action);
}
public static void reset() {
+ lastServer = null;
current = ServerSafetyLevel.UNDEFINED;
- allowUnsafeServer.set(false);
- sessionRequestedKey.set(false);
- isOnServer.set(false);
+ ALLOW_CHAT_SIGNING.set(false);
+ UnsafeServerScreen.setHideThisSession(false);
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("allowUnsafeServer: {}", allowUnsafeServer.get());
- }
+ RESET_ACTIONS.forEach(Runnable::run);
+ RESET_ACTIONS.clear();
+ SIGNING_ACTIONS.clear();
}
}
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..b2ccdbb
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java
@@ -0,0 +1,105 @@
+package com.aizistral.nochatreports.core;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.aizistral.nochatreports.config.NCRConfig;
+
+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 String getNameKey() {
+ return "gui.nochatreports.signing_mode." + this.name().toLowerCase();
+ }
+
+ public MutableComponent getName() {
+ if (this != DEFAULT)
+ return Component.translatable(this.getNameKey());
+ else
+ return Component.translatable(this.getNameKey(), NCRConfig.getClient().defaultSigningMode().getName());
+ }
+
+ public String getTooltipKey() {
+ return "gui.nochatreports.signing_mode." + this.name().toLowerCase() + ".tooltip";
+ }
+
+ public MutableComponent getTooltip() {
+ return Component.translatable(this.getTooltipKey());
+ }
+
+ public SigningMode next() {
+ SigningMode result = null;
+
+ if (this.ordinal() == values().length - 1) {
+ result = values()[0];
+ } else {
+ result = values()[this.ordinal() + 1];
+ }
+
+ return result.isSelectable() ? result : result.next();
+ }
+
+ public SigningMode resolve() {
+ return switch(this) {
+ case DEFAULT -> NCRConfig.getClient().defaultSigningMode();
+ case NEVER_FORCED -> NEVER;
+ default -> this;
+ };
+ }
+
+ public boolean isSelectable() {
+ return this != NEVER_FORCED;
+ }
+
+ public boolean isSelectableGlobally() {
+ return this.isSelectable() && this != DEFAULT;
+ }
+
+ public static SigningMode nullable(@Nullable SigningMode mode) {
+ return mode == null ? DEFAULT : mode;
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java
index 77adf4c..09b075c 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java
@@ -1,21 +1,6 @@
package com.aizistral.nochatreports.encryption;
import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-import java.util.Random;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import net.minecraft.util.StringUtil;
public class AESCFB8Encryption extends AESEncryption {
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java
index 5b32891..63476f3 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java
@@ -1,30 +1,14 @@
package com.aizistral.nochatreports.encryption;
+import net.minecraft.util.Tuple;
+
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
import java.security.spec.AlgorithmParameterSpec;
-import java.util.Base64;
import java.util.Random;
-import javax.crypto.AEADBadTagException;
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.KeyGenerator;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import net.minecraft.server.network.ServerLoginPacketListenerImpl;
-import net.minecraft.util.Tuple;
-
-import static com.aizistral.nochatreports.encryption.Encryption.*;
-import static javax.crypto.Cipher.*;
-
public class AESCFB8Encryptor extends AESEncryptor<AESCFB8Encryption> {
protected AESCFB8Encryptor(String key) throws InvalidKeyException {
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java
index bffc960..a853f0c 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java
@@ -1,14 +1,10 @@
package com.aizistral.nochatreports.encryption;
-import java.nio.ByteBuffer;
-import java.security.InvalidKeyException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.util.Random;
+import net.minecraft.util.Tuple;
import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-
-import net.minecraft.util.Tuple;
+import java.security.InvalidKeyException;
+import java.security.spec.AlgorithmParameterSpec;
public class AESECBEncryptor extends AESEncryptor<AESECBEncryption> {
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java
index f7c53cd..f2c4922 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java
@@ -1,21 +1,17 @@
package com.aizistral.nochatreports.encryption;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-import java.util.Optional;
-import java.util.Random;
+import net.minecraft.util.StringUtil;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;
-
-import net.minecraft.util.StringUtil;
-import net.minecraft.util.Tuple;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.util.Random;
public abstract class AESEncryption extends Encryption {
private final String mode, padding;
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java
index d7ec841..2094c5a8 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java
@@ -1,31 +1,17 @@
package com.aizistral.nochatreports.encryption;
-import static com.aizistral.nochatreports.encryption.Encryption.AES_CFB8;
-import static com.aizistral.nochatreports.encryption.Encryption.BASE64_DECODER;
-import static com.aizistral.nochatreports.encryption.Encryption.BASE64_ENCODER;
-import static javax.crypto.Cipher.DECRYPT_MODE;
-import static javax.crypto.Cipher.ENCRYPT_MODE;
+import net.minecraft.util.Tuple;
+import javax.crypto.*;
+import javax.crypto.spec.SecretKeySpec;
import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.spec.AlgorithmParameterSpec;
-import java.util.Random;
-
-import javax.annotation.Nullable;
-import javax.crypto.AEADBadTagException;
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import net.minecraft.SharedConstants;
-import net.minecraft.util.Tuple;
+import static javax.crypto.Cipher.DECRYPT_MODE;
+import static javax.crypto.Cipher.ENCRYPT_MODE;
public abstract class AESEncryptor<T extends AESEncryption> extends Encryptor<T> {
private final T encryption;
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java
index 3d11a36..9ef7ed7 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java
@@ -1,14 +1,12 @@
package com.aizistral.nochatreports.encryption;
-import java.nio.ByteBuffer;
-import java.security.InvalidKeyException;
-import java.security.spec.AlgorithmParameterSpec;
+import net.minecraft.util.Tuple;
import javax.crypto.SecretKey;
import javax.crypto.spec.GCMParameterSpec;
-import javax.crypto.spec.IvParameterSpec;
-
-import net.minecraft.util.Tuple;
+import java.nio.ByteBuffer;
+import java.security.InvalidKeyException;
+import java.security.spec.AlgorithmParameterSpec;
public class AESGCMEncryptor extends AESEncryptor<AESGCMEncryption> {
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java
index 8ed8cfe..926c657 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java
@@ -2,10 +2,6 @@ package com.aizistral.nochatreports.encryption;
import java.security.InvalidKeyException;
-import com.aizistral.nochatreports.NoChatReports;
-
-import net.minecraft.SharedConstants;
-
public class CaesarEncryptor extends Encryptor<CaesarEncryption> {
private static final char PARAGRAPH = '\u00a7', PARAGRAPH_PLACEHOLDER = '\uffef',
DELETE = '\u007f', DELETE_PLACEHOLDER = '\ufff0';
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java b/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java
index 826f521..0e32da8 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java
@@ -1,6 +1,5 @@
package com.aizistral.nochatreports.encryption;
-import java.nio.ByteBuffer;
import java.security.InvalidKeyException;
import java.util.ArrayList;
import java.util.Base64;
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java
index 220874d..0ccd39c 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java
@@ -1,17 +1,13 @@
package com.aizistral.nochatreports.encryption;
-import java.nio.ByteBuffer;
+import it.unimi.dsi.fastutil.chars.Char2CharArrayMap;
+import it.unimi.dsi.fastutil.chars.Char2CharMap;
+import it.unimi.dsi.fastutil.chars.Char2CharMaps;
+
import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException;
import java.security.SecureRandom;
import java.util.Arrays;
-import java.util.Base64;
-import java.util.List;
-import java.util.Map;
-
-import it.unimi.dsi.fastutil.chars.Char2CharArrayMap;
-import it.unimi.dsi.fastutil.chars.Char2CharMap;
-import it.unimi.dsi.fastutil.chars.Char2CharMaps;
public abstract class Encryptor<T extends Encryption> {
protected static final SecureRandom RANDOM = new SecureRandom();
@@ -163,7 +159,7 @@ public abstract class Encryptor<T extends Encryption> {
map.put('u', 'µ');
map.put('v', '¶');
map.put('w', '·');
- map.put('x', '¸');
+ map.put('x', '×');
map.put('y', '¹');
map.put('z', 'º');
map.put('0', '0');
diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java
new file mode 100644
index 0000000..898b1f5
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java
@@ -0,0 +1,83 @@
+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;
+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 AdaptiveWarningScreen extends Screen {
+ private final Component title;
+ private final Component content;
+ private final Component narration;
+ @Nullable
+ protected final Screen previous;
+ @Nullable
+ private final Component check;
+ @Nullable
+ protected Checkbox stopShowing = null;
+ protected MultiLineLabel message = MultiLineLabel.EMPTY;
+
+ public AdaptiveWarningScreen(Component title, Component content, @Nullable Component check,
+ @Nullable Screen previous) {
+ super(title);
+ this.title = title;
+ this.content = content;
+ this.check = check;
+ this.narration = this.title.copy().append("\n").append(this.content);
+ this.previous = previous;
+ }
+
+ @Override
+ protected void init() {
+ this.clearWidgets();
+ super.init();
+ this.message = MultiLineLabel.create(this.font, this.content, this.width - (this.hugeGUI() ? 65 : 100));
+ int i = (this.message.getLineCount() + 1) * this.getLineHeight();
+ if (this.check != null) {
+ int checkY = this.hugeGUI() ? 27 : 76;
+ int j = this.font.width(this.check);
+
+ 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 initButtons(int y);
+
+ @Override
+ public void render(PoseStack poseStack, int i, int j, float f) {
+ this.renderBackground(poseStack);
+ this.renderTitle(poseStack);
+ int k = this.width / 2 - this.message.getWidth() / 2;
+ this.message.renderLeftAligned(poseStack, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFF);
+ super.render(poseStack, i, j, f);
+ }
+
+ private void renderTitle(PoseStack poseStack) {
+ drawString(poseStack, this.font, this.title, 25, this.hugeGUI() ? 15 : 30, 0xFFFFFF);
+ }
+
+ private boolean hugeGUI() {
+ return this.height <= 1080 / 4;
+ }
+
+ protected int getLineHeight() {
+ if (this.hugeGUI())
+ return (int) (this.minecraft.font.lineHeight * 1.5) + 1;
+ else
+ return this.minecraft.font.lineHeight * 2;
+ }
+
+} \ No newline at end of file
diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java
new file mode 100644
index 0000000..bf394ec
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java
@@ -0,0 +1,40 @@
+package com.aizistral.nochatreports.gui;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+@OnlyIn(Dist.CLIENT)
+public class AdvancedImageButton extends ImageButton {
+ protected final Screen parent;
+
+ public AdvancedImageButton(int x, int y, int xSize, int ySize, int xTexStart, int yTexStart, int yStateDiff,
+ ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress, Component name,
+ Screen parent) {
+ super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress, name);
+ this.parent = parent;
+ }
+
+ @Override
+ public void updateTooltip() {
+ if (this.tooltip instanceof AdvancedTooltip tooltip && tooltip.hasCustomRender())
+ return;
+
+ super.updateTooltip();
+ }
+
+ @Override
+ public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float delta) {
+ super.renderButton(poseStack, mouseX, mouseY, delta);
+
+ if (this.isHovered)
+ if (this.tooltip instanceof AdvancedTooltip tooltip && tooltip.hasCustomRender()) {
+ tooltip.doCustomRender(this.parent, poseStack, mouseX, mouseY);
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java
new file mode 100644
index 0000000..ee963bc
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java
@@ -0,0 +1,177 @@
+package com.aizistral.nochatreports.gui;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.*;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.network.chat.Component;
+import net.minecraft.util.FormattedCharSequence;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+import org.jetbrains.annotations.Nullable;
+import org.joml.Matrix4f;
+
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+@OnlyIn(Dist.CLIENT)
+public class AdvancedTooltip extends Tooltip {
+ @Nullable
+ protected Supplier<Component> supplier;
+ protected int maxWidth = MAX_WIDTH;
+ protected boolean renderWithoutGap = false;
+
+ public AdvancedTooltip(Component message, @Nullable Component narration) {
+ super(message, narration);
+ }
+
+ public AdvancedTooltip(Component message) {
+ this(message, message);
+ }
+
+ public AdvancedTooltip(Supplier<Component> message) {
+ this(message.get());
+ this.supplier = message;
+ }
+
+ public AdvancedTooltip setMaxWidth(int maxWidth) {
+ this.maxWidth = maxWidth;
+ return this;
+ }
+
+ public AdvancedTooltip setRenderWithoutGap(boolean render) {
+ this.renderWithoutGap = render;
+ return this;
+ }
+
+ public Component getMessage() {
+ return this.supplier != null ? this.supplier.get() : this.message;
+ }
+
+ @Override
+ public List<FormattedCharSequence> toCharSequence(Minecraft minecraft) {
+ if (this.supplier == null) {
+ if (this.cachedTooltip == null) {
+ this.cachedTooltip = splitTooltip(minecraft, this.getMessage(), this.maxWidth);
+ }
+ return this.cachedTooltip;
+ } else
+ return splitTooltip(minecraft, this.getMessage(), this.maxWidth);
+ }
+
+ public boolean hasCustomRender() {
+ return this.renderWithoutGap;
+ }
+
+ public void doCustomRender(Screen screen, PoseStack poseStack, int x, int y) {
+ if (this.renderWithoutGap) {
+ this.renderTooltipNoGap(screen, poseStack, splitTooltip(screen.minecraft, this.getMessage(), this.maxWidth), x, y);
+ } else
+ throw new UnsupportedOperationException("This tooltip doesn't support custom render!");
+ }
+
+ public static List<FormattedCharSequence> splitTooltip(Minecraft minecraft, Component component, int maxWidth) {
+ return minecraft.font.split(component, maxWidth);
+ }
+
+ protected void renderTooltipNoGap(Screen screen, PoseStack poseStack, List<? extends FormattedCharSequence> list, int x, int y) {
+ this.renderTooltipInternalNoGap(screen, poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), x, y);
+ }
+
+ protected void renderTooltipInternalNoGap(Screen screen, PoseStack poseStack, List<ClientTooltipComponent> list, int x, int y) {
+ ClientTooltipComponent clientTooltipComponent2;
+ int v;
+ int m;
+ if (list.isEmpty())
+ return;
+ int k = 0;
+ int l = list.size() == 1 ? -2 : -2;
+ for (ClientTooltipComponent clientTooltipComponent : list) {
+ m = clientTooltipComponent.getWidth(screen.font);
+ if (m > k) {
+ k = m;
+ }
+ l += clientTooltipComponent.getHeight();
+ }
+ int n = x + 12;
+ int o = y - 12;
+ m = k;
+ int p = l;
+ if (n + k > screen.width) {
+ n -= 28 + k;
+ }
+ if (o + p + 6 > screen.height) {
+ o = screen.height - p - 6;
+ }
+ if (y - p - 8 < 0) {
+ o = y + 8;
+ }
+ poseStack.pushPose();
+ int q = -267386864;
+ int r = 0x505000FF;
+ int s = 1344798847;
+ int t = 400;
+ float f = screen.itemRenderer.blitOffset;
+ screen.itemRenderer.blitOffset = 400.0f;
+ Tesselator tesselator = Tesselator.getInstance();
+ BufferBuilder bufferBuilder = tesselator.getBuilder();
+ RenderSystem.setShader(GameRenderer::getPositionColorShader);
+ bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+ Matrix4f matrix4f = poseStack.last().pose();
+ fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
+ fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847);
+ RenderSystem.enableDepthTest();
+ RenderSystem.disableTexture();
+ RenderSystem.enableBlend();
+ RenderSystem.defaultBlendFunc();
+ BufferUploader.drawWithShader(bufferBuilder.end());
+ RenderSystem.disableBlend();
+ RenderSystem.enableTexture();
+ MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
+ poseStack.translate(0.0, 0.0, 400.0);
+ int u = o;
+ for (v = 0; v < list.size(); ++v) {
+ clientTooltipComponent2 = list.get(v);
+ clientTooltipComponent2.renderText(screen.font, n, u, matrix4f, bufferSource);
+ u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/;
+ }
+ bufferSource.endBatch();
+ poseStack.popPose();
+ u = o;
+ for (v = 0; v < list.size(); ++v) {
+ clientTooltipComponent2 = list.get(v);
+ clientTooltipComponent2.renderImage(screen.font, n, u, poseStack, screen.itemRenderer, 400);
+ u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0);
+ }
+ screen.itemRenderer.blitOffset = f;
+ }
+
+ protected static void fillGradient(Matrix4f matrix4f, BufferBuilder bufferBuilder, int i, int j, int k, int l, int m, int n, int o) {
+ float f = (n >> 24 & 0xFF) / 255.0f;
+ float g = (n >> 16 & 0xFF) / 255.0f;
+ float h = (n >> 8 & 0xFF) / 255.0f;
+ float p = (n & 0xFF) / 255.0f;
+ float q = (o >> 24 & 0xFF) / 255.0f;
+ float r = (o >> 16 & 0xFF) / 255.0f;
+ float s = (o >> 8 & 0xFF) / 255.0f;
+ float t = (o & 0xFF) / 255.0f;
+ bufferBuilder.vertex(matrix4f, k, j, m).color(g, h, p, f).endVertex();
+ bufferBuilder.vertex(matrix4f, i, j, m).color(g, h, p, f).endVertex();
+ bufferBuilder.vertex(matrix4f, i, l, m).color(r, s, t, q).endVertex();
+ bufferBuilder.vertex(matrix4f, k, l, m).color(r, s, t, q).endVertex();
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java b/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java
deleted file mode 100644
index 0727c00..0000000
--- a/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.aizistral.nochatreports.gui;
-
-import com.aizistral.nochatreports.NoChatReports;
-import com.aizistral.nochatreports.NoChatReportsClient;
-import com.aizistral.nochatreports.config.NCRConfig;
-import com.aizistral.nochatreports.core.ServerSafetyState;
-import com.mojang.blaze3d.vertex.PoseStack;
-
-import net.minecraft.Util;
-import net.minecraft.client.GameNarrator;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.ConnectScreen;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
-public class AwaitConnectionScreen extends Screen {
- private final Screen parent;
- private boolean aborted = false;
- private long millisAwaiting = 0;
-
- public AwaitConnectionScreen(Screen parent) {
- super(GameNarrator.NO_TITLE);
- this.parent = parent;
- }
-
- @Override
- protected void init() {
- this.clearWidgets();
- this.millisAwaiting = Util.getMillis();
-
- this.addRenderableWidget(new Button(this.width / 2 - 100, this.height / 4 + 120 + 12, 200, 20, CommonComponents.GUI_CANCEL, button -> {
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Aborted reconnect await!");
- }
-
- this.aborted = true;
- this.minecraft.setScreen(this.parent);
- ServerSafetyState.reset();
- }));
- }
-
- @Override
- public void tick() {
- if (!this.aborted)
- if (this.getRemainingTime() <= 0) {
- this.aborted = true;
- NoChatReportsClient.reconnectLastServer();
- }
- }
-
- @Override
- public void render(PoseStack poseStack, int i, int j, float f) {
- this.renderBackground(poseStack);
- Component status = Component.translatable("nochatreports.connect.await", (this.getRemainingTime()) / 1000L);
- ConnectScreen.drawCenteredString(poseStack, this.font, Component.translatable("nochatreports.connect.nokey_rejected"), this.width / 2, this.height / 2 - 50, 0xFFFFFF);
- ConnectScreen.drawCenteredString(poseStack, this.font, status, this.width / 2, this.height / 2 - 36, 0xFFFFFF);
- super.render(poseStack, i, j, f);
- }
-
- private long getRemainingTime() {
- long current = Util.getMillis();
- long disconnect = ServerSafetyState.getDisconnectMillis();
-
- if (current - disconnect <= this.getDisconnectAwaitTime() + 100L)
- return this.getDisconnectAwaitTime() - (current - disconnect);
- else
- return this.getAwaitTime() - (current - this.millisAwaiting);
- }
-
- private long getDisconnectAwaitTime() {
- return NCRConfig.getClient().getPostDisconnectAwaitSeconds() * 1000L;
- }
-
- private long getAwaitTime() {
- return NCRConfig.getClient().getReconnectAwaitSeconds() * 1000L;
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java
index ad58e59..2b0d94a 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java
@@ -1,22 +1,17 @@
package com.aizistral.nochatreports.gui;
import com.aizistral.nochatreports.config.NCRConfig;
-
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.ImageButton;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
-public class EncryptionButton extends ImageButton {
- private final Screen parent;
+public class EncryptionButton extends AdvancedImageButton {
public EncryptionButton(int x, int y, int xSize, int ySize, int xTexStart, int yTexStart, int yStateDiff,
- ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress, OnTooltip onTooltip,
- Component name, Screen parent) {
- super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress,
- onTooltip, name);
- this.parent = parent;
+ ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress, Component name, Screen parent) {
+ super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress, name, parent);
}
@Override
diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java
index 9f63552..af7955c 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java
@@ -1,36 +1,21 @@
package com.aizistral.nochatreports.gui;
-import java.util.List;
import java.util.Objects;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.config.NCRConfigEncryption;
import com.aizistral.nochatreports.encryption.Encryption;
-import com.mojang.blaze3d.platform.InputConstants;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
-
-import net.minecraft.ChatFormatting;
import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.Checkbox;
-import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.components.ImageButton;
-import net.minecraft.client.gui.components.MultiLineLabel;
-import net.minecraft.client.gui.components.TooltipAccessor;
+import net.minecraft.client.gui.components.*;
import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen;
+import net.minecraft.client.gui.screens.inventory.AnvilScreen;
import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.FormattedText;
-import net.minecraft.network.chat.MutableComponent;
import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.FormattedCharSequence;
import net.minecraft.util.StringUtil;
-import net.minecraft.world.level.BaseCommandBlock;
-import net.minecraft.world.level.block.entity.CommandBlockEntity;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -66,7 +51,6 @@ public class EncryptionConfigScreen extends Screen {
@Override
protected void init() {
- this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
this.clearWidgets();
super.init();
@@ -86,31 +70,28 @@ public class EncryptionConfigScreen extends Screen {
this.keyField.setResponder(this::onKeyUpdate);
this.addWidget(this.keyField);
- var button = new ImageButton(this.keyField.x + this.keyField.getWidth() - 15, this.keyField.y + 3, 12,
- 12, 0, 0, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) ->
- this.renderTooltip(poseStack, this.minecraft.font.split(this.validationIcon.yTexStart == 0
- ? VALIDATION_OK : VALIDATION_FAILED, 250), i, j), Component.empty());
+ var button = new AdvancedImageButton(this.keyField.getX() + this.keyField.getWidth() - 15, this.keyField.getY() + 3, 12,
+ 12, 0, 0, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, Component.empty(), this);
+ button.setTooltip(new AdvancedTooltip(() -> this.validationIcon != null &&
+ this.validationIcon.yTexStart == 0 ? VALIDATION_OK : VALIDATION_FAILED).setMaxWidth(250));
button.active = false;
button.visible = true;
this.addRenderableOnly(this.validationIcon = button);
- button = new ImageButton(this.keyField.x - 22, this.keyField.y - 0, 18, 18, 0,
- 28, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) ->
- this.renderTooltip(poseStack, this.minecraft.font.split(CommonComponents.EMPTY, 250), i, j),
- Component.empty());
+ button = new AdvancedImageButton(this.keyField.getX() - 22, this.keyField.getY() - 0, 18, 18, 0,
+ 28, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, Component.empty(), this);
button.active = false;
button.visible = true;
this.addRenderableOnly(button);
- button = new ImageButton(this.keyField.x + this.keyField.getWidth() + 4, this.keyField.y - 1, 23, 20, 41,
+ button = new AdvancedImageButton(this.keyField.getX() + this.keyField.getWidth() + 4, this.keyField.getY() - 1, 23, 20, 41,
24, 20, ENCRYPTION_ICONS, 64, 64, btn -> {
this.unfocusFields();
this.keyField.setValue(this.algorithmButton.getValue().getRandomKey());
- }, (btn, poseStack, i, j) ->
- this.renderTooltip(poseStack, this.minecraft.font.split(DICE_TOOLTIP, 250), i, j),
- Component.empty());
+ }, Component.empty(), this);
+ button.setTooltip(new AdvancedTooltip(DICE_TOOLTIP).setMaxWidth(250));
button.active = true;
button.visible = true;
@@ -118,39 +99,36 @@ public class EncryptionConfigScreen extends Screen {
w += 25;
- this.passField = new CustomEditBox(this.font, (this.width - w)/2 + 11, this.keyField.y +
+ this.passField = new CustomEditBox(this.font, (this.width - w)/2 + 11, this.keyField.getY() +
this.keyField.getHeight() + passDescSpace + (this.hugeGUI() ? -3 : 13), w, 18, CommonComponents.EMPTY);
this.passField.setMaxLength(512);
this.passField.setResponder(this::onPassphraseUpdate);
this.addWidget(this.passField);
- button = new ImageButton(this.passField.x - 22, this.passField.y - 0, 18, 18, 0,
- 46, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) ->
- this.renderTooltip(poseStack, this.minecraft.font.split(CommonComponents.EMPTY, 250), i, j),
- Component.empty());
+ button = new AdvancedImageButton(this.passField.getX() - 22, this.passField.getY() - 0, 18, 18, 0,
+ 46, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, Component.empty(), this);
button.active = false;
button.visible = true;
this.addRenderableOnly(button);
int checkWidth = this.font.width(ENCRYPT_PUBLIC);
- this.encryptPublicCheck = new Checkbox(this.width / 2 - checkWidth / 2 - 8, this.passField.y + 24, checkWidth + 24, 20,
+ this.encryptPublicCheck = new Checkbox(this.width / 2 - checkWidth / 2 - 8, this.passField.getY() + 24, checkWidth + 24, 20,
ENCRYPT_PUBLIC, NCRConfig.getEncryption().shouldEncryptPublic());
this.addRenderableWidget(this.encryptPublicCheck);
- this.addRenderableWidget(new Button(this.width / 2 + 4, this.passField.y + 48, 219, 20,
- CommonComponents.GUI_DONE, btn -> {
- this.onDone();
- this.onClose();
- }));
+ this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, btn -> {
+ this.onDone();
+ this.onClose();
+ }).pos(this.width / 2 + 4, this.passField.getY() + 48).size(219, 20).build());
CycleButton<Encryption> cycle = CycleButton.<Encryption>builder(value -> {
return Component.translatable("gui.nochatreports.encryption_config.algorithm",
Component.translatable("algorithm.nochatreports." + value.getID() + ".name"));
}).withValues(Encryption.getRegistered()).displayOnlyValue().withInitialValue(this.getConfig()
- .getAlgorithm()).withTooltip(value -> this.minecraft.font.split(
- Component.translatable("algorithm.nochatreports." + value.getID()), 250))
- .create(this.width / 2 - 4 - 218, this.passField.y + 48, 218, 20, CommonComponents.EMPTY,
+ .getAlgorithm()).withTooltip(value -> new AdvancedTooltip(Component.translatable(
+ "algorithm.nochatreports." + value.getID())).setMaxWidth(250))
+ .create(this.width / 2 - 4 - 218, this.passField.getY() + 48, 218, 20, CommonComponents.EMPTY,
(cycleButton, value) -> {
this.unfocusFields();
this.onAlgorithmUpdate(value);
@@ -184,34 +162,34 @@ public class EncryptionConfigScreen extends Screen {
this.renderBackground(poseStack);
Screen.drawCenteredString(poseStack, this.font, HEADER, this.width / 2, this.hugeGUI() ? 8 : 16, 0xFFFFFF);
- this.keyDesc.renderLeftAligned(poseStack, this.keyField.x - 20, (this.hugeGUI() ? 25 : FIELDS_Y_START), this.getLineHeight(), 0xFFFFFF);
+ this.keyDesc.renderLeftAligned(poseStack, this.keyField.getX() - 20, (this.hugeGUI() ? 25 : FIELDS_Y_START), this.getLineHeight(), 0xFFFFFF);
this.keyField.render(poseStack, i, j, f);
- this.passDesc.renderLeftAligned(poseStack, this.passField.x - 20, this.keyField.y + this.keyField.getHeight() + (this.hugeGUI() ? 12 : 28),
+ this.passDesc.renderLeftAligned(poseStack, this.passField.getX() - 20, this.keyField.getY() + this.keyField.getHeight() + (this.hugeGUI() ? 12 : 28),
this.getLineHeight(), 0xFFFFFF);
this.passField.render(poseStack, i, j, f);
- if (this.algorithmButton != null && this.algorithmButton.isMouseOver(i, j)) {
- this.renderTooltip(poseStack, this.algorithmButton.getTooltip(), i, j);
- }
+ // if (this.algorithmButton != null && this.algorithmButton.isMouseOver(i, j)) {
+ // this.renderTooltip(poseStack, this.algorithmButton.getTooltip(), i, j);
+ // }
super.render(poseStack, i, j, f);
if (StringUtil.isNullOrEmpty(this.keyField.getValue()) && !this.keyField.isFocused()) {
Screen.drawString(poseStack, this.font,
Component.translatable("gui.nochatreports.encryption_config.default_key",
- this.algorithmButton.getValue().getDefaultKey()), this.keyField.x + 4,
- this.keyField.y + 5, 0x999999);
+ this.algorithmButton.getValue().getDefaultKey()), this.keyField.getX() + 4,
+ this.keyField.getY() + 5, 0x999999);
}
if (!this.passField.active) {
- Screen.drawString(poseStack, this.font, PASS_NOT_ALLOWED, this.passField.x + 4,
- this.passField.y + 5, 0x999999);
+ Screen.drawString(poseStack, this.font, PASS_NOT_ALLOWED, this.passField.getX() + 4,
+ this.passField.getY() + 5, 0x999999);
RenderSystem.setShaderTexture(0, ENCRYPTION_ICONS);
RenderSystem.enableDepthTest();
- blit(poseStack, this.passField.x - 20, this.passField.y + 3, 50, 0, 14, 13, 64, 64);
+ blit(poseStack, this.passField.getX() - 20, this.passField.getY() + 3, 50, 0, 14, 13, 64, 64);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java
index 9b21101..1ef8bd9 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java
@@ -1,33 +1,15 @@
package com.aizistral.nochatreports.gui;
-import org.jetbrains.annotations.Nullable;
-
-import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.config.NCRConfig;
-import com.aizistral.nochatreports.core.ServerSafetyState;
-import com.mojang.blaze3d.vertex.PoseStack;
-
import net.minecraft.ChatFormatting;
-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.client.gui.screens.TitleScreen;
-import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen;
-import net.minecraft.client.gui.screens.multiplayer.WarningScreen;
-import net.minecraft.client.multiplayer.resolver.ServerAddress;
-import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.FormattedText;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
-
@OnlyIn(Dist.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/ExtendedWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java
deleted file mode 100644
index 39a7b86..0000000
--- a/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.aizistral.nochatreports.gui;
-
-import com.aizistral.nochatreports.config.NCRConfig;
-import com.mojang.blaze3d.vertex.PoseStack;
-
-import net.minecraft.ChatFormatting;
-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 ExtendedWarningScreen extends Screen {
- private final Component TITLE;
- private final Component CONTENT;
- private final Component CHECK;
- private final Component NARRATION;
- private final String WIKI_LINK;
- protected final Screen previous;
- protected MultiLineLabel message = MultiLineLabel.EMPTY;
- protected Checkbox stopShowing = null;
-
- public ExtendedWarningScreen(Component title, Component content, Component check, String wikiLink, 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;
- }
-
- @Override
- protected void init() {
- this.clearWidgets();
- super.init();
- this.message = MultiLineLabel.create(this.font, this.CONTENT, this.width - (this.hugeGUI() ? 65 : 100));
- int i = (this.message.getLineCount() + 1) * this.getLineHeight();
- 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(new Button(this.width / 2 - 260 + offset, buttonY + i, 150, 20, CommonComponents.GUI_PROCEED, this::onProceed));
- this.addRenderableWidget(new Button(this.width / 2 - 100 + offset, buttonY + i, 150, 20, 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));
- }));
- this.addRenderableWidget(new Button(this.width / 2 + 60 + offset, buttonY + i, 150, 20, CommonComponents.GUI_BACK, this::onBack));
- }
-
- protected abstract void onProceed(Button button);
-
- protected abstract void onBack(Button button);
-
- @Override
- public void render(PoseStack poseStack, int i, int j, float f) {
- this.renderBackground(poseStack);
- this.renderTitle(poseStack);
- int k = this.width / 2 - this.message.getWidth() / 2;
- this.message.renderLeftAligned(poseStack, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFF);
- super.render(poseStack, i, j, f);
- }
-
- private void renderTitle(PoseStack poseStack) {
- drawString(poseStack, this.font, this.title, 25, this.hugeGUI() ? 15 : 30, 0xFFFFFF);
- }
-
- private boolean hugeGUI() {
- return this.height <= 1080 / 4;
- }
-
- protected int getLineHeight() {
- if (this.hugeGUI())
- return (int) (this.minecraft.font.lineHeight * 1.5) + 1;
- else
- return this.minecraft.font.lineHeight * 2;
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java b/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java
index 84f11b4..99fd8b3 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java
@@ -15,7 +15,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
* @author Aizistral
*/
-
@OnlyIn(Dist.CLIENT)
public final class FontHelper {
diff --git a/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java b/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java
new file mode 100644
index 0000000..2c7bcd2
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java
@@ -0,0 +1,23 @@
+package com.aizistral.nochatreports.gui;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.Component;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+import java.util.function.Supplier;
+
+@OnlyIn(Dist.CLIENT)
+public class InvisibleButton extends Button {
+
+ public InvisibleButton() {
+ super(0, 0, 20, 20, Component.empty(), btn -> {}, Supplier::get);
+ }
+
+ @Override
+ public void render(PoseStack poseStack, int i, int j, float f) {
+ // NO-OP
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java
index 29f4d5d..3fb2b79 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java
@@ -1,21 +1,12 @@
package com.aizistral.nochatreports.gui;
-import org.jetbrains.annotations.Nullable;
-
import com.aizistral.nochatreports.config.NCRConfig;
-
import net.minecraft.ChatFormatting;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.Button;
-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.WarningScreen;
-import net.minecraft.network.chat.CommonComponents;
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 e568231..82ead58 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
@@ -6,65 +6,65 @@ import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
import net.minecraft.ChatFormatting;
+import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.ChatScreen;
+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;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
-/**
- * This is the screen user gets thrown into when they try to enter server that refuses to let them in
- * without exposing account's public key. From here the user can choose not to play on the server, or
- * agree to expose the key and send only signed messages. In the latter case they get reconnected to
- * the server and mod will not prevent the key from being sent. Optional checkbox is provided to add
- * the server to persistent whitelist in the config, to remove the need of going through this screen
- * every time when entering that specific server.
- *
- * @author Aizistral
- */
-
@OnlyIn(Dist.CLIENT)
-public final class UnsafeServerScreen extends WarningScreen {
- private static final Component TITLE = Component.translatable("gui.nochatreports.unsafe_server.header").withStyle(ChatFormatting.BOLD);
- private static final Component CONTENT = Component.translatable("gui.nochatreports.unsafe_server.contents");
- private static final Component CHECK = Component.translatable("gui.nochatreports.unsafe_server.check");
+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 = new TitleScreen();
- private final Screen joinMultiplayer = new JoinMultiplayerScreen(new TitleScreen());
-
- public UnsafeServerScreen() {
- super(TITLE, CONTENT, CHECK, NARRATION);
+ public UnsafeServerScreen(Screen previous) {
+ super(TITLE, CONTENT, CHECK, previous);
}
@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.getLastServerAddress();
+ this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.signing_required.allow_signing"),
+ button -> {
+ ServerSafetyState.setAllowChatSigning(true);
+ this.minecraft.setScreen(this.previous);
+ }).bounds(this.width / 2 - 155, i, 150, 20)
+ .build());
+
+ this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.signing_required.cancel"),
+ button -> {
+ if (this.stopShowing.selected()) {
+ hideThisSession = true;
+ }
+ this.minecraft.setScreen(this.previous);
+ }).bounds(this.width / 2 - 155 + 160, i, 150, 20).build());
+ }
- if (address != null) {
- if (this.stopShowing.selected()) {
- NCRConfig.getServerWhitelist().getList().add(address.getHost() + ":" + address.getPort());
- NCRConfig.getServerWhitelist().saveFile();
- }
+ private void resendLastMessage() {
+ if (this.previous instanceof ChatScreen chat) {
+ chat.handleChatInput(NCRConfig.getEncryption().getLastMessage(), false);
+ }
+ }
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Proceeding with unsafe connection to {}, added to whitelist: {}",
- address.getHost() + ":" + address.getPort(), this.stopShowing.selected());
- }
+ public static void setHideThisSession(boolean hide) {
+ hideThisSession = hide;
+ }
- ServerSafetyState.setAllowsUnsafeServer(true);
- this.minecraft.setScreen(new AwaitConnectionScreen(this.joinMultiplayer));
- }
- }));
- this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, 100 + i, 150, 20, CommonComponents.GUI_BACK, button -> {
- this.minecraft.setScreen(this.joinMultiplayer);
- }));
+ public static boolean hideThisSession() {
+ return hideThisSession;
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java
deleted file mode 100644
index e6e5205..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import com.aizistral.nochatreports.NoChatReportsClient;
-import com.aizistral.nochatreports.gui.UnsafeServerScreen;
-
-import net.minecraft.client.gui.screens.DisconnectedScreen;
-import net.minecraft.network.chat.Component;
-
-@Mixin(DisconnectedScreen.class)
-public interface AccessorDisconnectedScreen {
-
- /**
- * @return Disconnect reason of this screen. This is used in {@link NoChatReportsClient} to detect
- * when player have been kicked out of server because client refused to send account's public key,
- * and subsequently swap the screen for {@link UnsafeServerScreen} where player can choose to
- * reconnect and expose their key.
- */
-
- @Accessor
- public Component getReason();
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java
index cad93cd..b023769 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java
@@ -1,31 +1,19 @@
package com.aizistral.nochatreports.mixins.client;
-import javax.annotation.Nullable;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
-import org.spongepowered.asm.mixin.injection.ModifyArgs;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.At.Shift;
-
import com.aizistral.nochatreports.NoChatReports;
import com.aizistral.nochatreports.config.NCRConfig;
-import com.aizistral.nochatreports.config.NCRConfigClient;
import com.aizistral.nochatreports.core.EncryptionUtil;
-import com.aizistral.nochatreports.encryption.Encryptor;
-
import net.minecraft.ChatFormatting;
-import net.minecraft.client.GuiMessage;
import net.minecraft.client.GuiMessageTag;
import net.minecraft.client.gui.components.ChatComponent;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.ComponentContents;
import net.minecraft.network.chat.FormattedText;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.contents.LiteralContents;
-import net.minecraft.network.chat.contents.TranslatableContents;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.At.Shift;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
@Mixin(ChatComponent.class)
public class MixinChatComponent {
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 3cbd89a..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,27 +1,32 @@
package com.aizistral.nochatreports.mixins.client;
-import java.time.Instant;
-import java.util.Base64;
-import java.util.UUID;
-
-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.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.At.Shift;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
import com.aizistral.nochatreports.NoChatReports;
+import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.EncryptionUtil;
-
-import net.minecraft.client.GuiMessageTag;
-import net.minecraft.client.multiplayer.PlayerInfo;
+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;
import net.minecraft.client.multiplayer.chat.ChatListener;
import net.minecraft.client.multiplayer.chat.ChatTrustLevel;
import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.PlayerChatMessage;
+import net.minecraft.network.chat.contents.TranslatableContents;
+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.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.time.Instant;
+import java.util.Base64;
+import java.util.UUID;
@Mixin(ChatListener.class)
public class MixinChatListener {
@@ -31,6 +36,42 @@ public class MixinChatListener {
throw new IllegalStateException("@Shadow transformation failed. Should never happen.");
}
+ @Inject(method = "handleSystemMessage", at = @At("HEAD"), cancellable = true)
+ 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.signing_requested");
+
+ if (!ServerSafetyState.isOnRealms()) {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
+ }
+
+ if (UnsafeServerScreen.hideThisSession() || ServerSafetyState.allowChatSigning())
+ return;
+
+ if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ON_DEMAND)) {
+ ServerSafetyState.scheduleSigningAction(NoChatReportsClient::resendLastChatMessage);
+ ServerSafetyState.setAllowChatSigning(true);
+
+ if (NCRConfig.getClient().hideSigningRequestMessage()) {
+ info.cancel();
+ }
+
+ return;
+ }
+
+ 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();
+ }
+ }
+ }
+ }
+ }
+
/**
* @reason Removes "Not Secure" and "Modified" statuses of chat messages. They ultimately
* serve no purpose but to annoy the user and scare them away from servers that actually
@@ -39,23 +80,19 @@ public class MixinChatListener {
*/
@Inject(method = "evaluateTrustLevel", at = @At("HEAD"), cancellable = true)
- private void onEvaluateTrustLevel(PlayerChatMessage playerChatMessage, Component component, PlayerInfo playerInfo,
- Instant instant, CallbackInfoReturnable<ChatTrustLevel> info) {
-
- if (this.isSenderLocalPlayer(playerChatMessage.signer().profileId())) {
+ private void onEvaluateTrustLevel(PlayerChatMessage playerChatMessage, Component component, Instant instant, CallbackInfoReturnable<ChatTrustLevel> info) {
+ if (this.isSenderLocalPlayer(playerChatMessage.sender())) {
info.setReturnValue(ChatTrustLevel.SECURE);
} else {
- var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, playerInfo, instant);
-
- if (evaluate == ChatTrustLevel.BROKEN_CHAIN) {
- info.setReturnValue(evaluate);
- return;
+ if (playerChatMessage.hasSignature() && ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE) {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE);
}
- if (evaluate == ChatTrustLevel.NOT_SECURE && NCRConfig.getClient().hideRedChatIndicators()) {
+ var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, instant);
+
+ if (evaluate == ChatTrustLevel.NOT_SECURE && NCRConfig.getClient().hideInsecureMessageIndicators()) {
info.setReturnValue(ChatTrustLevel.SECURE);
- } else if ((evaluate == ChatTrustLevel.FILTERED || evaluate == ChatTrustLevel.MODIFIED)
- && NCRConfig.getClient().hideYellowChatIndicators()) {
+ } else if (evaluate == ChatTrustLevel.MODIFIED && NCRConfig.getClient().hideModifiedMessageIndicators()) {
info.setReturnValue(ChatTrustLevel.SECURE);
}
}
@@ -63,9 +100,9 @@ public class MixinChatListener {
// Debug never dies
if (NCRConfig.getCommon().enableDebugLog()) {
NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}",
- Component.Serializer.toStableJson(playerChatMessage.serverContent()),
- playerChatMessage.signer().profileId(),
- Base64.getEncoder().encodeToString(playerChatMessage.headerSignature().bytes()));
+ Component.Serializer.toStableJson(playerChatMessage.unsignedContent()),
+ playerChatMessage.link().sender(),
+ Base64.getEncoder().encodeToString(playerChatMessage.signature() != null ? playerChatMessage.signature().bytes() : new byte[0]));
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java
index 6b3d0f5..9fff6d9 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java
@@ -1,6 +1,7 @@
package com.aizistral.nochatreports.mixins.client;
import java.util.List;
+import java.util.Optional;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.asm.mixin.Mixin;
@@ -18,59 +19,29 @@ import net.minecraft.client.gui.screens.SimpleOptionsSubScreen;
import net.minecraft.network.chat.Component;
import net.minecraft.util.FormattedCharSequence;
+/**
+ * Mixin responsible for graying out "Only Show Secure Chat" option.
+ *
+ * @author Kevinthegreat (original implementation)
+ * @author Aizistral (current version)
+ */
+
@Mixin(ChatOptionsScreen.class)
public class MixinChatOptionsScreen extends SimpleOptionsSubScreen {
- private AbstractWidget onlyShowSecureChat;
-
- /**
- * @implNote Using {@link net.minecraft.client.gui.Font#split} because
- * {@link net.minecraft.client.OptionInstance#splitTooltip(Minecraft, Component)} is protected.
- * Field {@link net.minecraft.client.gui.screens.Screen#minecraft} is not used because it can be null.
- * @author Kevinthegreat
- */
- @SuppressWarnings({"JavaDoc", "JavadocReference"})
- private List<FormattedCharSequence> secureChatTooltip;
- public MixinChatOptionsScreen(Screen screen, Options options, Component component, OptionInstance<?>[] optionInstances) {
+ public MixinChatOptionsScreen(Screen screen, Options options, Component component, OptionInstance<?>... optionInstances) {
super(screen, options, component, optionInstances);
throw new IllegalStateException("Can't touch this");
}
- /**
- * Gray out the only show secure chat option by deactivating the button when the screen is initialized.
- * @author Kevinthegreat
- */
-
@Override
protected void init() {
super.init();
- if (!NCRConfig.getClient().enableMod())
- return;
-
- this.secureChatTooltip = Minecraft.getInstance().font.split(Component.translatable("gui.nochatreport.secureChat"), 200);
- this.onlyShowSecureChat = this.list.findOption(Minecraft.getInstance().options.onlyShowSecureChat());
-
- if (this.onlyShowSecureChat != null) {
- this.onlyShowSecureChat.active = false;
+ if (NCRConfig.getClient().enableMod()) {
+ Optional.ofNullable(this.list.findOption(Minecraft.getInstance().options.onlyShowSecureChat()))
+ .ifPresent(option -> option.active = false);
}
}
- /**
- * Render the tooltip on mouseover for only show secure chat option.
- * Minecraft only render tooltips when the widget is active.
- * @author Kevinthegreat
- */
-
- @Override
- public void render(@NotNull PoseStack poseStack, int x, int y, float f) {
- super.render(poseStack, x, y, f);
-
- if (!NCRConfig.getClient().enableMod())
- return;
-
- if (this.onlyShowSecureChat != null && this.onlyShowSecureChat.visible && x >= (double) this.onlyShowSecureChat.x && y >= (double) this.onlyShowSecureChat.y && x < (double) (this.onlyShowSecureChat.x + this.onlyShowSecureChat.getWidth()) && y < (double) (this.onlyShowSecureChat.y + this.onlyShowSecureChat.getHeight())) {
- this.renderTooltip(poseStack, this.secureChatTooltip, x, y);
- }
- }
-} \ No newline at end of file
+}
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 7b69957..18b673e 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
@@ -1,41 +1,42 @@
package com.aizistral.nochatreports.mixins.client;
-import java.util.List;
-import java.util.stream.Collectors;
-
-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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
+import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.config.NCRConfig;
-import com.aizistral.nochatreports.config.NCRConfigClient;
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.EncryptionConfigScreen;
import com.aizistral.nochatreports.gui.EncryptionWarningScreen;
import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.BufferUploader;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.blaze3d.vertex.VertexFormat;
-import com.mojang.math.Matrix4f;
+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;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.locale.Language;
import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
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;
/**
* This is responsible for adding safety status indicator to the bottom-right corner of chat screen.
@@ -46,12 +47,27 @@ import net.minecraft.util.FormattedCharSequence;
public abstract class MixinChatScreen extends Screen {
private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons_extended.png");
private static final ResourceLocation ENCRYPTION_BUTTON = new ResourceLocation("nochatreports", "textures/gui/encryption_toggle_button.png");
+ private ImageButton safetyStatusButton;
protected MixinChatScreen() {
super(null);
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();
@@ -75,16 +91,65 @@ public abstract class MixinChatScreen extends Screen {
int buttonX = this.width - 23;
if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) {
- ServerSafetyLevel trust = this.minecraft.isLocalServer() ? ServerSafetyLevel.SECURE : ServerSafetyState.getCurrent();
+ this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(),
+ 0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> {
+ if (!NoChatReportsClient.areSigningKeysPresent())
+ return;
+
+ var address = ServerSafetyState.getLastServer();
+
+ if (address != null) {
+ 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();
+
+ if (ServerSafetyState.allowChatSigning()) {
+ tooltip = Component.translatable("gui.nochatreports.safety_status.insecure_signing");
+ } else if (ServerSafetyState.isInSingleplayer())
+ return tooltip;
+
+ ServerAddress address = ServerSafetyState.getLastServer();
+ SigningMode mode = NCRConfig.getServerPreferences().getModeUnresolved(address);
+ String signing = "gui.nochatreports.signing_status.";
+
+ 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";
+ }
+ } else if (ServerSafetyState.allowChatSigning()) {
+ signing += "allowed_session";
+ } else {
+ signing += "disabled";
+ }
- var button = new ImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(trust),
- 0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> {}, (btn, poseStack, i, j) ->
- this.renderTooltipNoGap(poseStack, this.minecraft.font.split(trust.getTooltip(), 250), i, j),
- Component.empty());
- button.active = false;
- button.visible = true;
+ tooltip.append("\n\n");
+ tooltip.append(Component.translatable(signing));
- this.addRenderableOnly(button);
+ if (ServerSafetyState.isOnRealms())
+ return tooltip;
+
+ 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));
+
+ this.addRenderableWidget(this.safetyStatusButton);
buttonX -= 25;
}
@@ -104,29 +169,41 @@ public abstract class MixinChatScreen extends Screen {
} else {
((EncryptionButton)btn).openEncryptionConfig();
}
- }, (btn, poseStack, i, j) -> {
- if (NCRConfig.getEncryption().isValid()) {
- this.renderTooltip(poseStack, this.minecraft.font.split(
- Component.translatable("gui.nochatreports.encryption_tooltip", Language.getInstance()
- .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption()
- .isEnabledAndValid() ? "on" : "off")), 250), 250), i, j);
- } else {
- this.renderTooltip(poseStack, this.minecraft.font.split(
- Component.translatable("gui.nochatreports.encryption_tooltip_invalid", Language.getInstance()
- .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption()
- .isEnabledAndValid() ? "on" : "off")), 250), 250), i, j);
-
- }
}, Component.empty(), this);
+ button.setTooltip(new AdvancedTooltip(() -> {
+ if (NCRConfig.getEncryption().isValid())
+ return Component.translatable("gui.nochatreports.encryption_tooltip", Language.getInstance()
+ .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption()
+ .isEnabledAndValid() ? "on" : "off")));
+ else
+ return Component.translatable("gui.nochatreports.encryption_tooltip_invalid", Language.getInstance()
+ .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption()
+ .isEnabledAndValid() ? "on" : "off")));
+ }).setMaxWidth(250));
button.active = true;
button.visible = true;
this.addRenderableWidget(button);
}
+ @Inject(method = "tick", at = @At("RETURN"))
+ private void onTick(CallbackInfo info) {
+ if (this.safetyStatusButton != null) {
+ this.safetyStatusButton.xTexStart = this.getXOffset();
+ }
+ }
+
+ private ServerSafetyLevel getSafetyLevel() {
+ return ServerSafetyState.getCurrent();
+ }
+
+ private int getXOffset() {
+ return this.getXOffset(this.getSafetyLevel());
+ }
+
private int getXOffset(ServerSafetyLevel level) {
return switch (level) {
- case SECURE -> 21;
+ case SECURE, SINGLEPLAYER -> 21;
case UNINTRUSIVE -> 42;
case INSECURE -> 0;
case REALMS -> 63;
@@ -135,83 +212,7 @@ public abstract class MixinChatScreen extends Screen {
};
}
- protected void renderTooltipNoGap(PoseStack poseStack, List<? extends FormattedCharSequence> list, int i, int j) {
- this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j);
- }
-
- protected void renderTooltipInternalNoGap(PoseStack poseStack, List<ClientTooltipComponent> list, int i, int j) {
- ClientTooltipComponent clientTooltipComponent2;
- int v;
- int m;
- if (list.isEmpty())
- return;
- int k = 0;
- int l = list.size() == 1 ? -2 : -2;
- for (ClientTooltipComponent clientTooltipComponent : list) {
- m = clientTooltipComponent.getWidth(this.font);
- if (m > k) {
- k = m;
- }
- l += clientTooltipComponent.getHeight();
- }
- int n = i + 12;
- int o = j - 12;
- m = k;
- int p = l;
- if (n + k > this.width) {
- n -= 28 + k;
- }
- if (o + p + 6 > this.height) {
- o = this.height - p - 6;
- }
- if (j - p - 8 < 0) {
- o = j + 8;
- }
- poseStack.pushPose();
- int q = -267386864;
- int r = 0x505000FF;
- int s = 1344798847;
- int t = 400;
- float f = this.itemRenderer.blitOffset;
- this.itemRenderer.blitOffset = 400.0f;
- Tesselator tesselator = Tesselator.getInstance();
- BufferBuilder bufferBuilder = tesselator.getBuilder();
- RenderSystem.setShader(GameRenderer::getPositionColorShader);
- bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
- Matrix4f matrix4f = poseStack.last().pose();
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847);
- RenderSystem.enableDepthTest();
- RenderSystem.disableTexture();
- RenderSystem.enableBlend();
- RenderSystem.defaultBlendFunc();
- BufferUploader.drawWithShader(bufferBuilder.end());
- RenderSystem.disableBlend();
- RenderSystem.enableTexture();
- MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
- poseStack.translate(0.0, 0.0, 400.0);
- int u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource);
- u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/;
- }
- bufferSource.endBatch();
- poseStack.popPose();
- u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400);
- u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0);
- }
- this.itemRenderer.blitOffset = f;
- }
+ @Shadow
+ public abstract String normalizeChatMessage(String string);
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java
new file mode 100644
index 0000000..2d3e697
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java
@@ -0,0 +1,39 @@
+package com.aizistral.nochatreports.mixins.client;
+
+import com.aizistral.nochatreports.core.ServerSafetyLevel;
+import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.mojang.brigadier.ParseResults;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.SignableCommand;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ServerboundChatCommandPacket;
+import net.minecraft.network.protocol.game.ServerboundChatPacket;
+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;
+
+@Mixin(ClientPacketListener.class)
+public abstract class MixinClientPacketListener {
+
+ @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"))
+ private void onSend(Packet<?> packet, CallbackInfo info) {
+ if (!ServerSafetyState.allowChatSigning() && !ServerSafetyState.isDetermined()) {
+ if (packet instanceof ServerboundChatPacket chat) {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); // asume unintrusive until further notice
+ } else if (packet instanceof ServerboundChatCommandPacket command) {
+ if (!SignableCommand.of(this.parseCommand(command.command())).arguments().isEmpty()) {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE);
+ }
+ }
+ }
+ }
+
+ @Shadow
+ private ParseResults<SharedSuggestionProvider> parseCommand(String command) {
+ throw new IllegalStateException("@Shadow transformation failed");
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
deleted file mode 100644
index efbd9ed..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-import java.util.concurrent.Executor;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import com.aizistral.nochatreports.config.NCRConfig;
-import com.mojang.authlib.minecraft.TelemetrySession;
-import com.mojang.authlib.minecraft.UserApiService;
-
-import net.minecraft.client.ClientTelemetryManager;
-
-@Mixin(ClientTelemetryManager.class)
-public class MixinClientTelemetryManager {
-
- /**
- * @reason Privacy.
- * @author Aizistral
- */
-
- @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/UserApiService;"
- + "newTelemetrySession(Ljava/util/concurrent/Executor;)Lcom/mojang/authlib/minecraft/TelemetrySession;",
- remap = false))
- private TelemetrySession onCreateTelemetrySession(UserApiService service, Executor executor) {
- if (NCRConfig.getClient().disableTelemetry())
- return TelemetrySession.DISABLED;
- else
- return service.newTelemetrySession(executor);
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
deleted file mode 100644
index 82df5af..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-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.config.NCRConfig;
-import com.aizistral.nochatreports.core.ServerSafetyLevel;
-import com.aizistral.nochatreports.core.ServerSafetyState;
-
-import net.minecraft.network.protocol.login.ClientLoginPacketListener;
-import net.minecraft.network.protocol.login.ClientboundHelloPacket;
-
-@Mixin(ClientboundHelloPacket.class)
-public class MixinClientboundHelloPacket {
-
- /**
- * @reason If server is operated in the offline mode - we will never receive this type of packet
- * from it, which allows us to conclude we have no necessity to expose account's public key.
- * By acknowledging this we can update current {@link ServerSafetyLevel} accordingly.
- * @author Aizistral
- */
-
- @Inject(method = "handle", at = @At("HEAD"))
- private void onHandle(ClientLoginPacketListener listener, CallbackInfo info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
- ServerSafetyState.setSessionRequestedKey(true);
- }
-
-}
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 947729d..75e4705 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
@@ -1,29 +1,25 @@
package com.aizistral.nochatreports.mixins.client;
-import org.jetbrains.annotations.Nullable;
-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.NoChatReports;
import com.aizistral.nochatreports.config.NCRConfig;
-import com.aizistral.nochatreports.config.NCRConfigClient;
-import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
-
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.ConnectScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
+import org.jetbrains.annotations.Nullable;
+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;
@Mixin(ConnectScreen.class)
public class MixinConnectScreen {
/**
* @reason Intercept initiation of any new server connection. This way we can keep track of which
- * server client currently tries to connect to
+ * server client currently tries to connect to.
* @author Aizistral
*/
@@ -33,19 +29,12 @@ public class MixinConnectScreen {
if (!NCRConfig.getClient().enableMod())
return;
- ServerSafetyState.updateCurrent(ServerSafetyLevel.UNDEFINED); // just to be 100% sure
- ServerSafetyState.setLastConnectedServer(serverAddress, serverData);
-
- if (NCRConfig.getServerWhitelist().isWhitelisted(serverAddress)) {
- if (!NCRConfig.getClient().doSigningCheck(serverAddress)) {
- ServerSafetyState.setAllowsUnsafeServer(true);
- }
- }
+ ServerSafetyState.reset();
+ ServerSafetyState.setLastServer(serverAddress);
if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Connecting to: {}, will expose public key: {}",
- serverAddress.getHost() + ":" + serverAddress.getPort(),
- ServerSafetyState.allowsUnsafeServer());
+ NoChatReports.LOGGER.info("Connecting to: {}",
+ serverAddress.getHost() + ":" + serverAddress.getPort());
NoChatReports.LOGGER.info("Server Data IP: {}", serverData != null ? serverData.ip : "null");
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java
index 1c18c61..754db1f 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java
@@ -1,17 +1,12 @@
package com.aizistral.nochatreports.mixins.client;
+import com.aizistral.nochatreports.config.NCRConfig;
+import net.minecraft.client.GuiMessageTag;
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.CallbackInfoReturnable;
-import com.aizistral.nochatreports.config.NCRConfig;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.GuiMessageTag;
-import net.minecraft.client.GuiMessageTag.Icon;
-import net.minecraft.network.chat.Component;
-
@Mixin(GuiMessageTag.class)
public class MixinGuiMessageTag {
@@ -22,9 +17,9 @@ public class MixinGuiMessageTag {
* @author Aizistral
*/
- @Inject(method = "system", at = @At("HEAD"), cancellable = true)
+ @Inject(method = { "system", "systemSinglePlayer" }, at = @At("HEAD"), cancellable = true)
private static void onSystem(CallbackInfoReturnable<GuiMessageTag> info) {
- if (NCRConfig.getClient().hideGrayChatIndicators()) {
+ if (NCRConfig.getClient().hideSystemMessageIndicators()) {
info.setReturnValue(null);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java
index 7c130bd..6ef1488 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java
@@ -21,7 +21,7 @@ import net.minecraft.resources.ResourceLocation;
@Mixin(GuiMessageTag.Icon.class)
public abstract class MixinGuiMessageTagIcon {
private static final ResourceLocation TEXTURE_NCR = new ResourceLocation("nochatreports", "textures/gui/encrypted_tag.png");
- @Shadow(aliases = "field_39768", remap = false) @Mutable static Icon[] $VALUES;
+ @Shadow(aliases = "field_39768") @Mutable static Icon[] $VALUES;
@Invoker("<init>")
static Icon create(String name, int ordinal, int u, int v, int width, int height) {
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
index 61fa83a..cf5f6be 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
@@ -3,6 +3,7 @@ package com.aizistral.nochatreports.mixins.client;
import java.util.List;
import java.util.stream.Collectors;
+import org.joml.Matrix4f;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@@ -10,6 +11,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.gui.AdvancedImageButton;
+import com.aizistral.nochatreports.gui.AdvancedTooltip;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.BufferBuilder;
import com.mojang.blaze3d.vertex.BufferUploader;
@@ -17,7 +20,6 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.Tesselator;
import com.mojang.blaze3d.vertex.VertexFormat;
-import com.mojang.math.Matrix4f;
import net.minecraft.client.gui.components.ImageButton;
import net.minecraft.client.gui.screens.Screen;
@@ -26,6 +28,7 @@ import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.locale.Language;
+import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FormattedCharSequence;
@@ -49,17 +52,16 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
@Inject(method = "init", at = @At("HEAD"))
private void onInit(CallbackInfo info) {
if (NCRConfig.getClient().showReloadButton()) {
- var button = new ImageButton(this.width/2 + 158, this.height - 52, 20, 20, 0, 0, 20,
- RELOAD_TEXTURE, 64, 64, btn -> NCRConfig.load(), (btn, poseStack, i, j) ->
- this.renderTooltipNoGap(poseStack, this.minecraft.font.split(RELOAD_TOOLTIP, 250), i, j),
- Component.translatable("gui.nochatreports.reload_config"));
+ var button = new AdvancedImageButton(this.width/2 + 158, this.height - 52, 20, 20, 0, 0, 20,
+ RELOAD_TEXTURE, 64, 64, btn -> NCRConfig.load(), CommonComponents.EMPTY, this);
+ button.setTooltip(new AdvancedTooltip(RELOAD_TOOLTIP).setMaxWidth(250).setRenderWithoutGap(true));
button.active = true;
button.visible = true;
this.addRenderableWidget(button);
}
if (NCRConfig.getClient().showNCRButton()) {
- var button = new ImageButton(this.width/2 + 158, this.height - 28, 20, 20,
+ var button = new AdvancedImageButton(this.width/2 + 158, this.height - 28, 20, 20,
NCRConfig.getClient().enableMod() ? 0 : 20, 0, 20, TOGGLE_TEXTURE, 64, 64,
btn -> {
NCRConfig.getClient().toggleMod();
@@ -72,97 +74,14 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
}
ServerSafetyState.reset();
- }, (btn, poseStack, i, j) -> this.renderTooltip(poseStack,
- this.minecraft.font.split(
- Component.translatable("gui.nochatreports.ncr_toggle_tooltip",
- Language.getInstance()
- .getOrDefault("gui.nochatreports.ncr_state_"
- + (NCRConfig.getClient().enableMod()
- ? "on" : "off"))), 250), i, j),
- Component.translatable("gui.nochatreports.ncr_toggle"));
+ }, Component.translatable("gui.nochatreports.ncr_toggle"), this);
+ button.setTooltip(new AdvancedTooltip(() -> Component.translatable("gui.nochatreports.ncr_toggle_tooltip",
+ Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (NCRConfig.getClient()
+ .enableMod() ? "on" : "off")))).setMaxWidth(250));
button.active = true;
button.visible = true;
this.addRenderableWidget(button);
}
}
- protected void renderTooltipNoGap(PoseStack poseStack, List<? extends FormattedCharSequence> list, int i, int j) {
- this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j);
- }
-
- protected void renderTooltipInternalNoGap(PoseStack poseStack, List<ClientTooltipComponent> list, int i, int j) {
- ClientTooltipComponent clientTooltipComponent2;
- int v;
- int m;
- if (list.isEmpty())
- return;
- int k = 0;
- int l = list.size() == 1 ? -2 : -2;
- for (ClientTooltipComponent clientTooltipComponent : list) {
- m = clientTooltipComponent.getWidth(this.font);
- if (m > k) {
- k = m;
- }
- l += clientTooltipComponent.getHeight();
- }
- int n = i + 12;
- int o = j - 12;
- m = k;
- int p = l;
- if (n + k > this.width) {
- n -= 28 + k;
- }
- if (o + p + 6 > this.height) {
- o = this.height - p - 6;
- }
- if (j - p - 8 < 0) {
- o = j + 8;
- }
- poseStack.pushPose();
- int q = -267386864;
- int r = 0x505000FF;
- int s = 1344798847;
- int t = 400;
- float f = this.itemRenderer.blitOffset;
- this.itemRenderer.blitOffset = 400.0f;
- Tesselator tesselator = Tesselator.getInstance();
- BufferBuilder bufferBuilder = tesselator.getBuilder();
- RenderSystem.setShader(GameRenderer::getPositionColorShader);
- bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
- Matrix4f matrix4f = poseStack.last().pose();
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847);
- RenderSystem.enableDepthTest();
- RenderSystem.disableTexture();
- RenderSystem.enableBlend();
- RenderSystem.defaultBlendFunc();
- BufferUploader.drawWithShader(bufferBuilder.end());
- RenderSystem.disableBlend();
- RenderSystem.enableTexture();
- MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
- poseStack.translate(0.0, 0.0, 400.0);
- int u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource);
- u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/;
- }
- bufferSource.endBatch();
- poseStack.popPose();
- u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400);
- u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0);
- }
- this.itemRenderer.blitOffset = f;
- }
-
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
deleted file mode 100644
index 9e43d68..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-import javax.annotation.Nullable;
-
-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.CallbackInfoReturnable;
-
-import com.aizistral.nochatreports.config.NCRConfig;
-import com.aizistral.nochatreports.core.ServerSafetyState;
-import com.mojang.brigadier.ParseResults;
-
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.commands.SharedSuggestionProvider;
-import net.minecraft.commands.arguments.ArgumentSignatures;
-import net.minecraft.network.chat.ChatMessageContent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.LastSeenMessages;
-import net.minecraft.network.chat.MessageSignature;
-import net.minecraft.network.chat.MessageSigner;
-
-@Mixin(LocalPlayer.class)
-public class MixinLocalPlayer {
-
- /**
- * @reason Never sign messages, so that neither server nor other clients have
- * proof of them being sent from your account.
- * @author Aizistral
- */
-
- @Inject(method = "signMessage", at = @At("HEAD"), cancellable = true)
- private void onSignMessage(MessageSigner signer, ChatMessageContent message, LastSeenMessages messages, CallbackInfoReturnable<MessageSignature> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
- if (!ServerSafetyState.forceSignedMessages()) {
- info.setReturnValue(MessageSignature.EMPTY);
- }
- }
-
- /**
- * @reason Same as above, except commands mostly concern only server.
- * @author Aizistral
- */
-
- @Inject(method = "signCommandArguments", at = @At("HEAD"), cancellable = true)
- private void onSignCommand(MessageSigner signer, ParseResults<SharedSuggestionProvider> results, @Nullable Component component, LastSeenMessages messages, CallbackInfoReturnable<ArgumentSignatures> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
- if (!ServerSafetyState.forceSignedMessages()) {
- info.setReturnValue(ArgumentSignatures.EMPTY);
- }
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
new file mode 100644
index 0000000..c6dc485
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
@@ -0,0 +1,48 @@
+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) {
+ if (!NCRConfig.getClient().enableMod())
+ return;
+
+ if (!ServerSafetyState.allowChatSigning()) {
+ info.setReturnValue(ProfileKeyPairManager.EMPTY_KEY_MANAGER);
+ }
+ }
+
+ @Inject(method = "allowsTelemetry", at = @At("HEAD"), cancellable = true)
+ private void onAllowsTelemetry(CallbackInfoReturnable<Boolean> info) {
+ if (NCRConfig.getClient().disableTelemetry()) {
+ info.setReturnValue(false);
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java
index 5090b6c..0798ba1 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java
@@ -1,25 +1,10 @@
package com.aizistral.nochatreports.mixins.client;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-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 com.aizistral.nochatreports.NoChatReports;
-import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerDataExtension;
import com.aizistral.nochatreports.gui.FontHelper;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
-
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiComponent;
import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
@@ -28,7 +13,15 @@ import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.locale.Language;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Tuple;
+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 java.util.ArrayList;
+import java.util.stream.Collectors;
@Mixin(ServerSelectionList.OnlineServerEntry.class)
public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry {
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java
index 8bbdbfb..7064ed6 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java
@@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
@Mixin(Options.class)
public class MixinOptions {
+ private static final Component SECURE_CHAT_TOOLTIP = Component.translatable("gui.nochatreports.secure_chat");
private OptionInstance<Boolean> alternativeOption;
/**
@@ -31,12 +32,13 @@ public class MixinOptions {
if (this.alternativeOption == null) {
this.alternativeOption = new OptionInstance<>("options.onlyShowSecureChat",
- OptionInstance.cachedConstantTooltip(Component.translatable("gui.nochatreport.secureChat")),
- (component, value) -> value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF,
- new OptionInstance.Enum<>(ImmutableList.of(Boolean.FALSE), Codec.BOOL), false, (value) -> {});
+ OptionInstance.cachedConstantTooltip(SECURE_CHAT_TOOLTIP),
+ OptionInstance.BOOLEAN_TO_STRING,
+ new OptionInstance.Enum<>(ImmutableList.of(Boolean.FALSE), Codec.BOOL),
+ false, value -> {});
}
cir.setReturnValue(this.alternativeOption);
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java
index 03ae009..59348f1 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java
@@ -15,11 +15,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.gui.AdvancedImageButton;
+import com.aizistral.nochatreports.gui.InvisibleButton;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.client.gui.components.Tooltip;
import net.minecraft.client.gui.screens.social.PlayerEntry;
import net.minecraft.client.gui.screens.social.SocialInteractionsScreen;
import net.minecraft.network.chat.Component;
@@ -28,15 +31,9 @@ import net.minecraft.util.FormattedCharSequence;
@Mixin(PlayerEntry.class)
public class MixinPlayerEntry {
- private static final Component NCR_BUTTON_TOOLTIP = Component.translatable("gui.nochatreport.noReporting");
+ private static final Component NCR_BUTTON_TOOLTIP = Component.translatable("gui.nochatreports.no_reporting");
@Shadow @Final private static ResourceLocation REPORT_BUTTON_LOCATION;
@Shadow private Button reportButton;
- @Shadow float tooltipHoverTime;
-
- @Shadow
- static void postRenderTooltip(SocialInteractionsScreen socialInteractionsScreen, PoseStack poseStack, List<FormattedCharSequence> list, int i, int j) {
- throw new IllegalStateException("@Shadow transformation failed. Should never happen.");
- }
/**
* @reason Disable (or hide if configured respectively) chat report button on client.
@@ -44,30 +41,15 @@ public class MixinPlayerEntry {
*/
@Inject(method = "<init>", at = @At("RETURN"))
- private void onConstructed(Minecraft minecraft, SocialInteractionsScreen socialInteractionsScreen, UUID uUID, String string, Supplier<ResourceLocation> supplier, boolean reportable, CallbackInfo info) {
+ private void onConstructed(Minecraft minecraft, SocialInteractionsScreen screen, UUID uuid, String name, Supplier<ResourceLocation> skinGetter, boolean reportable, CallbackInfo info) {
if (NCRConfig.getClient().alwaysHideReportButton()) {
- this.reportButton = new Button(0, 0, 20, 20, Component.empty(), button -> {}) {
- @Override
- public void render(PoseStack poseStack, int i, int j, float f) {
- // NO-OP
- }
- };
+ this.reportButton = new InvisibleButton();
this.reportButton.active = this.reportButton.visible = false;
- } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE && this.reportButton != null) {
- this.reportButton = new ImageButton(0, 0, 20, 20, 0, 0, 20, REPORT_BUTTON_LOCATION, 64, 64, button -> {}, new Button.OnTooltip() {
- @Override
- public void onTooltip(Button button, PoseStack poseStack, int i, int j) {
- MixinPlayerEntry.this.tooltipHoverTime += minecraft.getDeltaFrameTime();
- if (MixinPlayerEntry.this.tooltipHoverTime >= 10.0f) {
- socialInteractionsScreen.setPostRenderRunnable(() -> postRenderTooltip(socialInteractionsScreen, poseStack, minecraft.font.split(NCR_BUTTON_TOOLTIP, 150), i, j));
- }
- }
-
- @Override
- public void narrateTooltip(Consumer<Component> consumer) {
- consumer.accept(NCR_BUTTON_TOOLTIP);
- }
- }, Component.translatable("gui.socialInteractions.report"));
+ } else if (ServerSafetyState.getCurrent().isSecure() && this.reportButton != null) {
+ this.reportButton = new AdvancedImageButton(0, 0, 20, 20, 0, 0, 20, REPORT_BUTTON_LOCATION, 64, 64,
+ button -> {}, Component.translatable("gui.socialInteractions.report"), screen);
+ this.reportButton.setTooltip(Tooltip.create(NCR_BUTTON_TOOLTIP));
+ this.reportButton.setTooltipDelay(10);
this.reportButton.active = false;
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
deleted file mode 100644
index 407a7ed..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-import java.util.Optional;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Group;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import com.aizistral.nochatreports.config.NCRConfig;
-import com.aizistral.nochatreports.core.ServerSafetyState;
-import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
-
-import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
-import net.minecraft.client.multiplayer.ProfileKeyPairManager;
-import net.minecraft.util.Signer;
-import net.minecraft.world.entity.player.ProfilePublicKey;
-
-@Mixin(ProfileKeyPairManager.class)
-public class MixinProfileKeyPairManager {
-
- /**
- * @reason Prevent the client from exposing its public key, unless it is necessary
- * and user agreed to do so.
- * @author Aizistral
- */
-
- @Inject(method = "profilePublicKey", at = @At("HEAD"), cancellable = true)
- private void onProfilePublicKey(CallbackInfoReturnable<Optional<ProfilePublicKey>> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
- if (!ServerSafetyState.allowsUnsafeServer()) {
- info.setReturnValue(Optional.empty());
- }
- }
-
- /**
- * @reason Prevent the client from exposing its public key, unless it is necessary
- * and user agreed to do so.
- * @author Aizistral
- */
-
- @Group(min = 1, max = 2)
- @Inject(method = "parsePublicKey", at = @At("HEAD"), cancellable = true)
- private static void onParsePublicKey(KeyPairResponse response, CallbackInfoReturnable<ProfilePublicKey.Data> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
- if (!ServerSafetyState.allowsUnsafeServer()) {
- info.setReturnValue(null);
- }
- }
-
- /**
- * @reason Accomplishes the same thing as {@link #onParsePublicKey(KeyPairResponse, CallbackInfoReturnable)},
- * but only in 1.19.1.
- * @author Aizistral
- */
-
- @Group(min = 1, max = 2)
- @Inject(method = { "profilePublicKeyData", "method_43784" }, at = @At("HEAD"), cancellable = true, remap = false)
- private void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
- if (!ServerSafetyState.allowsUnsafeServer()) {
- info.setReturnValue(Optional.empty());
- }
- }
-
- /**
- * @reason Prevent client from trying to produce signature in
- * {@link ClientHandshakePacketListenerImpl#handleHello}.
- * @author Aizistral
- */
-
- @Inject(method = "signer", at = @At("HEAD"), cancellable = true)
- private void onSigner(CallbackInfoReturnable<Optional<Signer>> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
- if (!ServerSafetyState.allowsUnsafeServer()) {
- info.setReturnValue(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 5fd58dd..7bcb9a8 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java
@@ -26,9 +26,9 @@ public class MixinRealmsConnect {
if (!NCRConfig.getClient().enableMod())
return;
- ServerSafetyState.setLastConnectedServer(serverAddress, null);
+ ServerSafetyState.reset();
ServerSafetyState.updateCurrent(ServerSafetyLevel.REALMS);
- ServerSafetyState.setAllowsUnsafeServer(true);
+ ServerSafetyState.setAllowChatSigning(true);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java
new file mode 100644
index 0000000..1c1958b
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java
@@ -0,0 +1,30 @@
+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.CallbackInfoReturnable;
+
+import com.aizistral.nochatreports.config.NCRConfig;
+
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.GridWidget;
+import net.minecraft.client.gui.screens.OptionsScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+
+@Mixin(GridWidget.RowHelper.class)
+public abstract class MixinRowHelper {
+
+ @Inject(method = "addChild(Lnet/minecraft/client/gui/components/AbstractWidget;)"
+ + "Lnet/minecraft/client/gui/components/AbstractWidget;", at = @At("HEAD"), cancellable = true)
+ private void onAddChild(AbstractWidget widget, CallbackInfoReturnable<AbstractWidget> info) {
+ if (NCRConfig.getClient().disableTelemetry() && NCRConfig.getClient().removeTelemetryButton())
+ if (OptionsScreen.TELEMETRY.equals(widget.getMessage())) {
+ info.setReturnValue(widget);
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java
index fb0d66b..7da207f 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java
@@ -1,7 +1,5 @@
package com.aizistral.nochatreports.mixins.client;
-import java.lang.reflect.Field;
-
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@@ -19,18 +17,8 @@ import net.minecraft.network.protocol.status.ServerStatus;
@Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1")
public class MixinServerStatusPinger$1 {
- private static final Field SERVER_DATA_FIELD;
-
- static {
- // We use reflection here because Mixin's AP dies when trying to process @Shadow of this lol
- try {
- Class<?> pinger = Class.forName("net.minecraft.client.multiplayer.ServerStatusPinger$1");
- SERVER_DATA_FIELD = pinger.getDeclaredField("val$p_105460_");
- SERVER_DATA_FIELD.setAccessible(true);
- } catch (Exception ex) {
- throw new RuntimeException("Reflection failed in MixinServerStatusPinger$1", ex);
- }
- }
+ @Shadow @Final
+ private ServerData val$data;
/**
* @reason Ensure "preventsChatReports" property is transferred from {@link ServerStatus} to
@@ -41,17 +29,14 @@ public class MixinServerStatusPinger$1 {
@Inject(method = "handleStatusResponse(Lnet/minecraft/network/protocol/status/ClientboundStatusResponsePacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/status/ServerStatus;getPlayers()Lnet/minecraft/network/protocol/status/ServerStatus$Players;", ordinal = 0, shift = At.Shift.BEFORE))
private void getNoChatReports(ClientboundStatusResponsePacket packet, CallbackInfo info) {
- try {
- boolean preventsReports = ((ServerDataExtension) packet.getStatus()).preventsChatReports();
- ((ServerDataExtension) SERVER_DATA_FIELD.get(this)).setPreventsChatReports(preventsReports);
-
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Received status response packet from server, preventsChatReports: {}",
- preventsReports);
- }
- } catch (IllegalArgumentException | IllegalAccessException ex) {
- throw new RuntimeException("Failed to get ServerData field via reflection", ex);
+ boolean preventsReports = ((ServerDataExtension) packet.getStatus()).preventsChatReports();
+ ((ServerDataExtension) this.val$data).setPreventsChatReports(preventsReports);
+
+ if (NCRConfig.getCommon().enableDebugLog()) {
+ NoChatReports.LOGGER.info("Received status response packet from server, preventsChatReports: {}",
+ preventsReports);
}
+
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
index 39fe9e0..859743d 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
@@ -1,17 +1,14 @@
package com.aizistral.nochatreports.mixins.client;
-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.RealmsWarningScreen;
import com.mojang.realmsclient.RealmsMainScreen;
-
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.TitleScreen;
import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
+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;
@Mixin(TitleScreen.class)
public class MixinTitleScreen extends Screen {
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java
new file mode 100644
index 0000000..2bd51c6
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java
@@ -0,0 +1,33 @@
+package com.aizistral.nochatreports.mixins.client;
+
+import java.util.concurrent.Executor;
+
+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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.aizistral.nochatreports.config.NCRConfig;
+import com.mojang.authlib.minecraft.TelemetrySession;
+import com.mojang.authlib.minecraft.UserApiService;
+import com.mojang.authlib.yggdrasil.YggdrasilUserApiService;
+
+import net.minecraft.client.telemetry.ClientTelemetryManager;
+
+@Mixin(value = YggdrasilUserApiService.class, remap = false)
+public class MixinYggdrasilUserApiService {
+
+ /**
+ * @reason Privacy.
+ * @author Aizistral
+ */
+
+ @Inject(method = "newTelemetrySession", at = @At("HEAD"), cancellable = true)
+ private void onCreateTelemetrySession(Executor executor, CallbackInfoReturnable<TelemetrySession> info) {
+ if (NCRConfig.getClient().disableTelemetry()) {
+ info.setReturnValue(TelemetrySession.DISABLED);
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java
index 9268092..ebe1fbb 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java
@@ -36,6 +36,12 @@ public class MixinServerStatus implements ServerDataExtension {
@Override
public boolean preventsChatReports() {
+ var self = (ServerStatus) (Object) this;
+
+ if (self.getVersion() != null && self.getVersion().getProtocol() < 759
+ && self.getVersion().getProtocol() > 0)
+ return true;
+
return this.preventsChatReports;
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java
deleted file mode 100644
index 1065a5a..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.aizistral.nochatreports.mixins.server;
-
-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.CallbackInfoReturnable;
-
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.ProfilePublicKey;
-
-@Mixin(Player.class)
-public class MixinPlayer {
-
- /**
- * @reason Prevents server from trying to validate signatures on incoming
- * chat messages. Also prevents it from relaying public keys to other clients.
- * @author Aizistral
- */
-
- @Inject(method = "getProfilePublicKey", at = @At("HEAD"), cancellable = true)
- private void onGetProfileKey(CallbackInfoReturnable<ProfilePublicKey> info) {
- info.setReturnValue(null);
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java
index 79a6959..6cbafe2 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java
@@ -5,7 +5,6 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import net.minecraft.network.chat.ChatSender;
import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.server.players.PlayerList;
@@ -18,7 +17,7 @@ public class MixinPlayerList {
*/
@Inject(method = "verifyChatTrusted", at = @At("HEAD"), cancellable = true)
- private void onVerifyChatTrusted(PlayerChatMessage playerChatMessage, ChatSender chatSender, CallbackInfoReturnable<Boolean> info) {
+ private void onVerifyChatTrusted(PlayerChatMessage playerChatMessage, CallbackInfoReturnable<Boolean> info) {
info.setReturnValue(true);
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
index c6fcbe0..395f317 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
@@ -11,8 +11,8 @@ import com.aizistral.nochatreports.NoChatReports;
import com.aizistral.nochatreports.config.NCRConfig;
import net.minecraft.network.PacketSendListener;
+import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientboundPlayerChatHeaderPacket;
import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket;
import net.minecraft.network.protocol.game.ClientboundSystemChatPacket;
import net.minecraft.server.level.ServerPlayer;
@@ -34,15 +34,15 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC
@Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true)
private void onSend(Packet<?> packet, CallbackInfo info) {
if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) {
- NoChatReports.LOGGER.info("Sending message: {}", chat.message().serverContent());
+ NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent()
+ : chat.body().content());
}
if (NCRConfig.getCommon().convertToGameMessage()) {
- if (packet instanceof ClientboundPlayerChatHeaderPacket) {
- info.cancel();
- } else if (packet instanceof ClientboundPlayerChatPacket chat) {
+ if (packet instanceof ClientboundPlayerChatPacket chat) {
packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level.registryAccess())
- .get().decorate(chat.message().serverContent()), false);
+ .get().decorate(chat.unsignedContent() != null ? chat.unsignedContent()
+ : Component.literal(chat.body().content())), false);
info.cancel();
this.send(packet);
@@ -59,13 +59,12 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC
at = @At("HEAD"), cancellable = true)
private void onSend(Packet<?> packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) {
if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) {
- NoChatReports.LOGGER.info("Sending message: {}", chat.message().serverContent());
+ NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent()
+ : chat.body().content());
}
if (NCRConfig.getCommon().convertToGameMessage()) {
- if (packet instanceof ClientboundPlayerChatHeaderPacket) {
- info.cancel();
- } else if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) {
+ if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) {
info.cancel();
((ServerGamePacketListenerImpl) (Object) this).send(chat);
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java
index d9332c1..44b3284 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java
@@ -20,7 +20,7 @@ public class MixinServerboundChatPacket {
@Inject(method = "signature", at = @At("RETURN"), cancellable = true)
private void onGetSignature(CallbackInfoReturnable<MessageSignature> info) {
- info.setReturnValue(MessageSignature.EMPTY);
+ info.setReturnValue(null);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java
new file mode 100644
index 0000000..d88a2eb
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java
@@ -0,0 +1,36 @@
+package com.aizistral.nochatreports.mixins.server;
+
+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.config.NCRConfig;
+
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.game.ServerGamePacketListener;
+import net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+
+@Mixin(ServerboundChatSessionUpdatePacket.class)
+public class MixinServerboundChatSessionUpdatePacket {
+
+ /**
+ * @reason Ignore chat sessions from client, since we throw away signatures anyways.
+ * @author Aizistral
+ */
+
+ @Inject(method = "handle", at = @At("HEAD"), cancellable = true)
+ private void onHandle(ServerGamePacketListener listener, CallbackInfo info) {
+ var impl = (ServerGamePacketListenerImpl) listener;
+
+ if (!impl.getPlayer().getServer().isSingleplayerOwner(impl.getPlayer().getGameProfile())) {
+ if (NCRConfig.getCommon().demandOnClient()) {
+ impl.disconnect(Component.literal(NCRConfig.getCommon().demandOnClientMessage()));
+ }
+ }
+
+ info.cancel();
+ }
+
+}