diff options
Diffstat (limited to 'src')
17 files changed, 441 insertions, 20 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index 0bf43bf..5a06ce3 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -3,7 +3,7 @@ package com.aizistral.nochatreports; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.aizistral.nochatreports.handlers.NoReportsConfig; +import com.aizistral.nochatreports.core.NoReportsConfig; import com.aizistral.nochatreports.network.ServerChannelHandler; import com.mojang.authlib.minecraft.UserApiService; @@ -22,7 +22,7 @@ import net.minecraft.server.network.ServerGamePacketListenerImpl; public class NoChatReports implements ModInitializer { public static final Logger LOGGER = LogManager.getLogger(); - protected static final ResourceLocation CHANNEL = new ResourceLocation("nochatreports", "sync"); + public static final ResourceLocation CHANNEL = new ResourceLocation("nochatreports", "sync"); @Override public void onInitialize() { diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 075b460..faac288 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -1,32 +1,100 @@ package com.aizistral.nochatreports; -import com.aizistral.nochatreports.handlers.NoReportsConfig; +import java.util.List; + +import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.gui.UnsafeServerScreen; +import com.aizistral.nochatreports.mixins.AccessorDisconnectedScreen; import com.aizistral.nochatreports.network.ClientChannelHandler; import com.aizistral.nochatreports.network.ServerChannelHandler; +import com.google.common.collect.ImmutableList; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.client.Minecraft; +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; @Environment(EnvType.CLIENT) public class NoChatReportsClient implements ClientModInitializer { + 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 boolean screenOverride = false; @Override public void onInitializeClient() { NoChatReports.LOGGER.info("Client initialization..."); ClientPlayNetworking.registerGlobalReceiver(NoChatReports.CHANNEL, ClientChannelHandler.INSTANCE); ClientPlayConnectionEvents.JOIN.register(this::onPlayReady); + ScreenEvents.AFTER_INIT.register(this::onScreenInit); + } + + private void onScreenInit(Minecraft client, Screen screen, int scaledWidth, int scaledHeight) { + if (screen instanceof AccessorDisconnectedScreen dsc) { + if (screenOverride) + return; + + if (dsc.getReason().getContents() instanceof TranslatableContents contents) { + if (ServerSafetyState.allowsUnsafeServer()) { + screenOverride = true; + ServerSafetyState.setAllowsUnsafeServer(false); + screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()), + CommonComponents.CONNECT_FAILED, dsc.getReason()); + client.setScreen(screen); + screenOverride = false; + return; + } else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) { + screenOverride = true; + client.setScreen(new UnsafeServerScreen()); + screenOverride = false; + } + } + } } private void onPlayReady(ClientPacketListener handler, PacketSender sender, Minecraft client) { client.execute(() -> { + if (!client.isLocalServer()) { + String ip = ServerSafetyState.getLastConnectedServer().getHost() + ":" + + ServerSafetyState.getLastConnectedServer().getPort(); + boolean canSend = ClientPlayNetworking.canSend(NoChatReports.CHANNEL); + + if (canSend) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + } else { + ServerSafetyState.updateCurrent(ServerSafetyState.allowsUnsafeServer() ? + ServerSafetyLevel.INSECURE : ServerSafetyLevel.UNINTRUSIVE); + + if (ServerSafetyState.getCurrent() != ServerSafetyLevel.INSECURE) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); + } else { + // NO-OP + } + } + + if (ServerSafetyState.allowsUnsafeServer()) { + ServerSafetyState.setAllowsUnsafeServer(false); + } + } + if (NoReportsConfig.demandsOnServer() && !ClientPlayNetworking.canSend(NoChatReports.CHANNEL)) { handler.getConnection().disconnect(Component.translatable("disconnect.nochatreports.client")); } diff --git a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index ad741f3..edb2ef6 100644 --- a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -1,10 +1,13 @@ -package com.aizistral.nochatreports.handlers; +package com.aizistral.nochatreports.core; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import javax.annotation.Nullable; @@ -12,12 +15,16 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.multiplayer.chat.ChatTrustLevel; +import net.minecraft.util.Tuple; public class NoReportsConfig { private static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json"); private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static NoReportsConfig INSTANCE; - private boolean demandOnClient, demandOnServer, convertToGameMessage, suppressBanNotices, randomizeUUID; + private boolean demandOnClient, demandOnServer, convertToGameMessage = true, + suppressBanNotices = true, showServerSafety = true; + private List<String> whitelistedServers; private static NoReportsConfig getInstance() { if (INSTANCE == null) { @@ -32,12 +39,21 @@ public class NoReportsConfig { if (INSTANCE == null) { INSTANCE = new NoReportsConfig(); - INSTANCE.suppressBanNotices = INSTANCE.convertToGameMessage = true; + } + + if (INSTANCE.whitelistedServers == null) { + INSTANCE.whitelistedServers = new ArrayList<>(); } writeFile(INSTANCE); } + public static void saveConfig() { + if (INSTANCE != null) { + writeFile(INSTANCE); + } + } + @Nullable private static NoReportsConfig readFile() { if (!Files.isRegularFile(CONFIG_FILE)) @@ -66,7 +82,7 @@ public class NoReportsConfig { return getInstance().demandOnServer; } - public static boolean convertsToGameMessage() { + public static boolean convertToGameMessage() { return getInstance().convertToGameMessage; } @@ -74,4 +90,12 @@ public class NoReportsConfig { return getInstance().suppressBanNotices; } + public static boolean showServerSafety() { + return getInstance().showServerSafety; + } + + public static List<String> getWhitelistedServers() { + return getInstance().whitelistedServers; + } + } diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java new file mode 100644 index 0000000..d6d0db5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -0,0 +1,18 @@ +package com.aizistral.nochatreports.core; + +import com.aizistral.nochatreports.NoChatReports; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.chat.Component; + +public enum ServerSafetyLevel { + SECURE, UNINTRUSIVE, INSECURE, UNKNOWN; + + @Environment(EnvType.CLIENT) + public Component getTooltip() { + return Component.translatable("gui.nochatreports.status_" + this.name().toLowerCase()); + } +} diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java new file mode 100644 index 0000000..2dff0e4 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java @@ -0,0 +1,41 @@ +package com.aizistral.nochatreports.core; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Nullable; + +import net.minecraft.client.multiplayer.ServerData; +import net.minecraft.client.multiplayer.resolver.ServerAddress; + +public class ServerSafetyState { + private static ServerSafetyLevel current = ServerSafetyLevel.UNKNOWN; + private static ServerAddress lastConnectedServer = null; + private static boolean allowUnsafeServer = false; + + public static void updateCurrent(ServerSafetyLevel level) { + current = level; + } + + public static ServerSafetyLevel getCurrent() { + return current; + } + + public static boolean allowsUnsafeServer() { + return allowUnsafeServer; + } + + public static void setAllowsUnsafeServer(boolean allows) { + allowUnsafeServer = allows; + } + + @Nullable + public static ServerAddress getLastConnectedServer() { + return lastConnectedServer; + } + + public static void setLastConnectedServer(@Nullable ServerAddress address) { + lastConnectedServer = address; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java new file mode 100644 index 0000000..efccc4e --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java @@ -0,0 +1,57 @@ +package com.aizistral.nochatreports.gui; + +import javax.print.attribute.standard.MediaSize.NA; + +import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.core.ServerSafetyState; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.ConnectScreen; +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.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; + +@Environment(EnvType.CLIENT) +public 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"); + private static final Component NARRATION = TITLE.copy().append("\n").append(CONTENT); + + private final Screen previous = new TitleScreen(); + private final Screen joinMultiplayer = new JoinMultiplayerScreen(new TitleScreen()); + + public UnsafeServerScreen() { + super(TITLE, CONTENT, CHECK, NARRATION); + } + + @Override + protected void initButtons(int i) { + this.addRenderableWidget(new Button(this.width / 2 - 155, 100 + i, 150, 20, CommonComponents.GUI_PROCEED, button -> { + ServerAddress address = ServerSafetyState.getLastConnectedServer(); + + if (address != null) { + if (this.stopShowing.selected()) { + NoReportsConfig.getWhitelistedServers().add(address.getHost() + ":" + address.getPort()); + NoReportsConfig.saveConfig(); + } else { + ServerSafetyState.setAllowsUnsafeServer(true); + } + + ConnectScreen.startConnecting(this, this.minecraft, address, null); + } + })); + this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, 100 + i, 150, 20, CommonComponents.GUI_BACK, button -> { + this.minecraft.setScreen(this.joinMultiplayer); + })); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java new file mode 100644 index 0000000..06d2207 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java @@ -0,0 +1,15 @@ +package com.aizistral.nochatreports.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.network.chat.Component; + +@Mixin(DisconnectedScreen.class) +public interface AccessorDisconnectedScreen { + + @Accessor + public Component getReason(); + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java index 768c873..c043f1a 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java @@ -6,7 +6,7 @@ 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.handlers.NoReportsConfig; +import com.aizistral.nochatreports.core.NoReportsConfig; import net.minecraft.client.multiplayer.PlayerInfo; import net.minecraft.client.multiplayer.chat.ChatListener; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java new file mode 100644 index 0000000..ad332d2 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java @@ -0,0 +1,148 @@ +package com.aizistral.nochatreports.mixins; + +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 com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.core.ServerSafetyLevel; +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 net.minecraft.client.OptionInstance; +import net.minecraft.client.OptionInstance.TooltipSupplierFactory; +import net.minecraft.client.gui.components.Button; +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.renderer.GameRenderer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.FormattedCharSequence; + +@Mixin(ChatScreen.class) +public abstract class MixinChatScreen extends Screen { + private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons.png"); + + protected MixinChatScreen(Component component) { + super(component); + throw new IllegalStateException("Can't touch this"); + } + + @Inject(method = "init", at = @At("HEAD")) + private void onInit(CallbackInfo info) { + if (!NoReportsConfig.showServerSafety()) + return; + + ServerSafetyLevel trust = this.minecraft.isLocalServer() ? ServerSafetyLevel.SECURE : ServerSafetyState.getCurrent(); + + var button = new ImageButton(this.width - 23, this.height - 37, 20, 20, this.getXOffset(trust), + 0, 20, CHAT_STATUS_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) -> + this.renderTooltipNoGap(poseStack, this.minecraft.font.split(trust.getTooltip(), 250), i, j), + Component.translatable("gui.socialInteractions.report")); + button.active = false; + button.visible = true; + this.addRenderableOnly(button); + } + + private int getXOffset(ServerSafetyLevel level) { + return switch (level) { + case SECURE -> 21; + case UNINTRUSIVE, UNKNOWN -> 42; + case INSECURE -> 0; + }; + } + + private 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); + } + + private 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 : 0; + 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/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java new file mode 100644 index 0000000..628e3e8 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java @@ -0,0 +1,32 @@ +package com.aizistral.nochatreports.mixins; + +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.core.NoReportsConfig; +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; + +@Mixin(ConnectScreen.class) +public class MixinConnectScreen { + + @Inject(method = "startConnecting", at = @At("HEAD")) + private static void onStartConnecting(Screen screen, Minecraft minecraft, ServerAddress serverAddress, + @Nullable ServerData serverData, CallbackInfo info) { + ServerSafetyState.setLastConnectedServer(serverAddress); + + if (serverAddress != null) + if (NoReportsConfig.getWhitelistedServers().contains(serverAddress.getHost() + ":" + serverAddress.getPort())) { + ServerSafetyState.setAllowsUnsafeServer(true); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java index 58161fd..fa73465 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java @@ -9,7 +9,7 @@ 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.handlers.NoReportsConfig; +import com.aizistral.nochatreports.core.NoReportsConfig; import com.mojang.authlib.minecraft.BanDetails; import com.mojang.authlib.minecraft.UserApiService; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java index 5fea452..f5ded0d 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java @@ -9,6 +9,8 @@ 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.core.ServerSafetyState; + import java.util.Optional; @Mixin(ProfileKeyPairManager.class) @@ -21,8 +23,10 @@ public class MixinProfileKeyPairManager { */ @Inject(method = "profilePublicKey", at = @At("HEAD"), cancellable = true) - private void preventServerValidation(CallbackInfoReturnable<Optional<ProfilePublicKey>> info) { - info.setReturnValue(Optional.empty()); + private void onProfilePublicKey(CallbackInfoReturnable<Optional<ProfilePublicKey>> info) { + if (!ServerSafetyState.allowsUnsafeServer()) { + info.setReturnValue(Optional.empty()); + } } /** @@ -32,8 +36,10 @@ public class MixinProfileKeyPairManager { */ @Inject(method = "profilePublicKeyData", at = @At("HEAD"), cancellable = true) - private void dontSendKeys(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) { - info.setReturnValue(Optional.empty()); + private void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) { + if (!ServerSafetyState.allowsUnsafeServer()) { + info.setReturnValue(Optional.empty()); + } } /** @@ -44,8 +50,10 @@ public class MixinProfileKeyPairManager { */ @Inject(method = "signer", at = @At("HEAD"), cancellable = true) - private void preventSignature(CallbackInfoReturnable<Optional<Signer>> info) { - info.setReturnValue(null); + private void onSigner(CallbackInfoReturnable<Optional<Signer>> info) { + if (!ServerSafetyState.allowsUnsafeServer()) { + info.setReturnValue(null); + } } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java index 29c7748..6a87b48 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java @@ -1,7 +1,7 @@ package com.aizistral.nochatreports.mixins; import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.handlers.NoReportsConfig; +import com.aizistral.nochatreports.core.NoReportsConfig; import net.minecraft.core.Registry; import net.minecraft.network.chat.ChatType; @@ -34,7 +34,7 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC @Inject(method = "send", at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, CallbackInfo info) { - if (NoReportsConfig.convertsToGameMessage()) { + if (NoReportsConfig.convertToGameMessage()) { if (packet instanceof ClientboundPlayerChatPacket chat) { Component component = chat.unsignedContent().orElse(chat.signedContent()); component = ChatTypeDecoration.withSender("chat.type.text").decorate(component, chat.sender()); diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 9582dc7..4ea561a 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -1,5 +1,12 @@ { "gui.nochatreport.secureChat": "This option cannot work with No Chat Reports, since there are no signatures to verify.", "gui.nochatreport.noReporting": "Chat reports are disabled on this server, courtesy of No Chat Reports.", - "disconnect.nochatreports.client": "This server does not have No Chat Reports, and you have it configured to require itself on server." + "disconnect.nochatreports.client": "This server does not have No Chat Reports, and you have it configured to require itself on server.", + "gui.nochatreports.status_secure": "This server has No Chat Reports installed, or prevents your messages from being reportable in some other known way. You can chat safely.", + "gui.nochatreports.status_unintrusive": "This server does not have No Chat Reports installed, but does not require you to send signed messages ('enforce-secure-profile' in server.properties is likely turned off). No Chat Reports will protect you by stripping signatures before sending messages to server.", + "gui.nochatreports.status_insecure": "This server demands all player messages to be signed, and you agreed to proceed with this arrangment. Everything you send to the chat is a potentially incriminating evidence. You can manually remove this server from your whitelist by editing NoChatReports.json in your config folder.", + "gui.nochatreports.status_unknown": "No Chat Reports could not evaluate safety of this server. This should never happen normally, report as bug to mod developer.", + "gui.nochatreports.unsafe_server.header": "Caution: Unsafe Server", + "gui.nochatreports.unsafe_server.contents": "This server is configured to demand your public key, and all your chat messages to be signed ('enforce-secure-profile' is likely enabled in server.properties). You can choose to play anyways, but No Chat Reports will not be able to protect you.", + "gui.nochatreports.unsafe_server.check": "Do not show again for this server" }
\ No newline at end of file diff --git a/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons.png b/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons.png Binary files differnew file mode 100644 index 0000000..d904ccc --- /dev/null +++ b/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons.png diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index 277a1ea..d3218e4 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -17,7 +17,10 @@ "MixinClientTelemetryManager", "MixinTitleScreen", "MixinMinecraft", - "MixinPlayerEntry" + "MixinPlayerEntry", + "MixinChatScreen", + "AccessorDisconnectedScreen", + "MixinConnectScreen" ], "server": [ "MixinDedicatedServer" diff --git a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java index f9f49ba..467d913 100644 --- a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java +++ b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java @@ -6,7 +6,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.handlers.NoReportsConfig; +import com.aizistral.nochatreports.core.NoReportsConfig; import com.aizistral.nochatreports.network.ServerChannelHandler; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.UserApiService; |
